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

diff --git a/scene.c b/scene.c
index 6d47393..fa90a18 100644
--- a/scene.c
+++ b/scene.c
@@ -305,12 +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;
+
+        // 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;