X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=3f211b4028f12f612d8d09e63c89ba00c24aa67c;hp=1b7c988919797bd5843b9fa8a9fca7762b574794;hb=3d2cc99d5a436f3f1febf9e4b8508388398b6879;hpb=acf576865458f10edf9526ee3abd8c36142a4e14

diff --git a/scene.c b/scene.c
index 1b7c988..3f211b4 100644
--- a/scene.c
+++ b/scene.c
@@ -307,25 +307,12 @@ void motion(int x, int y) {
         // w: big/small, h: up/down
 
         // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
-        float diff = (y - starty);
-        float scaling;
+        float diff = (x - startx);
+        float scaling = ( diff + (float)height/bigsmallFactor ) / ( (float)height/bigsmallFactor );
 
-        if ( diff < 0 ) {
-          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
-        } else {
-          scaling = diff;
-        }
-
-        if ( scaling != 0 ) {
-       
-          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;
+        sceneObjs[curObject].scale[0] *= scaling;
+        sceneObjs[curObject].scale[1] *= scaling;
+        sceneObjs[curObject].scale[2] *= scaling;
       }
 
       startx = x;