diff options
author | Rami Santina <[email protected]> | 2011-03-30 16:38:14 +0300 |
---|---|---|
committer | Rami Santina <[email protected]> | 2011-03-30 16:38:14 +0300 |
commit | 8e5d620eae1dcc1f1178e09c1d5172324541f503 (patch) | |
tree | f2d26265a6d2ee46fba6bae368fbde36428418a8 /src/jogamp/graph/curve/opengl/VBORegion2PGL3.java | |
parent | 133edeb70921dbcae3ec7cc76f1bc6dd0cd36da8 (diff) | |
parent | 630a9ea52b16da6badb31a98b70893f8d294b4e8 (diff) |
Merge with sgothel
Diffstat (limited to 'src/jogamp/graph/curve/opengl/VBORegion2PGL3.java')
-rw-r--r-- | src/jogamp/graph/curve/opengl/VBORegion2PGL3.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java index ac2be6097..066f43afc 100644 --- a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java +++ b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java @@ -53,7 +53,7 @@ public class VBORegion2PGL3 implements Region{ private IntBuffer t_vboIds; - private ArrayList<Triangle<Vertex>> triangles = new ArrayList<Triangle<Vertex>>(); + private ArrayList<Triangle> triangles = new ArrayList<Triangle>(); private ArrayList<Vertex> vertices = new ArrayList<Vertex>(); private GLContext context; @@ -85,7 +85,7 @@ public class VBORegion2PGL3 implements Region{ GL3 gl = context.getGL().getGL3(); ShortBuffer indicies = Buffers.newDirectShortBuffer(triangles.size() * 3); - for(Triangle<Vertex> t:triangles){ + for(Triangle t:triangles){ if(t.getVertices()[0].getId() == Integer.MAX_VALUE){ t.getVertices()[0].setId(numVertices++); t.getVertices()[1].setId(numVertices++); @@ -342,7 +342,7 @@ public class VBORegion2PGL3 implements Region{ gl.glBindBuffer(GL3.GL_ARRAY_BUFFER, 0); } - public void addTriangles(ArrayList<Triangle<Vertex>> tris) { + public void addTriangles(ArrayList<Triangle> tris) { triangles.addAll(tris); dirty = true; } |