Fix: vertex in loop test; using crossing method

Changed algo for in/out test of vertex wrt arbitrary polygon
to crossing test since angle based is shown prune to precision errors

3 files changed, 25 insertions, 79 deletions

diff --git a/src/jogl/classes/com/jogamp/graph/curve/tess/CDTriangulator2D.java b/src/jogl/classes/com/jogamp/graph/curve/tess/CDTriangulator2D.java
index 4c1ea3fe6..9de295616 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/tess/CDTriangulator2D.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/tess/CDTriangulator2D.java
@@ -88,17 +88,13 @@ public class CDTriangulator2D {
         }
         
         if(loop == null) {
-            // Claim:  CCW (out)
             GraphOutline outline = new GraphOutline(polyline);
-            // FIXME: #2/#3 extract..(CCW) and new Loop(CCW).. does CW/CCW tests
             GraphOutline innerPoly = extractBoundaryTriangles(outline, false);
             vertices.addAll(polyline.getVertices());
             loop = new Loop(innerPoly, VectorUtil.Winding.CCW);
             loops.add(loop);
         } else {
-            // Claim: CW (in)
             GraphOutline outline = new GraphOutline(polyline);
-            // FIXME: #3/#4 extract..(CW) and addContraint..(CW) does CW/CCW tests
             GraphOutline innerPoly = extractBoundaryTriangles(outline, true);
             vertices.addAll(innerPoly.getVertices());
             loop.addConstraintCurve(innerPoly);
@@ -200,14 +196,17 @@ public class CDTriangulator2D {
         return innerOutline;
     }
     
-    private Loop getContainerLoop(Outline polyline){
+    private Loop getContainerLoop(Outline polyline) {
         ArrayList<Vertex> vertices = polyline.getVertices();
-        // FIXME: remove implicit iterator
-        for(Vertex vert: vertices){
-            for (Loop loop:loops){
-                if(loop.checkInside(vert)){
-                    return loop;
-                }
+        for(int i=0; i < loops.size(); i++) {
+            Loop loop = loops.get(i);
+            boolean inside = false;
+            for(int j=0; j < vertices.size(); j++) {
+                Vertex v = vertices.get(j);
+                inside |= loop.checkInside(v);
+            }
+            if(inside) {
+                return loop;
             }
         }
         return null;
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/GraphOutline.java b/src/jogl/classes/jogamp/graph/curve/tess/GraphOutline.java
index d1245f4b8..6a2f47c79 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/GraphOutline.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/GraphOutline.java
@@ -56,11 +56,6 @@ public class GraphOutline {
         return outline;
     }
 
-    /*public void setOutline(Outline<T> outline) {
-        this.outline = outline;
-    }*/
-    
-
     public ArrayList<GraphVertex> getGraphPoint() {
         return controlpoints;
     }
@@ -69,10 +64,6 @@ public class GraphOutline {
         return outline.getVertices();
     }
 
-    /*public void setControlpoints(ArrayList<GraphPoint<T>> controlpoints) {
-        this.controlpoints = controlpoints;
-    }*/
-
     public void addVertex(GraphVertex v) {
         controlpoints.add(v);
         outline.addVertex(v.getPoint());
diff --git a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
index acccea503..a511ed26e 100644
--- a/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
+++ b/src/jogl/classes/jogamp/graph/curve/tess/Loop.java
@@ -102,7 +102,6 @@ public class Loop {
         if(vertices.size()<3) {
             throw new IllegalArgumentException("outline's vertices < 3: " + vertices.size());
         }
-        //final VectorUtil.Winding hasWinding = VectorUtil.getWinding(outline.getVertices());
         final VectorUtil.Winding hasWinding = VectorUtil.getWinding(
                                  vertices.get(0).getPoint(), 
                                  vertices.get(1).getPoint(),
@@ -298,74 +297,31 @@ public class Loop {
         return boundary;
     }
 
-
-    /** Check if vertex inside the Loop
-     * @param vertex the Vertex
-     * @return true if the vertex is inside, false otherwise
-     */
-    public boolean checkInside(Vertex vertex) {
-        if(!box.contains(vertex.getX(), vertex.getY(), vertex.getZ())){
+    public boolean checkInside(Vertex v) {
+        if(!box.contains(v.getX(), v.getY(), v.getZ())){
             return false;
         }
 
-        float[] center = box.getCenter();
-
-        int hits = 0;
+        boolean inside = false;
         HEdge current = root;
         HEdge next = root.getNext();
-        while(next!= root){
-            if(current.getType() == HEdge.INNER || next.getType() == HEdge.INNER){
-                current = next;
-                next = current.getNext();
-                continue;
-            }
-            Vertex vert1 = current.getGraphPoint().getPoint();
-            Vertex vert2 = next.getGraphPoint().getPoint();
-
-            /** The ray is P0+s*D0, where P0 is the ray origin, D0 is a direction vector and s >= 0. 
-             * The segment is P1+t*D1, where P1 and P1+D1 are the endpoints, and 0 <= t <= 1. 
-             * perp(x,y) = (y,-x).
-             * if Dot(perp(D1),D0) is not zero,
-             * s = Dot(perp(D1),P1-P0)/Dot(perp(D1),D0)
-             * t = Dot(perp(D0),P1-P0)/Dot(perp(D1),D0)
-             */
-
-            float[] d0 = new float[]{center[0] - vertex.getX(), center[1]-vertex.getY(),
-                    center[2]-vertex.getZ()};
-            float[] d1 = {vert2.getX() - vert1.getX(), vert2.getY() - vert1.getY(),
-                    vert2.getZ() - vert1.getZ()};
-
-            float[] prep_d1 = {d1[1],-1*d1[0], d1[2]};
-            float[] prep_d0 = {d0[1],-1*d0[0], d0[2]};
-
-            float[] p0p1 = new float[]{vert1.getX() - vertex.getX(), vert1.getY() - vertex.getY(),
-                    vert1.getZ() - vertex.getZ()};
-
-            float dotD1D0 = VectorUtil.dot(prep_d1, d0);
-            if(dotD1D0 == 0){ 
-                /** ray parallel to segment */
-                current = next;
-                next = current.getNext();
-                continue;
-            }
-
-            float s = VectorUtil.dot(prep_d1,p0p1)/dotD1D0;
-            float t = VectorUtil.dot(prep_d0,p0p1)/dotD1D0;
+        do {
+            Vertex v2 = current.getGraphPoint().getPoint();
+            Vertex v1 = next.getGraphPoint().getPoint();
 
-            if(s >= 0 && t >= 0 && t<= 1){
-                hits++;
+            if ( ((v1.getY() > v.getY()) != (v2.getY() > v.getY())) &&
+                  (v.getX() < (v2.getX() - v1.getX()) * (v.getY() - v1.getY()) / (v2.getY() - v1.getY()) + v1.getX()) ){
+                inside = !inside;
             }
+            
             current = next;
             next = current.getNext();
-        }
-
-        if(hits % 2 != 0){ 
-            /** check if hit count is even */
-            return true;
-        }
-        return false;
+            
+        } while(current != root);
+        
+        return inside;
     }
-
+    
     public int computeLoopSize(){
         int size = 0;
         HEdge e = root;