[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool AbstractTool.java, 1.83, 1.84

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1176/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	AbstractTool.java 
Log Message:
Space-bar activates orbit tool

Index: AbstractTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/AbstractTool.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** AbstractTool.java	3 Jul 2006 14:25:02 -0000	1.83
--- AbstractTool.java	5 Jul 2006 13:39:06 -0000	1.84
***************
*** 57,60 ****
--- 57,63 ----
    protected static Strategy select;
    
+   /** Orbit strategy */
+   protected static Strategy orbit;
+   
    /** The x axis */
    protected Edge xAxis = new Edge(new Vertex(-50, 0, 0), new Vertex(50, 0, 0));
***************
*** 99,102 ****
--- 102,108 ----
    private Cursor dragCursor;
    
+   /** The cursor for orbit */
+   private Cursor orbitCursor;
+   
    static {
      selection = Selection.primary();
***************
*** 118,121 ****
--- 124,133 ----
        Toolkit.getDefaultToolkit().createCustomCursor(dragImage, new Point(7, 8), "Drag");
      
+     
+     url = cl.getResource("Bcursorrotcam.gif");
+     Image rotationImage = Toolkit.getDefaultToolkit().getImage(url);
+     orbitCursor =
+       Toolkit.getDefaultToolkit().createCustomCursor(rotationImage, new Point(7, 8), "Rotation");
+     
      if (pan == null) {
        pan = new PanStrategy(glv);
***************
*** 124,127 ****
--- 136,142 ----
        select = new SelectStrategy(glv);
      }
+     if (orbit == null) {
+       orbit = new OrbitStrategy(glv);
+     }
    }
  
***************
*** 204,213 ****
      sidewards.scale(2 / sidewards.length());
      up.scale(2 / up.length());
-     
-     
-     log.info(e);
-     
      if (e.getKeyCode() == KeyEvent.VK_META) {
-       log.info("meta-pressed");
        glv.setCursor(null);
        return;
--- 219,223 ----
***************
*** 215,219 ****
      
      if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
-       log.info("control-pressed");
        glv.setCursor(null);
        return;
--- 225,228 ----
***************
*** 221,226 ****
      
      if (e.getKeyCode() == KeyEvent.VK_SPACE) {
-       log.info("space-pressed");
        cameraMode = true;
        return;
      }
--- 230,235 ----
      
      if (e.getKeyCode() == KeyEvent.VK_SPACE) {
        cameraMode = true;
+       glv.setCursor(orbitCursor);
        return;
      }
***************
*** 287,300 ****
    public void keyReleased(KeyEvent e) {
      if (e.getKeyCode() == KeyEvent.VK_META) {
-       log.info("meta-released");
        glv.setCursor(cursor);
      }
      if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
-       log.info("control-released");
        glv.setCursor(cursor);
      }
      if (e.getKeyCode() == KeyEvent.VK_SPACE) {
-       log.info("space-released");
        cameraMode = false;
      }
    }
--- 296,307 ----
    public void keyReleased(KeyEvent e) {
      if (e.getKeyCode() == KeyEvent.VK_META) {
        glv.setCursor(cursor);
      }
      if (e.getKeyCode() == KeyEvent.VK_CONTROL) {
        glv.setCursor(cursor);
      }
      if (e.getKeyCode() == KeyEvent.VK_SPACE) {
        cameraMode = false;
+       glv.setCursor(cursor);
      }
    }
***************
*** 321,325 ****
        pan.dragged(e);
      } else {
!       dragged(e);
      }
  
--- 328,336 ----
        pan.dragged(e);
      } else {
!       if (cameraMode) {
!         orbit.dragged(e);
!       } else {
!         dragged(e);
!       }
      }
  
***************
*** 373,399 ****
     */
    public void mousePressed(MouseEvent e) {
-     
-     
-     log.info("pressed button " + e.getButton());
-    
-     if (e.isAltDown()) {
-       log.info("alt-down");
-     }
-     if (e.isAltGraphDown()) {
-       log.info("alt-graph-down");
-     }
-     if (e.isControlDown()) {
-       log.info("control-down");
-     }
-     if (e.isMetaDown()) {
-       log.info("meta-down");
-     }
-     if (e.isShiftDown()) {
-       log.info("shift-down");
-     }
-     if (e.isPopupTrigger()) {
-       log.info("down popup-trigger");
-     }
-     
      if (!e.isPopupTrigger()) {
        if (e.getButton() == 1) {
--- 384,387 ----
***************
*** 415,419 ****
        pan.pressed(e);
      } else {
!       pressed(e);
      }
      glv.repaint(true);
--- 403,411 ----
        pan.pressed(e);
      } else {
!       if (cameraMode) {
!         orbit.pressed(e);
!       } else {
!         pressed(e);
!       }
      }
      glv.repaint(true);
***************
*** 425,429 ****
     */
    public void mouseReleased(MouseEvent e) {
-     log.info("released button " + e.getButton());
      if (e.isPopupTrigger()) {
        log.info("up popup-trigger");
--- 417,420 ----
***************
*** 434,438 ****
        pan.released(e);
      } else {
!       released(e);
      }
      glv.repaint(true);
--- 425,433 ----
        pan.released(e);
      } else {
!       if (cameraMode) {
!         orbit.released(e);
!       } else {
!         released(e);
!       }
      }
      glv.repaint(true);