diff options
Diffstat (limited to 'make')
53 files changed, 280 insertions, 280 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 0785ef9c0..f9238fa1b 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -92,8 +92,8 @@ value="com/jogamp/opengl/util/* jogamp/opengl/util/* com/jogamp/opengl/util/glsl/* jogamp/opengl/util/glsl/* jogamp/opengl/shader/**"/> <property name="java.part.core" - value="${java.part.gluegen-gl-rt} javax/media/opengl/* javax/media/opengl/fixedfunc/* com/jogamp/opengl/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/> - <property name="java.part.core.exclude" value="javax/media/opengl/Debug* javax/media/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/> + value="${java.part.gluegen-gl-rt} com/jogamp/opengl/* com/jogamp/opengl/fixedfunc/* com/jogamp/opengl/math/** jogamp/opengl/* ${java.part.core.util}"/> + <property name="java.part.core.exclude" value="com/jogamp/opengl/Debug* com/jogamp/opengl/Trace* com/jogamp/opengl/util/AWTAnimatorImpl* com/jogamp/opengl/util/PNG*"/> <property name="java.part.nv-cg" value="com/jogamp/opengl/cg com/jogamp/opengl/cg/* jogamp/opengl/cg/*"/> @@ -102,10 +102,10 @@ value="com/jogamp/opengl/egl/* jogamp/opengl/egl/*"/> <property name="java.part.glu" - value="javax/media/opengl/glu/* javax/media/opengl/glu/gl2es1/* jogamp/opengl/glu/* jogamp/opengl/glu/error/* jogamp/opengl/glu/tessellator/** jogamp/opengl/glu/mipmap/**"/> + value="com/jogamp/opengl/glu/* com/jogamp/opengl/glu/gl2es1/* jogamp/opengl/glu/* jogamp/opengl/glu/error/* jogamp/opengl/glu/tessellator/** jogamp/opengl/glu/mipmap/**"/> <property name="java.part.glu.gldesktop" - value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** javax/media/opengl/glu/gl2/**"/> + value="jogamp/opengl/glu/gl2/** jogamp/opengl/glu/nurbs/** jogamp/opengl/glu/registry/** com/jogamp/opengl/glu/gl2/**"/> <property name="java.part.openmax" value="jogamp/opengl/omx/**"/> @@ -132,22 +132,22 @@ value="jogamp/opengl/**/gl2/** jogamp/opengl/**/gl3/** jogamp/opengl/**/gl4/**"/> <property name="java.part.gldesktop.dbg" - value="javax/media/opengl/TraceGL2.* javax/media/opengl/DebugGL2.* javax/media/opengl/TraceGL3.* javax/media/opengl/DebugGL3.* javax/media/opengl/TraceGL3bc.* javax/media/opengl/DebugGL3bc.* javax/media/opengl/TraceGL4.* javax/media/opengl/DebugGL4.* javax/media/opengl/TraceGL4bc.* javax/media/opengl/DebugGL4bc.*"/> + value="com/jogamp/opengl/TraceGL2.* com/jogamp/opengl/DebugGL2.* com/jogamp/opengl/TraceGL3.* com/jogamp/opengl/DebugGL3.* com/jogamp/opengl/TraceGL3bc.* com/jogamp/opengl/DebugGL3bc.* com/jogamp/opengl/TraceGL4.* com/jogamp/opengl/DebugGL4.* com/jogamp/opengl/TraceGL4bc.* com/jogamp/opengl/DebugGL4bc.*"/> <property name="java.part.es1" - value="javax/media/opengl/**/es1/** com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/> + value="com/jogamp/opengl/**/es1/** jogamp/opengl/**/es1/**"/> <property name="java.part.es1.dbg" - value="javax/media/opengl/TraceGLES1.* javax/media/opengl/DebugGLES1.*"/> + value="com/jogamp/opengl/TraceGLES1.* com/jogamp/opengl/DebugGLES1.*"/> <property name="java.part.es2es3" value="jogamp/opengl/**/es3/**"/> <property name="java.part.es2es3.dbg" - value="javax/media/opengl/TraceGLES2.* javax/media/opengl/DebugGLES2.* javax/media/opengl/TraceGLES3.* javax/media/opengl/DebugGLES3.*"/> + value="com/jogamp/opengl/TraceGLES2.* com/jogamp/opengl/DebugGLES2.* com/jogamp/opengl/TraceGLES3.* com/jogamp/opengl/DebugGLES3.*"/> <property name="java.part.awt" - value="javax/media/opengl/awt/** jogamp/opengl/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/> + value="com/jogamp/opengl/awt/** jogamp/opengl/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/> <property name="java.part.swt" value="com/jogamp/opengl/**/swt/**"/> @@ -307,7 +307,7 @@ <property name="javadoc.dev" value="${project.root}/javadoc_jogl_dev" /> <property name="javadoc.windowtitle" value="JOGL API Specification -- Version ${jogamp.version.base}" /> <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> - <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> + <property name="javadoc.spec.packagenames" value="com.jogamp.opengl.*" /> <property name="javadoc.packagenames" value="${javadoc.spec.packagenames},com.jogamp.opengl.util.*" /> @@ -378,31 +378,31 @@ <!-- Now check for the presence of one well-known file --> <uptodate property="java.generate.skip.es1" - targetfile="${src.generated.java}/javax/media/opengl/GLES1.java"> + targetfile="${src.generated.java}/com/jogamp/opengl/GLES1.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> </uptodate> <uptodate property="java.generate.skip.es2" - targetfile="${src.generated.java}/javax/media/opengl/GLES2.java"> + targetfile="${src.generated.java}/com/jogamp/opengl/GLES2.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> </uptodate> <uptodate property="java.generate.skip.es3" - targetfile="${src.generated.java}/javax/media/opengl/GLES3.java"> + targetfile="${src.generated.java}/com/jogamp/opengl/GLES3.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> </uptodate> <uptodate property="java.generate.skip.gl2" - targetfile="${src.generated.java}/javax/media/opengl/GL2.java"> + targetfile="${src.generated.java}/com/jogamp/opengl/GL2.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> </uptodate> <uptodate property="java.generate.skip.glu" - targetfile="${src.generated.java}/javax/media/opengl/glu/GLU.java"> + targetfile="${src.generated.java}/com/jogamp/opengl/glu/GLU.java"> <srcfiles refid="stub.includes.dependencies.fileset.1" /> <srcfiles refid="stub.includes.dependencies.fileset.2" /> <srcfiles refid="stub.includes.dependencies.fileset.3" /> @@ -917,15 +917,15 @@ <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GLES1.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GLES1.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGLES1.java,TraceGLES1.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.es1" - srcfile="${classes}/javax/media/opengl/GLES1.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGLES1.java" /> + srcfile="${classes}/com/jogamp/opengl/GLES1.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGLES1.java" /> </target> @@ -933,15 +933,15 @@ <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GLES2.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GLES2.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGLES2.java,TraceGLES2.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.es2" - srcfile="${classes}/javax/media/opengl/GLES2.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGLES2.java" /> + srcfile="${classes}/com/jogamp/opengl/GLES2.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGLES2.java" /> </target> @@ -949,15 +949,15 @@ <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GLES3.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GLES3.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGLES3.java,TraceGLES3.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.es3" - srcfile="${classes}/javax/media/opengl/GLES3.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGLES3.java" /> + srcfile="${classes}/com/jogamp/opengl/GLES3.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGLES3.java" /> </target> @@ -965,67 +965,67 @@ <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GL2.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GL2.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGL2.java,TraceGL2.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.gl2" - srcfile="${classes}/javax/media/opengl/GL2.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGL2.java" /> + srcfile="${classes}/com/jogamp/opengl/GL2.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGL2.java" /> </target> <target name="java.generate.composable.pipeline.check.gl3"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GL3.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GL3.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGL3.java,TraceGL3.java,DebugGL3bc.java,TraceGL3bc.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.gl3" - srcfile="${classes}/javax/media/opengl/GL3.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGL3.java" /> + srcfile="${classes}/com/jogamp/opengl/GL3.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGL3.java" /> </target> <target name="java.generate.composable.pipeline.check.gl4bc"> <!-- Blow away the DebugGL*.java and TraceGL*.java sources if GL*.class has changed (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> - <srcfilelist dir="${classes}/javax/media/opengl" files="GL4bc.class" /> - <targetfileset dir="${src.generated.java}/javax/media/opengl" + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GL4bc.class" /> + <targetfileset dir="${src.generated.java}/com/jogamp/opengl" includes="DebugGL4bc.java,TraceGL4bc.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.skip.gl4bc" - srcfile="${classes}/javax/media/opengl/GL4bc.class" - targetfile="${src.generated.java}/javax/media/opengl/DebugGL4bc.java" /> + srcfile="${classes}/com/jogamp/opengl/GL4bc.class" + targetfile="${src.generated.java}/com/jogamp/opengl/DebugGL4bc.java" /> </target> <target name="java.generate.composable.pipeline.es1" depends="java.generate.composable.pipeline.check.es1" unless="java.generate.composable.pipeline.skip.es1"> <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> - <arg value="javax.media.opengl.GLES1" /> - <arg value="${src.generated.java}/javax/media/opengl" /> + <arg value="com.jogamp.opengl.GLES1" /> + <arg value="${src.generated.java}/com/jogamp/opengl" /> <classpath refid="pipeline.classpath" /> </java> </target> <target name="java.generate.composable.pipeline.es3" depends="java.generate.composable.pipeline.check.es3" unless="java.generate.composable.pipeline.skip.es3"> <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> - <arg value="javax.media.opengl.GLES3" /> - <arg value="${src.generated.java}/javax/media/opengl" /> + <arg value="com.jogamp.opengl.GLES3" /> + <arg value="${src.generated.java}/com/jogamp/opengl" /> <classpath refid="pipeline.classpath" /> </java> </target> <target name="java.generate.composable.pipeline.gl4bc" depends="java.generate.composable.pipeline.check.gl4bc" unless="java.generate.composable.pipeline.skip.gl4bc"> <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> - <arg value="javax.media.opengl.GL4bc" /> - <arg value="${src.generated.java}/javax/media/opengl" /> + <arg value="com.jogamp.opengl.GL4bc" /> + <arg value="${src.generated.java}/com/jogamp/opengl" /> <classpath refid="pipeline.classpath" /> </java> </target> @@ -1038,24 +1038,24 @@ (the uptodate element doesn't support arbitrary source and destination files) --> <dependset> <srcfilelist dir="${classes}/jogamp/opengl/util/glsl/fixedfunc" files="FixedFuncHook.class" /> - <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES1.class" /> - <srcfilelist dir="${classes}/javax/media/opengl" files="GL2ES2.class" /> + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GL2ES1.class" /> + <srcfilelist dir="${classes}/com/jogamp/opengl" files="GL2ES2.class" /> <targetfileset dir="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc" includes="FixedFuncImpl.java" /> </dependset> <!-- Now choose one of the two to test to see if we have to regenerate --> <uptodate property="java.generate.composable.pipeline.custom.skip.glfixfunc" - srcfile="${classes}/javax/media/opengl/GL2ES1.class" + srcfile="${classes}/com/jogamp/opengl/GL2ES1.class" targetfile="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc/FixedFuncImpl.java" /> </target> <target name="java.generate.composable.pipeline.custom.glfixfunc" depends="java.generate.composable.pipeline.custom.check.glfixfunc" unless="java.generate.composable.pipeline.custom.skip.glfixfunc"> <java classname="com.jogamp.gluegen.opengl.BuildComposablePipeline" fork="yes" failonerror="true"> - <arg value="javax.media.opengl.GL2ES1" /> + <arg value="com.jogamp.opengl.GL2ES1" /> <arg value="${src.generated.java}/jogamp/opengl/util/glsl/fixedfunc" /> <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncImpl" /> <arg value="jogamp.opengl.util.glsl.fixedfunc.FixedFuncHook" /> - <arg value="javax.media.opengl.GL2ES2" /> + <arg value="com.jogamp.opengl.GL2ES2" /> <arg value="prolog_xor_downstream" /> <arg value="gl_identity_by_assignable_class" /> <classpath refid="pipeline.classpath" /> @@ -1072,7 +1072,7 @@ <target name="java.compile.firstpass" depends="java.generate,java.generate.cg"> <!-- Perform the first pass Java compile. --> <javac destdir="${classes}" - includes="javax/media/opengl/fixedfunc/** javax/media/opengl/GLDrawableFactory.java javax/media/opengl/GLDrawable.java javax/media/opengl/GLContext.java javax/media/opengl/GL.java javax/media/opengl/GL2ES1.java javax/media/opengl/GLES1.java javax/media/opengl/GL2ES2.java javax/media/opengl/GLES2.java javax/media/opengl/GL2ES3.java javax/media/opengl/GL2GL3.java javax/media/opengl/GL2.java javax/media/opengl/GL3ES3.java javax/media/opengl/GL3.java javax/media/opengl/GL3bc.java javax/media/opengl/GL4ES3.java javax/media/opengl/GLES3.java javax/media/opengl/GL4.java javax/media/opengl/GL4bc.java" + includes="com/jogamp/opengl/fixedfunc/** com/jogamp/opengl/GLDrawableFactory.java com/jogamp/opengl/GLDrawable.java com/jogamp/opengl/GLContext.java com/jogamp/opengl/GL.java com/jogamp/opengl/GL2ES1.java com/jogamp/opengl/GLES1.java com/jogamp/opengl/GL2ES2.java com/jogamp/opengl/GLES2.java com/jogamp/opengl/GL2ES3.java com/jogamp/opengl/GL2GL3.java com/jogamp/opengl/GL2.java com/jogamp/opengl/GL3ES3.java com/jogamp/opengl/GL3.java com/jogamp/opengl/GL3bc.java com/jogamp/opengl/GL4ES3.java com/jogamp/opengl/GLES3.java com/jogamp/opengl/GL4.java com/jogamp/opengl/GL4bc.java" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" diff --git a/make/build-nativewindow.xml b/make/build-nativewindow.xml index 6a7ed8b95..a757c0f55 100644 --- a/make/build-nativewindow.xml +++ b/make/build-nativewindow.xml @@ -67,7 +67,7 @@ <!-- partitioning --> <property name="java.part.core" - value="javax/media/nativewindow/* javax/media/nativewindow/util/* com/jogamp/nativewindow/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/> + value="com/jogamp/nativewindow/* com/jogamp/nativewindow/util/* com/jogamp/nativewindow/egl/* com/jogamp/nativewindow/swt/** jogamp/nativewindow/*"/> <property name="java.part.awt" value="com/jogamp/nativewindow/awt/* jogamp/nativewindow/jawt/** jogamp/nativewindow/**/awt/**"/> @@ -150,8 +150,8 @@ <property name="javadoc.spec" value="${project.root}/javadoc_nativewindow_spec" /> <property name="javadoc.dev" value="${project.root}/javadoc_nativewindow_dev" /> <property name="javadoc.windowtitle" value="Native Windowing Interface (NativeWindow) API -- ${jogamp.version.base} Specification" /> - <property name="javadoc.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> - <property name="javadoc.spec.packagenames" value="javax.media.nativewindow.*" /> + <property name="javadoc.overview" value="../src/nativewindow/classes/com/jogamp/nativewindow/package.html" /> + <property name="javadoc.spec.packagenames" value="com.jogamp.nativewindow.*" /> <property name="javadoc.packagenames" value="${javadoc.spec.packagenames}" /> diff --git a/make/build.xml b/make/build.xml index 03a711c54..e2aa471c7 100644 --- a/make/build.xml +++ b/make/build.xml @@ -394,12 +394,12 @@ <property name="javadoc.overview" value="doc/jogl/spec-overview.html" /> - <property name="javadoc.nw.overview" value="../src/nativewindow/classes/javax/media/nativewindow/package.html" /> + <property name="javadoc.nw.overview" value="../src/nativewindow/classes/com/jogamp/nativewindow/package.html" /> <property name="javadoc.nw.spec.windowtitle" value="NativeWindow API -- ${jogamp.version.base} Specification" /> - <property name="javadoc.nw.spec.packagenames" value="javax.media.nativewindow.*" /> + <property name="javadoc.nw.spec.packagenames" value="com.jogamp.nativewindow.*" /> <property name="javadoc.spec.windowtitle" value="JOGL API -- ${jogamp.version.base} Specification" /> - <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> + <property name="javadoc.spec.packagenames" value="com.jogamp.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.graph.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.oculusvr.*" /> diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg index 62694da53..b30abf742 100644 --- a/make/config/jogl/egl-common.cfg +++ b/make/config/jogl/egl-common.cfg @@ -5,8 +5,8 @@ GLHeader EGL/eglext.h # Imports needed by all glue code Import java.util.* -Import javax.media.opengl.* -Import javax.media.opengl.fixedfunc.* +Import com.jogamp.opengl.* +Import com.jogamp.opengl.fixedfunc.* Import jogamp.opengl.* # Treat all of the EGL types as opaque longs diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index d5c45314e..9101d36c9 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -23,8 +23,8 @@ GLHeader GL/glext-20130207.h # Imports needed by all glue code Import java.util.* -Import javax.media.opengl.* -Import javax.media.opengl.fixedfunc.* +Import com.jogamp.opengl.* +Import com.jogamp.opengl.fixedfunc.* Import jogamp.opengl.* ##################################################################### diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index b66b18bfd..cc87a879e 100644 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -2,16 +2,16 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/es1 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java # There are a few routines we don't handle yet Ignore glGetBufferPointervOES -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceAndImpl JavaClass GLES1 #Extends GLES1 GLBase @@ -83,8 +83,8 @@ IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-gles1.java IncludeAs CustomJavaCode GLES1Impl gl-impl-CustomJavaCode-embedded.java IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c -Import javax.media.opengl.GLES1 -Import javax.media.opengl.GLES2 -Import javax.media.opengl.GL2 +Import com.jogamp.opengl.GLES1 +Import com.jogamp.opengl.GLES2 +Import com.jogamp.opengl.GL2 Import com.jogamp.common.nio.Buffers Import com.jogamp.opengl.util.GLBuffers diff --git a/make/config/jogl/gl-es3-impl.cfg b/make/config/jogl/gl-es3-impl.cfg index 00929765d..22acdbdeb 100644 --- a/make/config/jogl/gl-es3-impl.cfg +++ b/make/config/jogl/gl-es3-impl.cfg @@ -2,14 +2,14 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/es3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java Style ImplOnly ImplPackage jogamp.opengl.es3 @@ -73,15 +73,15 @@ IncludeAs CustomJavaCode GLES3Impl gl-impl-CustomJavaCode-embedded.java IncludeAs CustomJavaCode GLES3Impl gl-impl-CustomJavaCode-gl2_es2.java IncludeAs CustomCCode gl-impl-CustomCCode-gles3.c -Import javax.media.opengl.GLBase -Import javax.media.opengl.GL -Import javax.media.opengl.GL2ES2 -Import javax.media.opengl.GL2ES3 -Import javax.media.opengl.GL3ES3 -Import javax.media.opengl.GL4ES3 -Import javax.media.opengl.GLES3 -Import javax.media.opengl.GLArrayData -Import javax.media.opengl.GLUniformData +Import com.jogamp.opengl.GLBase +Import com.jogamp.opengl.GL +Import com.jogamp.opengl.GL2ES2 +Import com.jogamp.opengl.GL2ES3 +Import com.jogamp.opengl.GL3ES3 +Import com.jogamp.opengl.GL4ES3 +Import com.jogamp.opengl.GLES3 +Import com.jogamp.opengl.GLArrayData +Import com.jogamp.opengl.GLUniformData Import com.jogamp.common.nio.Buffers Import com.jogamp.opengl.util.GLBuffers Import java.io.PrintStream diff --git a/make/config/jogl/gl-gl4bc.cfg b/make/config/jogl/gl-gl4bc.cfg index 344b4776a..668fc3427 100644 --- a/make/config/jogl/gl-gl4bc.cfg +++ b/make/config/jogl/gl-gl4bc.cfg @@ -2,23 +2,23 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl4 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3bc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java - -Package javax.media.opengl +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3bc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java + +Package com.jogamp.opengl Style InterfaceAndImpl JavaClass GL4bc #Extends GL4bc GLBase @@ -163,18 +163,18 @@ IncludeAs CustomJavaCode GL4bcImpl gl-impl-CustomJavaCode-gl2_es2.java IncludeAs CustomCCode gl-impl-CustomCCode-gl4bc.c -Import javax.media.opengl.GLES1 -Import javax.media.opengl.GLES2 -Import javax.media.opengl.GL2ES1 -Import javax.media.opengl.GL2ES2 -Import javax.media.opengl.GL2ES3 -Import javax.media.opengl.GL3ES3 -Import javax.media.opengl.GL4ES3 -Import javax.media.opengl.GL2GL3 -Import javax.media.opengl.GL2 -Import javax.media.opengl.GL3 -Import javax.media.opengl.GL3bc -Import javax.media.opengl.GL4 +Import com.jogamp.opengl.GLES1 +Import com.jogamp.opengl.GLES2 +Import com.jogamp.opengl.GL2ES1 +Import com.jogamp.opengl.GL2ES2 +Import com.jogamp.opengl.GL2ES3 +Import com.jogamp.opengl.GL3ES3 +Import com.jogamp.opengl.GL4ES3 +Import com.jogamp.opengl.GL2GL3 +Import com.jogamp.opengl.GL2 +Import com.jogamp.opengl.GL3 +Import com.jogamp.opengl.GL3bc +Import com.jogamp.opengl.GL4 Import com.jogamp.common.nio.Buffers Import com.jogamp.opengl.util.GLBuffers Import java.io.PrintStream diff --git a/make/config/jogl/gl-if-es2.cfg b/make/config/jogl/gl-if-es2.cfg index 052722f40..23e392e9f 100644 --- a/make/config/jogl/gl-if-es2.cfg +++ b/make/config/jogl/gl-if-es2.cfg @@ -2,11 +2,11 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/es2 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GLES2 #Extends GLES2 GLBase diff --git a/make/config/jogl/gl-if-es3.cfg b/make/config/jogl/gl-if-es3.cfg index 66fd52597..80273e4cf 100644 --- a/make/config/jogl/gl-if-es3.cfg +++ b/make/config/jogl/gl-if-es3.cfg @@ -1,15 +1,15 @@ # This .cfg file is used to generate the GL interface. JavaOutputDir gensrc/classes -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GLES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GLES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GLES3 #Extends GLES3 GLBase diff --git a/make/config/jogl/gl-if-gl.cfg b/make/config/jogl/gl-if-gl.cfg index 5c9e4caa2..d552e5a31 100644 --- a/make/config/jogl/gl-if-gl.cfg +++ b/make/config/jogl/gl-if-gl.cfg @@ -1,10 +1,10 @@ # This .cfg file is used to generate the GL interface and implementing class. -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL Extends GL GLBase -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl2.cfg b/make/config/jogl/gl-if-gl2.cfg index 0120bd674..85c7cbe15 100644 --- a/make/config/jogl/gl-if-gl2.cfg +++ b/make/config/jogl/gl-if-gl2.cfg @@ -2,17 +2,17 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl2 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java - -Package javax.media.opengl +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java + +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2 #Extends GL2 GLBase diff --git a/make/config/jogl/gl-if-gl2_es1.cfg b/make/config/jogl/gl-if-gl2_es1.cfg index b533e83c3..1d517b731 100644 --- a/make/config/jogl/gl-if-gl2_es1.cfg +++ b/make/config/jogl/gl-if-gl2_es1.cfg @@ -1,5 +1,5 @@ # This .cfg file is used to generate the GL interface and implementing class. -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2ES1 #Extends GL2ES1 GLBase @@ -8,11 +8,11 @@ Extends GL2ES1 GLMatrixFunc Extends GL2ES1 GLPointerFunc Extends GL2ES1 GLLightingFunc -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg index db5489d06..3c4dbbb64 100644 --- a/make/config/jogl/gl-if-gl2_es2.cfg +++ b/make/config/jogl/gl-if-gl2_es2.cfg @@ -2,10 +2,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2ES2 #Extends GL2ES2 GLBase diff --git a/make/config/jogl/gl-if-gl2_es3.cfg b/make/config/jogl/gl-if-gl2_es3.cfg index 112bc5434..2390652c4 100644 --- a/make/config/jogl/gl-if-gl2_es3.cfg +++ b/make/config/jogl/gl-if-gl2_es3.cfg @@ -2,18 +2,18 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2ES3 #Extends GL2ES3 GLBase #Extends GL2ES3 GL Extends GL2ES3 GL2ES2 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2ES3Subset.java +ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/com/jogamp/opengl/GL2ES3Subset.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl2_gl3.cfg b/make/config/jogl/gl-if-gl2_gl3.cfg index 532a670e6..8e88a116e 100644 --- a/make/config/jogl/gl-if-gl2_gl3.cfg +++ b/make/config/jogl/gl-if-gl2_gl3.cfg @@ -1,5 +1,5 @@ # This .cfg file is used to generate the GL interface and implementing class. -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2GL3 #Extends GL2GL3 GLBase @@ -7,12 +7,12 @@ JavaClass GL2GL3 #Extends GL2GL3 GL2ES2 Extends GL2GL3 GL2ES3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/javax/media/opengl/GL2GL3Subset.java +ExtendedInterfaceSymbolsOnly ../build-temp/gluegen-set/com/jogamp/opengl/GL2GL3Subset.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl2es3-subset.cfg b/make/config/jogl/gl-if-gl2es3-subset.cfg index 3e325e065..a7ecdce8d 100644 --- a/make/config/jogl/gl-if-gl2es3-subset.cfg +++ b/make/config/jogl/gl-if-gl2es3-subset.cfg @@ -1,7 +1,7 @@ # This .cfg file is used to generate the common GL2 ES3 set JavaOutputDir ../../build-temp/gluegen-set -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2ES3Subset Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl2gl3-subset.cfg b/make/config/jogl/gl-if-gl2gl3-subset.cfg index ecb384ca3..1fae977e5 100644 --- a/make/config/jogl/gl-if-gl2gl3-subset.cfg +++ b/make/config/jogl/gl-if-gl2gl3-subset.cfg @@ -1,7 +1,7 @@ # This .cfg file is used to generate the common GL2 GL3 set JavaOutputDir ../../build-temp/gluegen-set -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL2GL3Subset Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl3.cfg b/make/config/jogl/gl-if-gl3.cfg index d472fbc29..3dbf86918 100644 --- a/make/config/jogl/gl-if-gl3.cfg +++ b/make/config/jogl/gl-if-gl3.cfg @@ -2,14 +2,14 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL3 #Extends GL3 GLBase diff --git a/make/config/jogl/gl-if-gl3_es3.cfg b/make/config/jogl/gl-if-gl3_es3.cfg index a25d9112a..16e194b80 100644 --- a/make/config/jogl/gl-if-gl3_es3.cfg +++ b/make/config/jogl/gl-if-gl3_es3.cfg @@ -2,7 +2,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL3ES3 #Extends GL3ES3 GLBase @@ -10,10 +10,10 @@ JavaClass GL3ES3 #Extends GL3ES3 GL2ES2 Extends GL3ES3 GL2ES3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-if-gl3bc.cfg b/make/config/jogl/gl-if-gl3bc.cfg index 5172c726c..7a1a1c7b3 100644 --- a/make/config/jogl/gl-if-gl3bc.cfg +++ b/make/config/jogl/gl-if-gl3bc.cfg @@ -2,20 +2,20 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES1.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLMatrixFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLPointerFunc.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java - -Package javax.media.opengl +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES1.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLMatrixFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLPointerFunc.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/fixedfunc/GLLightingFunc.java + +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL3bc #Extends GL3bc GLBase diff --git a/make/config/jogl/gl-if-gl4.cfg b/make/config/jogl/gl-if-gl4.cfg index 144c10ad2..07645ac26 100644 --- a/make/config/jogl/gl-if-gl4.cfg +++ b/make/config/jogl/gl-if-gl4.cfg @@ -2,16 +2,16 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl4 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL4ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2GL3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL4ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2GL3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL4 #Extends GL4 GLBase diff --git a/make/config/jogl/gl-if-gl4_es3.cfg b/make/config/jogl/gl-if-gl4_es3.cfg index 6233d530a..556be2b88 100644 --- a/make/config/jogl/gl-if-gl4_es3.cfg +++ b/make/config/jogl/gl-if-gl4_es3.cfg @@ -2,7 +2,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl -Package javax.media.opengl +Package com.jogamp.opengl Style InterfaceOnly JavaClass GL4ES3 #Extends GL4ES3 GLBase @@ -11,12 +11,12 @@ JavaClass GL4ES3 #Extends GL4ES3 GL2ES3 Extends GL4ES3 GL3ES3 -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES2.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL2ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3ES3.java -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/javax/media/opengl/GL3.java -ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/javax/media/opengl/GLBase.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES2.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL2ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3ES3.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/GL3.java +ExtendedInterfaceSymbolsIgnore ../src/jogl/classes/com/jogamp/opengl/GLBase.java HierarchicalNativeOutput false Include gl-common.cfg diff --git a/make/config/jogl/gl-impl-CustomJavaCode-common.java b/make/config/jogl/gl-impl-CustomJavaCode-common.java index 6db08efa7..503c125f0 100644 --- a/make/config/jogl/gl-impl-CustomJavaCode-common.java +++ b/make/config/jogl/gl-impl-CustomJavaCode-common.java @@ -88,7 +88,7 @@ } /** - * @see javax.media.opengl.GLContext#setSwapInterval(int) + * @see com.jogamp.opengl.GLContext#setSwapInterval(int) */ @Override public final void setSwapInterval(int interval) { @@ -96,7 +96,7 @@ } /** - * @see javax.media.opengl.GLContext#getSwapInterval() + * @see com.jogamp.opengl.GLContext#getSwapInterval() */ @Override public final int getSwapInterval() { diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index e8047d9d7..c6b892bf6 100644 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -84,8 +84,8 @@ static { Class _gl2es1Class=null; try { final ClassLoader cl = GLU.class.getClassLoader(); - _gl2Class = Class.forName("javax.media.opengl.glu.gl2.GLUgl2", false, cl); - _gl2es1Class = Class.forName("javax.media.opengl.glu.gl2es1.GLUgl2es1", false, cl); + _gl2Class = Class.forName("com.jogamp.opengl.glu.gl2.GLUgl2", false, cl); + _gl2es1Class = Class.forName("com.jogamp.opengl.glu.gl2es1.GLUgl2es1", false, cl); } catch (Throwable t) {} gl2Class = _gl2Class; gl2es1Class = _gl2es1Class; @@ -389,7 +389,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * * <b>GLU_TESS_BEGIN</b> * <UL> - * The begin callback is invoked like {@link javax.media.opengl.GL#glBegin + * The begin callback is invoked like {@link com.jogamp.opengl.GL#glBegin * glBegin} to indicate the start of a (triangle) primitive. The method * takes a single argument of type int. If the * <b>GLU_TESS_BOUNDARY_ONLY</b> property is set to <b>GL_FALSE</b>, then @@ -418,7 +418,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * <b>GLU_TESS_EDGE_FLAG</b> * <UL> * The edge flag callback is similar to - * {@link javax.media.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes + * {@link com.jogamp.opengl.GL#glEdgeFlag glEdgeFlag}. The method takes * a single boolean boundaryEdge that indicates which edges lie on the * polygon boundary. If the boundaryEdge is <b>GL_TRUE</b>, then each vertex * that follows begins an edge that lies on the polygon boundary, that is, @@ -453,7 +453,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * <b>GLU_TESS_VERTEX</b> * <UL> * The vertex callback is invoked between the begin and end callbacks. It is - * similar to {@link javax.media.opengl.GL#glVertex3f glVertex3f}, and it + * similar to {@link com.jogamp.opengl.GL#glVertex3f glVertex3f}, and it * defines the vertices of the triangles created by the tessellation * process. The method takes a reference as its only argument. This * reference is identical to the opaque reference provided by the user when @@ -480,7 +480,7 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * <b>GLU_TESS_END</b> * <UL> * The end callback serves the same purpose as - * {@link javax.media.opengl.GL#glEnd glEnd}. It indicates the end of a + * {@link com.jogamp.opengl.GL#glEnd glEnd}. It indicates the end of a * primitive and it takes no arguments. The method prototype for this * callback is: * </UL> @@ -638,9 +638,9 @@ public static final void gluTessNormal(GLUtessellator tessellator, double x, dou * @param aCallback * Specifies the callback object to be called. * - * @see javax.media.opengl.GL#glBegin glBegin - * @see javax.media.opengl.GL#glEdgeFlag glEdgeFlag - * @see javax.media.opengl.GL#glVertex3f glVertex3f + * @see com.jogamp.opengl.GL#glBegin glBegin + * @see com.jogamp.opengl.GL#glEdgeFlag glEdgeFlag + * @see com.jogamp.opengl.GL#glVertex3f glVertex3f * @see #gluNewTess gluNewTess * @see #gluErrorString gluErrorString * @see #gluTessVertex gluTessVertex diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg index 05aa2110e..542f8afef 100644 --- a/make/config/jogl/glu-base.cfg +++ b/make/config/jogl/glu-base.cfg @@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl Style ImplOnly -ImplPackage javax.media.opengl.glu +ImplPackage com.jogamp.opengl.glu ImplJavaClass GLU AccessControl GLU PUBLIC diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index 85d556b77..45535d21d 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -9,8 +9,8 @@ TagNativeBinding true # # Imports needed by all glue code # -Import javax.media.opengl.* -Import javax.media.opengl.glu.* +Import com.jogamp.opengl.* +Import com.jogamp.opengl.glu.* import com.jogamp.opengl.util.glsl.ShaderState Import jogamp.opengl.* Import jogamp.opengl.glu.* diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index 696e07050..c3a10a900 100644 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl2 Style ImplOnly -ImplPackage javax.media.opengl.glu.gl2 +ImplPackage com.jogamp.opengl.glu.gl2 ImplJavaClass GLUgl2 ParentClass GLUgl2 GLU @@ -24,10 +24,10 @@ CustomCCode #include <inttypes.h> CustomCCode #endif EmitProcAddressTable true -ProcAddressTablePackage javax.media.opengl.glu.gl2 +ProcAddressTablePackage com.jogamp.opengl.glu.gl2 ProcAddressTableClassName GLUgl2ProcAddressTable GetProcAddressTableExpr getGLUProcAddressTable() -AccessControl javax.media.opengl.glu.gl2.GLUgl2ProcAddressTable PACKAGE_PRIVATE +AccessControl com.jogamp.opengl.glu.gl2.GLUgl2ProcAddressTable PACKAGE_PRIVATE CustomCCode /* Include the OpenGL GLU header */ CustomCCode #include <GL/glu.h> @@ -45,7 +45,7 @@ Import com.jogamp.gluegen.runtime.opengl.GLProcAddressResolver Import jogamp.opengl.glu.gl2.nurbs.* Import jogamp.opengl.glu.mipmap.Mipmap Import jogamp.opengl.glu.gl2.* -Import javax.media.opengl.GL2 +Import com.jogamp.opengl.GL2 Import jogamp.opengl.gl2.ProjectDouble # diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg index ef9405fac..98217da1f 100644 --- a/make/config/jogl/glu-gl2es1.cfg +++ b/make/config/jogl/glu-gl2es1.cfg @@ -4,7 +4,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/gl2es1 Style ImplOnly -ImplPackage javax.media.opengl.glu.gl2es1 +ImplPackage com.jogamp.opengl.glu.gl2es1 ImplJavaClass GLUgl2es1 ParentClass GLUgl2es1 GLU @@ -20,7 +20,7 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java ManualStaticInitCall GLUgl2es1 -Import javax.media.opengl.GLES1 +Import com.jogamp.opengl.GLES1 Import jogamp.opengl.glu.mipmap.Mipmap diff --git a/make/config/nativewindow/win32-lib.cfg b/make/config/nativewindow/win32-lib.cfg index 26c744a80..9c60348d2 100644 --- a/make/config/nativewindow/win32-lib.cfg +++ b/make/config/nativewindow/win32-lib.cfg @@ -22,8 +22,8 @@ Opaque long HPBUFFERARB Opaque long HPBUFFEREXT Opaque long void ** -Import javax.media.nativewindow.util.Point -Import javax.media.nativewindow.NativeWindowException +Import com.jogamp.nativewindow.util.Point +Import com.jogamp.nativewindow.NativeWindowException Import jogamp.nativewindow.NWJNILibLoader import jogamp.nativewindow.Debug diff --git a/make/config/nativewindow/x11-lib.cfg b/make/config/nativewindow/x11-lib.cfg index ed8c13b54..8104b4697 100644 --- a/make/config/nativewindow/x11-lib.cfg +++ b/make/config/nativewindow/x11-lib.cfg @@ -12,7 +12,7 @@ NativeOutputDir gensrc/native/X11 # Imports needed by all glue code Import java.nio.* Import java.util.* -Import javax.media.nativewindow.util.Point +Import com.jogamp.nativewindow.util.Point # XID needs to be treated as a long for 32/64 bit compatibility Opaque long XID diff --git a/make/doc/jogl/spec-overview.html b/make/doc/jogl/spec-overview.html index 1a63fb7dd..a2c37e976 100644 --- a/make/doc/jogl/spec-overview.html +++ b/make/doc/jogl/spec-overview.html @@ -42,7 +42,7 @@ bindings to the native OpenGL(R) 3D graphics library profiles: <li> <a href="http://docs.oracle.com/javase/1.4.2/docs/api/java/nio/package-summary.html"> Java 1.4 <i>java.nio</i> implementation</a> </li> </ul></li> </ul></li> - <li> {@linkplain javax.media.nativewindow NativeWindow Protocol} + <li> {@linkplain com.jogamp.nativewindow NativeWindow Protocol} <p>The <i>NativeWindow Protocol</i> is included in JogAmp's implementation</p></li> </ul> <br> @@ -57,13 +57,13 @@ bindings to the native OpenGL(R) 3D graphics library profiles: The packages defined by this specification include:<br> <ul> - <li>The <b>javax.media.opengl</b> package<br> + <li>The <b>com.jogamp.opengl</b> package<br> <p>This package contains all Java bindings for all OpenGL profiles.</p> <p>See <a href="#GLAPIInclusionCriteria">Inclusion Criteria</a> explaining the OpenGL profile seperation.</p> <p>See <a href="#GLRuntimeVersion">OpenGL Runtime Requirements</a>.</p> <p>The main OpenGL profile interfaces are:</p> <ul> - <li> {@link javax.media.opengl.GL2 javax.media.opengl.GL2} interface + <li> {@link com.jogamp.opengl.GL2 com.jogamp.opengl.GL2} interface <p>This interface contains all OpenGL [ 1.0 .. 3.0 ] methods, as well as most of it's extensions defined at the time of this specification.</p> <p>OpenGL extensions whose functionality was incorporated into core OpenGL ≤ 3.0, @@ -73,7 +73,7 @@ bindings to the native OpenGL(R) 3D graphics library profiles: <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GL3 javax.media.opengl.GL3} interface + <li> {@link com.jogamp.opengl.GL3 com.jogamp.opengl.GL3} interface <p>This interface contains all OpenGL [ 3.1 .. 3.3 ] <i>core</i> methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Note: OpenGL [ 3.1 .. 3.3 ] core profile does not includes fixed point functionality.</p> @@ -82,40 +82,40 @@ bindings to the native OpenGL(R) 3D graphics library profiles: <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GL3bc javax.media.opengl.GL3bc} interface + <li> {@link com.jogamp.opengl.GL3bc com.jogamp.opengl.GL3bc} interface <p>This interface contains all OpenGL [ 3.1 .. 3.3 ] <i>compatibility</i> methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Note: OpenGL [ 3.1 .. 3.3 ] compatibility profile does includes fixed point functionality.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GL4 javax.media.opengl.GL4} interface + <li> {@link com.jogamp.opengl.GL4 com.jogamp.opengl.GL4} interface <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>core</i> methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Note: OpenGL [ 4.0 .. 4.3 ] core profile does not includes fixed point functionality.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GL4bc javax.media.opengl.GL4bc} interface + <li> {@link com.jogamp.opengl.GL4bc com.jogamp.opengl.GL4bc} interface <p>This interface contains all OpenGL [ 4.0 .. 4.3 ] <i>compatibility</i> profile, as well as most of it's extensions defined at the time of this specification.</p> <p>Note: OpenGL [ 4.0 .. 4.3 ] compatibility profile does includes fixed point functionality.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GLES1 javax.media.opengl.GLES1} interface + <li> {@link com.jogamp.opengl.GLES1 com.jogamp.opengl.GLES1} interface <p>This interface contains all OpenGL ES [ 1.0 .. 1.1 ] methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GLES2 javax.media.opengl.GLES2} interface + <li> {@link com.jogamp.opengl.GLES2 com.jogamp.opengl.GLES2} interface <p>This interface contains all OpenGL ES 2.0 methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> </li> - <li> {@link javax.media.opengl.GLES3 javax.media.opengl.GLES3} interface + <li> {@link com.jogamp.opengl.GLES3 com.jogamp.opengl.GLES3} interface <p>This interface contains all OpenGL ES 3.0 methods, as well as most of it's extensions defined at the time of this specification.</p> <p>Future extensions will be added with a <a href="#maintenanceupdates">maintenance update</a></p> @@ -125,39 +125,39 @@ bindings to the native OpenGL(R) 3D graphics library profiles: These <i>common profiles</i> may be utilize for cross profile code supposed to either run on desktop and mobile devices, or across GL profiles themselves:</p> <ul> - <li> {@link javax.media.opengl.GLBase javax.media.opengl.GLBase} interface + <li> {@link com.jogamp.opengl.GLBase com.jogamp.opengl.GLBase} interface <p>Common interface containing the profile type identification and conversion methods.</p> <p>Used to query which specialized profile class an instance of this object actually is and offering a protocol to convert it to these types.</p></li> - <li> {@link javax.media.opengl.GL javax.media.opengl.GL} interface + <li> {@link com.jogamp.opengl.GL com.jogamp.opengl.GL} interface <p>Common interface containing the subset of all profiles, GL4bc, GL4, GL3bc, GL3, GL2, GLES1, GLES2 and GLES3.</p> <p>This interface reflects common data types, texture and framebuffer functionality.</p></li> - <li> {@link javax.media.opengl.GL2ES1 javax.media.opengl.GL2ES1} interface + <li> {@link com.jogamp.opengl.GL2ES1 com.jogamp.opengl.GL2ES1} interface <p>Interface containing the common subset of GL2 and GLES1.</p> <p>This interface reflects the fixed functionality of OpenGL, without the immediate mode API.</p></li> - <li> {@link javax.media.opengl.GL2ES2 javax.media.opengl.GL2ES2} interface + <li> {@link com.jogamp.opengl.GL2ES2 com.jogamp.opengl.GL2ES2} interface <p>Interface containing the common subset of GL2 and GLES2. Interface is almost GLES2 complete.</p> <p>This interface reflects the programmable shader functionality of desktop and embedded OpenGL up until GLES2.</p></li> - <li> {@link javax.media.opengl.GL3ES3 javax.media.opengl.GL3ES3} interface + <li> {@link com.jogamp.opengl.GL3ES3 com.jogamp.opengl.GL3ES3} interface <p>Interface containing the common subset of core GL3 and GLES3. Interface is almost GLES3 complete, lacking <code>GL_ARB_ES3_compatibility</code> extension.</p> <p>This interface reflects the programmable shader functionality of desktop and embedded OpenGL up until GLES3.</p></li> - <li> {@link javax.media.opengl.GL4ES3 javax.media.opengl.GL4ES3} interface + <li> {@link com.jogamp.opengl.GL4ES3 com.jogamp.opengl.GL4ES3} interface <p>Interface containing the common subset of core GL4 and GLES3. Interface is GLES3 complete w/o vendor extensions.</p> <p>This interface reflects the programmable shader functionality of desktop and embedded OpenGL up until GLES3.</p></li> - <li> {@link javax.media.opengl.GL2GL3 javax.media.opengl.GL2GL3} interface + <li> {@link com.jogamp.opengl.GL2GL3 com.jogamp.opengl.GL2GL3} interface <p>Interface containing the common subset of core GL3 (OpenGL 3.1+) and GL2 (OpenGL 3.0), also known as the OpenGL 3.0 forward compatible, non deprecated subset.</p> <p>This interface reflects only the programmable shader functionality of desktop OpenGL</p></li> </ul> </li> - <li>The <b>javax.media.opengl.glu</b> package + <li>The <b>com.jogamp.opengl.glu</b> package <p> This package contains bindings for the OpenGL Graphics System Utility (GLU) Library version 1.3, inclusive, with the exception of the GLU NURBS routines @@ -172,7 +172,7 @@ experience. <p> The rules for creating the Java language binding are described in the following sections. These rules should be followed as closely as possible for all future -APIs that share the javax.media.opengl namespace.</p> +APIs that share the com.jogamp.opengl namespace.</p> <h4>Function Naming</h4> Functions are named in the same way as in the C binding. That is, an OpenGL @@ -333,7 +333,7 @@ Sharing of server-side OpenGL objects such as buffer objects, e.g. VBOs, and textures among OpenGL contexts is supported in this specification. <p> -See {@link javax.media.opengl.GLSharedContextSetter GLSharedContextSetter} interface +See {@link com.jogamp.opengl.GLSharedContextSetter GLSharedContextSetter} interface for details. </p> @@ -344,7 +344,7 @@ for details. according the following rules: </p> <ul> - <li><a name="GL3InclusionCriteria">{@link javax.media.opengl.GL3 javax.media.opengl.GL3} interface</a> + <li><a name="GL3InclusionCriteria">{@link com.jogamp.opengl.GL3 com.jogamp.opengl.GL3} interface</a> <ul> <li>All functions in core, forward compatible, OpenGL [ 3.1 - 3.3 ], inclusive, have been included, as described in the header files <code>GL/glcorearb.h</code>.</li> @@ -362,7 +362,7 @@ according the following rules: </p> <li> OpenGL 3.2 Spec Appendix E.1: It is not possible to implement both core and compatibility profiles in a single GL context, ..</li> </ul></li> </ul></li> - <li><a name="GL2InclusionCriteria"> {@link javax.media.opengl.GL2 javax.media.opengl.GL2} interface</a> + <li><a name="GL2InclusionCriteria"> {@link com.jogamp.opengl.GL2 com.jogamp.opengl.GL2} interface</a> <ul> <li>All functions in core OpenGL 3.0, inclusive, have been included.</li> <li>Reason for making the <em>cut</em> at OpenGL 3.0 are: @@ -439,13 +439,13 @@ implementation. <h3><a name="GLRuntimeVersion">OpenGL Version on Runtime System</a></h3> -<h4><a name="GL4RuntimeVersion">{@link javax.media.opengl.GL4 GL4} Desktop Requirements</a></h4> +<h4><a name="GL4RuntimeVersion">{@link com.jogamp.opengl.GL4 GL4} Desktop Requirements</a></h4> An OpenGL ≥ 4.0 version is required to instantiate a GL4 context. -<h4><a name="GL3RuntimeVersion">{@link javax.media.opengl.GL3 GL3} Desktop Requirements</a></h4> +<h4><a name="GL3RuntimeVersion">{@link com.jogamp.opengl.GL3 GL3} Desktop Requirements</a></h4> An OpenGL ≥ 3.1 version is required to instantiate a GL3 context. -<h4><a name="GL2RuntimeVersion">{@link javax.media.opengl.GL2 GL2} Desktop Requirements</a></h4> +<h4><a name="GL2RuntimeVersion">{@link com.jogamp.opengl.GL2 GL2} Desktop Requirements</a></h4> Even though OpenGL extensions whose functionality was included into core OpenGL by version 3.0, inclusive, are not included in the bindings, it should be noted that OpenGL version 3.0 is not an absolute requirement on the runtime @@ -460,13 +460,13 @@ the presence of at least OpenGL 1.5 on the target system. due to it's dynamical function binding starting with OpenGL 1.2.</p> <p>In future revisions of the API, this minimum standard may be raised.</p> -<h4><a name="GLES3RuntimeVersion">{@link javax.media.opengl.GLES3 GLES3} Requirements</a></h4> +<h4><a name="GLES3RuntimeVersion">{@link com.jogamp.opengl.GLES3 GLES3} Requirements</a></h4> An OpenGL ES ≥ 3.0 version is required to instantiate an ES3 context. -<h4><a name="GLES2RuntimeVersion">{@link javax.media.opengl.GLES2 GLES2} Requirements</a></h4> +<h4><a name="GLES2RuntimeVersion">{@link com.jogamp.opengl.GLES2 GLES2} Requirements</a></h4> An OpenGL ES ≥ 2.0 version is required to instantiate an ES2 context. -<h4><a name="GLES1RuntimeVersion">{@link javax.media.opengl.GLES1 GLES1} Requirements</a></h4> +<h4><a name="GLES1RuntimeVersion">{@link com.jogamp.opengl.GLES1 GLES1} Requirements</a></h4> An OpenGL ES [ 1.0 .. 1.1 ] version is required to instantiate an ES1 context. <h3><a name="RuntimeVersionInformation">Runtime Version Information</a></h3> @@ -485,7 +485,7 @@ the build date and source code repository branch name and it's latest commit ide <h3><a name="maintenanceupdates">Future Maintenance Updates</a></h3> New core APIs found in future versions of OpenGL, as well as new OpenGL extensions, are expected to be added to the bindings and included into the -javax.media.opengl namespace via future maintenance updates to the API. +com.jogamp.opengl namespace via future maintenance updates to the API. <h3>Related Links</h3> <ul> diff --git a/make/joglversion b/make/joglversion index 4e53b8de0..ded0fb106 100644 --- a/make/joglversion +++ b/make/joglversion @@ -10,7 +10,7 @@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community Implementation-URL: http://jogamp.org/ -Extension-Name: javax.media.opengl +Extension-Name: com.jogamp.opengl Implementation-Vendor-Id: com.jogamp Trusted-Library: true Permissions: all-permissions diff --git a/make/joglversion-all b/make/joglversion-all index 4e53b8de0..ded0fb106 100644 --- a/make/joglversion-all +++ b/make/joglversion-all @@ -10,7 +10,7 @@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community Implementation-URL: http://jogamp.org/ -Extension-Name: javax.media.opengl +Extension-Name: com.jogamp.opengl Implementation-Vendor-Id: com.jogamp Trusted-Library: true Permissions: all-permissions diff --git a/make/nativewindowversion b/make/nativewindowversion index f31c7f2bc..7c047a631 100644 --- a/make/nativewindowversion +++ b/make/nativewindowversion @@ -10,7 +10,7 @@ Implementation-Branch: @SCM_BRANCH@ Implementation-Commit: @SCM_COMMIT@ Implementation-Vendor: JogAmp Community Implementation-URL: http://jogamp.org/ -Extension-Name: javax.media.nativewindow +Extension-Name: com.jogamp.nativewindow Implementation-Vendor-Id: com.jogamp Trusted-Library: true Permissions: all-permissions diff --git a/make/resources/android/AndroidManifest-jogl.xml b/make/resources/android/AndroidManifest-jogl.xml index 1b6c46356..76872b69e 100644 --- a/make/resources/android/AndroidManifest-jogl.xml +++ b/make/resources/android/AndroidManifest-jogl.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" sharedUserId="com.jogamp.Community" - package="javax.media.opengl"> + package="com.jogamp.opengl"> <uses-feature android:name="android.hardware.touchscreen" android:required="false" /> <uses-feature android:name="android.hardware.camera" android:required="false" /> diff --git a/make/resources/android/AndroidManifest-test.xml b/make/resources/android/AndroidManifest-test.xml index 916f34e05..3238c2280 100644 --- a/make/resources/android/AndroidManifest-test.xml +++ b/make/resources/android/AndroidManifest-test.xml @@ -8,7 +8,7 @@ <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> <uses-library android:name="com.jogamp.common" android:required="true" /> - <uses-library android:name="javax.media.opengl" android:required="true" /> + <uses-library android:name="com.jogamp.opengl" android:required="true" /> <uses-library android:name="jogamp.android.launcher" android:required="true" /> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="14"/> diff --git a/make/scripts/adb-launch-junit.sh b/make/scripts/adb-launch-junit.sh index e53e76456..6780f9fa6 100644 --- a/make/scripts/adb-launch-junit.sh +++ b/make/scripts/adb-launch-junit.sh @@ -60,7 +60,7 @@ LOGFILE=`basename $0 .sh`.log #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk -#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall javax.media.opengl +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jar/jogl-all-android-armeabi.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl.test diff --git a/make/scripts/adb-launch-main.sh b/make/scripts/adb-launch-main.sh index 12dcab1e4..0068ef7dd 100644 --- a/make/scripts/adb-launch-main.sh +++ b/make/scripts/adb-launch-main.sh @@ -51,7 +51,7 @@ LOGFILE=`basename $0 .sh`.log #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jogamp-android-launcher.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/gluegen-rt-android-armeabi.apk -#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall javax.media.opengl +#adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl #adb -s $TARGET_IP:$TARGET_ADB_PORT install $BUILD_DIR/jar/jogl-all-android-armeabi.apk #adb -s $TARGET_IP:$TARGET_ADB_PORT uninstall com.jogamp.opengl.test diff --git a/make/scripts/adb-uninstall-all.sh b/make/scripts/adb-uninstall-all.sh index a80c38f61..ba9d603bc 100755 --- a/make/scripts/adb-uninstall-all.sh +++ b/make/scripts/adb-uninstall-all.sh @@ -1,4 +1,4 @@ #adb $* uninstall jogamp.android.launcher #adb $* uninstall com.jogamp.common -adb $* uninstall javax.media.opengl +adb $* uninstall com.jogamp.opengl adb $* uninstall com.jogamp.opengl.test diff --git a/make/scripts/cmpOld2New.sh b/make/scripts/cmpOld2New.sh index 4a121a632..a9475523e 100755 --- a/make/scripts/cmpOld2New.sh +++ b/make/scripts/cmpOld2New.sh @@ -2,8 +2,8 @@ dirscript=`dirname $0` -dirold=../build-old/jogl/gensrc/classes/javax/media/opengl/ -dirnew=../build/jogl/gensrc/classes/javax/media/opengl/ +dirold=../build-old/jogl/gensrc/classes/com/jogamp/opengl/ +dirnew=../build/jogl/gensrc/classes/com/jogamp/opengl/ dircmp=cmp-old2new rm -rf $dircmp diff --git a/make/scripts/lsGL23_commons.sh b/make/scripts/lsGL23_commons.sh index cab55639b..ec16fa209 100755 --- a/make/scripts/lsGL23_commons.sh +++ b/make/scripts/lsGL23_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GL2ES2.java $idir/GL2GL3.java $idir/GL3.java" diff --git a/make/scripts/lsGL23_unique.sh b/make/scripts/lsGL23_unique.sh index e21112ecc..560a3e4cd 100755 --- a/make/scripts/lsGL23_unique.sh +++ b/make/scripts/lsGL23_unique.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GLES2.java $idir/GL2ES2.java $idir/GL3.java $idir/GL2.java $idir/GL2GL3.java" diff --git a/make/scripts/lsGL23toGL2ES1_commons.sh b/make/scripts/lsGL23toGL2ES1_commons.sh index 83a543b3c..b5439ac33 100755 --- a/make/scripts/lsGL23toGL2ES1_commons.sh +++ b/make/scripts/lsGL23toGL2ES1_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL2GL3 to GL2ES1 enums # sort $idir/GL2.java $idir/GL3.java $idir/GL2ES1.java $idir/GL2GL3.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGL2_GL3_commons.sh b/make/scripts/lsGL2_GL3_commons.sh index 722ba850d..b0ebbdae3 100755 --- a/make/scripts/lsGL2_GL3_commons.sh +++ b/make/scripts/lsGL2_GL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl SOURCE="$idir/GL.java $idir/GL2ES2.java $idir/GL2GL3.java $idir/GL2.java $idir/GL3.java" diff --git a/make/scripts/lsGLES2toGL3_commons.sh b/make/scripts/lsGLES2toGL3_commons.sh index d271b7ea2..aa65c8cfe 100755 --- a/make/scripts/lsGLES2toGL3_commons.sh +++ b/make/scripts/lsGLES2toGL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GLES2 to GL3 enums sort $idir/GLES2.java $idir/GL3.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES1ES2_commons.sh b/make/scripts/lsGLtoES1ES2_commons.sh index 21efb6549..eece3d25a 100755 --- a/make/scripts/lsGLtoES1ES2_commons.sh +++ b/make/scripts/lsGLtoES1ES2_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES1 to GL2ES1 GL2 enums sort $idir/GL.java $idir/GL2ES1.java $idir/GL2ES2.java $idir/GL2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES1_commons.sh b/make/scripts/lsGLtoES1_commons.sh index e8a370acb..ba72ecc23 100755 --- a/make/scripts/lsGLtoES1_commons.sh +++ b/make/scripts/lsGLtoES1_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES1 to GLES1 enums sort $idir/GL.java $idir/GLES1.java $idir/GL2ES1.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoES2_commons.sh b/make/scripts/lsGLtoES2_commons.sh index bbd0e239c..ade2ff110 100755 --- a/make/scripts/lsGLtoES2_commons.sh +++ b/make/scripts/lsGLtoES2_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES2 to GLES2 enums sort $idir/GL.java $idir/GLES2.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/lsGLtoGL3_commons.sh b/make/scripts/lsGLtoGL3_commons.sh index 44cc34ccd..a2126ce79 100755 --- a/make/scripts/lsGLtoGL3_commons.sh +++ b/make/scripts/lsGLtoGL3_commons.sh @@ -7,7 +7,7 @@ if [ -z "$BUILDDIR" ] ; then exit 1 fi -idir=$BUILDDIR/jogl/gensrc/classes/javax/media/opengl +idir=$BUILDDIR/jogl/gensrc/classes/com/jogamp/opengl echo GL to GL2ES2 to GL3 enums sort $idir/GL.java $idir/GL3.java $idir/GL2ES2.java | uniq -d | grep GL_ | awk ' { print $5 } ' diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 84a937bee..8a94a0fa2 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -1,6 +1,6 @@ REM scripts\java-win.bat jogamp.newt.awt.opengl.VersionApplet REM scripts\java-win.bat com.jogamp.newt.opengl.GLWindow -REM scripts\java-win.bat javax.media.opengl.awt.GLCanvas +REM scripts\java-win.bat com.jogamp.awt.GLCanvas REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT %* REM scripts\java-win.bat com.jogamp.oculusvr.OVRVersion %* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index e73bf53ce..be930d3f6 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -389,7 +389,7 @@ function testawtswt() { # Version # #testawt jogamp.newt.awt.opengl.VersionApplet $* -#testawt javax.media.opengl.awt.GLCanvas $* +#testawt com.jogamp.opengl.awt.GLCanvas $* #testnoawt com.jogamp.nativewindow.NativeWindowVersion $* #testnoawt com.jogamp.opengl.JoglVersion $* #testnoawt com.jogamp.newt.NewtVersion $* diff --git a/make/validate-properties.xml b/make/validate-properties.xml index 3afb12bd5..a1ff589e0 100644 --- a/make/validate-properties.xml +++ b/make/validate-properties.xml @@ -30,7 +30,7 @@ - we can not overwrite it. --> <target name="java.class.path.validate"> - <available property="jogl.jar.on.class.path" classname="javax.media.opengl.GL" /> + <available property="jogl.jar.on.class.path" classname="com.jogamp.opengl.GL" /> <fail if="jogl.jar.on.class.path"> ****************************************************************** |