Bug 801: Cleanup shader-program location/data update ; Add COLORTEXTURE + TextureSequence to Region (Demo: TextureButton)

Cleanup shader-program location/data update

- GLUniformData:
  - Allow lazy data setup, as used for
    RenderState.ProgramLocal, see below

- RenderState
  - Separate data (pmv, weight, colorStatic) from
    program-local uniforms -> add class ProgramLocal.
    Reduces uniform location lookups, since
    ProgramLocal is bound to Region impl.

  - ProgramLocal.update(..) needs to write uniform data always,
    since data is being used in multiple programs!

  - No 'dirty' tracking possible, removed - see above.

- RegionRenderer
  - Fix shader-selection: 2-pass programs differ from 1-pass!
  - No shader-setup at init

+++

Add COLORTEXTURE + TextureSequence to Region
  - Create color-texture coords in vertex-shader via region's bounding box (pass-1)
  - Use color-texture unit in pass-1 if enabled (own shader program)
  - Use TextureSequence in Region impl. providing all required data (unit + texture-name)
  - Demo: TextureButton (a UIShape)

20 files changed, 357 insertions, 205 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
index f9107ef3e..ae435961e 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java
@@ -278,8 +278,8 @@ public class TestTextRendererNEWT00 extends UITestCase {
             setRendererCallbacks(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
             setRenderState(rs);
 
-            regionFPS = GLRegion.create(renderModes);
-            regionFPSAnim = GLRegion.create(renderModes);
+            regionFPS = GLRegion.create(renderModes, null);
+            regionFPSAnim = GLRegion.create(renderModes, null);
             if( null != fontFileName ) {
                 Font _font = null;
                 try {
@@ -377,7 +377,7 @@ public class TestTextRendererNEWT00 extends UITestCase {
 
             final String modeS = Region.getRenderModeString(renderModes);
 
-            if( true ) {
+            if( false ) {
                 // renderString(drawable, font, pixelSize, "I - / H P 7 0", 0, 0, 0, 0, -1000f, true);
                 // renderString(drawable, font, pixelSize, "A M > } ] ", 0, 0, 0, 0, -1000f, true);
                 // renderString(drawable, font, pixelSize, "M", 0, 0, 0, 0, -1000f, true);
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java
index b04808300..ad794b646 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java
@@ -191,7 +191,7 @@ public class TestTextRendererNEWT10 extends UITestCase {
         dx += font.getAdvanceWidth('X', fontSize) * column;
         dy -= (int)textBox.getHeight() * ( row + 1 );
 
-        final PMVMatrix pmv = renderer.getMatrixMutable();
+        final PMVMatrix pmv = renderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(dx, dy, z0);
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
index 207904f89..127cf3fc3 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
@@ -253,7 +253,7 @@ public abstract class TextRendererGLELBase implements GLEventListener {
             dx += pixelScale * font.getAdvanceWidth('X', pixelSize) * column;
             dy -= pixelScale * lineHeight * ( row + 1 );
 
-            final PMVMatrix pmvMatrix = rs.getMatrixMutable();
+            final PMVMatrix pmvMatrix = rs.getMatrix();
             pmvMatrix.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
             if( !exclusivePMVMatrix )  {
                 pmvMatrix.glPushMatrix();
@@ -279,7 +279,6 @@ public abstract class TextRendererGLELBase implements GLEventListener {
             renderer.enable(gl, false);
 
             if( !exclusivePMVMatrix )  {
-                rs.setMatrixDirty();
                 pmvMatrix.glPopMatrix();
             }
             lastRow = row + newLineCount;
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
index 2b3b2e7d9..48ba148a9 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener01.java
@@ -90,7 +90,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
         outlineShape.addVertex(offset+10.0f,0.0f, true);
         outlineShape.closeLastOutline(true);
 
-        region = GLRegion.create(getRenderModes());
+        region = GLRegion.create(getRenderModes(), null);
         region.addOutlineShape(outlineShape, null, region.hasColorChannel() ? getRenderer().getRenderState().getColorStatic(new float[4]) : null);
     }
 
@@ -116,7 +116,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
         gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
 
         final RegionRenderer regionRenderer = getRenderer();
-        final PMVMatrix pmv = regionRenderer.getMatrixMutable();
+        final PMVMatrix pmv = regionRenderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(getXTran(), getYTran(), getZTran());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java
index fbf110809..374f2928c 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURegionGLListener02.java
@@ -92,7 +92,7 @@ public class GPURegionGLListener02 extends GPURendererListenerBase01 {
         shape.addVertex(offset+10.0f,0.0f, true);
         shape.closeLastOutline(true);
 
-        region = GLRegion.create(getRenderModes());
+        region = GLRegion.create(getRenderModes(), null);
         region.addOutlineShapes(outlineShapes, null, null);
     }
 
@@ -119,7 +119,7 @@ public class GPURegionGLListener02 extends GPURendererListenerBase01 {
 
         final RegionRenderer regionRenderer = getRenderer();
 
-        final PMVMatrix pmv = regionRenderer.getMatrixMutable();
+        final PMVMatrix pmv = regionRenderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(getXTran(), getYTran(), getZTran());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
index 420e23f4d..72c2509cc 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPURendererListenerBase01.java
@@ -146,7 +146,7 @@ public abstract class GPURendererListenerBase01 implements GLEventListener {
 
     @Override
     public void reshape(GLAutoDrawable drawable, int xstart, int ystart, int width, int height) {
-        final PMVMatrix pmv = renderer.getMatrixMutable();
+        final PMVMatrix pmv = renderer.getMatrix();
         renderer.reshapePerspective(45.0f, width, height, zNear, zFar);
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
index 8b653bdfa..5704f3e7a 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUTextRendererListenerBase01.java
@@ -117,8 +117,8 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
                                     blending ? RegionRenderer.defaultBlendDisable : null),
                                     renderModes, debug, trace);
         this.textRegionUtil = new TextRegionUtil(renderModes);
-        this.regionFPS = GLRegion.create(renderModes);
-        this.regionBottom = GLRegion.create(renderModes);
+        this.regionFPS = GLRegion.create(renderModes, null);
+        this.regionBottom = GLRegion.create(renderModes, null);
         try {
             this.font = FontFactory.get(fontSet).getDefault();
             dumpFontNames();
@@ -213,7 +213,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
 
         final RegionRenderer renderer = getRenderer();
         final RenderState rs = renderer.getRenderState();
-        final PMVMatrix pmv = renderer.getMatrixMutable();
+        final PMVMatrix pmv = renderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         rs.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
@@ -254,7 +254,6 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
         float dx = width-fontNameBox.getWidth()-2f;
         float dy = height - 10f;
 
-        renderer.setMatrixDirty();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(nearPlaneX0+(dx*nearPlaneSx), nearPlaneY0+(dy*nearPlaneSy), nearPlaneZ0);
@@ -265,7 +264,6 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
         dy += -fontNameBox.getHeight() - 10f;
 
         if(null != headtext) {
-            renderer.setMatrixDirty();
             pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
             pmv.glLoadIdentity();
             // System.err.printf("Head: [%f %f] -> [%f %f]%n", dx, dy, nearPlaneX0+(dx*nearPlaneSx), nearPlaneY0+(dy*nearPlaneSy));
@@ -276,7 +274,6 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
 
         dy += -headbox.getHeight() - font.getLineHeight(pixelSizeBottom);
 
-        renderer.setMatrixDirty();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(nearPlaneX0+(dx*nearPlaneSx), nearPlaneY0+(dy*nearPlaneSy), nearPlaneZ0);
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
index e93d6607e..f9f9d58a0 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/GPUUISceneGLListener0A.java
@@ -29,9 +29,12 @@ import com.jogamp.opengl.math.FloatUtil;
 import com.jogamp.opengl.math.VectorUtil;
 import com.jogamp.opengl.test.junit.graph.demos.ui.CrossHair;
 import com.jogamp.opengl.test.junit.graph.demos.ui.Label;
-import com.jogamp.opengl.test.junit.graph.demos.ui.RIButton;
+import com.jogamp.opengl.test.junit.graph.demos.ui.LabelButton;
+import com.jogamp.opengl.test.junit.graph.demos.ui.RoundButton;
 import com.jogamp.opengl.test.junit.graph.demos.ui.SceneUIController;
+import com.jogamp.opengl.test.junit.graph.demos.ui.TextureButton;
 import com.jogamp.opengl.test.junit.graph.demos.ui.UIShape;
+import com.jogamp.opengl.test.junit.jogl.demos.TextureSequenceDemo01;
 import com.jogamp.opengl.util.GLReadBufferUtil;
 
 public class GPUUISceneGLListener0A implements GLEventListener {
@@ -52,7 +55,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
     private final float zNear = 0.1f, zFar = 7000f;
 
     private final float relTop = 5f/6f;
-    private final float relRight = 2f/6f;
+    private final float relMiddle = 2f/6f;
     private final float relLeft = 1f/6f;
 
     /** Proportional Button Size to Window Height, per-vertical-pixels [PVP] */
@@ -70,7 +73,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
     private String actionText = null;
     private Label[] labels = null;
     private String[] strings = null;
-    private final List<RIButton> buttons = new ArrayList<RIButton>();
+    private final List<RoundButton> buttons = new ArrayList<RoundButton>();
     private Label truePtSizeLabel = null;
     private Label jogampLabel = null;
     private Label fpsLabel = null;
@@ -122,9 +125,13 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
     private void setButtonsSpacing(float dx, float dy) {
         for(int i=0; i<buttons.size(); i++) {
-            final float sx = buttons.get(i).getSpacingX()+dx, sy = buttons.get(i).getSpacingY()+dy;
-            System.err.println("Spacing: X "+sx+", Y "+sy);
-            buttons.get(i).setSpacing(sx, sy);
+            final RoundButton b = buttons.get(i);
+            if( b instanceof LabelButton ) {
+                final LabelButton lb = (LabelButton) b;
+                final float sx = lb.getSpacingX()+dx, sy = lb.getSpacingY()+dy;
+                System.err.println("Spacing: X "+sx+", Y "+sy);
+                lb.setSpacing(sx, sy);
+            }
         }
     }
 
@@ -138,13 +145,16 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
     private void resetButtons() {
         for(int i=0; i<buttons.size(); i++) {
-            buttons.get(i).getRotation().setIdentity();
-            buttons.get(i).setCorner(RIButton.DEFAULT_CORNER);
-            buttons.get(i).setSpacing(RIButton.DEFAULT_SPACING_X, RIButton.DEFAULT_SPACING_Y);
+            final RoundButton b = buttons.get(i);
+            b.getRotation().setIdentity();
+            b.setCorner(RoundButton.DEFAULT_CORNER);
+            if( b instanceof LabelButton ) {
+                ((LabelButton)b).setSpacing(LabelButton.DEFAULT_SPACING_X, LabelButton.DEFAULT_SPACING_Y);
+            }
         }
     }
 
-    private void initButtons(final GL gl, final int width, final int height, final float labelZOffset, final RegionRenderer renderer) {
+    private void initButtons(final GL2ES2 gl, final int width, final int height, final float labelZOffset, final RegionRenderer renderer) {
         final boolean pass2Mode = Region.isTwoPass( renderModes ) ;
         buttons.clear();
 
@@ -156,9 +166,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         final float diffX = 1.2f * buttonXSize;
         final float diffY = 1.5f * buttonYSize;
 
-        RIButton button = new RIButton(SVertex.factory(), renderModes, font, "Next Text", buttonXSize, buttonYSize, labelZOffset);
+        LabelButton button = new LabelButton(SVertex.factory(), renderModes, font, "Next Text", buttonXSize, buttonYSize, labelZOffset);
         button.translate(xstart,ystart-diffY*buttons.size(), 0f);
-        button.setLabelColor(1.0f, 1.0f, 1.0f);
         button.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -173,11 +182,11 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         button.addMouseListener(dragZoomRotateListener);
         buttons.add(button);
 
-        button = new RIButton(SVertex.factory(), renderModes, font, "Show FPS", buttonXSize, buttonYSize, labelZOffset);
+        button = new LabelButton(SVertex.factory(), renderModes, font, "Show FPS", buttonXSize, buttonYSize, labelZOffset);
+        button.setName(100); // FIXME: DEBUG tag
         button.translate(xstart,ystart - diffY*buttons.size(), 0f);
         button.setToggleable(true);
-        button.setPressed(fpsLabel.isEnabled());
-        button.setLabelColor(1.0f, 1.0f, 1.0f);
+        button.setToggleState(fpsLabel.isEnabled());
         button.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -190,11 +199,10 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         button.addMouseListener(dragZoomRotateListener);
         buttons.add(button);
 
-        button = new RIButton(SVertex.factory(), renderModes, font, "v-sync", buttonXSize, buttonYSize, labelZOffset);
+        button = new LabelButton(SVertex.factory(), renderModes, font, "v-sync", buttonXSize, buttonYSize, labelZOffset);
         button.translate(xstart,ystart - diffY*buttons.size(), 0f);
         button.setToggleable(true);
-        button.setPressed(gl.getSwapInterval()>0);
-        button.setLabelColor(1.0f, 1.0f, 1.0f);
+        button.setToggleState(gl.getSwapInterval()>0);
         button.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -214,9 +222,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         button.addMouseListener(dragZoomRotateListener);
         buttons.add(button);
 
-        button = new RIButton(SVertex.factory(), renderModes, font, "< tilt >", buttonXSize, buttonYSize, labelZOffset);
+        button = new LabelButton(SVertex.factory(), renderModes, font, "< tilt >", buttonXSize, buttonYSize, labelZOffset);
         button.translate(xstart,ystart - diffY*buttons.size(), 0f);
-        button.setLabelColor(1.0f, 1.0f, 1.0f);
         button.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
@@ -237,9 +244,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         buttons.add(button);
 
         if( pass2Mode ) { // second column to the left
-            button = new RIButton(SVertex.factory(), renderModes, font, "< samples >", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "< samples >", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart,ystart - diffY*buttons.size(), 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -264,9 +270,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             button.addMouseListener(dragZoomRotateListener);
             buttons.add(button);
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "< quality >", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "< quality >", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart,ystart - diffY*buttons.size(), 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -293,10 +298,9 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
         }
 
-        button = new RIButton(SVertex.factory(), renderModes, font, "Quit", buttonXSize, buttonYSize, labelZOffset);
+        button = new LabelButton(SVertex.factory(), renderModes, font, "Quit", buttonXSize, buttonYSize, labelZOffset);
         button.translate(xstart,ystart - diffY*buttons.size(), 0f);
         button.setColor(0.8f, 0.0f, 0.0f, 1.0f);
-        button.setLabelColor(1.0f, 1.0f, 1.0f);
         button.setSelectedColorMod(0.8f, 0.8f, 0.8f, 1.0f);
         button.addMouseListener(new MouseAdapter() {
             @Override
@@ -319,9 +323,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         {
             int j = 1; // column
             int k = 0; // row
-            button = new RIButton(SVertex.factory(), renderModes, font, "y flip", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "y flip", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -331,9 +334,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
 
             k++;
-            button = new RIButton(SVertex.factory(), renderModes, font, "x flip", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "x flip", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -343,9 +345,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "+", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "+", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -371,9 +372,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "< space >", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "< space >", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -396,9 +396,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "< corner >", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "< corner >", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -422,9 +421,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "reset", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "reset", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -434,9 +432,8 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             buttons.add(button);
             k++;
 
-            button = new RIButton(SVertex.factory(), renderModes, font, "screenshot", buttonXSize, buttonYSize, labelZOffset);
+            button = new LabelButton(SVertex.factory(), renderModes, font, "screenshot", buttonXSize, buttonYSize, labelZOffset);
             button.translate(xstart - diffX*j,ystart - diffY*k, 0f);
-            button.setLabelColor(1.0f, 1.0f, 1.0f);
             button.addMouseListener(new MouseAdapter() {
                 @Override
                 public void mouseClicked(MouseEvent e) {
@@ -453,6 +450,17 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             k++;
         }
 
+        if(true) {
+            final TextureSequenceDemo01 texSeq = new TextureSequenceDemo01(true);
+            gl.glActiveTexture(GL.GL_TEXTURE0 + texSeq.getTextureUnit());
+            texSeq.initGLResources(gl);
+            final TextureButton texButton = new TextureButton(renderer.getRenderState().getVertexFactory(), renderModes,
+                                                              2f*buttonXSize, 2f*buttonYSize, texSeq);
+            texButton.translate(xstart + diffX*5, ystart - diffY*1, 0f);
+            texButton.setToggleable(true);
+            texButton.addMouseListener(dragZoomRotateListener);
+            buttons.add(texButton);
+        }
     }
 
     private void initTexts() {
@@ -541,7 +549,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
         final int zBits = drawable.getChosenGLCapabilities().getDepthBits();
         final float zEpsilon = FloatUtil.getZBufferEpsilon(zBits, sceneDist, zNear);
-        final float labelZOffset = Region.isTwoPass(renderModes) ? RIButton.DEFAULT_2PASS_LABEL_ZOFFSET : -2f*zEpsilon;
+        final float labelZOffset = Region.isTwoPass(renderModes) ? LabelButton.DEFAULT_2PASS_LABEL_ZOFFSET : -2f*zEpsilon;
         System.err.println("zEpsilon "+zEpsilon+" ( zBits "+zBits+") -> labelZOffset "+labelZOffset);
 
         renderer.init(gl, renderModes);
@@ -634,7 +642,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
         if(null == labels[currentText]) {
             final float pixelSizeFixed = fontSizeFixedPVP * drawable.getHeight();
             final float dyTop = drawable.getHeight() * relTop;
-            final float dxRight = drawable.getWidth() * relRight;
+            final float dxRight = drawable.getWidth() * relMiddle;
             labels[currentText] = new Label(renderer.getRenderState().getVertexFactory(), renderModes, font, pixelSizeFixed, strings[currentText]);
             labels[currentText].setColor(0.1f, 0.1f, 0.1f, 1.0f);
             labels[currentText].setEnabled(enableOthers);
@@ -689,17 +697,17 @@ public class GPUUISceneGLListener0A implements GLEventListener {
 
         final float dz = 0f;
         final float dyTop = dh * relTop;
-        final float dxRight = dw * relRight;
+        final float dxMiddle = dw * relMiddle;
         final float dxLeft = dw * relLeft;
 
         for(int i=0; i<buttons.size(); i++) {
             buttons.get(i).translate(dxLeft, dyTop, dz);
         }
-        jogampLabel.translate(dxRight, dyTop, dz);
-        truePtSizeLabel.translate(dxRight, dyTop, dz);
+        jogampLabel.translate(dxMiddle, dyTop, dz);
+        truePtSizeLabel.translate(dxMiddle, dyTop, dz);
         fpsLabel.translate(0f, 0f, 0f);
         if( null != labels[currentText] ) {
-            labels[currentText].translate(dxRight, dyTop, 0f);
+            labels[currentText].translate(dxMiddle, dyTop, 0f);
         }
         crossHairCtr.translate(dw/2f, dh/2f, 0f);
 
@@ -784,7 +792,7 @@ public class GPUUISceneGLListener0A implements GLEventListener {
             if( attachment instanceof UIShape.EventDetails ) {
                 final UIShape.EventDetails shapeEvent = (UIShape.EventDetails)attachment;
                 if( 0 == ( ~InputEvent.BUTTONALL_MASK & e.getModifiers() ) ) {
-                    float tz = 2f*e.getRotation()[1]; // vertical: wheel
+                    float tz = 8f*e.getRotation()[1]; // vertical: wheel
                     System.err.println("tz.4 "+tz);
                     shapeEvent.shape.translate(0f, 0f, tz);
                 } else if( e.isControlDown() ) {
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/CrossHair.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/CrossHair.java
index a0842b142..a15e2acdd 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/CrossHair.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/CrossHair.java
@@ -55,7 +55,7 @@ public class CrossHair extends UIShape {
         this.width = width;
         this.height = height;
         this.lineWidth = lineWidth;
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     @Override
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java
index 4a14bb442..37a82fe0f 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/Label.java
@@ -56,7 +56,7 @@ public class Label extends UIShape {
 
     public void setText(String text) {
         this.text = text;
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     public Font getFont() {
@@ -65,7 +65,7 @@ public class Label extends UIShape {
 
     public void setFont(Font font) {
         this.font = font;
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     public float getPixelSize() {
@@ -78,7 +78,7 @@ public class Label extends UIShape {
 
     public void setPixelSize(float pixelSize) {
         this.pixelSize = pixelSize;
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     @Override
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/LabelButton.java
index 5315a8927..64cf794c6 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RIButton.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/LabelButton.java
@@ -29,8 +29,6 @@ package com.jogamp.opengl.test.junit.graph.demos.ui;
 
 import javax.media.opengl.GL2ES2;
 
-import jogamp.graph.geom.plane.AffineTransform;
-
 import com.jogamp.graph.curve.OutlineShape;
 import com.jogamp.graph.curve.Region;
 import com.jogamp.graph.curve.opengl.RegionRenderer;
@@ -42,49 +40,25 @@ import com.jogamp.opengl.math.geom.AABBox;
 /**
  * GPU based resolution independent Button impl
  */
-public class RIButton extends UIShape {
+public class LabelButton extends RoundButton {
     /** {@value} */
     public static final float DEFAULT_SPACING_X = 0.08f;
     /** {@value} */
     public static final float DEFAULT_SPACING_Y = 0.40f;
-    /** {@value} */
-    public static final float DEFAULT_CORNER = 1f;
-
     public static final float DEFAULT_2PASS_LABEL_ZOFFSET = -0.05f;
 
-    private float width, height, labelZOffset;
+    private float labelZOffset;
     private final Label0 label;
     private float spacingX = DEFAULT_SPACING_X;
     private float spacingY = DEFAULT_SPACING_Y;
-    private float corner = DEFAULT_CORNER;
-    private final AffineTransform tempT1 = new AffineTransform();
-    private final AffineTransform tempT2 = new AffineTransform();
-
-    public RIButton(Factory<? extends Vertex> factory, int renderModes, Font labelFont, String labelText, float width, float height, float labelZOffset) {
-        super(factory, renderModes | Region.COLORCHANNEL_RENDERING_BIT);
 
+    public LabelButton(final Factory<? extends Vertex> factory, final int renderModes,
+                       final Font labelFont, final String labelText,
+                       final float width, final float height, final float labelZOffset) {
+        super(factory, renderModes | Region.COLORCHANNEL_RENDERING_BIT, width, height);
         this.label = new Label0(labelFont, labelText, new float[] { 0.9f, 0.9f, 0.9f, 1.0f });
-        this.width = width;
-        this.height = height;
         this.labelZOffset = labelZOffset;
-    }
-
-    public final float getWidth() { return width; }
-    public final float getHeight() { return height; }
-    public final float getCorner() { return corner; }
-
-    public void setDimension(float width, float height) {
-        this.width = width;
-        this.height = height;
-        dirty |= DIRTY_SHAPE;
-    }
-
-    @Override
-    protected void clearImpl(GL2ES2 gl, RegionRenderer renderer) {
-    }
-
-    @Override
-    protected void destroyImpl(GL2ES2 gl, RegionRenderer renderer) {
+        setLabelColor(1.0f, 1.0f, 1.0f);
     }
 
     @Override
@@ -104,9 +78,9 @@ public class RIButton extends UIShape {
     protected void addShapeToRegion(GL2ES2 gl, RegionRenderer renderer) {
         final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory());
         if(corner == 0.0f) {
-            createSharpOutline(shape);
+            createSharpOutline(shape, labelZOffset);
         } else {
-            createCurvedOutline(shape);
+            createCurvedOutline(shape, labelZOffset);
         }
         shape.setIsQuadraticNurbs();
         shape.setSharpness(shapesSharpness);
@@ -148,68 +122,14 @@ public class RIButton extends UIShape {
             System.err.println("XXX.UIShape.RIButton: Added Shape: "+shape+", "+box);
         }
     }
-    private void createSharpOutline(OutlineShape shape) {
-        final float tw = getWidth();
-        final float th = getHeight();
-
-        final float minX = 0;
-        final float minY = 0;
-        final float minZ = labelZOffset;
-
-        shape.addVertex(minX, minY, minZ,  true);
-        shape.addVertex(minX+tw, minY,  minZ, true);
-        shape.addVertex(minX+tw, minY + th, minZ,  true);
-        shape.addVertex(minX, minY + th, minZ,  true);
-        shape.closeLastOutline(true);
-    }
-    private void createCurvedOutline(OutlineShape shape) {
-        final float tw = getWidth();
-        final float th = getHeight();
-        final float dC = 0.5f*corner*Math.min(tw, th);
-
-        final float minX = 0;
-        final float minY = 0;
-        final float minZ = labelZOffset;
-
-        shape.addVertex(minX, minY + dC, minZ, true);
-        shape.addVertex(minX, minY,  minZ, false);
-
-        shape.addVertex(minX + dC, minY, minZ,  true);
-
-        shape.addVertex(minX + tw - dC, minY,           minZ, true);
-        shape.addVertex(minX + tw,      minY,           minZ, false);
-        shape.addVertex(minX + tw,      minY + dC,      minZ, true);
-        shape.addVertex(minX + tw,      minY + th- dC,  minZ, true);
-        shape.addVertex(minX + tw,      minY + th,      minZ, false);
-        shape.addVertex(minX + tw - dC, minY + th,      minZ, true);
-        shape.addVertex(minX + dC,      minY + th,      minZ, true);
-        shape.addVertex(minX,           minY + th,      minZ, false);
-        shape.addVertex(minX,           minY + th - dC, minZ, true);
-
-        shape.closeLastOutline(true);
-    }
 
-    /** Set corner size, default is {@link #DEFAULT_CORNER} */
-    public void setCorner(float corner) {
-        if(corner > 1.0f){
-            this.corner = 1.0f;
-        }
-        else if(corner < 0.01f){
-            this.corner = 0.0f;
-        }
-        else{
-            this.corner = corner;
-        }
-        dirty |= DIRTY_SHAPE;
-    }
-
-    public float getLabelZOffset() {
+    public final float getLabelZOffset() {
         return labelZOffset;
     }
 
-    public void setLabelZOffset(final float labelZOffset) {
+    public final void setLabelZOffset(final float labelZOffset) {
         this.labelZOffset = labelZOffset;
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
     public final float getSpacingX() { return spacingX; }
     public final float getSpacingY() { return spacingY; }
@@ -219,7 +139,7 @@ public class RIButton extends UIShape {
      * @param spacingX spacing in percent on X, default is {@link #DEFAULT_SPACING_X}
      * @param spacingY spacing in percent on Y, default is {@link #DEFAULT_SPACING_Y}
      */
-    public void setSpacing(float spacingX, float spacingY) {
+    public final void setSpacing(float spacingX, float spacingY) {
         if ( spacingX < 0.0f ) {
             this.spacingX = 0.0f;
         } else if ( spacingX > 1.0f ) {
@@ -234,21 +154,27 @@ public class RIButton extends UIShape {
         } else {
             this.spacingY = spacingY;
         }
-        dirty |= DIRTY_SHAPE;
+        markShapeDirty();
     }
 
-    public float[] getLabelColor() {
+    public final float[] getLabelColor() {
         return label.getColor();
     }
 
-    public void setLabelColor(float r, float g, float b) {
+    public final void setLabelColor(float r, float g, float b) {
         label.setColor(r, g, b, 1.0f);
+        markShapeDirty();
+    }
+
+    public final void setLabelText(final Font labelFont, final String labelText) {
+        label.setFont(labelFont);
+        label.setText(labelText);
+        markShapeDirty();
     }
 
     @Override
-    public String toString() {
-        return "RIButton [" + translate[0]+getWidth()/2f+" / "+translate[1]+getHeight()/2f+" "+getWidth() + "x" + getHeight() + ", "
-                + label + ", " + "spacing: " + spacingX+"/"+spacingY
-                + ", " + "corner: " + corner + ", " + "shapeOffset: " + labelZOffset + ", "+box+" ]";
+    public String getSubString() {
+        return super.getSubString()+", "+ label + ", " + "spacing: " + spacingX+"/"+spacingY+
+                              ", labelZOffset " + labelZOffset;
     }
 }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java
new file mode 100644
index 000000000..eddcb756e
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/RoundButton.java
@@ -0,0 +1,108 @@
+package com.jogamp.opengl.test.junit.graph.demos.ui;
+
+import javax.media.opengl.GL2ES2;
+
+import jogamp.graph.geom.plane.AffineTransform;
+
+import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.Vertex.Factory;
+
+public abstract class RoundButton extends UIShape {
+
+    /** {@value} */
+    public static final float DEFAULT_CORNER = 1f;
+    protected float width;
+    protected float height;
+    protected float corner = DEFAULT_CORNER;
+    protected final AffineTransform tempT1 = new AffineTransform();
+    protected final AffineTransform tempT2 = new AffineTransform();
+
+    protected RoundButton(final Factory<? extends Vertex> factory, final int renderModes, final float width, final float height) {
+        super(factory, renderModes);
+        this.width = width;
+        this.height = height;
+    }
+
+    @Override
+    protected void clearImpl(GL2ES2 gl, RegionRenderer renderer) {
+    }
+
+    @Override
+    protected void destroyImpl(GL2ES2 gl, RegionRenderer renderer) {
+    }
+
+    public final float getWidth() { return width; }
+
+    public final float getHeight() { return height; }
+
+    public final float getCorner() { return corner; }
+
+    public void setDimension(float width, float height) {
+        this.width = width;
+        this.height = height;
+        markShapeDirty();
+    }
+
+    protected void createSharpOutline(final OutlineShape shape, final float zOffset) {
+        final float tw = getWidth();
+        final float th = getHeight();
+
+        final float minX = 0;
+        final float minY = 0;
+        final float minZ = zOffset;
+
+        shape.addVertex(minX, minY, minZ,  true);
+        shape.addVertex(minX+tw, minY,  minZ, true);
+        shape.addVertex(minX+tw, minY + th, minZ,  true);
+        shape.addVertex(minX, minY + th, minZ,  true);
+        shape.closeLastOutline(true);
+    }
+
+    protected void createCurvedOutline(final OutlineShape shape, final float zOffset) {
+        final float tw = getWidth();
+        final float th = getHeight();
+        final float dC = 0.5f*corner*Math.min(tw, th);
+
+        final float minX = 0;
+        final float minY = 0;
+        final float minZ = zOffset;
+
+        shape.addVertex(minX, minY + dC, minZ, true);
+        shape.addVertex(minX, minY,  minZ, false);
+
+        shape.addVertex(minX + dC, minY, minZ,  true);
+
+        shape.addVertex(minX + tw - dC, minY,           minZ, true);
+        shape.addVertex(minX + tw,      minY,           minZ, false);
+        shape.addVertex(minX + tw,      minY + dC,      minZ, true);
+        shape.addVertex(minX + tw,      minY + th- dC,  minZ, true);
+        shape.addVertex(minX + tw,      minY + th,      minZ, false);
+        shape.addVertex(minX + tw - dC, minY + th,      minZ, true);
+        shape.addVertex(minX + dC,      minY + th,      minZ, true);
+        shape.addVertex(minX,           minY + th,      minZ, false);
+        shape.addVertex(minX,           minY + th - dC, minZ, true);
+
+        shape.closeLastOutline(true);
+    }
+
+    /** Set corner size, default is {@link #DEFAULT_CORNER} */
+    public void setCorner(float corner) {
+        if(corner > 1.0f){
+            this.corner = 1.0f;
+        }
+        else if(corner < 0.01f){
+            this.corner = 0.0f;
+        }
+        else{
+            this.corner = corner;
+        }
+        markShapeDirty();
+    }
+
+    @Override
+    public String getSubString() {
+        return super.getSubString()+", dim "+getWidth() + "x" + getHeight() + ", corner " + corner;
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/SceneUIController.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/SceneUIController.java
index 62e82a038..45907ad6a 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/SceneUIController.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/SceneUIController.java
@@ -96,7 +96,7 @@ public class SceneUIController implements GLEventListener{
     }
     public void markAllShapesDirty() {
         for(int i=0; i<shapes.size(); i++) {
-            shapes.get(i).markDirty();
+            shapes.get(i).markShapeDirty();
         }
     }
 
@@ -180,7 +180,7 @@ public class SceneUIController implements GLEventListener{
         gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
         gl.glClear(GL.GL_COLOR_BUFFER_BIT | GL.GL_DEPTH_BUFFER_BIT);
 
-        final PMVMatrix pmv = renderer.getMatrixMutable();
+        final PMVMatrix pmv = renderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
 
         final int shapeCount = shapes.size();
@@ -191,7 +191,6 @@ public class SceneUIController implements GLEventListener{
                 pmv.glPushMatrix();
                 transformShape(pmv, uiShape);
                 uiShape.drawShape(gl, renderer, sampleCount);
-                renderer.setMatrixDirty();
                 pmv.glPopMatrix();
             }
         }
@@ -218,7 +217,7 @@ public class SceneUIController implements GLEventListener{
         viewport[2] = width;
         viewport[3] = height;
 
-        final PMVMatrix pmv = renderer.getMatrixMutable();
+        final PMVMatrix pmv = renderer.getMatrix();
         renderer.reshapePerspective(45.0f, width, height, zNear, zFar);
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
@@ -308,7 +307,6 @@ public class SceneUIController implements GLEventListener{
                     activeId = pickShape(glWinX, glWinY);
                     final UIShape uiShape = getActiveUI();
                     if(uiShape != null) {
-                        uiShape.setPressed(true);
                         uiShape.dispatchMouseEvent(e, glWinX, glWinY);
                     }
                     return true;
@@ -319,7 +317,6 @@ public class SceneUIController implements GLEventListener{
         public void mouseReleased(MouseEvent e) {
             final UIShape uiShape = getActiveUI();
             if(uiShape != null){
-                uiShape.setPressed(false);
                 uiShape.dispatchMouseEvent(e, e.getX(), viewport[3]-e.getY());
             }
         }
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/TextureButton.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/TextureButton.java
new file mode 100644
index 000000000..eeb5e19f3
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/TextureButton.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright 2014 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.test.junit.graph.demos.ui;
+
+import javax.media.opengl.GL2ES2;
+
+import com.jogamp.graph.curve.OutlineShape;
+import com.jogamp.graph.curve.Region;
+import com.jogamp.graph.curve.opengl.GLRegion;
+import com.jogamp.graph.curve.opengl.RegionRenderer;
+import com.jogamp.graph.geom.Vertex;
+import com.jogamp.graph.geom.Vertex.Factory;
+import com.jogamp.opengl.util.texture.TextureSequence;
+
+/**
+ * GPU based resolution independent Button impl
+ */
+public class TextureButton extends RoundButton {
+    private TextureSequence texSeq;
+
+    public TextureButton(final Factory<? extends Vertex> factory, final int renderModes,
+                         final float width, final float height, final TextureSequence texSeq) {
+        super(factory, renderModes | Region.COLORTEXTURE_RENDERING_BIT, width, height);
+        this.texSeq = texSeq;
+        setColor(1.0f, 1.0f, 1.0f, 1.0f);
+        setSelectedColorMod(0.9f, 0.9f, 0.9f, 0.9f);
+    }
+
+    @Override
+    protected GLRegion createGLRegion() {
+        return GLRegion.create(getRenderModes(), texSeq);
+    }
+
+    public void setTextureSequence(final TextureSequence texSeq) { this.texSeq = texSeq; }
+    public TextureSequence getTextureSequence() { return this.texSeq; }
+
+    @Override
+    protected void addShapeToRegion(GL2ES2 gl, RegionRenderer renderer) {
+        final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory());
+        if(corner == 0.0f) {
+            createSharpOutline(shape, 0f);
+        } else {
+            createCurvedOutline(shape, 0f);
+        }
+        shape.setIsQuadraticNurbs();
+        shape.setSharpness(shapesSharpness);
+        region.addOutlineShape(shape, null, rgbaColor);
+        box.resize(shape.getBounds());
+
+        final float[] ctr = box.getCenter();
+        setRotationOrigin( ctr[0], ctr[1], ctr[2]);
+
+        if( DRAW_DEBUG_BOX ) {
+            System.err.println("XXX.UIShape.TextureButton: Added Shape: "+shape+", "+box);
+        }
+    }
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIGLListener01.java
index 4bab03088..90eb7d4f0 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIGLListener01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIGLListener01.java
@@ -50,7 +50,7 @@ public class UIGLListener01 extends UIListenerBase01 {
         setMatrix(-20, 00, 0f, -50);
         try {
             final Font font = FontFactory.get(FontFactory.UBUNTU).getDefault();
-            button = new RIButton(SVertex.factory(), 0, font, "Click me!", 4f, 3f, -0.05f);
+            button = new LabelButton(SVertex.factory(), 0, font, "Click me!", 4f, 3f, -0.05f);
             button.translate(2,1,0);
             /** Button defaults !
                 button.setLabelColor(1.0f,1.0f,1.0f);
@@ -89,7 +89,7 @@ public class UIGLListener01 extends UIListenerBase01 {
         final float[] translate = button.getTranslate();
 
         final RegionRenderer regionRenderer = getRegionRenderer();
-        final PMVMatrix pmv = regionRenderer.getMatrixMutable();
+        final PMVMatrix pmv = regionRenderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
         pmv.glTranslatef(getXTran(), getYTran(), getZoom());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
index 5445c6145..638ddac3c 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIListenerBase01.java
@@ -67,7 +67,7 @@ public abstract class UIListenerBase01 implements GLEventListener {
     private final boolean debug;
     private final boolean trace;
 
-    protected RIButton button;
+    protected LabelButton button;
 
     private KeyAction keyAction;
     private MouseAction mouseAction;
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java
index 554398435..abe0fcc76 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/demos/ui/UIShape.java
@@ -50,6 +50,7 @@ public abstract class UIShape {
     public static final boolean DRAW_DEBUG_BOX = false;
 
     protected static final int DIRTY_SHAPE     = 1 << 0 ;
+    protected static final int DIRTY_STATE    = 1 << 1 ;
 
     private final Factory<? extends Vertex> vertexFactory;
     private final int renderModes;
@@ -63,12 +64,14 @@ public abstract class UIShape {
     protected GLRegion region = null;
     protected int regionQuality = Region.MAX_QUALITY;
 
-    protected int dirty = DIRTY_SHAPE;
+    protected int dirty = DIRTY_SHAPE | DIRTY_STATE;
     protected float shapesSharpness = OutlineShape.DEFAULT_SHARPNESS;
 
     protected final float[] rgbaColor         = {0.6f, 0.6f, 0.6f, 1.0f};
     protected final float[] selectedRGBAModulate = {1.4f, 1.4f, 1.4f, 1.0f};
 
+    private int name = -1;
+
     private boolean down = false;
     private boolean toggle =false;
     private boolean toggleable = false;
@@ -81,6 +84,9 @@ public abstract class UIShape {
         this.box = new AABBox();
     }
 
+    public void setName(final int name) { this.name = name; }
+    public int getName() { return this.name; }
+
     public final Vertex.Factory<? extends Vertex> getVertexFactory() { return vertexFactory; }
 
     public boolean isEnabled() { return enabled; }
@@ -104,7 +110,7 @@ public abstract class UIShape {
         scale[1] = 1f;
         scale[2] = 1f;
         box.reset();
-        dirty = DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     /**
@@ -125,7 +131,7 @@ public abstract class UIShape {
         scale[1] = 1f;
         scale[2] = 1f;
         box.reset();
-        dirty = DIRTY_SHAPE;
+        markShapeDirty();
     }
 
     public void setTranslate(float tx, float ty, float tz) {
@@ -160,12 +166,18 @@ public abstract class UIShape {
     }
     public final float[] getScale() { return scale; }
 
-    public final void markDirty() {
-        dirty = DIRTY_SHAPE;
+    public final void markShapeDirty() {
+        dirty |= DIRTY_SHAPE;
     }
     public final boolean isShapeDirty() {
         return 0 != ( dirty & DIRTY_SHAPE ) ;
     }
+    public final void markStateDirty() {
+        dirty |= DIRTY_STATE;
+    }
+    public final boolean isStateDirty() {
+        return 0 != ( dirty & DIRTY_STATE ) ;
+    }
 
     public final AABBox getBounds() { return box; }
 
@@ -188,7 +200,7 @@ public abstract class UIShape {
     public void drawShape(GL2ES2 gl, RegionRenderer renderer, int[] sampleCount) {
         final float r, g, b, a;
         final boolean isSelect;
-        if( isPressed() || toggle ) {
+        if( isPressed() || getToggleState() ) {
             isSelect = true;
             r = rgbaColor[0]*selectedRGBAModulate[0];
             g = rgbaColor[1]*selectedRGBAModulate[1];
@@ -203,11 +215,12 @@ public abstract class UIShape {
         }
 
         if( renderer.getRenderState().isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED) ) {
-            gl.glClearColor(r, g, b, 0.0f);
+            // gl.glClearColor(r, g, b, 0.0f);
+            gl.glClearColor(1.0f, 1.0f, 1.0f, 0.0f);
         }
         final RenderState rs = renderer.getRenderState();
 
-        if( Region.hasColorChannel( renderModes ) ) {
+        if( Region.hasColorChannel( renderModes ) || Region.hasColorTexture( renderModes ) ) {
             if( isSelect ) {
                 rs.setColorStatic(selectedRGBAModulate[0], selectedRGBAModulate[1], selectedRGBAModulate[2], selectedRGBAModulate[3]);
             } else {
@@ -219,11 +232,15 @@ public abstract class UIShape {
         getRegion(gl, renderer).draw(gl, renderer, sampleCount);
     }
 
-    public final boolean validate(GL2ES2 gl, RegionRenderer renderer) {
-        if( isShapeDirty() ) {
+    protected GLRegion createGLRegion() {
+        return GLRegion.create(renderModes, null);
+    }
+
+    public final void validate(GL2ES2 gl, RegionRenderer renderer) {
+        if( isShapeDirty() || null == region ) {
             box.reset();
             if( null == region ) {
-                region = GLRegion.create(renderModes);
+                region = createGLRegion();
             } else {
                 region.clear(gl);
             }
@@ -236,10 +253,12 @@ public abstract class UIShape {
                 region.addOutlineShape(shape, null, rgbaColor);
             }
             region.setQuality(regionQuality);
-            dirty &= ~DIRTY_SHAPE;
-            return true;
-        } else {
-            return false;
+            // dirty &= ~(DIRTY_SHAPE | DIRTY_STATE);
+            dirty = 0;
+        } else if( isStateDirty() ) {
+            region.markDirty();
+            // dirty &= ~DIRTY_STATE;
+            dirty = 0;
         }
     }
 
@@ -256,7 +275,7 @@ public abstract class UIShape {
     }
     public final void setSharpness(float sharpness) {
         this.shapesSharpness = sharpness;
-        dirty = DIRTY_SHAPE;
+        markShapeDirty();
     }
     public final float getSharpness() {
         return shapesSharpness;
@@ -276,33 +295,44 @@ public abstract class UIShape {
     }
 
     public String toString() {
-        return getClass().getSimpleName()+"[enabled "+enabled+", "+translate[0]+" / "+translate[1]+", box "+box+"]";
+        return getClass().getSimpleName()+"["+getSubString()+"]";
+    }
+
+    public String getSubString() {
+        return "enabled "+enabled+", toggle[able "+toggleable+", state "+toggle+"], "+translate[0]+" / "+translate[1]+", box "+box;
     }
 
     //
     // Input
     //
 
-    public void setPressed(boolean b) {
+    public void setPressed(final boolean b) {
         this.down  = b;
-        if(isToggleable() && b) {
+        if( isToggleable() && b ) {
             toggle = !toggle;
         }
+        markStateDirty();
     }
 
     public boolean isPressed() {
         return this.down;
     }
 
+    public void setToggleable(final boolean toggleable) {
+        this.toggleable = toggleable;
+    }
+
     public boolean isToggleable() {
         return toggleable;
     }
 
-    public void setToggleable(boolean toggleable) {
-        this.toggleable = toggleable;
+    public void setToggleState(final boolean v) {
+        toggle = v;
+        markStateDirty();
     }
+    public boolean getToggleState() { return toggle; }
 
-    public final void addMouseListener(MouseListener l) {
+    public final void addMouseListener(final MouseListener l) {
         if(l == null) {
             return;
         }
@@ -373,9 +403,16 @@ public abstract class UIShape {
         // set as attachment
         e.setAttachment(new EventDetails(this, rbox, relPos));
 
+        final short eventType = e.getEventType();
+        if( MouseEvent.EVENT_MOUSE_PRESSED == eventType ) {
+            setPressed(true);
+        } else if ( MouseEvent.EVENT_MOUSE_RELEASED == eventType ) {
+            setPressed(false);
+        }
+
         for(int i = 0; !e.isConsumed() && i < mouseListeners.size(); i++ ) {
             final MouseListener l = mouseListeners.get(i);
-            switch(e.getEventType()) {
+            switch( eventType ) {
                 case MouseEvent.EVENT_MOUSE_CLICKED:
                     l.mouseClicked(e);
                     break;
@@ -386,11 +423,9 @@ public abstract class UIShape {
                     l.mouseExited(e);
                     break;
                 case MouseEvent.EVENT_MOUSE_PRESSED:
-                    markDirty();
                     l.mousePressed(e);
                     break;
                 case MouseEvent.EVENT_MOUSE_RELEASED:
-                    markDirty();
                     l.mouseReleased(e);
                     break;
                 case MouseEvent.EVENT_MOUSE_MOVED:
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java
index b96ef21a9..35b2242ae 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLReadBuffer00Base.java
@@ -63,7 +63,7 @@ public abstract class GLReadBuffer00Base extends UITestCase {
             // FIXME: Graph TextRenderer does not AA well w/o MSAA and FBO
             super(Region.VBAA_RENDERING_BIT, new int[] { 4 });
             this.setRendererCallbacks(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
-            regionFPS = GLRegion.create(renderModes);
+            regionFPS = GLRegion.create(renderModes, null);
 
             staticRGBAColor[0] = 0.9f;
             staticRGBAColor[1] = 0.9f;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
index 2abf083b1..bbf6d81ae 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieCube.java
@@ -180,7 +180,7 @@ public class MovieCube implements GLEventListener {
             if( lowPerfDevice ) {
                 regionFPS = null;
             } else {
-                regionFPS = GLRegion.create(renderModes);
+                regionFPS = GLRegion.create(renderModes, null);
                 System.err.println("RegionFPS "+Region.getRenderModeString(renderModes)+", sampleCount "+textSampleCount[0]+", class "+regionFPS.getClass().getName());
             }
             staticRGBAColor[0] = 0.1f;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
index f76859a9e..96ed57a8f 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/av/MovieSimple.java
@@ -149,7 +149,7 @@ public class MovieSimple implements GLEventListener {
             if( lowPerfDevice ) {
                 regionFPS = null;
             } else {
-                regionFPS = GLRegion.create(renderModes);
+                regionFPS = GLRegion.create(renderModes, null);
                 System.err.println("RegionFPS "+Region.getRenderModeString(renderModes)+", sampleCount "+textSampleCount[0]+", class "+regionFPS.getClass().getName());
             }
             staticRGBAColor[0] = 0.9f;