X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=aabad998ed4fabc2292f27858e5d33f98575393c;hp=bc91a097e7c839e081154ed3514c51d1205372db;hb=e9f79475908e1e8b0de29edf00f95a1fd3f80e7d;hpb=ed454e61276dbd1e2c6051589b1203698259f1a4

diff --git a/scene.c b/scene.c
index bc91a09..aabad99 100644
--- a/scene.c
+++ b/scene.c
@@ -87,7 +87,7 @@ void processMaterialEvents(int id) {
 void processLightEvents(int id) {
   switch (id) {
     case M_LIGHT_MOVE_LIGHT_1:
-      // Do stuff
+      manipulateState = STATE_LIGHT_1_MOVE;
       break;
 
     case M_LIGHT_RGBALL_LIGHT_1:
@@ -95,7 +95,7 @@ void processLightEvents(int id) {
       break;
 
     case M_LIGHT_MOVE_LIGHT_2:
-      // Do stuff
+      manipulateState = STATE_LIGHT_2_MOVE;
       break;
 
     case M_LIGHT_RGBALL_LIGHT_2:
@@ -122,6 +122,7 @@ void processObjectEvents(int id) {
 void processTextureEvents(int id) {
   if ( curObject >= 0 ) {
     sceneObjs[curObject].texture.id = id;
+    sceneObjs[curObject].texture.scale = 1;
     glutPostRedisplay();
   }
 }
@@ -216,66 +217,6 @@ void mouse(int button, int state, int x, int y) {
   }
 }
 
-/**
- * Keybord event handler
- * w/s increase/decrease the z
- * a/d increase/decrease the x
- * q/e increase/decrease the y
- * z/x increase/decrease the angle
- * @param key Key pressed
- * @param x x co-ordinate of mouse
- * @param y y co-ordinate of mouse
- */
-void keyboard(unsigned char key, int x, int y) {
-  switch(key) {
-    case 'w':
-    case 'W':
-      camz -= factor;
-      break;
-    case 'a':
-    case 'A':
-      camx -= factor;
-      break;
-    case 's':
-    case 'S':
-      camz += factor;
-      break;
-    case 'd':
-    case 'D':
-      camx += factor;
-      break;
-    case 'q':
-    case 'Q':
-      camy += factor;
-      break;
-    case 'e':
-    case 'E':
-      camy -= factor;
-      break;
-    case 'z':
-    case 'Z':
-      keyrot += factor;
-      break;
-    case 'x':
-    case 'X':
-      keyrot -= factor;
-      break;
-    case '=':
-    case '+':
-      factor += 0.1;
-      printf("Factor of change is now %f\n", factor);
-      break;
-    case '-':
-    case '_':
-      factor -= 0.1;
-      printf("Factor of change is now %f\n", factor);
-      break;
-
-  }
-  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, keyrot);
-  glutPostRedisplay();
-}
-
 /**
  * Called when motion event occurs
  * @param x Mouse x position
@@ -338,14 +279,38 @@ void motion(int x, int y) {
         sceneObjs[curObject].rotation.x += diffx * rotateFactor;
 
         // h: texture scale
+        // **NOTE: Seems to be problem with scaling, delayed action
         float max = (float)height/texscaleFactor;
-        float scaling = (diffy + max) / max;
+        float scaling = (-diffy + max) / max;
         sceneObjs[curObject].texture.scale *= scaling;
 
       }
       
       break;
 
+    case STATE_LIGHT_1_MOVE:
+    case STATE_LIGHT_2_MOVE:
+      ; // Semi-colon required to allow variable declaration below
+      
+      int i = 0;
+      if ( manipulateState == STATE_LIGHT_2_MOVE ) i = 1;
+
+      if ( buttonSelected == GLUT_LEFT_BUTTON ) {
+        // w: left/right, h: near/far
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );
+        lightObjs[i].position[0] += diffx * cos(angler) * lleftrightFactor + diffy * cos(M_PI/2 + angler) * lnearfarFactor;
+        lightObjs[i].position[2] += diffx * sin(angler) * lleftrightFactor + diffy * sin(M_PI/2 + angler) * lnearfarFactor;
+
+      } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
+        // w: increase/decrease some light param
+        // **NOTE: Currently not implemented
+
+        // h: up/down
+        lightObjs[i].position[1] -= diffy * updownFactor;
+      }
+
+      break;
+
   }
 
   starty = y;
@@ -389,21 +354,6 @@ void display() {
 
   glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward
 
-  /* Reposition the light source 0. */
-  lightObjs[0].position[0] = 4;
-  lightObjs[0].position[1] = 5;
-  lightObjs[0].position[2] = 6;//12*sin(0);
-  lightObjs[0].position[3] = 0.0;
-
-  /* Reposition the light source 1. */
-  lightObjs[1].position[0] = -6;
-  lightObjs[1].position[1] = 5;
-  lightObjs[1].position[2] = -4;//12*sin(90);
-  lightObjs[1].position[3] = 0.0;
-
-  //direction0[0] = lightPosition0[0];
-  //direction0[2] = lightPosition0[2];
-
   glPushMatrix();
 
     /* Perform scene rotations based on user mouse/keyboard input. */
@@ -494,20 +444,19 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_NORMALIZE);
-  glLineWidth(2.0);
+  //glEnable(GL_CULL_FACE);
+  glLineWidth(1.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
-  glutKeyboardFunc(keyboard);
   glutMotionFunc(motion);
 
   makeMenu();
-
   initializeLights();
+  initializeState();
 
   glutMainLoop();
 }
\ No newline at end of file