(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 5efecaf..a0fbff1 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -121,7 +121,7 @@ void processObjectEvents(int id) {
  */\r
 void processTextureEvents(int id) {\r
   if ( curObject >= 0 ) {\r
-    sceneObjs[curObject].texture = id;\r
+    sceneObjs[curObject].texture.id = id;\r
     glutPostRedisplay();\r
   }\r
 }\r
@@ -284,64 +284,69 @@ void keyboard(unsigned char key, int x, int y) {
 void motion(int x, int y) {\r
   if ( buttonSelected == -1 ) return; // No button selected, no action\r
 \r
+  float diffx = x - startx;\r
+  float diffy = y - starty;\r
+\r
   switch ( manipulateState ) {\r
     case STATE_CAMERA_ROTATE_MOVE:\r
       // w: rotate\r
-      rotate += (x - startx);\r
+      rotate += diffx;\r
 \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // h: zoom\r
-        zoom += (y - starty);\r
+        zoom += diffy;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // h: tilt\r
-        camAngle += (y - starty);\r
+        camAngle += diffy;\r
       }\r
-\r
-      starty = y;\r
-      startx = x;\r
-\r
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
-     \r
+\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-         //so.x, so.y, so.z\r
-        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
-        printf("cam angle: %f\n", rotate*rotateFactor);\r
-        sceneObjs[curObject].x += (x - startx) * sin(rotate*rotateFactor);\r
-        sceneObjs[curObject].z += (x - startx) * cos(rotate*rotateFactor);\r
+\r
+        // **NOTE: Currently a work in progress\r
+        printf("cam angle: %f\n", rotate*camRotateFactor);\r
+        sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);\r
+        sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);\r
+\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small\r
-        float diff = (x - startx);\r
         float max = (float)height/bigsmallFactor;\r
-        float scaling = ( diff + max) / max;\r
+        float scaling = (diffx + max) / max;\r
 \r
         sceneObjs[curObject].scale[0] *= scaling;\r
         sceneObjs[curObject].scale[1] *= scaling;\r
         sceneObjs[curObject].scale[2] *= scaling;\r
 \r
         // h: up/down\r
-        sceneObjs[curObject].y -= (y - starty) * updownFactor;\r
+        sceneObjs[curObject].y -= diffy * updownFactor;\r
       }\r
 \r
-      starty = y;\r
-      startx = x;\r
-\r
       break;\r
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
-        // w: rotate on width, h: rotate on h\r
-\r
+        // w: rotate on y\r
+        sceneObjs[curObject].rotation.y += diffx * rotateFactor;\r
+        // h: rotate on x\r
+        sceneObjs[curObject].rotation.x += diffy * rotateFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
-        // w: rotate on height, h: texture scale\r
-        \r
+        // w: rotate on x\r
+        sceneObjs[curObject].rotation.x += diffx * rotateFactor;\r
+        // h: texture scale\r
+        float max = (float)height/texscaleFactor;\r
+        float scaling = (diffy + max) / max;\r
+        sceneObjs[curObject].texture.scale *= scaling;\r
       }\r
       break;\r
 \r
   }\r
 \r
+  starty = y;\r
+  startx = x;\r
+\r
   glutPostRedisplay();\r
 }\r
 \r
@@ -401,7 +406,7 @@ void display() {
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
-    glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);\r
+    glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);\r
     glTranslatef(camx, camy, camz);\r
     glRotatef(keyrot, 1.0, 0.0, 0.0);\r
 \r
@@ -415,8 +420,10 @@ void display() {
       glPushMatrix();\r
         SceneObject so = sceneObjs[i];\r
 \r
-        // Apply rotation vector\r
-        glRotatef(so.rotation.amount, so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector[2]);\r
+        // Apply independant rotation vectors\r
+        glRotatef(so.rotation.x, 1.0, 0.0, 0.0);\r
+        glRotatef(so.rotation.y, 0.0, 1.0, 0.0);\r
+        glRotatef(so.rotation.z, 0.0, 0.0, 1.0);\r
 \r
         // Apply scaling vector\r
         glScalef(so.scale[0], so.scale[1], so.scale[2]);\r
@@ -425,9 +432,12 @@ void display() {
         glTranslatef(so.x, so.y, so.z);\r
 \r
         // Apply texture\r
-        if ( so.texture > 0 ) {\r
-          getTexture(so.texture);\r
-          glBindTexture(GL_TEXTURE_2D, so.texture);\r
+        if ( so.texture.id > 0 ) {\r
+          getTexture(so.texture.id);\r
+          glBindTexture(GL_TEXTURE_2D, so.texture.id);\r
+          glMatrixMode(GL_TEXTURE);\r
+          glScalef(so.texture.scale, so.texture.scale, so.texture.scale);\r
+          glMatrixMode(GL_MODELVIEW);\r
         } else {\r
           glBindTexture(GL_TEXTURE_2D, 0);\r
         }\r
@@ -447,24 +457,22 @@ void display() {
     }\r
     \r
 \r
-    // Draw a white ball over the light source\r
+    // Draw a white ball over the light sources\r
+    glDisable(GL_LIGHTING);\r
+    glColor3f(1.0, 1.0, 1.0);\r
+\r
     glPushMatrix();\r
-      glDisable(GL_LIGHTING);\r
-      glColor3f(1.0, 1.0, 1.0);\r
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);\r
       glutSolidSphere(0.5, 50, 50);\r
-      glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
 \r
-    // Draw a white ball over the light source\r
     glPushMatrix();\r
-      glDisable(GL_LIGHTING);\r
-      glColor3f(1.0, 1.0, 1.0);\r
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);\r
       glutSolidSphere(0.5, 50, 50);\r
-      glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
 \r
+    glEnable(GL_LIGHTING);\r
+\r
     drawAxisLines();\r
 \r
   glPopMatrix();\r