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

diff --git a/scene.c b/scene.c
index b043279..ba115c3 100644
--- a/scene.c
+++ b/scene.c
@@ -307,15 +307,13 @@ 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/2 ) / ( (float)height/2 ) * 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;