summaryrefslogtreecommitdiffstats
path: root/src/jogl/classes/jogamp/graph/curve
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl/classes/jogamp/graph/curve')
-rw-r--r--src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java64
-rw-r--r--src/jogl/classes/jogamp/graph/curve/text/GlyphString.java40
2 files changed, 24 insertions, 80 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
index ed51cce98..578148699 100644
--- a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
+++ b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
@@ -29,10 +29,9 @@ 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.geom.Vertex.Factory;
import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.math.Quaternion;
@@ -40,7 +39,6 @@ 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
@@ -50,70 +48,24 @@ public class GlyphShape {
shape = new OutlineShape(factory);
}
- /** Create a GlyphShape from a font Path Iterator
- * @param pathIterator the path iterator
- *
- * @see PathIterator
+ /** Create a new GlyphShape from a {@link OutlineShape}
+ * @param factory vertex impl factory {@link Factory}
+ * @param shape {@link OutlineShape} representation of the Glyph
*/
- public GlyphShape(Vertex.Factory<? extends Vertex> factory, PathIterator pathIterator){
+ public GlyphShape(Vertex.Factory<? extends Vertex> factory, OutlineShape shape){
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.VerticesState.QUADRATIC_NURBS);
+ this.shape = shape;
+ this.shape.transformOutlines(OutlineShape.VerticesState.QUADRATIC_NURBS);
}
public final Vertex.Factory<? extends Vertex> vertexFactory() { return shape.vertexFactory(); }
- private void addVertexToLastOutline(Vertex vertex) {
- //FIXME: assuming font outline comes in CW order
- shape.addVertex(0, vertex);
- }
-
- private void addOutlineVerticesFromGlyphVector(float[] coords, int segmentType){
- switch(segmentType) {
- case PathIterator.SEG_MOVETO:
- shape.closeLastOutline();
- shape.addEmptyOutline();
- addVertexToLastOutline(vertexFactory().create(coords, 0, 2, true));
- numVertices++;
- break;
- case PathIterator.SEG_LINETO:
- addVertexToLastOutline(vertexFactory().create(coords, 0, 2, true));
- numVertices++;
- break;
- case PathIterator.SEG_QUADTO:
- addVertexToLastOutline(vertexFactory().create(coords, 0, 2, false));
- addVertexToLastOutline(vertexFactory().create(coords, 2, 2, true));
- numVertices+=2;
- break;
- case PathIterator.SEG_CUBICTO:
- addVertexToLastOutline(vertexFactory().create(coords, 0, 2, false));
- addVertexToLastOutline(vertexFactory().create(coords, 2, 2, false));
- addVertexToLastOutline(vertexFactory().create(coords, 4, 2, true));
- numVertices+=3;
- break;
- case PathIterator.SEG_CLOSE:
- shape.closeLastOutline();
- break;
- default:
- throw new IllegalArgumentException("Unhandled Segment Type: "+segmentType);
- }
- }
-
public OutlineShape getShape() {
return shape;
}
public int getNumVertices() {
- return numVertices;
+ return shape.getVertices().size();
}
/** Get the rotational Quaternion attached to this Shape
diff --git a/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java b/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
index cd6cd56aa..c07b41a7b 100644
--- a/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
+++ b/src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
@@ -40,10 +40,6 @@ import javax.media.opengl.GL2ES2;
import jogamp.graph.curve.opengl.RegionFactory;
import jogamp.graph.font.FontInt;
-import jogamp.graph.geom.plane.AffineTransform;
-import jogamp.graph.geom.plane.Path2D;
-import jogamp.graph.geom.plane.PathIterator;
-
import com.jogamp.graph.curve.OutlineShape;
import com.jogamp.graph.curve.Region;
@@ -68,9 +64,9 @@ public class GlyphString {
* <p>No caching is performed.</p>
*
* @param shape is not null, add all {@link GlyphShape}'s {@link Outline} to this instance.
- * @param vertexFactory
- * @param font
- * @param str
+ * @param vertexFactory vertex impl factory {@link Factory}
+ * @param font the target {@link Font}
+ * @param str string text
* @return the created {@link GlyphString} instance
*/
public static GlyphString createString(OutlineShape shape, Factory<? extends Vertex> vertexFactory, Font font, String str) {
@@ -81,20 +77,17 @@ public class GlyphString {
* <p>No caching is performed.</p>
*
* @param shape is not null, add all {@link GlyphShape}'s {@link Outline} to this instance.
- * @param vertexFactory
- * @param font
- * @param size
- * @param str
+ * @param vertexFactory vertex impl factory {@link Factory}
+ * @param font the target {@link Font}
+ * @param size font size
+ * @param str string text
* @return the created {@link GlyphString} instance
*/
public static GlyphString createString(OutlineShape shape, Factory<? extends Vertex> vertexFactory, Font font, int fontSize, String str) {
- AffineTransform affineTransform = new AffineTransform(vertexFactory);
-
- Path2D[] paths = new Path2D[str.length()];
- ((FontInt)font).getPaths(str, fontSize, affineTransform, paths);
+ ArrayList<OutlineShape> shapes = ((FontInt)font).getOutlineShapes(str, fontSize, vertexFactory);
GlyphString glyphString = new GlyphString(font.getName(Font.NAME_UNIQUNAME), str);
- glyphString.createfromFontPath(vertexFactory, paths, affineTransform);
+ glyphString.createfromOutlineShapes(vertexFactory, shapes);
if(null != shape) {
for(int i=0; i<glyphString.glyphs.size(); i++) {
shape.addOutlineShape(glyphString.glyphs.get(i).getShape());
@@ -121,19 +114,17 @@ public class GlyphString {
return str;
}
- /** Creates the Curve based Glyphs from a Font
+ /**Creates the Curve based Glyphs from a list of {@link OutlineShape}
* @param vertexFactory vertex impl factory {@link Factory}
- * @param paths a list of FontPath2D objects that define the outline
- * @param affineTransform a global affine transformation applied to the paths.
+ * @param shapes list of {@link OutlineShape}
*/
- public void createfromFontPath(Factory<? extends Vertex> vertexFactory, Path2D[] paths, AffineTransform affineTransform) {
- final int numGlyps = paths.length;
+ public void createfromOutlineShapes(Factory<? extends Vertex> vertexFactory, ArrayList<OutlineShape> shapes) {
+ final int numGlyps = shapes.size();
for (int index=0;index<numGlyps;index++){
- if(paths[index] == null){
+ if(shapes.get(index) == null){
continue;
}
- PathIterator iterator = paths[index].iterator(affineTransform);
- GlyphShape glyphShape = new GlyphShape(vertexFactory, iterator);
+ GlyphShape glyphShape = new GlyphShape(vertexFactory, shapes.get(index));
if(glyphShape.getNumVertices() < 3) {
continue;
@@ -142,6 +133,7 @@ public class GlyphString {
}
}
+
/** Generate a OGL Region to represent this Object.
* @param gl the current gl object
* @param rs the current attached RenderState
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 18:07:05 +0000