summaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-03-21 09:33:06 +0100
committerSven Gothel <[email protected]>2023-03-21 09:33:06 +0100
commit59a7fdeb4ed36f0014ba1fdcc0ec144c04aaa2d5 (patch)
treeecd36c5dc7e3af7aa6c42795566640c9d49d11ab /src/test/com/jogamp
parent8abe939c5132e4a58c4b9a6b31f0b1fd10734516 (diff)
Graph: Cleanup Vertex.Factory referencing: Only bind to OutlineShape and use its default. GraphUI: Always use default.
Graph RegionRenderer, its RenderState as well as GraphUI's Scene don't need to have knowledge of Vertex.Factory, which is only used within OutlineShape and its 'inner geom workings'.
Diffstat (limited to 'src/test/com/jogamp')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java2
3 files changed, 4 insertions, 4 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 688174772..2dacdec68 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener01.java
@@ -254,7 +254,7 @@ public class GPURegionGLListener01 extends GPURendererListenerBase01 {
gl.glEnable(GL.GL_BLEND);
rs.setColorStatic(0.0f, 0.0f, 0.0f, 1.0f);
- outlineShape = new OutlineShape(getRenderer().getRenderState().getVertexFactory());
+ outlineShape = new OutlineShape();
switch( shape_ctor_mode ) {
case 0:
createTestOutline00();
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 f285f8bd8..80beafd60 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/GPURegionGLListener10.java
@@ -57,7 +57,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 {
}
private void createTestOutline(final GLProfile glp){
- OutlineShape shape = new OutlineShape(getRenderer().getRenderState().getVertexFactory());
+ OutlineShape shape = new OutlineShape();
outlineShapes.add(shape);
shape.addVertex(0.0f,-10.0f,true);
shape.addVertex(15.0f,-10.0f, true);
@@ -75,7 +75,7 @@ public class GPURegionGLListener10 extends GPURendererListenerBase01 {
shape.closeLastOutline(true);
/** Same shape as above but without any off-curve vertices */
- shape = new OutlineShape(getRenderer().getRenderState().getVertexFactory());
+ shape = new OutlineShape();
outlineShapes.add(shape);
final float offset = 30;
shape.addVertex(offset+0.0f,-10.0f, true);
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 e208833a8..99cbb5118 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TextRendererGLELBase.java
@@ -127,7 +127,7 @@ public abstract class TextRendererGLELBase implements GLEventListener {
@Override
public void init(final GLAutoDrawable drawable) {
exclusivePMVMatrix = null == sharedPMVMatrix;
- this.renderer = RegionRenderer.create(null, sharedPMVMatrix, enableCallback, disableCallback);
+ this.renderer = RegionRenderer.create(sharedPMVMatrix, enableCallback, disableCallback);
this.getRenderer().getRenderState().setHintMask(RenderState.BITHINT_GLOBAL_DEPTH_TEST_ENABLED);
this.textRenderUtil = new TextRegionUtil(renderModes);
final GL2ES2 gl = drawable.getGL().getGL2ES2();