Changeset 2779 for GTP

Timestamp:

06/19/08 18:26:29 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Camera.cpp (modified) (3 diffs)
• chcdemo.cpp (modified) (1 diff)

GTP/trunk/App/Demos/Vis/CHC_revisited/Camera.cpp

@@ -53 +53 @@
         mBaseOrientation = Matrix4x4(right, up, direction);
         mViewOrientation = mBaseOrientation;
+        cout<<"view: " << direction << " right: " << right << " up " << up << endl;
 }
 
@@ -146 +147 @@
 void Camera::SetupCameraView()
 {
-#if 1
-        //Matrix4x4 viewOrientation(mRight, mDirection, mUp);
-        //Matrix4x4 viewOrientation(mRight, mUp, mDirection);
-        Matrix4x4 tview = mViewOrientation;
-
-        //Vector3 pos = tview * mPosition;
+        Matrix4x4 viewOrientation = mViewOrientation;
         Vector3 pos = -mPosition;
-        pos = tview * pos;
-
-        Debug << "vieworient:\n" << mViewOrientation << " pos " << pos << " position " << mPosition << endl;
-
-        Matrix4x4 viewOrientation = mViewOrientation;
+        pos = mViewOrientation * pos;
 
         viewOrientation.x[3][0] = pos.x;
@@ -165 +157 @@
         glLoadIdentity();
         glMultMatrixf((float *)viewOrientation.x);
-        //glMultMatrixf((float *)tm.x);
-        Debug << "matrix:\n" << viewOrientation << endl;
-#else
-        glLoadIdentity();
-
-        gluLookAt(mPosition.x, mPosition.y, mPosition.z,
-                  mPosition.x + mDirection.x, mPosition.y + mDirection.y, mPosition.z + mDirection.z, 
-                          mUp.x, mUp.y, mUp.z);
-#endif
-        //std::cout << "dir: " << mDirection << " pos: " << mPosition << " up: " << mUp << std::endl;
 }
 

GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

@@ -295 +295 @@
                 break;
         case RenderTraverser::CHC:
+                cout << "using chc" << endl;
                 traverser = new CHCTraverser();
                 break;