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

diff --git a/scene.c b/scene.c
index d73df53..ba115c3 100644
--- a/scene.c
+++ b/scene.c
@@ -307,19 +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 ) * bigsmallFactor;
 
-        if ( scaling < 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);
       }
 
       startx = x;