X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=f95b33d58789138146bd3dcdf912510337f071f0;hp=3a4cba55b21e6cdb313e1029b5190cf41c8ef7ef;hb=5239d59bb876c25b263a24dbff11dc7a9082a431;hpb=621152904863f1ade5eed7757bfe05e91f848749

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 3a4cba5..f95b33d 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -8,6 +8,7 @@ import javax.media.opengl.glu.*;
 import edu.berkeley.qfat.geom.*;
 import edu.wlu.cs.levy.CG.KDTree;
 import edu.berkeley.qfat.geom.Point;
+import com.infomatiq.jsi.IntProcedure;
 
 public class Mesh implements Iterable<Mesh.T> {
 
@@ -74,7 +75,7 @@ public class Mesh implements Iterable<Mesh.T> {
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 
     /** a vertex in the mesh */
-    public final class Vertex extends HasQuadric implements Visitor<T> {
+    public final class Vertex extends HasQuadric implements Visitor {
         public String toString() { return p.toString(); }
         public Point p;
         E e;                // some edge *leaving* this point
@@ -111,7 +112,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public void applyQuadricToNeighbor() {
             if (score_against == null) return;
 
-            Vertex new_nearest = score_against.nearest(p);
+            Vertex new_nearest = (Vertex)nearest();
             if (nearest_in_other_mesh != null && new_nearest == nearest_in_other_mesh) return;
 
             if (nearest_in_other_mesh != null) unApplyQuadricToNeighbor();
@@ -120,16 +121,13 @@ public class Mesh implements Iterable<Mesh.T> {
             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();
-
             }
 
             reComputeError();
@@ -149,7 +147,7 @@ public class Mesh implements Iterable<Mesh.T> {
             score -= oldscore;
             oldscore = 0;
         }
-        public HasQuadric nearest() { return score_against.nearest(p); }
+        public HasQuadric nearest() { return score_against.vertices.nearest(p, this); }
         public void computeError() {
             oldscore =
                 quadric_count != 0
@@ -159,7 +157,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 : nearest_in_other_mesh != null
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
                 : score_against != null
-                ? score_against.nearest(p).fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
+                ? nearest().fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
                 : 0;
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = Math.abs(e.crossAngle());
@@ -213,15 +211,24 @@ public class Mesh implements Iterable<Mesh.T> {
             return good;
         }
 
-        public void visit(T t) {
-            if (!good) return;
-            for(E e = Vertex.this.e; e!=null; e=e.pair.next==Vertex.this.e?null:e.pair.next) {
-                if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; }
-                if (e.t != null) {
-                    if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; }
-                    if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; }
-                    if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; }
+        public boolean visit(Object o) {
+            if (o instanceof T) {
+                T t = (T)o;
+                if (!good) return false;
+                for(E e = Vertex.this.e; e!=null; e=e.pair.next==Vertex.this.e?null:e.pair.next) {
+                    if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; }
+                    if (e.t != null) {
+                        if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; }
+                        if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; }
+                        if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; }
+                    }
                 }
+                return good;
+            } else {
+                Vertex v = (Vertex)o;
+                if (v.e==null || v.norm().dot(Vertex.this.norm()) < 0)
+                    return false;
+                return true;
             }
         }
         private boolean good;