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

diff --git a/scene.c b/scene.c
index 9e3cb2d..2cfafa1 100644
--- a/scene.c
+++ b/scene.c
@@ -308,20 +308,23 @@ 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 scaling;
 
         if ( diff < 0 ) {
-          scaling = (diff - (float)-height)/(0 - (float)-height);
+          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;
+        sceneObjs[curObject].scale[0] = scaling;
+        sceneObjs[curObject].scale[1] = scaling;
+        sceneObjs[curObject].scale[2] = scaling;
       }
 
+      starty = y;
       startx = x;
       break;