checkpoint

darcs-hash:20080706215240-5007d-9282b1fd2013cf02a6926e59f098cca076c3d89a.gz

diff --git a/src/edu/berkeley/qfat/InteractiveMeshViewer.java b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
index 2a0af0b..3a2787d 100644 (file)
--- a/src/edu/berkeley/qfat/InteractiveMeshViewer.java
+++ b/src/edu/berkeley/qfat/InteractiveMeshViewer.java
@@ -23,6 +23,10 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
         MeshViewer mv2 = new MeshViewer();
         MeshViewer mv3 = new MeshViewer();
         MeshViewer mv4 = new MeshViewer();
         MeshViewer mv2 = new MeshViewer();
         MeshViewer mv3 = new MeshViewer();
         MeshViewer mv4 = new MeshViewer();

+        mv1.main = (Main)this;
+        mv2.main = (Main)this;
+        mv3.main = (Main)this;
+        mv4.main = (Main)this;

         mvs.add(mv1);
         mvs.add(mv2);
         mvs.add(mv3);
         mvs.add(mv1);
         mvs.add(mv2);
         mvs.add(mv3);

@@ -116,17 +120,19 @@ public class InteractiveMeshViewer extends JPanel implements KeyListener {
                 //case KeyEvent.VK_SPACE: breaks++; force = true; break;
             case KeyEvent.VK_UP: temp = temp * 2; break;
             case KeyEvent.VK_ENTER: temp = 10; break;
                 //case KeyEvent.VK_SPACE: breaks++; force = true; break;
             case KeyEvent.VK_UP: temp = temp * 2; break;
             case KeyEvent.VK_ENTER: temp = 10; break;

-            case KeyEvent.VK_LEFT: whichNeighbor--; break;
+            case KeyEvent.VK_N: whichNeighbor++; break;

             case KeyEvent.VK_RIGHT: whichNeighbor++; break;
             case KeyEvent.VK_D: dump(); 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;
             case KeyEvent.VK_RIGHT: whichNeighbor++; break;
             case KeyEvent.VK_D: dump(); 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;

-            case KeyEvent.VK_N: neighbors = !neighbors; break;
+                //case KeyEvent.VK_N: neighbors = !neighbors; break;

             case KeyEvent.VK_T: tileon = !tileon; break;
             case KeyEvent.VK_G: goalon = !goalon; break;
             case KeyEvent.VK_M: tilemeshon = !tilemeshon; break;
         }
             case KeyEvent.VK_T: tileon = !tileon; break;
             case KeyEvent.VK_G: goalon = !goalon; break;
             case KeyEvent.VK_M: tilemeshon = !tilemeshon; break;
         }

+        if (transforms!=null)
+            whichNeighbor = (whichNeighbor % (transforms.length+1));

     }
     }

-
+    public Matrix[] transforms;

 }
\ No newline at end of file
 }
\ No newline at end of file