checkpoint

[anneal.git] / src / edu / berkeley / qfat / geom / Polygon.java

diff --git a/src/edu/berkeley/qfat/geom/Polygon.java b/src/edu/berkeley/qfat/geom/Polygon.java
index ff75939..2afa144 100644 (file)
--- 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;
 
                 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;
                 }
                 if (p!=null) {
                     if (p1==null) p1 = p;

@@ -60,8 +60,8 @@ public final class Polygon {
         }
         Vec cen = new Vec(0,0,0);
         for(Segment s : segments)
         }
         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) {
         //centroid = new Point(round(centroid.x), round(centroid.y), round(centroid.z));
         if (segments.size() >= 3)
         for(Segment s : segments) {