Graph Font.GlyphVisitor*: Pass 'char symbol' to visitor, passing full text-processing information

2 files changed, 4 insertions, 3 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
index 6797a266c..402a238c9 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
@@ -43,6 +43,7 @@ import com.jogamp.opengl.util.glsl.ShaderProgram;
 import com.jogamp.opengl.util.texture.TextureSequence;

 import com.jogamp.graph.curve.Region;

 import com.jogamp.graph.font.Font;

+import com.jogamp.graph.font.Font.Glyph;

 

 import java.io.PrintStream;

 

@@ -152,7 +153,7 @@ public abstract class GLRegion extends Region {
         final int[] vertIndexCount = { 0, 0 };

         final Font.GlyphVisitor2 visitor = new Font.GlyphVisitor2() {

             @Override

-            public final void visit(final Font.Glyph glyph) {

+            public final void visit(final char symbol, final Font.Glyph glyph) {

                 region.countOutlineShape(glyph.getShape(), vertIndexCount);

             } };

         font.processString(visitor, str);

diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
index 35b6d5028..237d93184 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
@@ -109,7 +109,7 @@ public class TextRegionUtil {
                                            final AffineTransform temp1, final AffineTransform temp2) {
         final Font.GlyphVisitor visitor = new Font.GlyphVisitor() {
             @Override
-            public void visit(final Glyph glyph, final AffineTransform t) {
+            public void visit(final char symbol, final Glyph glyph, final AffineTransform t) {
                 if( glyph.isWhiteSpace() ) {
                     return;
                 }
@@ -135,7 +135,7 @@ public class TextRegionUtil {
     public static void countStringRegion(final Region region, final Font font, final CharSequence str, final int[/*2*/] vertIndexCount) {
         final Font.GlyphVisitor2 visitor = new Font.GlyphVisitor2() {
             @Override
-            public final void visit(final Font.Glyph glyph) {
+            public final void visit(final char symbol, final Font.Glyph glyph) {
                 region.countOutlineShape(glyph.getShape(), vertIndexCount);
             } };
         font.processString(visitor, str);