(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index fcbda4a..bbc0d33 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
  */\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
     glutPostRedisplay();\r
   }\r
 }\r


@@ -153,9 +153,9 @@ void makeMenu() {
   // Construct light menu\r
   int lightMenu = glutCreateMenu(processLightEvents);\r
   glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);\r
   // Construct light menu\r
   int lightMenu = glutCreateMenu(processLightEvents);\r
   glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);\r

-  glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);\r
+  //glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);\r

   glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);\r
   glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);\r

-  glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r
+  //glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r

 \r
   // Construct object menu\r
   int objectMenu = makeSubmenuFromArray( objectMenuEntries, NMESH, processObjectEvents );\r
 \r
   // Construct object menu\r
   int objectMenu = makeSubmenuFromArray( objectMenuEntries, NMESH, processObjectEvents );\r


@@ -173,7 +173,7 @@ void makeMenu() {
   //glutAddSubMenu("Material", materialMenu);\r
   glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r
   //glutAddSubMenu("Material", materialMenu);\r
   glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r

-  //glutAddSubMenu("Lights", lightMenu);\r
+  glutAddSubMenu("Lights", lightMenu);\r

   glutAddMenuEntry("Exit", M_EXIT);\r
 \r
   // Bind to right mouse button\r
   glutAddMenuEntry("Exit", M_EXIT);\r
 \r
   // Bind to right mouse button\r


@@ -199,6 +199,9 @@ void windowReshape(int w, int h) {
  * @param y Mouse y position\r
  */\r
 void mouse(int button, int state, int x, int y) {\r
  * @param y Mouse y position\r
  */\r
 void mouse(int button, int state, int x, int y) {\r

+  if ( button == GLUT_LEFT_BUTTON && glutGetModifiers() == GLUT_ACTIVE_SHIFT ) {\r
+    button = GLUT_MIDDLE_BUTTON; // Holding shift with left button is the same as the middle button\r
+  }\r

   switch(button) {\r
     case GLUT_LEFT_BUTTON:\r
     case GLUT_MIDDLE_BUTTON:\r
   switch(button) {\r
     case GLUT_LEFT_BUTTON:\r
     case GLUT_MIDDLE_BUTTON:\r


@@ -281,70 +284,73 @@ 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
 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
   switch ( manipulateState ) {\r
     case STATE_CAMERA_ROTATE_MOVE:\r

-      rotate += (x - startx);\r
+      // w: rotate\r
+      rotate += diffx;\r

 \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
 \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r

-        // w: rotate, h: zoom\r
-        zoom += (y - starty);\r
+        // h: zoom\r
+        zoom += diffy;\r

       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r

-        // w: rotate, h: tilt\r
-        camAngle += (y - starty);\r
+        // h: tilt\r
+        camAngle += diffy;\r

       }\r
       }\r

-\r
-      starty = y;\r
-      startx = x;\r
-\r

       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r

-      //so.x, so.y, so.z\r
+\r

       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r

-        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
-      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
-        // w: big/small, h: up/down\r
-\r
-        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
-        float diff = (y - starty);\r
-        float map = (diff - -((float)height/2))/(0 - -((float)height/2));\r
-        float scaling;\r
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
+        sceneObjs[curObject].x += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;\r
+        sceneObjs[curObject].z += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;\r

 \r
 \r

-        if ( diff < 0 ) {\r
-          scaling = map;\r
-        } else {\r
-          scaling = pow(1.0/map, diff);\r
-        }\r
-\r
-        if ( scaling != 0 ) {\r
-       \r
-          \r
-          sceneObjs[curObject].scale[0] *= scaling;\r
-          sceneObjs[curObject].scale[1] *= scaling;\r
-          sceneObjs[curObject].scale[2] *= scaling;\r
-          printf("Diff is %f, Scaling by %f on all axii\n", diff, sceneObjs[curObject].scale[0]);\r
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+        // w: big/small\r
+        float max = (float)height/bigsmallFactor;\r
+        float scaling = (diffx + max) / max;\r

 \r
 \r

-        }\r
+        sceneObjs[curObject].scale[0] *= scaling;\r
+        sceneObjs[curObject].scale[1] *= scaling;\r
+        sceneObjs[curObject].scale[2] *= scaling;\r

 \r
 \r

-        starty = y;\r
+        // h: up/down\r
+        sceneObjs[curObject].y -= diffy * updownFactor;\r

       }\r
 \r
       }\r
 \r

-      startx = x;\r

       break;\r
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
       break;\r
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r

+\r

       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r

-        // w: rotate on width, h: rotate on h\r
+        // w: rotate on y\r
+        sceneObjs[curObject].rotation.y += diffx * rotateFactor;\r
+\r
+        // h: rotate on x\r
+        sceneObjs[curObject].rotation.x += diffy * rotateFactor;\r

 \r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
 \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
+\r
+        // h: texture scale\r
+        float max = (float)height/texscaleFactor;\r
+        float scaling = (diffy + max) / max;\r
+        sceneObjs[curObject].texture.scale *= scaling;\r
+\r

       }\r
       }\r

+      \r

       break;\r
 \r
   }\r
 \r
       break;\r
 \r
   }\r
 \r

+  starty = y;\r
+  startx = x;\r
+\r

   glutPostRedisplay();\r
 }\r
 \r
   glutPostRedisplay();\r
 }\r
 \r


@@ -381,36 +387,30 @@ void display() {
     0.0,  10.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
     0.0,  10.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r

-  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0);\r
+  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward\r

 \r
   /* Reposition the light source 0. */\r
 \r
   /* Reposition the light source 0. */\r

-  lightPosition0[0] = 12*cos(lightAngle0);\r
-  lightPosition0[1] = lightHeight0;\r
-  lightPosition0[2] = 12*sin(lightAngle0);\r
-  lightPosition0[3] = 0.0;\r
-\r
-  direction0[0] = lightPosition0[0];\r
-  direction0[2] = lightPosition0[2];\r
+  lightObjs[0].position[0] = 9*cos(45);\r
+  lightObjs[0].position[1] = 5;\r
+  lightObjs[0].position[2] = 9*sin(45);\r
+  lightObjs[0].position[3] = 0.0;\r

 \r
   /* Reposition the light source 1. */\r
 \r
   /* Reposition the light source 1. */\r

-  lightPosition1[0] = 12*cos(lightAngle1);\r
-  lightPosition1[1] = lightHeight1;\r
-  lightPosition1[2] = 12*sin(lightAngle1);\r
-  lightPosition1[3] = 0.0;\r
+  lightObjs[1].position[0] = 9*cos(45 + 200);\r
+  lightObjs[1].position[1] = 5;\r
+  lightObjs[1].position[2] = 9*sin(45 + 200);\r
+  lightObjs[1].position[3] = 0.0;\r

 \r
 \r

-  direction1[0] = lightPosition1[0];\r
-  direction1[2] = lightPosition1[2];\r
+  //direction0[0] = lightPosition0[0];\r
+  //direction0[2] = lightPosition0[2];\r

 \r
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
 \r
   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
     glTranslatef(camx, camy, camz);\r
     glRotatef(keyrot, 1.0, 0.0, 0.0);\r
 \r

-    glLightfv(GL_LIGHT0, GL_POSITION, lightPosition0);\r
-    glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1);\r
-\r

     drawFloor();\r
     \r
     // Draw sceneObjs array\r
     drawFloor();\r
     \r
     // Draw sceneObjs array\r


@@ -418,19 +418,24 @@ void display() {
       glPushMatrix();\r
         SceneObject so = sceneObjs[i];\r
 \r
       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 translation vector\r
+        glTranslatef(so.x, so.y, so.z);\r
+\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
 \r
 \r
         // Apply scaling vector\r
         glScalef(so.scale[0], so.scale[1], so.scale[2]);\r
 \r

-        // Apply translation vector\r
-        glTranslatef(so.x, so.y, so.z);\r
-\r

         // Apply texture\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
         } else {\r
           glBindTexture(GL_TEXTURE_2D, 0);\r
         }\r


@@ -448,25 +453,8 @@ void display() {
         glBindTexture(GL_TEXTURE_2D, 0);\r
       glPopMatrix();\r
     }\r
         glBindTexture(GL_TEXTURE_2D, 0);\r
       glPopMatrix();\r
     }\r

-    \r

 \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(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
+    updateLights();\r

 \r
     drawAxisLines();\r
 \r
 \r
     drawAxisLines();\r
 \r


@@ -475,28 +463,6 @@ void display() {
   glutSwapBuffers();\r
 }\r
 \r
   glutSwapBuffers();\r
 }\r
 \r

-/**\r
- * init function; sets initial OpenGL state\r
- */\r
-void init() {\r
-  glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
-  glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
-  glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
-  glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);\r
-\r
-  glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1);\r
-  glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1);\r
-  glLightfv(GL_LIGHT1, GL_SPECULAR, specular1);\r
-  glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1);\r
-\r
-  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
-  glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR);\r
-\r
-  glEnable(GL_LIGHT0);\r
-  glEnable(GL_LIGHT1);\r
-  glEnable(GL_LIGHTING);\r
-}\r
-\r

 /**\r
  * Main function\r
  * @param argc Number of arguments\r
 /**\r
  * Main function\r
  * @param argc Number of arguments\r


@@ -519,8 +485,8 @@ int main(int argc, char **argv) {
 \r
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
 \r
 \r
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
 \r

-  glutInitWindowSize(500, 500);\r
-  glutCreateWindow("Scene Editor");\r
+  glutInitWindowSize(width, height);\r
+  glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)");\r

 \r
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading\r
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background\r
 \r
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading\r
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background\r


@@ -541,7 +507,7 @@ int main(int argc, char **argv) {
 \r
   makeMenu();\r
 \r
 \r
   makeMenu();\r
 \r

-  init();\r
+  initializeLights();\r

 \r
   glutMainLoop();\r
 }
\ No newline at end of file
 \r
   glutMainLoop();\r
 }
\ No newline at end of file