X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2Fgeom%2FPolygon.java;h=b69c3d743b731c467d534948d3af8da2697b0b05;hp=ff75939ff92abda6af5fa85150ec24f7ebf02e0e;hb=8084a784db5cd0f688d230ab9624ab6966265f39;hpb=5f15a6155bf7fbf2d62b3ab9fd992a54af10a95a

diff --git a/src/edu/berkeley/qfat/geom/Polygon.java b/src/edu/berkeley/qfat/geom/Polygon.java
index ff75939..b69c3d7 100644
--- a/src/edu/berkeley/qfat/geom/Polygon.java
+++ b/src/edu/berkeley/qfat/geom/Polygon.java
@@ -45,7 +45,7 @@ public final class Polygon {
 
                 for(int k=0; k<halfSpaces.length; k++) {
                     if (i==k || j==k) continue;
-                    if (!halfSpaces[k].contains(p)) { p = null; break; }
+                    if (!halfSpaces[k].contains(p, 0.0001f)) { p = null; break; }
                 }
                 if (p!=null) {
                     if (p1==null) p1 = p;
@@ -60,15 +60,15 @@ public final class Polygon {
         }
         Vec cen = new Vec(0,0,0);
         for(Segment s : segments)
-            cen = cen.plus(s.p1.minus(Point.ORIGIN)).plus(s.p2.minus(Point.ORIGIN));
-        Point centroid = Point.ORIGIN.plus(cen.times(1f/(2*segments.size())));
+            cen = cen.plus(s.p1.minus(Point.ZERO)).plus(s.p2.minus(Point.ZERO));
+        Point centroid = Point.ZERO.plus(cen.times(1f/(2*segments.size())));
         //centroid = new Point(round(centroid.x), round(centroid.y), round(centroid.z));
         if (segments.size() >= 3)
         for(Segment s : segments) {
-            System.out.println("newt! " + s.p1 + " " + centroid + " " + s.p2 + " " + plane.norm.times(-1));
-            mesh.newT(s.p1, centroid, s.p2, plane.norm.times(-1), 0);
+            //System.out.println("newt! " + s.p1 + " " + centroid + " " + s.p2 + " " + plane.norm().times(-1));
+            mesh.newT(s.p1, centroid, s.p2, plane.norm().times(-1), 0);
         }
-        System.out.println("done");
+        //System.out.println("done");
         return null;
     }