X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=scene.c;h=8bf5f29af54349a1fe4e23882d00b46c5fd07930;hb=dd422a5ff7cb12b97fd62c92971e2debf043d237;hp=565fd03c7a7cd9afb8a7c2cae2a701f88006620b;hpb=b1fc06189a6ff782681585df37dc0197d66af3bf;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 565fd03..8bf5f29 100644
--- a/scene.c
+++ b/scene.c
@@ -308,18 +308,24 @@ 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);
+        float map = (diff - -((float)height/2))/(0 - -((float)height/2));
         float scaling;
 
         if ( diff < 0 ) {
-          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
+          scaling = map;
         } else {
-          scaling = scaling * diff;
+          scaling = pow(1/map, 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]);
+
         }
-        
-        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;
       }