diff options
Diffstat (limited to 'src/jogl/classes/javax')
12 files changed, 42 insertions, 43 deletions
diff --git a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java index 5450e400b..8603c7184 100644 --- a/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java +++ b/src/jogl/classes/javax/media/opengl/DefaultGLCapabilitiesChooser.java @@ -41,7 +41,7 @@ package javax.media.opengl; import javax.media.nativewindow.Capabilities; import javax.media.nativewindow.NativeWindowException; -import com.sun.opengl.impl.Debug; +import com.jogamp.opengl.impl.Debug; /** <P> The default implementation of the {@link GLCapabilitiesChooser} interface, which provides consistent visual diff --git a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java index a94c14f33..7342369d9 100644 --- a/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java +++ b/src/jogl/classes/javax/media/opengl/GLAutoDrawable.java @@ -40,7 +40,7 @@ package javax.media.opengl; import javax.media.opengl.glu.*; -import com.sun.opengl.impl.Debug; +import com.jogamp.opengl.impl.Debug; import java.security.*; /** A higher-level abstraction than {@link GLDrawable} which supplies diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java index 840de4764..3ca1cd317 100644 --- a/src/jogl/classes/javax/media/opengl/GLContext.java +++ b/src/jogl/classes/javax/media/opengl/GLContext.java @@ -39,7 +39,6 @@ package javax.media.opengl; -import com.sun.opengl.impl.Debug; import java.util.HashMap; /** Abstraction for an OpenGL rendering context. In order to perform @@ -67,6 +66,8 @@ public abstract class GLContext { private HashMap/*<int, Object>*/ attachedObjects = new HashMap(); + protected long context; + /** * Returns the GLDrawable to which this context may be used to * draw. diff --git a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java index b7c81cbed..ca6bc9051 100644 --- a/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLDrawableFactory.java @@ -41,9 +41,8 @@ package javax.media.opengl; import javax.media.nativewindow.*; -import java.lang.reflect.*; import java.security.*; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.*; import com.sun.nativewindow.impl.NWReflection; /** <P> Provides a virtual machine- and operating system-independent @@ -88,8 +87,8 @@ public abstract class GLDrawableFactory { private static final GLDrawableFactory eglFactory; private static final GLDrawableFactory nativeOSFactory; private static final String nativeOSType; - static final String macosxFactoryClassNameCGL = "com.sun.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory"; - static final String macosxFactoryClassNameAWTCGL = "com.sun.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; + static final String macosxFactoryClassNameCGL = "com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLDrawableFactory"; + static final String macosxFactoryClassNameAWTCGL = "com.jogamp.opengl.impl.macosx.cgl.awt.MacOSXAWTCGLDrawableFactory"; /** * Instantiate singleton factories if available, EGLES1, EGLES2 and the OS native ones. @@ -97,7 +96,7 @@ public abstract class GLDrawableFactory { static { GLDrawableFactory tmp = null; try { - tmp = (GLDrawableFactory) NWReflection.createInstance("com.sun.opengl.impl.egl.EGLDrawableFactory"); + tmp = (GLDrawableFactory) NWReflection.createInstance("com.jogamp.opengl.impl.egl.EGLDrawableFactory"); } catch (Throwable t) { if (GLProfile.DEBUG) { System.err.println("GLDrawableFactory.static - EGLDrawableFactory - not available"); @@ -114,9 +113,9 @@ public abstract class GLDrawableFactory { factoryClassName = Debug.getProperty("jogl.gldrawablefactory.class.name", true, AccessController.getContext()); if (null == factoryClassName) { if ( nativeOSType.equals(NativeWindowFactory.TYPE_X11) ) { - factoryClassName = "com.sun.opengl.impl.x11.glx.X11GLXDrawableFactory"; + factoryClassName = "com.jogamp.opengl.impl.x11.glx.X11GLXDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_WINDOWS) ) { - factoryClassName = "com.sun.opengl.impl.windows.wgl.WindowsWGLDrawableFactory"; + factoryClassName = "com.jogamp.opengl.impl.windows.wgl.WindowsWGLDrawableFactory"; } else if ( nativeOSType.equals(NativeWindowFactory.TYPE_MACOSX) ) { if(NWReflection.isClassAvailable(macosxFactoryClassNameAWTCGL)) { factoryClassName = macosxFactoryClassNameAWTCGL; diff --git a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java index 63b50cb3c..352545849 100644 --- a/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java +++ b/src/jogl/classes/javax/media/opengl/GLPipelineFactory.java @@ -39,7 +39,7 @@ package javax.media.opengl; import java.lang.reflect.*; import java.util.StringTokenizer; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.*; /** * Factory for pipelining GL instances diff --git a/src/jogl/classes/javax/media/opengl/GLProfile.java b/src/jogl/classes/javax/media/opengl/GLProfile.java index 69cdd3f24..6719a76a2 100644 --- a/src/jogl/classes/javax/media/opengl/GLProfile.java +++ b/src/jogl/classes/javax/media/opengl/GLProfile.java @@ -36,13 +36,15 @@ package javax.media.opengl; -import javax.media.opengl.fixedfunc.*; -import java.lang.reflect.*; -import java.util.HashMap; -import java.security.*; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.DRIHack; +import com.jogamp.opengl.impl.Debug; +import com.jogamp.opengl.impl.NativeLibLoader; import com.sun.nativewindow.impl.NWReflection; import com.sun.nativewindow.impl.jvm.JVMUtil; +import java.util.HashMap; +import java.security.AccessControlContext; +import java.security.AccessController; +import javax.media.opengl.fixedfunc.GLPointerFunc; /** * Specifies the the OpenGL profile. @@ -192,17 +194,17 @@ public class GLProfile implements Cloneable { private static final String getGLImplBaseClassName(String profileImpl) { if(GL3bc.equals(profileImpl)) { - return "com.sun.opengl.impl.gl3.GL3bc"; + return "com.jogamp.opengl.impl.gl3.GL3bc"; } else if(GL3.equals(profileImpl)) { - return "com.sun.opengl.impl.gl3.GL3"; + return "com.jogamp.opengl.impl.gl3.GL3"; } else if(GL2.equals(profileImpl)) { - return "com.sun.opengl.impl.gl2.GL2"; + return "com.jogamp.opengl.impl.gl2.GL2"; } else if(GL2ES12.equals(profileImpl)) { - return "com.sun.opengl.impl.gl2es12.GL2ES12"; + return "com.jogamp.opengl.impl.gl2es12.GL2ES12"; } else if(GLES1.equals(profileImpl) || GL2ES1.equals(profileImpl)) { - return "com.sun.opengl.impl.es1.GLES1"; + return "com.jogamp.opengl.impl.es1.GLES1"; } else if(GLES2.equals(profileImpl) || GL2ES2.equals(profileImpl)) { - return "com.sun.opengl.impl.es2.GLES2"; + return "com.jogamp.opengl.impl.es2.GLES2"; } else { throw new GLException("unsupported profile \"" + profileImpl + "\""); } @@ -715,22 +717,22 @@ public class GLProfile implements Cloneable { } // FIXME: check for real GL3 availability .. ? - hasGL3bcImpl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3bcImpl"); - hasGL3Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl3.GL3Impl"); - hasGL2Impl = hasDesktopGL && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2.GL2Impl"); + hasGL3bcImpl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3bcImpl"); + hasGL3Impl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl3.GL3Impl"); + hasGL2Impl = hasDesktopGL && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2.GL2Impl"); - hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.sun.opengl.impl.gl2es12.GL2ES12Impl"); + hasGL2ES12Impl = hasDesktopGLES12 && NWReflection.isClassAvailable("com.jogamp.opengl.impl.gl2es12.GL2ES12Impl"); boolean btest = false; - boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.sun.opengl.impl.egl.EGLDynamicLookupHelper"); + boolean hasEGLDynLookup = NWReflection.isClassAvailable("com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper"); boolean hasEGLDrawableFactory = false; try { if(hasEGLDynLookup) { hasEGLDrawableFactory = null!=GLDrawableFactory.getFactoryImpl(GLES2); btest = hasEGLDrawableFactory && - NWReflection.isClassAvailable("com.sun.opengl.impl.es2.GLES2Impl") && - null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2); + NWReflection.isClassAvailable("com.jogamp.opengl.impl.es2.GLES2Impl") && + null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(2); } } catch (Throwable t) { if (DEBUG) { @@ -744,8 +746,8 @@ public class GLProfile implements Cloneable { try { if(hasEGLDynLookup) { btest = hasEGLDrawableFactory && - NWReflection.isClassAvailable("com.sun.opengl.impl.es1.GLES1Impl") && - null!=com.sun.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1); + NWReflection.isClassAvailable("com.jogamp.opengl.impl.es1.GLES1Impl") && + null!=com.jogamp.opengl.impl.egl.EGLDynamicLookupHelper.getDynamicLookupHelper(1); } } catch (Throwable t) { if (DEBUG) { diff --git a/src/jogl/classes/javax/media/opengl/Threading.java b/src/jogl/classes/javax/media/opengl/Threading.java index fecf6c78b..e58792b8f 100755 --- a/src/jogl/classes/javax/media/opengl/Threading.java +++ b/src/jogl/classes/javax/media/opengl/Threading.java @@ -39,7 +39,7 @@ package javax.media.opengl; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.*; /** This API provides access to the threading model for the implementation of the classes in this package. diff --git a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java index 038d6d280..53e79b8d9 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLCanvas.java @@ -43,7 +43,7 @@ import javax.media.opengl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.awt.*; -import com.sun.opengl.impl.*; +import com.jogamp.opengl.impl.*; import java.awt.Canvas; import java.awt.Color; diff --git a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java index e4758211e..43b2e1e1d 100644 --- a/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java +++ b/src/jogl/classes/javax/media/opengl/awt/GLJPanel.java @@ -41,20 +41,17 @@ package javax.media.opengl.awt; import javax.media.opengl.*; import javax.media.nativewindow.*; -import javax.media.nativewindow.awt.*; import java.awt.*; import java.awt.geom.*; import java.awt.image.*; import java.beans.*; -import javax.swing.*; import java.nio.*; import java.security.*; -import javax.swing.JComponent; import javax.swing.JPanel; -import com.sun.opengl.util.FBObject; -import com.sun.opengl.impl.*; -import com.sun.opengl.impl.awt.*; +import com.jogamp.opengl.util.FBObject; +import com.jogamp.opengl.impl.*; +import com.jogamp.opengl.impl.awt.*; // FIXME: Subclasses need to call resetGLFunctionAvailability() on their // context whenever the displayChanged() function is called on their @@ -1429,7 +1426,7 @@ public class GLJPanel extends JPanel implements AWTGLAutoDrawable { System.err.println("-- Created External Context: "+j2dContext); } if (DEBUG) { - j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2())); +// j2dContext.setGL(new DebugGL2(j2dContext.getGL().getGL2())); } // Check to see whether we can support the requested diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java index d5a7a11f3..49451a34b 100755 --- a/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java +++ b/src/jogl/classes/javax/media/opengl/glu/GLUquadric.java @@ -1,7 +1,7 @@ package javax.media.opengl.glu; import javax.media.opengl.GL; -import com.sun.opengl.util.ImmModeSink; +import com.jogamp.opengl.util.ImmModeSink; /** * Wrapper for a GLU quadric object. diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java index 971991519..72ad68ceb 100755 --- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java +++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallback.java @@ -352,5 +352,5 @@ public interface GLUtessellatorCallback { */ public void errorData(int errnum, Object polygonData); - //void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh); + //void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh); } diff --git a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java index 7845ac254..f380f4698 100755 --- a/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java +++ b/src/jogl/classes/javax/media/opengl/glu/GLUtessellatorCallbackAdapter.java @@ -68,7 +68,7 @@ public class GLUtessellatorCallbackAdapter implements GLUtessellatorCallback { public void edgeFlag(boolean boundaryEdge) {} public void vertex(Object vertexData) {} public void end() {} -// public void mesh(com.sun.opengl.impl.tessellator.GLUmesh mesh) {} +// public void mesh(com.jogamp.opengl.impl.tessellator.GLUmesh mesh) {} public void error(int errnum) {} public void combine(double[] coords, Object[] data, float[] weight, Object[] outData) {} |