X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=bec0cc21cbda152a7c96b23af4c757d4b46cd947;hp=82b6862519c041230335915177cc5ecab9380e9e;hb=2d6566bcf01b3853392ec13863671282f825444f;hpb=7c42fc87add9f8304182ccfd9722e22e95a70a96 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 82b6862..bec0cc2 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -1,30 +1,85 @@ package edu.berkeley.qfat; import java.awt.*; +import java.io.*; import java.awt.event.*; import javax.swing.*; import javax.media.opengl.*; import javax.media.opengl.glu.*; import java.util.*; +import edu.berkeley.qfat.bind.*; import edu.berkeley.qfat.geom.*; +import edu.berkeley.qfat.stl.*; +import edu.berkeley.qfat.voxel.*; import edu.berkeley.qfat.geom.Point; import edu.berkeley.qfat.geom.Polygon; +/* + + +Todo +- review catmull-clark; move vertex points? +- re-anneal fish + +- show constraints (?) +- show in red if user tries to move a point to an illegal location + +- eliminate use of bindinggroupschanged() + +- post qfat on my software page + + +With Sequin +- constraints admit intersections (lattice) +- constraints may be transformed linearly + + + + +Log console + - blend-shaded overlay? slick. + +face/vertex count +rendering FPS +ability to not draw edges between faces + + +three circumcircles showing crystal ball -- these don't get scaled +axes? + +drawing modes: + - bounding box + - vertices + - edges + - visible-edges + - flat with or without edges + - shaded with or without edges + * contrasting-faces + + +quadric decimation? + +show normals +show bounding box +show axes (big+fat) + */ + // 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 +// +// - Ability to snap three views to orthgonal +// - SLIDE UI +// - left button -> crystal ball +// - translate +// - rightbutton/mousewheel zoom +// - v+click to select vertex +// - show: constraints, bindings, faces +// +// Editing: +// - fracture edge, face +// - change aspect ratio +// - translate, rotate goal mesh +// - ability to select a point, rotate the model, then move the point +// - when moving a vertex in one window, show that window's axes in all other windows +// /* blender keys @@ -38,18 +93,39 @@ import edu.berkeley.qfat.geom.Polygon; wheel: zoom home: home view: take current angle, zoom to whole scnee 5 = ortho vs non-ortho - */ /* +Meshlab Notes: +Log console + - blend-shaded overlay? slick. +face/vertex count +rendering FPS +ability to not draw edges between faces - */ +three circumcircles showing crystal ball -- these don't get scaled +axes? + +drawing modes: + - bounding box + - vertices + - edges + - visible-edges + - flat with or without edges + - shaded with or without edges + * contrasting-faces -// FIXME: re-orient goal (how?) -public class Main extends MeshViewer { +quadric decimation? + +show normals +show bounding box +show axes (big+fat) + */ + +public class Main extends InteractiveMeshViewer { public static int verts = 1; @@ -65,34 +141,20 @@ public class Main extends MeshViewer { HashSet halfSpaces = new HashSet(); HashSet polygons = new HashSet(); for(Matrix m : matrices) { - Vec v = m.getTranslationalComponent(); - if (v.mag() < 0.0001) continue; - v = v.times(0.5f); - Point p = Point.ORIGIN.plus(v); - Vec v0 = v; - /* - if (small(v.x) && small(v.y)) v = new Vec(0,0,1); - else if (small(v.y) && small(v.z)) v = new Vec(1,0,0); - else if (small(v.z) && small(v.x)) v = new Vec(0,1,0); - else if (small(v.x)) v = new Vec(0,v.y,0).minus(new Vec(0,0,v.z)).cross(new Vec(1,0,0)); - else if (small(v.y)) v = new Vec(0,0,v.z).minus(new Vec(v.x,0,0)).cross(new Vec(0,1,0)); - else if (small(v.z)) v = new Vec(v.x,0,0).minus(new Vec(0,v.y,0)).cross(new Vec(0,0,1)); - else { - Point v1 = new Point(v.x, 0, 0); - Point v2 = new Point(0, v.y, 0); - Point v3 = new Point(0, 0, v.z); - v = v3.minus(v2).cross(v1.minus(v2)); - } - */ - if (v.dot(Point.ORIGIN.minus(p)) < 0) v = v.times(-1); - - System.out.println(v); - HalfSpace hs = new HalfSpace(p, v.norm()); - halfSpaces.add(hs); - polygons.add(new Polygon(hs)); + Vec v = m.getTranslationalComponent(); + if (v.mag() < 0.0001) continue; + v = v.times(-1); + v = v.times(0.5f); + Point p = Point.ZERO.plus(v); + v = v.times(-1); + + //System.out.println(v); + HalfSpace hs = new HalfSpace(p, v.norm()); + halfSpaces.add(hs); + polygons.add(new Polygon(hs)); } for(Polygon p : polygons) { - System.out.println(p.plane.norm + " " + p.plane.dvalue); + System.out.println(p.plane.norm() + " " + p.plane.d); for(HalfSpace hs : halfSpaces) { if (p.plane==hs) continue; p = p.intersect(hs); @@ -115,487 +177,792 @@ public class Main extends MeshViewer { mesh.newT(p4, p1, c, null, 0); } - public Main(StlFile stlf, Frame f) { - super(f); - - for(int i=0; i 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(); - } - */ - - - height = 4; - width = 4; - depth = 1; - - Matrix mm = Matrix.scale(0.1f); - // top - quad(tile, mm, - new Point( 2, 2, 0), - new Point( 1, 1, -1), - new Point(-1, 1, -1), - new Point(-2, 2, 0)); - quad(tile, mm, - new Point(-2, 2, 0), - new Point(-1, 1, 1), - new Point( 1, 1, 1), - new Point( 2, 2, 0)); - quad(tile, mm, - new Point( 1, 1, -1), - new Point( 1, 1, 1), - new Point(-1, 1, 1), - new Point(-1, 1, -1)); - - // bottom - quad(tile, mm, - new Point(-2, -2, 0), - new Point(-1, -1, -1), - new Point( 1, -1, -1), - new Point( 2, -2, 0)); - quad(tile, mm, - new Point( 2, -2, 0), - new Point( 1, -1, 1), - new Point(-1, -1, 1), - new Point(-2, -2, 0)); - quad(tile, mm, - new Point(-1, -1, -1), - new Point(-1, -1, 1), - new Point( 1, -1, 1), - new Point( 1, -1, -1)); - - // left - quad(tile, mm, - new Point( 2, -2, 0), - new Point( 1, -1, -1), - new Point( 1, 1, -1), - new Point( 2, 2, 0)); - quad(tile, mm, - new Point( 2, 2, 0), - new Point( 1, 1, 1), - new Point( 1, -1, 1), - new Point( 2, -2, 0)); - quad(tile, mm, - new Point( 1, -1, -1), - new Point( 1, -1, 1), - new Point( 1, 1, 1), - new Point( 1, 1, -1)); - - // bottom - quad(tile, mm, - new Point(-2, 2, 0), - new Point(-1, 1, -1), - new Point(-1, -1, -1), - new Point(-2, -2, 0)); - quad(tile, mm, - new Point(-2, -2, 0), - new Point(-1, -1, 1), - new Point(-1, 1, 1), - new Point(-2, 2, 0)); - quad(tile, mm, - new Point(-1, 1, -1), - new Point(-1, 1, 1), - new Point(-1, -1, 1), - new Point(-1, -1, -1)); - - - - translations = new Matrix[] { - - Matrix.translate(new Vec(0, 0.2f,0)) - .times(Matrix.rotate(new Vec(0,1,0), (float)(1*Math.PI/2))), - - Matrix.translate(new Vec(0,-0.2f,0)) - .times(Matrix.rotate(new Vec(0,1,0), (float)(1*Math.PI/2))), - - Matrix.translate(new Vec( 0.2f,0,0)) - .times(Matrix.rotate(new Vec(1,0,0), (float)(-1*Math.PI/2))), - - Matrix.translate(new Vec(-0.2f,0,0)) - .times(Matrix.rotate(new Vec(1,0,0), (float)(-1*Math.PI/2))), - - - /* - Matrix.rotate(new Vec(0,0,1), (float)(1*Math.PI/2)), - Matrix.rotate(new Vec(0,0,1), (float)(2*Math.PI/2)), - Matrix.rotate(new Vec(0,0,1), (float)(3*Math.PI/2)), - - Matrix.rotate(new Vec(1,0,0), (float)(2*Math.PI/2)), - */ - //Matrix.rotate(new Vec(0,0,1), (float)(2*Math.PI/2)), - //Matrix.scale(1,-1,1), - - //Matrix.translate(new Vec( 0.2f, 0,0)) - //.times(Matrix.rotate(new Vec(0,0,1), (float)( 1*Math.PI/2))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 3*Math.PI/2))), - - //Matrix.translate(new Vec(-0.2f, 0,0)) - //.times(Matrix.rotate(new Vec(0,0,1), (float)( 3*Math.PI/2))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 3*Math.PI/2))), - - //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2)) - //.times(Matrix.translate(new Vec(0, -0.2f, 0))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))), - //Matrix.rotate(new Vec(0,0,1), (float)( 1*Math.PI/2)) - //.times(Matrix.translate(new Vec(0, -0.2f, 0))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))), - - //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2)) - //.times(Matrix.translate(new Vec(0, -0.2f, 0))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))), - //Matrix.rotate(new Vec(0,0,1), (float)( 0*Math.PI/2)) - //.times(Matrix.translate(new Vec(0, -0.2f, 0))) - //.times(Matrix.rotate(new Vec(0,1,0), (float)( 1*Math.PI/2))), - - Matrix.ONE, - }; - - - - for(Matrix m1 : translations) { - for(Matrix m2 : translations) { - for(Mesh.T t1 : tile) { - for(Mesh.T t2 : tile) { - - Matrix m = m1.inverse().times(m2); - if ((t1.v1().p.times(m).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v2().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON) && - (t1.v3().p.times(m).distance(t2.v2().p) < 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).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v3().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON) && - (t1.v1().p.times(m).distance(t2.v2().p) < 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).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v1().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON) && - (t1.v2().p.times(m).distance(t2.v2().p) < MATCHING_EPSILON)) { - t2.e3().bindEdge(t1.e3(), m); - t2.e2().bindEdge(t1.e1(), m); - t2.e1().bindEdge(t1.e2(), m); - } + public Main(JFrame f) { super(f); } + + public synchronized void fixupTile() { + for(Matrix m1 : transforms) { + for(Matrix m2 : transforms) { + if (m1==m2) continue; + for(Mesh.T t1 : tile) { + for(Mesh.T t2 : tile) { + + Matrix m = m1.inverse().times(m2); + Point t1v1 = m.times(t1.v1().p); + Point t1v2 = m.times(t1.v2().p); + Point t1v3 = m.times(t1.v3().p); + + if (t1v1.distance(t2.v1().p) < MATCHING_EPSILON && + t1v2.distance(t2.v3().p) < MATCHING_EPSILON && + t1v3.distance(t2.v2().p) < MATCHING_EPSILON) { + t2.e3().bindEdge(t1.e1().pair, m); + t2.e2().bindEdge(t1.e2().pair, m); + t2.e1().bindEdge(t1.e3().pair, m); + } + if (t1v2.distance(t2.v1().p) < MATCHING_EPSILON && + t1v3.distance(t2.v3().p) < MATCHING_EPSILON && + t1v1.distance(t2.v2().p) < MATCHING_EPSILON) { + t2.e3().bindEdge(t1.e2().pair, m); + t2.e2().bindEdge(t1.e3().pair, m); + t2.e1().bindEdge(t1.e1().pair, m); + } + if (t1v3.distance(t2.v1().p) < MATCHING_EPSILON && + t1v1.distance(t2.v3().p) < MATCHING_EPSILON && + t1v2.distance(t2.v2().p) < MATCHING_EPSILON) { + t2.e3().bindEdge(t1.e3().pair, m); + t2.e2().bindEdge(t1.e1().pair, m); + t2.e1().bindEdge(t1.e2().pair, m); + } + + if (t1v1.distance(t2.v1().p) < MATCHING_EPSILON && + t1v2.distance(t2.v2().p) < MATCHING_EPSILON && + t1v3.distance(t2.v3().p) < MATCHING_EPSILON) { + t2.e1().bindEdge(t1.e1(), m); + t2.e2().bindEdge(t1.e2(), m); + t2.e3().bindEdge(t1.e3(), m); + } + if (t1v2.distance(t2.v1().p) < MATCHING_EPSILON && + t1v3.distance(t2.v2().p) < MATCHING_EPSILON && + t1v1.distance(t2.v3().p) < MATCHING_EPSILON) { + t2.e2().bindEdge(t1.e1(), m); + t2.e3().bindEdge(t1.e2(), m); + t2.e1().bindEdge(t1.e3(), m); + } + if (t1v3.distance(t2.v1().p) < MATCHING_EPSILON && + t1v1.distance(t2.v2().p) < MATCHING_EPSILON && + t1v2.distance(t2.v3().p) < MATCHING_EPSILON) { + t2.e3().bindEdge(t1.e1(), m); + t2.e1().bindEdge(t1.e2(), m); + t2.e2().bindEdge(t1.e3(), m); + } - if ((t1.v1().p.times(m).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v2().p.times(m).distance(t2.v2().p) < MATCHING_EPSILON) && - (t1.v3().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON)) { - t2.e1().bindEdge(t1.e1().pair, m); - t2.e2().bindEdge(t1.e2().pair, m); - t2.e3().bindEdge(t1.e3().pair, m); - } - if ((t1.v2().p.times(m).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v3().p.times(m).distance(t2.v2().p) < MATCHING_EPSILON) && - (t1.v1().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON)) { - t2.e2().bindEdge(t1.e1().pair, m); - t2.e3().bindEdge(t1.e2().pair, m); - t2.e1().bindEdge(t1.e3().pair, m); } - if ((t1.v3().p.times(m).distance(t2.v1().p) < MATCHING_EPSILON) && - (t1.v1().p.times(m).distance(t2.v2().p) < MATCHING_EPSILON) && - (t1.v2().p.times(m).distance(t2.v3().p) < MATCHING_EPSILON)) { - t2.e3().bindEdge(t1.e1().pair, m); - t2.e1().bindEdge(t1.e2().pair, m); - t2.e2().bindEdge(t1.e3().pair, m); - } - } } } - } - - //xMesh.Vertex mid = lbf.getE(mbn).shatter(); - - // rescale to match volume - + tile.rebindPoints(); + System.out.println("tile volume: " + tile.volume()); + System.out.println("goal volume: " + goal.volume()); + tile.error_against = goal; + goal.error_against = tile; + fixupGoal(); + } - float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); - goal.transform(Matrix.scale(factor/2.1f)); - goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2))); - // translate to match centroid - goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid()))); - goal.makeVerticesImmutable(); + public class MyMenuItem extends JMenuItem implements ActionListener { + public MyMenuItem(String s) { + super(s); + this.addActionListener(this); + } + public void actionPerformed(ActionEvent event) { + synchronized(Main.this) { + hit(); + } + } + public void hit() {} + } - //tx.e2.shatter(); - //tx.e3.shatter(); + public void marchingCubes() { + Mesh mesh = new Mesh(false); + mesh.coalesce = true; + MarchingCubes.march(new SampledField() { + public float getSample(Point p) { + double x = p.x; + double y = p.y; + double z = p.z; + x-=0.7; + y-=0.7; + z-=0.7; + return (float)Math.sqrt(x*x+y*y+z*z); + } + }, + 0.8, 20, 0.1, mesh); + setTile(mesh); + //fixupTile(); + } + public void hexBrick(boolean offset, boolean rotated) { + setTile(new Mesh(false)); + float width = (float)0.8; + float depth = (float)0.08; + float height = (float)0.4; + float rshift = width/2; + float lshift = -(width/2); + float halfup = 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)); - tile.rebindPoints(); + + Point[] points = new Point[] { + ltf, + mtf, + rtf, + lbf, + mbf, + rbf, + + ltc, + mtc, + rtc, + lbc, + mbc, + rbc, + + ltn, + mtn, + rtn, + lbn, + mbn, + rbn + }; + + + // top + 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, 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, 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(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, 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, 6); + tile.newT(mbf, ltf, lbf, null, 6); + tile.newT(rtf, mtf, rbf, null, 6); + tile.newT(rbf, mtf, mbf, null, 6); + + if (offset) { + transforms = new Matrix[] { + Matrix.translate(new Vec(lshift, 0, height)), + Matrix.translate(new Vec(lshift, 0, -height)), + 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)), + Matrix.translate(new Vec(lshift, depth, 0)), + Matrix.translate(new Vec(lshift, -depth, 0)), + Matrix.translate(new Vec(rshift, depth, 0)), + Matrix.translate(new Vec(rshift, -depth, 0)), + Matrix.ONE, + }; + } else if (rotated) { + 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.v1.p.x == e.v2.p.x && e.v1.p.y == e.v2.p.y) continue; + if (e.v1.p.z == e.v2.p.z && e.v1.p.y == e.v2.p.y) continue; + if (e.v1.p.x == e.v2.p.x && e.v1.p.z == e.v2.p.z) continue; + e.shatter(); + } + transforms = new Matrix[] { + 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( width, 0, 0)), + Matrix.translate(new Vec(-width, 0, 0)), + Matrix.ONE, + }; + } else { + transforms = new Matrix[] { + Matrix.translate(new Vec(lshift, 0, height)), + Matrix.translate(new Vec(lshift, 0, -height)), + 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)), + Matrix.translate(new Vec(0, depth, 0)), + Matrix.translate(new Vec(0, -depth, 0)), + Matrix.ONE, + }; + } + + fixupTile(); + } - //mid.move(new Vec((float)0,0,(float)-0.05)); - //ltn.move(new Vec((float)0,0,(float)-0.05)); + public class MyMenuBar extends JMenuBar { + + public MyMenuBar() { + + JMenu tileMenu = new JMenu("Tile"); + JMenu goalMenu = new JMenu("Goal"); + JMenu hideMenu = new JMenu("Actions"); + + hideMenu.add(new MyMenuItem("Start Anneal") { public void hit() { anneal = true; }}); + hideMenu.add(new MyMenuItem("Stop Anneal") { public void hit() { anneal = false; }}); + hideMenu.add(new MyMenuItem("Reset to high temperature") { public void hit() { temp = 1; }}); + hideMenu.add(new MyMenuItem("Subdivide surface") { public void hit() { breaks++; }}); + hideMenu.add(new MyMenuItem("Show Goal") { public void hit() { goalon = true; }}); + hideMenu.add(new MyMenuItem("Hide Goal") { public void hit() { goalon = false; }}); + hideMenu.add(new MyMenuItem("Show All Neighbors") { public void hit() { neighbors = true; }}); + hideMenu.add(new MyMenuItem("Show One Neighbor Wireframe") { public void hit() { neighborsWireOne = true; }}); + hideMenu.add(new MyMenuItem("Show All Neighbors Wireframe") { public void hit() { neighborsWire = true; neighborsWireOne = false;}}); + hideMenu.add(new MyMenuItem("Hide Neighbors") { public void hit() { neighborsWire = false; neighborsWireOne = false; neighbors = false; }}); + + goalMenu.add(new MyMenuItem("Fish with face") { public void hit() { + loadGoal("face.stl"); + //goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2))); + goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2))); + //goal.transform(Matrix.scale(1, 2.2f, 1)); + float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); + //factor = factor * 0.8f; + goal.transform(Matrix.scale(0.3f)); + //goal.transform(Matrix.rotate(new Vec(0,1,0), (float)(Math.PI*1/3))); + goal.transform(Matrix.rotate(new Vec(1,0,0), (float)(Math.PI*1/3))); + fixupGoal(true, false); + //goal.transform(Matrix.translate(new Vec(0.145f, 0, 0))); + fixupGoal(false, true); + }}); + goalMenu.add(new MyMenuItem("Fish") { public void hit() { + loadGoal("fish.stl"); + //goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2))); + goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2))); + goal.transform(Matrix.scale(1, 2.2f, 1)); + float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); + factor = factor * 0.8f; + goal.transform(Matrix.scale(factor)); + fixupGoal(true, false); + //goal.transform(Matrix.translate(new Vec(0.145f, 0, 0))); + fixupGoal(false, true); + }}); + goalMenu.add(new MyMenuItem("Hammerhead Fish") { public void hit() { + loadGoal("fish.stl"); + goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2))); + goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(3*Math.PI/2))); + float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); + factor *= 0.75f; + goal.transform(Matrix.scale(factor)); + fixupGoal(); + }}); + goalMenu.add(new MyMenuItem("Vertical Fish") { public void hit() { + loadGoal("fish.stl"); + //goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2))); + //goal.transform(Matrix.rotate(new Vec(1, 0, 0), (float)(Math.PI/2))); + float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); + goal.transform(Matrix.scale(factor/1.6f)); + fixupGoal(); + }}); + goalMenu.add(new MyMenuItem("Torus") { public void hit() { + loadGoal("torus.stl"); + float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0); + goal.transform(Matrix.scale(factor/2.5f)); + goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2))); + fixupGoal(); + }}); + tileMenu.add(new MyMenuItem("Hex Brick") { public void hit() { + hexBrick(false, false); + }}); + tileMenu.add(new MyMenuItem("Hex Brick, offset planes") { public void hit() { + hexBrick(true, false); + }}); + tileMenu.add(new MyMenuItem("Hex Brick, rotated") { public void hit() { + hexBrick(false, true); + }}); + tileMenu.add(new MyMenuItem("Temp (do not use)") { public void hit() { + setTile(new Mesh(false)); + float width = (float)0.8; + float depth = (float)0.08; + float height = (float)0.4; + + float rshift = width/2; + float lshift = -(width/2); + float halfup = 0; + //float shift = height/2; + //width = (width*2)/3; + float shift = 0; + transforms = new Matrix[] { + + Matrix.translate(new Vec(lshift/2, depth, -shift)), + Matrix.translate(new Vec(rshift/2, depth, -shift)), + Matrix.translate(new Vec(lshift/2, -depth, -shift)), + Matrix.translate(new Vec(rshift/2, -depth, -shift)), + + Matrix.translate(new Vec(lshift, depth/2, -shift)), + Matrix.translate(new Vec(rshift, depth/2, -shift)), + Matrix.translate(new Vec(lshift, -depth/2, -shift)), + Matrix.translate(new Vec(rshift, -depth/2, -shift)), + + + /* + Matrix.translate(new Vec(lshift, depth, -shift)), + Matrix.translate(new Vec(rshift, depth, -shift)), + Matrix.translate(new Vec(lshift, -depth, -shift)), + Matrix.translate(new Vec(rshift, -depth, -shift)), + */ + /* + Matrix.translate(new Vec(lshift, depth, shift)), + Matrix.translate(new Vec(rshift, depth, shift)), + Matrix.translate(new Vec(lshift, -depth, shift)), + Matrix.translate(new Vec(rshift, -depth, shift)), + */ + //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)), + + Matrix.ONE + }; + fixupTile(); + } }); + tileMenu.add(new MyMenuItem("Dense Packing (hex)") { public void hit() { + setTile(new Mesh(false)); + float width = (float)3.2; + float depth = (float)0.32; + float height = (float)1.6; + float unit = 0.4f; + float r = unit/2; + float sin = (float)(unit * Math.sin(Math.PI/3)); + float cos = (float)(unit * Math.cos(Math.PI/3)); + float x = (float)(r*Math.tan(Math.PI/6)); + float z = (float)(r/Math.cos(Math.PI/6)); + height = 2*r*(float)Math.sqrt(2f/3f); - //mtf.move(new Vec(0, (float)-0.05, (float)0.05)); + /* + r *= 0.3f; + cos *= 0.3f; + unit *= 0.3f; + */ + /* + sin *= 0.3f; + x *= 0.3f; + z *= 0.3f; + */ + transforms = new Matrix[] { + Matrix.translate(new Vec(-unit, 0, 0)), + Matrix.translate(new Vec( unit, 0, 0)), + Matrix.translate(new Vec(-cos, 0, sin)), + Matrix.translate(new Vec( cos, 0, sin)), + Matrix.translate(new Vec(-cos, 0, -sin)), + Matrix.translate(new Vec( cos, 0, -sin)), + Matrix.translate(new Vec( 0, height, z)), + Matrix.translate(new Vec(-r, height, -x)), + Matrix.translate(new Vec( r, height, -x)), + Matrix.translate(new Vec( 0, -height, -z)), + Matrix.translate(new Vec(-r, -height, x)), + Matrix.translate(new Vec( r, -height, x)), + Matrix.ONE, + }; + generateTile(transforms, tile); + fixupTile(); + } }); + + tileMenu.add(new MyMenuItem("Slim Dense Packing (Cubic)") { public void hit() { + setTile(new Mesh(false)); + float unit = 0.4f; + float r = unit/2; + float sin = (float)(unit * Math.sin(Math.PI/3)); + float cos = (float)(unit * Math.cos(Math.PI/3)); + float x = (float)(r*Math.tan(Math.PI/6)); + float z = (float)(r/Math.cos(Math.PI/6)); + float height = 2*r*(float)Math.sqrt(2f/3f); + + transforms = new Matrix[] { + + //Matrix.reflect(new Vec( 0, height, -z).norm()), + + Matrix.translate(new Vec(-unit, 0, 0)), + Matrix.translate(new Vec( unit, 0, 0)), + Matrix.translate(new Vec(-cos, 0, sin)), + Matrix.translate(new Vec( cos, 0, sin)), + Matrix.translate(new Vec(-cos, 0, -sin)), + Matrix.translate(new Vec( cos, 0, -sin)), + + Matrix.translate(new Vec( 0, height, -z)), + Matrix.translate(new Vec(-r, height, x)), + Matrix.translate(new Vec( r, height, x)), + Matrix.translate(new Vec( 0, -height, z)), + Matrix.translate(new Vec(-r, -height, -x)), + Matrix.translate(new Vec( r, -height, -x)), + + /* + Matrix.translate(new Vec( 0, height, -z)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + Matrix.translate(new Vec(-r, height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + Matrix.translate(new Vec( r, height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + Matrix.translate(new Vec( 0, -height, -z)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + Matrix.translate(new Vec(-r, -height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + Matrix.translate(new Vec( r, -height, x)).times(Matrix.rotate(new Vec(0,1,0), (float)Math.PI)), + */ + + /* + Matrix.translate(new Vec( 0, height, -z)).times(Matrix.scale(-1,1,-1)), + Matrix.translate(new Vec(-r, height, x)).times(Matrix.scale(-1,1,-1)), + Matrix.translate(new Vec( r, height, x)).times(Matrix.scale(-1,1,-1)), + Matrix.translate(new Vec( 0, -height, -z)).times(Matrix.scale(-1,1,-1)), + Matrix.translate(new Vec(-r, -height, x)).times(Matrix.scale(-1,1,-1)), + Matrix.translate(new Vec( r, -height, x)).times(Matrix.scale(-1,1,-1)), + */ + Matrix.ONE + }; + generateTile(transforms, tile); + + + transforms = new Matrix[] { + Matrix.reflect(new Vec( 0, height, -z).norm()), + //Matrix.reflect(new Vec( 0, -height, z)), + Matrix.ONE, + Matrix.translate(new Vec(-unit, 0, 0)), + Matrix.translate(new Vec( unit, 0, 0)), + /* + Matrix.translate(new Vec(-cos, 0, sin)), + Matrix.translate(new Vec( cos, 0, sin)), + Matrix.translate(new Vec(-cos, 0, -sin)), + Matrix.translate(new Vec( cos, 0, -sin)), + + Matrix.translate(new Vec( 0, height, -z)), + Matrix.translate(new Vec(-r, height, x)), + Matrix.translate(new Vec( r, height, x)), + Matrix.translate(new Vec( 0, -height, z)), + Matrix.translate(new Vec(-r, -height, -x)), + Matrix.translate(new Vec( r, -height, -x)), + */ + }; + + + //for(int i=0; i 2000 && !force) return; + force = false; System.out.println("doubling vertices."); PriorityQueue es = new PriorityQueue(); for(Mesh.T t : tile) { @@ -608,32 +975,26 @@ public class Main extends MeshViewer { for(int i=0; i 0) { - while (breaks>0) { - breaks--; - breakit(); - } - seek_upward = true; - } else if (acceptance > 0.96) gamma = 0.1f; - else if (acceptance > 0.9) gamma = 0.2f; - else if (acceptance > 0.8) gamma = 0.3f; - else if (acceptance > 0.6) gamma = 0.4f; - else if (acceptance > 0.3) gamma = 0.6f; - else if (acceptance > 0.15) gamma = 0.9f; - else if (acceptance > 0.05) gamma = 0.94f; - else if (acceptance > 0.01) gamma = 0.98f; - else { /*breaks++;*/ } - - /* - if (seek_upward) { - if (acceptance > 0.2) seek_upward = false; - else gamma = 2-gamma; - } - */ - - if (anneal) - temp = temp * gamma; - - - HashSet hs = new HashSet(); - for(Mesh.Vertex p : tile.vertices()) hs.add(p); - Mesh.Vertex[] pts = (Mesh.Vertex[])hs.toArray(new Mesh.Vertex[0]); - - int count = 0; - long then = System.currentTimeMillis(); - for(int i=0; i<400; i++) { - if (anneal) { - count++; - Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length]; - rand(temp,v); - v.recomputeFundamentalQuadricIfStale(); - v.recomputeFundamentalQuadricIfNeighborChanged(); - } - Thread.yield(); - repaint(); - } - - /* - PriorityQueue es = new PriorityQueue(); - for(Mesh.T t : tile) { - float max = 5; - for(Mesh.E e : new Mesh.E[] { t.e1(), t.e2(), t.e3() }) { - if (e==null) continue; - if (e.stretchRatio() > max) es.add(e); - 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(); + if (!anneal) { repaint(); Thread.sleep(10); continue; } + + double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses)); + hits = 0; + misses = 0; + double gamma = 1; + acceptance = (ratio+acceptance)/2; + accepts = (int)(Math.ceil(ratio*100)); + temps = (int)(Math.ceil(temp*1000)); + vertss = tile.size(); + if (breaks > 0) { + while (breaks>0) { + breaks--; + breakit(); } + seek_upward = true; + continue; + } else if (acceptance > 0.96) gamma = 0.1f; + else if (acceptance > 0.9) gamma = 0.2f; + else if (acceptance > 0.8) gamma = 0.3f; + else if (acceptance > 0.6) gamma = 0.4f; + else if (acceptance > 0.3) gamma = 0.8f; + else if (acceptance > 0.15) gamma = 0.94f; + else if (acceptance > 0.10) gamma = 0.98f; + + else if (acceptance < 0.01) breaks++; + + if (seek_upward) { + if (acceptance > 0.25) seek_upward = false; + else gamma = 2-gamma; + } + if (anneal) + temp = temp * gamma; - tile.rebindPoints(); - */ + HashSet hs = new HashSet(); + for(Mesh.Vertex p : tile.vertices()) hs.add(p); + Mesh.Vertex[] pts = (Mesh.Vertex[])hs.toArray(new Mesh.Vertex[0]); - System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " + - "points_per_second=" + - (count*1000)/((double)(System.currentTimeMillis()-then))); - for(Mesh.Vertex p : goal.vertices()) { - p.quadricStale = true; - p.recomputeFundamentalQuadricIfNeighborChanged(); + int count = 0; + long then = System.currentTimeMillis(); + for(int i=0; i<300; i++) { + if (anneal) { + Mesh.Vertex v = pts[Math.abs(random.nextInt()) % pts.length]; + if (breaks>0) break; + if (!rand(temp,v)) { i--; continue; } + v.recomputeFundamentalQuadricIfStale(); + v.recomputeFundamentalQuadricIfNeighborChanged(); + count++; } + Thread.yield(); + repaint(); + } - synchronized(safeTriangles) { - safeTriangles.clear(); - for(Mesh.T t : tile) - //if (t.shouldBeDrawn()) - safeTriangles.add(t); - } + System.out.println("temp="+temp + " ratio="+(Math.ceil(acceptance*100)) + " " + + "points_per_second=" + + (count*1000)/((double)(System.currentTimeMillis()-then))); + for(Mesh.Vertex p : goal.vertices()) { + p.quadricStale = true; + p.recomputeFundamentalQuadricIfNeighborChanged(); + } } } } public static void main(String[] s) throws Exception { - StlFile stlf = new StlFile(); - stlf.load("torus.stl"); - //stlf.load("fish.stl"); - //stlf.load("monkey.stl"); - Frame f = new Frame(); - Main main = new Main(stlf, f); + JFrame f = new JFrame(); + f.setLayout(new BorderLayout()); + Main main = new Main(f); + f.add(main, BorderLayout.CENTER); + + f.addWindowListener(new WindowListener() { + public void windowActivated(WindowEvent e) { } + public void windowClosed(WindowEvent e) { System.exit(0); } + public void windowClosing(WindowEvent e) { System.exit(0); } + public void windowDeactivated(WindowEvent e) { } + public void windowDeiconified(WindowEvent e) { } + public void windowIconified(WindowEvent e) { } + public void windowOpened(WindowEvent e) { } + }); + f.pack(); f.show(); f.setSize(900, 900); f.doLayout(); + + JFrame f2 = new JFrame(); + f2.setJMenuBar(main.new MyMenuBar()); + f2.setSize(100,100); + f2.show(); + main.anneal(); } + } \ No newline at end of file