Changeset 2758 for GTP/trunk

Timestamp:

06/14/08 03:38:30 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/App/Demos/Vis/CHC_revisited

Files:

• Texture.cpp (modified) (2 diffs)
• chcdemo.cpp (modified) (9 diffs)

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

@@ -67 +67 @@
 
         gluBuild2DMipmaps(GL_TEXTURE_2D, 3, mWidth, mHeight,
-                                                  GL_RGBA, GL_UNSIGNED_BYTE, mImage);
+                                          GL_RGBA, GL_UNSIGNED_BYTE, mImage);
 
         //glTexImage2D(GL_TEXTURE_2D, 0, 3, mWidth, mHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, mImage);
@@ -119 +119 @@
 
 int Texture::GetPixelSize() const
-
 {
         if (mFormat == FORMAT_RGBA)

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

@@ -103 +103 @@
 void mouse(int button, int state, int x, int y);
 void leftMotion(int x, int y);
+void rightMotion(int x, int y);
 void middleMotion(int x, int y);
 void drawEyeView(void);
@@ -112 +113 @@
 
 
-void SetupProjection(int w, int h, float angle, const AxisAlignedBox3 &sceneBox)
-{
-        glViewport(0, 0, w, h);
-        glMatrixMode(GL_PROJECTION);
-        glLoadIdentity();
-
-        gluPerspective(angle, 1.0, 1.0f, 2.0 * Magnitude(sceneBox.Diagonal()));
-        glMatrixMode(GL_MODELVIEW);
-}
-
 
 int main(int argc, char* argv[])
 {
+        camera = new Camera(800, 600);
+
         glutInitWindowSize(800, 600);
         glutInit(&argc, argv);
@@ -149 +142 @@
         const string filename("city.dem");
 
-        camera = new Camera(800, 600);
-
         if (loader.Load(filename, sceneEntities))
                 cout << "scene " << filename << " loaded" << endl;
@@ -165 +156 @@
         Debug << "scene box: " << sceneBox << endl;
 
-        SetupProjection(800, 600, 60, sceneBox);
+        //SetupProjection(800, 600, 60, sceneBox);
         //camera->LookAtBox(sceneBox);
         camera->LookInBox(sceneBox);
@@ -319 +310 @@
 void SetupEyeView(void)
 {
-        SetupProjection(800,600,60,sceneBox);
+        //SetupProjection(800,600,60,sceneBox);
         glMatrixMode(GL_MODELVIEW);
         camera->SetupCameraView();
@@ -624 +615 @@
         winHeight = h;
 
-        if(w) winAspectRatio = (double) h / (double) w;
-
-        //perspectiveDeg(eyeProjection, 60.0, 1.0/winAspectRatio, nearDist, 150.0);
+        if (w) winAspectRatio = (double) h / (double) w;
+
+        glMatrixMode(GL_PROJECTION);
+        glLoadIdentity();
+
+        gluPerspective(60.0f, 1.0f / winAspectRatio, nearDist, 2.0 * Magnitude(sceneBox.Diagonal()));
+        glMatrixMode(GL_MODELVIEW);
+
+        //perspectiveDeg(eyeProjection, 60.0, 1.0f/winAspectRatio, nearDist, 150.0);
 
         glutPostRedisplay();
@@ -634 +631 @@
 void mouse(int button, int state, int x, int y) 
 {
-        if(((button == GLUT_LEFT_BUTTON) || (button == GLUT_RIGHT_BUTTON)) && state == GLUT_DOWN) 
+        if ((button == GLUT_LEFT_BUTTON) && (state == GLUT_DOWN))
         {
                 xEyeBegin = x;
@@ -641 +638 @@
                 glutMotionFunc(leftMotion);
         }
-        else if(button == GLUT_MIDDLE_BUTTON && state == GLUT_DOWN)
+        else if ((button == GLUT_RIGHT_BUTTON) && (state == GLUT_DOWN))
+        {
+                yEyeBegin = y;
+                yMotionBegin = y;
+
+                glutMotionFunc(rightMotion);
+        }
+        else if ((button == GLUT_MIDDLE_BUTTON) && (state == GLUT_DOWN))
         {
                 horizontalMotionBegin = x;
@@ -651 +655 @@
 }
 
-/**
-        rotation for left/right mouse drag
+
+/**     rotation for left/right mouse drag
         motion for up/down mouse drag
 */
 void leftMotion(int x, int y) 
 {
-        static double eyeXAngle = 0.0;
-        // not move in the vertical direction
-        Vector3 horView = Vector3(viewDir[0], 0, viewDir[2]);
-        
-        eyeXAngle = 0.6 *  M_PI * (xEyeBegin - x) / 180.0;
-
-        /*
-        linCombVector3(eyePos, eyePos, horView, (yMotionBegin - y) * 0.1);
-        
-        rotateVectorY(viewDir, eyeXAngle);
+        static float eyeXAngle = 0.0f;
+
+        Vector3 viewDir = camera->GetDirection();
+        Vector3 pos = camera->GetPosition();
+
+        // don't move in the vertical direction
+        Vector3 horView(viewDir[0], 0, viewDir[2]);
+        
+        eyeXAngle = -0.2f *  M_PI * (xEyeBegin - x) / 180.0;
+
+        // rotate view vector
+        Matrix4x4 rot = RotationYMatrix(eyeXAngle);
+        viewDir = rot * viewDir;
+
+        pos += horView * (yMotionBegin - y) * 0.2f;
+
+        camera->SetDirection(viewDir);
+        camera->SetPosition(pos);
         
         xEyeBegin = x;
         yMotionBegin = y;
-        */
+
         glutPostRedisplay();
 }
+
+
+/**     rotation for left/right mouse drag
+        motion for up/down mouse drag
+*/
+void rightMotion(int x, int y) 
+{
+        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;
+        
+        glutPostRedisplay();
+}
+
 
 // strafe
 void middleMotion(int x, int y) 
 {
+        Vector3 viewDir = camera->GetDirection();
+        Vector3 pos = camera->GetPosition();
+
         // the 90 degree rotated view vector 
         // y zero so we don't move in the vertical
-        Vector3 rVec = Vector3(viewDir[0], 0, viewDir[2]);
-        
-        /*rotateVectorY(rVec, PI / 2.0);
-        linCombVector3(eyePos, eyePos, rVec, (horizontalMotionBegin - x) * 0.1);
-        
-        eyePos[1] += (verticalMotionBegin - y) * 0.1;
+        Vector3 rVec(viewDir[0], 0, viewDir[2]);
+        
+        Matrix4x4 rot = RotationYMatrix(M_PI * 0.5f);
+        rVec = rot * rVec;
+        
+        pos += rVec * (x - horizontalMotionBegin) * 0.1f;
+        pos[1] += (verticalMotionBegin - y) * 0.1f;
+
+        camera->SetPosition(pos);
 
         horizontalMotionBegin = x;
         verticalMotionBegin = y;
-*/
+
         glutPostRedisplay();
 }