Graph + GraphUI: Consolidate Vertex: Drop SVertex and factory, use Vec[234]f instead of float[] and remove unused VectorUtil methods

After Matrix4f consolidation and proving same or better performance on non array types,
this enhances code readability, simplifies API, reduces bugs and may improve performance.

GraphUI:
- Have RoundButton as a functional class to make a round or rectangular backdrop,
  i.e. impl. addShapeToRegion() via reused addRoundShapeToRegion()

9 files changed, 239 insertions, 364 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index 9b71865f6..30987ec7e 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -34,14 +34,15 @@ import java.util.Comparator;
 import com.jogamp.graph.curve.tess.Triangulation;
 import com.jogamp.graph.curve.tess.Triangulator;
 import com.jogamp.graph.geom.Outline;
-import com.jogamp.graph.geom.SVertex;
 import com.jogamp.graph.geom.Triangle;
 import com.jogamp.graph.geom.Vertex;
 import com.jogamp.graph.geom.plane.AffineTransform;
 import com.jogamp.graph.geom.plane.Path2F;
 import com.jogamp.graph.geom.plane.Winding;
 import com.jogamp.opengl.math.FloatUtil;
+import com.jogamp.opengl.math.Vec3f;
 import com.jogamp.opengl.math.VectorUtil;
+import com.jogamp.opengl.math.Vert2fImmutable;
 import com.jogamp.opengl.math.geom.AABBox;
 
 /**
@@ -142,8 +143,6 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      */
     public static final int DIRTY_TRIANGLES  = 1 << 2;
 
-    private final Vertex.Factory<? extends Vertex> vertexFactory;
-
     /** The list of {@link Outline}s that are part of this
      *  outline shape.
      */
@@ -161,25 +160,14 @@ public final class OutlineShape implements Comparable<OutlineShape> {
 
     private float sharpness;
 
-    private final float[] tmpV1 = new float[3];
-    private final float[] tmpV2 = new float[3];
-    private final float[] tmpV3 = new float[3];
-
-    /** Returns the default Vertex.Factory. */
-    public static Vertex.Factory<? extends Vertex> getDefaultVertexFactory() { return SVertex.factory(); }
-
-    /**
-     * Create a new Outline based Shape using {@link #getDefaultVertexFactory()}
-     */
-    public OutlineShape() {
-        this(getDefaultVertexFactory());
-    }
+    private final Vec3f tmpV1 = new Vec3f();
+    private final Vec3f tmpV2 = new Vec3f();
+    private final Vec3f tmpV3 = new Vec3f();
 
     /**
      * Create a new Outline based Shape
      */
-    public OutlineShape(final Vertex.Factory<? extends Vertex> factory) {
-        this.vertexFactory = factory;
+    public OutlineShape() {
         this.outlines = new ArrayList<Outline>(3);
         this.outlines.add(new Outline());
         this.outlineState = VerticesState.UNDEFINED;
@@ -230,12 +218,6 @@ public final class OutlineShape implements Comparable<OutlineShape> {
         dirtyBits |= DIRTY_TRIANGLES | DIRTY_VERTICES;
     }
 
-    /**
-     * Returns the associated vertex factory of this outline shape
-     * @return Vertex.Factory object
-     */
-    public final Vertex.Factory<? extends Vertex> vertexFactory() { return vertexFactory; }
-
     /** Returns the number of {@link Outline}s. */
     public final int getOutlineCount() {
         return outlines.size();
@@ -437,7 +419,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final float x, final float y, final boolean onCurve) {
-        addVertex(vertexFactory.create(x, y, 0f, onCurve));
+        addVertex(new Vertex(x, y, 0f, onCurve));
     }
 
     /**
@@ -451,7 +433,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final int position, final float x, final float y, final boolean onCurve) {
-        addVertex(position, vertexFactory.create(x, y, 0f, onCurve));
+        addVertex(position, new Vertex(x, y, 0f, onCurve));
     }
 
     /**
@@ -464,7 +446,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final float x, final float y, final float z, final boolean onCurve) {
-        addVertex(vertexFactory.create(x, y, z, onCurve));
+        addVertex(new Vertex(x, y, z, onCurve));
     }
 
     /**
@@ -478,7 +460,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final int position, final float x, final float y, final float z, final boolean onCurve) {
-        addVertex(position, vertexFactory.create(x, y, z, onCurve));
+        addVertex(position, new Vertex(x, y, z, onCurve));
     }
 
     /**
@@ -495,7 +477,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final float[] coordsBuffer, final int offset, final int length, final boolean onCurve) {
-        addVertex(vertexFactory.create(coordsBuffer, offset, length, onCurve));
+        addVertex(new Vertex(coordsBuffer, offset, length, onCurve));
     }
 
     /**
@@ -513,7 +495,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * @see <a href="#windingrules">see winding rules</a>
      */
     public final void addVertex(final int position, final float[] coordsBuffer, final int offset, final int length, final boolean onCurve) {
-        addVertex(position, vertexFactory.create(coordsBuffer, offset, length, onCurve));
+        addVertex(position, new Vertex(coordsBuffer, offset, length, onCurve));
     }
 
     /**
@@ -578,9 +560,9 @@ public final class OutlineShape implements Comparable<OutlineShape> {
                     }
                     {
                         // Skip if last vertex in last outline matching this point -> already connected.
-                        final float[] llc = lo.getVertex(lo_sz-1).getCoord();
-                        if( llc[0] == points[idx+0] &&
-                            llc[1] == points[idx+1] ) {
+                        final Vert2fImmutable llc = lo.getVertex(lo_sz-1);
+                        if( llc.x() == points[idx+0] &&
+                            llc.y() == points[idx+1] ) {
                             break;
                         }
                     }
@@ -652,9 +634,9 @@ public final class OutlineShape implements Comparable<OutlineShape> {
                     }
                     {
                         // Skip if last vertex in last outline matching this point -> already connected.
-                        final float[] llc = lo.getVertex(0).getCoord();
-                        if( llc[0] == points[idx+0] &&
-                            llc[1] == points[idx+1] ) {
+                        final Vert2fImmutable llc = lo.getVertex(0);
+                        if( llc.x() == points[idx+0] &&
+                            llc.y() == points[idx+1] ) {
                             break;
                         }
                     }
@@ -790,11 +772,11 @@ public final class OutlineShape implements Comparable<OutlineShape> {
         VectorUtil.midVec3(tmpV2, tmpV1, tmpV3);
 
         //drop off-curve vertex to image on the curve
-        b.setCoord(tmpV2, 0, 3);
+        b.setCoord(tmpV2);
         b.setOnCurve(true);
 
-        outline.addVertex(index, vertexFactory.create(tmpV1, 0, 3, false));
-        outline.addVertex(index+2, vertexFactory.create(tmpV3, 0, 3, false));
+        outline.addVertex(index, new Vertex(tmpV1, false));
+        outline.addVertex(index+2, new Vertex(tmpV3, false));
 
         addedVerticeCount += 2;
     }
@@ -934,7 +916,7 @@ public final class OutlineShape implements Comparable<OutlineShape> {
                     if ( !currentVertex.isOnCurve() && !nextVertex.isOnCurve() ) {
                         VectorUtil.midVec3(tmpV1, currentVertex.getCoord(), nextVertex.getCoord());
                         System.err.println("XXX: Cubic: "+i+": "+currentVertex+", "+j+": "+nextVertex);
-                        final Vertex v = vertexFactory.create(tmpV1, 0, 3, true);
+                        final Vertex v = new Vertex(tmpV1, true);
                         i++;
                         vertexCount++;
                         addedVerticeCount++;
@@ -946,8 +928,8 @@ public final class OutlineShape implements Comparable<OutlineShape> {
                 outlines.remove(outline);
                 cc--;
                 count--;
-            } else  if( 0 < vertexCount &&
-                        VectorUtil.isVec3Equal( outline.getVertex(0).getCoord(), 0, outline.getLastVertex().getCoord(), 0, FloatUtil.EPSILON )) {
+            } else if( 0 < vertexCount &&
+                       outline.getVertex(0).getCoord().isEqual( outline.getLastVertex().getCoord() ) ) {
                 outline.removeVertex(vertexCount-1);
             }
         }
@@ -1047,10 +1029,10 @@ public final class OutlineShape implements Comparable<OutlineShape> {
      * </p>
      */
     public final OutlineShape transform(final AffineTransform t) {
-        final OutlineShape newOutlineShape = new OutlineShape(vertexFactory);
+        final OutlineShape newOutlineShape = new OutlineShape();
         final int osize = outlines.size();
         for(int i=0; i<osize; i++) {
-            newOutlineShape.addOutline( outlines.get(i).transform(t, vertexFactory) );
+            newOutlineShape.addOutline( outlines.get(i).transform(t) );
         }
         return newOutlineShape;
     }
diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java
index b3cee629c..799b8b7bd 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/Region.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java
@@ -47,6 +47,8 @@ import com.jogamp.common.util.PerfCounterCtrl;
 import com.jogamp.graph.curve.opengl.GLRegion;
 import com.jogamp.opengl.GLCapabilitiesImmutable;
 import com.jogamp.opengl.GLProfile;
+import com.jogamp.opengl.math.Vec3f;
+import com.jogamp.opengl.math.Vec4f;
 import com.jogamp.opengl.math.geom.AABBox;
 import com.jogamp.opengl.math.geom.Frustum;
 import com.jogamp.opengl.util.texture.TextureSequence;
@@ -256,9 +258,9 @@ public abstract class Region {
      */
     public abstract void setBufferCapacity(int verticesCount, int indicesCount);
 
-    protected abstract void pushVertex(final float[] coords, final float[] texParams, float[] rgba);
-    protected abstract void pushVertices(final float[] coords1, final float[] coords2, final float[] coords3,
-                                         final float[] texParams1, final float[] texParams2, final float[] texParams3, float[] rgba);
+    protected abstract void pushVertex(final Vec3f coords, final Vec3f texParams, Vec4f rgba);
+    protected abstract void pushVertices(final Vec3f coords1, final Vec3f coords2, final Vec3f coords3,
+                                         final Vec3f texParams1, final Vec3f texParams2, final Vec3f texParams3, Vec4f rgba);
     protected abstract void pushIndex(int idx);
     protected abstract void pushIndices(int idx1, int idx2, int idx3);
 
@@ -336,12 +338,9 @@ public abstract class Region {
         this.frustum = frustum;
     }
 
-    private void pushNewVertexImpl(final Vertex vertIn, final AffineTransform transform, final float[] rgba) {
+    private void pushNewVertexImpl(final Vertex vertIn, final AffineTransform transform, final Vec4f rgba) {
         if( null != transform ) {
-            final float[] coordsEx1 = new float[3];
-            final float[] coordsIn = vertIn.getCoord();
-            transform.transform(coordsIn, coordsEx1);
-            coordsEx1[2] = coordsIn[2];
+            final Vec3f coordsEx1 = transform.transform(vertIn.getCoord(), new Vec3f());
             box.resize(coordsEx1);
             pushVertex(coordsEx1, vertIn.getTexCoord(), rgba);
         } else {
@@ -351,20 +350,11 @@ public abstract class Region {
         numVertices++;
     }
 
-    private void pushNewVerticesImpl(final Vertex vertIn1, final Vertex vertIn2, final Vertex vertIn3, final AffineTransform transform, final float[] rgba) {
+    private void pushNewVerticesImpl(final Vertex vertIn1, final Vertex vertIn2, final Vertex vertIn3, final AffineTransform transform, final Vec4f rgba) {
         if( null != transform ) {
-            final float[] coordsEx1 = new float[3];
-            final float[] coordsEx2 = new float[3];
-            final float[] coordsEx3 = new float[3];
-            final float[] coordsIn1 = vertIn1.getCoord();
-            final float[] coordsIn2 = vertIn2.getCoord();
-            final float[] coordsIn3 = vertIn3.getCoord();
-            transform.transform(coordsIn1, coordsEx1);
-            transform.transform(coordsIn2, coordsEx2);
-            transform.transform(coordsIn3, coordsEx3);
-            coordsEx1[2] = coordsIn1[2];
-            coordsEx2[2] = coordsIn2[2];
-            coordsEx3[2] = coordsIn3[2];
+            final Vec3f coordsEx1 = transform.transform(vertIn1.getCoord(), new Vec3f());
+            final Vec3f coordsEx2 = transform.transform(vertIn2.getCoord(), new Vec3f());
+            final Vec3f coordsEx3 = transform.transform(vertIn3.getCoord(), new Vec3f());
             box.resize(coordsEx1);
             box.resize(coordsEx2);
             box.resize(coordsEx3);
@@ -381,11 +371,11 @@ public abstract class Region {
     }
 
     @SuppressWarnings("unused")
-    private void pushNewVertexIdxImpl(final Vertex vertIn, final AffineTransform transform, final float[] rgba) {
+    private void pushNewVertexIdxImpl(final Vertex vertIn, final AffineTransform transform, final Vec4f rgba) {
         pushIndex(numVertices);
         pushNewVertexImpl(vertIn, transform, rgba);
     }
-    private void pushNewVerticesIdxImpl(final Vertex vertIn1, final Vertex vertIn2, final Vertex vertIn3, final AffineTransform transform, final float[] rgba) {
+    private void pushNewVerticesIdxImpl(final Vertex vertIn1, final Vertex vertIn2, final Vertex vertIn3, final AffineTransform transform, final Vec4f rgba) {
         pushIndices(numVertices, numVertices+1, numVertices+2);
         pushNewVerticesImpl(vertIn1, vertIn2, vertIn3, transform, rgba);
     }
@@ -396,12 +386,15 @@ public abstract class Region {
     protected static void put3s(final ShortBuffer b, final short v1, final short v2, final short v3) {
         b.put(v1); b.put(v2); b.put(v3);
     }
-    protected static void put3f(final FloatBuffer b, final float v1, final float v2, final float v3) {
-        b.put(v1); b.put(v2); b.put(v3);
+    protected static void put3f(final FloatBuffer b, final Vec3f v) {
+        b.put(v.x()); b.put(v.y()); b.put(v.z());
     }
     protected static void put4f(final FloatBuffer b, final float v1, final float v2, final float v3, final float v4) {
         b.put(v1); b.put(v2); b.put(v3); b.put(v4);
     }
+    protected static void put4f(final FloatBuffer b, final Vec4f v) {
+        b.put(v.x()); b.put(v.y()); b.put(v.z()); b.put(v.w());
+    }
 
     private final AABBox tmpBox = new AABBox();
 
@@ -529,7 +522,7 @@ public abstract class Region {
      * @param t the optional {@link AffineTransform} to be applied on each vertex
      * @param rgbaColor if {@link #hasColorChannel()} RGBA color must be passed, otherwise value is ignored.
      */
-    public final void addOutlineShape(final OutlineShape shape, final AffineTransform t, final float[] rgbaColor) {
+    public final void addOutlineShape(final OutlineShape shape, final AffineTransform t, final Vec4f rgbaColor) {
         if( null != frustum ) {
             final AABBox shapeBox = shape.getBounds();
             final AABBox shapeBoxT;
@@ -550,7 +543,7 @@ public abstract class Region {
         }
         markShapeDirty();
     }
-    private final void addOutlineShape0(final OutlineShape shape, final AffineTransform t, final float[] rgbaColor) {
+    private final void addOutlineShape0(final OutlineShape shape, final AffineTransform t, final Vec4f rgbaColor) {
         final List<Triangle> trisIn = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
         final ArrayList<Vertex> vertsIn = shape.getVertices();
         {
@@ -587,7 +580,7 @@ public abstract class Region {
             }
         }
     }
-    private final void addOutlineShape1(final OutlineShape shape, final AffineTransform t, final float[] rgbaColor) {
+    private final void addOutlineShape1(final OutlineShape shape, final AffineTransform t, final Vec4f rgbaColor) {
         ++perf.count;
         final long t0 = Clock.currentNanos();
         final List<Triangle> trisIn = shape.getTriangles(OutlineShape.VerticesState.QUADRATIC_NURBS);
@@ -682,7 +675,7 @@ public abstract class Region {
      * @param t the optional {@link AffineTransform} to be applied on each vertex
      * @param rgbaColor if {@link #hasColorChannel()} RGBA color must be passed, otherwise value is ignored.
      */
-    public final void addOutlineShapes(final List<OutlineShape> shapes, final AffineTransform transform, final float[] rgbaColor) {
+    public final void addOutlineShapes(final List<OutlineShape> shapes, final AffineTransform transform, final Vec4f rgbaColor) {
         for (int i = 0; i < shapes.size(); i++) {
             addOutlineShape(shapes.get(i), transform, rgbaColor);
         }
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 2f518d1cc..89a48e0c8 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/RenderState.java
@@ -33,6 +33,7 @@ import com.jogamp.opengl.GL;
 import com.jogamp.opengl.GL2ES2;
 import com.jogamp.opengl.GLException;
 import com.jogamp.opengl.GLUniformData;
+import com.jogamp.opengl.math.Vec4f;
 
 import jogamp.common.os.PlatformPropsImpl;
 import jogamp.graph.curve.opengl.shader.UniformNames;
@@ -241,13 +242,14 @@ public class RenderState {
         weight[0] = v;
     }
 
-
-    public final float[] getColorStatic(final float[] rgbaColor) {
-        System.arraycopy(colorStatic, 0, rgbaColor, 0, 4);
-        return rgbaColor;
+    public final Vec4f getColorStatic(final Vec4f rgbaColor) {
+        return rgbaColor.set(colorStatic);
     }
-    public final void setColorStatic(final float[] rgbaColor){
-        System.arraycopy(rgbaColor, 0, colorStatic, 0, 4);
+    public final void setColorStatic(final Vec4f rgbaColor){
+        colorStatic[0] = rgbaColor.x();
+        colorStatic[1] = rgbaColor.y();
+        colorStatic[2] = rgbaColor.z();
+        colorStatic[3] = rgbaColor.w();
     }
     public final void setColorStatic(final float r, final float g, final float b, final float a){
         colorStatic[0] = r;
diff --git a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
index 237d93184..6beb11be1 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/opengl/TextRegionUtil.java
@@ -33,6 +33,7 @@ import java.util.Iterator;
 
 import com.jogamp.opengl.GL2ES2;
 import com.jogamp.opengl.GLException;
+import com.jogamp.opengl.math.Vec4f;
 import com.jogamp.opengl.math.geom.AABBox;
 import com.jogamp.graph.curve.OutlineShape;
 import com.jogamp.graph.curve.Region;
@@ -82,7 +83,7 @@ public class TextRegionUtil {
      * @return the bounding box of the given string by taking each glyph's font em-sized [0..1] OutlineShape into account.
      */
     public static AABBox addStringToRegion(final Region region, final Font font, final AffineTransform transform,
-                                           final CharSequence str, final float[] rgbaColor) {
+                                           final CharSequence str, final Vec4f rgbaColor) {
         return addStringToRegion(region, font, transform, str, rgbaColor, new AffineTransform(), new AffineTransform());
     }
 
@@ -105,7 +106,7 @@ public class TextRegionUtil {
      * @return the bounding box of the given string by taking each glyph's font em-sized [0..1] OutlineShape into account.
      */
     public static AABBox addStringToRegion(final Region region, final Font font, final AffineTransform transform,
-                                           final CharSequence str, final float[] rgbaColor,
+                                           final CharSequence str, final Vec4f rgbaColor,
                                            final AffineTransform temp1, final AffineTransform temp2) {
         final Font.GlyphVisitor visitor = new Font.GlyphVisitor() {
             @Override
@@ -113,7 +114,7 @@ public class TextRegionUtil {
                 if( glyph.isWhiteSpace() ) {
                     return;
                 }
-                region.addOutlineShape(glyph.getShape(), t, region.hasColorChannel() ? rgbaColor : null);
+                region.addOutlineShape(glyph.getShape(), t, rgbaColor);
             }
         };
         return font.processString(visitor, transform, str, temp1, temp2);
@@ -167,7 +168,7 @@ public class TextRegionUtil {
      */
     public AABBox drawString3D(final GL2ES2 gl,
                                final RegionRenderer renderer, final Font font, final CharSequence str,
-                               final float[] rgbaColor, final int[/*1*/] sampleCount) {
+                               final Vec4f rgbaColor, final int[/*1*/] sampleCount) {
         if( !renderer.isInitialized() ) {
             throw new GLException("TextRendererImpl01: not initialized!");
         }
@@ -193,7 +194,7 @@ public class TextRegionUtil {
      */
     public static AABBox drawString3D(final GL2ES2 gl, final int renderModes,
                                       final RegionRenderer renderer, final Font font, final CharSequence str,
-                                      final float[] rgbaColor, final int[/*1*/] sampleCount) {
+                                      final Vec4f rgbaColor, final int[/*1*/] sampleCount) {
         return drawString3D(gl, renderModes, renderer, font, str, rgbaColor, sampleCount, new AffineTransform(), new AffineTransform());
     }
 
@@ -228,7 +229,7 @@ public class TextRegionUtil {
      */
     public static AABBox drawString3D(final GL2ES2 gl, final int renderModes,
                                       final RegionRenderer renderer, final Font font, final CharSequence str,
-                                      final float[] rgbaColor, final int[/*1*/] sampleCount, final AffineTransform tmp1, final AffineTransform tmp2) {
+                                      final Vec4f rgbaColor, final int[/*1*/] sampleCount, final AffineTransform tmp1, final AffineTransform tmp2) {
         if(!renderer.isInitialized()){
             throw new GLException("TextRendererImpl01: not initialized!");
         }
@@ -246,7 +247,7 @@ public class TextRegionUtil {
      * </p>
      */
     public static AABBox drawString3D(final GL2ES2 gl, final GLRegion region, final RegionRenderer renderer,
-                                      final Font font, final CharSequence str, final float[] rgbaColor, final int[/*1*/] sampleCount) {
+                                      final Font font, final CharSequence str, final Vec4f rgbaColor, final int[/*1*/] sampleCount) {
         return drawString3D(gl, region, renderer, font, str, rgbaColor, sampleCount, new AffineTransform(), new AffineTransform());
     }
 
@@ -278,7 +279,7 @@ public class TextRegionUtil {
      * @throws Exception if TextRenderer not initialized
      */
     public static AABBox drawString3D(final GL2ES2 gl, final GLRegion region, final RegionRenderer renderer,
-                                      final Font font, final CharSequence str, final float[] rgbaColor,
+                                      final Font font, final CharSequence str, final Vec4f rgbaColor,
                                       final int[/*1*/] sampleCount, final AffineTransform tmp1, final AffineTransform tmp2) {
         if(!renderer.isInitialized()){
             throw new GLException("TextRendererImpl01: not initialized!");
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index bd25aeccc..a0999baa1 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2010 JogAmp Community. All rights reserved.
+ * Copyright 2010-2023 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -268,7 +268,7 @@ public class Outline implements Comparable<Outline> {
         if( !isEmpty() ) {
             final Vertex first = vertices.get(0);
             final Vertex last = getLastVertex();
-            if( !VectorUtil.isVec3Equal( first.getCoord(), 0, last.getCoord(), 0, FloatUtil.EPSILON ) ) {
+            if( !first.getCoord().isEqual( last.getCoord() ) ) {
                 if( closeTail ) {
                     vertices.add(first.clone());
                 } else {
@@ -283,12 +283,12 @@ public class Outline implements Comparable<Outline> {
     /**
      * Return a transformed instance with all vertices are copied and transformed.
      */
-    public final Outline transform(final AffineTransform t, final Vertex.Factory<? extends Vertex> vertexFactory) {
+    public final Outline transform(final AffineTransform t) {
         final Outline newOutline = new Outline();
         final int vsize = vertices.size();
         for(int i=0; i<vsize; i++) {
             final Vertex v = vertices.get(i);
-            newOutline.addVertex(t.transform(v, vertexFactory.create()));
+            newOutline.addVertex(t.transform(v, new Vertex()));
         }
         newOutline.closed = this.closed;
         return newOutline;
diff --git a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java b/src/jogl/classes/com/jogamp/graph/geom/SVertex.java
deleted file mode 100644
index dc6982025..000000000
--- a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright 2010 JogAmp Community. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- *    1. Redistributions of source code must retain the above copyright notice, this list of
- *       conditions and the following disclaimer.
- *
- *    2. Redistributions in binary form must reproduce the above copyright notice, this list
- *       of conditions and the following disclaimer in the documentation and/or other materials
- *       provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those of the
- * authors and should not be interpreted as representing official policies, either expressed
- * or implied, of JogAmp Community.
- */
-package com.jogamp.graph.geom;
-
-import com.jogamp.opengl.math.FloatUtil;
-import com.jogamp.opengl.math.VectorUtil;
-
-/** A Simple Vertex Implementation. Where the coordinates, and other attributes are
- * float based, and the coordinates and texture coordinates are saved in two float arrays.
- *
- */
-public class SVertex implements Vertex {
-    private int id;
-    protected boolean onCurve;
-    protected final float[] coord = new float[3];
-    private final float[] texCoord = new float[3];
-
-    static final Factory factory = new Factory();
-
-    public static Factory factory() { return factory; }
-
-    public static class Factory implements Vertex.Factory<SVertex> {
-        @Override
-        public SVertex create() {
-            return new SVertex();
-        }
-
-        public SVertex create(final Vertex src) {
-            return new SVertex(src);
-        }
-
-        @Override
-        public SVertex create(final int id, final boolean onCurve, final float[] texCoordsBuffer) {
-            return new SVertex(id, onCurve, texCoordsBuffer);
-        }
-
-        @Override
-        public SVertex create(final float x, final float y, final float z, final boolean onCurve) {
-            return new SVertex(x, y, z, onCurve);
-        }
-
-        @Override
-        public SVertex create(final float[] coordsBuffer, final int offset, final int length, final boolean onCurve) {
-            return new SVertex(coordsBuffer, offset, length, onCurve);
-        }
-    }
-
-    public SVertex() {
-        this.id = Integer.MAX_VALUE;
-    }
-
-    public SVertex(final Vertex src) {
-        this.id = Integer.MAX_VALUE;
-        System.arraycopy(src.getCoord(), 0, coord, 0, 3);
-        System.arraycopy(src.getTexCoord(), 0, texCoord, 0, 3);
-        setOnCurve(src.isOnCurve());
-    }
-
-    public SVertex(final int id, final boolean onCurve, final float[] texCoordsBuffer) {
-        this.id = id;
-        this.onCurve = onCurve;
-        System.arraycopy(texCoordsBuffer, 0, texCoord, 0, 3);
-    }
-
-    public SVertex(final float x, final float y, final float z, final boolean onCurve) {
-        this.id = Integer.MAX_VALUE;
-        setCoord(x, y, z);
-        setOnCurve(onCurve);
-    }
-
-    public SVertex(final float[] coordsBuffer, final int offset, final int length, final boolean onCurve) {
-        this.id = Integer.MAX_VALUE;
-        setCoord(coordsBuffer, offset, length);
-        setOnCurve(onCurve);
-    }
-
-    @Override
-    public final void setCoord(final float x, final float y, final float z) {
-        coord[0] = x;
-        coord[1] = y;
-        coord[2] = z;
-    }
-
-    @Override
-    public final void setCoord(final float[] coordsBuffer, final int offset, final int length) {
-        System.arraycopy(coordsBuffer, offset, coord, 0, length);
-    }
-
-    @Override
-    public int getCoordCount() {
-        return 3;
-    }
-
-    @Override
-    public final float[] getCoord() {
-        return coord;
-    }
-
-    @Override
-    public final void setX(final float x) {
-        this.coord[0] = x;
-    }
-
-    @Override
-    public final void setY(final float y) {
-        this.coord[1] = y;
-    }
-
-    @Override
-    public final void setZ(final float z) {
-        this.coord[2] = z;
-    }
-
-    @Override
-    public final float getX() {
-        return this.coord[0];
-    }
-
-    @Override
-    public final float getY() {
-        return this.coord[1];
-    }
-
-    @Override
-    public final float getZ() {
-        return this.coord[2];
-    }
-
-    @Override
-    public final boolean isOnCurve() {
-        return onCurve;
-    }
-
-    @Override
-    public final void setOnCurve(final boolean onCurve) {
-        this.onCurve = onCurve;
-    }
-
-    @Override
-    public final int getId(){
-        return id;
-    }
-
-    @Override
-    public final void setId(final int id){
-        this.id = id;
-    }
-
-    @Override
-    public boolean equals(final Object obj) {
-        if( obj == this) {
-            return true;
-        }
-        if( null == obj || !(obj instanceof Vertex) ) {
-            return false;
-        }
-        final Vertex v = (Vertex) obj;
-        return this == v ||
-               isOnCurve() == v.isOnCurve() &&
-               VectorUtil.isVec3Equal(getTexCoord(), 0, v.getTexCoord(), 0, FloatUtil.EPSILON) &&
-               VectorUtil.isVec3Equal(getCoord(), 0, v.getCoord(), 0, FloatUtil.EPSILON) ;
-    }
-    @Override
-    public final int hashCode() {
-        throw new InternalError("hashCode not designed");
-    }
-
-    @Override
-    public final float[] getTexCoord() {
-        return texCoord;
-    }
-
-    @Override
-    public final void setTexCoord(final float s, final float t, final float p) {
-        texCoord[0] = s;
-        texCoord[1] = t;
-        texCoord[2] = p;
-    }
-
-    @Override
-    public final void setTexCoord(final float[] texCoordsBuffer, final int offset, final int length) {
-        System.arraycopy(texCoordsBuffer, offset, texCoord, 0, length);
-    }
-
-    /**
-     * @return deep clone of this Vertex elements
-     */
-    @Override
-    public SVertex clone(){
-        return new SVertex(this); // OK to not call super.clone(), using own copy-ctor
-    }
-
-    @Override
-    public String toString() {
-        return "[ID: " + id + ", onCurve: " + onCurve +
-               ": p " + coord[0] + ", " + coord[1] + ", " + coord[2] +
-               ", t " + texCoord[0] + ", " + texCoord[1] + ", " + texCoord[2] + "]";
-    }
-}
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
index 1c63c4005..6b07501a6 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Triangle.java
@@ -64,11 +64,11 @@ public class Triangle {
     /**
      * Returns a transformed a clone of this instance using the given AffineTransform.
      */
-    public Triangle transform(final AffineTransform t, final Vertex.Factory<? extends Vertex> vertexFactory) {
+    public Triangle transform(final AffineTransform t) {
         final Triangle tri = new Triangle(id, boundaryEdges, boundaryVertices);
-        tri.vertices[0] = t.transform(vertices[0], vertexFactory.create());
-        tri.vertices[1] = t.transform(vertices[1], vertexFactory.create());
-        tri.vertices[2] = t.transform(vertices[2], vertexFactory.create());
+        tri.vertices[0] = t.transform(vertices[0], new Vertex());
+        tri.vertices[1] = t.transform(vertices[1], new Vertex());
+        tri.vertices[2] = t.transform(vertices[2], new Vertex());
         return tri;
     }
 
@@ -83,9 +83,9 @@ public class Triangle {
      * Returns true if all vertices are lines, i.e. zero tex-coord, otherwise false.
      */
     public final boolean isLine() {
-        return VectorUtil.isVec2Zero(vertices[0].getTexCoord(), 0) &&
-               VectorUtil.isVec2Zero(vertices[1].getTexCoord(), 0) &&
-               VectorUtil.isVec2Zero(vertices[2].getTexCoord(), 0) ;
+        return VectorUtil.isVec2Zero(vertices[0].getTexCoord()) &&
+               VectorUtil.isVec2Zero(vertices[1].getTexCoord()) &&
+               VectorUtil.isVec2Zero(vertices[2].getTexCoord()) ;
     }
 
     public int getId() {
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
index e9c8dd193..e5fe76c28 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Vertex.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2011 JogAmp Community. All rights reserved.
+ * Copyright 2011-2023 JogAmp Community. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification, are
  * permitted provided that the following conditions are met:
@@ -27,64 +27,185 @@
  */
 package com.jogamp.graph.geom;
 
+import com.jogamp.opengl.math.Vec2f;
+import com.jogamp.opengl.math.Vec3f;
 import com.jogamp.opengl.math.Vert3fImmutable;
 
 /**
- * A Vertex with custom memory layout using custom factory.
+ * A Vertex exposing Vec3f vertex- and texture-coordinates.
  */
-public interface Vertex extends Vert3fImmutable, Cloneable {
+public final class Vertex implements Vert3fImmutable, Cloneable {
+    private int id;
+    private boolean onCurve;
+    private final Vec3f coord = new Vec3f();
+    private final Vec3f texCoord = new Vec3f();
+
+    public Vertex() {
+        this.id = Integer.MAX_VALUE;
+    }
 
-    public static interface Factory <T extends Vertex> {
-        T create();
+    public Vertex(final Vertex src) {
+        this.id = Integer.MAX_VALUE;
+        coord.set(src.getCoord());
+        texCoord.set(src.getTexCoord());
+        setOnCurve(src.isOnCurve());
+    }
 
-        T create(Vertex src);
+    public Vertex(final int id, final boolean onCurve, final Vec3f texCoord) {
+        this.id = id;
+        this.onCurve = onCurve;
+        this.texCoord.set(texCoord);
+    }
 
-        T create(int id, boolean onCurve, float[] texCoordsBuffer);
+    public Vertex(final int id, final boolean onCurve, final float texCoordX, final float texCoordY, final float texCoordZ) {
+        this.id = id;
+        this.onCurve = onCurve;
+        this.texCoord.set(texCoordX, texCoordY, texCoordZ);
+    }
 
-        T create(float x, float y, float z, boolean onCurve);
+    public Vertex(final Vec3f coord, final boolean onCurve) {
+        this.id = Integer.MAX_VALUE;
+        this.coord.set(coord);
+        setOnCurve(onCurve);
+    }
 
-        T create(float[] coordsBuffer, int offset, int length, boolean onCurve);
+    public Vertex(final Vec2f coord, final boolean onCurve) {
+        this.id = Integer.MAX_VALUE;
+        this.coord.set(coord, 0f);
+        setOnCurve(onCurve);
     }
 
-    void setCoord(float x, float y, float z);
+    public Vertex(final float x, final float y, final boolean onCurve) {
+        this(x, y, 0, onCurve);
+    }
 
-    /**
-     * @see System#arraycopy(Object, int, Object, int, int) for thrown IndexOutOfBoundsException
-     */
-    void setCoord(float[] coordsBuffer, int offset, int length);
+    public Vertex(final float[] coordsBuffer, final int offset, final int length, final boolean onCurve) {
+        this(coordsBuffer[offset+0], coordsBuffer[offset+1], 2 < length ? coordsBuffer[offset+2] : 0f, onCurve);
+    }
 
-    void setX(float x);
+    public Vertex(final float x, final float y, final float z, final boolean onCurve) {
+        this.id = Integer.MAX_VALUE;
+        coord.set(x, y, z);
+        setOnCurve(onCurve);
+    }
 
-    void setY(float y);
+    public final void setCoord(final Vec3f coord) {
+        this.coord.set(coord);
+    }
 
-    void setZ(float z);
+    public void setCoord(final Vec2f coord) {
+        this.coord.set(coord, 0f);
+    }
+
+    public final void setCoord(final float x, final float y, final float z) {
+        coord.set(x, y, z);
+    }
 
-    boolean isOnCurve();
+    public final void setCoord(final float x, final float y) {
+        coord.set(x, y, 0f);
+    }
 
-    void setOnCurve(boolean onCurve);
+    @Override
+    public int getCoordCount() {
+        return 3;
+    }
 
-    int getId();
+    @Override
+    public final Vec3f getCoord() {
+        return coord;
+    }
 
-    void setId(int id);
+    public final void setX(final float x) {
+        coord.setX(x);
+    }
 
-    float[] getTexCoord();
+    public final void setY(final float y) {
+        coord.setY(y);
+    }
 
-    void setTexCoord(float s, float t, float p);
+    public final void setZ(final float z) {
+        coord.setZ(z);
+    }
 
-    /**
-     * @see System#arraycopy(Object, int, Object, int, int) for thrown IndexOutOfBoundsException
-     */
-    void setTexCoord(float[] texCoordsBuffer, int offset, int length);
+    @Override
+    public final float x() {
+        return coord.x();
+    }
+
+    @Override
+    public final float y() {
+        return coord.y();
+    }
+
+    @Override
+    public final float z() {
+        return coord.z();
+    }
+
+    public final boolean isOnCurve() {
+        return onCurve;
+    }
+
+    public final void setOnCurve(final boolean onCurve) {
+        this.onCurve = onCurve;
+    }
+
+    public final int getId(){
+        return id;
+    }
+
+    public final void setId(final int id){
+        this.id = id;
+    }
 
     /**
      * @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.
      */
     @Override
-    boolean equals(Object obj);
+    public boolean equals(final Object obj) {
+        if( obj == this) {
+            return true;
+        }
+        if( null == obj || !(obj instanceof Vertex) ) {
+            return false;
+        }
+        final Vertex v = (Vertex) obj;
+        return this == v ||
+               isOnCurve() == v.isOnCurve() &&
+               getTexCoord().isEqual( v.getTexCoord() ) &&
+               getCoord().isEqual( v.getCoord() );
+    }
+
+    @Override
+    public final int hashCode() {
+        throw new InternalError("hashCode not designed");
+    }
+
+    public final Vec3f getTexCoord() {
+        return texCoord;
+    }
+
+    public final void setTexCoord(final Vec3f v) {
+        texCoord.set(v);
+    }
+
+    public final void setTexCoord(final float s, final float t, final float p) {
+        texCoord.set(s, t, p);
+    }
 
     /**
-     * @return deep clone of this Vertex
+     * @return deep clone of this Vertex elements
      */
-    Vertex clone();
+    @Override
+    public Vertex clone(){
+        return new Vertex(this); // OK to not call super.clone(), using own copy-ctor
+    }
+
+    @Override
+    public String toString() {
+        return "[ID: " + id + ", onCurve: " + onCurve +
+               ": p " + coord +
+               ", t " + texCoord + "]";
+    }
 }
diff --git a/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java b/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java
index 74036f97d..434746240 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/plane/AffineTransform.java
@@ -420,9 +420,9 @@ public class AffineTransform implements Cloneable {
      * @return dst for chaining
      */
     public final Vertex transform(final Vertex src, final Vertex dst) {
-        final float x = src.getX();
-        final float y = src.getY();
-        dst.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12, src.getZ());
+        final float x = src.x();
+        final float y = src.y();
+        dst.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12, src.z());
         return dst;
     }
 
@@ -433,9 +433,9 @@ public class AffineTransform implements Cloneable {
             if (dstPoint == null) {
                 throw new IllegalArgumentException("dst["+dstOff+"] is null");
             }
-            final float x = srcPoint.getX();
-            final float y = srcPoint.getY();
-            dstPoint.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12, srcPoint.getZ());
+            final float x = srcPoint.x();
+            final float y = srcPoint.y();
+            dstPoint.setCoord(x * m00 + y * m01 + m02, x * m10 + y * m11 + m12, srcPoint.z());
             dst[dstOff++] = dstPoint;
         }
     }
@@ -511,9 +511,9 @@ public class AffineTransform implements Cloneable {
      * @return return dst for chaining
      */
     public final Vertex deltaTransform(final Vertex src, final Vertex dst) {
-        final float x = src.getX();
-        final float y = src.getY();
-        dst.setCoord(x * m00 + y * m01, x * m10 + y * m11, src.getZ());
+        final float x = src.x();
+        final float y = src.y();
+        dst.setCoord(x * m00 + y * m01, x * m10 + y * m11, src.z());
         return dst;
     }
 
@@ -538,9 +538,9 @@ public class AffineTransform implements Cloneable {
         if (FloatUtil.abs(det) < ZERO) {
             throw new NoninvertibleTransformException(determinantIsZero);
         }
-        final float x = src.getX() - m02;
-        final float y = src.getY() - m12;
-        dst.setCoord((x * m11 - y * m01) / det, (y * m00 - x * m10) / det, src.getZ());
+        final float x = src.x() - m02;
+        final float y = src.y() - m12;
+        dst.setCoord((x * m11 - y * m01) / det, (y * m00 - x * m10) / det, src.z());
         return dst;
     }