X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=5fb2e79401147e4f5c86593d30b3cd2658e12e7e;hp=ad7e4bfb08c056ffff6c870f08be40f337f2905b;hb=99056f711c30745dd12a2be3675580363df3f874;hpb=5a9dfd8e5f68b2f6062987a5b67bbd7934828bf1

diff --git a/scene.c b/scene.c
index ad7e4bf..5fb2e79 100644
--- a/scene.c
+++ b/scene.c
@@ -305,13 +305,24 @@ 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 - starty)*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);
+        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;