X-Git-Url: http://git.megacz.com/?p=anneal.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fqfat%2FInteractiveMeshViewer.java;h=f87f257ffe7a8b02ec1f0626f5112fc14a6ab393;hp=068dc56c3133051636c091c6b6ccc3934a728b22;hb=HEAD;hpb=f018c9f76356b71ee3560595f6d236a76a7d13eb

diff --git a/src/edu/berkeley/qfat/InteractiveMeshViewer.java b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
index 068dc56..f87f257 100644
--- a/src/edu/berkeley/qfat/InteractiveMeshViewer.java
+++ b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
@@ -66,26 +66,6 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
         for(MeshViewer mv : mvs) mv.addMesh(this.goal);
     }
 
-    public synchronized void dump() {
-        try {
-            PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream("dump.stl")));
-            pw.println("solid dump");
-            for(Mesh.T t : tile) {
-                Vec normal = t.norm();
-                pw.println("facet normal " + normal.x + " " + normal.y + " " + normal.z);
-                pw.println("  outer loop");
-                for(Mesh.Vertex v : new Mesh.Vertex[] { t.v1(), t.v2(), t.v3() }) {
-                    pw.println("    vertex " + v.p.x + " " + v.p.y + " " + v.p.z);
-                }
-                pw.println("  endloop");
-                pw.println("endfacet");
-            }
-            pw.println("endsolid dump");
-            pw.flush();
-            pw.close();
-        } catch (Exception e) { throw new RuntimeException(e); }
-    }
-
     public int whichNeighbor = 1;
     public double temp;
     public boolean tileon = true;
@@ -99,7 +79,6 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
     public boolean errorNormals = false;
 
     public boolean force = false;
-    public Mesh.Vertex[] points;
     public int breaks = 0;
 
     public int temps;
@@ -112,7 +91,6 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
         //super.keyPressed(e);
         switch(e.getKeyCode()) {
             case KeyEvent.VK_SPACE:
-                System.err.println("hak");
                 synchronized(this) {
                     tile.subdivide();
                     tile.rebindPoints();
@@ -123,7 +101,13 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
             case KeyEvent.VK_ENTER: temp = 10; break;
             case KeyEvent.VK_N: whichNeighbor++; break;
             case KeyEvent.VK_RIGHT: whichNeighbor++; break;
-            case KeyEvent.VK_D: dump(); break;
+            case KeyEvent.VK_D:
+                try {
+                    tile.dump(new FileOutputStream("dump.stl"));
+                } catch (Exception ee) {
+                    throw new RuntimeException(ee);
+                }
+                break;
             case KeyEvent.VK_E: errorNormals = !errorNormals; break;
             case KeyEvent.VK_A: hillclimb = false; anneal = !anneal; break;
             case KeyEvent.VK_H: anneal = true; hillclimb = !hillclimb; break;