X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMesh.java;h=edd82d645d311711ac61211045379e1e082181b2;hp=d395d7ff109db1d95d39e0461b77402c564a95c1;hb=73ed19a2635750c10ed5ff71677f04ccfd3d0ef3;hpb=3637de3ab66ba9c7bcd94d3b863bd22c706119e1

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index d395d7f..edd82d6 100644
--- 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 {
-        public Point p, oldp;
+        public Point p, oldp, goodp;
         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;
+            this.goodp = p;
             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)
-                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);
+                /*
                 if (e.t.aspect() < 0.2) {
-                    nerror += (0.2-e.t.aspect()) * 300;
+                    nerror += (0.2-e.t.aspect()) * 10;
                 }
-            }
                 */
+            }
+
             setError(nerror);
         }
 
@@ -310,9 +313,9 @@ public class Mesh implements Iterable<Mesh.T> {
                 e.p2.bind(ebound.p1);
             }
         }
-        public void shatter(BindingGroup bg1, BindingGroup bg2) {
+        public void shatter(BindingGroup bg1, BindingGroup bg2, boolean triangles) {
             for(E e : set) {
-                e.shatter(e.midpoint(), bg1, bg2);
+                e.shatter(e.midpoint(), bg1, bg2, triangles);
             }
         }
     }
@@ -351,8 +354,8 @@ public class Mesh implements Iterable<Mesh.T> {
         public void bindEdge(E e) { bind_to.add(e); }
         public void dobind() { bind_to.dobind(this); }
 
-        public Point shatter() { return shatter(midpoint(), null, null); }
-        public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2) {
+        public Point shatter() { return shatter(midpoint(), null, null, true); }
+        public Point shatter(Point mid, BindingGroup bg1, BindingGroup bg2, boolean triangles) {
             if (shattered || destroyed) return mid;
             shattered = true;
 
@@ -364,15 +367,17 @@ public class Mesh implements Iterable<Mesh.T> {
             if (bg1==null) bg1 = new BindingGroup();
             if (bg2==null) bg2 = new BindingGroup();
             BindingGroup old_bind_to = bind_to;
-            bind_peers.shatter(bg1, bg2);
-            old_bind_to.shatter(bg2.other(), bg1.other());
+            bind_peers.shatter(bg1, bg2, triangles);
+            old_bind_to.shatter(bg2.other(), bg1.other(), triangles);
             pair.shatter();
             destroy();
 
-            newT(r.p, p1.p, mid, null, old_colorclass);
-            newT(r.p, mid, p2.p, null, old_colorclass);
-            bg1.add(p1.getE(mid));
-            bg2.add(p2.getE(mid).pair);
+            if (triangles) {
+                newT(r.p, p1.p, mid, null, old_colorclass);
+                newT(r.p, mid, p2.p, null, old_colorclass);
+                bg1.add(p1.getE(mid));
+                bg2.add(p2.getE(mid).pair);
+            }
             return mid;
         }
 
@@ -602,10 +607,9 @@ public class Mesh implements Iterable<Mesh.T> {
         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);