X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=8bf5f29af54349a1fe4e23882d00b46c5fd07930;hp=2cfafa1f819654d31160a26e8125d379b872322d;hb=dd422a5ff7cb12b97fd62c92971e2debf043d237;hpb=d9984149cebb3cf1bdbd2a5c89c8d7572c4b31d4

diff --git a/scene.c b/scene.c
index 2cfafa1..8bf5f29 100644
--- a/scene.c
+++ b/scene.c
@@ -308,23 +308,28 @@ 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);
-        if ( diff < 0 ) diff--;
-        if ( diff > 0 ) diff++;
+        float map = (diff - -((float)height/2))/(0 - -((float)height/2));
         float scaling;
 
         if ( diff < 0 ) {
-          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
+          scaling = map;
         } else {
-          scaling = diff;
+          scaling = pow(1/map, 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;
+
+        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;
       }
 
-      starty = y;
       startx = x;
       break;