checkpoint

[anneal.git] / src / edu / berkeley / qfat / Main.java

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 9d5c4fc..f51c772 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -63,8 +63,6 @@ public class Main extends MeshViewer {
             Mesh.T t  = goal.newT(p0, p1, p2, n, 0);
         }
 
-        goal.ignorecollision = true;
-
         // rotate to align major axis -- this probably needs to be done by a human.
         goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
 
@@ -307,9 +305,12 @@ public class Main extends MeshViewer {
         //v = v.plus(v2.norm().times(1/(float)300));
         v = v2.norm().times(1/(float)300);
 
-        boolean good = p.move(v);
+        Matrix m = Matrix.translate(v);
 
-        p.reComputeErrorAround();
+        boolean good = p.move(m, false);
+        if (!good) { misses++; return; }
+
+        //p.reComputeErrorAround();
 
         double new_tile_error = tile.error();
         double new_goal_error = goal.error();
@@ -326,7 +327,7 @@ public class Main extends MeshViewer {
             //System.out.println("error: " + tile_error + " / " + goal_error);
             hits++;
         } else {
-            p.move(v.times(-1));
+            p.move(Matrix.translate(v.times(-1)), true);
             misses++;
         }
     }