FloatUtil/VectorUtil: Enhance isEqual/compare w/ and w/o epsilon, add unit tests - Cleanup VectorUtil (vec2/3 naming, remove dedundant functions)

3 files changed, 10 insertions, 10 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
index 160e171e4..bac67eb5f 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
@@ -436,9 +436,9 @@ public class OutlineShape implements Comparable<OutlineShape> {
     }
 
     private void subdivideTriangle(final Outline outline, Vertex a, Vertex b, Vertex c, int index){
-        VectorUtil.mid(tmpV1, a.getCoord(), b.getCoord());
-        VectorUtil.mid(tmpV3, b.getCoord(), c.getCoord());
-        VectorUtil.mid(tmpV2, tmpV1, tmpV3);
+        VectorUtil.midVec3(tmpV1, a.getCoord(), b.getCoord());
+        VectorUtil.midVec3(tmpV3, b.getCoord(), c.getCoord());
+        VectorUtil.midVec3(tmpV2, tmpV1, tmpV3);
 
         //drop off-curve vertex to image on the curve
         b.setCoord(tmpV2, 0, 3);
@@ -517,7 +517,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
                     continue;
                 }
 
-                if( VectorUtil.vertexInTriangle3(a.getCoord(), b.getCoord(), c.getCoord(),
+                if( VectorUtil.isVec3InTriangle3(a.getCoord(), b.getCoord(), c.getCoord(),
                                                  current.getCoord(), nextV.getCoord(), prevV.getCoord(),
                                                  tmpV1, tmpV2, tmpV3) ) {
                     return current;
@@ -542,7 +542,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
                 final Vertex currentVertex = outline.getVertex(i);
                 final Vertex nextVertex = outline.getVertex((i+1)%vertexCount);
                 if ( !currentVertex.isOnCurve() && !nextVertex.isOnCurve() ) {
-                    VectorUtil.mid(tmpV1, currentVertex.getCoord(), nextVertex.getCoord());
+                    VectorUtil.midVec3(tmpV1, currentVertex.getCoord(), nextVertex.getCoord());
                     final Vertex v = vertexFactory.create(tmpV1, 0, 3, true);
                     i++;
                     vertexCount++;
@@ -557,8 +557,7 @@ public class OutlineShape implements Comparable<OutlineShape> {
             }
 
             if( vertexCount > 0 ) {
-                if(VectorUtil.checkEquality(outline.getVertex(0).getCoord(),
-                        outline.getLastVertex().getCoord())) {
+                if(VectorUtil.isVec3Equal( outline.getVertex(0).getCoord(), 0, outline.getLastVertex().getCoord(), 0, FloatUtil.EPSILON )) {
                     outline.removeVertex(vertexCount-1);
                 }
             }
diff --git a/src/jogl/classes/com/jogamp/graph/geom/Outline.java b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
index 9d4d1f26d..80aea2af4 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/Outline.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/Outline.java
@@ -172,7 +172,7 @@ public class Outline implements Cloneable, Comparable<Outline> {
         if( !isEmpty() ) {
             final Vertex first = vertices.get(0);
             final Vertex last = getLastVertex();
-            if( !VectorUtil.checkEquality( first.getCoord(), last.getCoord() ) ) {
+            if( !VectorUtil.isVec3Equal( first.getCoord(), 0, last.getCoord(), 0, FloatUtil.EPSILON ) ) {
                 if( closeTail ) {
                     vertices.add(first.clone());
                 } else {
diff --git a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java b/src/jogl/classes/com/jogamp/graph/geom/SVertex.java
index 99f10a694..beac908d4 100644
--- a/src/jogl/classes/com/jogamp/graph/geom/SVertex.java
+++ b/src/jogl/classes/com/jogamp/graph/geom/SVertex.java
@@ -27,6 +27,7 @@
  */
 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
@@ -188,8 +189,8 @@ public class SVertex implements Vertex {
         final Vertex v = (Vertex) obj;
         return this == v ||
                isOnCurve() == v.isOnCurve() &&
-               VectorUtil.checkEqualityVec2(getTexCoord(), v.getTexCoord()) &&
-               VectorUtil.checkEquality(getCoord(), v.getCoord()) ;
+               VectorUtil.isVec2Equal(getTexCoord(), 0, v.getTexCoord(), 0, FloatUtil.EPSILON) &&
+               VectorUtil.isVec3Equal(getCoord(), 0, v.getCoord(), 0, FloatUtil.EPSILON) ;
     }
 
     @Override