Changeset 2780 for GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp

Timestamp:

06/19/08 18:43:17 (16 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/App/Demos/Vis/CHC_revisited/chcdemo.cpp (modified) (11 diffs)

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

@@ -163 +163 @@
         //camera->LookInBox(bvh->GetBox());
 
-        //camera->SetDirection(Vector3(0.961829f, 0.273652f, 0.0f));
-        //camera->SetDirection(Vector3(0.0f, 1.0f, 0.0f));
+        camera->SetDirection(Vector3(0.961829f, 0.273652f, 0.0f));
         camera->SetPosition(Vector3(483.398f, 242.364f, 186.078f));
 
@@ -295 +294 @@
                 break;
         case RenderTraverser::CHC:
-                cout << "using chc" << endl;
                 traverser = new CHCTraverser();
                 break;
@@ -490 +488 @@
         case 'A':
                 {
-                        camera->Pitch(keyRotation);
+                        Vector3 viewDir = camera->GetDirection();
+                        // rotate view vector
+                        Matrix4x4 rot = RotationZMatrix(keyRotation);
+                        viewDir = rot * viewDir;
+                        camera->SetDirection(viewDir);
                 }
                 break;
@@ -496 +498 @@
         case 'D':
         {
-                        camera->Pitch(-keyRotation);
+                        Vector3 viewDir = camera->GetDirection();
+                        // rotate view vector
+                        Matrix4x4 rot = RotationZMatrix(-keyRotation);
+                        viewDir = rot * viewDir;
+                        camera->SetDirection(viewDir);
                 }
                 break;
         case 'w':
         case 'W':
+                {
+                        Vector3 pos = camera->GetPosition();
+                        pos += hvec * keyForwardMotion;
+                        camera->SetPosition(pos);
+                }
+                break;
+        case 'x':
+        case 'X':
                 {
                         Vector3 pos = camera->GetPosition();
@@ -507 +521 @@
                 }
                 break;
-        case 'x':
-        case 'X':
-                {
-                        Vector3 pos = camera->GetPosition();
-                        pos += hvec * keyForwardMotion;
-                        camera->SetPosition(pos);
-                }
-                break;
         case 'r':
         case 'R':
@@ -541 +547 @@
         case GLUT_KEY_LEFT:
                 {
-                        camera->Pitch(keyRotation);
+                        Vector3 viewDir = camera->GetDirection();
+                        // rotate view vector
+                        Matrix4x4 rot = RotationZMatrix(keyRotation);
+                        viewDir = rot * viewDir;
+                        camera->SetDirection(viewDir);
                 }
                 break;
         case GLUT_KEY_RIGHT:
                 {
-                        camera->Pitch(-keyRotation);
+                        Vector3 viewDir = camera->GetDirection();
+                        // rotate view vector
+                        Matrix4x4 rot = RotationZMatrix(-keyRotation);
+                        viewDir = rot * viewDir;
+                        camera->SetDirection(viewDir);
                 }
                 break;
         case GLUT_KEY_UP:
+                {
+                        Vector3 pos = camera->GetPosition();
+                        pos += hvec * 0.6f;
+                        camera->SetPosition(pos);
+                }
+                break;
+        case GLUT_KEY_DOWN:
                 {
                         Vector3 pos = camera->GetPosition();
                         pos -= hvec * 0.6f;
-                        camera->SetPosition(pos);
-                }
-                break;
-        case GLUT_KEY_DOWN:
-                {
-                        Vector3 pos = camera->GetPosition();
-                        pos += hvec * 0.6f;
                         camera->SetPosition(pos);
                 }
@@ -627 +641 @@
 void leftMotion(int x, int y) 
 {
+        static float eyeXAngle = 0.0f;
+
         Vector3 viewDir = camera->GetDirection();
         Vector3 pos = camera->GetPosition();
@@ -633 +649 @@
         Vector3 horView(viewDir[0], viewDir[1], 0);
         
-        float eyeXAngle = 0.2f *  M_PI * (xEyeBegin - x) / 180.0;
-
-        camera->Pitch(eyeXAngle);
-
-        pos -= horView * (yMotionBegin - y) * 0.2f;
-        
+        eyeXAngle = 0.2f *  M_PI * (xEyeBegin - x) / 180.0;
+
+        // rotate view vector
+        Matrix4x4 rot = RotationZMatrix(eyeXAngle);
+        viewDir = rot * viewDir;
+
+        pos += horView * (yMotionBegin - y) * 0.2f;
+
+        camera->SetDirection(viewDir);
         camera->SetPosition(pos);
         
@@ -653 +672 @@
 void rightMotion(int x, int y) 
 {
-        float eyeYAngle = -0.2f *  M_PI * (yEyeBegin - y) / 180.0;
-
-        camera->Yaw(eyeYAngle);
-        
+        static float eyeYAngle = 0.0f;
+
+        Vector3 viewDir = camera->GetDirection();
+        Vector3 right = camera->GetRightVector();
+
+        eyeYAngle = -0.2f *  M_PI * (yEyeBegin - y) / 180.0;
+
+        // rotate view vector
+        Matrix4x4 rot = RotationAxisMatrix(right, eyeYAngle);
+        viewDir = rot * viewDir;
+
+        camera->SetDirection(viewDir);
+                
         yEyeBegin = y;
         
@@ -678 +706 @@
         rVec = rot * rVec;
         
-        pos += rVec * (x - horizontalMotionBegin) * 0.1f;
+        pos -= rVec * (x - horizontalMotionBegin) * 0.1f;
         //pos[1] += (verticalMotionBegin - y) * 0.1f;
         pos[2] += (verticalMotionBegin - y) * 0.1f;
@@ -771 +799 @@
         ////////////
         // --- visualization of the occlusion culling
-
         visualization->Render();