diff --git a/engine/lib/jogl/gluegen-rt-android.jar b/engine/lib/jogl/gluegen-rt-android.jar new file mode 100644 index 000000000..f8055d6d6 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-android.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-android-armv6.jar b/engine/lib/jogl/gluegen-rt-natives-android-armv6.jar new file mode 100644 index 000000000..8ecbac550 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-android-armv6.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar new file mode 100644 index 000000000..139bee2d0 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-linux-amd64.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar b/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar new file mode 100644 index 000000000..2e219227f Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-linux-armv6.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar b/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar new file mode 100644 index 000000000..da8c148e5 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-linux-armv6hf.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar b/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar new file mode 100644 index 000000000..788e99b2f Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-linux-i586.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar b/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar new file mode 100644 index 000000000..1e51c2b0a Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-macosx-universal.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar new file mode 100644 index 000000000..0874b7905 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-solaris-amd64.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar b/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar new file mode 100644 index 000000000..ca01b405d Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-solaris-i586.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar b/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar new file mode 100644 index 000000000..918363946 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-windows-amd64.jar differ diff --git a/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar b/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar new file mode 100644 index 000000000..a46ad0a74 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt-natives-windows-i586.jar differ diff --git a/engine/lib/jogl/gluegen-rt.jar b/engine/lib/jogl/gluegen-rt.jar new file mode 100644 index 000000000..abf6be8c7 Binary files /dev/null and b/engine/lib/jogl/gluegen-rt.jar differ diff --git a/engine/lib/jogl/joal-natives-android-armv6.jar b/engine/lib/jogl/joal-natives-android-armv6.jar new file mode 100644 index 000000000..bf85beb8f Binary files /dev/null and b/engine/lib/jogl/joal-natives-android-armv6.jar differ diff --git a/engine/lib/jogl/joal-natives-linux-amd64.jar b/engine/lib/jogl/joal-natives-linux-amd64.jar new file mode 100644 index 000000000..61c1b85e5 Binary files /dev/null and b/engine/lib/jogl/joal-natives-linux-amd64.jar differ diff --git a/engine/lib/jogl/joal-natives-linux-armv6.jar b/engine/lib/jogl/joal-natives-linux-armv6.jar new file mode 100644 index 000000000..1af9903fc Binary files /dev/null and b/engine/lib/jogl/joal-natives-linux-armv6.jar differ diff --git a/engine/lib/jogl/joal-natives-linux-armv6hf.jar b/engine/lib/jogl/joal-natives-linux-armv6hf.jar new file mode 100644 index 000000000..f67a5fea9 Binary files /dev/null and b/engine/lib/jogl/joal-natives-linux-armv6hf.jar differ diff --git a/engine/lib/jogl/joal-natives-linux-i586.jar b/engine/lib/jogl/joal-natives-linux-i586.jar new file mode 100644 index 000000000..4fb9ad696 Binary files /dev/null and b/engine/lib/jogl/joal-natives-linux-i586.jar differ diff --git a/engine/lib/jogl/joal-natives-macosx-universal.jar b/engine/lib/jogl/joal-natives-macosx-universal.jar new file mode 100644 index 000000000..291c6bfc3 Binary files /dev/null and b/engine/lib/jogl/joal-natives-macosx-universal.jar differ diff --git a/engine/lib/jogl/joal-natives-solaris-amd64.jar b/engine/lib/jogl/joal-natives-solaris-amd64.jar new file mode 100644 index 000000000..afb9a7555 Binary files /dev/null and b/engine/lib/jogl/joal-natives-solaris-amd64.jar differ diff --git a/engine/lib/jogl/joal-natives-solaris-i586.jar b/engine/lib/jogl/joal-natives-solaris-i586.jar new file mode 100644 index 000000000..96d31712d Binary files /dev/null and b/engine/lib/jogl/joal-natives-solaris-i586.jar differ diff --git a/engine/lib/jogl/joal-natives-windows-amd64.jar b/engine/lib/jogl/joal-natives-windows-amd64.jar new file mode 100644 index 000000000..27ab19e70 Binary files /dev/null and b/engine/lib/jogl/joal-natives-windows-amd64.jar differ diff --git a/engine/lib/jogl/joal-natives-windows-i586.jar b/engine/lib/jogl/joal-natives-windows-i586.jar new file mode 100644 index 000000000..8ddfe5fc5 Binary files /dev/null and b/engine/lib/jogl/joal-natives-windows-i586.jar differ diff --git a/engine/lib/jogl/joal.jar b/engine/lib/jogl/joal.jar new file mode 100644 index 000000000..a9b800240 Binary files /dev/null and b/engine/lib/jogl/joal.jar differ diff --git a/engine/lib/jogl/jogl-all-android.jar b/engine/lib/jogl/jogl-all-android.jar new file mode 100644 index 000000000..2c089417a Binary files /dev/null and b/engine/lib/jogl/jogl-all-android.jar differ diff --git a/engine/lib/jogl/jogl-all-mobile.jar b/engine/lib/jogl/jogl-all-mobile.jar new file mode 100644 index 000000000..be7c8139b Binary files /dev/null and b/engine/lib/jogl/jogl-all-mobile.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-android-armv6.jar b/engine/lib/jogl/jogl-all-natives-android-armv6.jar new file mode 100644 index 000000000..56ab9bd26 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-android-armv6.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-linux-amd64.jar b/engine/lib/jogl/jogl-all-natives-linux-amd64.jar new file mode 100644 index 000000000..9c1dcfde7 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-linux-amd64.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-linux-armv6.jar b/engine/lib/jogl/jogl-all-natives-linux-armv6.jar new file mode 100644 index 000000000..054e7b151 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-linux-armv6.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar b/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar new file mode 100644 index 000000000..0da4ac030 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-linux-armv6hf.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-linux-i586.jar b/engine/lib/jogl/jogl-all-natives-linux-i586.jar new file mode 100644 index 000000000..ab57da5b7 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-linux-i586.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-macosx-universal.jar b/engine/lib/jogl/jogl-all-natives-macosx-universal.jar new file mode 100644 index 000000000..0b8fcf8d6 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-macosx-universal.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar b/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar new file mode 100644 index 000000000..e6ce02221 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-solaris-amd64.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-solaris-i586.jar b/engine/lib/jogl/jogl-all-natives-solaris-i586.jar new file mode 100644 index 000000000..6f9c2e578 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-solaris-i586.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-windows-amd64.jar b/engine/lib/jogl/jogl-all-natives-windows-amd64.jar new file mode 100644 index 000000000..6051abf93 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-windows-amd64.jar differ diff --git a/engine/lib/jogl/jogl-all-natives-windows-i586.jar b/engine/lib/jogl/jogl-all-natives-windows-i586.jar new file mode 100644 index 000000000..62e19b3b9 Binary files /dev/null and b/engine/lib/jogl/jogl-all-natives-windows-i586.jar differ diff --git a/engine/lib/jogl/jogl-all.jar b/engine/lib/jogl/jogl-all.jar new file mode 100644 index 000000000..684d21e0d Binary files /dev/null and b/engine/lib/jogl/jogl-all.jar differ diff --git a/engine/lib/nblibraries.properties b/engine/lib/nblibraries.properties index a2a5d2848..e57776e6f 100644 --- a/engine/lib/nblibraries.properties +++ b/engine/lib/nblibraries.properties @@ -22,10 +22,9 @@ libs.jogl.classpath=\ ${base}/jogl/jME3-jogl-natives.jar:\ ${base}/jogl/jogl.jar libs.jogl2.classpath=\ - ${base}/jogl2/jogl.all.jar;\ - ${base}/jogl2/nativewindow.all.jar;\ - ${base}/jogl2/newt.all.jar;\ - ${base}/jogl2/gluegen-rt.jar + ${base}/jogl/gluegen-rt.jar:\ + ${base}/jogl/joal.jar:\ + ${base}/jogl/jogl-all.jar libs.junit_4.classpath=\ ${base}/junit_4/junit-4.5.jar libs.junit_4.javadoc=\ diff --git a/engine/nbproject/build-impl.xml b/engine/nbproject/build-impl.xml index c22778e76..6808c5e93 100644 --- a/engine/nbproject/build-impl.xml +++ b/engine/nbproject/build-impl.xml @@ -166,6 +166,7 @@ is divided into following sections: + @@ -273,6 +274,7 @@ is divided into following sections: + Must set src.jogl.dir Must set src.core.dir Must set src.core-data.dir Must set src.core-effects.dir @@ -314,7 +316,7 @@ is divided into following sections: - + @@ -354,7 +356,7 @@ is divided into following sections: - + @@ -386,7 +388,7 @@ is divided into following sections: - + @@ -973,11 +975,12 @@ is divided into following sections: - + + @@ -1018,7 +1021,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - + @@ -1279,6 +1282,9 @@ is divided into following sections: + + + @@ -1346,6 +1352,9 @@ is divided into following sections: + + + diff --git a/engine/nbproject/genfiles.properties b/engine/nbproject/genfiles.properties index 51e74efa6..1b740f2e1 100644 --- a/engine/nbproject/genfiles.properties +++ b/engine/nbproject/genfiles.properties @@ -3,8 +3,8 @@ build.xml.script.CRC32=34d4c2f2 build.xml.stylesheet.CRC32=958a1d3e # 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=ba8f4e88 -nbproject/build-impl.xml.script.CRC32=019a773a +nbproject/build-impl.xml.data.CRC32=4c05467d +nbproject/build-impl.xml.script.CRC32=c8003d7e nbproject/build-impl.xml.stylesheet.CRC32=6ddba6b6@1.53.1.46 nbproject/profiler-build-impl.xml.data.CRC32=aff514c1 nbproject/profiler-build-impl.xml.script.CRC32=abda56ed diff --git a/engine/nbproject/project.properties b/engine/nbproject/project.properties index 65dde3c48..d2ec5834c 100644 --- a/engine/nbproject/project.properties +++ b/engine/nbproject/project.properties @@ -1,127 +1,129 @@ -annotation.processing.enabled=false -annotation.processing.enabled.in.editor=false -annotation.processing.processors.list= -annotation.processing.run.all.processors=true -ant.customtasks.libs=JWSAntTasks -application.homepage=http://www.jmonkeyengine.com/ -application.title=jMonkeyEngine 3.0 -application.vendor=jMonkeyEngine -build.classes.dir=${build.dir}/classes -build.classes.excludes=**/*.java,**/*.form -# This directory is removed when the project is cleaned: -build.dir=build -build.generated.dir=${build.dir}/generated -build.generated.sources.dir=${build.dir}/generated-sources -# Only compile against the classpath explicitly listed here: -build.sysclasspath=ignore -build.test.classes.dir=${build.dir}/test/classes -build.test.results.dir=${build.dir}/test/results -# Uncomment to specify the preferred debugger connection transport: -#debug.transport=dt_socket -debug.classpath=\ - ${run.classpath} -debug.test.classpath=\ - ${run.test.classpath} -# This directory is removed when the project is cleaned: -dist.dir=dist -dist.jar=${dist.dir}/jMonkeyEngine3.jar -dist.javadoc.dir=${dist.dir}/javadoc -endorsed.classpath= -excludes= -file.reference.src-test-data=src/test-data -includes=** -jar.archive.disabled=${jnlp.enabled} -jar.compress=true -jar.index=${jnlp.enabled} -javac.classpath=\ - ${libs.jogg.classpath}:\ - ${libs.jbullet.classpath}:\ - ${libs.lwjgl.classpath}:\ - ${libs.niftygui1.3.classpath}:\ - ${libs.jme3-test-data.classpath}:\ - ${libs.android.classpath}:\ - ${libs.bullet.classpath} -# Space-separated list of extra javac options -javac.compilerargs= -javac.deprecation=false -javac.processorpath=\ - ${javac.classpath} -javac.source=1.5 -javac.target=1.5 -javac.test.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${libs.junit_4.classpath} -javadoc.additionalparam=-protected -javadoc.author=false -javadoc.encoding=${source.encoding} -javadoc.noindex=false -javadoc.nonavbar=false -javadoc.notree=false -javadoc.private=false -javadoc.splitindex=true -javadoc.use=true -javadoc.version=false -javadoc.windowtitle=jMonkeyEngine3 -jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" -jnlp.applet.class=jme3test.awt.AppHarness -jnlp.applet.height=300 -jnlp.applet.width=300 -jnlp.codebase.type=user -jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/ -jnlp.descriptor=application -jnlp.enabled=false -jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png -jnlp.mixed.code=default -jnlp.offline-allowed=true -jnlp.signed=true -jnlp.signing=generated -jnlp.signing.alias= -jnlp.signing.keystore= -main.class=jme3test.TestChooser -manifest.file=MANIFEST.MF -meta.inf.dir=${src.dir}/META-INF -mkdist.disabled=false -platform.active=default_platform -run.classpath=\ - ${javac.classpath}:\ - ${build.classes.dir}:\ - ${build.dir}/core:\ - ${build.dir}/effects:\ - ${build.dir}/networking:\ - ${build.dir}/plugins:\ - ${build.dir}/jogg:\ - ${build.dir}/desktop:\ - ${build.dir}/blender:\ - ${build.dir}/terrain:\ - ${build.dir}/jbullet:\ - ${build.dir}/bullet:\ - ${build.dir}/niftygui:\ - ${build.dir}/lwjgl:\ - ${build.dir}/android -run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M -run.test.classpath=\ - ${javac.test.classpath}:\ - ${build.test.classes.dir} -source.encoding=UTF-8 -src.android.dir=src/android -src.blender.dir=src/blender -src.bullet-common.dir=src/bullet-common -src.bullet-native.dir=src/bullet-native -src.bullet.dir=src/bullet -src.core-data.dir=src/core-data -src.core-effects.dir=src/core-effects -src.core-plugins.dir=src/core-plugins -src.core.dir=src/core -src.desktop.dir=src/desktop -src.jbullet.dir=src/jbullet -src.jogg.dir=src/jogg -src.lwjgl.dir=src/lwjgl -src.networking.dir=src/networking -src.niftygui.dir=src/niftygui -src.ogre.dir=src/ogre -src.terrain.dir=src/terrain -src.test.dir=src/test -src.tools.dir=src/tools -src.xml.dir=src/xml -test.test.dir=test +annotation.processing.enabled=false +annotation.processing.enabled.in.editor=false +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +ant.customtasks.libs=JWSAntTasks +application.homepage=http://www.jmonkeyengine.com/ +application.title=jMonkeyEngine 3.0 +application.vendor=jMonkeyEngine +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/jMonkeyEngine3.jar +dist.javadoc.dir=${dist.dir}/javadoc +endorsed.classpath= +excludes= +file.reference.src-test-data=src/test-data +includes=** +jar.archive.disabled=${jnlp.enabled} +jar.compress=true +jar.index=${jnlp.enabled} +javac.classpath=\ + ${libs.jogg.classpath}:\ + ${libs.jbullet.classpath}:\ + ${libs.lwjgl.classpath}:\ + ${libs.niftygui1.3.classpath}:\ + ${libs.jme3-test-data.classpath}:\ + ${libs.android.classpath}:\ + ${libs.bullet.classpath}:\ + ${libs.jogl2.classpath} +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.processorpath=\ + ${javac.classpath} +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam=-protected +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle=jMonkeyEngine3 +jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api" +jnlp.applet.class=jme3test.awt.AppHarness +jnlp.applet.height=300 +jnlp.applet.width=300 +jnlp.codebase.type=user +jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/ +jnlp.descriptor=application +jnlp.enabled=false +jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png +jnlp.mixed.code=default +jnlp.offline-allowed=true +jnlp.signed=true +jnlp.signing=generated +jnlp.signing.alias=jme3 +jnlp.signing.keystore= +main.class=jme3test.TestChooser +manifest.file=MANIFEST.MF +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${build.dir}/core:\ + ${build.dir}/effects:\ + ${build.dir}/networking:\ + ${build.dir}/plugins:\ + ${build.dir}/jogg:\ + ${build.dir}/desktop:\ + ${build.dir}/blender:\ + ${build.dir}/terrain:\ + ${build.dir}/jbullet:\ + ${build.dir}/bullet:\ + ${build.dir}/niftygui:\ + ${build.dir}/lwjgl:\ + ${build.dir}/android +run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.android.dir=src/android +src.blender.dir=src/blender +src.bullet-common.dir=src/bullet-common +src.bullet-native.dir=src/bullet-native +src.bullet.dir=src/bullet +src.core-data.dir=src/core-data +src.core-effects.dir=src/core-effects +src.core-plugins.dir=src/core-plugins +src.core.dir=src/core +src.desktop.dir=src/desktop +src.jbullet.dir=src/jbullet +src.jogg.dir=src/jogg +src.jogl.dir=src/jogl +src.lwjgl.dir=src/lwjgl +src.networking.dir=src/networking +src.niftygui.dir=src/niftygui +src.ogre.dir=src/ogre +src.terrain.dir=src/terrain +src.test.dir=src/test +src.tools.dir=src/tools +src.xml.dir=src/xml +test.test.dir=test diff --git a/engine/nbproject/project.xml b/engine/nbproject/project.xml index 51772cf9c..400992cdc 100644 --- a/engine/nbproject/project.xml +++ b/engine/nbproject/project.xml @@ -11,6 +11,7 @@ jMonkeyEngine3 1.6.5 +