X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=f87412d8d9d4ae06eefcd1c37866a037d43f3069;hp=939594deb5ed37203bd2ed6621ce6b0999a1827d;hb=9ef4031c2586c4164580c88a8fcf198235a0ccc8;hpb=933954a445fd282f85c1cc9427fddc505422ec54

diff --git a/scene.c b/scene.c
index 939594d..f87412d 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 ( diff < 0 ) {
-          scaling = (x - -height)/(0 - -height);
+          scaling = map;
         } else {
-          scaling = diff;
+          scaling = pow(1.0/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, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], 1/map);
+
+        }
+
+        starty = y;
       }
 
       startx = x;