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 6e376cc..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)));
 
@@ -288,8 +286,8 @@ public class Main extends MeshViewer {
 
     public synchronized void rand(float temp, Mesh.Vertex p) {
 
-        p.reComputeError();
-        //p.reComputeErrorAround();
+        //p.reComputeError();
+        p.reComputeErrorAround();
         double tile_error = tile.error();
         double goal_error = goal.error();