j3dcore: fix up compile to build with JOGL release 2.3.1

Signed-off-by: Julien Gouesse <[email protected]>
Signed-off-by: Harvey Harrison <[email protected]>

4 files changed, 32 insertions, 32 deletions

diff --git a/src/classes/share/javax/media/j3d/JoglContext.java b/src/classes/share/javax/media/j3d/JoglContext.java
index f9bd82e..718a092 100644
--- a/src/classes/share/javax/media/j3d/JoglContext.java
+++ b/src/classes/share/javax/media/j3d/JoglContext.java
@@ -29,8 +29,8 @@ package javax.media.j3d;
 import java.nio.Buffer;
 import java.nio.FloatBuffer;
 
-import javax.media.opengl.GL;
-import javax.media.opengl.GLContext;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GLContext;
 
 /**
  * Graphics context objects for Jogl rendering pipeline.
diff --git a/src/classes/share/javax/media/j3d/JoglDrawable.java b/src/classes/share/javax/media/j3d/JoglDrawable.java
index 1ce492e..54c134e 100644
--- a/src/classes/share/javax/media/j3d/JoglDrawable.java
+++ b/src/classes/share/javax/media/j3d/JoglDrawable.java
@@ -26,8 +26,8 @@
 
 package javax.media.j3d;
 
-import javax.media.nativewindow.NativeWindow;
-import javax.media.opengl.GLDrawable;
+import com.jogamp.nativewindow.NativeWindow;
+import com.jogamp.opengl.GLDrawable;
 
 /**
  * Drawable class for the Jogl rendering pipeline.
diff --git a/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java b/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
index d7dc3f1..181dcec 100644
--- a/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
+++ b/src/classes/share/javax/media/j3d/JoglGraphicsConfiguration.java
@@ -38,7 +38,7 @@ import java.awt.image.ColorModel;
 import java.awt.image.VolatileImage;
 
 import com.jogamp.nativewindow.awt.AWTGraphicsDevice;
-import javax.media.opengl.GLCapabilities;
+import com.jogamp.opengl.GLCapabilities;
 
 /**
  * Class implementing the GraphicsConfiguration API, but not a "real"
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java
index a60a73f..2f38fd8 100644
--- a/src/classes/share/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/share/javax/media/j3d/JoglPipeline.java
@@ -52,28 +52,28 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.media.nativewindow.AbstractGraphicsDevice;
-import javax.media.nativewindow.AbstractGraphicsScreen;
-import javax.media.nativewindow.CapabilitiesChooser;
-import javax.media.nativewindow.GraphicsConfigurationFactory;
-import javax.media.nativewindow.NativeSurface;
-import javax.media.nativewindow.NativeWindowFactory;
-import javax.media.nativewindow.ProxySurface;
-import javax.media.nativewindow.UpstreamSurfaceHook;
-import javax.media.nativewindow.VisualIDHolder;
-import javax.media.opengl.DefaultGLCapabilitiesChooser;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2;
-import javax.media.opengl.GLCapabilities;
-import javax.media.opengl.GLCapabilitiesChooser;
-import javax.media.opengl.GLCapabilitiesImmutable;
-import javax.media.opengl.GLContext;
-import javax.media.opengl.GLDrawable;
-import javax.media.opengl.GLDrawableFactory;
-import javax.media.opengl.GLException;
-import javax.media.opengl.GLFBODrawable;
-import javax.media.opengl.GLProfile;
-import javax.media.opengl.Threading;
+import com.jogamp.nativewindow.AbstractGraphicsDevice;
+import com.jogamp.nativewindow.AbstractGraphicsScreen;
+import com.jogamp.nativewindow.CapabilitiesChooser;
+import com.jogamp.nativewindow.GraphicsConfigurationFactory;
+import com.jogamp.nativewindow.NativeSurface;
+import com.jogamp.nativewindow.NativeWindowFactory;
+import com.jogamp.nativewindow.ProxySurface;
+import com.jogamp.nativewindow.UpstreamSurfaceHook;
+import com.jogamp.nativewindow.VisualIDHolder;
+import com.jogamp.opengl.DefaultGLCapabilitiesChooser;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLCapabilitiesChooser;
+import com.jogamp.opengl.GLCapabilitiesImmutable;
+import com.jogamp.opengl.GLContext;
+import com.jogamp.opengl.GLDrawable;
+import com.jogamp.opengl.GLDrawableFactory;
+import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.GLFBODrawable;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.Threading;
 
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.nativewindow.awt.AWTGraphicsConfiguration;
@@ -3086,9 +3086,9 @@ class JoglPipeline extends Pipeline {
 
         int shaderHandle = 0;
         if (shaderType == Shader.SHADER_TYPE_VERTEX) {
-            shaderHandle = gl.glCreateShaderObjectARB(GL2.GL_VERTEX_SHADER);
+            shaderHandle = (int) gl.glCreateShaderObjectARB(GL2.GL_VERTEX_SHADER);
         } else if (shaderType == Shader.SHADER_TYPE_FRAGMENT) {
-            shaderHandle = gl.glCreateShaderObjectARB(GL2.GL_FRAGMENT_SHADER);
+            shaderHandle = (int) gl.glCreateShaderObjectARB(GL2.GL_FRAGMENT_SHADER);
         }
 
         if (shaderHandle == 0) {
@@ -3141,7 +3141,7 @@ class JoglPipeline extends Pipeline {
 
 		GL2 gl = context(ctx).getGL().getGL2();
 
-        int shaderProgramHandle = gl.glCreateProgramObjectARB();
+        int shaderProgramHandle = (int) gl.glCreateProgramObjectARB();
         if (shaderProgramHandle == 0) {
             return new ShaderError(ShaderError.LINK_ERROR,
                     "Unable to create native shader program object");
@@ -6287,7 +6287,7 @@ class JoglPipeline extends Pipeline {
 				// if multisampled the FBO sink (GL_FRONT) will be resized before the swap is executed
 				int numSamples = ((GLFBODrawable)glDrawble).getChosenGLCapabilities().getNumSamples();
 				FBObject fboObjectBack = ((GLFBODrawable)glDrawble).getFBObject( GL.GL_BACK );
-				fboObjectBack.reset(gl, newWidth, newHeight, numSamples, false); // false = don't reset SamplingSinkFBO immediately
+				fboObjectBack.reset(gl, newWidth, newHeight, numSamples/*, false*/); // false = don't reset SamplingSinkFBO immediately
 				fboObjectBack.bind(gl);
 
 				// If double buffered without antialiasing the GL_FRONT FBObject
@@ -6626,7 +6626,7 @@ class JoglPipeline extends Pipeline {
 
 		// !! a 'null' capability chooser; JOGL doesn't call a chooser for offscreen drawable
 
-		// If FBO : 'offDrawable' is of type javax.media.opengl.GLFBODrawable
+		// If FBO : 'offDrawable' is of type com.jogamp.opengl.GLFBODrawable
         GLDrawable offDrawable = GLDrawableFactory.getFactory(profile).createOffscreenDrawable(device, offCaps, null, width, height);
 
 // !! these chosen caps are not final as long as the corresponding context is made current