Bug 802: Graph TextRenderer Performance Part-1 (incomplete, rendering artifacts)

Strategy Change:
  - Font.Glyph itself holds it's OutlineShape
    with it's default scaling.
    Triangulation is done only once per glyph!

  - A CharSequence produces a Region
    by translating and scaling each Glyphs's OutlineShape.
    This removes the need for re-triangulate - see above.
    See: TextRendererUtil

  - The indices of re-added Triangles are
    offset to the new vertices (FIXME, seems not be be accurate yet).

  - OutlineShape's vertices and triangles are reused if 'clean'.

  - Simplified code

  - Reduced copies

API Changes:
  - OutlineShape, Region, ...: See above

  - Removed TextRenderer, GlyphShape and GlyphString: Redundant

  - Added TextRendererUtil to produce the Region from CharSequence

Result:
  - Over 600 fps while changing text for each frame.
    Previously only ~60fps max.

TODO:
  - Region shall not hold the triangles itself,
    but the indices instead.
    This will remove the need to swizzle w/ vertices in the Region Renderer impl
    and easies reusage of OutlineShapes.

1 files changed, 0 insertions, 201 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java b/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java
deleted file mode 100644
index b27604a44..000000000
--- a/src/jogl/classes/com/jogamp/graph/geom/opengl/SVertex.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.geom.opengl;
-
-import com.jogamp.graph.geom.Vertex;
-import com.jogamp.opengl.math.VectorUtil;
-
-/** A Simple Vertex Implementation. Where the coordinates, and other attributes are
- * float based, and the coordinates and texture coordinates are saved in two float arrays.
- *
- */
-public class SVertex implements Vertex {
-    private int id = Integer.MAX_VALUE;
-    protected float[] coord = new float[3];
-    protected boolean onCurve;
-    private float[] texCoord = new float[2];
-
-    static final Factory factory = new Factory();
-
-    public static Factory factory() { return factory; }
-
-    public static class Factory implements Vertex.Factory<SVertex> {
-        @Override
-        public SVertex create() {
-            return new SVertex();
-        }
-
-        @Override
-        public SVertex create(float x, float y, float z, boolean onCurve) {
-            return new SVertex(x, y, z, onCurve);
-        }
-
-        @Override
-        public SVertex create(float[] coordsBuffer, int offset, int length, boolean onCurve) {
-            return new SVertex(coordsBuffer, offset, length, onCurve);
-        }
-    }
-
-    public SVertex() {
-    }
-
-    public SVertex(float x, float y, float z, boolean onCurve) {
-        setCoord(x, y, z);
-        setOnCurve(onCurve);
-    }
-
-    public SVertex(float[] coordsBuffer, int offset, int length, boolean onCurve) {
-        setCoord(coordsBuffer, offset, length);
-        setOnCurve(onCurve);
-    }
-
-    public SVertex(float[] coordsBuffer, int offset, int length,
-                   float[] texCoordsBuffer, int offsetTC, int lengthTC, boolean onCurve) {
-        setCoord(coordsBuffer, offset, length);
-        setTexCoord(texCoordsBuffer, offsetTC, lengthTC);
-        setOnCurve(onCurve);
-    }
-
-    @Override
-    public final void setCoord(float x, float y, float z) {
-        this.coord[0] = x;
-        this.coord[1] = y;
-        this.coord[2] = z;
-    }
-
-    @Override
-    public final void setCoord(float[] coordsBuffer, int offset, int length) {
-        System.arraycopy(coordsBuffer, offset, coord, 0, length);
-    }
-
-    @Override
-    public int getCoordCount() {
-        return 3;
-    }
-
-    @Override
-    public final float[] getCoord() {
-        return coord;
-    }
-
-    @Override
-    public final void setX(float x) {
-        this.coord[0] = x;
-    }
-
-    @Override
-    public final void setY(float y) {
-        this.coord[1] = y;
-    }
-
-    @Override
-    public final void setZ(float z) {
-        this.coord[2] = z;
-    }
-
-    @Override
-    public final float getX() {
-        return this.coord[0];
-    }
-
-    @Override
-    public final float getY() {
-        return this.coord[1];
-    }
-
-    @Override
-    public final float getZ() {
-        return this.coord[2];
-    }
-
-    @Override
-    public final boolean isOnCurve() {
-        return onCurve;
-    }
-
-    @Override
-    public final void setOnCurve(boolean onCurve) {
-        this.onCurve = onCurve;
-    }
-
-    @Override
-    public final int getId(){
-        return id;
-    }
-
-    @Override
-    public final void setId(int id){
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if( obj == this) {
-            return true;
-        }
-        if( null == obj || !(obj instanceof Vertex) ) {
-            return false;
-        }
-        final Vertex v = (Vertex) obj;
-        return this == v ||
-               isOnCurve() == v.isOnCurve() &&
-               VectorUtil.checkEqualityVec2(getTexCoord(), v.getTexCoord()) &&
-               VectorUtil.checkEquality(getCoord(), v.getCoord()) ;
-    }
-
-    @Override
-    public final float[] getTexCoord() {
-        return texCoord;
-    }
-
-    @Override
-    public final void setTexCoord(float s, float t) {
-        this.texCoord[0] = s;
-        this.texCoord[1] = t;
-    }
-
-    @Override
-    public final void setTexCoord(float[] texCoordsBuffer, int offset, int length) {
-        System.arraycopy(texCoordsBuffer, offset, texCoord, 0, length);
-    }
-
-    /**
-     * @return deep clone of this Vertex, but keeping the id blank
-     */
-    @Override
-    public SVertex clone(){
-        return new SVertex(this.coord, 0, 3, this.texCoord, 0, 2, this.onCurve);
-    }
-
-    @Override
-    public String toString() {
-        return "[ID: " + id + ", onCurve: " + onCurve +
-               ": p " + coord[0] + ", " + coord[1] + ", " + coord[2] +
-               ", t " + texCoord[0] + ", " + texCoord[1] + "]";
-    }
-}