[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Camera.java,1.2,1.3

[rimestad <rim...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18527/src/net/sourceforge/bprocessor/model

Modified Files:
	Camera.java 
Log Message:
made small fixes and improvements to the camera tool and added a flytool

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Camera.java	13 Dec 2005 12:37:15 -0000	1.2
--- Camera.java	14 Dec 2005 14:20:39 -0000	1.3
***************
*** 216,222 ****
     */
    public void zoomin() {
!     camera[0] -= (camera[0] - center[0]) * 0.1;
!     camera[1] -= (camera[1] - center[1]) * 0.1;
!     camera[2] -= (camera[2] - center[2]) * 0.1;
    }
    
--- 216,230 ----
     */
    public void zoomin() {
!     zoomin(center);
!   }
!   
!   /**
!    * Function to zoom in
!    * @param target The point to zoom towards
!    */
!   public void zoomin(double[] target) {
!     camera[0] -= (camera[0] - target[0]) * 0.1;
!     camera[1] -= (camera[1] - target[1]) * 0.1;
!     camera[2] -= (camera[2] - target[2]) * 0.1;
    }
    
***************
*** 243,252 ****
      Vertex forward = new Vertex("", x, y, z);
      forward.scale(1 / forward.length());
!     double turn = 1;
!     if (c.roll[2] < 0) {
!       turn = -1;
!     }
!     Geometry.rotate(angle, up.getX(), up.getY(), up.getZ(), c.center, c.camera);
!     Geometry.rotate(angle, 0, 0, turn, c.roll, new double[]{0, 0, 0});
    }
    
--- 251,256 ----
      Vertex forward = new Vertex("", x, y, z);
      forward.scale(1 / forward.length());
!     Geometry.rotate(angle, 0, 0, 1, c.center, c.camera);
!     Geometry.rotate(angle, 0, 0, 1, c.roll, new double[]{0, 0, 0});
    }