X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=ff9819d580e93260d074b5d3ac488f4ab24dae15;hp=32d1aea55fa624c94d0f7571aeaa581ae0c8780b;hb=fa493c7d6f06f51cd29354d02c69b7456609dd92;hpb=49c6b2494c189dc37d2a48e2182aebdfc084056e

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 32d1aea..ff9819d 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -14,13 +14,13 @@ public class Mesh implements Iterable<Mesh.T> {
     public static final float EPSILON = (float)0.0001;
     public static final Random random = new Random();
 
-    private RTree<T> tris = new RTree<T>();
-    private PointSet<Vertex> vertices = new PointSet<Vertex>();
+    private RTree<T>         triangles = new RTree<T>();
+    private PointSet<Vertex> vertices  = new PointSet<Vertex>();
 
     public boolean immutableVertices;
     public boolean ignorecollision = false;
-    public Mesh score_against = null;
-    public double score = 0;
+    public Mesh    score_against = null;
+    public double  score = 0;
 
     public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; }
 
@@ -29,7 +29,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public int size() { return vertices.size(); }
     public Iterable<Vertex> vertices() { return vertices; }
-    public Iterator<T> iterator() { return tris.iterator(); }
+    public Iterator<T> iterator() { return triangles.iterator(); }
 
     public void rebindPoints() {
         // unbind all points
@@ -105,7 +105,8 @@ public class Mesh implements Iterable<Mesh.T> {
 
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 
-    public final class Vertex extends HasPoint {
+    /** a vertex in the mesh */
+    public final class Vertex extends HasPoint implements Visitor<T> {
         public String toString() { return p.toString(); }
         public Point p;
         E e;                // some edge *leaving* this point
@@ -144,7 +145,7 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public void recomputeFundamentalQuadric() {
-            //if (!quadricStale && fundamentalQuadric != null) return;
+            if (!quadricStale && fundamentalQuadric != null) return;
             quadricStale = false;
             unApplyQuadricToNeighbor();
             Matrix m = Matrix.ZERO;
@@ -312,47 +313,27 @@ public class Mesh implements Iterable<Mesh.T> {
                 e = e.pair.next;
             } while(e != this.e);
 
+            if (!ignorecollision && good) triangles.range(new Segment(oldp, this.p), this);
 
-            if (!ignorecollision && good) {
-
-                tris.range(new Segment(oldp, this.p),
-                            new Visitor<T>() {
-                                public void visit(T t) {
-                                    if (!good) return;
-                                    E e = Vertex.this.e;
-                                    do {
-                                        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; }
-                                        }
-                                        e = e.pair.next;
-                                    } while(e != Vertex.this.e);
-                                }
-                            });
-
-                /*
-                for(T t : Mesh.this) {
-                    if (!good) break;
-                    e = this.e;
-                    do {
-                        if (!t.has(e.p1) && !t.has(e.p2) && e.intersects(t)) { good = false; break; }
-                        if (e.t != null) {
-                            if (!e.t.has(t.e1().p1) && !e.t.has(t.e1().p2) && t.e1().intersects(e.t)) { good = false; break; }
-                            if (!e.t.has(t.e2().p1) && !e.t.has(t.e2().p2) && t.e2().intersects(e.t)) { good = false; break; }
-                            if (!e.t.has(t.e3().p1) && !e.t.has(t.e3().p2) && t.e3().intersects(e.t)) { good = false; break; }
-                        }
-                        e = e.pair.next;
-                    } while(e != this.e);
-                }
-                */
-            }
 
 
             reComputeErrorAround();
             return good;
         }
+
+    public void visit(T t) {
+        if (!good) return;
+        E e = Vertex.this.e;
+        do {
+            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; }
+            }
+            e = e.pair.next;
+        } while(e != Vertex.this.e);
+    }
         private boolean good;
 
         public boolean move(Vec v) {
@@ -711,10 +692,10 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
         public final int colorclass;
 
-        public void removeFromRTree() { tris.remove(this); }
-        public void addToRTree() { tris.insert(this); }
+        public void removeFromRTree() { triangles.remove(this); }
+        public void addToRTree() { triangles.insert(this); }
 
-        public void destroy() { tris.remove(this); }
+        public void destroy() { triangles.remove(this); }
 
         T(E e1, int colorclass) {
             this.e1 = e1;
@@ -739,7 +720,7 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             this.color = color;
             this.colorclass = colorclass;
-            tris.add(this);
+            triangles.add(this);
         }
         public E e1() { return e1; }
         public E e2() { return e1.next; }