X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FMain.java;h=3d0b0e4ae3d8d82385ce19c6083c935709d91edd;hp=50f44c07064fdb2db7c4b25e126f7667eb5c0851;hb=a4dade9d9503188c6e5638524213858b3d16304d;hpb=78303bd63882bf70a079f25874a8ff78fa0f652c

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 50f44c0..3d0b0e4 100644
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -1,30 +1,84 @@
 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.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 +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;
 
@@ -65,20 +140,20 @@ public class Main extends MeshViewer {
         HashSet<HalfSpace> halfSpaces = new HashSet<HalfSpace>();
         HashSet<Polygon> polygons = new HashSet<Polygon>();
         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 (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);
@@ -104,13 +179,14 @@ public class Main extends MeshViewer {
     public void loadGoal(String file) {
         try {
             StlFile stlf = new StlFile();
-            stlf.load(file);
-            goal = new Mesh(false);
+            InputStream res = this.getClass().getClassLoader().getResourceAsStream(file);
+            stlf.readBinaryFile(file, res);
+            setGoal(new Mesh(false));
             for(int i=0; i<stlf.coordArray.length; i+=3) {
                 Point p0 = new Point(stlf.coordArray[i+0].x * MAG, stlf.coordArray[i+0].y * MAG, stlf.coordArray[i+0].z * MAG);
                 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);
+                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, 0);
             }
             float goal_width  = goal.diagonal().dot(new Vec(1, 0, 0));
@@ -119,18 +195,21 @@ public class Main extends MeshViewer {
             
         } catch (Exception e) { throw new RuntimeException(e);}
     }
-    public void fixupGoal() {
+    public void fixupGoal() { fixupGoal(true, true); }
+    public void fixupGoal(boolean recenter, boolean lock) {
         // translate to match centroid
-        goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
-        goal.makeVerticesImmutable();
-        tile.error_against = goal;
-        goal.error_against = tile;
+        if (recenter)
+            goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
+        if (lock) {
+            goal.makeVerticesImmutable();
+            tile.error_against = goal;
+            goal.error_against = tile;
+        }
     }
 
     public Main(JFrame f) { super(f); }
 
-    public void fixupTile() { 
-        synchronized(safeTriangles) {
+    public synchronized void fixupTile() { 
         for(Matrix m1 : transforms) {
             for(Matrix m2 : transforms) {
                 if (m1==m2) continue;
@@ -138,48 +217,52 @@ public class Main extends MeshViewer {
                     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);
-                        }
+                        Point t1v1 = m.times(t1.v1().p);
+                        Point t1v2 = m.times(t1.v2().p);
+                        Point t1v3 = m.times(t1.v3().p);
 
-                        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);
+                        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.e3().bindEdge(t1.e3().pair, m);
+                            t2.e1().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);
+                        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.e1().bindEdge(t1.e3().pair, m);
+                            t2.e2().bindEdge(t1.e3().pair, m);
+                            t2.e1().bindEdge(t1.e1().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);
+                        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);
-                            t2.e2().bindEdge(t1.e3().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);
                         }
 
                     }
@@ -192,158 +275,8 @@ public class Main extends MeshViewer {
         tile.error_against = goal;
         goal.error_against = tile;
         fixupGoal();
-        }
-    }
-
-    public void breakit() {
-        int oldverts = verts;
-        System.out.println("doubling vertices.");
-        PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
-        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<Math.min(oldverts,50); i++) {
-            Mesh.E e = es.poll();
-            verts++;
-            e.shatter();
-            Thread.yield();
-            repaint();
-        }
-        tile.rebindPoints();
     }
 
-    public boolean rand(double temp, Mesh.Vertex p) {
-
-        p.reComputeErrorAround();
-        double tile_error = tile.error();
-        double goal_error = goal.error();
-
-        float max = p.averageEdgeLength()/5;
-        Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
-        v = v.norm().times((random.nextFloat() - 0.5f) * max);
-        Matrix m = Matrix.translate(v);
-
-        boolean good = p.move(m, false);
-        if (!good) { return false; }
-
-        double new_tile_error = tile.error();
-        double new_goal_error = goal.error();
-        double tile_delta = (new_tile_error - tile_error) / tile_error;
-        double goal_delta = (new_goal_error - goal_error) / goal_error;
-        double delta = tile_delta + goal_delta;
-        double swapProbability = Math.exp((-1 * delta) / temp);
-
-        //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
-        //boolean doSwap = good && (tile_delta + goal_delta <= 0);
-        //if (temp < 0.000001) doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
-        boolean doSwap = good && (Math.random() < swapProbability);
-        if (doSwap) {
-            tile_error = new_tile_error;
-            goal_error = new_goal_error;
-            hits++;
-            p.goodp = p.p;
-        } else {
-            p.move(Matrix.translate(v.times(-1)), true);
-            misses++;
-        }
-        p.reComputeErrorAround();
-        return true;
-    }
-
-    float hits = 0;
-    float misses = 0;
-    public void anneal() throws Exception {
-        double hightemp = 1;
-        temp = hightemp;
-        double last = 10;
-        boolean seek_upward = false;
-        double acceptance = 1;
-        while(true) {
-            synchronized(safeTriangles) {
-                safeTriangles.clear();
-                for(Mesh.T t : tile) 
-                    if (t.shouldBeDrawn())
-                        safeTriangles.add(t);
-            }
-            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 { breaks++; }
-
-            if (seek_upward) {
-                if (acceptance > 0.25) seek_upward = false;
-                else gamma = 2-gamma;
-            }
-
-            if (anneal)
-                temp = temp * gamma;
-
-
-            HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
-            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) {
@@ -352,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;
@@ -484,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[] {
@@ -534,11 +465,38 @@ public class Main extends MeshViewer {
             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();
             }});
@@ -553,7 +511,7 @@ public class Main extends MeshViewer {
             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/3.3f));
+                goal.transform(Matrix.scale(factor/2.5f));
                 goal.transform(Matrix.rotate(new Vec(0, 1, 0), (float)(Math.PI/2)));
                 fixupGoal();
             }});
@@ -567,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;
@@ -627,8 +585,8 @@ public class Main extends MeshViewer {
                 };
                 fixupTile();
             } });
-            tileMenu.add(new MyMenuItem("Dense Packing (Hex)") { public void hit() {
-                tile = new Mesh(false);
+            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;
@@ -669,55 +627,98 @@ public class Main extends MeshViewer {
                 generateTile(transforms, tile);
                 fixupTile();
             } });
-            tileMenu.add(new MyMenuItem("Slim Dense Packing (Hex)") { public void hit() {
-                tile = new Mesh(false);
-                float width  = (float)3.2;
-                float depth  = (float)0.32;
-                float height = (float)1.6;
+
+            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));
-                height = 2*r*(float)Math.sqrt(2f/3f);
+                float height = 2*r*(float)Math.sqrt(2f/3f);
 
+                transforms = new Matrix[] {
 
-                r *= 0.3f;
-                cos *= 0.3f;
-                unit *= 0.3f;
-                height *= 1.5f;
+                    //Matrix.reflect(new Vec( 0,  height, -z).norm()),
 
-                /*
-                  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,
+
+                    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<transforms.length; i++) transforms[i] = Matrix.translate(m.times(vecs[i]));
+
+                Matrix m = Matrix.scale(1.9f, 1f ,1);
+                //Matrix m = Matrix.scale(1f, 2.1f, 1f);
+                tile.transform(m);
+                for(int i=0; i<transforms.length; i++)
+                    transforms[i] = preMultiplyTranslationalComponentBy(transforms[i], m);
+
+
                 fixupTile();
+
             } });
             tileMenu.add(new MyMenuItem("Genus-1") { public void hit() {
                 synchronized(this) {
-                    tile = new Mesh(false);
+                    setTile(new Mesh(false));
+                    Matrix mm = Matrix.scale(0.1f);
                     float height = 4;
                     float width  = 4;
                     float depth  = 1;
-                    Matrix mm = Matrix.scale(0.1f);
                     // top
                     quad(tile, mm, 
                          new Point( 2,  2,  0),
@@ -804,6 +805,7 @@ public class Main extends MeshViewer {
                         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)),
 
                         /*
@@ -842,13 +844,270 @@ public class Main extends MeshViewer {
                     };
                     fixupTile();
                 }}});
+            tileMenu.add(new MyMenuItem("Hammerhead") { public void hit() {
+                synchronized(this) {
+                    setTile(new Mesh(false));
+                    Matrix mm = Matrix.ONE;
+                    float height1 = .1f;
+                    float height2 = .1f;
+                    float width  = .4f;
+                    float depth  = .1f;
+                    // top
+                    Point a1 = new Point( -width/2,         height2/2, -depth/2);
+                    Point b1 = new Point(        0,         height2/2, -depth/2);
+                    Point c1 = new Point(        0, height1+height2/2, -depth/2);
+                    Point d1 = new Point(  width/2, height1+height2/2, -depth/2);
+                    Point e1 = new Point(  width/2,         height2/2, -depth/2);
+                    Point f1 = new Point(  width/2,        -height2/2, -depth/2);
+                    Point g1 = new Point(  width/2,-height1-height2/2, -depth/2);
+                    Point h1 = new Point(        0,-height1-height2/2, -depth/2);
+                    Point i1 = new Point(        0,        -height2/2, -depth/2);
+                    Point j1 = new Point( -width/2,        -height2/2, -depth/2);
+                    Point a2 = new Point( -width/2,         height2/2,  depth/2);
+                    Point b2 = new Point(        0,         height2/2,  depth/2);
+                    Point c2 = new Point(        0, height1+height2/2,  depth/2);
+                    Point d2 = new Point(  width/2, height1+height2/2,  depth/2);
+                    Point e2 = new Point(  width/2,         height2/2,  depth/2);
+                    Point f2 = new Point(  width/2,        -height2/2,  depth/2);
+                    Point g2 = new Point(  width/2,-height1-height2/2,  depth/2);
+                    Point h2 = new Point(        0,-height1-height2/2,  depth/2);
+                    Point i2 = new Point(        0,        -height2/2,  depth/2);
+                    Point j2 = new Point( -width/2,        -height2/2,  depth/2);
+
+                    quad(tile, mm, a1, b1, i1, j1);
+                    quad(tile, mm, c1, d1, e1, b1);
+                    quad(tile, mm, b1, e1, f1, i1);
+                    quad(tile, mm, i1, f1, g1, h1);
+
+                    quad(tile, mm, j2, i2, b2, a2);
+                    quad(tile, mm, b2, e2, d2, c2);
+                    quad(tile, mm, i2, f2, e2, b2);
+                    quad(tile, mm, h2, g2, f2, i2);
+
+                    quad(tile, mm, d1, d2, e2, e1);
+                    quad(tile, mm, e1, e2, f2, f1);
+                    quad(tile, mm, f1, f2, g2, g1);
+                    quad(tile, mm, h1, g1, g2, h2);
+                    quad(tile, mm, i2, i1, h1, h2);
+                    quad(tile, mm, j1, i1, i2, j2);
+                    quad(tile, mm, a2, a1, j1, j2);
+                    quad(tile, mm, a1, a2, b2, b1);
+                    quad(tile, mm, c2, c1, b1, b2);
+                    quad(tile, mm, c1, c2, d2, d1);
+
+                    transforms = new Matrix[] {
+
+                        mm.times(Matrix.translate(new Vec(   width,     0, 0))),
+                        mm.times(Matrix.translate(new Vec(  -width,     0, 0))),
+                        mm.times(Matrix.translate(new Vec(-width/2, height1+height2, 0))),
+                        mm.times(Matrix.translate(new Vec( width/2, height1+height2, 0))),
+                        mm.times(Matrix.translate(new Vec(-width/2,-height1-height2, 0))),
+                        mm.times(Matrix.translate(new Vec( width/2,-height1-height2, 0))),
+
+                        mm.times(Matrix.translate(new Vec(   width/2,     0,  depth))),
+                        mm.times(Matrix.translate(new Vec(  -width/2,     0,  depth))),
+                        mm.times(Matrix.translate(new Vec(         0, height1+height2,  depth))),
+                        mm.times(Matrix.translate(new Vec(         0,-height1-height2,  depth))),
+
+                        mm.times(Matrix.translate(new Vec(   width/2,     0, -depth))),
+                        mm.times(Matrix.translate(new Vec(  -width/2,     0, -depth))),
+                        mm.times(Matrix.translate(new Vec(         0, height1+height2, -depth))),
+                        mm.times(Matrix.translate(new Vec(         0,-height1-height2, -depth))),
+
+                        Matrix.ONE
+                    };
+                    fixupTile();
+                }}});
 
             // Finally, add all the menus to the menu bar.
             add(tileMenu);
-            add(goalMenu);
-            add(hideMenu);
+            //add(goalMenu);
+            //add(hideMenu);
         }
 
     }
 
+    private static Matrix preMultiplyTranslationalComponentBy(Matrix mthis, Matrix mm) {
+        Vec v = mm.times(mthis.getTranslationalComponent());
+        return new Matrix(mthis.a, mthis.b, mthis.c, v.x,
+                          mthis.e, mthis.f, mthis.g, v.y,
+                          mthis.i, mthis.j, mthis.k, v.z,
+                          mthis.m, mthis.n, mthis.o, 1);
+    }
+
+//////////////////////////////////////////////////////////////////////////////
+    public void breakit() {
+        int oldverts = verts;
+        if (verts > 2000 && !force) return;
+        force = false;
+        System.out.println("doubling vertices.");
+        PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
+        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<Math.min(oldverts,50); i++) {
+            Mesh.E e = es.poll();
+            verts++;
+            e.shatter();
+            Thread.yield();
+            repaint();
+        }
+        System.out.println("now have " + verts + " vertices; max is 2000");
+        tile.rebindPoints();
+    }
+
+    public boolean rand(double temp, Mesh.Vertex p) {
+
+        p.reComputeErrorAround();
+        double tile_error = tile.error();
+        double goal_error = goal.error();
+
+        float max = p.averageEdgeLength()/5;
+        Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
+        v = v.norm().times((random.nextFloat() - 0.5f) * max);
+        Matrix m = Matrix.translate(v);
+        boolean good = p.move(v, false);
+        if (!good) { return false; }
+
+        double new_tile_error = tile.error();
+        double new_goal_error = goal.error();
+        double tile_delta = (new_tile_error - tile_error) / tile_error;
+        double goal_delta = (new_goal_error - goal_error) / goal_error;
+        double delta = tile_delta + goal_delta;
+        double swapProbability = Math.exp((-1 * delta) / temp);
+
+        //boolean doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+        //boolean doSwap = good && (tile_delta + goal_delta <= 0);
+        //if (temp < 0.000001) doSwap = good && (tile_delta <= 0 && goal_delta <= 0);
+        boolean doSwap = good && (Math.random() < swapProbability);
+
+        // always move uphill if possible -- potential idea
+        if (tile_delta <= 0 && goal_delta <= 0 && good) doSwap = true;
+        if (hillclimb)
+            doSwap = tile_delta <= 0 && goal_delta <= 0 && good;
+
+        if (doSwap) {
+            tile_error = new_tile_error;
+            goal_error = new_goal_error;
+            hits++;
+            p.goodp = p.p;
+        } else {
+            p.move(v.times(-1), true);
+            misses++;
+        }
+        p.reComputeErrorAround();
+        return true;
+    }
+
+    float hits = 0;
+    float misses = 0;
+    public void anneal() throws Exception {
+        double hightemp = 1;
+        temp = hightemp;
+        double last = 10;
+        boolean seek_upward = false;
+        double acceptance = 1;
+        while(true) {
+            synchronized(this) {
+                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;
+
+
+            HashSet<Mesh.Vertex> hs = new HashSet<Mesh.Vertex>();
+            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