Graph: Simplify RegionRenderer API by exposing common RenderState methods (and fwd 'em to RenderState aggregate)

8 files changed, 22 insertions, 28 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java
index 0b25b3d3a..42ee9d2c0 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java
@@ -59,7 +59,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
     public GPURegionGLListener01 (final int shape_ctor_mode, final int renderModes, final int sampleCount, final boolean debug, final boolean trace) {
         super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace);
         this.shape_ctor_mode = shape_ctor_mode;
-        this.getRenderer().getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         setMatrix(-20, 00, -50, 0f, sampleCount);
     }
 
@@ -247,12 +247,10 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
 
         final GL2ES2 gl = drawable.getGL().getGL2ES2();
 
-        final RenderState rs = getRenderer().getRenderState();
-
         gl.setSwapInterval(1);
         gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glEnable(GL.GL_BLEND);
-        rs.setColorStatic(0.0f, 0.0f, 0.0f, 1.0f);
+        getRenderer().setColorStatic(0.0f, 0.0f, 0.0f, 1.0f);
 
         outlineShape = new OutlineShape();
         switch( shape_ctor_mode ) {
@@ -273,7 +271,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
                 break;
         }
         region = GLRegion.create(gl.getGLProfile(), getRenderModes(), null, outlineShape);
-        region.addOutlineShape(outlineShape, null, region.hasColorChannel() ? getRenderer().getRenderState().getColorStatic(new Vec4f()) : null);
+        region.addOutlineShape(outlineShape, null, region.hasColorChannel() ? getRenderer().getColorStatic(new Vec4f()) : null);
     }
 
     @Override
@@ -289,8 +287,8 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
         pmv.glLoadIdentity();
         pmv.glTranslatef(getXTran(), getYTran(), getZTran());
         pmv.glRotatef(getAngle(), 0, 1, 0);
-        if( weight != regionRenderer.getRenderState().getWeight() ) {
-            regionRenderer.getRenderState().setWeight(weight);
+        if( weight != regionRenderer.getWeight() ) {
+            regionRenderer.setWeight(weight);
         }
         regionRenderer.enable(gl, true);
         region.draw(gl, regionRenderer, getSampleCount());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java
index 10cabb213..716c9f2e7 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java
@@ -53,7 +53,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 {
 
     public GPURegionGLListener10 (final int renderModes, final int sampleCount, final boolean debug, final boolean trace) {
         super(RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable), renderModes, debug, trace);
-        this.getRenderer().getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         setMatrix(-20, 00, -50, 0f, sampleCount);
     }
 
@@ -106,12 +106,10 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 {
 
         final GL2ES2 gl = drawable.getGL().getGL2ES2();
 
-        final RenderState rs = getRenderer().getRenderState();
-
         gl.setSwapInterval(1);
         gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glEnable(GL.GL_BLEND);
-        rs.setColorStatic(0.0f, 0.0f, 0.0f, 1.0f);
+        getRenderer().setColorStatic(0.0f, 0.0f, 0.0f, 1.0f);
 
         createTestOutline(gl.getGLProfile());
     }
@@ -130,8 +128,8 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 {
         pmv.glLoadIdentity();
         pmv.glTranslatef(getXTran(), getYTran(), getZTran());
         pmv.glRotatef(getAngle(), 0, 1, 0);
-        if( weight != regionRenderer.getRenderState().getWeight() ) {
-            regionRenderer.getRenderState().setWeight(weight);
+        if( weight != regionRenderer.getWeight() ) {
+            regionRenderer.setWeight(weight);
         }
         regionRenderer.enable(gl, true);
         region.draw(gl, regionRenderer, getSampleCount());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
index f4283bf41..b6391b1cf 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPUTextRendererListenerBase01.java
@@ -153,7 +153,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
         // NOTE_ALPHA_BLENDING: We use alpha-blending
         super(RegionRenderer.create(blending ? RegionRenderer.defaultBlendEnable : null, blending ? RegionRenderer.defaultBlendDisable : null),
                                     renderModes, debug, trace);
-        this.getRenderer().getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         this.textRegionUtil = new TextRegionUtil(renderModes);
         this.regionFPS = GLRegion.create(glp, renderModes, null, 0, 0);
         this.regionHead = GLRegion.create(glp, renderModes, null, 0, 0);
@@ -301,11 +301,10 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
         // final int[] view = new int[] { 0, 0, drawable.getWidth(),  drawable.getHeight() };
 
         final RegionRenderer renderer = getRenderer();
-        final RenderState rs = renderer.getRenderState();
         final PMVMatrix pmv = renderer.getMatrix();
         pmv.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
         pmv.glLoadIdentity();
-        rs.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
+        renderer.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
         final float pixelSizeFName = FontScale.toPixels(fontSizeFName, dpiV);
         final float pixelSizeHead = FontScale.toPixels(fontSizeHead, dpiV);
         final float mmSizeHead = pixelSizeHead / ppmmV;
@@ -332,7 +331,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
                     fontSizeHead, pixelSizeHead, mmSizeHead,
                     fontSizeCenter, pixelSizeCenter, mmSizeCenter,
                     modeS, getSampleCount()[0], sampleCountFPS[0],
-                    renderer.getRenderState().isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED),
+                    renderer.isHintMaskSet(RenderState.BITHINT_BLENDING_ENABLED),
                     drawable.getChosenGLCapabilities().getAlphaBits());
 
             // bottom, half line up
@@ -389,7 +388,7 @@ public abstract class GPUTextRendererListenerBase01 extends GPURendererListenerB
                 final float sxy = nearPlaneS * pixelSizeCenter;
                 pmv.glScalef(sxy, sxy, 1.0f);
             }
-            rs.setColorStatic(0.9f, 0.0f, 0.0f, 1.0f);
+            renderer.setColorStatic(0.9f, 0.0f, 0.0f, 1.0f);
 
             if( bottomTextUseFrustum ) {
                 regionBottom.setFrustum(pmv.getFrustum());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java b/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java
index 8719fea27..9b487a2f0 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/PerfTextRendererNEWT00.java
@@ -242,7 +242,7 @@ public class PerfTextRendererNEWT00 {
         final GLReadBufferUtil screenshot = new GLReadBufferUtil(false, false);
 
         final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
-        renderer.getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
 
         final GLRegion region = GLRegion.create(gl.getGLProfile(), renderModes, null, font, text);
         System.err.println("Region post ctor w/ pre-calculated buffer size");
@@ -268,7 +268,7 @@ public class PerfTextRendererNEWT00 {
             // region.growBufferSize(123000, 62000); // hack-me
             gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
             renderer.init(gl);
-            renderer.getRenderState().setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
+            renderer.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
 
             // reshape
             gl.glViewport(0, 0, drawable.getSurfaceWidth(), drawable.getSurfaceHeight());
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java
index 3416958e3..80bb95d05 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java
@@ -179,13 +179,13 @@ public class TestTextRendererNEWT01 extends UITestCase {
         System.err.println("Chosen: "+winctx.window.getChosenCapabilities());
 
         final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
-        renderer.getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         final TextRegionUtil textRenderUtil = new TextRegionUtil(renderModes);
 
         // init
         gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
         renderer.init(gl);
-        renderer.getRenderState().setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
+        renderer.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
         screenshot = new GLReadBufferUtil(false, false);
 
         // reshape
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
index 511aa36ba..5ce4005a6 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT20.java
@@ -350,8 +350,7 @@ public class TestTextRendererNEWT20 extends UITestCase {
             System.err.println(JoglVersion.getGLInfo(gl, null, false /* withCapsAndExts */).toString());
             MSAATool.dump(drawable);
 
-            final RenderState rs = getRenderer().getRenderState();
-            rs.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
+            getRenderer().setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
         }
 
         @Override
diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java
index 3917f7c1b..41b556186 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWTBugXXXX.java
@@ -137,13 +137,13 @@ public class TestTextRendererNEWTBugXXXX extends UITestCase {
         System.err.println("Chosen: "+winctx.window.getChosenCapabilities());
 
         final RegionRenderer renderer = RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable);
-        renderer.getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        renderer.setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         final TextRegionUtil textRenderUtil = new TextRegionUtil(renderModes);
 
         // init
         gl.glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
         renderer.init(gl);
-        renderer.getRenderState().setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
+        renderer.setColorStatic(0.1f, 0.1f, 0.1f, 1.0f);
         screenshot = new GLReadBufferUtil(false, false);
 
         // reshape
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 f66d58d3c..8e90d88eb 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
@@ -128,11 +128,11 @@ public abstract class TextRendererGLELBase implements GLEventListener {
     public void init(final GLAutoDrawable drawable) {
         exclusivePMVMatrix = null == sharedPMVMatrix;
         this.renderer = RegionRenderer.create(sharedPMVMatrix, enableCallback, disableCallback);
-        this.getRenderer().getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
+        this.getRenderer().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
         this.textRenderUtil = new TextRegionUtil(renderModes);
         final GL2ES2 gl = drawable.getGL().getGL2ES2();
         renderer.init(gl);
-        renderer.getRenderState().setColorStatic(staticRGBAColor[0], staticRGBAColor[1], staticRGBAColor[2], staticRGBAColor[3]);
+        renderer.setColorStatic(staticRGBAColor[0], staticRGBAColor[1], staticRGBAColor[2], staticRGBAColor[3]);
 
         final Object upObj = drawable.getUpstreamWidget();
         if( upObj instanceof Window ) {