Graph UI: Apply API changes to demos *WIP* (not all working yet, but compile clean)

7 files changed, 675 insertions, 265 deletions

diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneGLListener0A.java b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneGLListener0A.java
index 5dee77f2a..90a127e29 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneGLListener0A.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneGLListener0A.java
@@ -447,30 +447,6 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new Button(SVertex.factory(), renderModes, font, "+", buttonXSize, buttonYSize);
-            button.move(xStartLeft - diffX*j,yStartTop - diffY*k, 0f);
-            button.addMouseListener(new Shape.MouseGestureAdapter() {
-                @Override
-                public void mouseClicked(final MouseEvent e) {
-                    final Shape.EventInfo shapeEvent = (Shape.EventInfo) e.getAttachment();
-                    // rel position to center
-                    final float dx = shapeEvent.objPos[0] - shapeEvent.shape.getBounds().getCenter()[0] ;
-                    final float dy = shapeEvent.objPos[1] - shapeEvent.shape.getBounds().getCenter()[1] ;
-                    // per-cent position to center (remove dependency on dimension)
-                    final float awdx = Math.abs(dx)/shapeEvent.shape.getBounds().getWidth();
-                    final float awdy = Math.abs(dy)/shapeEvent.shape.getBounds().getHeight();
-                    float tx = 0, ty = 0;
-                    if ( awdx > awdy  ) {
-                        tx = dx < 0 ? -5 : 5;
-                    } else {
-                        ty = dy < 0 ? -5 : 5;
-                    }
-                    translateButtons(tx, ty, 0f);
-                } } );
-            button.addMouseListener(dragZoomRotateListener);
-            buttons.add(button);
-            k++;
-
             button = new Button(SVertex.factory(), renderModes, font, "< Space >", buttonXSize, buttonYSize);
             button.move(xStartLeft - diffX*j,yStartTop - diffY*k, 0f);
             button.addMouseListener(new Shape.MouseGestureAdapter() {
@@ -665,7 +641,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
     private void setupUI(final GLAutoDrawable drawable) {
         final float[/*2*/] sceneSize = { 0f, 0f };
-        scene.surfaceToObjSize(drawable.getSurfaceWidth(), drawable.getSurfaceHeight(), sceneSize);
+        scene.surfaceToPlaneSize(new int[] { 0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight()}, sceneSize);
 
         final float modelSizeFixed = fontSizeFixedPVV * sceneSize[1];
         jogampLabel = new Label(scene.getVertexFactory(), renderModes, font, modelSizeFixed, jogamp);
@@ -798,12 +774,12 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
         final float dxMiddleAbs = scene.getBounds().getWidth() * relMiddle;
         final float dyTopLabelAbs = scene.getBounds().getHeight() - 2f*jogampLabel.getLineHeight();
-        jogampLabel.setPosition(dxMiddleAbs, dyTopLabelAbs, dz);
-        truePtSizeLabel.setPosition(dxMiddleAbs, dyTopLabelAbs, dz);
-        truePtSizeLabel.setPosition(dxMiddleAbs, dyTopLabelAbs - 1.5f * jogampLabel.getLineHeight(), 0f);
+        jogampLabel.moveTo(dxMiddleAbs, dyTopLabelAbs, dz);
+        truePtSizeLabel.moveTo(dxMiddleAbs, dyTopLabelAbs, dz);
+        truePtSizeLabel.moveTo(dxMiddleAbs, dyTopLabelAbs - 1.5f * jogampLabel.getLineHeight(), 0f);
         fpsLabel.move(0f, 0f, 0f);
         if( null != labels[currentText] ) {
-            labels[currentText].setPosition(dxMiddleAbs,
+            labels[currentText].moveTo(dxMiddleAbs,
                     dyTopLabelAbs - 1.5f * jogampLabel.getLineHeight()
                     - 1.5f * truePtSizeLabel.getLineHeight(), 0f);
             System.err.println("Label["+currentText+"] MOVE: "+labels[currentText]);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneNewtDemo.java b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneNewtDemo.java
index b62b156da..52ffee2db 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneNewtDemo.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneNewtDemo.java
@@ -54,10 +54,10 @@ public class GPUUISceneNewtDemo {
     }
 
     public static void main(final String[] args) {
-        int SceneMSAASamples = 0;
-        boolean GraphVBAAMode = false;
-        boolean GraphMSAAMode = false;
-        float GraphAutoMode = GPUUISceneGLListener0A.DefaultNoAADPIThreshold;
+        int sceneMSAASamples = 0;
+        boolean graphVBAAMode = true;
+        boolean graphMSAAMode = false;
+        float graphAutoMode = 0; // GPUUISceneGLListener0A.DefaultNoAADPIThreshold;
 
         final float[] reqSurfacePixelScale = new float[] { ScalableSurface.AUTOMAX_PIXELSCALE, ScalableSurface.AUTOMAX_PIXELSCALE };
 
@@ -73,25 +73,30 @@ public class GPUUISceneNewtDemo {
 
         if( 0 != args.length ) {
             for(int i=0; i<args.length; i++) {
-                if(args[i].equals("-smsaa")) {
+                if(args[i].equals("-gnone")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                    graphAutoMode = 0f;
+                } else if(args[i].equals("-smsaa")) {
                     i++;
-                    SceneMSAASamples = MiscUtils.atoi(args[i], SceneMSAASamples);
-                    GraphMSAAMode = false;
-                    GraphVBAAMode = false;
-                    GraphAutoMode = 0f;
+                    sceneMSAASamples = MiscUtils.atoi(args[i], sceneMSAASamples);
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                    graphAutoMode = 0f;
                 } else if(args[i].equals("-gmsaa")) {
-                    GraphMSAAMode = true;
-                    GraphVBAAMode = false;
-                    GraphAutoMode = 0f;
+                    graphMSAAMode = true;
+                    graphVBAAMode = false;
+                    graphAutoMode = 0f;
                 } else if(args[i].equals("-gvbaa")) {
-                    GraphMSAAMode = false;
-                    GraphVBAAMode = true;
-                    GraphAutoMode = 0f;
+                    graphMSAAMode = false;
+                    graphVBAAMode = true;
+                    graphAutoMode = 0f;
                 } else if(args[i].equals("-gauto")) {
-                    GraphMSAAMode = false;
-                    GraphVBAAMode = true;
+                    graphMSAAMode = false;
+                    graphVBAAMode = true;
                     i++;
-                    GraphAutoMode = MiscUtils.atof(args[i], GraphAutoMode);
+                    graphAutoMode = MiscUtils.atof(args[i], graphAutoMode);
                 } else if(args[i].equals("-font")) {
                     i++;
                     fontfilename = args[i];
@@ -125,10 +130,10 @@ public class GPUUISceneNewtDemo {
         System.err.println("forceGL3   "+forceGL3);
         System.err.println("forceGLDef "+forceGLDef);
         System.err.println("Desired win size "+width+"x"+height);
-        System.err.println("Scene MSAA Samples "+SceneMSAASamples);
-        System.err.println("Graph MSAA Mode "+GraphMSAAMode);
-        System.err.println("Graph VBAA Mode "+GraphVBAAMode);
-        System.err.println("Graph Auto Mode "+GraphAutoMode+" no-AA dpi threshold");
+        System.err.println("Scene MSAA Samples "+sceneMSAASamples);
+        System.err.println("Graph MSAA Mode "+graphMSAAMode);
+        System.err.println("Graph VBAA Mode "+graphVBAAMode);
+        System.err.println("Graph Auto Mode "+graphAutoMode+" no-AA dpi threshold");
 
         final Display dpy = NewtFactory.createDisplay(null);
         final Screen screen = NewtFactory.createScreen(dpy, 0);
@@ -150,32 +155,32 @@ public class GPUUISceneNewtDemo {
         System.err.println("GLProfile: "+glp);
         final GLCapabilities caps = new GLCapabilities(glp);
         caps.setAlphaBits(4);
-        if( SceneMSAASamples > 0 ) {
+        if( sceneMSAASamples > 0 ) {
             caps.setSampleBuffers(true);
-            caps.setNumSamples(SceneMSAASamples);
+            caps.setNumSamples(sceneMSAASamples);
         }
         System.out.println("Requested: " + caps);
 
-        final int rmode;
-        if( GraphVBAAMode ) {
-            rmode = Region.VBAA_RENDERING_BIT;
-        } else if( GraphMSAAMode ) {
-            rmode = Region.MSAA_RENDERING_BIT;
+        final int renderModes;
+        if( graphVBAAMode ) {
+            renderModes = Region.VBAA_RENDERING_BIT;
+        } else if( graphMSAAMode ) {
+            renderModes = Region.MSAA_RENDERING_BIT;
         } else {
-            rmode = 0;
+            renderModes = 0;
         }
 
         final GLWindow window = GLWindow.create(screen, caps);
-        if( 0 == SceneMSAASamples ) {
+        if( 0 == sceneMSAASamples ) {
             window.setCapabilitiesChooser(new NonFSAAGLCapsChooser(true));
         }
         window.setSize(width, height);
-        window.setTitle("GraphUI Newt Demo: graph["+Region.getRenderModeString(rmode)+"], msaa "+SceneMSAASamples);
+        window.setTitle("GraphUI Newt Demo: graph["+Region.getRenderModeString(renderModes)+"], msaa "+sceneMSAASamples);
         window.setSurfaceScale(reqSurfacePixelScale);
         // final float[] valReqSurfacePixelScale = window.getRequestedSurfaceScale(new float[2]);
 
-        final GPUUISceneGLListener0A scene = 0 < GraphAutoMode ? new GPUUISceneGLListener0A(fontfilename, filmURL, GraphAutoMode, DEBUG, TRACE) :
-                                                                 new GPUUISceneGLListener0A(fontfilename, filmURL, rmode, DEBUG, TRACE);
+        final GPUUISceneGLListener0A scene = 0 < graphAutoMode ? new GPUUISceneGLListener0A(fontfilename, filmURL, graphAutoMode, DEBUG, TRACE) :
+                                                                 new GPUUISceneGLListener0A(fontfilename, filmURL, renderModes, DEBUG, TRACE);
         window.addGLEventListener(scene);
 
         final Animator animator = new Animator();
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneTextAnim01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneTextAnim01.java
index 19fa5f0a6..b36bb4635 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneTextAnim01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/GPUUISceneTextAnim01.java
@@ -220,7 +220,7 @@ public class GPUUISceneTextAnim01 implements GLEventListener {
 
         final float dxMiddleAbs = width * relMiddle;
         final float dyTopLabelAbs = drawable.getSurfaceHeight() - 2f*jogampLabel.getLineHeight();
-        jogampLabel.setPosition(dxMiddleAbs, dyTopLabelAbs, dz);
+        jogampLabel.moveTo(dxMiddleAbs, dyTopLabelAbs, dz);
         fpsLabel.move(0f, 0f, 0f);
 
         scene.reshape(drawable, x, y, width, height);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
index bc2353bb1..8a39bd36d 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
@@ -30,23 +30,20 @@ package com.jogamp.opengl.demos.graph.ui;
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
-import java.util.Locale;
 
 import com.jogamp.common.net.Uri;
 import com.jogamp.common.util.InterruptSource;
 import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.curve.opengl.RegionRenderer;
 import com.jogamp.graph.font.Font;
 import com.jogamp.graph.font.FontFactory;
 import com.jogamp.graph.font.FontSet;
 import com.jogamp.graph.geom.SVertex;
-import com.jogamp.graph.geom.plane.AffineTransform;
 import com.jogamp.graph.ui.gl.Scene;
 import com.jogamp.graph.ui.gl.Shape;
 import com.jogamp.graph.ui.gl.shapes.Button;
+import com.jogamp.graph.ui.gl.shapes.CrossHair;
 import com.jogamp.graph.ui.gl.shapes.GLButton;
 import com.jogamp.graph.ui.gl.shapes.MediaButton;
-import com.jogamp.newt.Window;
 import com.jogamp.newt.event.KeyAdapter;
 import com.jogamp.newt.event.KeyEvent;
 import com.jogamp.newt.event.MouseEvent;
@@ -54,16 +51,13 @@ import com.jogamp.newt.event.WindowAdapter;
 import com.jogamp.newt.event.WindowEvent;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.GL;
-import com.jogamp.opengl.GL2ES2;
-import com.jogamp.opengl.GLAutoDrawable;
 import com.jogamp.opengl.GLCapabilities;
 import com.jogamp.opengl.GLEventListener;
-import com.jogamp.opengl.GLPipelineFactory;
 import com.jogamp.opengl.GLProfile;
 import com.jogamp.opengl.demos.es2.GearsES2;
-import com.jogamp.opengl.demos.graph.MSAATool;
+import com.jogamp.opengl.demos.util.MiscUtils;
+import com.jogamp.opengl.math.geom.AABBox;
 import com.jogamp.opengl.util.Animator;
-import com.jogamp.opengl.util.GLReadBufferUtil;
 import com.jogamp.opengl.util.PMVMatrix;
 import com.jogamp.opengl.util.av.GLMediaPlayer;
 import com.jogamp.opengl.util.av.GLMediaPlayerFactory;
@@ -71,7 +65,7 @@ import com.jogamp.opengl.util.av.GLMediaPlayerFactory;
 /**
  * Basic UIScene demo using a single UIShape.
  */
-public class UISceneDemo01 implements GLEventListener {
+public class UISceneDemo01 {
     static final boolean DEBUG = false;
     static final boolean TRACE = false;
 
@@ -79,10 +73,34 @@ public class UISceneDemo01 implements GLEventListener {
     static private String filmPath = defaultMediaPath;
 
     public static void main(final String[] args) throws IOException {
+        int sceneMSAASamples = 0;
+        boolean graphVBAAMode = true;
+        boolean graphMSAAMode = false;
+
         Font font = null;
+
+        final int width = 1280, height = 720;
+
         if( 0 != args.length ) {
             for(int i=0; i<args.length; i++) {
-                if(args[i].equals("-font")) {
+                if(args[i].equals("-gnone")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-smsaa")) {
+                    i++;
+                    sceneMSAASamples = MiscUtils.atoi(args[i], sceneMSAASamples);
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-gmsaa")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = true;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-gvbaa")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = false;
+                    graphVBAAMode = true;
+                } else if(args[i].equals("-font")) {
                     i++;
                     font = FontFactory.get(new File(args[i]));
                 } else if(args[i].equals("-film")) {
@@ -99,19 +117,66 @@ public class UISceneDemo01 implements GLEventListener {
         final GLProfile glp = GLProfile.getGL2ES2();
         final GLCapabilities caps = new GLCapabilities(glp);
         caps.setAlphaBits(4);
-        caps.setSampleBuffers(true);
-        caps.setNumSamples(4);
+        if( sceneMSAASamples > 0 ) {
+            caps.setSampleBuffers(true);
+            caps.setNumSamples(sceneMSAASamples);
+        }
         System.out.println("Requested: " + caps);
 
+        final int renderModes;
+        if( graphVBAAMode ) {
+            renderModes = Region.VBAA_RENDERING_BIT;
+        } else if( graphMSAAMode ) {
+            renderModes = Region.MSAA_RENDERING_BIT;
+        } else {
+            renderModes = 0;
+        }
+
+        final Scene scene = new Scene();
+        scene.setClearParams(new float[] { 1f, 1f, 1f, 1f}, GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+
+        final Shape shape = makeShape(font, renderModes);
+        if( false ) {
+        shape.onMove(new Shape.Listener() {
+            @Override
+            public void run(final Shape shape) {
+                final float[] p = shape.getPosition();
+                System.err.println("Shape moved: "+p[0]+", "+p[1]+", "+p[2]);
+            }
+        });
+        shape.addMouseListener(new Shape.MouseGestureAdapter() {
+            @Override
+            public void mouseMoved(final MouseEvent e) {
+                final int[] viewport = scene.getViewport(new int[4]);
+                // flip to GL window coordinates, origin bottom-left
+                final int glWinX = e.getX();
+                final int glWinY = viewport[3] - e.getY() - 1;
+                testProject(scene, shape, glWinX, glWinY);
+            }
+            @Override
+            public void mouseDragged(final MouseEvent e) {
+                final int[] viewport = scene.getViewport(new int[4]);
+                // flip to GL window coordinates, origin bottom-left
+                final int glWinX = e.getX();
+                final int glWinY = viewport[3] - e.getY() - 1;
+                testProject(scene, shape, glWinX, glWinY);
+            }
+        } );
+        }
+        scene.addShape(shape);
+
+        final AABBox shapeBox = shape.getBounds(glp);
+        System.err.println("m0 "+shape);
+
+
+        // scene.surfaceToPlaneSize(width, height, null);
+
         final GLWindow window = GLWindow.create(caps);
-        // window.setPosition(10, 10);
-        window.setSize(800, 400);
+        window.setSize(width, height);
         window.setTitle(UISceneDemo01.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
-        // final int renderModes = Region.COLORCHANNEL_RENDERING_BIT | Region.VBAA_RENDERING_BIT;
-        final int renderModes = Region.COLORCHANNEL_RENDERING_BIT;
         window.setVisible(true);
-        final UISceneDemo01 uiGLListener = new UISceneDemo01(font, renderModes, window.getSurfaceWidth(), window.getSurfaceHeight(), DEBUG, TRACE);
-        window.addGLEventListener(uiGLListener);
+        window.addGLEventListener(scene);
+        scene.attachInputListenerTo(window);
 
         final Animator animator = new Animator();
         animator.setUpdateFPSFrames(5*60, null);
@@ -137,43 +202,65 @@ public class UISceneDemo01 implements GLEventListener {
         });
 
         animator.start();
-    }
-
-    @SuppressWarnings("unused")
-    private final Font font;
-
-    private final GLReadBufferUtil screenshot;
-    private final int renderModes;
-    private final boolean debug;
-    private final boolean trace;
-
-    private final Scene scene;
-    private final Shape shape;
-
-    private final float[] position = new float[] {0,0,0};
 
-    boolean ignoreInput = false;
+        scene.waitUntilDisplayed();
+
+        final AABBox sceneBox = scene.getBounds();
+        final float[] surfaceSize = { 0f, 0f };
+        scene.surfaceToPlaneSize(scene.getViewport(), surfaceSize);
+
+        System.err.println("m1 scene "+surfaceSize[0]+" x "+surfaceSize[1]);
+        System.err.println("m1 scene "+sceneBox);
+        System.err.println("m1.0 "+shape);
+        // shape.moveTo(-shapeBox.getWidth()/2f, -shapeBox.getHeight()/2f, 0f);
+        shape.scale(sceneBox.getWidth(), sceneBox.getWidth(), 1f);
+        System.err.println("m1.1 "+shape);
+        shape.scale(0.4f,  0.4f, 1f);
+        System.err.println("m1.2 "+shape);
+        try { Thread.sleep(1000); } catch (final InterruptedException e1) { }
+
+        final float min = sceneBox.getMinX();
+        final float max = sceneBox.getMaxX(); // - shapeBox.getWidth(); //  * shape.getScaleX();
+        // shape.moveTo(min, -shapeBox.getHeight()/2f, 0f);
+        shape.moveTo(min, 0f, 0f);
+        if( false ) {
+        try { Thread.sleep(1000); } catch (final InterruptedException e1) { }
+        final float step = (max-min)/200f;
+        System.err.println("m2 ["+min+" .. "+max+"], step "+step);
+        for(float x=min; x < max; x+=step) {
+            shape.move(step, 0f, 0f);
+            // System.err.println(shape);
+            final int[] glWinPos = new int[2];
+            final boolean ok = shape.objToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), shape.getBounds().getCenter(), new PMVMatrix(), glWinPos);
+            // System.err.printf("m3: objToWinCoord: ok "+ok+", winCoords %d / %d%n", glWinPos[0], glWinPos[1]);
+            // demo.testProject(glWinPos[0], glWinPos[1]);
+            // window.warpPointer(glWinPos[0], window.getHeight() - glWinPos[1] - 1);
+            System.err.println("mm x "+x+", ["+min+" .. "+max+"], step "+step);
+            try { Thread.sleep(10); } catch (final InterruptedException e1) { }
+        }
+        }
+        System.err.println("X");
+    }
 
-    protected final AffineTransform tempT1 = new AffineTransform();
-    protected final AffineTransform tempT2 = new AffineTransform();
+    static void testProject(final Scene scene, final Shape shape, final int glWinX, final int glWinY) {
+        final float[] objPos = new float[3];
+        final int[] glWinPos = new int[2];
+        final PMVMatrix pmv = new PMVMatrix();
+        boolean ok = shape.winToObjCoord(scene.getPMVMatrixSetup(), scene.getViewport(), glWinX, glWinY, pmv, objPos);
+        System.err.printf("MM1: winToObjCoord: ok "+ok+", obj [%25.20ff, %25.20ff, %25.20ff]%n", objPos[0], objPos[1], objPos[2]);
+        ok = shape.objToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), objPos, pmv, glWinPos);
+        final int windx = glWinPos[0]-glWinX;
+        final int windy = glWinPos[1]-glWinY;
+        System.err.printf("MM2: objToWinCoord: ok "+ok+", winCoords %d / %d, diff %d x %d%n", glWinPos[0], glWinPos[1], windx, windy);
+    }
 
     @SuppressWarnings("unused")
-    public UISceneDemo01(final Font font, final int renderModes, final int width, final int height, final boolean debug, final boolean trace) {
-        this.font = font;
-        this.renderModes = renderModes;
-        this.debug = debug;
-        this.trace = trace;
-        this.screenshot = new GLReadBufferUtil(false, false);
-
-        scene = new Scene();
-        final float[/*2*/] sceneSize = { 0f, 0f };
-        scene.surfaceToObjSize(width, height, sceneSize);
-        System.err.println("Scene "+width+" x "+height+" pixel -> "+sceneSize[0]+" x "+sceneSize[1]+" model");
-        final float sw = 1/3f * sceneSize[0];
-        final float sh = sw / 2f;
+    static Shape makeShape(final Font font, final int renderModes) {
+        final float sw = 0.2f;
+        final float sh = sw / 2.5f;
         System.err.println("Shape "+sw+" x "+sh);
 
-        if( true ) {
+        if( false ) {
             Uri filmUri;
             try {
                 filmUri = Uri.cast( filmPath );
@@ -194,8 +281,8 @@ public class UISceneDemo01 implements GLEventListener {
                     mPlayer.setAudioVolume( b.isToggleOn() ? 1f : 0f );
                 } } );
             mPlayer.playStream(filmUri, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.TEXTURE_COUNT_DEFAULT);
-            shape = b;
-        } else if( true ) {
+            return b;
+        } else if( false ) {
             final GLEventListener glel;
             {
                 final GearsES2 gears = new GearsES2(0);
@@ -204,154 +291,25 @@ public class UISceneDemo01 implements GLEventListener {
                 glel = gears;
             }
             final int texUnit = 1;
-            final GLButton b = new GLButton(scene.getVertexFactory(), renderModes,
+            final GLButton b = new GLButton(SVertex.factory(), renderModes,
                                             sw, sh, texUnit, glel, false /* useAlpha */);
             b.setToggleable(true);
             b.setToggle(true); // toggle == true -> animation
             b.setAnimate(true);
-            b.addMouseListener(shapeGesture);
             b.addMouseListener(new Shape.MouseGestureAdapter() {
                 @Override
                 public void mouseClicked(final MouseEvent e) {
                     b.setAnimate( b.isToggleOn() );
                 } } );
-            shape = b;
+            return b;
+        } else if( true ){
+            final Button b = new Button(SVertex.factory(), renderModes, font, "+", sw, sh);
+            // b.setLabelColor(0.0f,0.0f,0.0f);
+            b.setCorner(0.0f);
+            return b;
         } else {
-            final Button b = new Button(SVertex.factory(), renderModes, font, "Click me!", sw, sh);
-            b.setLabelColor(0.0f,0.0f,0.0f);
-            b.addMouseListener(shapeGesture);
-            shape = b;
+            final CrossHair b = new CrossHair(SVertex.factory(), renderModes, sw, sw, 1f/100f);
+            return b;
         }
-        shape.move((sceneSize[0] - sw)/2f, (sceneSize[1] - sh)/2f, 0f); // center
-        scene.addShape(shape);
-    }
-
-    final Shape.MouseGestureAdapter shapeGesture = new Shape.MouseGestureAdapter() {
-        @Override
-        public void mouseClicked(final MouseEvent e) {
-            final Shape.EventInfo shapeEvent = (Shape.EventInfo) e.getAttachment();
-            System.err.println("Shape.EventInfo: "+shapeEvent);
-            final Shape s = shapeEvent.shape;
-
-            final RegionRenderer renderer = scene.getRenderer();
-            final PMVMatrix pmv = new PMVMatrix();
-            scene.setupMatrix(pmv, 0, 0);
-
-            // flip to GL window coordinates, origin bottom-left
-            final int[] viewport = renderer.getViewport(new int[4]);
-            final int glWinX = e.getX();
-            final int glWinY = viewport[3] - e.getY() - 1;
-            {
-                pmv.glPushMatrix();
-                s.setTransform(pmv);
-
-                final float[] objPos = new float[3];
-                s.winToObjCoord(pmv, viewport, glWinX, glWinY, objPos);
-                System.err.println("Button: Click: Win "+glWinX+"/"+glWinY+" -> Obj "+objPos[0]+"/"+objPos[1]+"/"+objPos[1]);
-
-                final int[] surfaceSize = new int[2];
-                s.getSurfaceSize(pmv, viewport, surfaceSize);
-                System.err.println("Button: Size: Pixel "+surfaceSize[0]+" x "+surfaceSize[1]);
-
-                pmv.glPopMatrix();
-            }
-        } };
-
-    public final float[] getPosition() { return position; }
-
-    @Override
-    public void init(final GLAutoDrawable drawable) {
-        GL2ES2 gl = drawable.getGL().getGL2ES2();
-        if(debug) {
-            gl = gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", null, gl, null) ).getGL2ES2();
-        }
-        if(trace) {
-            gl = gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2();
-        }
-
-        if(drawable instanceof GLWindow) {
-            final GLWindow glw = (GLWindow) drawable;
-            scene.attachInputListenerTo(glw);
-        }
-        gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
-
-        gl.setSwapInterval(1);
-        gl.glEnable(GL.GL_DEPTH_TEST);
-        gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
-        MSAATool.dump(drawable);
-
-        System.err.println("Init: Shape "+shape);
-        scene.init(drawable);
-    }
-
-    @Override
-    public void reshape(final GLAutoDrawable drawable, final int xstart, final int ystart, final int width, final int height) {
-        // Layout all shapes: Just stay centered
-        //
-        // shape.move(0f, 0f, 0f);
-        System.err.println("Reshape: Shape "+shape);
-
-        System.err.println("Reshape: Scene Plane.R "+scene.getBounds());
-
-        scene.reshape(drawable, xstart, ystart, width, height);
-
-        System.err.println("Reshape: Scene Plane.R "+scene.getBounds());
-
-        if( drawable instanceof Window ) {
-            ((Window)drawable).setTitle(UISceneDemo01.class.getSimpleName()+": "+drawable.getSurfaceWidth()+" x "+drawable.getSurfaceHeight());
-        }
-    }
-
-    final int[] sampleCount = { 4 };
-
-    @Override
-    public void display(final GLAutoDrawable drawable) {
-        scene.display(drawable);
-        if( once ) {
-            once = false;
-            final RegionRenderer renderer = scene.getRenderer();
-            final PMVMatrix pmv = renderer.getMatrix();
-            pmv.glPushMatrix();
-            shape.setTransform(pmv);
-
-            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]);
-
-            pmv.glPopMatrix();
-        }
-    }
-    static boolean once = true;
-
-    @Override
-    public void dispose(final GLAutoDrawable drawable) {
-        final GL2ES2 gl = drawable.getGL().getGL2ES2();
-        scene.dispose(drawable); // disposes all registered UIShapes
-
-        screenshot.dispose(gl);
-    }
-
-    public void printScreen(final GL gl)  {
-        final RegionRenderer renderer = scene.getRenderer();
-        final String modeS = Region.getRenderModeString(renderModes);
-        final String filename = String.format((Locale)null, "UISceneDemo01-shot%03d-%03dx%03d-S_%s_%02d.png",
-                shotCount++, renderer.getWidth(), renderer.getHeight(),
-                modeS, scene.getSampleCount());
-        gl.glFinish(); // just make sure rendering finished ..
-        if(screenshot.readPixels(gl, false)) {
-            screenshot.write(new File(filename));
-            System.err.println("Wrote: "+filename);
-        }
-    }
-    private int shotCount = 0;
-
-    public void setIgnoreInput(final boolean v) {
-        ignoreInput = v;
-    }
-    public boolean getIgnoreInput() {
-        return ignoreInput;
     }
 }
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java
new file mode 100644
index 000000000..2bcc3a536
--- /dev/null
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java
@@ -0,0 +1,463 @@
+/**
+ * Copyright 2010-2023 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+package com.jogamp.opengl.demos.graph.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.util.Locale;
+
+import com.jogamp.common.net.Uri;
+import com.jogamp.common.util.InterruptSource;
+import com.jogamp.graph.curve.Region;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
+import com.jogamp.graph.font.Font;
+import com.jogamp.graph.font.FontFactory;
+import com.jogamp.graph.font.FontSet;
+import com.jogamp.graph.geom.SVertex;
+import com.jogamp.graph.geom.plane.AffineTransform;
+import com.jogamp.graph.ui.gl.Scene;
+import com.jogamp.graph.ui.gl.Shape;
+import com.jogamp.graph.ui.gl.shapes.Button;
+import com.jogamp.graph.ui.gl.shapes.GLButton;
+import com.jogamp.graph.ui.gl.shapes.MediaButton;
+import com.jogamp.newt.Window;
+import com.jogamp.newt.event.KeyAdapter;
+import com.jogamp.newt.event.KeyEvent;
+import com.jogamp.newt.event.MouseEvent;
+import com.jogamp.newt.event.WindowAdapter;
+import com.jogamp.newt.event.WindowEvent;
+import com.jogamp.newt.opengl.GLWindow;
+import com.jogamp.opengl.GL;
+import com.jogamp.opengl.GL2ES2;
+import com.jogamp.opengl.GLAutoDrawable;
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLEventListener;
+import com.jogamp.opengl.GLPipelineFactory;
+import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.demos.es2.GearsES2;
+import com.jogamp.opengl.demos.graph.MSAATool;
+import com.jogamp.opengl.demos.util.MiscUtils;
+import com.jogamp.opengl.math.geom.AABBox;
+import com.jogamp.opengl.util.Animator;
+import com.jogamp.opengl.util.GLReadBufferUtil;
+import com.jogamp.opengl.util.PMVMatrix;
+import com.jogamp.opengl.util.av.GLMediaPlayer;
+import com.jogamp.opengl.util.av.GLMediaPlayerFactory;
+
+/**
+ * Basic UIScene demo using a single UIShape.
+ */
+public class UISceneDemo02 implements GLEventListener {
+    static final boolean DEBUG = false;
+    static final boolean TRACE = false;
+
+    static private final String defaultMediaPath = "http://archive.org/download/BigBuckBunny_328/BigBuckBunny_512kb.mp4";
+    static private String filmPath = defaultMediaPath;
+
+    public static void main(final String[] args) throws IOException {
+        int sceneMSAASamples = 0;
+        boolean graphVBAAMode = true;
+        boolean graphMSAAMode = false;
+
+        Font font = null;
+
+        final int width = 1280, height = 720;
+
+        if( 0 != args.length ) {
+            for(int i=0; i<args.length; i++) {
+                if(args[i].equals("-gnone")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-smsaa")) {
+                    i++;
+                    sceneMSAASamples = MiscUtils.atoi(args[i], sceneMSAASamples);
+                    graphMSAAMode = false;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-gmsaa")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = true;
+                    graphVBAAMode = false;
+                } else if(args[i].equals("-gvbaa")) {
+                    sceneMSAASamples = 0;
+                    graphMSAAMode = false;
+                    graphVBAAMode = true;
+                } else if(args[i].equals("-font")) {
+                    i++;
+                    font = FontFactory.get(new File(args[i]));
+                } else if(args[i].equals("-film")) {
+                    i++;
+                    filmPath = args[i];
+                }
+            }
+        }
+        if( null == font ) {
+            font = FontFactory.get(FontFactory.UBUNTU).get(FontSet.FAMILY_LIGHT, FontSet.STYLE_SERIF);
+        }
+        System.err.println("Font: "+font.getFullFamilyName());
+
+        final GLProfile glp = GLProfile.getGL2ES2();
+        final GLCapabilities caps = new GLCapabilities(glp);
+        caps.setAlphaBits(4);
+        if( sceneMSAASamples > 0 ) {
+            caps.setSampleBuffers(true);
+            caps.setNumSamples(sceneMSAASamples);
+        }
+        System.out.println("Requested: " + caps);
+
+        final int renderModes;
+        if( graphVBAAMode ) {
+            renderModes = Region.VBAA_RENDERING_BIT;
+        } else if( graphMSAAMode ) {
+            renderModes = Region.MSAA_RENDERING_BIT;
+        } else {
+            renderModes = 0;
+        }
+
+        final GLWindow window = GLWindow.create(caps);
+        // window.setPosition(10, 10);
+        window.setSize(width, height);
+        window.setTitle(UISceneDemo02.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
+        // final int renderModes = Region.COLORCHANNEL_RENDERING_BIT | Region.VBAA_RENDERING_BIT;
+        window.setVisible(true);
+
+        final Scene scene = new Scene();
+
+        final UISceneDemo02 demo = new UISceneDemo02(scene, font, renderModes, window.getSurfaceWidth(), window.getSurfaceHeight(), DEBUG, TRACE);
+        window.addGLEventListener(demo);
+
+        final Animator animator = new Animator();
+        animator.setUpdateFPSFrames(5*60, null);
+        animator.add(window);
+
+        window.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyPressed(final KeyEvent arg0) {
+                if(arg0.getKeyCode() == KeyEvent.VK_F4) {
+                    new InterruptSource.Thread() {
+                        @Override
+                        public void run() {
+                            window.destroy();
+                        } }.start();
+                }
+            }
+        });
+        window.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowDestroyed(final WindowEvent e) {
+                animator.stop();
+            }
+        });
+
+        animator.start();
+        System.err.println("m1 "+demo.shape);
+
+        scene.waitUntilDisplayed();
+
+        final AABBox box = scene.getBounds();
+        final float diag = (float)Math.sqrt(box.getHeight()*box.getHeight() + box.getWidth()*box.getWidth());
+        System.err.println("box "+box+", diag "+diag);
+        final float max = box.getWidth(); // diag;
+        final float step = max/200f;
+        System.err.println("m2 [0 .. "+max+"], step "+step+", "+box);
+        demo.testProject();
+        for(float x=0; x < max; x+=step) {
+            demo.shape.move(-step, 0f, 0f);
+            // System.err.println(demo.shape);
+            final int[] glWinPos = new int[2];
+            final boolean ok = demo.shape.objToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), demo.shape.getBounds().getCenter(), new PMVMatrix(), glWinPos);
+            System.err.printf("m3: objToWinCoord: ok "+ok+", winCoords %d / %d%n", glWinPos[0], glWinPos[1]);
+            // demo.testProject(glWinPos[0], glWinPos[1]);
+            window.warpPointer(glWinPos[0], window.getHeight() - glWinPos[1] - 1);
+            System.err.println("mm x "+x+", [0 .. "+max+"], step "+step+", "+box);
+            try { Thread.sleep(10); } catch (final InterruptedException e1) { }
+        }
+    }
+    void testProject() {
+        final int[] glWinPos = new int[2];
+        final boolean ok = shape.objToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), shape.getBounds().getCenter(), new PMVMatrix(), glWinPos);
+        System.err.printf("m4: objToWinCoord: ok "+ok+", winCoords %d / %d%n", glWinPos[0], glWinPos[1]);
+        testProject(glWinPos[0], glWinPos[1]);
+    }
+    void testProject(final int glWinX, final int glWinY) {
+        final float[] objPos = new float[3];
+        final int[] glWinPos = new int[2];
+        final PMVMatrix pmv = new PMVMatrix();
+        boolean ok = shape.winToObjCoord(scene.getPMVMatrixSetup(), scene.getViewport(), glWinX, glWinY, pmv, objPos);
+        System.err.printf("m5: winToObjCoord: ok "+ok+", obj [%25.20ff, %25.20ff, %25.20ff]%n", objPos[0], objPos[1], objPos[2]);
+        ok = shape.objToWinCoord(scene.getPMVMatrixSetup(), scene.getViewport(), objPos, pmv, glWinPos);
+        final int windx = glWinPos[0]-glWinX;
+        final int windy = glWinPos[1]-glWinY;
+        if( windx > 10 || windy > 10 ) {
+            System.err.printf("XX: objToWinCoord: ok "+ok+", winCoords %d / %d, diff %d x %d%n", glWinPos[0], glWinPos[1], windx, windy);
+            // Thread.dumpStack();
+            // System.exit(-1);
+        } else {
+            System.err.printf("m6: objToWinCoord: ok "+ok+", winCoords %d / %d, diff %d x %d%n", glWinPos[0], glWinPos[1], windx, windy);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    private final Font font;
+
+    private final GLReadBufferUtil screenshot;
+    private final int renderModes;
+    private final boolean debug;
+    private final boolean trace;
+
+    private final Scene scene;
+    private final Shape shape;
+
+    private final float[] position = new float[] {0,0,0};
+
+    boolean ignoreInput = false;
+
+    protected final AffineTransform tempT1 = new AffineTransform();
+    protected final AffineTransform tempT2 = new AffineTransform();
+
+    @SuppressWarnings("unused")
+    public UISceneDemo02(final Scene scene, final Font font, final int renderModes, final int width, final int height, final boolean debug, final boolean trace) {
+        this.font = font;
+        this.renderModes = renderModes;
+        this.debug = debug;
+        this.trace = trace;
+        this.screenshot = new GLReadBufferUtil(false, false);
+        this.scene = scene;
+
+        final float[/*2*/] sceneSize = { 0f, 0f };
+        scene.surfaceToPlaneSize(new int[] { 0, 0, width, height}, sceneSize);
+        System.err.println("Scene "+width+" x "+height+" pixel -> "+sceneSize[0]+" x "+sceneSize[1]+" model");
+        final float sw = sceneSize[0] * 0.2f; // 0.084f; // 1/3f * sceneSize[0];
+        final float sh = sw / 2.5f;
+        System.err.println("Shape "+sw+" x "+sh);
+
+        if( false ) {
+            Uri filmUri;
+            try {
+                filmUri = Uri.cast( filmPath );
+            } catch (final URISyntaxException e1) {
+                throw new RuntimeException(e1);
+            }
+            final GLMediaPlayer mPlayer = GLMediaPlayerFactory.createDefault();
+            // mPlayer.setTextureUnit(texUnitMediaPlayer);
+            final MediaButton b = new MediaButton(SVertex.factory(), renderModes, sw, sh, mPlayer);
+            b.setVerbose(false);
+            b.addDefaultEventListener();
+            b.setToggleable(true);
+            b.setToggle(true);
+            b.setToggleOffColorMod(0f, 1f, 0f, 1.0f);
+            b.addMouseListener(new Shape.MouseGestureAdapter() {
+                @Override
+                public void mouseClicked(final MouseEvent e) {
+                    mPlayer.setAudioVolume( b.isToggleOn() ? 1f : 0f );
+                } } );
+            mPlayer.playStream(filmUri, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.STREAM_ID_AUTO, GLMediaPlayer.TEXTURE_COUNT_DEFAULT);
+            shape = b;
+        } else if( false ) {
+            final GLEventListener glel;
+            {
+                final GearsES2 gears = new GearsES2(0);
+                gears.setVerbose(false);
+                gears.setClearColor(new float[] { 0.9f, 0.9f, 0.9f, 1f } );
+                glel = gears;
+            }
+            final int texUnit = 1;
+            final GLButton b = new GLButton(scene.getVertexFactory(), renderModes,
+                                            sw, sh, texUnit, glel, false /* useAlpha */);
+            b.setToggleable(true);
+            b.setToggle(true); // toggle == true -> animation
+            b.setAnimate(true);
+            b.addMouseListener(shapeGesture);
+            b.addMouseListener(new Shape.MouseGestureAdapter() {
+                @Override
+                public void mouseClicked(final MouseEvent e) {
+                    b.setAnimate( b.isToggleOn() );
+                } } );
+            shape = b;
+        } else {
+            final Button b = new Button(SVertex.factory(), renderModes, font, "+", sw, sh);
+            b.addMouseListener(shapeGesture);
+            b.setLabelColor(0.0f,0.0f,0.0f);
+            b.setCorner(0.0f);
+            b.scale(0.4f,  0.4f, 1f);
+            // b.setLabelColor(1.0f,0.0f,0.0f);
+            // b.setColor(0.0f,0.0f,1.0f, 1f);
+            /** Button defaults !
+                    button.setLabelColor(1.0f,1.0f,1.0f);
+                    button.setButtonColor(0.6f,0.6f,0.6f);
+                    button.setCorner(1.0f);
+                    button.setSpacing(2.0f);
+             */
+            shape = b;
+        }
+        // shape.move((sceneSize[0] - sw)/2f, (sceneSize[1] - sh)/2f, 0f); // center
+        // shape.move( 1/8f * sceneSize[0], (sceneSize[1] - sh)/2f, 0f); // left-center
+        shape.move( sceneSize[0] - sw, sceneSize[1] - sh, 0f); // top-right
+
+        scene.addShape(shape);
+    }
+
+    final Shape.MouseGestureAdapter shapeGesture = new Shape.MouseGestureAdapter() {
+        @Override
+        public void mouseMoved(final MouseEvent e) {
+            final int[] viewport = scene.getViewport(new int[4]);
+            // flip to GL window coordinates, origin bottom-left
+            final int glWinX = e.getX();
+            final int glWinY = viewport[3] - e.getY() - 1;
+            testProject(glWinX, glWinY);
+        }
+
+        @Override
+        public void mouseClicked(final MouseEvent e) {
+            final Shape.EventInfo shapeEvent = (Shape.EventInfo) e.getAttachment();
+            System.err.println("Shape.EventInfo: "+shapeEvent);
+            final Shape s = shapeEvent.shape;
+
+            final int[] viewport = scene.getViewport(new int[4]);
+            final PMVMatrix pmv = new PMVMatrix();
+            scene.setupMatrix(pmv, 0, 0, viewport[2], viewport[3]);
+
+            // flip to GL window coordinates, origin bottom-left
+            final int glWinX = e.getX();
+            final int glWinY = viewport[3] - e.getY() - 1;
+            {
+                pmv.glPushMatrix();
+                s.setTransform(pmv);
+
+                final float[] objPos = new float[3];
+                boolean ok = s.winToObjCoord(pmv, viewport, glWinX, glWinY, objPos);
+                System.err.println("Button: Click: win["+glWinX+", "+glWinY+"] -> ok "+ok+", obj["+objPos[0]+", "+objPos[1]+", "+objPos[1]+"]");
+
+                final int[] surfaceSize = new int[2];
+                ok = s.getSurfaceSize(pmv, viewport, surfaceSize);
+                System.err.println("Button: Size: ok "+ok+", pixel "+surfaceSize[0]+" x "+surfaceSize[1]);
+
+                pmv.glPopMatrix();
+            }
+        } };
+
+    public final float[] getPosition() { return position; }
+
+    @Override
+    public void init(final GLAutoDrawable drawable) {
+        GL2ES2 gl = drawable.getGL().getGL2ES2();
+        if(debug) {
+            gl = gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Debug", null, gl, null) ).getGL2ES2();
+        }
+        if(trace) {
+            gl = gl.getContext().setGL( GLPipelineFactory.create("com.jogamp.opengl.Trace", null, gl, new Object[] { System.err } ) ).getGL2ES2();
+        }
+
+        if(drawable instanceof GLWindow) {
+            final GLWindow glw = (GLWindow) drawable;
+            scene.attachInputListenerTo(glw);
+        }
+        gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
+        gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
+
+        gl.setSwapInterval(1);
+        gl.glEnable(GL.GL_DEPTH_TEST);
+        // gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
+        MSAATool.dump(drawable);
+
+        System.err.println("Init: Shape "+shape);
+        scene.init(drawable);
+    }
+
+    @Override
+    public void reshape(final GLAutoDrawable drawable, final int xstart, final int ystart, final int width, final int height) {
+        // Layout all shapes: Just stay centered
+        //
+        // shape.move(0f, 0f, 0f);
+        System.err.println("Reshape: Shape "+shape);
+
+        System.err.println("Reshape: Scene Plane.R "+scene.getBounds());
+
+        scene.reshape(drawable, xstart, ystart, width, height);
+
+        System.err.println("Reshape: Scene Plane.R "+scene.getBounds());
+
+        if( drawable instanceof Window ) {
+            ((Window)drawable).setTitle(UISceneDemo02.class.getSimpleName()+": "+drawable.getSurfaceWidth()+" x "+drawable.getSurfaceHeight());
+        }
+    }
+
+    final int[] sampleCount = { 4 };
+
+    @Override
+    public void display(final GLAutoDrawable drawable) {
+        scene.display(drawable);
+        if( once ) {
+            once = false;
+            final RegionRenderer renderer = scene.getRenderer();
+            final PMVMatrix pmv = renderer.getMatrix();
+            pmv.glPushMatrix();
+            shape.setTransform(pmv);
+
+            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]);
+
+            pmv.glPopMatrix();
+        }
+    }
+    static boolean once = true;
+
+    @Override
+    public void dispose(final GLAutoDrawable drawable) {
+        final GL2ES2 gl = drawable.getGL().getGL2ES2();
+        scene.dispose(drawable); // disposes all registered UIShapes
+
+        screenshot.dispose(gl);
+    }
+
+    public void printScreen(final GL gl)  {
+        final RegionRenderer renderer = scene.getRenderer();
+        final String modeS = Region.getRenderModeString(renderModes);
+        final String filename = String.format((Locale)null, "UISceneDemo01-shot%03d-%03dx%03d-S_%s_%02d.png",
+                shotCount++, renderer.getWidth(), renderer.getHeight(),
+                modeS, scene.getSampleCount());
+        gl.glFinish(); // just make sure rendering finished ..
+        if(screenshot.readPixels(gl, false)) {
+            screenshot.write(new File(filename));
+            System.err.println("Wrote: "+filename);
+        }
+    }
+    private int shotCount = 0;
+
+    public void setIgnoreInput(final boolean v) {
+        ignoreInput = v;
+    }
+    public boolean getIgnoreInput() {
+        return ignoreInput;
+    }
+}
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 a4230bcaa..4d6b85bbd 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
@@ -87,6 +87,7 @@ public class UIShapeDemo01 implements GLEventListener {
 
     public static void main(final String[] args) throws IOException {
         Font font = null;
+        final int width = 1280, height = 720;
         if( 0 != args.length ) {
             for(int i=0; i<args.length; i++) {
                 if(args[i].equals("-font")) {
@@ -109,12 +110,13 @@ public class UIShapeDemo01 implements GLEventListener {
         }
         System.out.println("Requested: " + caps);
 
+        final int renderModes = Region.COLORCHANNEL_RENDERING_BIT | Region.VBAA_RENDERING_BIT;
+        // final int renderModes = Region.COLORCHANNEL_RENDERING_BIT;
+
         final GLWindow window = GLWindow.create(caps);
         // window.setPosition(10, 10);
-        window.setSize(800, 400);
+        window.setSize(width, height);
         window.setTitle(UIShapeDemo01.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
-        final int renderModes = Region.COLORCHANNEL_RENDERING_BIT | Region.VBAA_RENDERING_BIT;
-        // final int renderModes = Region.COLORCHANNEL_RENDERING_BIT;
         final UIShapeDemo01 uiGLListener = new UIShapeDemo01(font, renderModes, DEBUG, TRACE);
         uiGLListener.attachInputListenerTo(window);
         window.addGLEventListener(uiGLListener);
@@ -216,7 +218,7 @@ public class UIShapeDemo01 implements GLEventListener {
 
         gl.setSwapInterval(1);
         gl.glEnable(GL.GL_DEPTH_TEST);
-        gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
+        // gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
         MSAATool.dump(drawable);
     }
 
@@ -244,7 +246,7 @@ public class UIShapeDemo01 implements GLEventListener {
         final PMVMatrix pmv = renderer.getMatrix();
         pmv.glPushMatrix();
         shape.setTransform(pmv);
-        shape.drawShape(gl, renderer, sampleCount);
+        shape.draw(gl, renderer, sampleCount);
         if( once ) {
             final int[] winPosSize = { 0, 0 };
             System.err.println("draw.0: "+shape);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
index 7637a9942..08cde27c9 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
@@ -93,6 +93,7 @@ public class UITypeDemo01 implements GLEventListener {
 
     public static void main(final String[] args) throws IOException {
         Font font = null;
+        final int width = 1280, height = 720;
         String text = "Hello Origin.";
         int glyph_id = Glyph.ID_UNKNOWN;
         if( 0 != args.length ) {
@@ -118,15 +119,20 @@ public class UITypeDemo01 implements GLEventListener {
         final GLProfile glp = GLProfile.getGL2ES2();
         final GLCapabilities caps = new GLCapabilities(glp);
         caps.setAlphaBits(4);
-        caps.setSampleBuffers(true);
-        caps.setNumSamples(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;
+        // final int renderModes = Region.COLORCHANNEL_RENDERING_BIT;
+
         final GLWindow window = GLWindow.create(caps);
         // window.setPosition(10, 10);
-        window.setSize(800, 400);
+        window.setSize(width, height);
         window.setTitle(UITypeDemo01.class.getSimpleName()+": "+window.getSurfaceWidth()+" x "+window.getSurfaceHeight());
-        final UITypeDemo01 uiGLListener = new UITypeDemo01(font, glyph_id, text, Region.COLORCHANNEL_RENDERING_BIT, DEBUG, TRACE);
+        final UITypeDemo01 uiGLListener = new UITypeDemo01(font, glyph_id, text, renderModes, DEBUG, TRACE);
         uiGLListener.attachInputListenerTo(window);
         window.addGLEventListener(uiGLListener);
         window.setVisible(true);
@@ -237,7 +243,7 @@ public class UITypeDemo01 implements GLEventListener {
 
         gl.setSwapInterval(1);
         gl.glEnable(GL.GL_DEPTH_TEST);
-        gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
+        // gl.glEnable(GL.GL_POLYGON_OFFSET_FILL);
         MSAATool.dump(drawable);
     }
 
@@ -262,7 +268,7 @@ public class UITypeDemo01 implements GLEventListener {
     private void drawShape(final GL2ES2 gl, final PMVMatrix pmv, final RegionRenderer renderer, final Shape shape) {
         pmv.glPushMatrix();
         shape.setTransform(pmv);
-        shape.drawShape(gl, renderer, sampleCount);
+        shape.draw(gl, renderer, sampleCount);
         pmv.glPopMatrix();
     }