checkpoint

[anneal.git] / src / edu / berkeley / qfat / Mesh.java

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index f63bd1d..0e2c1d6 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -20,13 +20,13 @@ public class Mesh implements Iterable<Mesh.T> {
 
     public boolean immutableVertices;
     public boolean ignorecollision    = false;
-    public Mesh    score_against      = null;
-    public double  score              = 0;
+    public Mesh    error_against      = null;
+    public double  error              = 0;
 
     public Mesh(boolean immutableVertices) { this.immutableVertices = immutableVertices; }
 
     public void makeVerticesImmutable() { this.immutableVertices = true; }
-    public float score() { return (float)score; }
+    public float error() { return (float)error; }
 
     public int size() { return vertices.size(); }
     public Iterable<Vertex> vertices() { return vertices; }
@@ -81,9 +81,10 @@ public class Mesh implements Iterable<Mesh.T> {
 
         Matrix binding = Matrix.ONE;
         Vertex bound_to = this;
+        private boolean good;
 
         public Point getPoint() { return p; }
-        public float score() { return oldscore; }
+        public float error() { return olderror; }
 
         private Vertex(Point p) {
             this.p = p;
@@ -91,11 +92,11 @@ public class Mesh implements Iterable<Mesh.T> {
             vertices.add(this);
         }
 
-        public float oldscore = 0;
-        public void setScore(float nscore) {
-            score -= oldscore;
-            oldscore = nscore;
-            score += oldscore;
+        public float olderror = 0;
+        public void setError(float nerror) {
+            error -= olderror;
+            olderror = nerror;
+            error += olderror;
         }
 
         public Matrix _recomputeFundamentalQuadric() {
@@ -109,26 +110,26 @@ public class Mesh implements Iterable<Mesh.T> {
         }
 
         public HasQuadric nearest() {
-            if (score_against==null) return null;
-            return score_against.vertices.nearest(p, this);
+            if (error_against==null) return null;
+            return error_against.vertices.nearest(p, this);
         }
-        public void unComputeError() { setScore(0); }
+
         public void computeError() {
-            float nscore =
+            float nerror =
                 quadric_count != 0
                 ? (quadric.preAndPostMultiply(p) * 100) / quadric_count
                 : nearest_in_other_mesh != null
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p) * 100 * 10
-                : score_against != null
+                : error_against != null
                 ? 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());
                 if (ang > Math.PI) throw new Error();
                 float minangle = (float)(Math.PI * 0.8);
-                if (ang > minangle) nscore += (ang - minangle);
+                if (ang > minangle) nerror += (ang - minangle);
             }
-            setScore(nscore);
+            setError(nerror);
         }
 
         private void removeTrianglesFromRTree() {
@@ -169,8 +170,6 @@ public class Mesh implements Iterable<Mesh.T> {
 
             if (!ignorecollision && good) triangles.range(oldp, this.p, (Visitor<T>)this);
 
-            reComputeErrorAround();
-
             return good;
         }
 
@@ -201,16 +200,21 @@ public class Mesh implements Iterable<Mesh.T> {
                 return true;
             }
         }
-        private boolean good;
 
         public boolean move(Vec v) {
             Matrix m = Matrix.translate(v);
-            Vertex p = this;
+
             boolean good = true;
-            do {
+            for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
                 good &= p.transform(m);
-                p = p.bound_to;
-            } while (p != this);
+
+            if (good) {
+                for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
+                    p.reComputeErrorAround();
+            } else {
+                for(Vertex p = this; p != null; p = (p.bound_to==this)?null:p.bound_to)
+                    p.transform(Matrix.translate(v.times(-1)));
+            }
             return good;
         }
 
@@ -326,7 +330,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());
+            Vertex nearest = error_against.nearest(midpoint());
             return (float)Math.max(length(), midpoint().distance(nearest.p));
         }
         public int compareTo(E e) {