Merge pull request ClearVolume#3 from ClearVolume/RetinaTextRendering

Proper detection of rendering on Retina displays

Author: royerloic

src/java/cleargl/ClearGLWindow.java

@@ -13,6 +13,7 @@
 import com.jogamp.newt.event.MouseListener;
 import com.jogamp.newt.event.WindowAdapter;
 import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.GL;
 import com.jogamp.opengl.DefaultGLCapabilitiesChooser;
 import com.jogamp.opengl.GLAutoDrawable;
 import com.jogamp.opengl.GLCapabilities;
@@ -276,12 +277,12 @@ public void setOrthoProjectionMatrix(	final float left,
 																				final float zFar)
 	{
 		if (mProjectionMatrix != null)
-			mProjectionMatrix.setOrthoProjectionMatrix(	left,
-																									right,
-																									bottom,
-																									top,
-																									zNear,
-																									zFar);
+			mProjectionMatrix.setOrthoProjectionMatrix(left,
+              right,
+              bottom,
+              top,
+              zNear,
+              zFar);
 	}
 
 	/* (non-Javadoc)
@@ -385,6 +386,21 @@ public void display()
 		mGlWindow.display();
 	}
 
+	public static boolean isRetina(GL pGL) {
+		int[] trialSizes = new int[2];
+
+		trialSizes[0] = 512;
+		trialSizes[1] = 512;
+
+		pGL.getContext().getGLDrawable().getNativeSurface().convertToPixelUnits(trialSizes);
+
+		if(trialSizes[0] == 512 && trialSizes[1] == 512) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
 	/* (non-Javadoc)
 	 * @see cleargl.ClearGLDisplayable#setDefaultCloseOperation(javax.media.nativewindow.WindowClosingProtocol.WindowClosingMode)
 	 */

src/java/cleargl/ClearTextRenderer.java

@@ -78,12 +78,14 @@ public void drawTextAtPosition(	String text,
 			font = new JLabel().getFont();
 		}
 
+    final int scaleFactor = ClearGLWindow.isRetina(mGL) ? 2 : 1;
+
 		final int windowSizeX = mGL.getContext()
 																.getGLDrawable()
-																.getSurfaceWidth() / 2;
+																.getSurfaceWidth() / scaleFactor;
 		final int windowSizeY = mGL.getContext()
 																.getGLDrawable()
-																.getSurfaceHeight() / 2;
+																.getSurfaceHeight() / scaleFactor;
 
 		final int width = text.length() * font.getSize();
 		final int height = font.getSize();