(no commit message)

diff --git a/globals.c b/globals.c
index 7a5c310..a08eee1 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -92,7 +92,7 @@ GLfloat emission[] = {0.0, 0.3, 0.3, 1.0};
 /* Zoom and rotate tracking */
 GLfloat zoom = 0.0, rotate = 0.0, camAngle = 40.0;
 GLfloat zoomFactor = 0.2, rotateFactor = 0.5, camAngleFactor = 0.5;
 /* Zoom and rotate tracking */
 GLfloat zoom = 0.0, rotate = 0.0, camAngle = 40.0;
 GLfloat zoomFactor = 0.2, rotateFactor = 0.5, camAngleFactor = 0.5;

-GLfloat leftrightFactor = 0.5, nearfarFactor = 0.5, bigsmallFactor = 1.2, updownFactor = 0.5;
+GLfloat leftrightFactor = 0.5, nearfarFactor = 0.5, bigsmallFactor = 0.2, updownFactor = 0.5;

 
 /* Beginning width, height */
 int width = 500, height = 500;
 
 /* Beginning width, height */
 int width = 500, height = 500;

diff --git a/scene.c b/scene.c
index 6d47393..ad7e4bf 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -306,6 +306,7 @@ void motion(int x, int y) {
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
         float scaling = (y - starty)*bigsmallFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
         float scaling = (y - starty)*bigsmallFactor;\r

+        printf("Scaling by %f on all axii\n", scaling);\r

         sceneObjs[curObject].scale[0] += scaling;\r
         sceneObjs[curObject].scale[1] += scaling;\r
         sceneObjs[curObject].scale[2] += scaling;\r
         sceneObjs[curObject].scale[0] += scaling;\r
         sceneObjs[curObject].scale[1] += scaling;\r
         sceneObjs[curObject].scale[2] += scaling;\r