(no commit message)

[atyndall/cits2231.git] / scene.c

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