diff options
author | Rami Santina <[email protected]> | 2011-05-10 14:29:12 +0300 |
---|---|---|
committer | Rami Santina <[email protected]> | 2011-05-10 14:29:12 +0300 |
commit | 192631530503b8046abcfa9b2ca6760e3f39ae66 (patch) | |
tree | f19789a1407ae1a00cd9de1987f5a0529b647325 /src/jogl/classes/jogamp | |
parent | 1303328b476570d94e56c9d2fc061e3b09cf538a (diff) |
Fix: glyph outline orientation with the removal of inversion
Diffstat (limited to 'src/jogl/classes/jogamp')
-rw-r--r-- | src/jogl/classes/jogamp/graph/curve/tess/Loop.java | 4 | ||||
-rw-r--r-- | src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java index 038d41b84..956fd56f2 100644 --- a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java +++ b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java @@ -104,8 +104,8 @@ public class Loop { } boolean isCCW = VectorUtil.ccw(vertices.get(0).getPoint(), vertices.get(1).getPoint(), vertices.get(2).getPoint()); - boolean invert = isCCW != (direction == VectorUtil.CCW); - + boolean invert = isCCW && (direction == VectorUtil.CW); + final int dir; final int max; final int edgeType; diff --git a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java index b6f37a610..b47612f51 100644 --- a/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java +++ b/src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java @@ -73,7 +73,8 @@ public class GlyphShape { public final Vertex.Factory<? extends Vertex> vertexFactory() { return shape.vertexFactory(); } private void addVertexToLastOutline(Vertex vertex) { - shape.addVertex(vertex); + //FIXME: assuming font outline comes in CW order + shape.addVertex(0, vertex); } private void addOutlineVerticesFromGlyphVector(float[] coords, int segmentType){ |