(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 7d5456f..a8d9596 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -199,6 +199,9 @@ void windowReshape(int w, int h) {
  * @param y Mouse y position\r
  */\r
 void mouse(int button, int state, int x, int y) {\r
+  if ( glutGetModifiers() == GLUT_ACTIVE_SHIFT ) {\r
+    button = GLUT_MIDDLE_BUTTON;\r
+  }\r
   switch(button) {\r
     case GLUT_LEFT_BUTTON:\r
     case GLUT_MIDDLE_BUTTON:\r
@@ -299,17 +302,22 @@ void motion(int x, int y) {
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
-      //so.x, so.y, so.z\r
+     \r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
+         //so.x, so.y, so.z\r
         //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
-        float scaling = (y - starty);//*bigsmallFactor;\r
-        printf("Scaling by %f on all axii\n", scaling);\r
-        sceneObjs[curObject].scale[0] += scaling;\r
-        sceneObjs[curObject].scale[1] += scaling;\r
-        sceneObjs[curObject].scale[2] += scaling;\r
+\r
+        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
+        float diff = (x - startx);\r
+        float max = (float)height/bigsmallFactor;\r
+        float scaling = ( diff + max) / max;\r
+\r
+        sceneObjs[curObject].scale[0] *= scaling;\r
+        sceneObjs[curObject].scale[1] *= scaling;\r
+        sceneObjs[curObject].scale[2] *= scaling;\r
       }\r
 \r
       startx = x;\r