X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=b0432794129d76f93ae6ac15f50e82e55ce2736e;hp=45a71a93462dacc513b7ceeeb580bc5997bf4b05;hb=fdff213d086517ba95a290381e2b72c10113b9ff;hpb=3f87e23786ecbb7845ee98571acbf8bd9060337c

diff --git a/scene.c b/scene.c
index 45a71a9..b043279 100644
--- a/scene.c
+++ b/scene.c
@@ -308,18 +308,14 @@ void motion(int x, int y) {
 
         // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
         float diff = (y - starty);
-        float scaling;
+        float scaling = ( diff + (float)height/2 ) / ( (float)height/2 );
 
-        if ( diff < 0 ) {
-          scaling = (x - -height)/(0 - -height);
-        } else {
-          scaling = diff;
-        }
-        
-        printf("Scaling by %f on all axii\n", scaling);
-        sceneObjs[curObject].scale[0] += scaling;
-        sceneObjs[curObject].scale[1] += scaling;
-        sceneObjs[curObject].scale[2] += scaling;
+        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);
+
+        starty = y;
       }
 
       startx = x;