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

1 files changed, 14 insertions, 19 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
index 3080f32cc..994253f71 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
@@ -27,27 +27,27 @@
  */
 package com.jogamp.graph.geom;
 
+import com.jogamp.opengl.math.Vert3fImmutable;
+
 /**
- * A Vertex with custom memory layout using custom factory. 
+ * A Vertex with custom memory layout using custom factory.
  */
-public interface Vertex extends Cloneable {
+public interface Vertex extends Vert3fImmutable, Cloneable {
 
     public static interface Factory <T extends Vertex> {
         T create();
 
         T create(float x, float y, float z, boolean onCurve);
 
-        T create(float[] coordsBuffer, int offset, int length, boolean onCurve);    
+        T create(float[] coordsBuffer, int offset, int length, boolean onCurve);
     }
-    
+
     void setCoord(float x, float y, float z);
 
     /**
      * @see System#arraycopy(Object, int, Object, int, int) for thrown IndexOutOfBoundsException
      */
     void setCoord(float[] coordsBuffer, int offset, int length);
-    
-    float[] getCoord();
 
     void setX(float x);
 
@@ -55,35 +55,30 @@ public interface Vertex extends Cloneable {
 
     void setZ(float z);
 
-    float getX();
-
-    float getY();
-
-    float getZ();
-
     boolean isOnCurve();
 
     void setOnCurve(boolean onCurve);
 
     int getId();
-    
+
     void setId(int id);
-    
+
     float[] getTexCoord();
-    
+
     void setTexCoord(float s, float t);
-    
+
     /**
      * @see System#arraycopy(Object, int, Object, int, int) for thrown IndexOutOfBoundsException
      */
     void setTexCoord(float[] texCoordsBuffer, int offset, int length);
-    
+
     /**
      * @param obj the Object to compare this Vertex with
-     * @return true if {@code obj} is a Vertex and not null, on-curve flag is equal and has same vertex- and tex-coords. 
+     * @return true if {@code obj} is a Vertex and not null, on-curve flag is equal and has same vertex- and tex-coords.
      */
+    @Override
     boolean equals(Object obj);
-    
+
     /**
      * @return deep clone of this Vertex
      */