Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

8 files changed, 218 insertions, 210 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index 5b0d985ad..c8d5a9db6 100755..100644
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -32,23 +32,23 @@ import java.util.Collections;
 
 import com.jogamp.graph.curve.tess.Triangulation;
 import com.jogamp.graph.curve.tess.Triangulator;
-import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Outline;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.graph.geom.Vertex;
-import com.jogamp.graph.math.VectorUtil;
+import com.jogamp.opengl.math.VectorUtil;
+import com.jogamp.opengl.math.geom.AABBox;
 
 
 /** A Generic shape objects which is defined by a list of Outlines.
  * This Shape can be transformed to Triangulations.
  * The list of triangles generated are render-able by a Region object.
- * The triangulation produced by this Shape will define the 
+ * The triangulation produced by this Shape will define the
  * closed region defined by the outlines.
- * 
+ *
  * One or more OutlineShape Object can be associated to a region
  * this is left as a high-level representation of the Objects. For
  * optimizations, flexibility requirements for future features.
- * 
+ *
  * <br><br>
  * Example to creating an Outline Shape:
  * <pre>
@@ -60,18 +60,18 @@ import com.jogamp.graph.math.VectorUtil;
       addVertex(...)
       addVertex(...)
  * </pre>
- * 
- * The above will create two outlines each with three vertices. By adding these two outlines to 
+ *
+ * The above will create two outlines each with three vertices. By adding these two outlines to
  * the OutlineShape, we are stating that the combination of the two outlines represent the shape.
  * <br>
- * 
- * To specify that the shape is curved at a region, the on-curve flag should be set to false 
+ *
+ * To specify that the shape is curved at a region, the on-curve flag should be set to false
  * for the vertex that is in the middle of the curved region (if the curved region is defined by 3
  * vertices (quadratic curve).
  * <br>
- * In case the curved region is defined by 4 or more vertices the middle vertices should both have 
+ * In case the curved region is defined by 4 or more vertices the middle vertices should both have
  * the on-curve flag set to false.
- * 
+ *
  * <br>Example: <br>
  * <pre>
       addVertex(0,0, true);
@@ -79,16 +79,16 @@ import com.jogamp.graph.math.VectorUtil;
       addVertex(1,1, false);
       addVertex(1,0, true);
  * </pre>
- * 
- * The above snippet defines a cubic nurbs curve where (0,1 and 1,1) 
+ *
+ * The above snippet defines a cubic nurbs curve where (0,1 and 1,1)
  * do not belong to the final rendered shape.
- *  
+ *
  * <i>Implementation Notes:</i><br>
  * <ul>
  *    <li> The first vertex of any outline belonging to the shape should be on-curve</li>
  *    <li> Intersections between off-curved parts of the outline is not handled</li>
  * </ul>
- * 
+ *
  * @see Outline
  * @see Region
  */
@@ -104,21 +104,21 @@ public class OutlineShape implements Comparable<OutlineShape> {
         VerticesState(int state){
             this.state = state;
         }
-    } 
+    }
 
     public static final int DIRTY_BOUNDS = 1 << 0;
 
     private final Vertex.Factory<? extends Vertex> vertexFactory;
     private VerticesState outlineState;
 
-    /** The list of {@link Outline}s that are part of this 
+    /** The list of {@link Outline}s that are part of this
      *  outline shape.
      */
     /* pp */ ArrayList<Outline> outlines;
-    private AABBox bbox;
+    private final AABBox bbox;
 
     /** dirty bits DIRTY_BOUNDS */
-    private int dirtyBits;  
+    private int dirtyBits;
 
     /** Create a new Outline based Shape
      */
@@ -128,7 +128,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
         this.outlines.add(new Outline());
         this.outlineState = VerticesState.UNDEFINED;
         this.bbox = new AABBox();
-        this.dirtyBits = 0;    
+        this.dirtyBits = 0;
     }
 
     /** Clears all data and reset all states as if this instance was newly created */
@@ -137,7 +137,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
         outlines.add(new Outline());
         outlineState = VerticesState.UNDEFINED;
         bbox.reset();
-        dirtyBits = 0;    
+        dirtyBits = 0;
     }
 
     /** Returns the associated vertex factory of this outline shape
@@ -149,10 +149,10 @@ public class OutlineShape implements Comparable<OutlineShape> {
         return outlines.size();
     }
 
-    /** Add a new empty {@link Outline} 
+    /** Add a new empty {@link Outline}
      * to the end of this shape's outline list.
      * <p>If the {@link #getLastOutline()} is empty already, no new one will be added.</p>
-     * 
+     *
      * After a call to this function all new vertices added
      * will belong to the new outline
      */
@@ -164,26 +164,26 @@ public class OutlineShape implements Comparable<OutlineShape> {
 
     /** Appends the {@link Outline} element to the end,
      * ensuring a clean tail.
-     * 
+     *
      * <p>A clean tail is ensured, no double empty Outlines are produced
      * and a pre-existing empty outline will be replaced with the given one. </p>
-     * 
+     *
      * @param outline Outline object to be added
-     * @throws NullPointerException if the  {@link Outline} element is null 
+     * @throws NullPointerException if the  {@link Outline} element is null
      */
     public void addOutline(Outline outline) throws NullPointerException {
         addOutline(outlines.size(), outline);
     }
 
     /** Insert the {@link Outline} element at the given {@code position}.
-     * 
+     *
      * <p>If the {@code position} indicates the end of this list,
      * a clean tail is ensured, no double empty Outlines are produced
      * and a pre-existing empty outline will be replaced with the given one. </p>
-     * 
+     *
      * @param position of the added Outline
      * @param outline Outline object to be added
-     * @throws NullPointerException if the  {@link Outline} element is null 
+     * @throws NullPointerException if the  {@link Outline} element is null
      * @throws IndexOutOfBoundsException if position is out of range (position < 0 || position > getOutlineNumber())
      */
     public void addOutline(int position, Outline outline) throws NullPointerException, IndexOutOfBoundsException {
@@ -213,7 +213,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
      * using {@link #addOutline(Outline)} for each element.
      * <p>Closes the current last outline via {@link #closeLastOutline()} before adding the new ones.</p>
      * @param outlineShape OutlineShape elements to be added.
-     * @throws NullPointerException if the  {@link OutlineShape} is null 
+     * @throws NullPointerException if the  {@link OutlineShape} is null
      * @throws IndexOutOfBoundsException if position is out of range (position < 0 || position > getOutlineNumber())
      */
     public void addOutlineShape(OutlineShape outlineShape) throws NullPointerException {
@@ -228,10 +228,10 @@ public class OutlineShape implements Comparable<OutlineShape> {
 
     /** Replaces the {@link Outline} element at the given {@code position}.
      * <p>Sets the bounding box dirty, hence a next call to {@link #getBounds()} will validate it.</p>
-     * 
+     *
      * @param position of the replaced Outline
-     * @param outline replacement Outline object 
-     * @throws NullPointerException if the  {@link Outline} element is null 
+     * @param outline replacement Outline object
+     * @throws NullPointerException if the  {@link Outline} element is null
      * @throws IndexOutOfBoundsException if position is out of range (position < 0 || position >= getOutlineNumber())
      */
     public void setOutline(int position, Outline outline) throws NullPointerException, IndexOutOfBoundsException {
@@ -244,7 +244,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
 
     /** Removes the {@link Outline} element at the given {@code position}.
      * <p>Sets the bounding box dirty, hence a next call to {@link #getBounds()} will validate it.</p>
-     * 
+     *
      * @param position of the to be removed Outline
      * @throws IndexOutOfBoundsException if position is out of range (position < 0 || position >= getOutlineNumber())
      */
@@ -261,15 +261,15 @@ public class OutlineShape implements Comparable<OutlineShape> {
         return outlines.get(outlines.size()-1);
     }
 
-    /** @return the {@code Outline} at {@code position} 
+    /** @return the {@code Outline} at {@code position}
      * @throws IndexOutOfBoundsException if position is out of range (position < 0 || position >= getOutlineNumber())
      */
     public Outline getOutline(int position) throws IndexOutOfBoundsException {
         return outlines.get(position);
-    }    
+    }
 
     /** Adds a vertex to the last open outline in the
-     *  shape. 
+     *  shape.
      * @param v the vertex to be added to the OutlineShape
      */
     public final void addVertex(Vertex v) {
@@ -280,9 +280,9 @@ public class OutlineShape implements Comparable<OutlineShape> {
         }
     }
 
-    /** Adds a vertex to the last open outline in the shape. 
-     * at {@code position} 
-     * @param position indx at which the vertex will be added 
+    /** Adds a vertex to the last open outline in the shape.
+     * at {@code position}
+     * @param position indx at which the vertex will be added
      * @param v the vertex to be added to the OutlineShape
      */
     public final void addVertex(int position, Vertex v) {
@@ -295,7 +295,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
 
     /** Add a 2D {@link Vertex} to the last outline by defining the coordniate attribute
      * of the vertex. The 2D vertex will be represented as Z=0.
-     * 
+     *
      * @param x the x coordinate
      * @param y the y coordniate
      * @param onCurve flag if this vertex is on the final curve or defines a curved region
@@ -317,10 +317,10 @@ public class OutlineShape implements Comparable<OutlineShape> {
         addVertex(vertexFactory.create(x, y, z, onCurve));
     }
 
-    /** Add a vertex to the last outline by passing a float array and specifying the 
-     * offset and length in which. The attributes of the vertex are located. 
+    /** Add a vertex to the last outline by passing a float array and specifying the
+     * offset and length in which. The attributes of the vertex are located.
      * The attributes should be continuous (stride = 0).
-     * Attributes which value are not set (when length less than 3) 
+     * Attributes which value are not set (when length less than 3)
      * are set implicitly to zero.
      * @param coordsBuffer the coordinate array where the vertex attributes are to be picked from
      * @param offset the offset in the buffer to the x coordinate
@@ -330,11 +330,11 @@ public class OutlineShape implements Comparable<OutlineShape> {
      */
     public final void addVertex(float[] coordsBuffer, int offset, int length, boolean onCurve) {
         addVertex(vertexFactory.create(coordsBuffer, offset, length, onCurve));
-    }    
+    }
 
     /** Closes the last outline in the shape.
      * <p>If last vertex is not equal to first vertex.
-     * A new temp vertex is added at the end which 
+     * A new temp vertex is added at the end which
      * is equal to the first.</p>
      */
     public void closeLastOutline() {
@@ -351,7 +351,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
     /** Ensure the outlines represent
      * the specified destinationType.
      * and removes all overlaps in boundary triangles
-     * @param destinationType the target outline's vertices state. Currently only 
+     * @param destinationType the target outline's vertices state. Currently only
      * {@link OutlineShape.VerticesState#QUADRATIC_NURBS} are supported.
      */
     public void transformOutlines(VerticesState destinationType) {
@@ -371,7 +371,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
         float[] v2 = VectorUtil.mid(v1, v3);
 
         //drop off-curve vertex to image on the curve
-        b.setCoord(v2, 0, 3); 
+        b.setCoord(v2, 0, 3);
         b.setOnCurve(true);
 
         outline.addVertex(index, vertexFactory.create(v1, 0, 3, false));
@@ -379,19 +379,19 @@ public class OutlineShape implements Comparable<OutlineShape> {
     }
 
     /** Check overlaps between curved triangles
-     *  first check if any vertex in triangle a is in triangle b 
+     *  first check if any vertex in triangle a is in triangle b
      *  second check if edges of triangle a intersect segments of triangle b
      *  if any of the two tests is true we divide current triangle
      *  and add the other to the list of overlaps
-     *  
+     *
      *  Loop until overlap array is empty. (check only in first pass)
      */
-    private void checkOverlaps() { 
+    private void checkOverlaps() {
         ArrayList<Vertex> overlaps = new ArrayList<Vertex>(3);
         int count = getOutlineNumber();
         boolean firstpass = true;
         do {
-            for (int cc = 0; cc < count; cc++) { 
+            for (int cc = 0; cc < count; cc++) {
                 final Outline outline = getOutline(cc);
                 int vertexCount = outline.getVertexCount();
                 for(int i=0; i < outline.getVertexCount(); i++) {
@@ -430,10 +430,10 @@ public class OutlineShape implements Comparable<OutlineShape> {
     private final float[] tempVecAC = new float[3];
     private final float[] tempVecAB = new float[3];
     private final float[] tempVecAP = new float[3];
-    
+
     private Vertex checkTriOverlaps(Vertex a, Vertex b, Vertex c) {
         int count = getOutlineNumber();
-        for (int cc = 0; cc < count; cc++) { 
+        for (int cc = 0; cc < count; cc++) {
             final Outline outline = getOutline(cc);
             int vertexCount = outline.getVertexCount();
             for(int i=0; i < vertexCount; i++) {
@@ -466,7 +466,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
 
     private void transformOutlines2Quadratic() {
         int count = getOutlineNumber();
-        for (int cc = 0; cc < count; cc++) {            
+        for (int cc = 0; cc < count; cc++) {
             final Outline outline = getOutline(cc);
             int vertexCount = outline.getVertexCount();
 
@@ -474,13 +474,13 @@ public class OutlineShape implements Comparable<OutlineShape> {
                 final Vertex currentVertex = outline.getVertex(i);
                 final Vertex nextVertex = outline.getVertex((i+1)%vertexCount);
                 if ( !currentVertex.isOnCurve() && !nextVertex.isOnCurve() ) {
-                    final float[] newCoords = VectorUtil.mid(currentVertex.getCoord(), 
+                    final float[] newCoords = VectorUtil.mid(currentVertex.getCoord(),
                             nextVertex.getCoord());
                     final Vertex v = vertexFactory.create(newCoords, 0, 3, true);
                     i++;
                     vertexCount++;
                     outline.addVertex(i, v);
-                }                
+                }
             }
             if(vertexCount <= 0) {
                 outlines.remove(outline);
@@ -490,7 +490,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
             }
 
             if( vertexCount > 0 ) {
-                if(VectorUtil.checkEquality(outline.getVertex(0).getCoord(), 
+                if(VectorUtil.checkEquality(outline.getVertex(0).getCoord(),
                         outline.getLastVertex().getCoord())) {
                     outline.removeVertex(vertexCount-1);
                 }
@@ -511,7 +511,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
         }
     }
 
-    /** @return the list of concatenated vertices associated with all 
+    /** @return the list of concatenated vertices associated with all
      * {@code Outline}s of this object
      */
     public ArrayList<Vertex> getVertices() {
@@ -554,9 +554,10 @@ public class OutlineShape implements Comparable<OutlineShape> {
     }
 
     /** Compare two outline shapes with Bounding Box area
-     * as criteria. 
+     * as criteria.
      * @see java.lang.Comparable#compareTo(java.lang.Object)
      */
+    @Override
     public final int compareTo(OutlineShape outline) {
         float size = getBounds().getSize();
         float newSize = outline.getBounds().getSize();
@@ -582,20 +583,21 @@ public class OutlineShape implements Comparable<OutlineShape> {
             validateBoundingBox();
         }
         return bbox;
-    }    
+    }
 
     /**
      * @param obj the Object to compare this OutlineShape with
-     * @return true if {@code obj} is an OutlineShape, not null, 
-     *                 same outlineState, equal bounds and equal outlines in the same order 
+     * @return true if {@code obj} is an OutlineShape, not null,
+     *                 same outlineState, equal bounds and equal outlines in the same order
      */
+    @Override
     public boolean equals(Object obj) {
         if( obj == this) {
             return true;
         }
         if( null == obj || !(obj instanceof OutlineShape) ) {
             return false;
-        }        
+        }
         final OutlineShape o = (OutlineShape) obj;
         if(getOutlineState() != o.getOutlineState()) {
             return false;
@@ -613,20 +615,4 @@ public class OutlineShape implements Comparable<OutlineShape> {
         }
         return true;
     }
-
-    /**
-     * @return deep clone of this OutlineShape w/o Region
-     */
-    public OutlineShape clone() {
-        OutlineShape o;
-        try {
-            o = (OutlineShape) super.clone();
-        } catch (CloneNotSupportedException e) { throw new InternalError(); }
-        o.bbox = bbox.clone();
-        o.outlines = new ArrayList<Outline>(outlines.size());
-        for(int i=0; i<outlines.size(); i++) {
-            o.outlines.add(outlines.get(i).clone());
-        }
-        return o;
-    }                
 }
diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java
index f7f51758b..e36e37c26 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/Region.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java
@@ -34,13 +34,13 @@ import jogamp.graph.curve.opengl.RegionFactory;
 import jogamp.opengl.Debug;
 
 import com.jogamp.graph.curve.opengl.GLRegion;
-import com.jogamp.graph.geom.AABBox;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.graph.geom.Vertex;
+import com.jogamp.opengl.math.geom.AABBox;
 
 /** Abstract Outline shape GL representation define the method an OutlineShape(s)
  * is bound and rendered.
- * 
+ *
  * @see GLRegion */
 public abstract class Region {
 
@@ -73,7 +73,7 @@ public abstract class Region {
     }
 
     /** Check if render mode capable of non uniform weights
-     * 
+     *
      * @param renderModes
      *            bit-field of modes, e.g.
      *            {@link Region#VARIABLE_CURVE_WEIGHT_BIT},
@@ -93,7 +93,7 @@ public abstract class Region {
         return region;
     }
 
-    /** 
+    /**
      * Create a {@link Region} defining this {@link OutlineShape}
      * @return the resulting Region.
      */
@@ -101,28 +101,28 @@ public abstract class Region {
         final Region region = RegionFactory.create(renderModes);
         region.addOutlineShape(outlineShape);
         return region;
-    }        
-        
+    }
+
     protected Region(int regionRenderModes) {
         this.renderModes = regionRenderModes;
     }
 
     /** Get current Models
-     * 
+     *
      * @return bit-field of render modes */
     public final int getRenderModes() {
         return renderModes;
     }
 
     /** Check if current Region is using VBAA
-     * 
+     *
      * @return true if capable of two pass rendering - VBAA */
     public boolean isVBAA() {
         return Region.isVBAA(renderModes);
     }
 
     /** Check if current instance uses non uniform weights
-     * 
+     *
      * @return true if capable of nonuniform weights */
     public boolean isNonUniformWeight() {
         return Region.isNonUniformWeight(renderModes);
@@ -130,7 +130,7 @@ public abstract class Region {
 
     /** 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;
@@ -138,10 +138,10 @@ public abstract class Region {
 
     /** Adds a {@link Triangle} object to the Region This triangle will be bound
      * to OGL objects on the next call to {@code update}
-     * 
+     *
      * @param tri
      *            a triangle object
-     * 
+     *
      * @see update(GL2ES2) */
     public void addTriangle(Triangle tri) {
         triangles.add(tri);
@@ -150,10 +150,10 @@ public abstract class Region {
 
     /** 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
-     * 
+     *
      * @see update(GL2ES2) */
     public void addTriangles(List<Triangle> tris) {
         triangles.addAll(tris);
@@ -162,10 +162,10 @@ public abstract class Region {
 
     /** 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) {
         vertices.add(vert);
@@ -175,10 +175,10 @@ public abstract class Region {
 
     /** 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);
@@ -202,7 +202,7 @@ public abstract class Region {
         }
         setDirty(true);
     }
-    
+
     public void addOutlineShapes(List<OutlineShape> shapes) {
         for (int i = 0; i < shapes.size(); i++) {
             addOutlineShape(shapes.get(i));
@@ -217,9 +217,9 @@ public abstract class Region {
 
     /** Check if this region is dirty. A region is marked dirty when new
      * Vertices, Triangles, and or Lines are added after a call to update()
-     * 
+     *
      * @return true if region is Dirty, false otherwise
-     * 
+     *
      * @see update(GL2ES2) */
     public final boolean isDirty() {
         return dirty;
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 e046c91cb..d63e02a9c 100755..100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
@@ -37,16 +37,16 @@ import com.jogamp.graph.curve.Region;
 

 /** A GLRegion is the OGL binding of one or more OutlineShapes

  *  Defined by its vertices and generated triangles. The Region

- *  defines the final shape of the OutlineShape(s), which shall produced a shaded 

+ *  defines the final shape of the OutlineShape(s), which shall produced a shaded

  *  region on the screen.

- *  

- *  Implementations of the GLRegion shall take care of the OGL 

+ *

+ *  Implementations of the GLRegion shall take care of the OGL

  *  binding of the depending on its context, profile.

- * 

+ *

  * @see Region, RegionFactory, OutlineShape

  */

-public abstract class GLRegion extends Region {    

-    

+public abstract class GLRegion extends Region {

+

     /** Create an ogl {@link GLRegion} defining the list of {@link OutlineShape}.

      * Combining the Shapes into single buffers.

      * @return the resulting Region inclusive the generated region

@@ -55,31 +55,31 @@ public abstract class GLRegion extends Region {
         return (GLRegion) Region.create(outlineShapes, renderModes);

     }

 

-    /** 

+    /**

      * Create an ogl {@link Region} defining this {@link OutlineShape}

      * @return the resulting Region.

      */

     public static GLRegion create(OutlineShape outlineShape, int renderModes) {

         return (GLRegion) Region.create(outlineShape, renderModes);

-    }        

-        

+    }

+

     protected GLRegion(int renderModes) {

         super(renderModes);

     }

-    

+

     /** Updates a graph region by updating the ogl related

      *  objects for use in rendering if {@link #isDirty()}.

-     *  <p>Allocates the ogl related data and initializes it the 1st time.<p>  

+     *  <p>Allocates the ogl related data and initializes it the 1st time.<p>

      *  <p>Called by {@link #draw(GL2ES2, RenderState, int, int, int)}.</p>

      * @param rs TODO

      */

     protected abstract void update(GL2ES2 gl, RenderState rs);

-    

+

     /** Delete and clean the associated OGL

      *  objects

      */

     public abstract void destroy(GL2ES2 gl, RenderState rs);

-    

+

     /** Renders the associated OGL objects specifying

      * current width/hight of window for multi pass rendering

      * of the region.

@@ -87,13 +87,13 @@ public abstract class GLRegion extends Region {
      * @param rs the RenderState to be used

      * @param vp_width current screen width

      * @param vp_height current screen height

-     * @param texWidth desired texture width for multipass-rendering. 

+     * @param texWidth desired texture width for multipass-rendering.

      *        The actual used texture-width is written back when mp rendering is enabled, otherwise the store is untouched.

      */

     public final void draw(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth) {

         update(gl, rs);

         drawImpl(gl, rs, vp_width, vp_height, texWidth);

     }

-    

+

     protected abstract void drawImpl(GL2ES2 gl, RenderState rs, int vp_width, int vp_height, int[/*1*/] texWidth);

 }

diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
index 4b7c12fea..faaf72a99 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
@@ -35,25 +35,25 @@ import com.jogamp.graph.curve.Region;
 
 public abstract class RegionRenderer extends Renderer {
 
-    /** 
+    /**
      * Create a Hardware accelerated Region Renderer.
-     * @param rs the used {@link RenderState} 
-     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, {@link Region#VBAA_RENDERING_BIT} 
+     * @param rs the used {@link RenderState}
+     * @param renderModes bit-field of modes, e.g. {@link Region#VARIABLE_CURVE_WEIGHT_BIT}, {@link Region#VBAA_RENDERING_BIT}
      * @return an instance of Region Renderer
      */
     public static RegionRenderer create(RenderState rs, int renderModes) {
         return new jogamp.graph.curve.opengl.RegionRendererImpl01(rs, renderModes);
     }
-    
+
     protected RegionRenderer(RenderState rs, int renderModes) {
         super(rs, renderModes);
     }
-    
-    
+
+
     /** Render an {@link OutlineShape} in 3D space at the position provided
      *  the triangles of the shapes will be generated, if not yet generated
      * @param region the OutlineShape to Render.
-     * @param texWidth desired texture width for multipass-rendering. 
+     * @param texWidth desired texture width for multipass-rendering.
      *        The actual used texture-width is written back when mp rendering is enabled, otherwise the store is untouched.
      * @throws Exception if HwRegionRenderer not initialized
      */
@@ -64,10 +64,10 @@ public abstract class RegionRenderer extends Renderer {
         if( !areRenderModesCompatible(region) ) {
             throw new GLException("Incompatible render modes, : region modes "+region.getRenderModes()+
                                   " doesn't contain renderer modes "+this.getRenderModes());
-        }        
+        }
         drawImpl(gl, region, texWidth);
     }
-    
+
     /**
      * Usually just dispatched the draw call to the Region's draw implementation,
      * e.g. {@link com.jogamp.graph.curve.opengl.GLRegion#draw(GL2ES2, RenderState, int, int, int[]) GLRegion#draw(GL2ES2, RenderState, int, int, int[])}.
@@ -78,6 +78,6 @@ public abstract class RegionRenderer extends Renderer {
     protected void destroyImpl(GL2ES2 gl) {
         // nop
     }
-    
-    
+
+
 }
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
index eb07142a3..9b0f32ef6 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
@@ -40,50 +40,50 @@ import com.jogamp.opengl.util.glsl.ShaderState;
 
 public abstract class RenderState {
     private static final String thisKey = "jogamp.graph.curve.RenderState" ;
-    
+
     public static RenderState createRenderState(ShaderState st, Vertex.Factory<? extends Vertex> pointFactory) {
-        return new RenderStateImpl(st, pointFactory);
+        return new RenderStateImpl(st, pointFactory, null);
     }
 
     public static RenderState createRenderState(ShaderState st, Vertex.Factory<? extends Vertex> pointFactory, PMVMatrix pmvMatrix) {
         return new RenderStateImpl(st, pointFactory, pmvMatrix);
     }
-    
+
     public static final RenderState getRenderState(GL2ES2 gl) {
         return (RenderState) gl.getContext().getAttachedObject(thisKey);
     }
-    
+
     protected final ShaderState st;
     protected final Vertex.Factory<? extends Vertex> vertexFactory;
     protected final PMVMatrix pmvMatrix;
-    protected final GLUniformData gcu_PMVMatrix;                    
-        
+    protected final GLUniformData gcu_PMVMatrix;
+
     protected RenderState(ShaderState st, Vertex.Factory<? extends Vertex> vertexFactory, PMVMatrix pmvMatrix) {
         this.st = st;
         this.vertexFactory = vertexFactory;
-        this.pmvMatrix = pmvMatrix;        
-        this.gcu_PMVMatrix = new GLUniformData(UniformNames.gcu_PMVMatrix, 4, 4, pmvMatrix.glGetPMvMatrixf());
-        st.ownUniform(gcu_PMVMatrix);        
+        this.pmvMatrix = null != pmvMatrix ? pmvMatrix : new PMVMatrix();
+        this.gcu_PMVMatrix = new GLUniformData(UniformNames.gcu_PMVMatrix, 4, 4, this.pmvMatrix.glGetPMvMatrixf());
+        st.ownUniform(gcu_PMVMatrix);
     }
-        
+
     public final ShaderState getShaderState() { return st; }
     public final Vertex.Factory<? extends Vertex> getVertexFactory() { return vertexFactory; }
     public final PMVMatrix pmvMatrix() { return pmvMatrix; }
     public final GLUniformData getPMVMatrix() { return gcu_PMVMatrix; }
-    
+
     public void destroy(GL2ES2 gl) {
         st.destroy(gl);
     }
-    
+
     public abstract GLUniformData getWeight();
     public abstract GLUniformData getAlpha();
     public abstract GLUniformData getColorStatic();
     // public abstract GLUniformData getStrength();
-    
+
     public final RenderState attachTo(GL2ES2 gl) {
         return (RenderState) gl.getContext().attachObject(thisKey, this);
     }
-    
+
     public final boolean detachFrom(GL2ES2 gl) {
         RenderState _rs = (RenderState) gl.getContext().getAttachedObject(thisKey);
         if(_rs == this) {
@@ -91,21 +91,22 @@ public abstract class RenderState {
             return true;
         }
         return false;
-    }    
-    
-    public StringBuilder toString(StringBuilder sb) {
+    }
+
+    public StringBuilder toString(StringBuilder sb, boolean alsoUnlocated) {
         if(null==sb) {
             sb = new StringBuilder();
         }
 
         sb.append("RenderState[");
-        st.toString(sb).append(Platform.getNewline());
+        st.toString(sb, alsoUnlocated).append(Platform.getNewline());
         sb.append("]");
 
         return sb;
     }
-    
+
+    @Override
     public String toString() {
-        return toString(null).toString();
-    }    
+        return toString(null, false).toString();
+    }
 }
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
index c9cb13ad4..31e4f0b8f 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
@@ -33,6 +33,7 @@ import javax.media.opengl.GL2ES2;
 import javax.media.opengl.GLException;
 import javax.media.opengl.fixedfunc.GLMatrixFunc;
 
+import com.jogamp.opengl.util.glsl.ShaderCode;
 import com.jogamp.opengl.util.glsl.ShaderState;
 import com.jogamp.opengl.util.PMVMatrix;
 
@@ -51,8 +52,8 @@ public abstract class Renderer {
     protected int vp_height;
     protected boolean initialized;
     protected final RenderState rs;
-    private boolean vboSupported = false; 
-    
+    private boolean vboSupported = false;
+
     public final boolean isInitialized() { return initialized; }
 
     public final int getWidth() { return vp_width; }
@@ -61,29 +62,29 @@ public abstract class Renderer {
     public float getWeight() { return rs.getWeight().floatValue(); }
     public float getAlpha() { return rs.getAlpha().floatValue(); }
     public final PMVMatrix getMatrix() { return rs.pmvMatrix(); }
-    
+
     /**
      * Implementation shall load, compile and link the shader program and leave it active.
      * @param gl referencing the current GLContext to which the ShaderState is bound to
      * @return
      */
     protected abstract boolean initShaderProgram(GL2ES2 gl);
-    
+
     protected abstract void destroyImpl(GL2ES2 gl);
-   
+
     /**
-     * @param rs the used {@link RenderState} 
+     * @param rs the used {@link RenderState}
      * @param renderModes bit-field of modes
      */
     protected Renderer(RenderState rs, int renderModes) {
         this.rs = rs;
         this.renderModes = renderModes;
     }
-    
+
     public final int getRenderModes() {
         return renderModes;
     }
-    
+
     public boolean usesVariableCurveWeight() { return Region.isNonUniformWeight(renderModes); }
 
     /**
@@ -92,17 +93,17 @@ public abstract class Renderer {
      */
     public final boolean areRenderModesCompatible(Region region) {
         final int cleanRenderModes = getRenderModes() & ( Region.VARIABLE_CURVE_WEIGHT_BIT );
-        return cleanRenderModes == ( region.getRenderModes() & cleanRenderModes ); 
+        return cleanRenderModes == ( region.getRenderModes() & cleanRenderModes );
     }
-    
+
     public final boolean isVBOSupported() { return vboSupported; }
-    
-    /** 
+
+    /**
      * Initialize shader and bindings for GPU based rendering bound to the given GL object's GLContext
      * if not initialized yet.
      * <p>Leaves the renderer enabled, ie ShaderState.</p>
      * <p>Shall be called by a {@code draw()} method, e.g. {@link RegionRenderer#draw(GL2ES2, Region, int)}</p>
-     *  
+     *
      * @param gl referencing the current GLContext to which the ShaderState is bound to
      * @throws GLException if initialization failed
      */
@@ -116,46 +117,48 @@ public abstract class Renderer {
                         gl.isFunctionAvailable("glDrawElements") &&
                         gl.isFunctionAvailable("glVertexAttribPointer") &&
                         gl.isFunctionAvailable("glDeleteBuffers");
-    
+
         if(DEBUG) {
             System.err.println("TextRendererImpl01: VBO Supported = " + isVBOSupported());
         }
-        
+
         if(!vboSupported){
             throw new GLException("VBO not supported");
         }
-        
+
         rs.attachTo(gl);
-        
+
         gl.glEnable(GL2ES2.GL_BLEND);
         gl.glBlendFunc(GL2ES2.GL_SRC_ALPHA, GL2ES2.GL_ONE_MINUS_SRC_ALPHA); // FIXME: alpha blending stage ?
-        
+
         initialized = initShaderProgram(gl);
         if(!initialized) {
             throw new GLException("Shader initialization failed");
         }
-        
+
         if(!rs.getShaderState().uniform(gl, rs.getPMVMatrix())) {
             throw new GLException("Error setting PMVMatrix in shader: "+rs.getShaderState());
         }
-        
-        if(!rs.getShaderState().uniform(gl, rs.getWeight())) {
-            throw new GLException("Error setting weight in shader: "+rs.getShaderState());
+
+        if( Region.isNonUniformWeight( getRenderModes() ) ) {
+            if(!rs.getShaderState().uniform(gl, rs.getWeight())) {
+                throw new GLException("Error setting weight in shader: "+rs.getShaderState());
+            }
         }
-                
+
         if(!rs.getShaderState().uniform(gl, rs.getAlpha())) {
             throw new GLException("Error setting global alpha in shader: "+rs.getShaderState());
-        }        
-        
+        }
+
         if(!rs.getShaderState().uniform(gl, rs.getColorStatic())) {
             throw new GLException("Error setting global color in shader: "+rs.getShaderState());
-        }        
+        }
     }
 
-    public final void flushCache(GL2ES2 gl) {  
+    public final void flushCache(GL2ES2 gl) {
         // FIXME: REMOVE !
     }
-        
+
     public void destroy(GL2ES2 gl) {
         if(!initialized){
             if(DEBUG_INSTANCE) {
@@ -166,13 +169,13 @@ public abstract class Renderer {
         rs.getShaderState().useProgram(gl, false);
         destroyImpl(gl);
         rs.destroy(gl);
-        initialized = false;        
+        initialized = false;
     }
-    
+
     public final RenderState getRenderState() { return rs; }
     public final ShaderState getShaderState() { return rs.getShaderState(); }
-    
-    public final void enable(GL2ES2 gl, boolean enable) { 
+
+    public final void enable(GL2ES2 gl, boolean enable) {
         rs.getShaderState().useProgram(gl, enable);
     }
 
@@ -181,11 +184,11 @@ public abstract class Renderer {
         	 throw new IllegalArgumentException("Weight out of range");
         }
         rs.getWeight().setData(v);
-        if(null != gl && rs.getShaderState().inUse()) {
+        if(null != gl && rs.getShaderState().inUse() && Region.isNonUniformWeight( getRenderModes() ) ) {
             rs.getShaderState().uniform(gl, rs.getWeight());
         }
     }
-    
+
     public void setAlpha(GL2ES2 gl, float alpha_t) {
         rs.getAlpha().setData(alpha_t);
         if(null != gl && rs.getShaderState().inUse()) {
@@ -196,11 +199,11 @@ public abstract class Renderer {
 
     public void getColorStatic(GL2ES2 gl, float[] rgb) {
         FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer();
-        rgb[0] = fb.get(0); 
-        rgb[1] = fb.get(1); 
-        rgb[2] = fb.get(2); 
+        rgb[0] = fb.get(0);
+        rgb[1] = fb.get(1);
+        rgb[2] = fb.get(2);
     }
-    
+
     public void setColorStatic(GL2ES2 gl, float r, float g, float b){
         FloatBuffer fb = (FloatBuffer) rs.getColorStatic().getBuffer();
         fb.put(0, r);
@@ -210,7 +213,7 @@ public abstract class Renderer {
             rs.getShaderState().uniform(gl, rs.getColorStatic());
         }
     }
-    
+
     public void rotate(GL2ES2 gl, float angle, float x, float y, float z) {
         rs.pmvMatrix().glRotatef(angle, x, y, z);
         updateMatrix(gl);
@@ -220,7 +223,7 @@ public abstract class Renderer {
         rs.pmvMatrix().glTranslatef(x, y, z);
         updateMatrix(gl);
     }
-    
+
     public void scale(GL2ES2 gl, float x, float y, float z) {
         rs.pmvMatrix().glScalef(x, y, z);
         updateMatrix(gl);
@@ -238,6 +241,14 @@ public abstract class Renderer {
         }
     }
 
+    /** No PMVMatrix operation is performed here. PMVMatrix will be updated if gl is not null. */
+    public boolean reshapeNotify(GL2ES2 gl, int width, int height) {
+        this.vp_width = width;
+        this.vp_height = height;
+        updateMatrix(gl);
+        return true;
+    }
+
     public boolean reshapePerspective(GL2ES2 gl, float angle, int width, int height, float near, float far) {
         this.vp_width = width;
         this.vp_height = height;
@@ -258,24 +269,34 @@ public abstract class Renderer {
         p.glLoadIdentity();
         p.glOrthof(0, width, 0, height, near, far);
         updateMatrix(gl);
-        return true;        
+        return true;
     }
 
-    protected String getVertexShaderName(GL2ES2 gl) {
-        return "curverenderer01" + getShaderGLVersionSuffix(gl);
+    protected String getVertexShaderName() {
+        return "curverenderer" + getImplVersion();
     }
-    
-    protected String getFragmentShaderName(GL2ES2 gl) {
-        final String type = "01" ; // Region.isNonUniformWeight(renderModes) ? "02" : "01" ;
-        final String pass = Region.isVBAA(renderModes) ? "b" : "a" ;
-        return "curverenderer" + type + pass + getShaderGLVersionSuffix(gl);
+
+    protected String getFragmentShaderName() {
+        final String version = getImplVersion();
+        final String pass = Region.isVBAA(renderModes) ? "-2pass" : "-1pass" ;
+        final String weight = Region.isNonUniformWeight(renderModes) ? "-weight" : "" ;
+        return "curverenderer" + version + pass + weight;
     }
-        
-    protected String getShaderGLVersionSuffix(GL2ES2 gl) {
-        if(gl.isGLES2()) {
-            return "-es2";
+
+    // FIXME: Really required to have sampler2D def. precision ? If not, we can drop getFragmentShaderPrecision(..) and use default ShaderCode ..
+    public static final String es2_precision_fp = "\nprecision mediump float;\nprecision mediump int;\nprecision mediump sampler2D;\n";
+
+    protected String getFragmentShaderPrecision(GL2ES2 gl) {
+        if( gl.isGLES() ) {
+            return es2_precision_fp;
+        }
+        if( ShaderCode.requiresGL3DefaultPrecision(gl) ) {
+            return ShaderCode.gl3_default_precision_fp;
         }
-        return "-gl2";
-    }    
-    
+        return null;
+    }
+
+    protected String getImplVersion() {
+        return "01";
+    }
 }
\ No newline at end of file
diff --git a/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulation.java b/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulation.java
index 7728efcaf..ae2849536 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulation.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulation.java
@@ -33,7 +33,7 @@ import jogamp.graph.curve.tess.CDTriangulator2D;
 
 public class Triangulation {
     /** Create a new instance of a triangulation.
-     *  Currently only a modified version of Constraint Delaunay 
+     *  Currently only a modified version of Constraint Delaunay
      *  is implemented.
      * @return instance of a triangulator
      * @see Triangulator
diff --git a/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulator.java b/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulator.java
index 1ffaccebc..4e8c400e0 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulator.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/tess/Triangulator.java
@@ -36,32 +36,32 @@ import com.jogamp.graph.geom.Triangle;
 /** Interface to the triangulation algorithms provided
  *  A triangulation of 2D outlines where you can
  *  provides an easy one or more outlines to be triangulated
- *  
+ *
  *  example usage:
  *      addCurve(o1);
  *      addCurve(o2);
  *      addCurve(o3);
  *      generate();
  *      reset();
- *      
+ *
  * @see Outline
  * @see Triangulation
  */
 public interface Triangulator {
-    
+
     /** Add a curve to the list of Outlines
      * describing the shape
      * @param outline a bounding {@link Outline}
      */
     public void addCurve(Outline outline);
-    
-    /** Generate the triangulation of the provided 
+
+    /** Generate the triangulation of the provided
      *  List of {@link Outline}s
      * @return an arraylist of {@link Triangle}s resembling the
      * final shape.
      */
     public ArrayList<Triangle> generate();
-    
+
     /** Reset the triangulation to initial state
      *  Clearing cached data
      */