diff options
| author | Sven Gothel <[email protected]> | 2023-02-14 09:42:34 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-02-14 09:42:34 +0100 |
| commit | 3c3f663bfe25e296b46344a2825c6a2714c29c89 (patch) | |
| tree | 58ba62da8c666979fd76e1eb3c4f6680e9b8408a /src/jogl/classes/com/jogamp | |
| parent | 53259c43474eb9bc1475365ed251344202c4c179 (diff) | |
Graph Font: getGlyph(char symbol -> int glyph_id), add kerning to getPointsBoundsFU(); Glyph: Drop getSymbol()
Diffstat (limited to 'src/jogl/classes/com/jogamp')
| -rw-r--r-- | src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java | 5 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/graph/font/Font.java | 3 |
2 files changed, 4 insertions, 4 deletions
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 4af40bf1c..f9db8c655 100644 --- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java +++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java @@ -119,14 +119,15 @@ public class TextRegionUtil { } else { temp1.setToIdentity(); } - final Font.Glyph glyph = font.getGlyph(character); + final int glyph_id = font.getGlyphID(character); + final Font.Glyph glyph = font.getGlyph(glyph_id); final OutlineShape glyphShape = glyph.getShape(); if( null == glyphShape ) { left_glyph = null; continue; } if( null != left_glyph ) { - advanceTotal += left_glyph.getKerning(glyph.getID()); + advanceTotal += left_glyph.getKerning(glyph_id); } temp1.translate(advanceTotal, y, temp2); visitor.visit(glyphShape, temp1); diff --git a/src/jogl/classes/com/jogamp/graph/font/Font.java b/src/jogl/classes/com/jogamp/graph/font/Font.java index 2d26b1a85..1b852436f 100644 --- a/src/jogl/classes/com/jogamp/graph/font/Font.java +++ b/src/jogl/classes/com/jogamp/graph/font/Font.java @@ -161,7 +161,6 @@ public interface Font { public static final int ID_SPACE = 3; Font getFont(); - char getSymbol(); /** Return this glyph's ID */ int getID(); @@ -262,7 +261,7 @@ public interface Font { int getGlyphID(final char symbol); - Glyph getGlyph(final char symbol); + Glyph getGlyph(final int glyph_id); int getNumGlyphs(); |