X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=c0417924b2a4c1c780567b86b10c9b60357b38b2;hp=57eda26d738feffcd6ed84b123aa8c7dc2edd40a;hb=42acb5af8ff15b7af9fa8f34c071ee58e24faf98;hpb=5e1dfbf83814f05b602d6463fca86470531fe4fe

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 57eda26..c041792 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -134,6 +134,10 @@ public class Mesh implements Iterable<Mesh.T> {
                 m = m.plus(e.t.norm().fundamentalQuadric(e.t.centroid()));
                 count++;
             }
+            if (count > 0) {
+                m = m.plus(norm().fundamentalQuadric(this.p).times(count));
+                count *= 2;
+            }
             return m.times(1/(float)count);
         }
 
@@ -147,28 +151,45 @@ public class Mesh implements Iterable<Mesh.T> {
             if (quadric_count != 0)
                 nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1);
 
-            if (!immutableVertices && quadric_count == 0)
-                nerror *= 2;
+            if (!immutableVertices && quadric_count == 0) {
+                //nerror = Math.max(nerror, 0.4f);
+                //nerror *= 2;
+            }
             //System.out.println(nerror);
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = e.dihedralAngle();
                 if (ang > Math.PI) throw new Error();
                 if (ang < -Math.PI) throw new Error();
-                //float minangle = (float)(Math.PI * 0.8);
-                nerror += ((ang / Math.PI)*(ang/Math.PI)) * e.length() * 0.05;
+                float minangle = (float)(Math.PI * 0.8);
+                //nerror += ((ang / Math.PI)*(ang/Math.PI)) * e.length() * 0.05;
+
+                nerror += (1-e.t.quality())*0.0001;
+                if (ang > minangle) nerror += (ang - minangle);
+
                 //System.out.println(((ang / Math.PI)*(ang/Math.PI)) * 0.000001);
-                //if (ang > minangle) nerror += (ang - minangle);
                 /*
                 if (e.t.aspect() < 0.2) {
                     nerror += (0.2-e.t.aspect()) * 10;
                 }
                 */
             }
+            if (!immutableVertices) {
+                Vertex n = (Vertex)nearest();
+                float d = norm().dot(n.norm());
+                if (d > 1 || d < -1) throw new Error();
+                if (d >= 0) {
+                    nerror *= (2.0f - d);
+                } else {
+                    nerror += 0.0003 * (2.0f + d);
+                    nerror *= (2.0f + d);
+                }
+            }
 
             setError(nerror);
         }
 
         public boolean move(Matrix m, boolean ignoreProblems) {
+
             boolean good = true;
 
             //     t1' = M * t1
@@ -190,7 +211,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 }
                 if (!m.equals(m2)) return true;
             }
-
+            ok = false;
             Point op = this.p;
             Point pt = m.times(this.p);
             for(Vertex v : (Iterable<Vertex>)getBoundPeers()) {
@@ -212,8 +233,10 @@ public class Mesh implements Iterable<Mesh.T> {
                 v.recomputeFundamentalQuadricIfNeighborChanged();
             for(Vertex v : (Iterable<Vertex>)getBoundPeers())
                 v.reComputeErrorAround();
+            ok = true;
             return good;
         }
+        public boolean ok = true;
 
         /** does NOT update bound pairs! */
         private boolean transform(Point newp, boolean ignoreProblems, Matrix yes) {
@@ -354,6 +377,12 @@ public class Mesh implements Iterable<Mesh.T> {
                 if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair))
                     next.bindTo(prev.getBindingMatrix(eother.pair.next.pair), eother.pair.prev.pair);
 
+                /*
+                if (next.isBoundTo(eother.prev) && !prev.isBoundTo(eother.next))
+                    prev.bindTo(next.getBindingMatrix(eother.prev), eother.next);
+                if (!next.isBoundTo(eother.prev) && prev.isBoundTo(eother.next))
+                    next.bindTo(prev.getBindingMatrix(eother.next), eother.prev);
+                */
                 if (next.isBoundTo(eother.next) && !prev.isBoundTo(eother.prev))
                     prev.bindTo(next.getBindingMatrix(eother.next), eother.prev);
                 if (!next.isBoundTo(eother.next) && prev.isBoundTo(eother.prev))
@@ -372,7 +401,6 @@ public class Mesh implements Iterable<Mesh.T> {
         }
         public float comparator() {
             return length();
-            //return t==null?0:(1/t.aspect());
         }
         public int compareTo(E e) {
             return e.comparator() > comparator() ? 1 : -1;
@@ -401,8 +429,10 @@ public class Mesh implements Iterable<Mesh.T> {
             System.out.println("  " + p1.p + " " + m.times(e.p1.p));
             System.out.println("  " + p2.p + " " + m.times(e.p2.p));
             */
+            /*
             if (m.times(e.p1.p).minus(p1.p).mag() > EPSILON) throw new Error();
             if (m.times(e.p2.p).minus(p2.p).mag() > EPSILON) throw new Error();
+            */
             this.bindTo(m, e);
         }