X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=14e6bcde90370a13bf1d2b46fccaf5311619a53a;hp=75bfd7e617e1a859784ed99885b8e04ebf5bea7b;hb=db91e356d433030537508cacbf91bce9dd82f38f;hpb=2b09dab499516873839b9bdbc972c980829e9bac

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 75bfd7e..14e6bcd 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -51,6 +51,7 @@ public class Main extends MeshViewer {
     
     /** magnification factor */
     private static final float MAG = 1;
+    public static final float MATCHING_EPSILON = 0.01f;
 
     public Main(StlFile stlf, Frame f) {
         super(f);
@@ -86,27 +87,34 @@ public class Main extends MeshViewer {
         float halfup = 0;
 
         translations = new Matrix[] {
-            Matrix.translate(new Vec(lshift,  depth,    halfup)),
             /*
+            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,    0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+            //Matrix.translate(new Vec(0, -depth,    0)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+
+            Matrix.translate(new Vec(0,   0,    height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
+            Matrix.translate(new Vec(0,   0,   -height)).times(Matrix.rotate(new Vec(0, 0, 1), (float)Math.PI)),
             /*
-              Matrix.translate(new Vec(0,  depth,    halfup)),
-              Matrix.translate(new Vec(0, -depth,    halfup)),
+            Matrix.translate(new Vec(0,  depth, 0)),
+            Matrix.translate(new Vec(0, -depth, 0)),
+            Matrix.translate(new Vec(0,      0,  height)),
+            Matrix.translate(new Vec(0,      0, -height)),
             */
-            /*
-            Matrix.translate(new Vec(lshift,       0,  height)),
-            Matrix.translate(new Vec(rshift,       0,  height)),
-            Matrix.translate(new Vec(lshift,       0, -height)),
-            Matrix.translate(new Vec(rshift,       0, -height)),
-
+            //Matrix.translate(new Vec(lshift,        depth,  height/2)),
+            //Matrix.translate(new Vec(lshift,        depth, -height/2)),
+            //Matrix.translate(new Vec(rshift,       -depth,  height/2)),
+            //Matrix.translate(new Vec(rshift,       -depth, -height/2)),
+            //Matrix.translate(new Vec(rshift,       0,  height)),
+            //Matrix.translate(new Vec(rshift,       0, -height)),
 
             Matrix.translate(new Vec( width,           0,    0)),
             Matrix.translate(new Vec(-width,           0,    0)),
-            */
+
         };
 
         //   
@@ -207,28 +215,41 @@ public class Main extends MeshViewer {
         tile.newT(rtf, mtf, rbf, null, 6);
         tile.newT(rbf, mtf, mbf, null, 6);
 
+        HashSet<Mesh.E> es = new HashSet<Mesh.E>();
+        for(Mesh.T t : tile) {
+            es.add(t.e1());
+            es.add(t.e2());
+            es.add(t.e3());
+        }
+        for(Mesh.E e : es) {
+            if (e.p1.p.x == e.p2.p.x && e.p1.p.y == e.p2.p.y) continue;
+            if (e.p1.p.z == e.p2.p.z && e.p1.p.y == e.p2.p.y) continue;
+            if (e.p1.p.x == e.p2.p.x && e.p1.p.z == e.p2.p.z) continue;
+            e.shatter();
+        }
+
         for(Matrix m : translations) {
             for(Mesh.T t1 : tile) {
                 for(Mesh.T t2 : tile) {
                     if (t1==t2) continue;
 
-                    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)) {
+                    if ((t1.v1().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v2().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v3().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
                         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)) {
+                    if ((t1.v2().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v3().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v1().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
                         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)) {
+                    if ((t1.v3().p.times(m).minus(t2.v1().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v1().p.times(m).minus(t2.v3().p).mag() < MATCHING_EPSILON) &&
+                        (t1.v2().p.times(m).minus(t2.v2().p).mag() < MATCHING_EPSILON)) {
                         t2.e3().bindEdge(t1.e3(), m);
                         t2.e2().bindEdge(t1.e1(), m);
                         t2.e1().bindEdge(t1.e2(), m);
@@ -284,7 +305,7 @@ public class Main extends MeshViewer {
             //System.out.println("shatter " + e);
             //e.shatter(e.midpoint(), null, null, true, true);
             
-            //e.shatter(e.midpoint(), null, null, true, false);
+            e.shatter();
             Thread.yield();
             repaint();
         }