checkpoint

darcs-hash:20080630035746-5007d-dc60a3d19253d811051bb3f1148b4e1075dcd2e8.gz

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index a3b591b..c6318a4 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -32,10 +32,6 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     float anglex = 0;
     float angley = 0;
 
     float anglex = 0;
     float angley = 0;
 

-    boolean alt = false;
-    boolean shift = false;
-    boolean control = false;
-

     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
 
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
 

@@ -181,21 +177,8 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public void keyTyped(KeyEvent e)  { }
     }
 
     public void keyTyped(KeyEvent e)  { }

-    public void keyPressed(KeyEvent e)  {
-        switch(e.getKeyCode()) {
-            case KeyEvent.VK_CONTROL: control = true; break;
-            case KeyEvent.VK_ALT: alt = true; break;
-            case KeyEvent.VK_SHIFT: shift = true; break;
-        }
-    }
-
-    public void keyReleased(KeyEvent e) {
-        switch(e.getKeyCode()) {
-            case KeyEvent.VK_CONTROL: control = false; break;
-            case KeyEvent.VK_ALT: alt = false; break;
-            case KeyEvent.VK_SHIFT: shift = false; break;
-        }
-    }
+    public void keyPressed(KeyEvent e)  { }
+    public void keyReleased(KeyEvent e) { }

 
     public void mouseClicked(MouseEvent e) { }
     public void mouseEntered(MouseEvent e) { }
 
     public void mouseClicked(MouseEvent e) { }
     public void mouseEntered(MouseEvent e) { }

@@ -216,7 +199,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public void mouseDragged(MouseEvent e) {
     }
 
     public void mouseDragged(MouseEvent e) {

-        if (shift) {
+        if ((e.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) {

             if (closest != null && projection != null && clickClosest != null) {
                 synchronized(this) {
                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));
             if (closest != null && projection != null && clickClosest != null) {
                 synchronized(this) {
                     Vec d1 = projection.inverse().times(getMouse()).minus(projection.inverse().times(clickPoint));