Remove generics notion of Type<Vertex>, since Vertex _is_ the lowest denominator for our implementation and curve API

2 files changed, 6 insertions, 6 deletions

diff --git a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
index baca05dc7..a17809d79 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++);
@@ -338,7 +338,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;
 	}
diff --git a/src/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
index 155d35f0b..f509dbd58 100644
--- a/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -45,7 +45,7 @@ public class VBORegionSPES2  implements Region{
 	private int numVertices = 0;
 	private IntBuffer 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;
@@ -63,7 +63,7 @@ public class VBORegionSPES2  implements Region{
 		GL2ES2 gl = context.getGL().getGL2ES2();
 		ShortBuffer indicies = Buffers.newDirectShortBuffer(triangles.size() * 3);
 		
-		for(Triangle<Vertex> t:triangles){
+		for(Triangle t:triangles){
 			final Vertex[] t_vertices = t.getVertices();
 			
 			if(t_vertices[0].getId() == Integer.MAX_VALUE){
@@ -151,7 +151,7 @@ public class VBORegionSPES2  implements Region{
 		render();
 	}
 	
-	public void addTriangles(ArrayList<Triangle<Vertex>> tris) {
+	public void addTriangles(ArrayList<Triangle> tris) {
 		triangles.addAll(tris);
 		dirty = true;
 	}