Bug 801: Graph TextRenderer Cleanup Part-2: Remove Path2D from Glyph/Typecast* ; Misc Cleanup

Commit c3621221b9a563495b4f54fe60e18e8db8cc57fb introduced
create an OutlineShape per Glyph from it's data w/o going through Path2D.

Misc Cleanup: Remove unused code/fields, use private/final where possible.

2 files changed, 2 insertions, 52 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java
index 6ac3d926f..b54fcd6a6 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java
@@ -144,43 +144,6 @@ public class TextRenderUtil {
         return region;
     }
 
-    private static GLRegion createRegion2(final int renderModes, final Factory<? extends Vertex> vertexFactory,
-                                         final Font font, final CharSequence str, final int pixelSize) {
-        final List<OutlineShape> shapesIn = font.getOutlineShapes(null, str, pixelSize, vertexFactory);
-        final ArrayList<OutlineShape> shapesOut = new ArrayList<OutlineShape>();
-        final int numGlyps = shapesIn.size();
-        for (int index=0;index<numGlyps;index++){
-            if(shapesIn.get(index) == null){
-                continue;
-            }
-            final OutlineShape glyphShape = shapesIn.get(index);
-
-            if(glyphShape.getVertices().size() < 3) {
-                continue;
-            }
-            shapesOut.add(glyphShape);
-        }
-
-        final GLRegion region = Region.create(renderModes);
-        // region.setFlipped(true);
-        int numVertices = region.getNumVertices();
-
-        for(int i=0; i< shapesOut.size(); i++) {
-            final OutlineShape shape = shapesOut.get(i);
-            ArrayList<Triangle> gtris = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
-            region.addTriangles(gtris, null, 0);
-
-            final ArrayList<Vertex> gVertices = shape.getVertices();
-            for(int j=0; j<gVertices.size(); j++) {
-                final Vertex gVert = gVertices.get(j);
-                gVert.setId(numVertices++);
-                region.addVertex(gVert, null);
-            }
-        }
-        return region;
-    }
-
-
     /**
      * Render the String in 3D space wrt to the font provided at the position provided
      * the outlines will be generated, if not yet generated
diff --git a/src/jogl/classes/com/jogamp/graph/font/Font.java b/src/jogl/classes/com/jogamp/graph/font/Font.java
index 1e0572037..afffe0654 100644
--- a/src/jogl/classes/com/jogamp/graph/font/Font.java
+++ b/src/jogl/classes/com/jogamp/graph/font/Font.java
@@ -27,11 +27,7 @@
  */
 package com.jogamp.graph.font;
 
-import java.util.List;
-
 import com.jogamp.graph.curve.OutlineShape;
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.geom.Vertex.Factory;
 import com.jogamp.opengl.math.geom.AABBox;
 
 /**
@@ -88,6 +84,7 @@ public interface Font {
         public Font getFont();
         public char getSymbol();
         public short getID();
+        public AABBox getBBox();
         public float getScale(float pixelSize);
         public AABBox getBBox(float pixelSize);
         public float getAdvance(float pixelSize, boolean useFrationalMetrics);
@@ -117,17 +114,7 @@ public interface Font {
 
     public boolean isPrintableChar( char c );
 
-    /**
-     * @deprecated Remove altogether - use {@link #getOutlineShape(Glyph, Factory)
-     * @param shapes optional storage of OutlineShapes passed by user, new shapes are appended
-     * @param string source of the created OutlineShapes
-     * @param pixelSize
-     * @param vertexFactory factory for vertices
-     * @return List of OutlineShapes, one OutlineShape per character
-     */
-    public List<OutlineShape> getOutlineShapes(List<OutlineShape> shapes, CharSequence string, float pixelSize, Factory<? extends Vertex> vertexFactory);
-
     /** Shall return {@link #getFullFamilyName()} */
     @Override
     public String toString();
-}
\ No newline at end of file
+}