aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/graph/curve
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2013-10-17 22:51:47 -0700
committerHarvey Harrison <[email protected]>2013-10-17 23:01:22 -0700
commitf1ae8ddb87c88a57dce4593f006881ef6a7f0932 (patch)
tree0c25dff44d3781dadecc8234a9bc70e18e50cbc2 /src/jogl/classes/jogamp/graph/curve
parent5e9c02bce7b241a0bf95c8abca9a91cd25e51ed3 (diff)
jogl: add missing @Override annotations
Signed-off-by: Harvey Harrison <[email protected]>
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve')
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java1
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java3
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java3
-rw-r--r--src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java3
-rw-r--r--src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java3
5 files changed, 13 insertions, 0 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
index 22600cb89..012b1d1dd 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RegionRendererImpl01.java
@@ -46,6 +46,7 @@ public class RegionRendererImpl01 extends RegionRenderer {
}
+ @Override
protected boolean initShaderProgram(GL2ES2 gl) {
final ShaderState st = rs.getShaderState();
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java b/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
index 8ca29b9f0..fe2dd7363 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/RenderStateImpl.java
@@ -65,8 +65,11 @@ public class RenderStateImpl extends RenderState {
this(st, pointFactory, new PMVMatrix());
}
+ @Override
public final GLUniformData getWeight() { return gcu_Weight; }
+ @Override
public final GLUniformData getAlpha() { return gcu_Alpha; }
+ @Override
public final GLUniformData getColorStatic() { return gcu_ColorStatic; }
//public final GLUniformData getStrength() { return gcu_Strength; }
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
index 86c0db8c6..77c862ed4 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PES2.java
@@ -77,6 +77,7 @@ public class VBORegion2PES2 extends GLRegion {
mgl_ActiveTexture = new GLUniformData(UniformNames.gcu_TextureUnit, textureEngine);
}
+ @Override
public void update(GL2ES2 gl, RenderState rs) {
if(!isDirty()) {
return;
@@ -194,6 +195,7 @@ public class VBORegion2PES2 extends GLRegion {
int[] maxTexSize = new int[] { -1 } ;
+ @Override
protected void drawImpl(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth) {
if(vp_width <=0 || vp_height <= 0 || null==texWidth || texWidth[0] <= 0){
renderRegion(gl);
@@ -296,6 +298,7 @@ public class VBORegion2PES2 extends GLRegion {
verticeTxtAttr.enableBuffer(gl, false);
}
+ @Override
public void destroy(GL2ES2 gl, RenderState rs) {
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 0a867b45c..9feb18a12 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -48,6 +48,7 @@ public class VBORegionSPES2 extends GLRegion {
super(renderModes);
}
+ @Override
protected void update(GL2ES2 gl, RenderState rs) {
if(!isDirty()) {
return;
@@ -125,6 +126,7 @@ public class VBORegionSPES2 extends GLRegion {
setDirty(false);
}
+ @Override
protected void drawImpl(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth) {
verticeAttr.enableBuffer(gl, true);
texCoordAttr.enableBuffer(gl, true);
@@ -137,6 +139,7 @@ public class VBORegionSPES2 extends GLRegion {
verticeAttr.enableBuffer(gl, false);
}
+ @Override
public final void destroy(GL2ES2 gl, RenderState rs) {
if(DEBUG_INSTANCE) {
System.err.println("VBORegionSPES2 Destroy: " + this);
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
index 4f48b2d20..a60f91b87 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/CDTriangulator2D.java
@@ -65,6 +65,7 @@ public class CDTriangulator2D implements Triangulator{
/** Reset the triangulation to initial state
* Clearing cached data
*/
+ @Override
public void reset() {
maxTriID = 0;
vertices = new ArrayList<Vertex>();
@@ -72,6 +73,7 @@ public class CDTriangulator2D implements Triangulator{
loops = new ArrayList<Loop>();
}
+ @Override
public void addCurve(Outline polyline) {
Loop loop = null;
@@ -93,6 +95,7 @@ public class CDTriangulator2D implements Triangulator{
}
}
+ @Override
public ArrayList<Triangle> generate() {
for(int i=0;i<loops.size();i++) {
Loop loop = loops.get(i);