Updates the renderers based on JOGL 2.0 (and JOAL 1.1.3)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9879 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

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}/jogl/gluegen-rt.jar:\
-    ${base}/jogl2/nativewindow.all.jar;\
+    ${base}/jogl/joal.jar:\
-    ${base}/jogl2/newt.all.jar;\
+    ${base}/jogl/jogl-all.jar
-    ${base}/jogl2/gluegen-rt.jar
 libs.junit_4.classpath=\
     ${base}/junit_4/junit-4.5.jar
 libs.junit_4.javadoc=\

engine/nbproject/build-impl.xml

@@ -166,6 +166,7 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.jogl.dir}"/>
                 <available file="${src.core.dir}"/>
                 <available file="${src.core-data.dir}"/>
                 <available file="${src.core-effects.dir}"/>
@@ -273,6 +274,7 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-do-init" name="-init-check">
+        <fail unless="src.jogl.dir">Must set src.jogl.dir</fail>
         <fail unless="src.core.dir">Must set src.core.dir</fail>
         <fail unless="src.core-data.dir">Must set src.core-data.dir</fail>
         <fail unless="src.core-effects.dir">Must set src.core-effects.dir</fail>
@@ -314,7 +316,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
+            <attribute default="${src.jogl.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -354,7 +356,7 @@ is divided into following sections:
     </target>
     <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
+            <attribute default="${src.jogl.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -386,7 +388,7 @@ is divided into following sections:
     </target>
     <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
+            <attribute default="${src.jogl.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -973,11 +975,12 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.jogl.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}:${build.generated.subdirs}"/>
     </target>
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
         <copy todir="${build.classes.dir}">
+            <fileset dir="${src.jogl.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core-data.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.core-effects.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1018,7 +1021,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.jogl.dir}:${src.core.dir}:${src.core-data.dir}:${src.core-effects.dir}:${src.core-plugins.dir}:${src.desktop.dir}:${src.terrain.dir}:${src.jbullet.dir}:${src.bullet.dir}:${src.bullet-native.dir}:${src.bullet-common.dir}:${src.networking.dir}:${src.niftygui.dir}:${src.jogg.dir}:${src.ogre.dir}:${src.blender.dir}:${src.xml.dir}:${src.tools.dir}:${src.test.dir}:${src.lwjgl.dir}:${src.android.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1279,6 +1282,9 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.jogl.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.core.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1346,6 +1352,9 @@ is divided into following sections:
             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
         </javadoc>
         <copy todir="${dist.javadoc.dir}">
+            <fileset dir="${src.jogl.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.core.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>

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.data.CRC32=4c05467d
-nbproject/build-impl.xml.script.CRC32=019a773a
+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

engine/nbproject/project.properties

@@ -1,127 +1,129 @@
-annotation.processing.enabled=false
+annotation.processing.enabled=false
-annotation.processing.enabled.in.editor=false
+annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
+annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
+annotation.processing.run.all.processors=true
-ant.customtasks.libs=JWSAntTasks
+ant.customtasks.libs=JWSAntTasks
-application.homepage=http://www.jmonkeyengine.com/
+application.homepage=http://www.jmonkeyengine.com/
-application.title=jMonkeyEngine 3.0
+application.title=jMonkeyEngine 3.0
-application.vendor=jMonkeyEngine
+application.vendor=jMonkeyEngine
-build.classes.dir=${build.dir}/classes
+build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
+build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-build.dir=build
+build.dir=build
-build.generated.dir=${build.dir}/generated
+build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
+build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
+# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
+build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
+build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
+build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
+# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
+#debug.transport=dt_socket
-debug.classpath=\
+debug.classpath=\
-    ${run.classpath}
+    ${run.classpath}
-debug.test.classpath=\
+debug.test.classpath=\
-    ${run.test.classpath}
+    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
+# This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=dist
-dist.jar=${dist.dir}/jMonkeyEngine3.jar
+dist.jar=${dist.dir}/jMonkeyEngine3.jar
-dist.javadoc.dir=${dist.dir}/javadoc
+dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
+endorsed.classpath=
-excludes=
+excludes=
-file.reference.src-test-data=src/test-data
+file.reference.src-test-data=src/test-data
-includes=**
+includes=**
-jar.archive.disabled=${jnlp.enabled}
+jar.archive.disabled=${jnlp.enabled}
-jar.compress=true
+jar.compress=true
-jar.index=${jnlp.enabled}
+jar.index=${jnlp.enabled}
-javac.classpath=\
+javac.classpath=\
-    ${libs.jogg.classpath}:\
+    ${libs.jogg.classpath}:\
-    ${libs.jbullet.classpath}:\
+    ${libs.jbullet.classpath}:\
-    ${libs.lwjgl.classpath}:\
+    ${libs.lwjgl.classpath}:\
-    ${libs.niftygui1.3.classpath}:\
+    ${libs.niftygui1.3.classpath}:\
-    ${libs.jme3-test-data.classpath}:\
+    ${libs.jme3-test-data.classpath}:\
-    ${libs.android.classpath}:\
+    ${libs.android.classpath}:\
-    ${libs.bullet.classpath}
+    ${libs.bullet.classpath}:\
-# Space-separated list of extra javac options
+    ${libs.jogl2.classpath}
-javac.compilerargs=
+# Space-separated list of extra javac options
-javac.deprecation=false
+javac.compilerargs=
-javac.processorpath=\
+javac.deprecation=false
-    ${javac.classpath}
+javac.processorpath=\
-javac.source=1.5
+    ${javac.classpath}
-javac.target=1.5
+javac.source=1.5
-javac.test.classpath=\
+javac.target=1.5
-    ${javac.classpath}:\
+javac.test.classpath=\
-    ${build.classes.dir}:\
+    ${javac.classpath}:\
-    ${libs.junit_4.classpath}
+    ${build.classes.dir}:\
-javadoc.additionalparam=-protected
+    ${libs.junit_4.classpath}
-javadoc.author=false
+javadoc.additionalparam=-protected
-javadoc.encoding=${source.encoding}
+javadoc.author=false
-javadoc.noindex=false
+javadoc.encoding=${source.encoding}
-javadoc.nonavbar=false
+javadoc.noindex=false
-javadoc.notree=false
+javadoc.nonavbar=false
-javadoc.private=false
+javadoc.notree=false
-javadoc.splitindex=true
+javadoc.private=false
-javadoc.use=true
+javadoc.splitindex=true
-javadoc.version=false
+javadoc.use=true
-javadoc.windowtitle=jMonkeyEngine3
+javadoc.version=false
-jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
+javadoc.windowtitle=jMonkeyEngine3
-jnlp.applet.class=jme3test.awt.AppHarness
+jaxbwiz.endorsed.dirs="${netbeans.home}/../ide12/modules/ext/jaxb/api"
-jnlp.applet.height=300
+jnlp.applet.class=jme3test.awt.AppHarness
-jnlp.applet.width=300
+jnlp.applet.height=300
-jnlp.codebase.type=user
+jnlp.applet.width=300
-jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
+jnlp.codebase.type=user
-jnlp.descriptor=application
+jnlp.codebase.user=http://jmonkeyengine.com/javawebstart/
-jnlp.enabled=false
+jnlp.descriptor=application
-jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
+jnlp.enabled=false
-jnlp.mixed.code=default
+jnlp.icon=/Users/normenhansen/Pictures/jme/icons/jme-logo48.png
-jnlp.offline-allowed=true
+jnlp.mixed.code=default
-jnlp.signed=true
+jnlp.offline-allowed=true
-jnlp.signing=generated
+jnlp.signed=true
-jnlp.signing.alias=
+jnlp.signing=generated
-jnlp.signing.keystore=
+jnlp.signing.alias=jme3
-main.class=jme3test.TestChooser
+jnlp.signing.keystore=
-manifest.file=MANIFEST.MF
+main.class=jme3test.TestChooser
-meta.inf.dir=${src.dir}/META-INF
+manifest.file=MANIFEST.MF
-mkdist.disabled=false
+meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
+mkdist.disabled=false
-run.classpath=\
+platform.active=default_platform
-    ${javac.classpath}:\
+run.classpath=\
-    ${build.classes.dir}:\
+    ${javac.classpath}:\
-    ${build.dir}/core:\
+    ${build.classes.dir}:\
-    ${build.dir}/effects:\
+    ${build.dir}/core:\
-    ${build.dir}/networking:\
+    ${build.dir}/effects:\
-    ${build.dir}/plugins:\
+    ${build.dir}/networking:\
-    ${build.dir}/jogg:\
+    ${build.dir}/plugins:\
-    ${build.dir}/desktop:\
+    ${build.dir}/jogg:\
-    ${build.dir}/blender:\
+    ${build.dir}/desktop:\
-    ${build.dir}/terrain:\
+    ${build.dir}/blender:\
-    ${build.dir}/jbullet:\
+    ${build.dir}/terrain:\
-    ${build.dir}/bullet:\
+    ${build.dir}/jbullet:\
-    ${build.dir}/niftygui:\
+    ${build.dir}/bullet:\
-    ${build.dir}/lwjgl:\
+    ${build.dir}/niftygui:\
-    ${build.dir}/android
+    ${build.dir}/lwjgl:\
-run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
+    ${build.dir}/android
-run.test.classpath=\
+run.jvmargs=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=256M
-    ${javac.test.classpath}:\
+run.test.classpath=\
-    ${build.test.classes.dir}
+    ${javac.test.classpath}:\
-source.encoding=UTF-8
+    ${build.test.classes.dir}
-src.android.dir=src/android
+source.encoding=UTF-8
-src.blender.dir=src/blender
+src.android.dir=src/android
-src.bullet-common.dir=src/bullet-common
+src.blender.dir=src/blender
-src.bullet-native.dir=src/bullet-native
+src.bullet-common.dir=src/bullet-common
-src.bullet.dir=src/bullet
+src.bullet-native.dir=src/bullet-native
-src.core-data.dir=src/core-data
+src.bullet.dir=src/bullet
-src.core-effects.dir=src/core-effects
+src.core-data.dir=src/core-data
-src.core-plugins.dir=src/core-plugins
+src.core-effects.dir=src/core-effects
-src.core.dir=src/core
+src.core-plugins.dir=src/core-plugins
-src.desktop.dir=src/desktop
+src.core.dir=src/core
-src.jbullet.dir=src/jbullet
+src.desktop.dir=src/desktop
-src.jogg.dir=src/jogg
+src.jbullet.dir=src/jbullet
-src.lwjgl.dir=src/lwjgl
+src.jogg.dir=src/jogg
-src.networking.dir=src/networking
+src.jogl.dir=src/jogl
-src.niftygui.dir=src/niftygui
+src.lwjgl.dir=src/lwjgl
-src.ogre.dir=src/ogre
+src.networking.dir=src/networking
-src.terrain.dir=src/terrain
+src.niftygui.dir=src/niftygui
-src.test.dir=src/test
+src.ogre.dir=src/ogre
-src.tools.dir=src/tools
+src.terrain.dir=src/terrain
-src.xml.dir=src/xml
+src.test.dir=src/test
-test.test.dir=test
+src.tools.dir=src/tools
+src.xml.dir=src/xml
+test.test.dir=test

engine/nbproject/project.xml

@@ -11,6 +11,7 @@
             <name>jMonkeyEngine3</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.jogl.dir" name="JOGL Renderer"/>
                 <root id="src.core.dir" name="Core"/>
                 <root id="src.core-data.dir" name="Core-Data"/>
                 <root id="src.core-effects.dir" name="Core-Effects"/>