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

diff --git a/scene.c b/scene.c
index a706c5e..565fd03 100644
--- a/scene.c
+++ b/scene.c
@@ -305,11 +305,23 @@ 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);
+        float scaling;
+
+        if ( diff < 0 ) {
+          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
+        } else {
+          scaling = 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;