checkpoint

darcs-hash:20071220192327-5007d-8c84679190d6bbc4ff25bb3eae356e772e73ca09.gz

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 2af52bf..50f44c0 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -70,20 +70,6 @@ public class Main extends MeshViewer {
             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);
@@ -115,483 +101,98 @@ 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<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);
-            Mesh.T t  = goal.newT(p0, p1, p2, n, 0);
-        }
-
-        // rotate to align major axis -- this probably needs to be done by a human.
-        //goal.transform(Matrix.rotate(new Vec(0, 0, 1), (float)(Math.PI/2)));
-
-
-        float goal_width  = goal.diagonal().dot(new Vec(1, 0, 0));
-        float goal_height = goal.diagonal().dot(new Vec(0, 1, 0));
-        float goal_depth  = goal.diagonal().dot(new Vec(0, 0, 1));
-
-        /*
-          float width  = (float)0.6;
-          float height = (float)0.08;
-          float depth  = (float)0.3;
-        */
-        
-        float width  = (float)0.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;
-        translations = 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
-        };
-
-        float unit = 0.1f;
-        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);
-
-
-        r *= 0.3f;
-        cos *= 0.3f;
-        unit *= 0.3f;
-
-
-        /*
-        sin *= 0.3f;
-        x *= 0.3f;
-        z *= 0.3f;
-        */
-        translations = 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)),
-        };
-
-
-        /*
-        translations = new Matrix[] {
-
-            //Matrix.translate(new Vec(lshift,  depth,    halfup)),
-            //Matrix.translate(new Vec(rshift,  depth,    halfup)),
-            //Matrix.translate(new Vec(lshift, -depth,    halfup)),
-            //Matrix.translate(new Vec(rshift, -depth,    halfup)),
-
-
-            //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)),
-
-        };
-        */
-        //   
-
-
-        //generateTile(translations, tile);
-
-        Point ltf = new Point(lshift,  (depth/2),  (height/2));
-        Point mtf = new Point( 0.0,    (depth/2),  (height/2));
-        Point rtf = new Point(rshift,  (depth/2),  (height/2));
-        Point lbf = new Point(lshift, -(depth/2),  (height/2));
-        Point mbf = new Point( 0.0,   -(depth/2),  (height/2));
-        Point rbf = new Point(rshift, -(depth/2),  (height/2));
-
-        Point ltc = new Point(lshift,  (depth/2), 0);
-        Point mtc = new Point( 0.0,    (depth/2), 0);
-        Point rtc = new Point(rshift,  (depth/2), 0);
-        Point lbc = new Point(lshift, -(depth/2), 0);
-        Point mbc = new Point( 0.0,   -(depth/2), 0);
-        Point rbc = new Point(rshift, -(depth/2), 0);
-
-        Point ltn = new Point(lshift,  (depth/2), -(height/2));
-        Point mtn = new Point( 0.0,    (depth/2), -(height/2));
-        Point rtn = new Point(rshift,  (depth/2), -(height/2));
-        Point lbn = new Point(lshift, -(depth/2), -(height/2));
-        Point mbn = new Point( 0.0,   -(depth/2), -(height/2));
-        Point rbn = new Point(rshift, -(depth/2), -(height/2));
-
-        
-        Point[] 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);
-*/
-        /*
-        HashSet<Mesh.E> es = new HashSet<Mesh.E>();
-        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)(2*Math.PI/2)),
-            /*
-            Matrix.rotate(new Vec(0,0,1), (float)(1*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);
-                    }
-
-                    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);
-                    }
-
-                }
+    public void loadGoal(String file) {
+        try {
+            StlFile stlf = new StlFile();
+            stlf.load(file);
+            goal = 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);
+                Mesh.T t  = goal.newT(p0, p1, p2, n, 0);
             }
-        }
-        }
-
-        //xMesh.Vertex mid = lbf.getE(mbn).shatter();
-
-        // rescale to match volume
-
-
-        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)));
-
+            float goal_width  = goal.diagonal().dot(new Vec(1, 0, 0));
+            float goal_height = goal.diagonal().dot(new Vec(0, 1, 0));
+            float goal_depth  = goal.diagonal().dot(new Vec(0, 0, 1));
+            
+        } catch (Exception e) { throw new RuntimeException(e);}
+    }
+    public void fixupGoal() {
         // translate to match centroid
         goal.transform(Matrix.translate(tile.centroid().minus(goal.centroid())));
         goal.makeVerticesImmutable();
+        tile.error_against = goal;
+        goal.error_against = tile;
+    }
 
-        //tx.e2.shatter();
-        //tx.e3.shatter();
-
+    public Main(JFrame f) { super(f); }
+
+    public void fixupTile() { 
+        synchronized(safeTriangles) {
+        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);
+                        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);
+                        }
+
+                        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);
+                        }
 
+                    }
+                }
+            }
+        }
         tile.rebindPoints();
-
-        //mid.move(new Vec((float)0,0,(float)-0.05));
-        //ltn.move(new Vec((float)0,0,(float)-0.05));
-
-        //mtf.move(new Vec(0, (float)-0.05, (float)0.05));
-
-
         System.out.println("tile volume: " + tile.volume());
         System.out.println("goal volume: " + goal.volume());
-
         tile.error_against = goal;
         goal.error_against = tile;
+        fixupGoal();
+        }
     }
 
     public void breakit() {
@@ -608,8 +209,6 @@ public class Main extends MeshViewer {
         for(int i=0; i<Math.min(oldverts,50); i++) {
             Mesh.E e = es.poll();
             verts++;
-            //System.out.println("shatter " + e);
-            //e.shatter(e.midpoint(), null, null, true, true);
             e.shatter();
             Thread.yield();
             repaint();
@@ -617,23 +216,19 @@ public class Main extends MeshViewer {
         tile.rebindPoints();
     }
 
-    public synchronized void rand(double temp, Mesh.Vertex p) {
+    public boolean rand(double temp, Mesh.Vertex p) {
 
         p.reComputeErrorAround();
         double tile_error = tile.error();
         double goal_error = goal.error();
 
-        //float max = p.averageEdgeLength()/10;
-        float max = 0.01f;
-
+        float max = p.averageEdgeLength()/5;
         Vec v = new Vec(random.nextFloat(), random.nextFloat(), random.nextFloat());
         v = v.norm().times((random.nextFloat() - 0.5f) * max);
-        //System.out.println(max + " " + p.averageEdgeLength() + " " + v.mag());
         Matrix m = Matrix.translate(v);
 
-        //System.out.println(v.mag() + " " + max);
         boolean good = p.move(m, false);
-        if (!good) { /*misses++;*/ return; }
+        if (!good) { return false; }
 
         double new_tile_error = tile.error();
         double new_goal_error = goal.error();
@@ -641,17 +236,14 @@ public class Main extends MeshViewer {
         double goal_delta = (new_goal_error - goal_error) / goal_error;
         double delta = tile_delta + goal_delta;
         double swapProbability = Math.exp((-1 * delta) / temp);
-        //System.out.println(swapProbability);
-        boolean doSwap = good && (Math.random() < swapProbability);
+
         //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;
-            //System.out.println("error: " + tile_error + " / " + goal_error);
             hits++;
             p.goodp = p.p;
         } else {
@@ -659,118 +251,93 @@ public class Main extends MeshViewer {
             misses++;
         }
         p.reComputeErrorAround();
+        return true;
     }
 
     float hits = 0;
     float misses = 0;
     public void anneal() throws Exception {
         double hightemp = 1;
-        double temp = hightemp;
+        temp = hightemp;
         double last = 10;
         boolean seek_upward = false;
         double acceptance = 1;
         while(true) {
-            synchronized(this) {
-                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;
-                } 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<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<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();
+            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;
+            }
 
-                /*
-                PriorityQueue<Mesh.E> es = new PriorityQueue<Mesh.E>();
-                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)
+                temp = temp * gamma;
 
 
-                tile.rebindPoints();
-                */
+            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]);
 
-
-                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();
+        Main main = new Main(f);
+        f.setJMenuBar(main.new MyMenuBar());
         f.pack();
         f.show();
         f.setSize(900, 900);
@@ -778,4 +345,510 @@ public class Main extends MeshViewer {
         main.anneal();
     }
 
+    public class MyMenuItem extends JMenuItem implements ActionListener {
+        public MyMenuItem(String s) {
+            super(s);
+            this.addActionListener(this);
+        }
+        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);
+                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));
+
+        
+                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<Mesh.E> es = new HashSet<Mesh.E>();
+                    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();
+                    }
+                    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();
+    }
+
+    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") { 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)));
+                float factor = (float)Math.pow(tile.volume() / goal.volume(), 1.0/3.0);
+                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/3.3f));
+                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() {
+                tile = 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() {
+                tile = 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);
+
+                /*
+                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 (Hex)") { public void hit() {
+                tile = 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);
+
+
+                r *= 0.3f;
+                cos *= 0.3f;
+                unit *= 0.3f;
+                height *= 1.5f;
+
+                /*
+                  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("Genus-1") { public void hit() {
+                synchronized(this) {
+                    tile = new Mesh(false);
+                    float height = 4;
+                    float width  = 4;
+                    float 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));
+
+                    height = 4;
+                    width  = 4;
+                    depth  = 1;
+
+
+                    transforms = 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)(1*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,
+                    };
+                    fixupTile();
+                }}});
+
+            // Finally, add all the menus to the menu bar.
+            add(tileMenu);
+            add(goalMenu);
+            add(hideMenu);
+        }
+
+    }
+
 }
\ No newline at end of file

diff --git a/src/edu/berkeley/qfat/Mesh.java b/src/edu/berkeley/qfat/Mesh.java
index 1e83eee..34a8de2 100644 (file)
--- a/src/edu/berkeley/qfat/Mesh.java
+++ b/src/edu/berkeley/qfat/Mesh.java
@@ -52,6 +52,7 @@ public class Mesh implements Iterable<Mesh.T> {
         ArrayList<Vertex> set = new ArrayList<Vertex>();
         for(Vertex v : vertices) set.add(v);
         for(Vertex v : set) v.transform(m.times(v.p), true, null);
+        for(Vertex v : set) v.goodp = v.p;
     }
 
     public void rebuild() { /*vertices.rebuild();*/ }
@@ -147,15 +148,20 @@ public class Mesh implements Iterable<Mesh.T> {
 
             if (!immutableVertices && quadric_count == 0)
                 nerror *= 2;
-                
+            //System.out.println(nerror);
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
-                double ang = Math.abs(e.dihedralAngle());
+                double ang = e.dihedralAngle();
                 if (ang > Math.PI) throw new Error();
-                float minangle = (float)(Math.PI * 0.8);
-                if (ang > minangle) nerror += (ang - minangle);
+                if (ang < -Math.PI) throw new Error();
+                //float minangle = (float)(Math.PI * 0.8);
+                nerror += ((ang / Math.PI)*(ang/Math.PI)) * e.length() * 0.01;
+                //System.out.println(((ang / Math.PI)*(ang/Math.PI)) * 0.000001);
+                //if (ang > minangle) nerror += (ang - minangle);
+                /*
                 if (e.t.aspect() < 0.2) {
                     nerror += (0.2-e.t.aspect()) * 10;
                 }
+                */
             }
 
             setError(nerror);
@@ -169,6 +175,7 @@ public class Mesh implements Iterable<Mesh.T> {
             //     t2' = t2.getMatrix(t1) * M * t1
             //     t1 =     t1.getMatrix(t2) * t2
             // M * t1 = M * t1.getMatrix(t2) * t2
+
             if (bindingGroup!=null && this != bindingGroup.getMaster()) {
                 Matrix v = getBindingMatrix(bindingGroup.getMaster());
                 return ((Vertex)bindingGroup.getMaster()).move(v.inverse().times(m).times(v), ignoreProblems);
@@ -195,7 +202,7 @@ public class Mesh implements Iterable<Mesh.T> {
                 good &= v.transform(pt2, ignoreProblems, v.getBindingMatrix(this));
             }
 
-            if (!good) {
+            if (!good && !ignoreProblems) {
                 for(Vertex v : (Iterable<Vertex>)getBoundPeers()) 
                     v.transform(v.oldp, true, null);
             }
@@ -216,16 +223,16 @@ public class Mesh implements Iterable<Mesh.T> {
 
 
             illegal = false;
-            if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) {
             /*
+            if (this.p.minus(newp).mag() > 0.1 && !ignoreProblems) {
                 try {
                     throw new Exception(""+this.p.minus(newp).mag()+" "+ignoreProblems+" "+yes);
                 } catch(Exception e) {
                     e.printStackTrace();
                 }
-            */
                 illegal = true;
             }
+            */
 
             this.p = newp;
             reinsert();
@@ -240,11 +247,13 @@ public class Mesh implements Iterable<Mesh.T> {
         } 
 
         public void checkLegality() {
+
             for(E e = this.e; e!=null; e=e.pair.next==this.e?null:e.pair.next) {
                 if (Math.abs(e.dihedralAngle()) > (Math.PI * 0.9) ||
                     Math.abs(e.next.dihedralAngle()) > (Math.PI * 0.9)) illegal = true;
                 if (e.t.aspect() < 0.2) illegal = true;
             }
+
             if (!illegal) triangles.range(oldp, this.p, (Visitor<T>)this);
         }
 
@@ -337,6 +346,7 @@ public class Mesh implements Iterable<Mesh.T> {
             for(E eother : nbg) {
                 if (next==null || prev==null) continue;
                 if (eother.next==null || eother.prev==null) continue;
+
                 if (next.isBoundTo(eother.pair.prev.pair) && !prev.isBoundTo(eother.pair.next.pair))
                     prev.bindTo(next.getBindingMatrix(eother.pair.prev.pair), eother.pair.next.pair);
                 if (!next.isBoundTo(eother.pair.prev.pair) && prev.isBoundTo(eother.pair.next.pair))
@@ -399,6 +409,8 @@ public class Mesh implements Iterable<Mesh.T> {
                 if (e==this) continue;
                 p1.bindTo(getBindingMatrix(e), e.p1);
                 p2.bindTo(getBindingMatrix(e), e.p2);
+                e.p1.setConstraint(getConstraint());
+                e.p2.setConstraint(getConstraint());
             }
         }
 
@@ -439,11 +451,11 @@ public class Mesh implements Iterable<Mesh.T> {
                 e.p1.getE(mid).pair.     bindTo(e.getBindingMatrix(firste), first.pair);
                 e.p2.getE(mid).pair.     bindTo(e.getBindingMatrix(firste), firstq);
                 e.p2.getE(mid).pair.pair.bindTo(e.getBindingMatrix(firste), firstq.pair);
-                first.bindingGroup.setKrank(e.bindingGroup.krank);
-                firstq.bindingGroup.setKrank(e.bindingGroup.krank);
-                first.pair.bindingGroup.setKrank(e.bindingGroup.krank);
-                firstq.pair.bindingGroup.setKrank(e.bindingGroup.krank);
             }
+            if (firste.bindingGroup != null)
+                firste.bindingGroup.setKrank(bindingGroup.krank);
+            if (firstq.bindingGroup != null)
+                firstq.bindingGroup.setKrank(bindingGroup.krank);
             return null;
         }
 
@@ -493,7 +505,12 @@ public class Mesh implements Iterable<Mesh.T> {
         public double dihedralAngle() {
             Vec v1 = t.norm().times(-1);
             Vec v2 = pair.t.norm().times(-1);
-            return Math.acos(v1.norm().dot(v2.norm()));
+            double prod = v1.norm().dot(v2.norm());
+            prod = Math.min(1,prod);
+            prod = Math.max(-1,prod);
+            double ret = Math.acos(prod);
+            if (Double.isNaN(ret)) throw new Error("nan! " + prod);
+            return ret;
         }
 
         /** angle between this half-edge and the next */

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index 9e98480..2e52797 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -14,15 +14,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
     public Mesh tile = new Mesh(false);
     public Mesh goal = new Mesh(false);
-    public Matrix[] translations;
+    public Matrix[] transforms;
     public Mesh.Vertex[] points;
 
-
+    public double temp;
     public boolean tileon = true;
     public boolean tilemeshon = false;
-    public boolean goalon = false;
+    public boolean goalon = true;
     public boolean anneal = false;
     public boolean neighbors = false;
+    public boolean neighborsWire = false;
+    public boolean neighborsWireOne = false;
 
     public int breaks = 0;
     boolean alt = false;
@@ -40,6 +42,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             case KeyEvent.VK_ALT: alt = true; break;
             case KeyEvent.VK_SHIFT: shift = true; break;
             case KeyEvent.VK_SPACE: breaks++; break;
+            case KeyEvent.VK_UP: temp = temp * 2; break;
+            case KeyEvent.VK_ENTER: temp = 10; break;
             case KeyEvent.VK_D: dump(); break;
             case KeyEvent.VK_A: anneal = !anneal; break;
             case KeyEvent.VK_N: neighbors = !neighbors; break;
@@ -152,9 +156,10 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public    int vertss;
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
-    public void display(GLAutoDrawable drawable) {
+    public synchronized void display(GLAutoDrawable drawable) {
+
+        if (transforms==null) return;
 
-        if (translations==null) return;
 
         glcanvas.setSize(f.getWidth(), f.getHeight() - 100);
         Graphics2D g = (Graphics2D)f.getGraphics();
@@ -191,16 +196,17 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         gl.glBegin(GL.GL_TRIANGLES);
         gl.glColor4f((float)0.5, (float)0.5, (float)0.5, (float)0.8);
         if (goalon)
-        draw(gl, false, goal);
+            draw(gl, false, goal);
         gl.glEnd();
 
 
         int i = 0;
         //gl.glDisable(GL.GL_DEPTH_TEST);
         gl.glColor4f(1,1,1,1);
-        for(Matrix m : translations) {
+        for(Matrix m : transforms) {
             //if (v1.z==0 && v1.y==0) continue;
             i++;
+            if (neighborsWireOne && i>1) continue;
             //if (i>4) continue;
             /*
             Point p = new Point(0, 0, 0).times(m);
@@ -208,13 +214,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
             v = v.times((float)1.04);
             gl.glTranslatef(v.x, v.y, v.z);
             */
-            if (neighbors) draw(gl, false, safeTriangles, m);
+            if (neighbors) draw(gl, true, safeTriangles, m);
+            else if (neighborsWire || neighborsWireOne) draw(gl, false, safeTriangles, m);
             /*
             gl.glTranslatef(-v.x, -v.y, -v.z);
             */
         }
         //gl.glEnable(GL.GL_DEPTH_TEST);
         gl.glEnable (GL.GL_LIGHTING);
+
     }
 
     protected HashSet<Mesh.T> safeTriangles = new HashSet<Mesh.T>();
@@ -252,22 +260,26 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
             if (triangles) {
                 gl.glBegin(GL.GL_TRIANGLES);
-                t.glVertices(gl);
+                if (t.shouldBeDrawn()) {
+                    m.times(t.norm()).glNormal(gl);
+                    m.times(t.v1().goodp).glVertex(gl);
+                    m.times(t.v2().goodp).glVertex(gl);
+                    m.times(t.v3().goodp).glVertex(gl);
+                    //t.glVertices(gl, m);
+                }
                 gl.glEnd();
             } else {
-
                 gl.glDisable(GL.GL_LIGHTING);
                 gl.glBegin(GL.GL_LINES);
                 gl.glColor3f(1, 1, 1);
-                m.times(t.e1().p1.p).glVertex(gl);
-                m.times(t.e1().p2.p).glVertex(gl);
-                m.times(t.e2().p1.p).glVertex(gl);
-                m.times(t.e2().p2.p).glVertex(gl);
-                m.times(t.e3().p1.p).glVertex(gl);
-                m.times(t.e3().p2.p).glVertex(gl);
+                m.times(t.e1().p1.goodp).glVertex(gl);
+                m.times(t.e1().p2.goodp).glVertex(gl);
+                m.times(t.e2().p1.goodp).glVertex(gl);
+                m.times(t.e2().p2.goodp).glVertex(gl);
+                m.times(t.e3().p1.goodp).glVertex(gl);
+                m.times(t.e3().p2.goodp).glVertex(gl);
                 gl.glEnd();
                 gl.glEnable(GL.GL_LIGHTING);
-
             }
 
             Point centroid = t.centroid();
@@ -298,14 +310,15 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
 
 
     //private JTextArea ocanvas = new JTextArea();
-    private Frame f;
+    private JFrame f;
     private GLCanvas glcanvas;
-    public MeshViewer(Frame f) {
+    public MeshViewer(JFrame f) {
         this.f = f;
        GLCapabilities glcaps = new GLCapabilities();
         glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(this);
         f.add(glcanvas, BorderLayout.CENTER);
+
         glcanvas.addMouseListener(this);
         glcanvas.addMouseMotionListener(this);
         glcanvas.addMouseWheelListener(this);
@@ -314,4 +327,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     public void repaint() {
         glcanvas.repaint();
     }
+
+
+
 }
\ No newline at end of file

diff --git a/src/edu/berkeley/qfat/geom/HasBindingGroup.java b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
index d884672..2a44314 100644 (file)
--- a/src/edu/berkeley/qfat/geom/HasBindingGroup.java
+++ b/src/edu/berkeley/qfat/geom/HasBindingGroup.java
@@ -1,6 +1,7 @@
 package edu.berkeley.qfat.geom;
 import javax.media.opengl.*;
 import java.util.*;
+import edu.berkeley.qfat.Mesh;
 
 public abstract class HasBindingGroup {
 
@@ -19,10 +20,11 @@ public abstract class HasBindingGroup {
             if (getBindingMatrix(other).equals(bindingMatrix))
                 return;
             /*
-            throw new Error("rebind attempt: "+this+" and "+other+" with "
-                            + bindingMatrix
-                            + "; expected "
-                            + getBindingMatrix(other));
+            if (this instanceof Mesh.E)
+                throw new Error("rebind attempt: "+this+" and "+other+" with "
+                                + bindingMatrix
+                                + "; expected "
+                                + getBindingMatrix(other));
             */
             Matrix vom = other.getBindingMatrix(bindingGroup.getMaster());
             Matrix v2 = bindingMatrix;
@@ -68,6 +70,19 @@ public abstract class HasBindingGroup {
         return bindingGroup.getMaster();
     }
 
+    public Matrix getConstraint() {
+        if (bindingGroup==null) return Matrix.ONE;
+        Matrix v = getBindingMatrix(getMaster());
+        return v.inverse().times(bindingGroup.krank).times(v);
+    }
+    public void setConstraint(Matrix m) {
+        /*
+        if (bindingGroup==null) bindingGroup = new BindingGroup(this);
+        Matrix v = getBindingMatrix(getMaster());
+        bindingGroup.krank = bindingGroup.krank.times(v.inverse().times(m).times(v));
+        */
+    }
+
     public void unbind() {
         if (bindingGroup==null) return;
         bindingGroup.unbind(this);

diff --git a/src/edu/berkeley/qfat/geom/Triangle.java b/src/edu/berkeley/qfat/geom/Triangle.java
index 7c54357..9d16661 100644 (file)
--- a/src/edu/berkeley/qfat/geom/Triangle.java
+++ b/src/edu/berkeley/qfat/geom/Triangle.java
@@ -29,6 +29,12 @@ public abstract class Triangle implements HasBoundingBox {
         p2().glVertex(gl);
         p3().glVertex(gl);
     }
+    public void glVertices(GL gl, Matrix m) {
+        m.times(norm()).glNormal(gl);
+        m.times(p1()).glVertex(gl);
+        m.times(p2()).glVertex(gl);
+        m.times(p3()).glVertex(gl);
+    }
 
     /** the triangle's centroid */
     public Point centroid() {