X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=51b9249829b5c4fdf23dfde13b3b13e5dba10d14;hp=3c80182164e42d1f481f1d456ad43107f438c112;hb=8190da98c29041324f9dcaa9bc86d0a8a3f77491;hpb=c7f3e926b90ddd42d194b110836df73928482fea

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 3c80182..51b9249 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);
@@ -118,8 +86,8 @@ public class Mesh implements Iterable<Mesh.T> {
         /** the total error quadric (contributions from all vertices in other mesh for which this is nearest) */
         Matrix quadric = Matrix.ZERO;
 
-        Vertex bound_to = this;
         Matrix binding = Matrix.ONE;
+        Vertex bound_to = this;
         float oldscore = 0;
         boolean quadricStale = false;
 
@@ -226,7 +194,6 @@ public class Mesh implements Iterable<Mesh.T> {
                 if (ang > minangle)
                     oldscore += (ang - minangle);
             }
-
             score += oldscore;
         }
 
@@ -299,24 +266,15 @@ 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) {
-                E ex = e;
-                do {
-                    System.out.println(ex + " " + ex.t);
-                    ex = ex.pair.next;
-                } while (ex != e);
-                throw new Error("unable to find free incident to " + this);
-            }
-            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);
         }
 
         public E getFreeIncident(E start, E before) {
-            E e = start;
-            do {
-                if (e.pair.p2 == this && e.pair.t == null && e.pair.next.t == null) return e.pair;
-                e = e.pair.next;
-            } while(e != before);
+            for(E e = start; e!=null; e=e.pair.next==before?null:e.pair.next)
+                if (e.pair.p2 == this && e.pair.t == null && e.pair.next.t == null)
+                    return e.pair;
             return null;
         }
 
@@ -326,33 +284,26 @@ public class Mesh implements Iterable<Mesh.T> {
             return getE(v);
         }
         public E getE(Vertex p2) {
-            E e = this.e;
-            do {
-                if (e==null) return null;
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
                 if (e.p1 == this && e.p2 == p2) return e;
-                e = e.pair.next;
-            } while (e!=this.e);
             return null;
         }
 
         public Vec norm() {
             Vec norm = new Vec(0, 0, 0);
-            E e = this.e;
-            do {
-                if (e.t != null) norm = norm.plus(e.t.norm().times((float)e.prev.angle()));
-                e = e.pair.next;
-            } while(e != this.e);
+            for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next)
+                if (e.t != null)
+                    norm = norm.plus(e.t.norm().times((float)e.prev.angle()));
             return norm.norm();
         }
 
         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) {
@@ -421,20 +372,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;