Changeset 2829 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/Camera.cpp

Timestamp:

07/10/08 15:57:47 (16 years ago)

Author:

mattausch

Message:

worked on environment + hud

File:

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

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

@@ -182 +182 @@
         const Vector3 fc = mPosition + view * z_far; 
         
-        const Vector3 up = GetUpVector();
+        const Vector3 up = -GetUpVector();
 
         const Vector3 right = GetRightVector();
@@ -218 +218 @@
         mYaw += angle;
         CalculateFromPitchAndYaw();
-        /*
-        Matrix4x4 viewOrientation(mRight, mUp, mDirection);
-        Matrix4x4 rot = RotationYMatrix(angle);
-
-        viewOrientation = viewOrientation * rot;
-
-        mDirection = Vector3(viewOrientation.x[2][0], viewOrientation.x[2][1], viewOrientation.x[2][2]);
-        mRight =     Vector3(viewOrientation.x[0][0], viewOrientation.x[0][1], viewOrientation.x[0][2]);
-        mUp =        Vector3(viewOrientation.x[1][0], viewOrientation.x[1][1], viewOrientation.x[1][2]);*/
 }
 
@@ -237 +228 @@
 
 
+void Camera::SetDirection(const Vector3 &direction)
+{
+        Vector3 h1 = direction; h1.z = 0; h1.Normalize();
+        Vector3 h2 = direction; h1.x = 0; h2.Normalize();
+
+        mYaw = acos(DotProd(h1, Vector3(0, 1, 0)));
+        mPitch = acos(DotProd(h2, Vector3(0, 1, 0)));
+
+        CalculateFromPitchAndYaw();
+}
+
+
 void Camera::CalculateFromPitchAndYaw()
 {