X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=9e3cb2d5bfc54984a6b387267cd87bd51077492a;hp=a706c5e44d4f7c167f29174a6b75a175571460af;hb=0bbce418109732b9b7a61040b5d8a409ad90f977;hpb=c721e772ebfd5bae455e30616551c654834767ca

diff --git a/scene.c b/scene.c
index a706c5e..9e3cb2d 100644
--- a/scene.c
+++ b/scene.c
@@ -305,8 +305,18 @@ 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);
+
+        // 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)/(0 - (float)-height);
+        } 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;