X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=25cc0dc1634ce924a84dad5c321dbed67aa1a922;hp=fe7eca37774708dd85a9a986f2d8db1c689d956c;hb=aab2e2f70552398a51a24f644147a1c6de45c766;hpb=1fa55b75f0e3b1acf1245362cebaf5baa86f93f7

diff --git a/scene.c b/scene.c
index fe7eca3..25cc0dc 100644
--- a/scene.c
+++ b/scene.c
@@ -199,6 +199,9 @@ void windowReshape(int w, int h) {
  * @param y Mouse y position
  */
 void mouse(int button, int state, int x, int y) {
+  if ( button == GLUT_LEFT_BUTTON && glutGetModifiers() == GLUT_ACTIVE_SHIFT ) {
+    button = GLUT_MIDDLE_BUTTON; // Holding shift with left button is the same as the middle button
+  }
   switch(button) {
     case GLUT_LEFT_BUTTON:
     case GLUT_MIDDLE_BUTTON:
@@ -283,13 +286,14 @@ void motion(int x, int y) {
 
   switch ( manipulateState ) {
     case STATE_CAMERA_ROTATE_MOVE:
+      // w: rotate
       rotate += (x - startx);
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
-        // w: rotate, h: zoom
+        // h: zoom
         zoom += (y - starty);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: rotate, h: tilt
+        // h: tilt
         camAngle += (y - starty);
       }
 
@@ -299,38 +303,31 @@ void motion(int x, int y) {
       break;
 
     case STATE_OBJECT_POSITION_SCALE:
-      //so.x, so.y, so.z
+     
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
+         //so.x, so.y, so.z
         //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
+        printf("cam angle: %f\n", rotate*rotateFactor);
+        sceneObjs[curObject].x += (x - startx) * cos(rotate*rotateFactor);
+        sceneObjs[curObject].z += (x - startx) * sin(rotate*rotateFactor);
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: big/small, h: up/down
-
-        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
-        float diff = (y - starty);
-        float map = ( diff + (float)height/2 ) / ( (float)height/2 );
-        float scaling;
-
-        if ( diff < 0 ) {
-          scaling = map;
-        } else {
-          scaling = pow(map, diff);
-        }
+        // w: big/small
+        float diff = (x - startx);
+        float max = (float)height/bigsmallFactor;
+        float scaling = ( diff + max) / max;
 
-        if ( scaling != 0 ) {
-       
-          
-          sceneObjs[curObject].scale[0] *= scaling;
-          sceneObjs[curObject].scale[1] *= scaling;
-          sceneObjs[curObject].scale[2] *= scaling;
-          printf("Diff is %f, Scaling by %f on all axii, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], map);
+        sceneObjs[curObject].scale[0] *= scaling;
+        sceneObjs[curObject].scale[1] *= scaling;
+        sceneObjs[curObject].scale[2] *= scaling;
 
-        }
-
-        starty = y;
+        // h: up/down
+        sceneObjs[curObject].y -= (y - starty) * updownFactor;
       }
 
+      starty = y;
       startx = x;
+
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
@@ -381,7 +378,7 @@ void display() {
     0.0,  10.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0);
+  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward
 
   /* Reposition the light source 0. */
   lightPosition0[0] = 12*cos(lightAngle0);