implemented GLJPanel for Mac OS X

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

4 files changed, 78 insertions, 66 deletions

diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java b/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java
index e1618a15a..d636eaa6f 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java
+++ b/src/net/java/games/jogl/impl/macosx/MacOSXGLContext.java
@@ -85,11 +85,29 @@ public abstract class MacOSXGLContext extends GLContext
   
   protected abstract boolean isOffscreen();
 	
-  public abstract int getOffscreenContextBufferedImageType();
+  public int getOffscreenContextBufferedImageType() {
+    throw new GLException("Should not call this");
+  }
 
-  public abstract int getOffscreenContextReadBuffer();
+  public int getOffscreenContextReadBuffer() {
+    throw new GLException("Should not call this");
+  }
 
-  public abstract boolean offscreenImageNeedsVerticalFlip();
+  public int getOffscreenContextWidth() {
+    throw new GLException("Should not call this");
+  }
+  
+  public int getOffscreenContextHeight() {
+    throw new GLException("Should not call this");
+  }
+  
+  public int getOffscreenContextPixelDataType() {
+    throw new GLException("Should not call this");
+  }
+
+  public boolean offscreenImageNeedsVerticalFlip() {
+    throw new GLException("Should not call this");
+  }
 
   /**
    * Creates and initializes an appropriate OpenGl nsContext. Should only be
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java b/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java
index 431710a7c..1bbb32eda 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java
+++ b/src/net/java/games/jogl/impl/macosx/MacOSXOffscreenGLContext.java
@@ -43,48 +43,42 @@ import java.awt.image.BufferedImage;
 import net.java.games.jogl.*;
 import net.java.games.jogl.impl.*;
 
-public class MacOSXOffscreenGLContext extends MacOSXGLContext
-{
-  // Width and height of the underlying bitmap
-  private int  width;
-  private int  height;
-  
+public class MacOSXOffscreenGLContext extends MacOSXPbufferGLContext
+{  
   public MacOSXOffscreenGLContext(GLCapabilities capabilities,
                                   GLCapabilitiesChooser chooser,
                                   GLContext shareWith) {
-    super(null, capabilities, chooser, shareWith);
-  }
-	
-  protected GL createGL() {
-    return new MacOSXGLImpl(this);
+    super(capabilities, -1, -1);
   }
 	
   protected boolean isOffscreen() {
     return true;
   }
 	
+  public boolean offscreenImageNeedsVerticalFlip() {
+    return true;
+  }
+  
   public int getOffscreenContextBufferedImageType() {
       return BufferedImage.TYPE_INT_ARGB;
   }
 	
-  public int getOffscreenContextReadBuffer() {
-    return GL.GL_FRONT;
+  public int getOffscreenContextWidth() {
+      return initWidth;
   }
-	
-  public boolean offscreenImageNeedsVerticalFlip() {
-    // We can take care of this in the DIB creation (see below)
-    return false;
+
+  public int getOffscreenContextHeight() {
+      return initWidth;
   }
-	
-  public boolean canCreatePbufferContext() {
-    // For now say no
-    return false;
+
+  public int getOffscreenContextPixelDataType() {
+      return GL.GL_UNSIGNED_INT_8_8_8_8_REV;
   }
-	
-  public synchronized GLContext createPbufferContext(GLCapabilities capabilities, int initialWidth, int initialHeight) {
-    throw new GLException("Not supported");
+
+  public int getOffscreenContextReadBuffer() {
+    return GL.GL_BACK;
   }
-	
+
   public void bindPbufferToTexture() {
     throw new GLException("Should not call this");
   }
@@ -94,13 +88,12 @@ public class MacOSXOffscreenGLContext extends MacOSXGLContext
   }
 	
   protected synchronized boolean makeCurrent(Runnable initAction) throws GLException {
-    if (pendingOffscreenResize) {
+    if (pendingOffscreenResize && (nsContext != 0)) {
       if (pendingOffscreenWidth != width || pendingOffscreenHeight != height) {
-        if (nsContext != 0) {
-          destroy();
-        }
-        width  = pendingOffscreenWidth;
-        height = pendingOffscreenHeight;
+        destroyPBuffer();
+        initWidth  = pendingOffscreenWidth;
+        initHeight = pendingOffscreenHeight;
+        createPbuffer(0, 0);
         pendingOffscreenResize = false;
       }
     }
@@ -108,9 +101,5 @@ public class MacOSXOffscreenGLContext extends MacOSXGLContext
   }
 	
   protected synchronized void swapBuffers() throws GLException {
-  }
-	
-  private void destroy() {
-	free();
-  }
+  }	
 }
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java b/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java
index 97020de28..27b8a67f7 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java
+++ b/src/net/java/games/jogl/impl/macosx/MacOSXOnscreenGLContext.java
@@ -80,10 +80,6 @@ public class MacOSXOnscreenGLContext extends MacOSXGLContext {
     }
   }
 
-  protected GL createGL() {
-    return new MacOSXGLImpl(this);
-  }
-    
   protected boolean isOffscreen() {
     return false;
   }
diff --git a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java b/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java
index 70068ce63..5e2662b47 100644
--- a/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java
+++ b/src/net/java/games/jogl/impl/macosx/MacOSXPbufferGLContext.java
@@ -4,16 +4,20 @@ import net.java.games.jogl.*;
 import net.java.games.jogl.impl.*;
 
 public class MacOSXPbufferGLContext extends MacOSXGLContext {
+
   private static final boolean DEBUG = false;
+  
+  // see MacOSXWindowSystemInterface.m createPBuffer
+  private static final boolean USE_GL_TEXTURE_RECTANGLE_EXT = true;
 
-  private int  initWidth;
-  private int  initHeight;
+  protected int  initWidth;
+  protected int  initHeight;
 
   private long pBuffer;
   private int pBufferTextureName;
   
-  private int  width;
-  private int  height;
+  protected int  width;
+  protected int  height;
 
   // FIXME: kept around because we create the OpenGL context lazily to
   // better integrate with the MacOSXGLContext framework
@@ -23,10 +27,6 @@ public class MacOSXPbufferGLContext extends MacOSXGLContext {
     super(null, capabilities, null, null);
     this.initWidth  = initialWidth;
     this.initHeight = initialHeight;
-    if (initWidth <= 0 || initHeight <= 0) {
-      throw new GLException("Initial width and height of pbuffer must be positive (were (" +
-			    initWidth + ", " + initHeight + "))");
-    }
   }
 
   public boolean canCreatePbufferContext() {
@@ -61,14 +61,35 @@ public class MacOSXPbufferGLContext extends MacOSXGLContext {
 	
 	nsContextOfParent = parentContext;
 	
-	width = getNextPowerOf2(initWidth);
-	height = getNextPowerOf2(initHeight);
-	
+        if (USE_GL_TEXTURE_RECTANGLE_EXT)
+        {
+            // GL_TEXTURE_RECTANGLE_EXT
+            width = initWidth;
+            height = initHeight;
+        }
+        else
+        {
+            // GL_TEXTURE_2D
+            width = getNextPowerOf2(initWidth);
+            height = getNextPowerOf2(initHeight);
+        }
+        
     if (DEBUG) {
       System.err.println("Created pbuffer " + width + " x " + height);
     }
   }
 
+  public void destroyPBuffer() {
+    if (this.pBuffer != 0) {
+	CGL.destroyPBuffer(nsContext, pBuffer);
+    }
+	this.pBuffer = 0;
+        
+    if (DEBUG) {
+      System.err.println("Destroyed pbuffer " + width + " x " + height);
+    }
+  }
+
   public void handleModeSwitch(long parentView, long parentContext) {
     throw new GLException("Not yet implemented");
   }
@@ -79,18 +100,6 @@ public class MacOSXPbufferGLContext extends MacOSXGLContext {
     return false;
   }
 
-  public int getOffscreenContextBufferedImageType() {
-    throw new GLException("Should not call this");
-  }
-
-  public int getOffscreenContextReadBuffer() {
-    throw new GLException("Should not call this");
-  }
-
-  public boolean offscreenImageNeedsVerticalFlip() {
-    throw new GLException("Should not call this");
-  }
-
   protected void swapBuffers() throws GLException {
     // FIXME: do we need to do anything if the pbuffer is double-buffered?
   }