1 files changed, 18 insertions, 25 deletions

diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
index 4d6b85bbd..b1eca9b20 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
@@ -104,10 +104,6 @@ public class UIShapeDemo01 implements GLEventListener {
         final GLProfile glp = GLProfile.getGL2ES2();
         final GLCapabilities caps = new GLCapabilities(glp);
         caps.setAlphaBits(4);
-        if( false ) {
-            caps.setSampleBuffers(true);
-            caps.setNumSamples(4);
-        }
         System.out.println("Requested: " + caps);
 
         final int renderModes = Region.COLORCHANNEL_RENDERING_BIT | Region.VBAA_RENDERING_BIT;
@@ -248,12 +244,11 @@ public class UIShapeDemo01 implements GLEventListener {
         shape.setTransform(pmv);
         shape.draw(gl, renderer, sampleCount);
         if( once ) {
-            final int[] winPosSize = { 0, 0 };
             System.err.println("draw.0: "+shape);
-            boolean ok = shape.getSurfaceSize(pmv, renderer.getViewport(), winPosSize);
-            System.err.println("draw.1: ok "+ok+", surfaceSize "+winPosSize[0]+" x "+winPosSize[1]);
-            ok = shape.objToWinCoord(pmv, renderer.getViewport(), shape.getPosition(), winPosSize);
-            System.err.println("draw.2: ok "+ok+",    winCoord "+winPosSize[0]+" x "+winPosSize[1]);
+            final int[] winSize = shape.getSurfaceSize(pmv, renderer.getViewport(), new int[2]);
+            System.err.println("draw.1: surfaceSize "+winSize[0]+" x "+winSize[1]);
+            final int[] winPos = shape.shapeToWinCoord(pmv, renderer.getViewport(), shape.getPosition(), new int[2]);
+            System.err.println("draw.2: winCoord "+winPos[0]+" x "+winPos[1]);
         }
         pmv.glPopMatrix();
     }
@@ -405,14 +400,16 @@ public class UIShapeDemo01 implements GLEventListener {
                         pmv.glPushMatrix();
                         button.setTransform(pmv);
 
-                        final float[] objPos = new float[3];
                         System.err.println("\n\nButton: "+button);
-                        button.winToObjCoord(pmv, viewport, glWinX, glWinY, objPos);
-                        System.err.println("Button: Click: Win "+glWinX+"/"+glWinY+" -> Obj "+objPos[0]+"/"+objPos[1]+"/"+objPos[1]);
+                        final float[] objPos = button.winToShapeCoord(pmv, viewport, glWinX, glWinY, new float[3]);
+                        if( null != objPos ) {
+                            System.err.println("Button: Click: Win "+glWinX+"/"+glWinY+" -> Obj "+objPos[0]+"/"+objPos[1]+"/"+objPos[1]);
+                        }
 
-                        final int[] surfaceSize = new int[2];
-                        button.getSurfaceSize(pmv, viewport, surfaceSize);
-                        System.err.println("Button: Size: Pixel "+surfaceSize[0]+" x "+surfaceSize[1]);
+                        final int[] surfaceSize = button.getSurfaceSize(pmv, viewport, new int[2]);
+                        if( null != surfaceSize ) {
+                            System.err.println("Button: Size: Pixel "+surfaceSize[0]+" x "+surfaceSize[1]);
+                        }
 
                         pmv.glPopMatrix();
                     }
@@ -421,18 +418,15 @@ public class UIShapeDemo01 implements GLEventListener {
                         crossHair.setTransform(pmv);
 
                         final float[] objPosC = crossHair.getBounds().getCenter();
-                        final int[] objWinPos = new int[2];
                         System.err.println("\n\nCrossHair: "+crossHair);
-                        if( crossHair.objToWinCoord(pmv, viewport, objPosC, objWinPos) ) {
-                            System.err.println("CrossHair: Obj: Obj "+objPosC[0]+"/"+objPosC[1]+"/"+objPosC[1]+" -> Win "+objWinPos[0]+"/"+objWinPos[1]);
-                        }
+                        final int[] objWinPos = crossHair.shapeToWinCoord(pmv, viewport, objPosC, new int[2]);
+                        System.err.println("CrossHair: Obj: Obj "+objPosC[0]+"/"+objPosC[1]+"/"+objPosC[1]+" -> Win "+objWinPos[0]+"/"+objWinPos[1]);
 
-                        final float[] objPos2 = new float[3];
-                        crossHair.winToObjCoord(pmv, viewport, objWinPos[0], objWinPos[1], objPos2);
+                        final float[] objPos2 = crossHair.winToShapeCoord(pmv, viewport, objWinPos[0], objWinPos[1], new float[3]);
                         System.err.println("CrossHair: Obj: Win "+objWinPos[0]+"/"+objWinPos[1]+" -> Obj "+objPos2[0]+"/"+objPos2[1]+"/"+objPos2[1]);
 
-                        final float[] winObjPos = new float[3];
-                        if( crossHair.winToObjCoord(pmv, viewport, glWinX, glWinY, winObjPos) ) {
+                        final float[] winObjPos = crossHair.winToShapeCoord(pmv, viewport, glWinX, glWinY, new float[3]);
+                        if( null != winObjPos ) {
                             // final float[] translate = crossHair.getTranslate();
                             // final float[] objPosT = new float[] { objPosC[0]+translate[0], objPosC[1]+translate[1], objPosC[2]+translate[2] };
                             final float dx = winObjPos[0] - objPosC[0];
@@ -446,8 +440,7 @@ public class UIShapeDemo01 implements GLEventListener {
                             }
                         }
 
-                        final int[] surfaceSize = new int[2];
-                        crossHair.getSurfaceSize(pmv, viewport, surfaceSize);
+                        final int[] surfaceSize = crossHair.getSurfaceSize(pmv, viewport, new int[2]);
                         System.err.println("CrossHair: Size: Pixel "+surfaceSize[0]+" x "+surfaceSize[1]);
 
                         pmv.glPopMatrix();