[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Camera.java,1.14,1.15

[Nordholt <nor...@us...>]

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

Modified Files:
	Camera.java 
Log Message:
fixed the view entire model method so it camera does not rotate (might rotatet 180 degrees if camera is behind the model)

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Camera.java	17 May 2006 17:11:41 -0000	1.14
--- Camera.java	23 May 2006 16:48:28 -0000	1.15
***************
*** 406,420 ****
        double cameraDistance = 
          maxDistance / Math.tan(Math.toRadians((this.getFocalwidth() / 2)));
!       Vertex cameraPos = new Vertex(1, 1, 1);
        cameraPos.scale(cameraDistance / cameraPos.length());
        cameraPos = cameraPos.add(modelCenter);
!       setCenter(new double[] {modelCenter.getX(), 
                                modelCenter.getY(), 
                                modelCenter.getZ()});
        setCamera(new double[] {cameraPos.getX(),
                                cameraPos.getY(),
!                               cameraPos.getZ()});    
!       setRoll(new double[] {-1, -1, 1});
!     }    
    }
      
--- 406,421 ----
        double cameraDistance = 
          maxDistance / Math.tan(Math.toRadians((this.getFocalwidth() / 2)));
!       Vertex cameraPos = new Vertex(camera[0] - center[0],
!                                     camera[1] - center[1],
!                                     camera[2] - center[2]);
        cameraPos.scale(cameraDistance / cameraPos.length());
        cameraPos = cameraPos.add(modelCenter);
!       setCenter(new double[] {modelCenter.getX(),
                                modelCenter.getY(), 
                                modelCenter.getZ()});
        setCamera(new double[] {cameraPos.getX(),
                                cameraPos.getY(),
!                               cameraPos.getZ()});
!     }
    }