X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=bbb419ab8777f12a0e10ee56330b45b2b0aaf0e7;hp=23679996f40ac502f06c7af42e1b232589879e41;hb=eee2dd75dbd926b92f63d4c4adb968a58323717e;hpb=4cfb993775d0547ba2e864bbfac16bea59711ff6

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 2367999..bbb419a 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -18,9 +18,9 @@ public class Mesh implements Iterable<Mesh.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 boolean ignorecollision    = false;
+    public Mesh    score_against      = null;
+    public double  score              = 0;
 
     public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; }
 
@@ -46,38 +46,6 @@ public class Mesh implements Iterable<Mesh.T> {
         }
     }
 
-    public void unApplyQuadricToNeighborAll() {
-        HashSet<Vertex> done = new HashSet<Vertex>();
-        for(T t : this)
-            for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) {
-                if (done.contains(p)) continue;
-                done.add(p);
-                p.unApplyQuadricToNeighbor();
-            }
-    }
-    public void recomputeAllFundamentalQuadrics() {
-        HashSet<Vertex> done = new HashSet<Vertex>();
-        for(T t : this)
-            for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) {
-                if (done.contains(p)) continue;
-                done.add(p);
-                p.recomputeFundamentalQuadric();
-            }
-    }
-    public float applyQuadricToNeighborAll() {
-        int num = 0;
-        double dist = 0;
-        HashSet<Vertex> done = new HashSet<Vertex>();
-        for(T t : this)
-            for(Vertex p : new Vertex[] { t.v1(), t.v2(), t.v3() }) {
-                if (done.contains(p)) continue;
-                done.add(p);
-                p.applyQuadricToNeighbor();
-                
-            }
-        return (float)(dist/num);
-    }
-
     public void transform(Matrix m) {
         ArrayList<Vertex> set = new ArrayList<Vertex>();
         for(Vertex v : vertices) set.add(v);
@@ -144,18 +112,27 @@ public class Mesh implements Iterable<Mesh.T> {
             gl.glNormal3f(norm.x, norm.y, norm.z);
         }
 
+        public void recomputeFundamentalQuadricIfNeighborChanged() {
+            Vertex oldv = nearest_in_other_mesh;
+            Vertex newv = score_against.nearest(p);
+            if (oldv==newv) return;
+            recomputeFundamentalQuadric();
+            if (oldv!=null) oldv.recomputeFundamentalQuadricIfNeighborChanged();
+            //if (newv!=null) newv.recomputeFundamentalQuadricIfNeighborChanged();
+        }
         public void recomputeFundamentalQuadric() {
-            if (!quadricStale && fundamentalQuadric != null) return;
-            quadricStale = false;
             unApplyQuadricToNeighbor();
-            Matrix m = Matrix.ZERO;
-            int count = 0;
-            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
-                T t = e.t;
-                m = m.plus(t.norm().fundamentalQuadric(t.centroid()));
-                count++;
+            if (quadricStale || fundamentalQuadric==null) {
+                Matrix m = Matrix.ZERO;
+                int count = 0;
+                for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
+                    T t = e.t;
+                    m = m.plus(t.norm().fundamentalQuadric(t.centroid()));
+                    count++;
+                }
+                quadricStale = false;
+                fundamentalQuadric = m.times(1/(float)count);
             }
-            fundamentalQuadric = m.times(1/(float)count);
             applyQuadricToNeighbor();
         }
 
@@ -298,8 +275,6 @@ public class Mesh implements Iterable<Mesh.T> {
         public E getFreeIncident() {
             E ret = getFreeIncident(e, e);
             if (ret != null) return ret;
-            //ret = getFreeIncident(e.pair.next, e.pair.next);
-            if (ret != null) return ret;
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 System.out.println(e + " " + e.t);
             throw new Error("unable to find free incident to " + this);
@@ -332,13 +307,12 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public boolean isBoundTo(Vertex p) {
-            Vertex px = p;
-            do {
-                if (px==this) return true;
-                px = px.bound_to;
-            } while(px != p);
+            for(Vertex px = p; px!=null; px=(px.bound_to==p?null:px.bound_to))
+                if (px==this)
+                    return true;
             return false;
         }
+
         public void unbind() { bound_to = this; binding = Matrix.ONE; }
         public void bind(Vertex p) { bind(p, Matrix.ONE); }
         public void bind(Vertex p, Matrix binding) {
@@ -407,20 +381,7 @@ public class Mesh implements Iterable<Mesh.T> {
         public boolean intersects(T t) { return t.intersects(p1.p, p2.p); }
         public float comparator() {
             Vertex nearest = score_against.nearest(midpoint());
-            //if (t==null) return length();
-            /*
-              double ang = Math.abs(crossAngle());
-              float minangle = (float)(Math.PI * 0.9);
-              if (ang > minangle)
-              return 300;
-            */
-            /*
-              if ((length() * length()) / t.area() > 10)
-              return (float)(length()*Math.sqrt(t.area()));
-              return length()*t.area();
-            */
             return (float)Math.max(length(), midpoint().distance(nearest.p));
-            //return length();
         }
         public int compareTo(E e) {
             return e.comparator() > comparator() ? 1 : -1;