From 101567f5f16d91a13c8067764d5e14eefb2b9936 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 15 Mar 2014 16:54:34 +0100
Subject: FloatUtil/VectorUtil: Enhance isEqual/compare w/ and w/o epsilon, add
 unit tests - Cleanup VectorUtil (vec2/3 naming, remove dedundant functions)

---
 src/jogl/classes/jogamp/graph/curve/tess/Loop.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/jogl/classes/jogamp/graph/curve')

diff --git a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
index 5810e3bc9..f96726e5b 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
@@ -192,20 +192,20 @@ public class Loop {
 
         float minDistance = Float.MAX_VALUE;
         boolean inValid = false;
-        ArrayList<GraphVertex> initVertices = initialOutline.getGraphPoint();
-        ArrayList<GraphVertex> vertices = polyline.getGraphPoint();
+        final ArrayList<GraphVertex> initVertices = initialOutline.getGraphPoint();
+        final ArrayList<GraphVertex> vertices = polyline.getGraphPoint();
 
         for(int i=0; i< initVertices.size()-1; i++){
-            GraphVertex v = initVertices.get(i);
-            GraphVertex nextV = initVertices.get(i+1);
+            final GraphVertex v = initVertices.get(i);
+            final GraphVertex nextV = initVertices.get(i+1);
             for(int pos=0; pos<vertices.size(); pos++) {
-                GraphVertex cand = vertices.get(pos);
-                float distance = VectorUtil.computeLength(v.getCoord(), cand.getCoord());
+                final GraphVertex cand = vertices.get(pos);
+                final float distance = VectorUtil.vec3Distance(v.getCoord(), cand.getCoord());
                 if(distance < minDistance){
                     for (GraphVertex vert:vertices){
                         if(vert == v || vert == nextV || vert == cand)
                             continue;
-                        inValid = VectorUtil.inCircle(v.getPoint(), nextV.getPoint(),
+                        inValid = VectorUtil.isInCircle(v.getPoint(), nextV.getPoint(),
                                 cand.getPoint(), vert.getPoint());
                         if(inValid){
                             break;
@@ -249,7 +249,7 @@ public class Loop {
                     e = e.getNext();
                     continue;
                 }
-                inValid = VectorUtil.inCircle(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(),
+                inValid = VectorUtil.isInCircle(root.getGraphPoint().getPoint(), next.getGraphPoint().getPoint(),
                                               cand, e.getGraphPoint().getPoint());
                 if(inValid){
                     break;
-- 
cgit v1.2.3