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

diff --git a/scene.c b/scene.c
index b043279..3f211b4 100644
--- a/scene.c
+++ b/scene.c
@@ -307,15 +307,12 @@ void motion(int x, int y) {
         // w: big/small, h: up/down
 
         // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
-        float diff = (y - starty);
-        float scaling = ( diff + (float)height/2 ) / ( (float)height/2 );
+        float diff = (x - startx);
+        float scaling = ( diff + (float)height/bigsmallFactor ) / ( (float)height/bigsmallFactor );
 
         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;