X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=f96346d8eebc375c0ac50ee60e02535ebfbdf395;hp=b25d1b73dcb5847c4498c69510058bf78f1d8690;hb=0f91cadcd5a273c8c312c1d054fe9de1a82ebf8e;hpb=6fc720977d26dc1f154a3c0802c3beabd347d673

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index b25d1b7..f96346d 100644
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -215,15 +215,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 }
             }
 
-            /*
-            double s1, s2;
-            if (quadric_count==0) s1 = 0;
-            else                  s1 = p.distance(quadric_x/quadric_count, quadric_y/quadric_count, quadric_z/quadric_count);
-            s2 = quadric==null ? 0 : po.p.distance(quadric.p);
-            oldscore = (float)(s1 + s2);
-            */
             oldscore = quadric_count == 0 ? 0 : (quadric.preAndPostMultiply(p) / quadric_count);
-
             score += oldscore;
         }
 
@@ -241,34 +233,11 @@ public class Mesh implements Iterable<Mesh.T> {
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
-            fundamentalQuadric = fundamentalQuadric();
             rescore();
 
-            // recompute fundamental quadrics of all vertices sharing a face
-            /*
-            E e = this.e;
-            do {
-                e.p2.recomputeFundamentalQuadric();
-                e = e.pair.next;
-            } while(e != this.e);
-            */
-            
-            boolean good = true;
-            /*
-            for(T t : this) {
-                for(E e = this.e; ;) {
-                    if (e.intersects(t)) { good = false; break; }
-                    e = e.pair.next;
-                    if (e == this.e) break;
-                }
-            }
-            */
-            /*
-                if (t==this.t) continue;
-                if (this.intersects(t)) good = false;
-            }
-            */
-            return good;
+            // should recompute fundamental quadrics of all vertices sharing a face, but we defer...
+            // FIXME: intersection test needed?
+            return true;
         }
         public boolean move(Vec v) {
             Matrix m = new Matrix(v);