X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=27fc5474f8b9d08e2769ff05526103c236d8aece;hp=7d5456fab079adcea1db91de6b8b74542e6b621d;hb=2090fa97207b7008eaddbab184478b1720e5fad1;hpb=84a44257a71818d30cf2bbdea195a0b7d246aa83

diff --git a/scene.c b/scene.c
index 7d5456f..27fc547 100644
--- a/scene.c
+++ b/scene.c
@@ -305,11 +305,28 @@ 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 = pow(1.1, diff);
+        }
+
+        if ( scaling != 0 ) {
+       
+          
+          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\n", diff, sceneObjs[curObject].scale[0]);
+
+        }
+
+        starty = y;
       }
 
       startx = x;