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

diff --git a/scene.c b/scene.c
index b4795f1..fe7eca3 100644
--- a/scene.c
+++ b/scene.c
@@ -308,19 +308,26 @@ 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 = (x - (float)-height)/(0 - (float)-height);
-          printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling);
+          scaling = map;
         } else {
-          scaling = diff;
+          scaling = pow(map, diff);
         }
-        
-        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;
+
+        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, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], map);
+
+        }
+
+        starty = y;
       }
 
       startx = x;