checkpoint

darcs-hash:20071216020046-5007d-f908af10d950794f814f42b5f241b0c3ece27424.gz

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 32d1aea..e4b5bf4 100644 (file)
--- 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();
 
     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 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; }
 
 
     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 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
 
     public void rebindPoints() {
         // unbind all points

@@ -105,6 +105,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 
 
     // Vertexices //////////////////////////////////////////////////////////////////////////////
 

+    /** a vertex in the mesh */

     public final class Vertex extends HasPoint {
         public String toString() { return p.toString(); }
         public Point p;
     public final class Vertex extends HasPoint {
         public String toString() { return p.toString(); }
         public Point p;

@@ -144,7 +145,7 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public void recomputeFundamentalQuadric() {
         }
 
         public void recomputeFundamentalQuadric() {

-            //if (!quadricStale && fundamentalQuadric != null) return;
+            if (!quadricStale && fundamentalQuadric != null) return;

             quadricStale = false;
             unApplyQuadricToNeighbor();
             Matrix m = Matrix.ZERO;
             quadricStale = false;
             unApplyQuadricToNeighbor();
             Matrix m = Matrix.ZERO;

@@ -315,7 +316,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
             if (!ignorecollision && good) {
 
 
             if (!ignorecollision && good) {
 

-                tris.range(new Segment(oldp, this.p),
+                triangles.range(new Segment(oldp, this.p),

                             new Visitor<T>() {
                                 public void visit(T t) {
                                     if (!good) return;
                             new Visitor<T>() {
                                 public void visit(T t) {
                                     if (!good) return;

@@ -711,10 +712,10 @@ public class Mesh implements Iterable<Mesh.T> {
         public final int color;
         public final int colorclass;
 
         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;
 
         T(E e1, int colorclass) {
             this.e1 = e1;

@@ -739,7 +740,7 @@ public class Mesh implements Iterable<Mesh.T> {
             }
             this.color = color;
             this.colorclass = colorclass;
             }
             this.color = color;
             this.colorclass = colorclass;

-            tris.add(this);
+            triangles.add(this);

         }
         public E e1() { return e1; }
         public E e2() { return e1.next; }
         }
         public E e1() { return e1; }
         public E e2() { return e1.next; }