X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=d10f63b4d698d32ac884cd188c80797434be7573;hp=bb15b3bdfa19f43caba3d058d96bd8ead42ffd31;hb=40b6b99bd4b0bd6041b8ab94a22201faab23ed90;hpb=6fc720977d26dc1f154a3c0802c3beabd347d673 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index bb15b3b..d10f63b 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -8,10 +8,45 @@ import java.util.*; import edu.berkeley.qfat.geom.*; import edu.berkeley.qfat.geom.Point; +// TO DO: +// - real anneal +// - solve self-intersection problem +// - get a better test model? +// - symmetry constraints withing the tile +// - rotation matrices +// - overbinding results in forced equational constraints on the leader +// - shatter in invertd-triforce pattern brian mentioned +// - aspect ratio? non-uniform deformation? +// - rotational alignment + +// - movie-style user interface like +// http://www.coleran.com/markcoleranreell.html ? + +// - consider recasting the Shewchuk predicates in Java? +// http://www.cs.cmu.edu/afs/cs/project/quake/public/code/predicates.c + +/* +blender keys +- middle mouse = option+click +- right mouse = command+click + +3,7,1 = view along axes (control for opp direction) +4, 8, 7, 2 = rotate in discrete increments (+control to translate) +middle trag: rotate space +shift+middle drag: translate space +wheel: zoom +home: home view: take current angle, zoom to whole scnee +5 = ortho vs non-ortho + + */ + + // FIXME: re-orient goal (how?) public class Main extends MeshViewer { + public static int verts = 1; + public static final Random random = new Random(); /** magnification factor */ @@ -25,63 +60,100 @@ public class Main extends MeshViewer { Point p1 = new Point(stlf.coordArray[i+1].x * MAG, stlf.coordArray[i+1].y * MAG, stlf.coordArray[i+1].z * MAG); Point p2 = new Point(stlf.coordArray[i+2].x * MAG, stlf.coordArray[i+2].y * MAG, stlf.coordArray[i+2].z * MAG); Vec n = new Vec(stlf.normArray[i/3].x * MAG, stlf.normArray[i/3].y * MAG, stlf.normArray[i/3].z * MAG); - Mesh.T t = goal.newT(p0, p1, p2, n); + Mesh.T t = goal.newT(p0, p1, p2, n, 0); } + goal.ignorecollision = true; + // rotate to align major axis -- this probably needs to be done by a human. goal.transform(new Matrix(new Vec(0, 0, 1), (float)(Math.PI/2))); - float goal_width = goal.diagonal().dot(new Vec(1, 0, 0)); float goal_height = goal.diagonal().dot(new Vec(0, 1, 0)); float goal_depth = goal.diagonal().dot(new Vec(0, 0, 1)); + /* float width = (float)0.6; float height = (float)0.08; float depth = (float)0.3; + */ + float width = (float)0.7; + float depth = (float)0.08; + float height = (float)0.4; + + float rshift = width/2; + float lshift = -(width/2); + + //float halfup = height/2; + float halfup = 0; + translations = new Matrix[] { - new Matrix(new Vec(-(width/2), height, 0)), - new Matrix(new Vec( (width/2), height, 0)), - new Matrix(new Vec(-(width/2), -height, 0)), - new Matrix(new Vec( (width/2), -height, 0)), - new Matrix(new Vec(-(width/2), 0, depth)), - new Matrix(new Vec( (width/2), 0, depth)), - new Matrix(new Vec(-(width/2), 0, -depth)), - new Matrix(new Vec( (width/2), 0, -depth)), + new Matrix(new Vec(lshift, depth, halfup)), + new Matrix(new Vec(rshift, depth, halfup)), + new Matrix(new Vec(lshift, -depth, halfup)), + new Matrix(new Vec(rshift, -depth, halfup)), - new Matrix(new Vec( width, 0, 0)), - new Matrix(new Vec(-width, 0, 0)), /* - new Matrix(new Vec( 0, 0, depth)), - new Matrix(new Vec( 0, 0, -depth)), + new Matrix(new Vec(0, depth, halfup)), + new Matrix(new Vec(0, -depth, halfup)), */ + + new Matrix(new Vec(lshift, 0, height)), + new Matrix(new Vec(rshift, 0, height)), + new Matrix(new Vec(lshift, 0, -height)), + new Matrix(new Vec(rshift, 0, -height)), + + + new Matrix(new Vec( width, 0, 0)), + new Matrix(new Vec(-width, 0, 0)), + }; + // + + + + Point ltf = new Point(lshift, (depth/2), (height/2)); + Point mtf = new Point( 0.0, (depth/2), (height/2)); + Point rtf = new Point(rshift, (depth/2), (height/2)); + Point lbf = new Point(lshift, -(depth/2), (height/2)); + Point mbf = new Point( 0.0, -(depth/2), (height/2)); + Point rbf = new Point(rshift, -(depth/2), (height/2)); + + Point ltc = new Point(lshift, (depth/2), 0); + Point mtc = new Point( 0.0, (depth/2), 0); + Point rtc = new Point(rshift, (depth/2), 0); + Point lbc = new Point(lshift, -(depth/2), 0); + Point mbc = new Point( 0.0, -(depth/2), 0); + Point rbc = new Point(rshift, -(depth/2), 0); + + Point ltn = new Point(lshift, (depth/2), -(height/2)); + Point mtn = new Point( 0.0, (depth/2), -(height/2)); + Point rtn = new Point(rshift, (depth/2), -(height/2)); + Point lbn = new Point(lshift, -(depth/2), -(height/2)); + Point mbn = new Point( 0.0, -(depth/2), -(height/2)); + Point rbn = new Point(rshift, -(depth/2), -(height/2)); - Point ltf = new Point(-(width/2), (height/2), (depth/2)); - Point mtf = new Point( 0.0, (height/2), (depth/2)); - Point rtf = new Point( (width/2), (height/2), (depth/2)); - Point ltn = new Point(-(width/2), (height/2), -(depth/2)); - Point mtn = new Point( 0.0, (height/2), -(depth/2)); - Point rtn = new Point( (width/2), (height/2), -(depth/2)); - Point lbf = new Point(-(width/2), -(height/2), (depth/2)); - Point mbf = new Point( 0.0, -(height/2), (depth/2)); - Point rbf = new Point( (width/2), -(height/2), (depth/2)); - Point lbn = new Point(-(width/2), -(height/2), -(depth/2)); - Point mbn = new Point( 0.0, -(height/2), -(depth/2)); - Point rbn = new Point( (width/2), -(height/2), -(depth/2)); Point[] points = new Point[] { ltf, mtf, rtf, - ltn, - mtn, - rtn, lbf, mbf, rbf, + + ltc, + mtc, + rtc, + lbc, + mbc, + rbc, + + ltn, + mtn, + rtn, lbn, mbn, rbn @@ -89,36 +161,52 @@ public class Main extends MeshViewer { // top - tile.newT(ltf, mtf, mtn, null); - tile.newT(mtn, ltn, ltf, null); - tile.newT(mtf, rtf, rtn, null); - tile.newT(rtn, mtn, mtf, null); + tile.newT(ltf, mtf, mtc, null, 1); + tile.newT(mtc, ltc, ltf, null, 1); + tile.newT(mtf, rtf, rtc, null, 1); + tile.newT(rtc, mtc, mtf, null, 1); + + tile.newT(ltc, mtc, mtn, null, 1); + tile.newT(mtn, ltn, ltc, null, 1); + tile.newT(mtc, rtc, rtn, null, 1); + tile.newT(rtn, mtn, mtc, null, 1); // bottom (swap normals) - tile.newT(mbf, lbf, mbn, null); - tile.newT(lbn, mbn, lbf, null); - tile.newT(rbf, mbf, rbn, null); - tile.newT(mbn, rbn, mbf, null); - + tile.newT(mbf, lbf, mbc, null, 2); + tile.newT(lbc, mbc, lbf, null, 2); + tile.newT(rbf, mbf, rbc, null, 2); + tile.newT(mbc, rbc, mbf, null, 2); + + tile.newT(mbc, lbc, mbn, null, 2); + tile.newT(lbn, mbn, lbc, null, 2); + + tile.newT(rbc, mbc, rbn, null, 2); + tile.newT(mbn, rbn, mbc, null, 2); + + // left - tile.newT(ltf, ltn, lbn, null); - tile.newT(lbn, lbf, ltf, null); + tile.newT(ltf, ltc, lbc, null, 3); + tile.newT(lbc, lbf, ltf, null, 3); + tile.newT(ltc, ltn, lbn, null, 3); + tile.newT(lbn, lbc, ltc, null, 3); // right (swap normals) - tile.newT(rtn, rtf, rbn, null); - tile.newT(rbf, rbn, rtf, null); + tile.newT(rtc, rtf, rbc, null, 4); + tile.newT(rbf, rbc, rtf, null, 4); + tile.newT(rtn, rtc, rbn, null, 4); + tile.newT(rbc, rbn, rtc, null, 4); // front - tile.newT(ltn, mtn, mbn, null); - tile.newT(ltn, mbn, lbn, null); - tile.newT(mtn, rtn, rbn, null); - tile.newT(mtn, rbn, mbn, null); + tile.newT(ltn, mtn, mbn, null, 5); + tile.newT(ltn, mbn, lbn, null, 5); + tile.newT(mtn, rtn, rbn, null, 5); + tile.newT(mtn, rbn, mbn, null, 5); // back - tile.newT(mtf, ltf, mbf, null); - tile.newT(mbf, ltf, lbf, null); - tile.newT(rtf, mtf, rbf, null); - tile.newT(rbf, mtf, mbf, null); + tile.newT(mtf, ltf, mbf, null, 6); + tile.newT(mbf, ltf, lbf, null, 6); + tile.newT(rtf, mtf, rbf, null, 6); + tile.newT(rbf, mtf, mbf, null, 6); for(Matrix m : translations) { for(Mesh.T t1 : tile) { @@ -128,24 +216,25 @@ 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().bind(t2.e3().pair); - t1.e2().bind(t2.e2().pair); - t1.e3().bind(t2.e1().pair); + t1.e1().bindEdge(t2.e3()); + t1.e2().bindEdge(t2.e2()); + t1.e3().bindEdge(t2.e1()); } 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().bind(t2.e3().pair); - t1.e3().bind(t2.e2().pair); - t1.e1().bind(t2.e1().pair); + t1.e2().bindEdge(t2.e3()); + t1.e3().bindEdge(t2.e2()); + t1.e1().bindEdge(t2.e1()); } 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().bind(t2.e3().pair); - t1.e1().bind(t2.e2().pair); - t1.e2().bind(t2.e1().pair); + t1.e3().bindEdge(t2.e3()); + t1.e1().bindEdge(t2.e2()); + t1.e2().bindEdge(t2.e1()); } + } } } @@ -154,7 +243,7 @@ public class Main extends MeshViewer { // rescale to match volume float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); - goal.transform(new Matrix(factor)); + goal.transform(Matrix.scale(factor)); // translate to match centroid goal.transform(new Matrix(tile.centroid().minus(goal.centroid()))); @@ -163,7 +252,7 @@ public class Main extends MeshViewer { //tx.e3.shatter(); - tile.bind(); + tile.rebindPoints(); //mid.move(new Vec((float)0,0,(float)-0.05)); //ltn.move(new Vec((float)0,0,(float)-0.05)); @@ -176,82 +265,159 @@ public class Main extends MeshViewer { tile.score_against = goal; goal.score_against = tile; + tile.tilemesh = true; } public synchronized void breakit() { - if (verts > 200) return; + int oldverts = verts; + System.out.println("doubling vertices."); PriorityQueue es = new PriorityQueue(); for(Mesh.E e : tile.edges()) es.add(e); - for(int i=0; i<10; i++) { + for(int i=0; i 0) { while (breaks>0) { + breaks--; + breakit(); + //gamma = 1; + gamma = 1; + //temp = last * 0.8f; + //last = temp; + //temp = hightemp; + } } else + if (acceptance > 0.96) gamma = 0.4f; + else if (acceptance > 0.9) gamma = 0.5f; + else if (acceptance > 0.8) gamma = 0.65f; + else if (acceptance > 0.6) gamma = 0.7f; + else { + if (acceptance > 0.3) { + gamma = 0.9f; + } else if (acceptance > 0.15) { + gamma = 0.95f; + } else if (acceptance > 0.10) { + gamma = 0.98f; + } else { + breakit(); + //gamma = 1; + gamma = 0.99f; + //gamma = 1; + //temp = last * 0.8f; + //last = temp; + //temp = hightemp; + } + } + temp = temp * gamma; + + + HashSet hs = new HashSet(); + for(Mesh.Vert p : tile.vertices()) hs.add(p); + Mesh.Vert[] pts = (Mesh.Vert[])hs.toArray(new Mesh.Vert[0]); + + int count = 0; + long then = System.currentTimeMillis(); + for(int i=0; i<100; i++) { + if (anneal) { + count++; + Mesh.Vert v = pts[Math.abs(random.nextInt()) % pts.length]; + rand(temp,v); + } + Thread.yield(); repaint(); - //tile.ts.get(Math.abs(random.nextInt()) % tile.ts.size()).e1().p1 - for(Mesh.T t : tile) - for(Mesh.Vert p : new Mesh.Vert[] { t.v1(), t.v2(), t.v3() }) { - rand(10,p); - } - goal.unscore(); - tile.unscore(); - goal.fundamental(); - tile.fundamental(); - goal.rescore(); - tile.rescore(); } - breakit(); + System.out.println("temp="+temp + " ratio="+(Math.ceil(ratio*100)) + " " + + "points_per_second=" + + (count*1000)/((double)(System.currentTimeMillis()-then))); + tile.rebuildPointSet(); + repaint(); + //breakit(); + repaint(); + goal.unApplyQuadricToNeighborAll(); + repaint(); + tile.recomputeAllFundamentalQuadrics(); + repaint(); + goal.applyQuadricToNeighborAll(); + } } - } public static void main(String[] s) throws Exception { StlFile stlf = new StlFile(); - stlf.load("simplefish.stl"); + stlf.load("fish.stl"); + //stlf.load("monkey.stl"); Frame f = new Frame(); Main main = new Main(stlf, f); + f.pack(); + f.show(); + f.setSize(900, 900); + f.doLayout(); main.anneal(); } + } \ No newline at end of file