X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=debba608da20efb80cf51e68205f7bdf0538aacd;hp=b684583d0097f5d940095a8213f3db331ba8eccf;hb=9d534bb644d7510782a835c701e4b185957f7e64;hpb=d58903b333042e04555f09bcab7b21231a48f793

diff --git a/scene.c b/scene.c
index b684583..debba60 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,24 +303,28 @@ 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;
       } 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
+        // w: big/small
         float diff = (x - startx);
-        float scaling = ( diff + (float)height ) / ( (float)height );
+        float max = (float)height/bigsmallFactor;
+        float scaling = ( diff + max) / max;
 
         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], scaling);
+
+        // h: up/down
+        sceneObjs[curObject].y += (y - starty) * updownFactor;
       }
 
+      starty = y;
       startx = x;
+
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE: