summaryrefslogtreecommitdiffstats
path: root/src/jogamp/graph/curve/text
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-03-30 15:25:18 +0200
committerSven Gothel <[email protected]>2011-03-30 15:25:18 +0200
commit630a9ea52b16da6badb31a98b70893f8d294b4e8 (patch)
tree8ab07c2ff6a670381e2592c09a83bd7cf60a1f2c /src/jogamp/graph/curve/text
parentd06d5596d18101c876c869a514e42e795ee9357c (diff)
Remove generics notion of Type<Vertex>, since Vertex _is_ the lowest denominator for our implementation and curve API
Diffstat (limited to 'src/jogamp/graph/curve/text')
-rw-r--r--src/jogamp/graph/curve/text/GlyphShape.java2
-rw-r--r--src/jogamp/graph/curve/text/GlyphString.java8
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 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<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();