From 2cafc01f08f9ab05748be6eeb82c417de38b31f7 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 27 Feb 2014 10:53:06 +0100
Subject: Bug 801: Graph TextRenderer Cleanup Part-3:
 Region.addOutlineShape(..) Push GL data directly incl. all index validations

Region:
  - Remove redundant methods to make
    OutlineShape the unique source.
    - addVertex(..)
    - addTriangles(..)

  - Perform all index validations in addOutlineShape(..)

  - Push OutlineShape's vertex data
    and it's triangle indices directly to VBO.

GLRegion: Add clear(..) method, allowing to clear the region
          for new data, i.e. OutlineShapes
---
 .../com/jogamp/graph/curve/OutlineShape.java       |   3 -
 .../classes/com/jogamp/graph/curve/Region.java     | 246 +++++++++------------
 .../com/jogamp/graph/curve/opengl/GLRegion.java    |  13 +-
 .../jogamp/graph/curve/opengl/TextRenderUtil.java  |  31 +--
 .../classes/com/jogamp/graph/geom/Triangle.java    |  16 +-
 5 files changed, 120 insertions(+), 189 deletions(-)

(limited to 'src/jogl/classes/com')

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index ffaaca91c..50bd79e1c 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -560,8 +560,6 @@ public class OutlineShape implements Comparable<OutlineShape> {
      * Should always be called <i>after</i> {@link #getTriangles(VerticesState)},
      * since the latter will mark all cached vertices dirty!
      * </p>
-     * FIXME: Add memory optimization, i.e. VBO layout
-     * FIXME: Add Runnable task-per-vertices !
      */
     public final ArrayList<Vertex> getVertices() {
         final boolean updated;
@@ -604,7 +602,6 @@ public class OutlineShape implements Comparable<OutlineShape> {
      * </p>
      * @return an arraylist of triangles representing the filled region
      * which is produced by the combination of the outlines
-     * FIXME: Add memory optimization, i.e. VBO layout
      */
     public ArrayList<Triangle> getTriangles(VerticesState destinationType) {
         final boolean updated;
diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java
index 79ec305d1..359c63c80 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/Region.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java
@@ -51,32 +51,33 @@ public abstract class Region {
     public static final boolean DEBUG = Debug.debug("graph.curve");
     public static final boolean DEBUG_INSTANCE = Debug.debug("graph.curve.instance");
 
-    /** View based Anti-Aliasing, A Two pass region rendering, slower and more
+    /**
+     * View based Anti-Aliasing, A Two pass region rendering, slower and more
      * resource hungry (FBO), but AA is perfect. Otherwise the default fast one
-     * pass MSAA region rendering is being used. */
+     * pass MSAA region rendering is being used.
+     */
     public static final int VBAA_RENDERING_BIT = 1 << 0;
 
-    /** Use non uniform weights [0.0 .. 1.9] for curve region rendering.
+    /**
+     * Use non uniform weights [0.0 .. 1.9] for curve region rendering.
      * Otherwise the default weight 1.0 for uniform curve region rendering is
-     * being applied. */
+     * being applied.
+     */
     public static final int VARIABLE_CURVE_WEIGHT_BIT = 1 << 1;
 
     public static final int TWO_PASS_DEFAULT_TEXTURE_UNIT = 0;
 
     private final int renderModes;
     private boolean dirty = true;
-    protected int numVertices = 0;
+    private int numVertices = 0;
     protected final AABBox box = new AABBox();
-    /** FIXME: Think about a rendering storage optimization (VBO ... )! */
-    protected ArrayList<Triangle> triangles = new ArrayList<Triangle>();
-    /** FIXME: Think about a rendering storage optimization (VBO ... )! */
-    protected ArrayList<Vertex> vertices = new ArrayList<Vertex>();
 
     public static boolean isVBAA(int renderModes) {
         return 0 != (renderModes & Region.VBAA_RENDERING_BIT);
     }
 
-    /** Check if render mode capable of non uniform weights
+    /**
+     * Check if render mode capable of non uniform weights
      *
      * @param renderModes
      *            bit-field of modes, e.g.
@@ -109,165 +110,132 @@ public abstract class Region {
         this.renderModes = regionRenderModes;
     }
 
-    /** Get current Models
-     *
-     * @return bit-field of render modes */
+    /**
+     * Returns true, if the implementation uses indices to render the vertices,
+     * otherwise false.
+     * <p>
+     * Impacts {@link #validateIndices()} and {@link #addOutlineShape(OutlineShape, AffineTransform)} ..,
+     * i.e. defines unique indices if this method returns true.
+     * </p>
+     */
+    public abstract boolean usesIndices();
+
+    public abstract void pushVertex(float[] coords, float[] texParams);
+    public abstract void pushIndex(int idx);
+
+    /**
+     * Return bit-field of render modes, see {@link #create(int)}.
+     */
     public final int getRenderModes() {
         return renderModes;
     }
 
-
-    public final ArrayList<Triangle> getTriangles() { return triangles; }
-
-    public final ArrayList<Vertex> getVertices() { return vertices; }
-
-    /** Check if current Region is using VBAA
-     *
-     * @return true if capable of two pass rendering - VBAA */
-    public boolean isVBAA() {
-        return Region.isVBAA(renderModes);
+    protected void clearImpl() {
+        dirty = true;
+        numVertices = 0;
+        box.reset();
     }
 
-    /** Check if current instance uses non uniform weights
-     *
-     * @return true if capable of nonuniform weights */
-    public boolean isNonUniformWeight() {
-        return Region.isNonUniformWeight(renderModes);
+    /**
+     * Return  true if capable of two pass rendering - VBAA, otherwise false.
+     */
+    public final boolean isVBAA() {
+        return isVBAA(renderModes);
     }
 
-    /** Get the current number of vertices associated with this region. This
-     * number is not necessary equal to the OGL bound number of vertices.
-     *
-     * @return vertices count */
-    public final int getNumVertices() {
-        return numVertices;
+    /**
+     * Return true if capable of nonuniform weights, otherwise false.
+     */
+    public final boolean isNonUniformWeight() {
+        return Region.isNonUniformWeight(renderModes);
     }
 
-    /** Adds a list of {@link Triangle} objects to the Region These triangles are
-     * to be binded to OGL objects on the next call to {@code update}
-     *
-     * @param tris
-     *            a list of triangle objects
-     * @param idxOffset TODO
-     *
-     * @see update(GL2ES2) */
-    public void addTriangles(List<Triangle> tris, AffineTransform t, int idxOffset) {
-        if( true && null != t ) {
-            for(int i=0; i<tris.size(); i++) {
-                final Triangle t2 = tris.get(i).transform(t);
-                t2.addVertexIndicesOffset(idxOffset);
-                triangles.add( t2 );
-            }
+    private void pushNewVertexImpl(final Vertex vertIn, final AffineTransform transform) {
+        final float[] coordsEx = new float[3];
+        if( null != transform ) {
+            final float[] coordsIn = vertIn.getCoord();
+            transform.transform(coordsIn, coordsEx);
+            coordsEx[2] = coordsIn[2];
+            box.resize(coordsEx[0], coordsEx[1], coordsEx[2]);
+            pushVertex(coordsEx, vertIn.getTexCoord());
         } else {
-            for(int i=0; i<tris.size(); i++) {
-                final Triangle t2 = new Triangle( tris.get(i) );
-                t2.addVertexIndicesOffset(idxOffset);
-                triangles.add( t2 );
-            }
-            // triangles.addAll(tris);
-        }
-        if(DEBUG_INSTANCE) {
-            System.err.println("Region.addTriangles(): tris: "+triangles.size()+", verts "+vertices.size());
+            box.resize(vertIn.getX(), vertIn.getY(), vertIn.getZ());
+            pushVertex(vertIn.getCoord(), vertIn.getTexCoord());
         }
-        setDirty(true);
+        numVertices++;
     }
 
-    /** Adds a {@link Vertex} object to the Region This vertex will be bound to
-     * OGL objects on the next call to {@code update}
-     *
-     * @param vert
-     *            a vertex objects
-     *
-     * @see update(GL2ES2) */
-    public void addVertex(Vertex vert, AffineTransform t) {
-        final Vertex svert = null != t ? t.transform(vert, null) : vert;
-        vertices.add(svert);
-        numVertices++;
-        assert( vertices.size() == numVertices );
-        if(DEBUG_INSTANCE) {
-            System.err.println("Region.addVertex(): tris: "+triangles.size()+", verts "+vertices.size());
-        }
-        setDirty(true);
+    private void pushNewVertexIdxImpl(final Vertex vertIn, final AffineTransform transform) {
+        pushIndex(numVertices);
+        pushNewVertexImpl(vertIn, transform);
     }
 
-    /** Adds a list of {@link Vertex} objects to the Region These vertices are to
-     * be binded to OGL objects on the next call to {@code update}
-     *
-     * @param verts
-     *            a list of vertex objects
-     *
-     * @see update(GL2ES2) */
-    public void addVertices(List<Vertex> verts) {
-        vertices.addAll(verts);
-        numVertices = vertices.size();
+    public final void addOutlineShape(final OutlineShape shape, final AffineTransform transform) {
+        final List<Triangle> trisIn = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
+        final ArrayList<Vertex> vertsIn = shape.getVertices();
         if(DEBUG_INSTANCE) {
-            System.err.println("Region.addVertices(): tris: "+triangles.size()+", verts "+vertices.size());
+            System.err.println("Region.addOutlineShape().0: tris: "+trisIn.size()+", verts "+vertsIn.size()+", transform "+transform);
         }
-        setDirty(true);
-    }
-
-    public void addOutlineShape(OutlineShape shape, AffineTransform t) {
-        final List<Triangle> tris = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
-        if(null != tris) {
-            if( false && null != t ) {
-                for(int i=0; i<tris.size(); i++) {
-                    triangles.add( tris.get(i).transform(t) );
-                }
-            } else {
-                triangles.addAll(tris);
+        final int idxOffset = numVertices;
+        int vertsVNewIdxCount = 0, vertsTMovIdxCount = 0, vertsTNewIdxCount = 0, tris = 0;
+        int vertsDupCountV = 0, vertsDupCountT = 0, vertsKnownMovedT = 0;
+        if( vertsIn.size() >= 3 ) {
+            if(DEBUG_INSTANCE) {
+                System.err.println("Region.addOutlineShape(): Processing Vertices");
+            }
+            for(int i=0; i<vertsIn.size(); i++) {
+                pushNewVertexImpl(vertsIn.get(i), transform);
+                vertsVNewIdxCount++;
+            }
+            if(DEBUG_INSTANCE) {
+                System.err.println("Region.addOutlineShape(): Processing Triangles");
             }
-            // final List<Vertex> verts = shape.getVertices();
-            // vertices.addAll(verts);
-            // FIXME: use OutlineShape.getVertices(Runnable task-per-vertex) !!
-            for (int j = 0; j < shape.outlines.size(); j++) {
-                final ArrayList<Vertex> sovs = shape.outlines.get(j).getVertices();
-                for (int k = 0; k < sovs.size(); k++) {
-                    final Vertex v;
-                    if( null != t ) {
-                        v = t.transform(sovs.get(k), null);
-                    } else {
-                        v = sovs.get(k);
+            for(int i=0; i<trisIn.size(); i++) {
+                final Triangle triIn = trisIn.get(i);
+                if(Region.DEBUG_INSTANCE) {
+                    System.err.println("T["+i+"]: "+triIn);
+                }
+                // triEx.addVertexIndicesOffset(idxOffset);
+                // triangles.add( triEx );
+                final Vertex[] triInVertices = triIn.getVertices();
+                final int tv0Idx = triInVertices[0].getId();
+                if( Integer.MAX_VALUE-idxOffset > tv0Idx ) { // Integer.MAX_VALUE != i0 // FIXME: renderer uses SHORT!
+                    // valid 'known' idx - move by offset
+                    if(Region.DEBUG_INSTANCE) {
+                        System.err.println("T["+i+"]: Moved "+tv0Idx+" + "+idxOffset+" -> "+(tv0Idx+idxOffset));
+                    }
+                    pushIndex(tv0Idx+idxOffset);
+                    pushIndex(triInVertices[1].getId()+idxOffset);
+                    pushIndex(triInVertices[2].getId()+idxOffset);
+                    vertsTMovIdxCount+=3;
+                } else {
+                    // invalid idx - generate new one
+                    if(Region.DEBUG_INSTANCE) {
+                        System.err.println("T["+i+"]: New Idx "+numVertices);
                     }
-                    v.setId(numVertices++);
-                    vertices.add(v);
+                    pushNewVertexIdxImpl(triInVertices[0], transform);
+                    pushNewVertexIdxImpl(triInVertices[1], transform);
+                    pushNewVertexIdxImpl(triInVertices[2], transform);
+                    vertsTNewIdxCount+=3;
                 }
+                tris++;
             }
-            // numVertices = vertices.size();
         }
         if(DEBUG_INSTANCE) {
-            System.err.println("Region.addOutlineShape(): tris: "+triangles.size()+", verts "+vertices.size());
+            System.err.println("Region.addOutlineShape().X: idxOffset "+idxOffset+", tris: "+tris+", verts [idx "+vertsTNewIdxCount+", add "+vertsTNewIdxCount+" = "+(vertsVNewIdxCount+vertsTNewIdxCount)+"]");
+            System.err.println("Region.addOutlineShape().X: verts: idx[v-new "+vertsVNewIdxCount+", t-new "+vertsTNewIdxCount+" = "+(vertsVNewIdxCount+vertsTNewIdxCount)+"]");
+            System.err.println("Region.addOutlineShape().X: verts: idx t-moved "+vertsTMovIdxCount+", numVertices "+numVertices);
+            System.err.println("Region.addOutlineShape().X: verts: v-dups "+vertsDupCountV+", t-dups "+vertsDupCountT+", t-known "+vertsKnownMovedT);
+            // int vertsDupCountV = 0, vertsDupCountT = 0;
+            System.err.println("Region.addOutlineShape().X: box "+box);
         }
         setDirty(true);
     }
 
-    public void validateIndices() {
-        final int verticeCountPre = vertices.size();
-        for(int i=0; i<triangles.size(); i++) {
-            final Triangle t = triangles.get(i);
-            final Vertex[] t_vertices = t.getVertices();
-
-            if(t_vertices[0].getId() == Integer.MAX_VALUE){
-                t_vertices[0].setId(numVertices++);
-                t_vertices[1].setId(numVertices++);
-                t_vertices[2].setId(numVertices++);
-                vertices.add(t_vertices[0]);
-                vertices.add(t_vertices[1]);
-                vertices.add(t_vertices[2]);
-            }
-        }
-        if( verticeCountPre < vertices.size() ) {
-            setDirty(true);
-        }
-    }
-
-    public void addOutlineShapes(List<OutlineShape> shapes) {
+    public final void addOutlineShapes(final List<OutlineShape> shapes, final AffineTransform transform) {
         for (int i = 0; i < shapes.size(); i++) {
-            addOutlineShape(shapes.get(i), null);
+            addOutlineShape(shapes.get(i), transform);
         }
-        if(DEBUG_INSTANCE) {
-            System.err.println("Region.addOutlineShapes(): tris: "+triangles.size()+", verts "+vertices.size());
-        }
-        setDirty(true);
     }
 
     /** @return the AxisAligned bounding box of current region */
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 78c8660fa..7bf2ee6e1 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
@@ -27,12 +27,9 @@
  */
 package com.jogamp.graph.curve.opengl;
 
-import java.util.List;
-
 import javax.media.opengl.GL2ES2;
 
 import com.jogamp.opengl.util.PMVMatrix;
-import com.jogamp.graph.curve.OutlineShape;
 import com.jogamp.graph.curve.Region;
 
 /** A GLRegion is the OGL binding of one or more OutlineShapes
@@ -77,6 +74,16 @@ public abstract class GLRegion extends Region {
      */
     public abstract void destroy(GL2ES2 gl, RegionRenderer renderer);
 
+    protected abstract void clearImpl(final GL2ES2 gl, final RegionRenderer renderer);
+
+    /**
+     * Clears all data, i.e. triangles, vertices etc.
+     */
+    public void clear(final GL2ES2 gl, final RegionRenderer renderer) {
+        clearImpl(gl, renderer);
+        clearImpl();
+    }
+
     /**
      * Renders the associated OGL objects specifying
      * current width/hight of window for multi pass rendering
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 b54fcd6a6..944050a14 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderUtil.java
@@ -74,7 +74,7 @@ public class TextRenderUtil {
                                         final Font font, final CharSequence str, final int pixelSize) {
         final int charCount = str.length();
 
-        final GLRegion region = Region.create(renderModes);
+        final GLRegion region = GLRegion.create(renderModes);
         // region.setFlipped(true);
         final Font.Metrics metrics = font.getMetrics();
 
@@ -88,7 +88,6 @@ public class TextRenderUtil {
 
         float y = 0;
         float advanceTotal = 0;
-        int numVertices = region.getNumVertices();
 
         for(int i=0; i< charCount; i++) {
             final char character = str.charAt(i);
@@ -110,33 +109,7 @@ public class TextRenderUtil {
                 if( null == glyphShape ) {
                     continue;
                 }
-                // glyphShape.closeLastOutline();
-
-                if( false ) {
-                    region.addOutlineShape(glyphShape, t);
-                } else {
-                    // System.err.println("XXXXX Pre TRI");
-                    // glyphShape.getVertices();
-                    final ArrayList<Triangle> trisIn = glyphShape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
-                    final ArrayList<Vertex> gVertices = glyphShape.getVertices();
-
-                    if( gVertices.size() < 3 ) {
-                        continue;
-                    }
-                    region.addTriangles(trisIn, t, numVertices);
-
-                    for(int j=0; j<gVertices.size(); j++) {
-                        final Vertex vert = gVertices.get(j);
-                        final Vertex svert = t.transform(vert, null);
-                        svert.setId(numVertices++);
-                        if(Region.DEBUG_INSTANCE) {
-                            System.err.println("IN: "+vert);
-                            System.err.println("EX: "+svert);
-                        }
-                        region.addVertex(svert, null);
-                    }
-                }
-                assert( numVertices == region.getNumVertices() );
+                region.addOutlineShape(glyphShape, t);
 
                 advanceTotal += glyph.getAdvance(pixelSize, true);
             }
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
index 6de99c48b..e353dd061 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
@@ -83,20 +83,6 @@ public class Triangle {
         this.id = id;
     }
 
-    public void addVertexIndicesOffset(int offset) {
-        if( 0 < offset ) {
-            final int i0 = vertices[0].getId();
-            if( Integer.MAX_VALUE-offset > i0 ) { // Integer.MAX_VALUE != i0 // FIXME: renderer uses SHORT!
-                if(Region.DEBUG_INSTANCE) {
-                    System.err.println("Triangle.addVertexIndicesOffset: "+i0+" + "+offset+" -> "+(i0+offset));
-                }
-                vertices[0].setId(i0+offset);
-                vertices[1].setId(vertices[1].getId()+offset);
-                vertices[2].setId(vertices[2].getId()+offset);
-            }
-        }
-    }
-
     /** Returns array of 3 vertices, denominating the triangle. */
     public Vertex[] getVertices() {
         return vertices;
@@ -124,6 +110,6 @@ public class Triangle {
 
     @Override
     public String toString() {
-        return "Tri ID: " + id + "\n" +  vertices[0]  + "\n" +  vertices[1] + "\n" +  vertices[2];
+        return "Tri ID: " + id + "\n\t" +  vertices[0]  + "\n\t" +  vertices[1] + "\n\t" +  vertices[2];
     }
 }
-- 
cgit v1.2.3