GraphUI GraphShape: createGLRegion() -> updateGLRegion(), called by addShapeToRegion() impl to utilize OutlineShape -> GLRegion ctor w/ proper buffer-size

This way we avoid unnecessary buffer growth and allow creation of 'always' fitting buffer sizes.

+++

Update or freshly create the GLRegion, while allocating its buffers with given initial `vertexCount` and `indexCount`.

Method shall be invoked by the addShapeToRegion(GLProfile, GL2ES2) implementation before actually adding the OutlineShape to the GLRegion.

addShapeToRegion(GLProfile, GL2ES2) is capable to determine initial `vertexCount` and `indexCount` buffer sizes,
as it composes the OutlineShapes to be added.

updateGLRegion(GLProfile, GL2ES2, TextureSequence, OutlineShape) maybe used for convenience.

In case GLRegion is `null`, a new instance is being created.

In case the GLRegion already exists, it will be either cleared if the GL2ES2 `gl` instance is not `null`
or earmarked for deletion at a later time and a new instance is being created.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java b/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java
index 568270073..dd4398c63 100644
--- a/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java
+++ b/src/graphui/classes/com/jogamp/graph/ui/shapes/GlyphShape.java
@@ -36,6 +36,7 @@ import com.jogamp.graph.font.Font;
 import com.jogamp.graph.font.Font.Glyph;
 import com.jogamp.graph.geom.plane.AffineTransform;
 import com.jogamp.graph.ui.GraphShape;
+import com.jogamp.opengl.GL2ES2;
 import com.jogamp.opengl.GLProfile;
 import com.jogamp.opengl.math.Vec3f;
 import com.jogamp.opengl.math.geom.AABBox;
@@ -52,6 +53,8 @@ import com.jogamp.opengl.util.texture.TextureSequence;
 public class GlyphShape extends GraphShape {
     private final char symbol;
     private final Glyph glyph;
+    private final int regionVertCount;
+    private final int regionIdxCount;
     private final Vec3f origPos;
 
     /**
@@ -71,6 +74,9 @@ public class GlyphShape extends GraphShape {
         if( glyph.isWhiteSpace() || null == glyph.getShape() ) {
             setEnabled(false);
         }
+        final int[/*2*/] vertIndexCount = Region.countOutlineShape(glyph.getShape(), new int[2]);
+        regionVertCount = vertIndexCount[0];
+        regionIdxCount = vertIndexCount[1];
     }
 
     /**
@@ -82,13 +88,7 @@ public class GlyphShape extends GraphShape {
      * @param y the intended unscaled Y position of this Glyph, e.g. if part of a string - otherwise use zero.
      */
     public GlyphShape(final int renderModes, final Font font, final char symbol, final float x, final float y) {
-        super(renderModes);
-        this.symbol = symbol;
-        this.glyph = font.getGlyph( font.getGlyphID(symbol) );
-        this.origPos = new Vec3f(x, y, 0f);
-        if( glyph.isWhiteSpace() || null == glyph.getShape() ) {
-            setEnabled(false);
-        }
+        this(renderModes, symbol, font.getGlyph( font.getGlyphID(symbol) ), x, y);
     }
 
     /** Returns the char symbol to be rendered. */
@@ -181,7 +181,7 @@ public class GlyphShape extends GraphShape {
     }
 
     @Override
-    protected void addShapeToRegion() {
+    protected void addShapeToRegion(final GLProfile glp, final GL2ES2 gl) {
         final OutlineShape shape = glyph.getShape();
         box.reset();
         if( null != shape ) {
@@ -191,9 +191,11 @@ public class GlyphShape extends GraphShape {
             // but keep the underline (decline) intact!
             tmp.setToTranslation(-sbox.getMinX(), -sbox.getMinY() + glyph.getBounds().getMinY());
             shape.setSharpness(oshapeSharpness);
+
+            updateGLRegion(glp, gl, null, regionVertCount, regionIdxCount);
             region.addOutlineShape(shape, tmp, rgbaColor);
-            setRotationPivot( sbox.getCenter() );
             box.resize(tmp.transform(sbox, new AABBox()));
+            setRotationPivot( box.getCenter() );
         }
     }