From: Ash Tyndall <git@atyndall.net>
Date: Sat, 22 Oct 2011 02:26:21 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=5f4da2e97f7d31c4980837be823a1297f6e3b657;p=atyndall%2Fcits2231.git

---

diff --git a/globals.c b/globals.c
index 719d6ae..278bf89 100644
--- 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;
-GLfloat leftrightFactor = 0.5, nearfarFactor = 0.5, bigsmallFactor = 0.05, updownFactor = 0.5;
+GLfloat leftrightFactor = 0.5, nearfarFactor = 0.5, bigsmallFactor = 0.5, updownFactor = 0.5;
 
 /* Beginning width, height */
 int width = 500, height = 500;
diff --git a/scene.c b/scene.c
index 74e79a7..ba115c3 100644
--- a/scene.c
+++ b/scene.c
@@ -308,7 +308,7 @@ void motion(int x, int y) {
 
         // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf
         float diff = (x - startx);
-        float scaling = ( diff + (float)height/2 ) / ( (float)height/2 );
+        float scaling = ( diff + (float)height/2 ) / ( (float)height/2 ) * bigsmallFactor;
 
         sceneObjs[curObject].scale[0] *= scaling;
         sceneObjs[curObject].scale[1] *= scaling;