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 6c663d0..b774066 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -209,11 +209,6 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
             }
         }
 
-        for(Mesh.Vert vert : goal.vertices()) {
-            System.out.println("error: " + vert.quadric().preAndPostMultiply(vert.p));
-        }
-
-
         //xMesh.Vert mid = lbf.getE(mbn).shatter();
 
         // rescale to match volume
@@ -269,7 +264,8 @@ public class Main implements GLEventListener, MouseListener, MouseMotionListener
         r1 = r1 - (float)Math.floor(r1);
         r1 = r1 * (float)0.01;
         r1 = r1 - (float)0.005;
-        Vec v = p.watchback().minus(p.p).norm().times(r1);
+
+        Vec v = p.nearest_vert_in_other_mesh().minus(p.p).norm().times(r1);
 
         //v = p.norm().times(v.dot(p.norm()));