X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=fcbda4ab692c7657f8dd1cc88d2922f96707d038;hb=5bf3130b1623b0f243454f7be5a970e6772b18f5;hp=6d47393250a084c9a7075613fa8c04882d1cd8a1;hpb=5e6a932345dfe95c3d2b289053b93abfb5c5d4fb;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 6d47393..fcbda4a 100644
--- a/scene.c
+++ b/scene.c
@@ -305,10 +305,29 @@ void motion(int x, int y) {
         //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small, h: up/down
-        float scaling = (y - starty)*bigsmallFactor;
-        sceneObjs[curObject].scale[0] += scaling;
-        sceneObjs[curObject].scale[1] += scaling;
-        sceneObjs[curObject].scale[2] += scaling;
+
+        // 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 = map;
+        } else {
+          scaling = pow(1.0/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]);
+
+        }
+
+        starty = y;
       }
 
       startx = x;