Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23150/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
CameraTool.java
Log Message:
Removed debug output
Index: CameraTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/CameraTool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CameraTool.java 1 Dec 2005 10:10:02 -0000 1.1
--- CameraTool.java 1 Dec 2005 15:56:57 -0000 1.2
***************
*** 117,137 ****
Vertex sidewards = up.cross(forward);
sidewards.scale(1 / sidewards.length());
! log.info("forward: " + forward.getX() + ", " + forward.getY() + ", " + forward.getZ());
log.info("sideward: " + sidewards.getX()
+ ", " + sidewards.getY() + ", " + sidewards.getZ());
! log.info("upwrad: " + up.getX() + ", " + up.getY() + ", " + up.getZ());
double angleX = ((double)(e.getX() - previousPos[0]) / 360) * Math.PI;
double angleY = ((double)(e.getY() - previousPos[1]) / 360) * Math.PI;
if (e.isShiftDown()) {
// roll camera
! Geometry.rotate(angleY, forward.getX(),
forward.getY(), forward.getZ(), roll, zero);
} else if (e.isAltDown()) {
// rotate camera about itself
- double turn = 1;
- if (roll[2] < 0) {
- turn = -1;
- }
Geometry.rotate(angleX, up.getX(), up.getY(), up.getZ(), center, camera);
Geometry.rotate(-angleY, sidewards.getX(), sidewards.getY(), sidewards.getZ(),
--- 117,137 ----
Vertex sidewards = up.cross(forward);
sidewards.scale(1 / sidewards.length());
! /*log.info("forward: " + forward.getX() + ", " + forward.getY() + ", " + forward.getZ());
log.info("sideward: " + sidewards.getX()
+ ", " + sidewards.getY() + ", " + sidewards.getZ());
! log.info("upwrad: " + up.getX() + ", " + up.getY() + ", " + up.getZ());*/
double angleX = ((double)(e.getX() - previousPos[0]) / 360) * Math.PI;
double angleY = ((double)(e.getY() - previousPos[1]) / 360) * Math.PI;
+ double turn = 1;
+ if (roll[2] < 0) {
+ turn = -1;
+ }
if (e.isShiftDown()) {
// roll camera
! Geometry.rotate(turn * (-angleY - angleX) / 2, forward.getX(),
forward.getY(), forward.getZ(), roll, zero);
} else if (e.isAltDown()) {
// rotate camera about itself
Geometry.rotate(angleX, up.getX(), up.getY(), up.getZ(), center, camera);
Geometry.rotate(-angleY, sidewards.getX(), sidewards.getY(), sidewards.getZ(),
***************
*** 142,148 ****
} else {
// rotate camera about point of view (or selection if any)
! Geometry.rotate(-angleX, up.getX(), up.getY(), up.getZ(), camera, pivot);
! Geometry.rotate(-angleX, up.getX(), up.getY(), up.getZ(), center, pivot);
! //Geometry.rotate(-angleX, 0, 0, 1, roll, new double[]{0, 0, 0});
Geometry.rotate(angleY, sidewards.getX(), sidewards.getY(), sidewards.getZ(),
camera, pivot);
--- 142,148 ----
} else {
// rotate camera about point of view (or selection if any)
! Geometry.rotate(-angleX, 0, 0, turn, camera, pivot);
! Geometry.rotate(-angleX, 0, 0, turn, center, pivot);
! Geometry.rotate(-angleX, 0, 0, turn, roll, new double[]{0, 0, 0});
Geometry.rotate(angleY, sidewards.getX(), sidewards.getY(), sidewards.getZ(),
camera, pivot);
|
