(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 6d47393..3f211b4 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -305,10 +305,14 @@ 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 = (x - startx);\r
+        float scaling = ( diff + (float)height/bigsmallFactor ) / ( (float)height/bigsmallFactor );\r
+\r
+        sceneObjs[curObject].scale[0] *= scaling;\r
+        sceneObjs[curObject].scale[1] *= scaling;\r
+        sceneObjs[curObject].scale[2] *= scaling;\r
       }\r
 \r
       startx = x;\r