X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=6cf7cf5becd5856ffb84e550fca0b67457eef299;hp=3f2c2ab4e235d68041db566e04aa5e1b014434ce;hb=fdc6eb90410f851b32b6d84135791c5df51393d9;hpb=ab838687c0439bc042cf3818fd7dcba9c23963a4

diff --git a/scene.c b/scene.c
index 3f2c2ab..6cf7cf5 100644
--- a/scene.c
+++ b/scene.c
@@ -307,26 +307,13 @@ 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 ) {
-       
-          
-          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, sceneObjs[curObject].scale[0]);
-
-        }
-
-        starty = y;
+        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], scaling);
       }
 
       startx = x;