X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=c563563a906c1e87c9706793570fdfac3c1292f5;hp=f95b33d58789138146bd3dcdf912510337f071f0;hb=366e1c99a39b4ac6e8a55828678ce0213e1badc2;hpb=5239d59bb876c25b263a24dbff11dc7a9082a431 diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java index f95b33d..c563563 100644 --- a/src/edu/berkeley/qfat/Mesh.java +++ b/src/edu/berkeley/qfat/Mesh.java @@ -120,15 +120,10 @@ public class Mesh implements Iterable { 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(); }