X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=scene.c;h=2cfafa1f819654d31160a26e8125d379b872322d;hb=d9984149cebb3cf1bdbd2a5c89c8d7572c4b31d4;hp=a706c5e44d4f7c167f29174a6b75a175571460af;hpb=c721e772ebfd5bae455e30616551c654834767ca;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index a706c5e..2cfafa1 100644
--- a/scene.c
+++ b/scene.c
@@ -305,13 +305,26 @@ void motion(int x, int y) {
         //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small, h: up/down
-        float scaling = y*bigsmallFactor;
-        printf("Scaling by %f on all axii\n", scaling);
-        sceneObjs[curObject].scale[0] += scaling;
-        sceneObjs[curObject].scale[1] += scaling;
-        sceneObjs[curObject].scale[2] += scaling;
+
+        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
+        float diff = (y - starty);
+        if ( diff < 0 ) diff--;
+        if ( diff > 0 ) diff++;
+        float scaling;
+
+        if ( diff < 0 ) {
+          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
+        } else {
+          scaling = diff;
+        }
+        
+        printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling);
+        sceneObjs[curObject].scale[0] = scaling;
+        sceneObjs[curObject].scale[1] = scaling;
+        sceneObjs[curObject].scale[2] = scaling;
       }
 
+      starty = y;
       startx = x;
       break;