checkpoint

[anneal.git] / src / edu / berkeley / qfat / Main.java

diff --git a/src/edu/berkeley/qfat/Main.java b/src/edu/berkeley/qfat/Main.java
index 95cd989..75b3f12 100644 (file)
--- a/src/edu/berkeley/qfat/Main.java
+++ b/src/edu/berkeley/qfat/Main.java
@@ -50,7 +50,9 @@ import edu.berkeley.qfat.geom.Polygon;
 
 // FIXME: re-orient goal (how?)
 
-public class Main extends MeshViewer {
+public class Main extends InteractiveMeshViewer {
+
+    public Matrix[] transforms;
 
     public static int verts = 1;
 
@@ -107,7 +109,7 @@ public class Main extends MeshViewer {
             StlFile stlf = new StlFile();
             InputStream res = this.getClass().getClassLoader().getResourceAsStream(file);
             stlf.readBinaryFile(file, res);
-            goal = new Mesh(false);
+            setGoal(new Mesh(false));
             for(int i=0; i<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);
@@ -135,8 +137,7 @@ public class Main extends MeshViewer {
 
     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;
@@ -199,7 +200,6 @@ public class Main extends MeshViewer {
         tile.error_against = goal;
         goal.error_against = tile;
         fixupGoal();
-        }
     }
 
     public void breakit() {
@@ -236,8 +236,7 @@ public class Main extends MeshViewer {
         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);
+        boolean good = p.move(v, false);
         if (!good) { return false; }
 
         double new_tile_error = tile.error();
@@ -263,7 +262,7 @@ public class Main extends MeshViewer {
             hits++;
             p.goodp = p.p;
         } else {
-            p.move(Matrix.translate(v.times(-1)), true);
+            p.move(v.times(-1), true);
             misses++;
         }
         p.reComputeErrorAround();
@@ -280,13 +279,7 @@ public class Main extends MeshViewer {
         double acceptance = 1;
         while(true) {
             synchronized(this) {
-            synchronized(safeTriangles) {
-                safeTriangles.clear();
-                for(Mesh.T t : tile) 
-                    if (t.shouldBeDrawn())
-                        safeTriangles.add(t);
-            }
-            if (!anneal) { repaint(); Thread.sleep(10); continue; }
+                if (!anneal) { repaint(); Thread.sleep(10); continue; }
 
             double ratio = (hits+misses==0) ? 1 : (hits / (hits+misses));
             hits = 0;
@@ -355,7 +348,9 @@ public class Main extends MeshViewer {
 
     public static void main(String[] s) throws Exception {
         JFrame f = new JFrame();
+        f.setLayout(new BorderLayout());
         Main main = new Main(f);
+        f.add(main, BorderLayout.CENTER);
         f.setJMenuBar(main.new MyMenuBar());
         f.pack();
         f.show();
@@ -371,16 +366,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;
@@ -613,7 +606,7 @@ public class Main extends MeshViewer {
                 hexBrick(false, true);
             }});
             tileMenu.add(new MyMenuItem("Temp (do not use)") { public void hit() {
-                tile = new Mesh(false);
+                setTile(new Mesh(false));
                 float width  = (float)0.8;
                 float depth  = (float)0.08;
                 float height = (float)0.4;
@@ -674,7 +667,7 @@ public class Main extends MeshViewer {
                 fixupTile();
             } });
             tileMenu.add(new MyMenuItem("Dense Packing (hex)") { public void hit() {
-                tile = new Mesh(false);
+                setTile(new Mesh(false));
                 float width  = (float)3.2;
                 float depth  = (float)0.32;
                 float height = (float)1.6;
@@ -716,7 +709,7 @@ public class Main extends MeshViewer {
                 fixupTile();
             } });
             tileMenu.add(new MyMenuItem("Slim Dense Packing (Cubic)") { public void hit() {
-                tile = new Mesh(false);
+                setTile(new Mesh(false));
                 float unit = 0.4f;
                 float r = unit/2;
                 float sin = (float)(unit * Math.sin(Math.PI/3));
@@ -772,7 +765,7 @@ public class Main extends MeshViewer {
             } });
             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;
@@ -863,6 +856,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)),
 
                         /*
@@ -903,7 +897,7 @@ public class Main extends MeshViewer {
                 }}});
             tileMenu.add(new MyMenuItem("Hammerhead") { public void hit() {
                 synchronized(this) {
-                    tile = new Mesh(false);
+                    setTile(new Mesh(false));
                     Matrix mm = Matrix.ONE;
                     float height1 = .1f;
                     float height2 = .1f;