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, 5 deletions

diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl b/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
index c4d9db535..b8c68a924 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/shader/attributes.glsl
@@ -12,13 +12,19 @@ attribute vec4    gca_Vertices;
  *     hole or holeLike: 0 > y
  *     !hole           : 0 < y 
  *      
- *     0   == gcv_TexCoord.x : vertex-0 of triangle
- *     0.5 == gcv_TexCoord.x : vertex-1 of triangle
- *     1   == gcv_TexCoord.x : vertex-2 of triangle
+ *     0   == gcv_CurveParams.x : vertex-0 of triangle
+ *     0.5 == gcv_CurveParams.x : vertex-1 of triangle
+ *     1   == gcv_CurveParams.x : vertex-2 of triangle
  */
-attribute vec3    gca_TexCoords;
+attribute vec3    gca_CurveParams;
+
+attribute vec4    gca_FboVertices;
+attribute vec2    gca_FboTexCoords;
+
+#ifdef USE_COLOR_CHANNEL
+    attribute vec4    gca_Colors;
+#endif
 
-//attribute vec4    gca_Colors;
 //attribute vec3    gca_Normals;
 
 #endif // attributes_glsl