Rewirte lighting system to use LightObjects; set up move light manipulations. Still...

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index deb8c0e..3ffe29f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -87,7 +87,7 @@ void processMaterialEvents(int id) {
 void processLightEvents(int id) {\r
   switch (id) {\r
     case M_LIGHT_MOVE_LIGHT_1:\r
-      // Do stuff\r
+      manipulateState = STATE_LIGHT_1_MOVE;\r
       break;\r
 \r
     case M_LIGHT_RGBALL_LIGHT_1:\r
@@ -95,7 +95,7 @@ void processLightEvents(int id) {
       break;\r
 \r
     case M_LIGHT_MOVE_LIGHT_2:\r
-      // Do stuff\r
+      manipulateState = STATE_LIGHT_2_MOVE;\r
       break;\r
 \r
     case M_LIGHT_RGBALL_LIGHT_2:\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
-  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("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
@@ -173,7 +173,7 @@ void makeMenu() {
   //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
@@ -305,13 +305,9 @@ void motion(int x, int y) {
 \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-\r
-        // **NOTE: Currently a work in progress, does not work correctly\r
         float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
-        printf("cam angle: %f\n", rotate*camRotateFactor);\r
-       // float arc = arctan()\r
-        sceneObjs[curObject].x += diffx * sin(angler) * 0.3;\r
-        sceneObjs[curObject].z += diffx * cos(angler) * 0.3;\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
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small\r
@@ -350,6 +346,29 @@ void motion(int x, int y) {
       \r
       break;\r
 \r
+    case STATE_LIGHT_1_MOVE:\r
+    case STATE_LIGHT_2_MOVE:\r
+      ; // Semi-colon required to allow variable declaration below\r
+      \r
+      int i = 0;\r
+      if ( manipulateState == STATE_LIGHT_2_MOVE ) i = 1;\r
+\r
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
+        // w: left/right, h: near/far\r
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
+        lightObjs[i].position[0] += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;\r
+        lightObjs[i].position[2] += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;\r
+\r
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+        // w: increase/decrease some light param\r
+        // **NOTE: Currently not implemented\r
+\r
+        // h: up/down\r
+        lightObjs[i].position[1] -= diffy * updownFactor;\r
+      }\r
+\r
+      break;\r
+\r
   }\r
 \r
   starty = y;\r
@@ -393,24 +412,6 @@ void display() {
 \r
   glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward\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
-\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
-\r
-  direction1[0] = lightPosition1[0];\r
-  direction1[2] = lightPosition1[2];\r
-\r
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
@@ -418,9 +419,6 @@ void display() {
     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
@@ -464,21 +462,7 @@ void display() {
       glPopMatrix();\r
     }\r
 \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
-      glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);\r
-      glutSolidSphere(0.5, 50, 50);\r
-    glPopMatrix();\r
-\r
-    glPushMatrix();\r
-      glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);\r
-      glutSolidSphere(0.5, 50, 50);\r
-    glPopMatrix();\r
-\r
-    glEnable(GL_LIGHTING);\r
+    updateLights();\r
 \r
     drawAxisLines();\r
 \r
@@ -487,28 +471,6 @@ void display() {
   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
@@ -553,7 +515,19 @@ int main(int argc, char **argv) {
 \r
   makeMenu();\r
 \r
-  init();\r
+  initializeLights();\r
+\r
+  /* Initial light 0 position. */\r
+  lightObjs[0].position[0] = 4;\r
+  lightObjs[0].position[1] = 5;\r
+  lightObjs[0].position[2] = 6;\r
+  lightObjs[0].position[3] = 0.0;\r
+\r
+  /* Initial light 1 position. */\r
+  lightObjs[1].position[0] = -4;\r
+  lightObjs[1].position[1] = 5;\r
+  lightObjs[1].position[2] = -6;\r
+  lightObjs[1].position[3] = 0.0;\r
 \r
   glutMainLoop();\r
 }
\ No newline at end of file