X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=3d0b0e4ae3d8d82385ce19c6083c935709d91edd;hp=95cd989487e9517dd2dc10229a2f470f933ed12e;hb=a4dade9d9503188c6e5638524213858b3d16304d;hpb=42acb5af8ff15b7af9fa8f34c071ee58e24faf98 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index 95cd989..3d0b0e4 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -6,26 +6,79 @@ 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.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 @@ -39,18 +92,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; @@ -70,7 +144,7 @@ public class Main extends MeshViewer { if (v.mag() < 0.0001) continue; v = v.times(-1); v = v.times(0.5f); - Point p = Point.ORIGIN.plus(v); + Point p = Point.ZERO.plus(v); v = v.times(-1); //System.out.println(v); @@ -79,7 +153,7 @@ public class Main extends MeshViewer { 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); @@ -107,7 +181,7 @@ public class Main extends MeshViewer { StlFile stlf = new StlFile(); InputStream res = this.getClass().getClassLoader().getResourceAsStream(file); stlf.readBinaryFile(file, res); - goal = new Mesh(false); + setGoal(new Mesh(false)); for(int i=0; i 2000 && !force) return; - force = false; - System.out.println("doubling vertices."); - PriorityQueue es = new PriorityQueue(); - for(Mesh.T t : tile) { - es.add(t.e1()); - es.add(t.e2()); - es.add(t.e3()); - Thread.yield(); - repaint(); - } - for(int i=0; i 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; - - - 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<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(); - } - - 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 { - JFrame f = new JFrame(); - Main main = new Main(f); - f.setJMenuBar(main.new MyMenuBar()); - f.pack(); - f.show(); - f.setSize(900, 900); - f.doLayout(); - main.anneal(); - } public class MyMenuItem extends JMenuItem implements ActionListener { public MyMenuItem(String s) { @@ -371,16 +285,14 @@ public class Main extends MeshViewer { } public void actionPerformed(ActionEvent event) { synchronized(Main.this) { - synchronized(safeTriangles) { hit(); - } } } public void hit() {} } public void hexBrick(boolean offset, boolean rotated) { - tile = new Mesh(false); + setTile(new Mesh(false)); float width = (float)0.8; float depth = (float)0.08; float height = (float)0.4; @@ -503,9 +415,9 @@ public class Main extends MeshViewer { 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; + 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[] { @@ -613,7 +525,7 @@ public class Main extends MeshViewer { hexBrick(false, true); }}); tileMenu.add(new MyMenuItem("Temp (do not use)") { public void hit() { - tile = new Mesh(false); + setTile(new Mesh(false)); float width = (float)0.8; float depth = (float)0.08; float height = (float)0.4; @@ -674,7 +586,7 @@ public class Main extends MeshViewer { fixupTile(); } }); tileMenu.add(new MyMenuItem("Dense Packing (hex)") { public void hit() { - tile = new Mesh(false); + setTile(new Mesh(false)); float width = (float)3.2; float depth = (float)0.32; float height = (float)1.6; @@ -715,8 +627,9 @@ public class Main extends MeshViewer { generateTile(transforms, tile); fixupTile(); } }); + tileMenu.add(new MyMenuItem("Slim Dense Packing (Cubic)") { public void hit() { - tile = new Mesh(false); + setTile(new Mesh(false)); float unit = 0.4f; float r = unit/2; float sin = (float)(unit * Math.sin(Math.PI/3)); @@ -726,6 +639,9 @@ public class Main extends MeshViewer { 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)), @@ -733,6 +649,13 @@ public class Main extends MeshViewer { 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)), @@ -742,14 +665,6 @@ public class Main extends MeshViewer { 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)), - 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.rotate(new Vec(0,0,1), (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)), @@ -761,18 +676,45 @@ public class Main extends MeshViewer { 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) { + es.add(t.e1()); + es.add(t.e2()); + es.add(t.e3()); + Thread.yield(); + repaint(); + } + for(int i=0; i 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; + + + 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<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(); + } + + 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 { + 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