X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=565fd03c7a7cd9afb8a7c2cae2a701f88006620b;hp=45a71a93462dacc513b7ceeeb580bc5997bf4b05;hb=b1fc06189a6ff782681585df37dc0197d66af3bf;hpb=3f87e23786ecbb7845ee98571acbf8bd9060337c

diff --git a/scene.c b/scene.c
index 45a71a9..565fd03 100644
--- a/scene.c
+++ b/scene.c
@@ -311,15 +311,17 @@ void motion(int x, int y) {
         float scaling;
 
         if ( diff < 0 ) {
-          scaling = (x - -height)/(0 - -height);
+          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
         } else {
-          scaling = diff;
+          scaling = scaling * 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;
+        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;
+
+        starty = y;
       }
 
       startx = x;