summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/com/jogamp/graph/geom
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-02-27 10:53:06 +0100
committerSven Gothel <[email protected]>2014-02-27 10:53:06 +0100
commit2cafc01f08f9ab05748be6eeb82c417de38b31f7 (patch)
tree8fd55b032fa2585f75517287506604ca739bfed9 /src/jogl/classes/com/jogamp/graph/geom
parent073ac5ab63af792d8468d8bf074b982f7c44ef33 (diff)
Bug 801: Graph TextRenderer Cleanup Part-3: Region.addOutlineShape(..) Push GL data directly incl. all index validations
Region: - Remove redundant methods to make OutlineShape the unique source. - addVertex(..) - addTriangles(..) - Perform all index validations in addOutlineShape(..) - Push OutlineShape's vertex data and it's triangle indices directly to VBO. GLRegion: Add clear(..) method, allowing to clear the region for new data, i.e. OutlineShapes
Diffstat (limited to 'src/jogl/classes/com/jogamp/graph/geom')
-rw-r--r--src/jogl/classes/com/jogamp/graph/geom/Triangle.java16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
index 6de99c48b..e353dd061 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
@@ -83,20 +83,6 @@ public class Triangle {
this.id = id;
}
- public void addVertexIndicesOffset(int offset) {
- if( 0 < offset ) {
- final int i0 = vertices[0].getId();
- if( Integer.MAX_VALUE-offset > i0 ) { // Integer.MAX_VALUE != i0 // FIXME: renderer uses SHORT!
- if(Region.DEBUG_INSTANCE) {
- System.err.println("Triangle.addVertexIndicesOffset: "+i0+" + "+offset+" -> "+(i0+offset));
- }
- vertices[0].setId(i0+offset);
- vertices[1].setId(vertices[1].getId()+offset);
- vertices[2].setId(vertices[2].getId()+offset);
- }
- }
- }
-
/** Returns array of 3 vertices, denominating the triangle. */
public Vertex[] getVertices() {
return vertices;
@@ -124,6 +110,6 @@ public class Triangle {
@Override
public String toString() {
- return "Tri ID: " + id + "\n" + vertices[0] + "\n" + vertices[1] + "\n" + vertices[2];
+ return "Tri ID: " + id + "\n\t" + vertices[0] + "\n\t" + vertices[1] + "\n\t" + vertices[2];
}
}