X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=6cf7cf5becd5856ffb84e550fca0b67457eef299;hp=6d47393250a084c9a7075613fa8c04882d1cd8a1;hb=fdc6eb90410f851b32b6d84135791c5df51393d9;hpb=5e6a932345dfe95c3d2b289053b93abfb5c5d4fb

diff --git a/scene.c b/scene.c
index 6d47393..6cf7cf5 100644
--- a/scene.c
+++ b/scene.c
@@ -305,10 +305,15 @@ 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;
-        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 = (x - startx);
+        float scaling = ( diff + (float)height/bigsmallFactor ) / ( (float)height/bigsmallFactor );
+
+        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);
       }
 
       startx = x;