X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=3a5243574c21876be2eccf7f895c342406f32400;hp=2cfafa1f819654d31160a26e8125d379b872322d;hb=1692482e406e8d640f949047b9caa8edbc73fa59;hpb=d9984149cebb3cf1bdbd2a5c89c8d7572c4b31d4;ds=sidebyside

diff --git a/scene.c b/scene.c
index 2cfafa1..3a52435 100644
--- a/scene.c
+++ b/scene.c
@@ -308,8 +308,6 @@ 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 ) {
@@ -319,12 +317,13 @@ void motion(int x, int y) {
         }
         
         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;
       }
 
-      starty = y;
       startx = x;
       break;