X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=14e6bcde90370a13bf1d2b46fccaf5311619a53a;hp=0c9e52124f0caecbab49a1f8c484174ab399c217;hb=db91e356d433030537508cacbf91bce9dd82f38f;hpb=bebc4007cb48fe93ca03f97047d3445a881afe9e diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 0c9e521..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,22 +87,30 @@ 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)), - Matrix.translate(new Vec(rshift, 0, -height)), + //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, 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, 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)), @@ -206,31 +215,44 @@ public class Main extends MeshViewer { tile.newT(rtf, mtf, rbf, null, 6); tile.newT(rbf, mtf, mbf, null, 6); + HashSet es = new HashSet(); + 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)) { - t1.e1().bindEdge(t2.e3()); - t1.e2().bindEdge(t2.e2()); - t1.e3().bindEdge(t2.e1()); + 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)) { - t1.e2().bindEdge(t2.e3()); - t1.e3().bindEdge(t2.e2()); - t1.e1().bindEdge(t2.e1()); + 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)) { - t1.e3().bindEdge(t2.e3()); - t1.e1().bindEdge(t2.e2()); - t1.e2().bindEdge(t2.e1()); + 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); } } @@ -281,7 +303,9 @@ public class Main extends MeshViewer { Mesh.E e = es.poll(); verts++; //System.out.println("shatter " + e); - e.shatter(e.midpoint(), null, null, true, true); + //e.shatter(e.midpoint(), null, null, true, true); + + e.shatter(); Thread.yield(); repaint(); } @@ -392,12 +416,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)) + " " +