(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 6d47393..5fb2e79 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -305,12 +305,24 @@ void motion(int x, int y) {
         //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
-        float scaling = (y - starty)*bigsmallFactor;\r
-        sceneObjs[curObject].scale[0] += scaling;\r
-        sceneObjs[curObject].scale[1] += scaling;\r
-        sceneObjs[curObject].scale[2] += scaling;\r
+\r
+        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
+        float diff = (y - starty);\r
+        float scaling;\r
+\r
+        if ( diff < 0 ) {\r
+          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));\r
+        } else {\r
+          scaling = diff;\r
+        }\r
+        \r
+        printf("Diff is %f, Scaling by %f on all axii\n", diff, scaling);\r
+        sceneObjs[curObject].scale[0] = scaling;\r
+        sceneObjs[curObject].scale[1] = scaling;\r
+        sceneObjs[curObject].scale[2] = scaling;\r
       }\r
 \r
+      starty = y;\r
       startx = x;\r
       break;\r
 \r