X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=fe7eca37774708dd85a9a986f2d8db1c689d956c;hp=491943b7da1b1c74e61e2eb1379a2e40b807439f;hb=1fa55b75f0e3b1acf1245362cebaf5baa86f93f7;hpb=2e066d076e25d4cd765ba886fc4e6478c8137d06

diff --git a/scene.c b/scene.c
index 491943b..fe7eca3 100644
--- a/scene.c
+++ b/scene.c
@@ -308,12 +308,13 @@ 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 ) / ( (float)height/2 );
         float scaling;
 
         if ( diff < 0 ) {
-          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));
+          scaling = map;
         } else {
-          scaling = pow(1.00000010101010100100001115, diff);
+          scaling = pow(map, diff);
         }
 
         if ( scaling != 0 ) {
@@ -322,7 +323,7 @@ void motion(int x, int 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\n", diff, sceneObjs[curObject].scale[0]);
+          printf("Diff is %f, Scaling by %f on all axii, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], map);
 
         }