checkpoint

darcs-hash:20071216032229-5007d-a59bcbd5ea4cc230dcf8e8323eda051cd3ae710f.gz

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index f95b33d..c563563 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -120,15 +120,10 @@ public class Mesh implements Iterable<Mesh.T> {
 
             nearest_in_other_mesh = new_nearest;
                 
 
             nearest_in_other_mesh = new_nearest;
                 

-            // don't attract to vertices that face the other way
-            if (((Vertex)nearest_in_other_mesh).e == null || ((Vertex)nearest_in_other_mesh).norm().dot(norm()) < 0) {
-                nearest_in_other_mesh = null;
-            } else {
-                nearest_in_other_mesh.unComputeError();
-                nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
-                nearest_in_other_mesh.quadric_count++;
-                nearest_in_other_mesh.computeError();
-            }
+            nearest_in_other_mesh.unComputeError();
+            nearest_in_other_mesh.quadric = nearest_in_other_mesh.quadric.plus(fundamentalQuadric());
+            nearest_in_other_mesh.quadric_count++;
+            nearest_in_other_mesh.computeError();

 
             reComputeError();
         }
 
             reComputeError();
         }