Bug 801: WIP 1/2 - Add color attribute; Switch Shader instead of branching in shader; Update attributes and uniforms manually, drop ShaderState;

- ShaderCode
  - add int insertShaderSource(int shaderIdx, int position, Class<?> context, String path)
  - insertShaderSource(..): pos==-1 -> append code

- VectorUtil
  - add isVec3InTriangle3(..., float epsilon)
  - add testSeg2SegIntersection(..., float epsilon)
  - add testTri2SegIntersection(..., float epsilon)

- AffineTransform: Return result for chaining

- Font
  - Add pixel precise 'getPointsBounds(final AffineTransform transform, CharSequence string, float pixelSize)'
  - Rename getString*() -> getMetric*()
  - OTGlyph: Release _points field, no more used
  -

- Graph Triangulation
  - Count additional vertices in: Triangulator, CDTriangulator2D

- OutlineShape:
  - Allow skipping of 'transformOutlines2Quadratic', i.e. allow tagging
    OutlineShape to be quadratic_nurbs via 'setIsQuadraticNurbs()'

  - Clarify cleanup ot outlines in same method 'cleanupOutlines()'

  - Count additional vertices ..

- Graph Shader:
  - Start splitting and segmenting shader code for:
    - pass1 / pass2
    - features, i.e. sampleCont, color-channel, ..

1 files changed, 11 insertions, 7 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/AttributeNames.java b/src/jogl/classes/jogamp/graph/curve/opengl/shader/AttributeNames.java
index b46661778..b2c73a2e4 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/AttributeNames.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/AttributeNames.java
@@ -28,18 +28,22 @@
 package jogamp.graph.curve.opengl.shader;
 
 public class AttributeNames {
-    /** The vertices index in an OGL object
+    /**
+     * The vertices index in an OGL object
      */
-    public static final int VERTEX_ATTR_IDX = 0; // FIXME: AMD needs this to be location 0 ? hu ?
     public static final String VERTEX_ATTR_NAME = "gca_Vertices";
 
-    /** The Texture Coord index in an OGL object
+    /**
+     * The Texture Coord index in an OGL object
      */
-    public static final int TEXCOORD_ATTR_IDX = 1;
-    public static final String TEXCOORD_ATTR_NAME = "gca_TexCoords";
+    public static final String CURVEPARAMS_ATTR_NAME = "gca_CurveParams";
 
-    /** The color index in an OGL object
+    /**
+     * The color index in an OGL object
      */
-    public static final int COLOR_ATTR_IDX = 2;
     public static final String COLOR_ATTR_NAME = "gca_Colors";
+
+    public static final String FBO_VERTEX_ATTR_NAME = "gca_FboVertices";
+    public static final String FBO_TEXCOORDS_ATTR_NAME = "gca_FboTexCoords";
+
 }