diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java index 5875a94fb..3d9a1b3b7 100644 --- a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java +++ b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java @@ -392,9 +392,22 @@ public class OGLESShaderRenderer implements Renderer { public void clearBuffers(boolean color, boolean depth, boolean stencil) { int bits = 0; if (color) { + //See explanations of the depth below, we must enable color write to be able to clear the color buffer + if (context.colorWriteEnabled == false) { + GLES20.glColorMask(true, true, true, true); + context.colorWriteEnabled = true; + } bits = GLES20.GL_COLOR_BUFFER_BIT; } if (depth) { + //glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false + //here s some link on openl board + //http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223 + //if depth clear is requested, we enable the depthMask + if (context.depthWriteEnabled == false) { + GLES20.glDepthMask(true); + context.depthWriteEnabled = true; + } bits |= GLES20.GL_DEPTH_BUFFER_BIT; } if (stencil) { diff --git a/jme3-examples/build.gradle b/jme3-examples/build.gradle index a0dfeae52..9ccd184a7 100644 --- a/jme3-examples/build.gradle +++ b/jme3-examples/build.gradle @@ -44,7 +44,7 @@ jar.doFirst{ } } -task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar']){ +task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar']) << { // Copy all dependencies to ../dist/lib, remove versions from jar files configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact -> copy { diff --git a/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java b/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java index 5cdbcb4f9..ed78baae2 100644 --- a/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java +++ b/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java @@ -121,9 +121,22 @@ public class IGLESShaderRenderer implements Renderer { logger.log(Level.FINE, "IGLESShaderRenderer clearBuffers"); int bits = 0; if (color) { + //See explanations of the depth below, we must enable color write to be able to clear the color buffer + if (context.colorWriteEnabled == false) { + JmeIosGLES.glColorMask(true, true, true, true); + context.colorWriteEnabled = true; + } bits = JmeIosGLES.GL_COLOR_BUFFER_BIT; } if (depth) { + //glClear(GL_DEPTH_BUFFER_BIT) seems to not work when glDepthMask is false + //here s some link on openl board + //http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=257223 + //if depth clear is requested, we enable the depthMask + if (context.depthWriteEnabled == false) { + JmeIosGLES.glDepthMask(true); + context.depthWriteEnabled = true; + } bits |= JmeIosGLES.GL_DEPTH_BUFFER_BIT; } if (stencil) { diff --git a/jme3-niftygui/build.gradle b/jme3-niftygui/build.gradle index 06f7aeeda..8572b3127 100644 --- a/jme3-niftygui/build.gradle +++ b/jme3-niftygui/build.gradle @@ -12,5 +12,5 @@ dependencies { compile project(':jme3-core') compile 'lessvoid:nifty:1.3.3' compile 'lessvoid:nifty-default-controls:1.3.3' -// compile 'lessvoid:nifty-style-black:1.3.3' + compile 'lessvoid:nifty-style-black:1.3.3' } diff --git a/sdk/jme3-core-baselibs/nbproject/project.xml b/sdk/jme3-core-baselibs/nbproject/project.xml index 8d3603391..71bf4a69b 100644 --- a/sdk/jme3-core-baselibs/nbproject/project.xml +++ b/sdk/jme3-core-baselibs/nbproject/project.xml @@ -29,7 +29,6 @@ com.jme3.scene.plugins.blender.lights com.jme3.scene.plugins.blender.materials com.jme3.scene.plugins.blender.meshes - com.jme3.scene.plugins.blender.meshes.builders com.jme3.scene.plugins.blender.modifiers com.jme3.scene.plugins.blender.objects com.jme3.scene.plugins.blender.particles @@ -67,6 +66,7 @@ com.jme3.material.plugins com.jme3.math com.jme3.post + com.jme3.profile com.jme3.renderer com.jme3.renderer.queue com.jme3.scene @@ -127,6 +127,8 @@ com.jme3.network.serializing.serializers com.jme3.niftygui com.jme3.export.xml + com.jme3.scene.plugins.fbx + com.jme3.scene.plugins.fbx.file com.jme3.scene.plugins.ogre com.jme3.scene.plugins.ogre.matext com.jme3.terrain diff --git a/sdk/jme3-core-libraries/nbproject/project.xml b/sdk/jme3-core-libraries/nbproject/project.xml index 9c94fbe9f..74def0791 100644 --- a/sdk/jme3-core-libraries/nbproject/project.xml +++ b/sdk/jme3-core-libraries/nbproject/project.xml @@ -215,6 +215,10 @@ ext/nifty-default-controls-1.3.3.jar release/modules/ext/nifty-default-controls-1.3.3.jar + + ext/nifty-style-black-1.3.3.jar + release/modules/ext/nifty-style-black-1.3.3.jar + ext/xpp3-1.1.4c.jar release/modules/ext/xpp3-1.1.4c.jar diff --git a/sdk/jme3-core/src/com/jme3/gde/core/core-helpset.xml b/sdk/jme3-core/src/com/jme3/gde/core/core-helpset.xml deleted file mode 100644 index cca1a889b..000000000 --- a/sdk/jme3-core/src/com/jme3/gde/core/core-helpset.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - diff --git a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml index 816bfe2ea..5dc6db6fe 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/layer.xml +++ b/sdk/jme3-core/src/com/jme3/gde/core/layer.xml @@ -319,9 +319,6 @@ - - - diff --git a/sdk/jme3-gui/build.xml b/sdk/jme3-gui/build.xml index a5c92cb19..f7d03ec94 100644 --- a/sdk/jme3-gui/build.xml +++ b/sdk/jme3-gui/build.xml @@ -1,8 +1,8 @@ - - - - - - Builds, tests, and runs the project com.jme3.gde.gui. - - + + + + + + Builds, tests, and runs the project com.jme3.gde.gui. + + diff --git a/sdk/jme3-gui/manifest.mf b/sdk/jme3-gui/manifest.mf index 38c508804..e7d435ae1 100644 --- a/sdk/jme3-gui/manifest.mf +++ b/sdk/jme3-gui/manifest.mf @@ -1,6 +1,6 @@ -Manifest-Version: 1.0 -OpenIDE-Module: com.jme3.gde.gui/3 -OpenIDE-Module-Implementation-Version: 0 -OpenIDE-Module-Layer: com/jme3/gde/gui/layer.xml -OpenIDE-Module-Localizing-Bundle: com/jme3/gde/gui/Bundle.properties - +Manifest-Version: 1.0 +OpenIDE-Module: com.jme3.gde.gui/3 +OpenIDE-Module-Implementation-Version: 0 +OpenIDE-Module-Layer: com/jme3/gde/gui/layer.xml +OpenIDE-Module-Localizing-Bundle: com/jme3/gde/gui/Bundle.properties + diff --git a/sdk/jme3-gui/nbproject/build-impl.xml b/sdk/jme3-gui/nbproject/build-impl.xml index e5b9c7898..307e07b68 100644 --- a/sdk/jme3-gui/nbproject/build-impl.xml +++ b/sdk/jme3-gui/nbproject/build-impl.xml @@ -1,45 +1,45 @@ - - - - - - - - - - - - - You must set 'suite.dir' to point to your containing module suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + You must set 'suite.dir' to point to your containing module suite + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sdk/jme3-gui/nbproject/genfiles.properties b/sdk/jme3-gui/nbproject/genfiles.properties index 99333ca57..2ffacfaa9 100644 --- a/sdk/jme3-gui/nbproject/genfiles.properties +++ b/sdk/jme3-gui/nbproject/genfiles.properties @@ -8,12 +8,12 @@ nbproject/build-impl.xml.data.CRC32=971927a9 nbproject/build-impl.xml.script.CRC32=55a34aaf nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1 ======= -build.xml.data.CRC32=d998e9a1 +build.xml.data.CRC32=e69ed2ba build.xml.script.CRC32=a0136781 -build.xml.stylesheet.CRC32=a56c6a5b@2.56.1 +build.xml.stylesheet.CRC32=a56c6a5b@2.66.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=d998e9a1 +nbproject/build-impl.xml.data.CRC32=e69ed2ba nbproject/build-impl.xml.script.CRC32=55a34aaf -nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.56.1 +nbproject/build-impl.xml.stylesheet.CRC32=238281d1@2.66.1 >>>>>>> experimental diff --git a/sdk/jme3-gui/nbproject/project.properties b/sdk/jme3-gui/nbproject/project.properties index e0b462857..291042fd5 100644 --- a/sdk/jme3-gui/nbproject/project.properties +++ b/sdk/jme3-gui/nbproject/project.properties @@ -1,8 +1,19 @@ +file.reference.beansbinding-1.2.1.jar=release/modules/ext/beansbinding-1.2.1.jar +file.reference.guava-16.0.1.jar=release/modules/ext/guava-16.0.1.jar +file.reference.javassist.jar=release/modules/ext/javassist.jar +file.reference.jTatoo.jar=release/modules/ext/jTatoo.jar +file.reference.Nifty-Editor0.5.7.jar=release/modules/ext/Nifty-Editor0.5.7.jar +file.reference.nifty-java2d-renderer-1.4.0-SNAPSHOT.jar=release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar +file.reference.reflections-0.9.9-RC1.jar=release/modules/ext/reflections-0.9.9-RC1.jar +file.reference.relaxngDatatype-1.5.jar=release/modules/ext/relaxngDatatype-1.5.jar +file.reference.slf4j-simple-1.7.7.jar=release/modules/ext/slf4j-simple-1.7.7.jar +file.reference.swingtonifty.jar=release/modules/ext/swingtonifty.jar +file.reference.xsom-20110101-SNAPSHOT.jar=release/modules/ext/xsom-20110101-SNAPSHOT.jar #Thu, 25 Aug 2011 20:26:49 +0200 javac.source=1.5 -javac.compilerargs=-Xlint -Xlint\:-serial +javac.compilerargs=-Xlint -Xlint:-serial license.file=../license-jme.txt -nbm.homepage=http\://www.jmonkeyengine.com -nbm.module.author=Normen Hansen +nbm.homepage=http://www.jmonkeyengine.com +nbm.module.author=Relucri nbm.needs.restart=true spec.version.base=3.1.0 diff --git a/sdk/jme3-gui/nbproject/project.xml b/sdk/jme3-gui/nbproject/project.xml index f88b4237d..6c27f9f9b 100644 --- a/sdk/jme3-gui/nbproject/project.xml +++ b/sdk/jme3-gui/nbproject/project.xml @@ -42,6 +42,15 @@ 1.36.1 + + org.netbeans.api.progress + + + + 1 + 1.37.1 + + org.netbeans.core.multiview @@ -51,6 +60,15 @@ 1.32.1 + + org.netbeans.modules.editor.mimelookup + + + + 1 + 1.35.1 + + org.netbeans.modules.java.project @@ -78,6 +96,15 @@ + + org.netbeans.spi.navigator + + + + 1 + 1.32.1 + + org.netbeans.spi.palette @@ -171,10 +198,50 @@ com.jme3.gde.gui + + ext/xsom-20110101-SNAPSHOT.jar + release/modules/ext/xsom-20110101-SNAPSHOT.jar + + + ext/guava-16.0.1.jar + release/modules/ext/guava-16.0.1.jar + + + ext/reflections-0.9.9-RC1.jar + release/modules/ext/reflections-0.9.9-RC1.jar + + + ext/jTatoo.jar + release/modules/ext/jTatoo.jar + ext/swingtonifty.jar release/modules/ext/swingtonifty.jar + + ext/slf4j-simple-1.7.7.jar + release/modules/ext/slf4j-simple-1.7.7.jar + + + ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar + release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar + + + ext/javassist.jar + release/modules/ext/javassist.jar + + + ext/beansbinding-1.2.1.jar + release/modules/ext/beansbinding-1.2.1.jar + + + ext/Nifty-Editor0.5.7.jar + release/modules/ext/Nifty-Editor0.5.7.jar + + + ext/relaxngDatatype-1.5.jar + release/modules/ext/relaxngDatatype-1.5.jar + diff --git a/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.7.jar b/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.7.jar index c22e77625..e7dbf871c 100644 Binary files a/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.7.jar and b/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.7.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar b/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar deleted file mode 100644 index 0747d52ea..000000000 Binary files a/sdk/jme3-gui/release/modules/ext/Nifty-Editor0.5.9.jar and /dev/null differ diff --git a/sdk/jme3-gui/release/modules/ext/beansbinding-1.2.1.jar b/sdk/jme3-gui/release/modules/ext/beansbinding-1.2.1.jar new file mode 100644 index 000000000..7f26dc3d2 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/beansbinding-1.2.1.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/guava-16.0.1.jar b/sdk/jme3-gui/release/modules/ext/guava-16.0.1.jar new file mode 100644 index 000000000..2c8127d16 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/guava-16.0.1.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/jTatoo.jar b/sdk/jme3-gui/release/modules/ext/jTatoo.jar new file mode 100644 index 000000000..1cedaabcc Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/jTatoo.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/javassist.jar b/sdk/jme3-gui/release/modules/ext/javassist.jar new file mode 100644 index 000000000..e9840d5e3 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/javassist.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar b/sdk/jme3-gui/release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar new file mode 100644 index 000000000..9d76c59e3 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/nifty-java2d-renderer-1.4.0-SNAPSHOT.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/reflections-0.9.9-RC1.jar b/sdk/jme3-gui/release/modules/ext/reflections-0.9.9-RC1.jar new file mode 100644 index 000000000..8524129eb Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/reflections-0.9.9-RC1.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/relaxngDatatype-1.5.jar b/sdk/jme3-gui/release/modules/ext/relaxngDatatype-1.5.jar new file mode 100644 index 000000000..b0e8e2f38 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/relaxngDatatype-1.5.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/slf4j-simple-1.7.7.jar b/sdk/jme3-gui/release/modules/ext/slf4j-simple-1.7.7.jar new file mode 100644 index 000000000..2387c438b Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/slf4j-simple-1.7.7.jar differ diff --git a/sdk/jme3-gui/release/modules/ext/xsom-20110101-SNAPSHOT.jar b/sdk/jme3-gui/release/modules/ext/xsom-20110101-SNAPSHOT.jar new file mode 100644 index 000000000..ff330c826 Binary files /dev/null and b/sdk/jme3-gui/release/modules/ext/xsom-20110101-SNAPSHOT.jar differ diff --git a/sdk/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java b/sdk/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java index d63f7543e..d79502066 100644 --- a/sdk/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java +++ b/sdk/jme3-gui/src/com/jme3/gde/gui/view/NiftyGuiVisualElement.java @@ -4,12 +4,16 @@ */ package com.jme3.gde.gui.view; -import com.jme3.app.Application; +import com.jme3.asset.AssetInfo; +import com.jme3.asset.AssetKey; +import com.jme3.asset.AssetManager; +import com.jme3.asset.AssetNotFoundException; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.gui.NiftyGuiDataObject; import com.jme3.gde.gui.nodes.GElementNode; import com.jme3.gde.gui.nodes.GUINode; import de.lessvoid.nifty.Nifty; +import de.lessvoid.nifty.tools.resourceloader.ResourceLocation; import jada.ngeditor.controller.CommandProcessor; import jada.ngeditor.controller.GUIEditor; import jada.ngeditor.guiviews.DND.PaletteDropTarget; @@ -27,21 +31,18 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import java.beans.PropertyVetoException; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; +import java.net.URL; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; import java.util.Observable; import java.util.Observer; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.Action; -import javax.swing.ActionMap; import javax.swing.DefaultComboBoxModel; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -58,18 +59,14 @@ import org.netbeans.core.spi.multiview.MultiViewElementCallback; import org.netbeans.spi.actions.AbstractSavable; import org.openide.awt.UndoRedo; import org.openide.explorer.ExplorerManager; -import org.openide.explorer.ExplorerUtils; import org.openide.loaders.DataObject; -import org.openide.nodes.Node; import org.openide.util.Exceptions; import org.openide.util.Lookup; import org.openide.util.NbBundle.Messages; import org.openide.util.lookup.AbstractLookup; import org.openide.util.lookup.InstanceContent; -import org.openide.util.lookup.ProxyLookup; import org.openide.windows.TopComponent; import org.xml.sax.SAXException; -import sun.rmi.runtime.Log; @MultiViewElement.Registration( displayName = "#LBL_NiftyGui_VISUAL", @@ -93,13 +90,37 @@ public final class NiftyGuiVisualElement extends JPanel implements MultiViewElem private int guiID; private final InstanceContent content = new InstanceContent(); private Lookup lookup; + private AssetManager assetManager; + protected class ResourceLocationJmp implements ResourceLocation { + + public InputStream getResourceAsStream(String path) { + AssetKey key = new AssetKey(path); + AssetInfo info = assetManager.locateAsset(key); + if (info != null){ + return info.openStream(); + }else{ + throw new AssetNotFoundException(path); + } + } + + public URL getResource(String path) { + throw new UnsupportedOperationException(); + } + } + + private ResourceLocation resourceLocation = new ResourceLocationJmp(); + + public NiftyGuiVisualElement(Lookup lkp) { obj = lkp.lookup(NiftyGuiDataObject.class); assert obj != null; + assetManager = obj.getLookup().lookup(AssetManager.class); + assert assetManager != null; + System.out.println("AssetManagerNifty " + assetManager); initComponents(); view = new J2DNiftyView(800, 600); - view.init(); + view.init(resourceLocation); this.scrollArea.getViewport().addChangeListener(view); this.scrollArea.setViewportView(view); TrasferHandling tranf = new TrasferHandling(); diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml index cf4b50c3a..8a7312b13 100644 --- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-jogl.xml @@ -7,42 +7,42 @@ classpath jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-jogl-3.1.0-snapshot-github.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-android-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-armv6hf.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-linux-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-macosx-universal.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-solaris-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4-natives-windows-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-android-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-armv6hf.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-linux-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-macosx-universal.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-solaris-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4-natives-windows-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.1.4.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-android-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-armv6hf.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-linux-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-macosx-universal.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-solaris-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-amd64.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4-natives-windows-i586.jar!/ - jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.1.4.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-main-2.2.0.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-main-2.2.0.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-main-2.2.0.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/gluegen-rt-2.2.0.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/jogl-all-2.2.0.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-android-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-armv6.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-armv6hf.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-linux-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-macosx-universal.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-solaris-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-solaris-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-windows-amd64.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0-natives-windows-i586.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/joal-2.2.0.jar!/ src diff --git a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml index fd98eb1a7..ed5eb570c 100644 --- a/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml +++ b/sdk/jme3-project-baselibs/src/com/jme3/gde/project/baselibs/jme3-niftygui.xml @@ -9,6 +9,7 @@ jar:nbinst://com.jme3.gde.project.baselibs/libs/jme3-niftygui-3.1.0-snapshot-github.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-1.3.3.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-default-controls-1.3.3.jar!/ + jar:nbinst://com.jme3.gde.project.libraries/libs/nifty-style-black-1.3.3.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/xpp3-1.1.4c.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/eventbus-1.4.jar!/ jar:nbinst://com.jme3.gde.project.libraries/libs/jglfont-core-1.3.jar!/