X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=82944767eeab1a8e60a7b52f47147e1c11d7f382;hp=e4abd5a3f0f4cdf78967dd72630fe1d6e5823b01;hb=85a39fe7780fd06019b267db6b2854af1a840d0f;hpb=9a60e73a7339e38ca07ead4a1d4b8880eea34854 diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java index e4abd5a..8294476 100644 --- a/src/edu/berkeley/qfat/Main.java +++ b/src/edu/berkeley/qfat/Main.java @@ -6,19 +6,61 @@ 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: // -// - Implement "real" constraints (plane, line, point) -// -// - Constrained surface subdivision -// - Edge.flip() gets us the triforce subdivision -// - Edge.delete() gets us the catmull-clark subdivision -// - Catmull-Clark: just don't move points if we can't. Need to average the influence of the points on a binding group. -// // - Ability to snap three views to orthgonal // - SLIDE UI // - left button -> crystal ball @@ -30,28 +72,11 @@ import edu.berkeley.qfat.geom.Polygon; // 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 // - -// 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 @@ -64,20 +89,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? -// FIXME: re-orient goal (how?) +drawing modes: + - bounding box + - vertices + - edges + - visible-edges + - flat with or without edges + - shaded with or without edges + * contrasting-faces -public class Main extends InteractiveMeshViewer { - public Matrix[] transforms; +quadric decimation? + +show normals +show bounding box +show axes (big+fat) + */ + +public class Main extends InteractiveMeshViewer { public static int verts = 1; @@ -97,7 +141,7 @@ public class Main extends InteractiveMeshViewer { 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); @@ -106,7 +150,7 @@ public class Main extends InteractiveMeshViewer { 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); @@ -173,48 +217,51 @@ public class Main extends InteractiveMeshViewer { 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(), m); - t2.e2().bindEdge(t1.e2(), m); - t2.e1().bindEdge(t1.e3(), m); + 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(), m); - t2.e2().bindEdge(t1.e3(), m); - t2.e1().bindEdge(t1.e1(), m); + 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(), m); - t2.e2().bindEdge(t1.e1(), m); - t2.e1().bindEdge(t1.e2(), m); + 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().pair, m); - t2.e2().bindEdge(t1.e2().pair, m); - t2.e3().bindEdge(t1.e3().pair, m); + 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().pair, m); - t2.e3().bindEdge(t1.e2().pair, m); - t2.e1().bindEdge(t1.e3().pair, m); + 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().pair, m); - t2.e1().bindEdge(t1.e2().pair, m); - t2.e2().bindEdge(t1.e3().pair, m); + t2.e3().bindEdge(t1.e1(), m); + t2.e1().bindEdge(t1.e2(), m); + t2.e2().bindEdge(t1.e3(), m); } + } } } @@ -227,162 +274,6 @@ public class Main extends InteractiveMeshViewer { fixupGoal(); } - public void breakit() { - int oldverts = verts; - if (verts > 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.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) { @@ -397,6 +288,114 @@ public class Main extends InteractiveMeshViewer { public void hit() {} } + public void marchingCubes() { + Mesh mesh = new Mesh(false); + mesh.coalesce = true; + MarchingCubes.march(new VoxelData() { + float radius = 1.0f; + public float getMaxX() { return 1.0f; } + public float getMinX() { return -1.0f; } + public int getNumSamplesX() { return 10; } + public float getMaxY() { return 1.0f; } + public float getMinY() { return -1.0f; } + public int getNumSamplesY() { return 10; } + public float getMaxZ() { return 1.0f; } + public float getMinZ() { return -1.0f; } + public int getNumSamplesZ() { return 10; } + public float getSample(Point p) { + double x = p.x; + double y = p.y; + double z = p.z; + return (float)(radius-Math.sqrt(x*x+y*y+z*z)); + } + }, + mesh); + setTile(mesh); + //fixupTile(); + } + + public void marchingCubes2() { + try { + + final float[][][] samples = new float[256][256][124]; + double total = 0; + int count = 0; + for(int i=1; i<=124; i++) { + String ix = ""+i; + while(ix.length() < 3) ix = "0"+ix; + FileInputStream fis = new FileInputStream("/Users/megacz/Desktop/projects/mri brain images/spgr/I."+ix); + DataInputStream dis = new DataInputStream(new BufferedInputStream(fis)); + dis.skip(7904); + for(int x=0; x<256; x++) + for(int y=0; y<256; y++) { + short s = dis.readShort(); + samples[x][y][i-1] = (float)s; + total += samples[x][y][i-1]; + count++; + } + } + System.out.println("done reading samples; average sample is " + (total/count)); + + /* + PrintWriter pw = new PrintWriter(new FileOutputStream("/tmp/out")); + pw.println("new short[][][] {"); + for(int x=0; x<256; x++) { + if (x>0) pw.println(" ,"); + pw.println(" {"); + for(int y=0; y<256; y++) { + if (y>0) pw.println(" ,"); + pw.print(" {"); + for(int z=0; z<124; z++) { + if (z>0) pw.print(", "); + if ((z % 20) == 0) { + pw.println(); + pw.print(" "); + } + pw.print(shorts[x][y][z]); + } + pw.println(); + pw.println(" }"); + } + pw.println(" }"); + } + pw.println("};"); + pw.flush(); + pw.close(); + */ + + Mesh mesh = new Mesh(false); + mesh.coalesce = true; + MarchingCubes.march(new VoxelData() { + float radius = 1.0f; + public float getMaxX() { return 2.4f; } + public float getMinX() { return 0f; } + public int getNumSamplesX() { return 256/10; } + public float getMaxY() { return 2.4f; } + public float getMinY() { return 0f; } + public int getNumSamplesY() { return 256/10; } + public float getMaxZ() { return 1.86f; } + public float getMinZ() { return 0f; } + public int getNumSamplesZ() { return 124/10; } + public float getSample(Point p) { + int x = (int)Math.floor(p.x / ((double)getMaxX() / (double)256)); + int y = (int)Math.floor(p.y / ((double)getMaxY() / (double)256)); + int z = (int)Math.floor(p.z / ((double)getMaxZ() / (double)124)); + if ( (x<0) || (x>=samples.length) ) return 0; + if ( (y<0) || (y>=samples[x].length) ) return 0; + if ( (z<0) || (z>=samples[x][y].length) ) return 0; + return samples[x][y][z]; + } + }, + 200, + mesh); + setTile(mesh); + //fixupTile(); + + } catch (Exception e) { + e.printStackTrace(); + } + } + public void hexBrick(boolean offset, boolean rotated) { setTile(new Mesh(false)); float width = (float)0.8; @@ -521,9 +520,9 @@ public class Main extends InteractiveMeshViewer { 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[] { @@ -733,6 +732,7 @@ public class Main extends InteractiveMeshViewer { generateTile(transforms, tile); fixupTile(); } }); + tileMenu.add(new MyMenuItem("Slim Dense Packing (Cubic)") { public void hit() { setTile(new Mesh(false)); float unit = 0.4f; @@ -744,6 +744,9 @@ public class Main extends InteractiveMeshViewer { 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)), @@ -751,6 +754,13 @@ public class Main extends InteractiveMeshViewer { 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)), @@ -760,14 +770,6 @@ public class Main extends InteractiveMeshViewer { 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)), @@ -779,12 +781,39 @@ public class Main extends InteractiveMeshViewer { 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