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 46c2200..3696c0b 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -247,7 +247,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 oldscore = (quadric.preAndPostMultiply(p) * 100) / quadric_count;
             }
 
-            oldscore = oldscore*oldscore;
+            oldscore = oldscore;
 
             int numaspects = 0;
             float aspects = 0;
@@ -260,12 +260,13 @@ public class Mesh implements Iterable<Mesh.T> {
                     aspects += e.t.aspect()*e.t.aspect();
                 }
 
-                if (ang > Math.PI * 0.8)
-                    oldscore += (ang - (Math.PI*0.8)) * 10;
+                float minangle = (float)(Math.PI * 0.3);
+                if (ang > minangle)
+                    oldscore += (ang - minangle);
 
                 e = e.pair.next;
             } while (e != this.e);
-            if (numaspects > 0) oldscore += (aspects / numaspects);
+            //if (numaspects > 0) oldscore += (aspects / numaspects);
 
             //System.out.println(oldscore);
             //oldscore = oldscore*oldscore;
@@ -793,11 +794,11 @@ public class Mesh implements Iterable<Mesh.T> {
         public boolean has(Vert v) { return v1()==v || v2()==v || v3()==v; }
 
         public void glVertices(GL gl) {
-
+            /*
             if (e1().bind_to.set.size() == 0) return;
             if (e2().bind_to.set.size() == 0) return;
             if (e3().bind_to.set.size() == 0) return;
-
+            */
             norm().glNormal(gl);
             p1().glVertex(gl);
             p2().glVertex(gl);