X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=74e79a7328607479e2923944c5990a65b87c3e64;hp=003b2eaf5e6a8d31aa525c1691ddc7f91937bef2;hb=4bceef28c8187fdff231fe2bc03fd3da6b7adb4b;hpb=b09b1364ed07276886bbc6ef939445bc7fef8fb3

diff --git a/scene.c b/scene.c
index 003b2ea..74e79a7 100644
--- a/scene.c
+++ b/scene.c
@@ -307,21 +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;
+        float diff = (x - startx);
+        float scaling = ( diff + (float)height/2 ) / ( (float)height/2 );
 
-        if ( diff < 0 ) {
-          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
-        } else {
-          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 + diff;
+        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);
       }
 
       startx = x;