Refactored Vertex Point PointTex GraphPoint namings

Vertex class --> SVertex (Simple vertex wwhere memory impl is float[])
Point interface --> Vertex (which combines in it PointTex Interface)
GraphPoint --> GraphVertex

8 files changed, 88 insertions, 90 deletions

diff --git a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
index c5182059e..4f2714494 100644
--- a/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
+++ b/src/jogamp/graph/curve/opengl/VBORegion2PGL3.java
@@ -41,7 +41,7 @@ import com.jogamp.common.nio.Buffers;
 
 import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Triangle;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 
 import com.jogamp.graph.curve.Region;
 import com.jogamp.opengl.util.PMVMatrix;
@@ -53,8 +53,8 @@ public class VBORegion2PGL3  implements Region{
 	
 	private IntBuffer t_vboIds;
 	
-	private ArrayList<Triangle<PointTex>> triangles = new ArrayList<Triangle<PointTex>>();
-	private ArrayList<PointTex> vertices = new ArrayList<PointTex>();
+	private ArrayList<Triangle<Vertex>> triangles = new ArrayList<Triangle<Vertex>>();
+	private ArrayList<Vertex> vertices = new ArrayList<Vertex>();
 	private GLContext context;
 	
 	private int numBuffers = 3;
@@ -85,7 +85,7 @@ public class VBORegion2PGL3  implements Region{
 		GL3 gl = context.getGL().getGL3();
 		ShortBuffer indicies = Buffers.newDirectShortBuffer(triangles.size() * 3);
 		
-		for(Triangle<PointTex> t:triangles){
+		for(Triangle<Vertex> t:triangles){
 			if(t.getVertices()[0].getId() == Integer.MAX_VALUE){
 				t.getVertices()[0].setId(numVertices++);
 				t.getVertices()[1].setId(numVertices++);
@@ -100,9 +100,9 @@ public class VBORegion2PGL3  implements Region{
 				indicies.put((short) t.getVertices()[2].getId());
 			}
 			else{
-				PointTex v1 = t.getVertices()[0];
-				PointTex v2 = t.getVertices()[1];
-				PointTex v3 = t.getVertices()[2];
+				Vertex v1 = t.getVertices()[0];
+				Vertex v2 = t.getVertices()[1];
+				Vertex v3 = t.getVertices()[2];
 				
 				indicies.put((short) v1.getId());
 				indicies.put((short) v2.getId());
@@ -112,7 +112,7 @@ public class VBORegion2PGL3  implements Region{
 		indicies.rewind();
 		
 		FloatBuffer verticesBuffer = Buffers.newDirectFloatBuffer(vertices.size() * 3);
-		for(PointTex v:vertices){
+		for(Vertex v:vertices){
 			verticesBuffer.put(v.getX());
 			if(flipped){
 				verticesBuffer.put(-1*v.getY());
@@ -127,7 +127,7 @@ public class VBORegion2PGL3  implements Region{
 		verticesBuffer.rewind();
 		
 		FloatBuffer texCoordBuffer = Buffers.newDirectFloatBuffer(vertices.size() * 2);
-		for(PointTex v:vertices){
+		for(Vertex v:vertices){
 			float[] tex = v.getTexCoord();
 			texCoordBuffer.put(tex[0]);
 			texCoordBuffer.put(tex[1]);
@@ -327,7 +327,7 @@ public class VBORegion2PGL3  implements Region{
 		gl.glBindBuffer(GL3.GL_ARRAY_BUFFER, 0);
 	}
 	
-	public void addTriangles(ArrayList<Triangle<PointTex>> tris) {
+	public void addTriangles(ArrayList<Triangle<Vertex>> tris) {
 		triangles.addAll(tris);
 		dirty = true;
 	}
@@ -336,7 +336,7 @@ public class VBORegion2PGL3  implements Region{
 		return numVertices;
 	}
 	
-	public void addVertices(ArrayList<PointTex> verts){
+	public void addVertices(ArrayList<Vertex> verts){
 		vertices.addAll(verts);
 		numVertices = vertices.size();
 		dirty = true;
diff --git a/src/jogamp/graph/curve/opengl/VBORegionSPES2.java b/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
index 5ef23d4e0..155d35f0b 100644
--- a/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
+++ b/src/jogamp/graph/curve/opengl/VBORegionSPES2.java
@@ -37,7 +37,7 @@ import javax.media.opengl.GLContext;
 
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.opengl.util.PMVMatrix;
 
@@ -45,8 +45,8 @@ public class VBORegionSPES2  implements Region{
 	private int numVertices = 0;
 	private IntBuffer vboIds;
 	
-	private ArrayList<Triangle<PointTex>> triangles = new ArrayList<Triangle<PointTex>>();
-	private ArrayList<PointTex> vertices = new ArrayList<PointTex>();
+	private ArrayList<Triangle<Vertex>> triangles = new ArrayList<Triangle<Vertex>>();
+	private ArrayList<Vertex> vertices = new ArrayList<Vertex>();
 	
 	private GLContext context;
 	
@@ -63,8 +63,8 @@ public class VBORegionSPES2  implements Region{
 		GL2ES2 gl = context.getGL().getGL2ES2();
 		ShortBuffer indicies = Buffers.newDirectShortBuffer(triangles.size() * 3);
 		
-		for(Triangle<PointTex> t:triangles){
-			final PointTex[] t_vertices = t.getVertices();
+		for(Triangle<Vertex> t:triangles){
+			final Vertex[] t_vertices = t.getVertices();
 			
 			if(t_vertices[0].getId() == Integer.MAX_VALUE){
 				t_vertices[0].setId(numVertices++);
@@ -80,9 +80,9 @@ public class VBORegionSPES2  implements Region{
 				indicies.put((short) t.getVertices()[2].getId());
 			}
 			else{
-				PointTex v1 = t_vertices[0];
-				PointTex v2 = t_vertices[1];
-				PointTex v3 = t_vertices[2];
+				Vertex v1 = t_vertices[0];
+				Vertex v2 = t_vertices[1];
+				Vertex v3 = t_vertices[2];
 				
 				indicies.put((short) v1.getId());
 				indicies.put((short) v2.getId());
@@ -92,7 +92,7 @@ public class VBORegionSPES2  implements Region{
 		indicies.rewind();
 		
 		FloatBuffer verticesBuffer = Buffers.newDirectFloatBuffer(vertices.size() * 3);
-		for(PointTex v:vertices){
+		for(Vertex v:vertices){
 			verticesBuffer.put(v.getX());
 			if(flipped){
 				verticesBuffer.put(-1*v.getY());
@@ -105,7 +105,7 @@ public class VBORegionSPES2  implements Region{
 		verticesBuffer.rewind();
 		
 		FloatBuffer texCoordBuffer = Buffers.newDirectFloatBuffer(vertices.size() * 2);
-		for(PointTex v:vertices){
+		for(Vertex v:vertices){
 			float[] tex = v.getTexCoord();
 			texCoordBuffer.put(tex[0]);
 			texCoordBuffer.put(tex[1]);
@@ -151,7 +151,7 @@ public class VBORegionSPES2  implements Region{
 		render();
 	}
 	
-	public void addTriangles(ArrayList<Triangle<PointTex>> tris) {
+	public void addTriangles(ArrayList<Triangle<Vertex>> tris) {
 		triangles.addAll(tris);
 		dirty = true;
 	}
@@ -160,7 +160,7 @@ public class VBORegionSPES2  implements Region{
 		return numVertices;
 	}
 	
-	public void addVertices(ArrayList<PointTex> verts){
+	public void addVertices(ArrayList<Vertex> verts){
 		vertices.addAll(verts);
 		numVertices = vertices.size();
 		dirty = true;
diff --git a/src/jogamp/graph/curve/tess/GraphOutline.java b/src/jogamp/graph/curve/tess/GraphOutline.java
index cf73ab379..bb262ce5b 100644
--- a/src/jogamp/graph/curve/tess/GraphOutline.java
+++ b/src/jogamp/graph/curve/tess/GraphOutline.java
@@ -30,11 +30,11 @@ package jogamp.graph.curve.tess;
 import java.util.ArrayList;
 
 import com.jogamp.graph.geom.Outline;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 
-public class GraphOutline <T extends PointTex> {
+public class GraphOutline <T extends Vertex> {
 	final private Outline<T> outline;
-	final private ArrayList<GraphPoint<T>> controlpoints = new ArrayList<GraphPoint<T>>(3);
+	final private ArrayList<GraphVertex<T>> controlpoints = new ArrayList<GraphVertex<T>>(3);
 	
 	public GraphOutline(){
 		this.outline = new Outline<T>();
@@ -48,7 +48,7 @@ public class GraphOutline <T extends PointTex> {
 		this.outline = ol;
 		ArrayList<T> vertices = this.outline.getVertices();
 		for(T v:vertices){
-			this.controlpoints.add(new GraphPoint<T>(v));
+			this.controlpoints.add(new GraphVertex<T>(v));
 		}
 	}
 
@@ -61,7 +61,7 @@ public class GraphOutline <T extends PointTex> {
 	}*/
 	
 
-	public ArrayList<GraphPoint<T>> getGraphPoint() {
+	public ArrayList<GraphVertex<T>> getGraphPoint() {
 		return controlpoints;
 	}
 	
@@ -73,7 +73,7 @@ public class GraphOutline <T extends PointTex> {
 		this.controlpoints = controlpoints;
 	}*/
 
-	public void addVertex(GraphPoint<T> v) {
+	public void addVertex(GraphVertex<T> v) {
 		controlpoints.add(v);
 		outline.addVertex(v.getPoint());
 	}
diff --git a/src/jogamp/graph/curve/tess/GraphPoint.java b/src/jogamp/graph/curve/tess/GraphVertex.java
index 87d0b9929..a474a002e 100644
--- a/src/jogamp/graph/curve/tess/GraphPoint.java
+++ b/src/jogamp/graph/curve/tess/GraphVertex.java
@@ -29,14 +29,14 @@ package jogamp.graph.curve.tess;
 
 import java.util.ArrayList;
 
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 
-public class GraphPoint <T extends PointTex> {
+public class GraphVertex <T extends Vertex> {
 	private T point;
 	private ArrayList<HEdge<T>> edges = null;
 	private boolean boundaryContained = false;
 	
-	public GraphPoint(T point) {
+	public GraphVertex(T point) {
 		this.point = point;
 	}
 
@@ -85,7 +85,7 @@ public class GraphPoint <T extends PointTex> {
 			edges = null;
 		}
 	}
-	public HEdge<T> findNextEdge(GraphPoint<T> nextVert){
+	public HEdge<T> findNextEdge(GraphVertex<T> nextVert){
 		for(HEdge<T> e:edges){
 			if(e.getNext().getGraphPoint() == nextVert){
 				return e;
@@ -101,7 +101,7 @@ public class GraphPoint <T extends PointTex> {
 		}
 		return null;
 	}
-	public HEdge<T> findPrevEdge(GraphPoint<T> prevVert){
+	public HEdge<T> findPrevEdge(GraphVertex<T> prevVert){
 		for(HEdge<T> e:edges){
 			if(e.getPrev().getGraphPoint() == prevVert){
 				return e;
diff --git a/src/jogamp/graph/curve/tess/HEdge.java b/src/jogamp/graph/curve/tess/HEdge.java
index acb32cb4d..5635e2c31 100644
--- a/src/jogamp/graph/curve/tess/HEdge.java
+++ b/src/jogamp/graph/curve/tess/HEdge.java
@@ -27,28 +27,28 @@
  */
 package jogamp.graph.curve.tess;
 
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
 
 
-public class HEdge <T extends PointTex> {
+public class HEdge <T extends Vertex> {
 	public static int BOUNDARY = 3;
 	public static int INNER = 1;
 	public static int HOLE = 2;
 	
-	private GraphPoint<T> vert;
+	private GraphVertex<T> vert;
 	private HEdge<T> prev = null;
 	private HEdge<T> next = null;
 	private HEdge<T> sibling = null;
 	private int type = BOUNDARY;
 	private Triangle<T> triangle = null;
 	
-	public HEdge(GraphPoint<T> vert, int type) {
+	public HEdge(GraphVertex<T> vert, int type) {
 		this.vert = vert;
 		this.type = type;
 	}
 
-	public HEdge(GraphPoint<T> vert, HEdge<T> prev, HEdge<T> next, HEdge<T> sibling, int type) {
+	public HEdge(GraphVertex<T> vert, HEdge<T> prev, HEdge<T> next, HEdge<T> sibling, int type) {
 		this.vert = vert;
 		this.prev = prev;
 		this.next = next;
@@ -56,7 +56,7 @@ public class HEdge <T extends PointTex> {
 		this.type = type;
 	}
 
-	public HEdge(GraphPoint<T> vert, HEdge<T> prev, HEdge<T> next, HEdge<T> sibling, int type,
+	public HEdge(GraphVertex<T> vert, HEdge<T> prev, HEdge<T> next, HEdge<T> sibling, int type,
 			Triangle<T> triangle) {
 		this.vert = vert;
 		this.prev = prev;
@@ -66,11 +66,11 @@ public class HEdge <T extends PointTex> {
 		this.triangle = triangle;
 	}
 
-	public GraphPoint<T> getGraphPoint() {
+	public GraphVertex<T> getGraphPoint() {
 		return vert;
 	}
 
-	public void setVert(GraphPoint<T> vert) {
+	public void setVert(GraphVertex<T> vert) {
 		this.vert = vert;
 	}
 
@@ -114,12 +114,12 @@ public class HEdge <T extends PointTex> {
 		this.triangle = triangle;
 	}
 	
-	public static <T extends PointTex> void connect(HEdge<T> first, HEdge<T> next){
+	public static <T extends Vertex> void connect(HEdge<T> first, HEdge<T> next){
 		first.setNext(next);
 		next.setPrev(first);
 	}
 	
-	public static <T extends PointTex> void makeSiblings(HEdge<T> first, HEdge<T> second){
+	public static <T extends Vertex> void makeSiblings(HEdge<T> first, HEdge<T> second){
 		first.setSibling(second);
 		second.setSibling(first);
 	}
diff --git a/src/jogamp/graph/curve/tess/Loop.java b/src/jogamp/graph/curve/tess/Loop.java
index caebd64e4..e4553968b 100644
--- a/src/jogamp/graph/curve/tess/Loop.java
+++ b/src/jogamp/graph/curve/tess/Loop.java
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import jogamp.graph.math.VectorFloatUtil;
 
 import com.jogamp.graph.geom.AABBox;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
 
-public class Loop <T extends PointTex> {
+public class Loop <T extends Vertex> {
 	private HEdge<T> root = null;
 	private AABBox box = new AABBox();
 	private GraphOutline<T> initialOutline = null;
@@ -66,9 +66,9 @@ public class Loop <T extends PointTex> {
 			return null;
 		}
 
-		GraphPoint<T> v1 = root.getGraphPoint();
-		GraphPoint<T> v2 = next1.getGraphPoint();
-		GraphPoint<T> v3 = next2.getGraphPoint();
+		GraphVertex<T> v1 = root.getGraphPoint();
+		GraphVertex<T> v2 = next1.getGraphPoint();
+		GraphVertex<T> v3 = next2.getGraphPoint();
 
 		HEdge<T> v3Edge = new HEdge<T>(v3, HEdge.INNER);
 
@@ -98,7 +98,7 @@ public class Loop <T extends PointTex> {
 	 * @param direction requested winding of edges (CCW or CW)
 	 */
 	private HEdge<T> initFromPolyline(GraphOutline<T> outline, int direction){
-		ArrayList<GraphPoint<T>> vertices = outline.getGraphPoint();
+		ArrayList<GraphVertex<T>> vertices = outline.getGraphPoint();
 
 		if(vertices.size()<3) {
 			throw new IllegalArgumentException("outline's vertices < 3: " + vertices.size());
@@ -120,7 +120,7 @@ public class Loop <T extends PointTex> {
 		}
 
 		while(index != max){
-			GraphPoint<T> v1 = vertices.get(index);
+			GraphVertex<T> v1 = vertices.get(index);
 			box.resize(v1.getX(), v1.getY(), v1.getZ());
 
 			HEdge<T> edge = new HEdge<T>(v1, edgeType);
@@ -162,7 +162,7 @@ public class Loop <T extends PointTex> {
 		/**needed to generate vertex references.*/
 		initFromPolyline(polyline, VectorFloatUtil.CW); 
 
-		GraphPoint<T> v3 = locateClosestVertex(polyline);
+		GraphVertex<T> v3 = locateClosestVertex(polyline);
 		HEdge<T> v3Edge = v3.findBoundEdge();
 		HEdge<T> v3EdgeP = v3Edge.getPrev();
 		HEdge<T> crossEdge = new HEdge<T>(root.getGraphPoint(), HEdge.INNER);
@@ -186,22 +186,22 @@ public class Loop <T extends PointTex> {
 	 * to search for closestvertices
 	 * @return the vertex that is closest to the newly set root Hedge.
 	 */
-	private GraphPoint<T> locateClosestVertex(GraphOutline<T> polyline) {
+	private GraphVertex<T> locateClosestVertex(GraphOutline<T> polyline) {
 		HEdge<T> closestE = null;
-		GraphPoint<T> closestV = null;
+		GraphVertex<T> closestV = null;
 
 		float minDistance = Float.MAX_VALUE;
 		boolean inValid = false;
-		ArrayList<GraphPoint<T>> initVertices = initialOutline.getGraphPoint();
-		ArrayList<GraphPoint<T>> vertices = polyline.getGraphPoint();
+		ArrayList<GraphVertex<T>> initVertices = initialOutline.getGraphPoint();
+		ArrayList<GraphVertex<T>> vertices = polyline.getGraphPoint();
 
 		for(int i=0; i< initVertices.size()-1; i++){
-			GraphPoint<T> v = initVertices.get(i);
-			GraphPoint<T> nextV = initVertices.get(i+1);
-			for(GraphPoint<T> cand:vertices){
+			GraphVertex<T> v = initVertices.get(i);
+			GraphVertex<T> nextV = initVertices.get(i+1);
+			for(GraphVertex<T> cand:vertices){
 				float distance = VectorFloatUtil.computeLength(v.getCoord(), cand.getCoord());
 				if(distance < minDistance){
-					for (GraphPoint<T> vert:vertices){
+					for (GraphVertex<T> vert:vertices){
 						if(vert == v || vert == nextV || vert == cand)
 							continue;
 						inValid = VectorFloatUtil.inCircle(v.getPoint(), nextV.getPoint(), 
diff --git a/src/jogamp/graph/curve/text/GlyphShape.java b/src/jogamp/graph/curve/text/GlyphShape.java
index 8e16de1a4..78ae7396c 100644
--- a/src/jogamp/graph/curve/text/GlyphShape.java
+++ b/src/jogamp/graph/curve/text/GlyphShape.java
@@ -32,8 +32,7 @@ import java.util.ArrayList;
 import jogamp.graph.geom.plane.PathIterator;
 
 import com.jogamp.graph.geom.Line;
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
 
 import com.jogamp.graph.curve.OutlineShape;
@@ -48,7 +47,7 @@ public class GlyphShape {
 	/** Create a new Glyph shape
 	 * based on Parametric curve control polyline
 	 */
-	public GlyphShape(Point.Factory<? extends PointTex> factory){
+	public GlyphShape(Vertex.Factory<? extends Vertex> factory){
 		shape = new OutlineShape(factory);
 	}
 	
@@ -57,7 +56,7 @@ public class GlyphShape {
 	 * 
 	 * @see PathIterator
 	 */
-	public GlyphShape(Point.Factory<? extends PointTex> factory, PathIterator pathIterator){
+	public GlyphShape(Vertex.Factory<? extends Vertex> factory, PathIterator pathIterator){
 		this(factory);
 		
 		if(null != pathIterator){
@@ -72,9 +71,9 @@ public class GlyphShape {
 		shape.transformOutlines(OutlineShape.QUADRATIC_NURBS);
 	}
 	
-	public final Point.Factory<? extends PointTex> pointFactory() { return shape.pointFactory(); }
+	public final Vertex.Factory<? extends Vertex> pointFactory() { return shape.pointFactory(); }
 	
-	private void addVertexToLastOutline(PointTex vertex){
+	private void addVertexToLastOutline(Vertex vertex){
 		shape.addVertex(vertex);
 	}
 	
@@ -83,40 +82,40 @@ public class GlyphShape {
 			if(!shape.getLastOutline().isEmpty()){
 				shape.addEmptyOutline();
 			}			
-			PointTex vert = pointFactory().create(coords[0],coords[1]);
+			Vertex vert = pointFactory().create(coords[0],coords[1]);
 			vert.setOnCurve(true);
 			addVertexToLastOutline(vert);
 			
 			numVertices++;
 		}
 		else if(segmentType == PathIterator.SEG_LINETO){
-			PointTex vert1 = pointFactory().create(coords[0],coords[1]);
+			Vertex vert1 = pointFactory().create(coords[0],coords[1]);
 			vert1.setOnCurve(true);
 			addVertexToLastOutline(vert1);
 			
 			numVertices++;
 		}
 		else if(segmentType == PathIterator.SEG_QUADTO){
-			PointTex vert1 = pointFactory().create(coords[0],coords[1]);
+			Vertex vert1 = pointFactory().create(coords[0],coords[1]);
 			vert1.setOnCurve(false);
 			addVertexToLastOutline(vert1);
 
-			PointTex vert2 = pointFactory().create(coords[2],coords[3]);
+			Vertex vert2 = pointFactory().create(coords[2],coords[3]);
 			vert2.setOnCurve(true);
 			addVertexToLastOutline(vert2);
 			
 			numVertices+=2;
 		}
 		else if(segmentType == PathIterator.SEG_CUBICTO){
-			PointTex vert1 = pointFactory().create(coords[0],coords[1]);
+			Vertex vert1 = pointFactory().create(coords[0],coords[1]);
 			vert1.setOnCurve(false);
 			addVertexToLastOutline(vert1);
 
-			PointTex vert2 = pointFactory().create(coords[2],coords[3]);
+			Vertex vert2 = pointFactory().create(coords[2],coords[3]);
 			vert2.setOnCurve(false);
 			addVertexToLastOutline(vert2);
 
-			PointTex vert3 = pointFactory().create(coords[4],coords[5]);
+			Vertex vert3 = pointFactory().create(coords[4],coords[5]);
 			vert3.setOnCurve(true);
 			addVertexToLastOutline(vert3);
 			
@@ -150,21 +149,21 @@ public class GlyphShape {
 	 * @param sharpness sharpness of the curved regions default = 0.5
 	 * @return ArrayList of triangles which define this shape
 	 */
-	public ArrayList<Triangle<PointTex>> triangulate(float sharpness){
+	public ArrayList<Triangle<Vertex>> triangulate(float sharpness){
 		return shape.triangulate(sharpness);
 	}
 
 	/** Get the list of Vertices of this Object
 	 * @return arrayList of Vertices
 	 */
-	public ArrayList<PointTex> getVertices(){
+	public ArrayList<Vertex> getVertices(){
 		return shape.getVertices();
 	}
 	
 	/** Get the list of AA lines defined by this object
 	 * @return arraylist of lines
 	 */
-	public ArrayList<Line<PointTex>> getLines(){
+	public ArrayList<Line<Vertex>> getLines(){
 		return shape.getLines();
 	}
 }
diff --git a/src/jogamp/graph/curve/text/GlyphString.java b/src/jogamp/graph/curve/text/GlyphString.java
index 75d7e4402..a7418c6de 100644
--- a/src/jogamp/graph/curve/text/GlyphString.java
+++ b/src/jogamp/graph/curve/text/GlyphString.java
@@ -29,10 +29,9 @@ package jogamp.graph.curve.text;
 
 import java.util.ArrayList;
 
-import com.jogamp.graph.geom.Point;
-import com.jogamp.graph.geom.PointTex;
+import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.Triangle;
-import com.jogamp.graph.geom.opengl.Vertex;
+import com.jogamp.graph.geom.opengl.SVertex;
 
 import javax.media.opengl.GLContext;
 
@@ -47,26 +46,26 @@ import com.jogamp.opengl.util.PMVMatrix;
 import com.jogamp.opengl.util.glsl.ShaderState;
 
 public class GlyphString {
-	private final Point.Factory<? extends PointTex> pointFactory;	
+	private final Vertex.Factory<? extends Vertex> pointFactory;	
 	private ArrayList<GlyphShape> glyphs = new ArrayList<GlyphShape>();
 	private String str = "";
 	private String fontname = "";
 	private Region region;
 	
-	private Vertex origin = new Vertex();
+	private SVertex origin = new SVertex();
 
 	/** Create a new GlyphString object
 	 * @param fontname the name of the font that this String is
 	 * associated with
 	 * @param str the string object
 	 */
-	public GlyphString(Point.Factory<? extends PointTex> factory, String fontname, String str){
+	public GlyphString(Vertex.Factory<? extends Vertex> factory, String fontname, String str){
 		pointFactory = factory;
 		this.fontname = fontname;
 		this.str = str;
 	}
 	
-	public final Point.Factory<? extends PointTex> pointFactory() { return pointFactory; }
+	public final Vertex.Factory<? extends Vertex> pointFactory() { return pointFactory; }
 	
 	public void addGlyphShape(GlyphShape glyph){
 		glyphs.add(glyph);
@@ -95,10 +94,10 @@ public class GlyphString {
 		}
 	}
 	
-	private ArrayList<Triangle<PointTex>> initializeTriangles(float sharpness){
-		ArrayList<Triangle<PointTex>> triangles = new ArrayList<Triangle<PointTex>>();
+	private ArrayList<Triangle<Vertex>> initializeTriangles(float sharpness){
+		ArrayList<Triangle<Vertex>> triangles = new ArrayList<Triangle<Vertex>>();
 		for(GlyphShape glyph:glyphs){
-			ArrayList<Triangle<PointTex>> tris = glyph.triangulate(sharpness);
+			ArrayList<Triangle<Vertex>> tris = glyph.triangulate(sharpness);
 			triangles.addAll(tris);
 		}
 		return triangles;
@@ -113,13 +112,13 @@ public class GlyphString {
 		region = RegionFactory.create(context, st, type);
 		region.setFlipped(true);
 		
-		ArrayList<Triangle<PointTex>> tris = initializeTriangles(shaprness);
+		ArrayList<Triangle<Vertex>> tris = initializeTriangles(shaprness);
 		region.addTriangles(tris);
 		
 		int numVertices = region.getNumVertices();
 		for(GlyphShape glyph:glyphs){
-			ArrayList<PointTex> gVertices = glyph.getVertices();
-			for(PointTex vert:gVertices){
+			ArrayList<Vertex> gVertices = glyph.getVertices();
+			for(Vertex vert:gVertices){
 				vert.setId(numVertices++);
 			}
 			region.addVertices(gVertices);
@@ -152,7 +151,7 @@ public class GlyphString {
 	/** Get the Origion of this GlyphString
 	 * @return 
 	 */
-	public PointTex getOrigin() {
+	public Vertex getOrigin() {
 		return origin;
 	}