X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=618c1aeac78d29da927b7e7e0ff2febeb21f077b;hp=42b717c80db85090045f8569f37827090888ced8;hb=f060b203a10568807bc3810b28628d28df8d74e4;hpb=df4a1058cbb4a92922dd61c514c827392ba1330e

diff --git a/scene.c b/scene.c
index 42b717c..618c1ae 100644
--- a/scene.c
+++ b/scene.c
@@ -347,19 +347,24 @@ void motion(int x, int y) {
       break;
 
     case STATE_LIGHT_1_MOVE:
-    case STATE_LIGHT_2_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) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;
-        lightObjs[i].position[2] += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;
-        
+        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;