very early support for Retina in the OpenGL renderers

codeanticode · codeanticode · commit 2ab6b312f1d6 · 2014-08-03T10:12:25.000-04:00
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
+import javax.media.nativewindow.ScalableSurface;
 import javax.media.opengl.GL;
 import javax.media.opengl.GL2;
 import javax.media.opengl.GL2ES1;
@@ -57,6 +58,9 @@ public class PJOGL extends PGL {
   // OpenGL profile to use (2, 3 or 4)
   public static int PROFILE = 2;
 
+  // Enables/disables Retina support on OSX
+  public static boolean RETINA = false;
+
   // The two windowing toolkits available to use in JOGL:
   public static final int AWT  = 0; // http://jogamp.org/wiki/index.php/Using_JOGL_in_AWT_SWT_and_Swing
   public static final int NEWT = 1; // http://jogamp.org/jogl/doc/NEWT-Overview.html
@@ -150,15 +154,9 @@ public class PJOGL extends PGL {
   /** The AWT-OpenGL canvas */
   protected GLCanvas canvasAWT;
 
-  /** The shared AWT-OpenGL canvas */
-//  protected static GLCanvas sharedCanvasAWT;
-
   /** The NEWT window */
   protected GLWindow windowNEWT;
 
-  /** The shared NEWT window */
-//  protected static GLWindow sharedWindowNEWT;
-
   /** The NEWT-OpenGL canvas */
   protected NewtCanvasAWT canvasNEWT;
 
@@ -192,6 +190,12 @@ public class PJOGL extends PGL {
 
   // ........................................................
 
+  // Retina support
+
+  int retf = 1;
+
+  // ........................................................
+
   // Utility arrays to copy projection/modelview matrices to GL
 
   protected float[] projMatrix;
@@ -281,12 +285,10 @@ protected void initSurface(int antialias) {
     if (canvasAWT != null || canvasNEWT != null) {
       // Restarting...
       if (canvasAWT != null) {
-//        sharedCanvasAWT = null;
         canvasAWT.removeGLEventListener(listener);
         pg.parent.removeListeners(canvasAWT);
         pg.parent.remove(canvasAWT);
       } else if (canvasNEWT != null) {
-//        sharedWindowNEWT = null;
         windowNEWT.removeGLEventListener(listener);
         pg.parent.remove(canvasNEWT);
       }
@@ -334,11 +336,16 @@ protected void initSurface(int antialias) {
 
     if (WINDOW_TOOLKIT == AWT) {
       canvasAWT = new GLCanvas(caps);
-//      if (sharedCanvasAWT == null) {
-//        sharedCanvasAWT = canvasAWT;
-//      } else {
-//        canvasAWT.setSharedAutoDrawable(sharedCanvasAWT);
-//      }
+
+      if (RETINA) {
+        canvasAWT.setSurfaceScale(new int[] { ScalableSurface.AUTOMAX_PIXELSCALE,
+                                              ScalableSurface.AUTOMAX_PIXELSCALE });
+        retf = 2;
+      } else {
+        canvasAWT.setSurfaceScale(new int[] { ScalableSurface.IDENTITY_PIXELSCALE,
+                                              ScalableSurface.IDENTITY_PIXELSCALE });
+      }
+
       canvasAWT.setBounds(0, 0, pg.width, pg.height);
       canvasAWT.setBackground(new Color(pg.backgroundColor, true));
       canvasAWT.setFocusable(true);
@@ -347,15 +354,12 @@ protected void initSurface(int antialias) {
       pg.parent.add(canvasAWT, BorderLayout.CENTER);
       canvasAWT.requestFocusInWindow();
 
+
+
       canvas = canvasAWT;
       canvasNEWT = null;
     } else if (WINDOW_TOOLKIT == NEWT) {
       windowNEWT = GLWindow.create(caps);
-//      if (sharedWindowNEWT == null) {
-//        sharedWindowNEWT = windowNEWT;
-//      } else {
-//        windowNEWT.setSharedAutoDrawable(sharedWindowNEWT);
-//      }
       canvasNEWT = new NewtCanvasAWT(windowNEWT);
       canvasNEWT.setBounds(0, 0, pg.width, pg.height);
       canvasNEWT.setBackground(new Color(pg.backgroundColor, true));
@@ -365,6 +369,9 @@ protected void initSurface(int antialias) {
       pg.parent.add(canvasNEWT, BorderLayout.CENTER);
       canvasNEWT.requestFocusInWindow();
 
+      int[] reqSurfacePixelScale = new int[] { ScalableSurface.AUTOMAX_PIXELSCALE, ScalableSurface.AUTOMAX_PIXELSCALE };
+      windowNEWT.setSurfaceScale(reqSurfacePixelScale);
+
       canvas = canvasNEWT;
       canvasAWT = null;
     }
@@ -852,9 +859,8 @@ public void display(GLAutoDrawable glDrawable) {
           } else {
             // w/out multisampling, rendering is done on the back buffer.
             frontFBO = fboDrawable.getFBObject(GL.GL_FRONT);
-
-            backTexAttach  = fboDrawable.getTextureBuffer(GL.GL_BACK);
-            frontTexAttach = fboDrawable.getTextureBuffer(GL.GL_FRONT);
+            backTexAttach  = (FBObject.TextureAttachment) backFBO.getColorbuffer(0);
+            frontTexAttach = (FBObject.TextureAttachment) frontFBO.getColorbuffer(0);
           }
         }
       }
@@ -1776,7 +1782,7 @@ public void depthRangef(float n, float f) {
 
   @Override
   public void viewport(int x, int y, int w, int h) {
-    gl.glViewport(x, y, w, h);
+    gl.glViewport(retf * x, retf * y, retf * w, retf * h);
   }
 
   //////////////////////////////////////////////////////////////////////////////
@@ -2298,7 +2304,7 @@ public String getProgramInfoLog(int program) {
 
   @Override
   public void scissor(int x, int y, int w, int h) {
-    gl.glScissor(x, y, w, h);
+    gl.glScissor(retf * x, retf * y, retf * w, retf * h);
   }
 
   @Override
