From 630a9ea52b16da6badb31a98b70893f8d294b4e8 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 30 Mar 2011 15:25:18 +0200 Subject: Remove generics notion of Type, since Vertex _is_ the lowest denominator for our implementation and curve API --- src/jogamp/graph/curve/text/GlyphShape.java | 2 +- src/jogamp/graph/curve/text/GlyphString.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/jogamp/graph/curve/text') diff --git a/src/jogamp/graph/curve/text/GlyphShape.java b/src/jogamp/graph/curve/text/GlyphShape.java index 712633f4b..70a725424 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> triangulate(float sharpness){ + public ArrayList 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> initializeTriangles(float sharpness){ - ArrayList> triangles = new ArrayList>(); + private ArrayList initializeTriangles(float sharpness){ + ArrayList triangles = new ArrayList(); for(GlyphShape glyph:glyphs){ - ArrayList> tris = glyph.triangulate(sharpness); + ArrayList 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> tris = initializeTriangles(shaprness); + ArrayList tris = initializeTriangles(shaprness); region.addTriangles(tris); int numVertices = region.getNumVertices(); -- cgit v1.2.3