From bd43319992d02f8194dce94587de476ee421891b Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 27 Feb 2014 23:57:39 +0100 Subject: Bug 801: Graph TextRenderer Cleanup Part-5: *Region API Cleanup (protected impl. part) --- .../classes/jogamp/graph/curve/opengl/VBORegion2PES2.java | 13 +++++-------- .../classes/jogamp/graph/curve/opengl/VBORegionSPES2.java | 13 +++++-------- 2 files changed, 10 insertions(+), 16 deletions(-) (limited to 'src/jogl/classes/jogamp/graph/curve/opengl') diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java index 9c3e3f2c2..df3be2e06 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java @@ -82,7 +82,7 @@ public class VBORegion2PES2 extends GLRegion { } @Override - public final void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) { + protected final void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) { indicesTxtBuffer.seal(gl, false); indicesTxtBuffer.rewind(); verticeTxtAttr.seal(gl, false); @@ -92,10 +92,7 @@ public class VBORegion2PES2 extends GLRegion { } @Override - public final boolean usesIndices() { return true; } - - @Override - public final void pushVertex(float[] coords, float[] texParams) { + protected final void pushVertex(float[] coords, float[] texParams) { verticeTxtAttr.putf(coords[0]); verticeTxtAttr.putf(coords[1]); verticeTxtAttr.putf(coords[2]); @@ -105,12 +102,12 @@ public class VBORegion2PES2 extends GLRegion { } @Override - public final void pushIndex(int idx) { + protected final void pushIndex(int idx) { indicesTxtBuffer.puts((short)idx); } @Override - public void update(final GL2ES2 gl, final RegionRenderer renderer) { + protected void update(final GL2ES2 gl, final RegionRenderer renderer) { if(null == indicesFbo) { final ShaderState st = renderer.getShaderState(); @@ -276,7 +273,7 @@ public class VBORegion2PES2 extends GLRegion { } @Override - public void destroy(final GL2ES2 gl, final RegionRenderer renderer) { + protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) { if(DEBUG_INSTANCE) { System.err.println("VBORegion2PES2 Destroy: " + this); } diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java index af0c4c980..f4c40b0e5 100644 --- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java +++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java @@ -56,7 +56,7 @@ public class VBORegionSPES2 extends GLRegion { } @Override - public final void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) { + protected final void clearImpl(final GL2ES2 gl, final RegionRenderer renderer) { indicesBuffer.seal(gl, false); indicesBuffer.rewind(); verticeAttr.seal(gl, false); @@ -66,10 +66,7 @@ public class VBORegionSPES2 extends GLRegion { } @Override - public final boolean usesIndices() { return true; } - - @Override - public final void pushVertex(float[] coords, float[] texParams) { + protected final void pushVertex(float[] coords, float[] texParams) { verticeAttr.putf(coords[0]); verticeAttr.putf(coords[1]); verticeAttr.putf(coords[2]); @@ -79,12 +76,12 @@ public class VBORegionSPES2 extends GLRegion { } @Override - public final void pushIndex(int idx) { + protected final void pushIndex(int idx) { indicesBuffer.puts((short)idx); } @Override - public void update(final GL2ES2 gl, final RegionRenderer renderer) { + protected void update(final GL2ES2 gl, final RegionRenderer renderer) { if( !buffersAttached ) { final ShaderState st = renderer.getShaderState(); st.ownAttribute(verticeAttr, true); @@ -119,7 +116,7 @@ public class VBORegionSPES2 extends GLRegion { } @Override - public void destroy(final GL2ES2 gl, final RegionRenderer renderer) { + protected void destroyImpl(final GL2ES2 gl, final RegionRenderer renderer) { if(DEBUG_INSTANCE) { System.err.println("VBORegionSPES2 Destroy: " + this); } -- cgit v1.2.3