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 efeb89b..e66c814 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -74,7 +74,8 @@ public class Mesh implements Iterable<Mesh.T> {
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
                 if (done.contains(p)) continue;
                 done.add(p);
             for(Vert p : new Vert[] { t.v1(), t.v2(), t.v3() }) {
                 if (done.contains(p)) continue;
                 done.add(p);

-                p.rescore();
+                //p.rescore();
+                p.recomputeFundamentalQuadric();

             }
         return (float)(dist/num);
     }
             }
         return (float)(dist/num);
     }

@@ -226,13 +227,13 @@ public class Mesh implements Iterable<Mesh.T> {
             rescore();
 
             // recompute fundamental quadrics of all vertices sharing a face
             rescore();
 
             // recompute fundamental quadrics of all vertices sharing a face

+            /*

             E e = this.e;
             do {
             E e = this.e;
             do {

-                e.t.v1().recomputeFundamentalQuadric();
-                e.t.v2().recomputeFundamentalQuadric();
-                e.t.v3().recomputeFundamentalQuadric();
+                e.p2.recomputeFundamentalQuadric();

                 e = e.pair.next;
             } while(e != this.e);
                 e = e.pair.next;
             } while(e != this.e);

+            */

             
             boolean good = true;
             /*
             
             boolean good = true;
             /*