X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=641e4404c927c75cd927e68d771f85ef6a8148b0;hp=0c8c271411bb395899b36cce892df6cf9bc1dbfb;hb=e6ede2b794c97801f3890af9ea634e67012420ef;hpb=4561a5ff23ca77f6deb217d3cff6253057735d30

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 0c8c271..641e440 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -86,17 +86,19 @@ public class Main extends MeshViewer {
         float halfup = 0;
 
         translations = new Matrix[] {
-            /*
+
             Matrix.translate(new Vec(lshift,  depth,    halfup)),
             Matrix.translate(new Vec(rshift,  depth,    halfup)),
+            /*
             Matrix.translate(new Vec(lshift, -depth,    halfup)),
             Matrix.translate(new Vec(rshift, -depth,    halfup)),
             */
+
             /*
               Matrix.translate(new Vec(0,  depth,    halfup)),
               Matrix.translate(new Vec(0, -depth,    halfup)),
             */
-
+            /*
             Matrix.translate(new Vec(lshift,       0,  height)),
             Matrix.translate(new Vec(rshift,       0,  height)),
             Matrix.translate(new Vec(lshift,       0, -height)),
@@ -105,7 +107,7 @@ public class Main extends MeshViewer {
 
             Matrix.translate(new Vec( width,           0,    0)),
             Matrix.translate(new Vec(-width,           0,    0)),
-
+            */
         };
 
         //   
@@ -214,23 +216,23 @@ public class Main extends MeshViewer {
                     if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
                         (t1.v2().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
                         (t1.v3().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
-                        t1.e1().bindEdge(t2.e3());
-                        t1.e2().bindEdge(t2.e2());
-                        t1.e3().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e1(), m);
+                        t2.e2().bindEdge(t1.e2(), m);
+                        t2.e1().bindEdge(t1.e3(), m);
                     }
                     if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
                         (t1.v3().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
                         (t1.v1().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
-                        t1.e2().bindEdge(t2.e3());
-                        t1.e3().bindEdge(t2.e2());
-                        t1.e1().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e2(), m);
+                        t2.e2().bindEdge(t1.e3(), m);
+                        t2.e1().bindEdge(t1.e1(), m);
                     }
                     if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < Mesh.EPSILON) &&
                         (t1.v1().p.times(m).minus(t2.v3().p).mag() < Mesh.EPSILON) &&
                         (t1.v2().p.times(m).minus(t2.v2().p).mag() < Mesh.EPSILON)) {
-                        t1.e3().bindEdge(t2.e3());
-                        t1.e1().bindEdge(t2.e2());
-                        t1.e2().bindEdge(t2.e1());
+                        t2.e3().bindEdge(t1.e3(), m);
+                        t2.e2().bindEdge(t1.e1(), m);
+                        t2.e1().bindEdge(t1.e2(), m);
                     }
 
                 }
@@ -281,7 +283,9 @@ public class Main extends MeshViewer {
             Mesh.E e = es.poll();
             verts++;
             //System.out.println("shatter " + e);
-            e.shatter();
+            //e.shatter(e.midpoint(), null, null, true, true);
+            
+            //e.shatter(e.midpoint(), null, null, true, false);
             Thread.yield();
             repaint();
         }
@@ -392,12 +396,13 @@ public class Main extends MeshViewer {
                         if (t.aspect() < 0.1 && e.length()>e.next.length() && e.length()>e.prev.length()) es.add(e);
                     }
                 }
-
+                /*
                 for(int i=0; i<5; i++) {
                     Mesh.E e = es.poll();
                     if (e==null) break;
                     e.shatter();
                 }
+                */
                 tile.rebindPoints();
 
                 System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " +