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

diff --git a/scene.c b/scene.c
index d73df53..fcbda4a 100644
--- a/scene.c
+++ b/scene.c
@@ -308,18 +308,26 @@ 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 map = (diff - -((float)height/2))/(0 - -((float)height/2));
         float scaling;
 
-        if ( scaling < 0 ) {
-          scaling = (x - -height)/(0 - -height);
+        if ( diff < 0 ) {
+          scaling = map;
         } else {
-          scaling = diff;
+          scaling = pow(1.0/map, 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;
+
+        if ( scaling != 0 ) {
+       
+          
+          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\n", diff, sceneObjs[curObject].scale[0]);
+
+        }
+
+        starty = y;
       }
 
       startx = x;