checkpoint before triforce

[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 d395d7f..02f589e 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -75,7 +75,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
     /** a vertex in the mesh */
     public final class Vertex extends HasQuadric implements Visitor {
 
     /** a vertex in the mesh */
     public final class Vertex extends HasQuadric implements Visitor {

-        public Point p, oldp;
+        public Point p, oldp, goodp;

         E e;                // some edge *leaving* this point
 
         Matrix binding = Matrix.ONE;
         E e;                // some edge *leaving* this point
 
         Matrix binding = Matrix.ONE;

@@ -87,6 +87,7 @@ public class Mesh implements Iterable<Mesh.T> {
 
         private Vertex(Point p) {
             this.p = p;
 
         private Vertex(Point p) {
             this.p = p;

+            this.goodp = p;

             if (vertices.get(p) != null) throw new Error();
             vertices.add(this);
         }
             if (vertices.get(p) != null) throw new Error();
             vertices.add(this);
         }

@@ -141,18 +142,20 @@ public class Mesh implements Iterable<Mesh.T> {
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p)
                 : nearest().fundamentalQuadric().preAndPostMultiply(p);
             if (quadric_count != 0)
                 ? nearest_in_other_mesh.fundamentalQuadric().preAndPostMultiply(p)
                 : nearest().fundamentalQuadric().preAndPostMultiply(p);
             if (quadric_count != 0)

-                nerror = (/*nerror +*/ quadric.preAndPostMultiply(p))/(quadric_count/*+1*/);
-                /*
+                nerror = (nerror + quadric.preAndPostMultiply(p))/(quadric_count+1);
+

             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = Math.abs(e.dihedralAngle());
                 if (ang > Math.PI) throw new Error();
                 float minangle = (float)(Math.PI * 0.8);
                 if (ang > minangle) nerror += (ang - minangle);
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 double ang = Math.abs(e.dihedralAngle());
                 if (ang > Math.PI) throw new Error();
                 float minangle = (float)(Math.PI * 0.8);
                 if (ang > minangle) nerror += (ang - minangle);

+                /*

                 if (e.t.aspect() < 0.2) {
                 if (e.t.aspect() < 0.2) {

-                    nerror += (0.2-e.t.aspect()) * 300;
+                    nerror += (0.2-e.t.aspect()) * 10;

                 }
                 }

-            }

                 */
                 */

+            }
+

             setError(nerror);
         }
 
             setError(nerror);
         }
 

@@ -602,10 +605,9 @@ public class Mesh implements Iterable<Mesh.T> {
         public void glVertices(GL gl) {
             if (!shouldBeDrawn()) return;
             norm().glNormal(gl);
         public void glVertices(GL gl) {
             if (!shouldBeDrawn()) return;
             norm().glNormal(gl);

-            Point p1 = v1().oldp;
-            Point p2 = v2().oldp;
-            Point p3 = v3().oldp;
-            if (p1==null || p2==null || p3==null) return;
+            Point p1 = v1().goodp;
+            Point p2 = v2().goodp;
+            Point p3 = v3().goodp;

             p1.glVertex(gl);
             p2.glVertex(gl);
             p3.glVertex(gl);
             p1.glVertex(gl);
             p2.glVertex(gl);
             p3.glVertex(gl);