[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool PencilTool.java,1.37,1.38

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

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

Modified Files:
	PencilTool.java 
Log Message:
More rotation testing

Index: PencilTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/PencilTool.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** PencilTool.java	24 Nov 2005 10:31:22 -0000	1.37
--- PencilTool.java	24 Nov 2005 13:40:56 -0000	1.38
***************
*** 626,646 ****
        double[] roll = view.getRoll();
        
-       roll[0] = 0;
-       roll[1] = 0;
-       roll[2] = 1;
-       
        double angle;
        if (e.getKeyCode() == KeyEvent.VK_LEFT) {
!         angle = Math.PI / 6;
        } else {
!         angle = -Math.PI / 6;
        }
        if (e.isShiftDown()) {
          rotate(angle, 0, 0, 1, camera, center);
        } else if (e.isAltDown()) {
!         rotate(angle, 0, 0, 1, center, camera);
        } else {
          rotate(angle, 0, 0, 1, camera, pivot);
          rotate(angle, 0, 0, 1, center, pivot);
        }
        glv.repaint();
--- 626,643 ----
        double[] roll = view.getRoll();
        
        double angle;
        if (e.getKeyCode() == KeyEvent.VK_LEFT) {
!         angle = Math.PI / 18;
        } else {
!         angle = -Math.PI / 18;
        }
        if (e.isShiftDown()) {
          rotate(angle, 0, 0, 1, camera, center);
        } else if (e.isAltDown()) {
!         rotate(angle, roll[0], roll[1], roll[2], center, camera);
        } else {
          rotate(angle, 0, 0, 1, camera, pivot);
          rotate(angle, 0, 0, 1, center, pivot);
+         rotate(angle, 0, 0, 1, roll, new double[]{0, 0, 0});
        }
        glv.repaint();
***************
*** 652,664 ****
        double[] roll = view.getRoll();
        
!       roll[0] = 0;
!       roll[1] = 0;
!       roll[2] = 1;
!       
        double x;
        double y;
        double z;
        
!       Vertex up = new Vertex("", 0, 0, 1);
        x = center[0] - camera[0];
        y = center[1] - camera[1];
--- 649,658 ----
        double[] roll = view.getRoll();
        
!       double[] zero = new double[]{0, 0, 0};
        double x;
        double y;
        double z;
        
!       Vertex up = new Vertex("", roll[0], roll[1], roll[2]);
        x = center[0] - camera[0];
        y = center[1] - camera[1];
***************
*** 674,680 ****
        double angle;
        if (e.getKeyCode() == KeyEvent.VK_UP) {
!         angle = Math.PI / 6;
        } else {
!         angle = -Math.PI / 6;
        }
        if (e.isShiftDown()) {
--- 668,674 ----
        double angle;
        if (e.getKeyCode() == KeyEvent.VK_UP) {
!         angle = Math.PI / 18;
        } else {
!         angle = -Math.PI / 18;
        }
        if (e.isShiftDown()) {
***************
*** 685,689 ****
--- 679,685 ----
          rotate(angle, x, y, z, camera, pivot);
          rotate(angle, x, y, z, center, pivot);
+         rotate(angle, x, y, z, roll, zero);
        }
+      
        glv.repaint();
      } else {