diff options
Diffstat (limited to 'make/config/jogl')
32 files changed, 85 insertions, 85 deletions
diff --git a/make/config/jogl/cg-common-CustomJavaCode.java b/make/config/jogl/cg-common-CustomJavaCode.java index 1f109d9f6..974e24bf4 100755 --- a/make/config/jogl/cg-common-CustomJavaCode.java +++ b/make/config/jogl/cg-common-CustomJavaCode.java @@ -1,5 +1,5 @@ static { - com.sun.opengl.impl.NativeLibLoader.loadCgImpl(); + com.jogamp.opengl.impl.NativeLibLoader.loadCgImpl(); } /** A convenience method which reads all available data from the InputStream and then calls cgCreateProgram. */ diff --git a/make/config/jogl/cg-common.cfg b/make/config/jogl/cg-common.cfg index 9b8dba079..e9ff9d907 100644 --- a/make/config/jogl/cg-common.cfg +++ b/make/config/jogl/cg-common.cfg @@ -1,6 +1,6 @@ # This .cfg file provides common options used among all Cg glue code # generated for Jogl on all platforms. -Package com.sun.opengl.cg +Package com.jogamp.opengl.cg JavaClass CgGL Style AllStatic JavaOutputDir gensrc/classes @@ -97,7 +97,7 @@ Ignore cgGetProgramOptions # Import java.nio.* # And NativeLibLoader for help loading the native libraries -Import com.sun.opengl.impl.* +Import com.jogamp.opengl.impl.* # # NIODirectOnly directives for routines requiring them for semantic reasons diff --git a/make/config/jogl/cgl-macosx.cfg b/make/config/jogl/cgl-macosx.cfg index 54b4be171..f2af29e00 100644 --- a/make/config/jogl/cgl-macosx.cfg +++ b/make/config/jogl/cgl-macosx.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.sun.opengl.impl.macosx.cgl +Package com.jogamp.opengl.impl.macosx.cgl JavaClass CGL Style allstatic Include gl-common.cfg diff --git a/make/config/jogl/cglext.cfg b/make/config/jogl/cglext.cfg index 3bd027c84..404a852b0 100755 --- a/make/config/jogl/cglext.cfg +++ b/make/config/jogl/cglext.cfg @@ -6,10 +6,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/MacOSX -Package com.sun.opengl.impl.macosx.cgl +Package com.jogamp.opengl.impl.macosx.cgl Style InterfaceAndImpl JavaClass CGLExt -ImplPackage com.sun.opengl.impl.macosx.cgl +ImplPackage com.jogamp.opengl.impl.macosx.cgl ImplJavaClass CGLExtImpl Include gl-common.cfg Include gl-desktop.cfg diff --git a/make/config/jogl/egl-common.cfg b/make/config/jogl/egl-common.cfg index bcda00b07..01b681b87 100644 --- a/make/config/jogl/egl-common.cfg +++ b/make/config/jogl/egl-common.cfg @@ -8,7 +8,7 @@ Import java.nio.* Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.sun.opengl.impl.* +Import com.jogamp.opengl.impl.* # Treat all of the EGL types as opaque longs # Opaque long EGLConfig diff --git a/make/config/jogl/egl.cfg b/make/config/jogl/egl.cfg index 086152b4f..74047072b 100755 --- a/make/config/jogl/egl.cfg +++ b/make/config/jogl/egl.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.sun.opengl.impl.egl +Package com.jogamp.opengl.impl.egl JavaClass EGL Style allstatic # Shouldn't matter which one of these we pick up @@ -47,4 +47,4 @@ CustomJavaCode EGL return dispatch_eglGetProcAddress1(procname, eglGetProcAdd CustomJavaCode EGL } -Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper +Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper diff --git a/make/config/jogl/eglext.cfg b/make/config/jogl/eglext.cfg index fedff35e9..40239371d 100755 --- a/make/config/jogl/eglext.cfg +++ b/make/config/jogl/eglext.cfg @@ -3,15 +3,15 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/egl -Package com.sun.opengl.impl.egl +Package com.jogamp.opengl.impl.egl Style InterfaceAndImpl JavaClass EGLExt -ImplPackage com.sun.opengl.impl.egl +ImplPackage com.jogamp.opengl.impl.egl ImplJavaClass EGLExtImpl # Shouldn't matter which one of these we pick up Include egl-common.cfg -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/egl/EGL.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/egl/EGL.java HierarchicalNativeOutput false diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index d9d66323a..022c272df 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -12,7 +12,7 @@ Import java.nio.* Import java.util.* Import javax.media.opengl.* Import javax.media.opengl.fixedfunc.* -Import com.sun.opengl.impl.* +Import com.jogamp.opengl.impl.* ##################################################################### # Mostly desktop OpenGL stuff below diff --git a/make/config/jogl/gl-es1.cfg b/make/config/jogl/gl-es1.cfg index 867ef8a83..da2267186 100755 --- a/make/config/jogl/gl-es1.cfg +++ b/make/config/jogl/gl-es1.cfg @@ -17,7 +17,7 @@ JavaClass GLES1 Extends GLES1 GLBase Extends GLES1 GL Extends GLES1 GL2ES1 -ImplPackage com.sun.opengl.impl.es1 +ImplPackage com.jogamp.opengl.impl.es1 ImplJavaClass GLES1Impl Implements GLES1Impl GLBase Implements GLES1Impl GL @@ -97,4 +97,4 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gles1.c Import javax.media.opengl.GLES1 Import javax.media.opengl.GLES2 Import javax.media.opengl.GL2 -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil diff --git a/make/config/jogl/gl-es2.cfg b/make/config/jogl/gl-es2.cfg index f78001dee..fd11ffcf0 100755 --- a/make/config/jogl/gl-es2.cfg +++ b/make/config/jogl/gl-es2.cfg @@ -12,7 +12,7 @@ JavaClass GLES2 Extends GLES2 GLBase Extends GLES2 GL Extends GLES2 GL2ES2 -ImplPackage com.sun.opengl.impl.es2 +ImplPackage com.jogamp.opengl.impl.es2 ImplJavaClass GLES2Impl Implements GLES2Impl GLBase Implements GLES2Impl GL @@ -79,6 +79,6 @@ Import javax.media.opengl.GLES2 Import javax.media.opengl.GL2 Import javax.media.opengl.GLArrayData Import javax.media.opengl.GLUniformData -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil Import java.io.PrintStream diff --git a/make/config/jogl/gl-gl2.cfg b/make/config/jogl/gl-gl2.cfg index 820243ff5..37452d159 100644 --- a/make/config/jogl/gl-gl2.cfg +++ b/make/config/jogl/gl-gl2.cfg @@ -19,7 +19,7 @@ Extends GL2 GL Extends GL2 GL2ES1 Extends GL2 GL2ES2 Extends GL2 GL2GL3 -ImplPackage com.sun.opengl.impl.gl2 +ImplPackage com.jogamp.opengl.impl.gl2 ImplJavaClass GL2Impl Implements GL2Impl GLBase Implements GL2Impl GL @@ -79,5 +79,5 @@ Import javax.media.opengl.GLES2 Import javax.media.opengl.GL2 Import javax.media.opengl.GLArrayData Import javax.media.opengl.GLUniformData -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil Import java.io.PrintStream diff --git a/make/config/jogl/gl-gl2es12.cfg b/make/config/jogl/gl-gl2es12.cfg index 232116a61..3942b1419 100644 --- a/make/config/jogl/gl-gl2es12.cfg +++ b/make/config/jogl/gl-gl2es12.cfg @@ -11,7 +11,7 @@ ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GL ExtendedInterfaceSymbolsOnly ../src/jogl/classes/javax/media/opengl/fixedfunc/GLLightingFunc.java Style ImplOnly -ImplPackage com.sun.opengl.impl.gl2es12 +ImplPackage com.jogamp.opengl.impl.gl2es12 ImplJavaClass GL2ES12Impl Implements GL2ES12Impl GLBase Implements GL2ES12Impl GL @@ -86,5 +86,5 @@ IncludeAs CustomCCode gl-impl-CustomCCode-gl2es12.c Import javax.media.opengl.GLES1 Import javax.media.opengl.GLES2 -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil Import java.io.PrintStream diff --git a/make/config/jogl/gl-gl3.cfg b/make/config/jogl/gl-gl3.cfg index 9f0ea05a8..0bfe2cc38 100644 --- a/make/config/jogl/gl-gl3.cfg +++ b/make/config/jogl/gl-gl3.cfg @@ -14,7 +14,7 @@ Extends GL3 GLBase Extends GL3 GL Extends GL3 GL2ES2 Extends GL3 GL2GL3 -ImplPackage com.sun.opengl.impl.gl3 +ImplPackage com.jogamp.opengl.impl.gl3 ImplJavaClass GL3Impl Implements GL3Impl GLBase Implements GL3Impl GL @@ -70,5 +70,5 @@ Import javax.media.opengl.GLES2 Import javax.media.opengl.GL3 Import javax.media.opengl.GLArrayData Import javax.media.opengl.GLUniformData -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil Import java.io.PrintStream diff --git a/make/config/jogl/gl-gl3bc.cfg b/make/config/jogl/gl-gl3bc.cfg index d2525735e..a637df941 100644 --- a/make/config/jogl/gl-gl3bc.cfg +++ b/make/config/jogl/gl-gl3bc.cfg @@ -23,7 +23,7 @@ Extends GL3bc GL2ES2 Extends GL3bc GL2GL3 Extends GL3bc GL2 Extends GL3bc GL3 -ImplPackage com.sun.opengl.impl.gl3 +ImplPackage com.jogamp.opengl.impl.gl3 ImplJavaClass GL3bcImpl Implements GL3bcImpl GLBase Implements GL3bcImpl GL @@ -97,5 +97,5 @@ Import javax.media.opengl.GL2GL3 Import javax.media.opengl.GL2 Import javax.media.opengl.GL3 Import javax.media.opengl.GL3bc -Import com.sun.opengl.impl.InternalBufferUtil +Import com.jogamp.opengl.impl.InternalBufferUtil Import java.io.PrintStream diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2.c b/make/config/jogl/gl-impl-CustomCCode-gl2.c index f97b8eaff..91fd0078b 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl2.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl2.GL2Impl + * Java package: com.jogamp.opengl.impl.gl2.GL2Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl2_GL2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject } /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl2.GL2Impl + * Java package: com.jogamp.opengl.impl.gl2.GL2Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_gl2_GL2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_gl2_GL2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c index e2d5cb58d..07b821802 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl2es12.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl2es12.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl + * Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_dispatch_1glMapBuffer(JNIEnv *env, } /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl2es12.GL2ES12Impl + * Java package: com.jogamp.opengl.impl.gl2es12.GL2ES12Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_gl2es12_GL2ES12Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_gl2es12_GL2ES12Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3.c b/make/config/jogl/gl-impl-CustomCCode-gl3.c index a5f78a460..f540a7d4a 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl3.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl3.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl3.GL3Impl + * Java package: com.jogamp.opengl.impl.gl3.GL3Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl3_GL3Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject } /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl3.GL3Impl + * Java package: com.jogamp.opengl.impl.gl3.GL3Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_gl3_GL3Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c index a69204198..21de8c925 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gl3bc.c +++ b/make/config/jogl/gl-impl-CustomCCode-gl3bc.c @@ -1,10 +1,10 @@ /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl3.GL3bcImpl + * Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -14,11 +14,11 @@ Java_com_sun_opengl_impl_gl3_GL3bcImpl_dispatch_1glMapBuffer(JNIEnv *env, jobjec } /* Java->C glue code: - * Java package: com.sun.opengl.impl.gl3.GL3bcImpl + * Java package: com.jogamp.opengl.impl.gl3.GL3bcImpl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_gl3_GL3bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_gl3_GL3bcImpl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles1.c b/make/config/jogl/gl-impl-CustomCCode-gles1.c index efc614e64..a71ca4aae 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles1.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles1.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.sun.opengl.impl.es1.GLES1Impl + * Java package: com.jogamp.opengl.impl.es1.GLES1Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_sun_opengl_impl_es1_GLES1Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec } /* Java->C glue code: - * Java package: com.sun.opengl.impl.es1.GLES1Impl + * Java package: com.jogamp.opengl.impl.es1.GLES1Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_es1_GLES1Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/gl-impl-CustomCCode-gles2.c b/make/config/jogl/gl-impl-CustomCCode-gles2.c index 27be04749..f99822d65 100644 --- a/make/config/jogl/gl-impl-CustomCCode-gles2.c +++ b/make/config/jogl/gl-impl-CustomCCode-gles2.c @@ -1,11 +1,11 @@ typedef GLvoid* (GL_APIENTRY* PFNGLMAPBUFFERPROC) (GLenum target, GLenum access); /* Java->C glue code: - * Java package: com.sun.opengl.impl.es2.GLES2Impl + * Java package: com.jogamp.opengl.impl.es2.GLES2Impl * Java method: long dispatch_glMapBuffer(int target, int access) * C function: void * glMapBuffer(GLenum target, GLenum access); */ JNIEXPORT jlong JNICALL -Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { +Java_com_jogamp_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobject _unused, jint target, jint access, jlong glProcAddress) { PFNGLMAPBUFFERPROC ptr_glMapBuffer; void * _res; ptr_glMapBuffer = (PFNGLMAPBUFFERPROC) (intptr_t) glProcAddress; @@ -15,11 +15,11 @@ Java_com_sun_opengl_impl_es2_GLES2Impl_dispatch_1glMapBuffer(JNIEnv *env, jobjec } /* Java->C glue code: - * Java package: com.sun.opengl.impl.es2.GLES2Impl + * Java package: com.jogamp.opengl.impl.es2.GLES2Impl * Java method: ByteBuffer newDirectByteBuffer(long addr, int capacity); * C function: jobject newDirectByteBuffer(jlong addr, jint capacity); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { +Java_com_jogamp_opengl_impl_es2_GLES2Impl_newDirectByteBuffer(JNIEnv *env, jobject _unused, jlong addr, jint capacity) { return (*env)->NewDirectByteBuffer(env, (void*) (intptr_t) addr, capacity); } diff --git a/make/config/jogl/glu-CustomJavaCode-base.java b/make/config/jogl/glu-CustomJavaCode-base.java index 78c067606..aeb4f2ef9 100755 --- a/make/config/jogl/glu-CustomJavaCode-base.java +++ b/make/config/jogl/glu-CustomJavaCode-base.java @@ -169,7 +169,7 @@ protected static boolean checkedGLUtessellatorImpl = false; protected static final void validateGLUtessellatorImpl() { if(!checkedGLUtessellatorImpl) { - availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl"); + availableGLUtessellatorImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl"); checkedGLUtessellatorImpl = true; } if(!availableGLUtessellatorImpl) { @@ -1220,7 +1220,7 @@ protected static final void validateGLUquadricImpl() { if(!checkedGLUquadricImpl) { synchronized (syncObject) { if(!checkedGLUquadricImpl) { - availableGLUquadricImpl = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.GLUquadricImpl"); + availableGLUquadricImpl = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.GLUquadricImpl"); checkedGLUquadricImpl = true; } } diff --git a/make/config/jogl/glu-CustomJavaCode-gl2es1.java b/make/config/jogl/glu-CustomJavaCode-gl2es1.java index 8afc28c15..b5cb3b2f8 100755 --- a/make/config/jogl/glu-CustomJavaCode-gl2es1.java +++ b/make/config/jogl/glu-CustomJavaCode-gl2es1.java @@ -86,7 +86,7 @@ protected static boolean checkedMipmap = false; protected static final void validateMipmap() { if(!checkedMipmap) { - availableMipmap = NWReflection.isClassAvailable("com.sun.opengl.impl.glu.mipmap.Mipmap"); + availableMipmap = NWReflection.isClassAvailable("com.jogamp.opengl.impl.glu.mipmap.Mipmap"); checkedMipmap = true; } if(!availableMipmap) { diff --git a/make/config/jogl/glu-base.cfg b/make/config/jogl/glu-base.cfg index f67673a78..d859225ec 100755 --- a/make/config/jogl/glu-base.cfg +++ b/make/config/jogl/glu-base.cfg @@ -20,8 +20,8 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLU glu-CustomJavaCode-base.java # Imports for the Error and Registry classes -Import com.sun.opengl.impl.glu.error.Error -Import com.sun.opengl.impl.glu.registry.Registry +Import com.jogamp.opengl.impl.glu.error.Error +Import com.jogamp.opengl.impl.glu.registry.Registry Include glu-common.cfg diff --git a/make/config/jogl/glu-common.cfg b/make/config/jogl/glu-common.cfg index df59175bb..28a075954 100644 --- a/make/config/jogl/glu-common.cfg +++ b/make/config/jogl/glu-common.cfg @@ -12,9 +12,9 @@ TagNativeBinding true Import java.nio.* Import javax.media.opengl.* Import javax.media.opengl.glu.* -Import com.sun.opengl.impl.* -Import com.sun.opengl.impl.glu.* -Import com.sun.opengl.impl.glu.tessellator.GLUtessellatorImpl +Import com.jogamp.opengl.impl.* +Import com.jogamp.opengl.impl.glu.* +Import com.jogamp.opengl.impl.glu.tessellator.GLUtessellatorImpl Import com.sun.nativewindow.impl.NWReflection # Raise GLException instead of RuntimeException in glue code diff --git a/make/config/jogl/glu-gl2.cfg b/make/config/jogl/glu-gl2.cfg index 712f9a305..cc5b16f0f 100755 --- a/make/config/jogl/glu-gl2.cfg +++ b/make/config/jogl/glu-gl2.cfg @@ -25,7 +25,7 @@ CustomCCode #endif Include ../intptr.cfg EmitProcAddressTable true -ProcAddressTablePackage com.sun.opengl.impl.glu.gl2 +ProcAddressTablePackage com.jogamp.opengl.impl.glu.gl2 ProcAddressTableClassName GLUgl2ProcAddressTable GetProcAddressTableExpr getGLUProcAddressTable() @@ -38,14 +38,14 @@ IncludeAs CustomJavaCode GLUgl2 glu-CustomJavaCode-gl2.java # GLU needs access to the GLUtesselatorImpl class for GLUtesselator, # to the Mipmap class for scaling and mipmap generation, # and to the nurbs.* package for the NURBS functionality -Import com.sun.opengl.impl.glu.nurbs.* +Import com.jogamp.opengl.impl.glu.nurbs.* Import java.security.* -Import com.sun.gluegen.runtime.opengl.GLProcAddressHelper -Import com.sun.opengl.impl.glu.gl2.nurbs.* -Import com.sun.opengl.impl.glu.mipmap.Mipmap -Import com.sun.opengl.impl.glu.gl2.* +Import com.jogamp.gluegen.runtime.opengl.GLProcAddressHelper +Import com.jogamp.opengl.impl.glu.gl2.nurbs.* +Import com.jogamp.opengl.impl.glu.mipmap.Mipmap +Import com.jogamp.opengl.impl.glu.gl2.* Import javax.media.opengl.GL2 -Import com.sun.opengl.impl.gl2.ProjectDouble +Import com.jogamp.opengl.impl.gl2.ProjectDouble # # ------------------------ diff --git a/make/config/jogl/glu-gl2es1.cfg b/make/config/jogl/glu-gl2es1.cfg index 8927f96b9..af89014f4 100755 --- a/make/config/jogl/glu-gl2es1.cfg +++ b/make/config/jogl/glu-gl2es1.cfg @@ -20,7 +20,7 @@ Ignore gluScaleImage IncludeAs CustomJavaCode GLUgl2es1 glu-CustomJavaCode-gl2es1.java Import javax.media.opengl.GLES1 -Import com.sun.opengl.impl.glu.mipmap.Mipmap +Import com.jogamp.opengl.impl.glu.mipmap.Mipmap Include glu-common.cfg diff --git a/make/config/jogl/glx-CustomCCode.c b/make/config/jogl/glx-CustomCCode.c index a075c4852..7dac53fb6 100755 --- a/make/config/jogl/glx-CustomCCode.c +++ b/make/config/jogl/glx-CustomCCode.c @@ -15,7 +15,7 @@ /* We expect glXGetProcAddressARB to be defined */ extern void (*glXGetProcAddressARB(const GLubyte *procname))(); -static const char * clazzNameInternalBufferUtil = "com/sun/opengl/impl/InternalBufferUtil"; +static const char * clazzNameInternalBufferUtil = "com/jogamp/opengl/impl/InternalBufferUtil"; static const char * clazzNameInternalBufferUtilStaticCstrName = "copyByteBuffer"; static const char * clazzNameInternalBufferUtilStaticCstrSignature = "(Ljava/nio/ByteBuffer;)Ljava/nio/ByteBuffer;"; static const char * clazzNameByteBuffer = "java/nio/ByteBuffer"; @@ -30,29 +30,29 @@ static void _initClazzAccess(JNIEnv *env) { c = (*env)->FindClass(env, clazzNameInternalBufferUtil); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil); + fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameInternalBufferUtil); (*env)->FatalError(env, clazzNameInternalBufferUtil); } clazzInternalBufferUtil = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==clazzInternalBufferUtil) { - fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil); + fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameInternalBufferUtil); (*env)->FatalError(env, clazzNameInternalBufferUtil); } c = (*env)->FindClass(env, clazzNameByteBuffer); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't find %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } clazzByteBuffer = (jclass)(*env)->NewGlobalRef(env, c); if(NULL==c) { - fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); + fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX: can't use %s\n", clazzNameByteBuffer); (*env)->FatalError(env, clazzNameByteBuffer); } cstrInternalBufferUtil = (*env)->GetStaticMethodID(env, clazzInternalBufferUtil, clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature); if(NULL==cstrInternalBufferUtil) { - fprintf(stderr, "FatalError: Java_com_sun_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n", + fprintf(stderr, "FatalError: Java_com_jogamp_opengl_impl_x11_glx_GLX:: can't create %s.%s %s\n", clazzNameInternalBufferUtil, clazzNameInternalBufferUtilStaticCstrName, clazzNameInternalBufferUtilStaticCstrSignature); (*env)->FatalError(env, clazzNameInternalBufferUtilStaticCstrName); @@ -60,12 +60,12 @@ static void _initClazzAccess(JNIEnv *env) { } /* Java->C glue code: - * Java package: com.sun.opengl.impl.x11.glx.GLX + * Java package: com.jogamp.opengl.impl.x11.glx.GLX * Java method: XVisualInfo glXGetVisualFromFBConfig(long dpy, long config) * C function: XVisualInfo * glXGetVisualFromFBConfig(Display * dpy, GLXFBConfig config); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) { +Java_com_jogamp_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv *env, jclass _unused, jlong dpy, jlong config) { XVisualInfo * _res; jobject jbyteSource; jobject jbyteCopy; @@ -85,12 +85,12 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXGetVisualFromFBConfigCopied0__JJ(JNIEnv } /* Java->C glue code: - * Java package: com.sun.opengl.impl.x11.glx.GLX + * Java package: com.jogamp.opengl.impl.x11.glx.GLX * Java method: java.nio.LongBuffer glXChooseFBConfig(long dpy, int screen, java.nio.IntBuffer attribList, java.nio.IntBuffer nitems) * C function: GLXFBConfig * glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) { +Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset, jobject nitems, jint nitems_byte_offset) { int * _ptr2 = NULL; int * _ptr3 = NULL; GLXFBConfig * _res; @@ -126,12 +126,12 @@ Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseFBConfigCopied1__JILjava_lang_Obje } /* Java->C glue code: - * Java package: com.sun.opengl.impl.x11.glx.GLX + * Java package: com.jogamp.opengl.impl.x11.glx.GLX * Java method: XVisualInfo glXChooseVisual(long dpy, int screen, java.nio.IntBuffer attribList) * C function: XVisualInfo * glXChooseVisual(Display * dpy, int screen, int * attribList); */ JNIEXPORT jobject JNICALL -Java_com_sun_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) { +Java_com_jogamp_opengl_impl_x11_glx_GLX_glXChooseVisualCopied1__JILjava_lang_Object_2I(JNIEnv *env, jclass _unused, jlong dpy, jint screen, jobject attribList, jint attribList_byte_offset) { int * _ptr2 = NULL; XVisualInfo * _res; jobject jbyteSource; diff --git a/make/config/jogl/glx-CustomJavaCode.java b/make/config/jogl/glx-CustomJavaCode.java index 3cb1d3619..56057377a 100644 --- a/make/config/jogl/glx-CustomJavaCode.java +++ b/make/config/jogl/glx-CustomJavaCode.java @@ -13,7 +13,7 @@ /** Interface to C language function: <br> - Alias for: <br> <code> GLXFBConfig * glXChooseFBConfigSGIX, glXChooseFBConfig(Display * dpy, int screen, const int * attribList, int * nitems); </code> */ - public static com.sun.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset) + public static com.jogamp.gluegen.runtime.PointerBuffer glXChooseFBConfigCopied(long dpy, int screen, int[] attribList, int attribList_offset, int[] nitems, int nitems_offset) { if(attribList != null && attribList.length <= attribList_offset) throw new GLException("array offset argument \"attribList_offset\" (" + attribList_offset + ") equals or exceeds array length (" + attribList.length + ")"); diff --git a/make/config/jogl/glx-x11.cfg b/make/config/jogl/glx-x11.cfg index c9079b84f..8814f5e2f 100644 --- a/make/config/jogl/glx-x11.cfg +++ b/make/config/jogl/glx-x11.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.sun.opengl.impl.x11.glx +Package com.jogamp.opengl.impl.x11.glx JavaClass GLX Style allstatic Include gl-common.cfg diff --git a/make/config/jogl/glxext.cfg b/make/config/jogl/glxext.cfg index 39ba379c4..f07d5cc1b 100755 --- a/make/config/jogl/glxext.cfg +++ b/make/config/jogl/glxext.cfg @@ -3,13 +3,13 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/X11 -Package com.sun.opengl.impl.x11.glx +Package com.jogamp.opengl.impl.x11.glx Style InterfaceAndImpl JavaClass GLXExt -ImplPackage com.sun.opengl.impl.x11.glx +ImplPackage com.jogamp.opengl.impl.x11.glx ImplJavaClass GLXExtImpl -ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/sun/opengl/impl/x11/glx/GLX.java +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/opengl/impl/x11/glx/GLX.java Include gl-common.cfg Include gl-desktop.cfg diff --git a/make/config/jogl/wgl-win32.cfg b/make/config/jogl/wgl-win32.cfg index 6cd4fd412..2a69290a4 100644 --- a/make/config/jogl/wgl-win32.cfg +++ b/make/config/jogl/wgl-win32.cfg @@ -3,7 +3,7 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.sun.opengl.impl.windows.wgl +Package com.jogamp.opengl.impl.windows.wgl JavaClass WGL Style allstatic Include gl-common.cfg diff --git a/make/config/jogl/wglext.cfg b/make/config/jogl/wglext.cfg index ea9a0257e..35c43cb86 100644 --- a/make/config/jogl/wglext.cfg +++ b/make/config/jogl/wglext.cfg @@ -3,10 +3,10 @@ JavaOutputDir gensrc/classes NativeOutputDir gensrc/native/jogl/Windows -Package com.sun.opengl.impl.windows.wgl +Package com.jogamp.opengl.impl.windows.wgl Style InterfaceAndImpl JavaClass WGLExt -ImplPackage com.sun.opengl.impl.windows.wgl +ImplPackage com.jogamp.opengl.impl.windows.wgl ImplJavaClass WGLExtImpl Include gl-common.cfg Include gl-desktop.cfg |