(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 9e3cb2d..27fc547 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -311,15 +311,22 @@ void motion(int x, int y) {
         float scaling;\r
 \r
         if ( diff < 0 ) {\r
         float scaling;\r
 \r
         if ( diff < 0 ) {\r

-          scaling = (diff - (float)-height)/(0 - (float)-height);\r
+          scaling = (diff - -((float)height/2))/(0 - -((float)height/2));\r

         } else {\r
         } else {\r

-          scaling = diff;\r
+          scaling = pow(1.1, diff);\r

         }\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
+        if ( scaling != 0 ) {\r
+       \r
+          \r
+          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
+\r
+        }\r
+\r
+        starty = y;\r

       }\r
 \r
       startx = x;\r
       }\r
 \r
       startx = x;\r