2 files changed, 0 insertions, 324 deletions
diff --git a/turtle2d/src/jogamp/graph/curve/text/GlyphShape.java b/turtle2d/src/jogamp/graph/curve/text/GlyphShape.java
deleted file mode 100644
index 36ba57244..000000000
--- a/turtle2d/src/jogamp/graph/curve/text/GlyphShape.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package jogamp.graph.curve.text;
-
-import java.util.ArrayList;
-
-import jogamp.graph.geom.plane.PathIterator;
-
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.geom.Triangle;
-
-import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.math.Quaternion;
-
-public class GlyphShape {
-	
-	private Quaternion quat= null;
-	private int numVertices = 0;
-	private OutlineShape shape = null;
-	
-	/** Create a new Glyph shape
-	 * based on Parametric curve control polyline
-	 */
-	public GlyphShape(Vertex.Factory<? extends Vertex> factory){
-		shape = new OutlineShape(factory);
-	}
-	
-	/** Create a GlyphShape from a font Path Iterator
-	 * @param pathIterator the path iterator
-	 * 
-	 * @see PathIterator
-	 */
-	public GlyphShape(Vertex.Factory<? extends Vertex> factory, PathIterator pathIterator){
-		this(factory);
-		
-		if(null != pathIterator){
-			while(!pathIterator.isDone()){
-				float[] coords = new float[6];
-				int segmentType = pathIterator.currentSegment(coords);
-				addOutlineVerticesFromGlyphVector(coords, segmentType);
-
-				pathIterator.next();
-			}
-		}
-		shape.transformOutlines(OutlineShape.QUADRATIC_NURBS);
-	}
-	
-	public final Vertex.Factory<? extends Vertex> vertexFactory() { return shape.vertexFactory(); }
-	
-	private void addVertexToLastOutline(Vertex vertex){
-		shape.addVertex(vertex);
-	}
-	
-	private void addOutlineVerticesFromGlyphVector(float[] coords, int segmentType){
-		if(segmentType == PathIterator.SEG_MOVETO){
-			if(!shape.getLastOutline().isEmpty()){
-				shape.addEmptyOutline();
-			}			
-			Vertex vert = vertexFactory().create(coords[0],coords[1]);
-			vert.setOnCurve(true);
-			addVertexToLastOutline(vert);
-			
-			numVertices++;
-		}
-		else if(segmentType == PathIterator.SEG_LINETO){
-			Vertex vert1 = vertexFactory().create(coords[0],coords[1]);
-			vert1.setOnCurve(true);
-			addVertexToLastOutline(vert1);
-			
-			numVertices++;
-		}
-		else if(segmentType == PathIterator.SEG_QUADTO){
-			Vertex vert1 = vertexFactory().create(coords[0],coords[1]);
-			vert1.setOnCurve(false);
-			addVertexToLastOutline(vert1);
-
-			Vertex vert2 = vertexFactory().create(coords[2],coords[3]);
-			vert2.setOnCurve(true);
-			addVertexToLastOutline(vert2);
-			
-			numVertices+=2;
-		}
-		else if(segmentType == PathIterator.SEG_CUBICTO){
-			Vertex vert1 = vertexFactory().create(coords[0],coords[1]);
-			vert1.setOnCurve(false);
-			addVertexToLastOutline(vert1);
-
-			Vertex vert2 = vertexFactory().create(coords[2],coords[3]);
-			vert2.setOnCurve(false);
-			addVertexToLastOutline(vert2);
-
-			Vertex vert3 = vertexFactory().create(coords[4],coords[5]);
-			vert3.setOnCurve(true);
-			addVertexToLastOutline(vert3);
-			
-			numVertices+=3;
-		}
-		else if(segmentType == PathIterator.SEG_CLOSE){
-			shape.closeLastOutline();
-		}
-	}
-	
-	public int getNumVertices() {
-		return numVertices;
-	}
-	
-	/** Get the rotational Quaternion attached to this Shape
-	 * @return the Quaternion Object
-	 */
-	public Quaternion getQuat() {
-		return quat;
-	}
-	
-	/** Set the Quaternion that shall defien the rotation
-	 * of this shape.
-	 * @param quat
-	 */
-	public void setQuat(Quaternion quat) {
-		this.quat = quat;
-	}
-	
-	/** Triangluate the glyph shape
-	 * @param sharpness sharpness of the curved regions default = 0.5
-	 * @return ArrayList of triangles which define this shape
-	 */
-	public ArrayList<Triangle> triangulate(float sharpness){
-		return shape.triangulate(sharpness);
-	}
-
-	/** Get the list of Vertices of this Object
-	 * @return arrayList of Vertices
-	 */
-	public ArrayList<Vertex> getVertices(){
-		return shape.getVertices();
-	}	
-}
diff --git a/turtle2d/src/jogamp/graph/curve/text/GlyphString.java b/turtle2d/src/jogamp/graph/curve/text/GlyphString.java
deleted file mode 100644
index 808e3a415..000000000
--- a/turtle2d/src/jogamp/graph/curve/text/GlyphString.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package jogamp.graph.curve.text;
-
-import java.util.ArrayList;
-
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.geom.Triangle;
-import com.jogamp.graph.geom.opengl.SVertex;
-
-import javax.media.opengl.GLContext;
-
-import jogamp.graph.geom.plane.AffineTransform;
-import jogamp.graph.geom.plane.Path2D;
-import jogamp.graph.geom.plane.PathIterator;
-
-
-import com.jogamp.graph.curve.Region;
-import com.jogamp.graph.curve.RegionFactory;
-import com.jogamp.opengl.util.PMVMatrix;
-import com.jogamp.opengl.util.glsl.ShaderState;
-
-public class GlyphString {
-	private final Vertex.Factory<? extends Vertex> pointFactory;	
-	private ArrayList<GlyphShape> glyphs = new ArrayList<GlyphShape>();
-	private String str = "";
-	private String fontname = "";
-	private Region region;
-	
-	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(Vertex.Factory<? extends Vertex> factory, String fontname, String str){
-		pointFactory = factory;
-		this.fontname = fontname;
-		this.str = str;
-	}
-	
-	public final Vertex.Factory<? extends Vertex> pointFactory() { return pointFactory; }
-	
-	public void addGlyphShape(GlyphShape glyph){
-		glyphs.add(glyph);
-	}
-	public String getString(){
-		return str;
-	}
-
-	/** Creates the Curve based Glyphs from a Font 
-	 * @param paths a list of FontPath2D objects that define the outline
-	 * @param affineTransform a global affine transformation applied to the paths.
-	 */
-	public void createfromFontPath(Path2D[] paths, AffineTransform affineTransform){
-		final int numGlyps = paths.length;
-		for (int index=0;index<numGlyps;index++){
-			if(paths[index] == null){
-				continue;
-			}
-			PathIterator iterator = paths[index].iterator(affineTransform);
-			GlyphShape glyphShape = new GlyphShape(pointFactory, iterator);
-			
-			if(glyphShape.getNumVertices() < 3) {
-				continue;
-			}			
-			addGlyphShape(glyphShape);
-		}
-	}
-	
-	private ArrayList<Triangle> initializeTriangles(float sharpness){
-		ArrayList<Triangle> triangles = new ArrayList<Triangle>();
-		for(GlyphShape glyph:glyphs){
-			ArrayList<Triangle> tris = glyph.triangulate(sharpness);
-			triangles.addAll(tris);
-		}
-		return triangles;
-	}
-	
-	/** Generate a OGL Region to represent this Object.
-	 * @param context the GLContext which the region is defined by.
-	 * @param shaprness the curvature sharpness of the object.
-	 * @param st shader state
-	 */
-	public void generateRegion(GLContext context, float shaprness, ShaderState st, int type){
-		region = RegionFactory.create(context, st, type);
-		region.setFlipped(true);
-		
-		ArrayList<Triangle> tris = initializeTriangles(shaprness);
-		region.addTriangles(tris);
-		
-		int numVertices = region.getNumVertices();
-		for(GlyphShape glyph:glyphs){
-			ArrayList<Vertex> gVertices = glyph.getVertices();
-			for(Vertex vert:gVertices){
-				vert.setId(numVertices++);
-			}
-			region.addVertices(gVertices);
-		}
-		
-		/** initialize the region */
-		region.update();
-	}
-	
-	/** Generate a Hashcode for this object 
-	 * @return a string defining the hashcode
-	 */
-	public String getTextHashCode(){
-		return "" + fontname.hashCode() + str.hashCode();
-	}
-
-	/** Render the Object based using the associated Region
-	 *  previously generated.
-	 */
-	public void renderString3D() {
-		region.render(null, 0, 0, 0);
-	}
-	/** Render the Object based using the associated Region
-	 *  previously generated.
-	 */
-	public void renderString3D(PMVMatrix matrix, int vp_width, int vp_height, int size) {
-		region.render(matrix, vp_width, vp_height, size);
-	}
-	
-	/** Get the Origion of this GlyphString
-	 * @return 
-	 */
-	public Vertex getOrigin() {
-		return origin;
-	}
-
-	/** Destroy the associated OGL objects
-	 */
-	public void destroy(){
-		region.destroy();
-	}
-}