Added nonuniform weight impl; misc enhancements/cleanups

Seperate texcoords from shaprness
Added NonUniform weight shader impl for region impl only (not text)
Refactor p1y --> weight (equiv to nurbs weight)
cleanup shader uniforms (rename/remove unneeded)
Enhanced blending of text
GPURegionNewtDemo01 - added weight W/Q to manipulate weight
refactor r2t --> vbaa (matching algorithm name)

1 files changed, 2 insertions, 11 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index 724380f4a..c995b3749 100755
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -264,28 +264,19 @@ public class OutlineShape {
         return vertices;

     }

 

-    /** Triangulate the outline shape generating a list of triangles

-     * @return an arraylist of triangles representing the filled region

-     * which is produced by the combination of the outlines 

-     */

-    public ArrayList<Triangle> triangulate(){

-        return triangulate(0.5f);

-    }

 

     /**Triangulate the {@link OutlineShape} generating a list of triangles

-     * @param sharpness defines the curvature strength around the off-curve vertices.

-     * defaults to 0.5f

      * @return an arraylist of triangles representing the filled region

      * which is produced by the combination of the outlines

      */

-    public ArrayList<Triangle> triangulate(float sharpness){

+    public ArrayList<Triangle> triangulate(){

         if(outlines.size() == 0){

             return null;

         }

         sortOutlines();

         generateVertexIds();

         

-        CDTriangulator2D triangulator2d = new CDTriangulator2D(sharpness);

+        CDTriangulator2D triangulator2d = new CDTriangulator2D();

         for(int index = 0; index< outlines.size();index++){

             Outline outline = outlines.get(index);

             triangulator2d.addCurve(outline);