Made public API changes discussed with expert group to make core JOGL

API more toolkit-agnostic:

1. Decoupled instantiation of GLCanvas and GLJPanel objects from the
   GLDrawableFactory. GLCanvas and GLJPanel's constructors are now
   public and the associated factory methods have been removed from
   the GLDrawableFactory.

2. Changed the signature of GLDrawableFactory.
   chooseGraphicsConfiguration() to accept and return marker
   AbstractGraphicsDevice and AbstractGraphicsConfiguration
   interfaces, respectively. Defined new AWTGraphicsDevice and
   AWTGraphicsConfiguration wrapper classes simply wrapping the
   associated objects. An SWT port could define similar wrapper
   classes for its data types.

3. Allowed overriding of the specific GLDrawableFactory subclass
   instantiated through GLDrawableFactory.getFactory() by setting the
   system property "opengl.factory.class.name". For example, an SWT
   port might swap itself in by specifying the following system
   property on the command line:

   -Dopengl.factory.class.name=com.ibm.swt.opengl.SWTGLDrawableFactory

Tested on Solaris/SPARC. Also fixed breakage on Solaris/SPARC due to
recent split of jogl native library into jogl and jogl_awt pieces.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/trunk@431 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 39 insertions, 15 deletions

diff --git a/src/classes/javax/media/opengl/GLCanvas.java b/src/classes/javax/media/opengl/GLCanvas.java
index 9151dbd37..fe2cd869b 100644
--- a/src/classes/javax/media/opengl/GLCanvas.java
+++ b/src/classes/javax/media/opengl/GLCanvas.java
@@ -70,22 +70,36 @@ public class GLCanvas extends Canvas implements GLAutoDrawable {
   private boolean autoSwapBufferMode = true;
   private boolean sendReshape = false;
 
-  /** Creates a new GLCanvas component. The passed GLCapabilities must
-      be non-null and specifies the OpenGL capabilities for the
-      component. The GLCapabilitiesChooser must be non-null and
+  /** Creates a new GLCanvas component with a default set of OpenGL
+      capabilities, using the default OpenGL capabilities selection
+      mechanism, on the default screen device. */
+  public GLCanvas() {
+    this(null);
+  }
+
+  /** Creates a new GLCanvas component with the requested set of
+      OpenGL capabilities, using the default OpenGL capabilities
+      selection mechanism, on the default screen device. */
+  public GLCanvas(GLCapabilities capabilities) {
+    this(capabilities, null, null, null);
+  }
+
+  /** Creates a new GLCanvas component. The passed GLCapabilities
+      specifies the OpenGL capabilities for the component; if null, a
+      default set of capabilities is used. The GLCapabilitiesChooser
       specifies the algorithm for selecting one of the available
-      GLCapabilities for the component; the GLDrawableFactory uses a
-      DefaultGLCapabilitesChooser if the user does not provide
-      one. The passed GLContext may be null and specifies an OpenGL
-      context with which to share textures, display lists and other
-      OpenGL state. The passed GraphicsDevice must be non-null and
-      indicates the screen on which to create the GLCanvas; the
+      GLCapabilities for the component; a DefaultGLCapabilitesChooser
+      is used if null is passed for this argument. The passed
+      GLContext specifies an OpenGL context with which to share
+      textures, display lists and other OpenGL state, and may be null
+      if sharing is not desired. The passed GraphicsDevice indicates
+      the screen on which to create the GLCanvas; the
       GLDrawableFactory uses the default screen device of the local
-      GraphicsEnvironment if the user does not provide one. */
-  protected GLCanvas(GLCapabilities capabilities,
-                     GLCapabilitiesChooser chooser,
-                     GLContext shareWith,
-                     GraphicsDevice device) {
+      GraphicsEnvironment if null is passed for this argument. */
+  public GLCanvas(GLCapabilities capabilities,
+                  GLCapabilitiesChooser chooser,
+                  GLContext shareWith,
+                  GraphicsDevice device) {
     // The platform-specific GLDrawableFactory will only provide a
     // non-null GraphicsConfiguration on platforms where this is
     // necessary (currently only X11, as Windows allows the pixel
@@ -95,7 +109,10 @@ public class GLCanvas extends Canvas implements GLAutoDrawable {
     // least in the Sun AWT implementation) that this will result in
     // equivalent behavior to calling the no-arg super() constructor
     // for Canvas.
-    super(GLDrawableFactory.getFactory().chooseGraphicsConfiguration(capabilities, chooser, device));
+    super(unwrap((AWTGraphicsConfiguration)
+                 GLDrawableFactory.getFactory().chooseGraphicsConfiguration(capabilities,
+                                                                            chooser,
+                                                                            new AWTGraphicsDevice(device))));
     drawable = GLDrawableFactory.getFactory().getGLDrawable(this, capabilities, chooser);
     context = (GLContextImpl) drawable.createContext(shareWith);
     context.setSynchronized(true);
@@ -305,4 +322,11 @@ public class GLCanvas extends Canvas implements GLAutoDrawable {
       }
     }
   }
+
+  private static GraphicsConfiguration unwrap(AWTGraphicsConfiguration config) {
+    if (config == null) {
+      return null;
+    }
+    return config.getGraphicsConfiguration();
+  }
 }