Changeset 2926 for GTP/trunk

Timestamp:

09/10/08 08:45:41 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp (modified) (7 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp

@@ -12 +12 @@
 
 // our coordinate system has the positive z axis pointing up
-static Vector3 baseDir = Vector3(0, 1, 0);
+static const Vector3 baseDir = Vector3::UNIT_Y();
 
 
@@ -51 +51 @@
 void Camera::Precompute(const Vector3 &direction) 
 {
-        Vector3 up = Vector3(0, 0, 1);
-        Vector3 right = Normalize(CrossProd(up, direction));
-        up = Normalize(CrossProd(direction, right));
-
-        mBaseOrientation = Matrix4x4(right, up, direction);
+        Vector3 up = Vector3::UNIT_Z();
+        Vector3 right = Normalize(CrossProd(up, -direction));
+        up = Normalize(CrossProd(-direction, right));
+
+        mBaseOrientation = Matrix4x4(right, up, -direction);
         mViewOrientation = mBaseOrientation;
 }
@@ -88 +88 @@
         mat = mViewOrientation;
 
-        Vector3 pos = mViewOrientation * -mPosition;
+        const Vector3 pos = mViewOrientation * -mPosition;
         
         mat.x[3][0] = pos.x;
         mat.x[3][1] = pos.y;
-        mat.x[3][2] = pos.z;
+        mat.x[3][2] = -pos.z;
 
         //glGetFloatv(GL_MODELVIEW_MATRIX, (float *)mat.x);
@@ -129 +129 @@
         Matrix4x4 viewOrientation = mViewOrientation;
 
-        Vector3 pos = mViewOrientation * -mPosition;
+        const Vector3 pos = mViewOrientation * -mPosition;
 
         viewOrientation.x[3][0] = pos.x;
         viewOrientation.x[3][1] = pos.y;
-        viewOrientation.x[3][2] = pos.z;
+        viewOrientation.x[3][2] = -pos.z;
 
         glLoadMatrixf((float *)viewOrientation.x);
@@ -220 +220 @@
 void Camera::SetDirection(const Vector3 &dir)
 {
-        Vector3 ndir = -Normalize(dir);
+        Vector3 ndir = Normalize(dir);
 
         mPitch = -atan2(ndir.x, ndir.y);
@@ -243 +243 @@
 Vector3 Camera::GetDirection() const
 { 
-        return -Vector3(mViewOrientation.x[0][2], mViewOrientation.x[1][2], mViewOrientation.x[2][2]);
+        return Vector3(mViewOrientation.x[0][2], mViewOrientation.x[1][2], mViewOrientation.x[2][2]);
 }
 
@@ -261 +261 @@
 Vector3 Camera::GetBaseDirection() const
 { 
-        return -Vector3(mBaseOrientation.x[0][2], mBaseOrientation.x[1][2], mBaseOrientation.x[2][2]);
+        return Vector3(mBaseOrientation.x[0][2], mBaseOrientation.x[1][2], mBaseOrientation.x[2][2]);
 }