Merge with sgothel

2 files changed, 5 insertions, 5 deletions

diff --git a/src/jogamp/graph/curve/text/GlyphShape.java b/src/jogamp/graph/curve/text/GlyphShape.java
index 16983fed9..36ba57244 100644
--- a/src/jogamp/graph/curve/text/GlyphShape.java
+++ b/src/jogamp/graph/curve/text/GlyphShape.java
@@ -148,7 +148,7 @@ public class GlyphShape {
 	 * @param sharpness sharpness of the curved regions default = 0.5
 	 * @return ArrayList of triangles which define this shape
 	 */
-	public ArrayList<Triangle<Vertex>> triangulate(float sharpness){
+	public ArrayList<Triangle> triangulate(float sharpness){
 		return shape.triangulate(sharpness);
 	}
 
diff --git a/src/jogamp/graph/curve/text/GlyphString.java b/src/jogamp/graph/curve/text/GlyphString.java
index a7418c6de..808e3a415 100644
--- a/src/jogamp/graph/curve/text/GlyphString.java
+++ b/src/jogamp/graph/curve/text/GlyphString.java
@@ -94,10 +94,10 @@ public class GlyphString {
 		}
 	}
 	
-	private ArrayList<Triangle<Vertex>> initializeTriangles(float sharpness){
-		ArrayList<Triangle<Vertex>> triangles = new ArrayList<Triangle<Vertex>>();
+	private ArrayList<Triangle> initializeTriangles(float sharpness){
+		ArrayList<Triangle> triangles = new ArrayList<Triangle>();
 		for(GlyphShape glyph:glyphs){
-			ArrayList<Triangle<Vertex>> tris = glyph.triangulate(sharpness);
+			ArrayList<Triangle> tris = glyph.triangulate(sharpness);
 			triangles.addAll(tris);
 		}
 		return triangles;
@@ -112,7 +112,7 @@ public class GlyphString {
 		region = RegionFactory.create(context, st, type);
 		region.setFlipped(true);
 		
-		ArrayList<Triangle<Vertex>> tris = initializeTriangles(shaprness);
+		ArrayList<Triangle> tris = initializeTriangles(shaprness);
 		region.addTriangles(tris);
 		
 		int numVertices = region.getNumVertices();