diff options
| author | Sven Gothel <[email protected]> | 2023-03-19 08:13:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-03-19 08:13:11 +0100 |
| commit | 37224b6c84a66788813856f806a727d73991f546 (patch) | |
| tree | b7e6f1b70ae88d638111fac34d1171e83de451dd /src/demos/com | |
| parent | 6c13d824a00eff448cef6bec7010e9c682df7d62 (diff) | |
Graph UI: Adopt Shape implementations to Shape API changes (simplification)
Diffstat (limited to 'src/demos/com')
5 files changed, 10 insertions, 10 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java index 4171eeda8..d9db96332 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph01UbuntuLight_o.java @@ -56,8 +56,8 @@ public class Glyph01UbuntuLight_o extends Shape { @SuppressWarnings("unused") @Override - protected void addShapeToRegion(final GL2ES2 gl, final RegionRenderer renderer) { - final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory()); + protected void addShapeToRegion() { + final OutlineShape shape = new OutlineShape(vertexFactory); // Ubuntu-Light, lower case 'o' // Start TTF Shape for Glyph 82 diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java index 28d6f6390..6113756a7 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph02UbuntuLight_ae.java @@ -55,8 +55,8 @@ public class Glyph02UbuntuLight_ae extends Shape { @SuppressWarnings("unused") @Override - protected void addShapeToRegion(final GL2ES2 gl, final RegionRenderer renderer) { - final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory()); + protected void addShapeToRegion() { + final OutlineShape shape = new OutlineShape(vertexFactory); // Ubuntu-Light, lower case 'æ' diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java index 45868762c..a4e342ff5 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph03FreeMonoRegular_M.java @@ -55,8 +55,8 @@ public class Glyph03FreeMonoRegular_M extends Shape { @SuppressWarnings("unused") @Override - protected void addShapeToRegion(final GL2ES2 gl, final RegionRenderer renderer) { - final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory()); + protected void addShapeToRegion() { + final OutlineShape shape = new OutlineShape(vertexFactory); if( false ) { // Start TTF Shape for Glyph 48 diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java index 63bc0b5b5..05624e7bd 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph04FreeSans_0.java @@ -54,8 +54,8 @@ public class Glyph04FreeSans_0 extends Shape { } @Override - protected void addShapeToRegion(final GL2ES2 gl, final RegionRenderer renderer) { - final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory()); + protected void addShapeToRegion() { + final OutlineShape shape = new OutlineShape(vertexFactory); // Start TTF Shape for Glyph 19 // 000: B0a: move-to p0 diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java index dd92228ff..8a3594d58 100644 --- a/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java +++ b/src/demos/com/jogamp/opengl/demos/graph/ui/testshapes/Glyph05FreeSerifBoldItalic_ae.java @@ -54,8 +54,8 @@ public class Glyph05FreeSerifBoldItalic_ae extends Shape { } @Override - protected void addShapeToRegion(final GL2ES2 gl, final RegionRenderer renderer) { - final OutlineShape shape = new OutlineShape(renderer.getRenderState().getVertexFactory()); + protected void addShapeToRegion() { + final OutlineShape shape = new OutlineShape(vertexFactory); // Start TTF Shape for Glyph 168 // 000: B0a: move-to p0 |