X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=5356319f5bd493ee53b4a1f2336c415a6f78b9e8;hp=800f363c217c53535038f4281f5604fef41bfcc2;hb=9679e75a0bac57d3a2dc8602963c2ac4b94905b3;hpb=8664ff7d3cbe2e5285d067231f54772b46649653

diff --git a/globals.c b/globals.c
index 800f363..5356319 100644
--- a/globals.c
+++ b/globals.c
@@ -63,20 +63,18 @@ GLfloat far = 30;
 GLfloat nearClip = -200;
 GLfloat farClip = 200;
 
-/* Zoom factor for mouse movements */
-GLfloat zoomFactor = 1.0;
-
 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 
 /* Size of floor, from -n to n */
-int floorSize = 50;
+int floorSize = 200;
 
 /* Current camera x, y, z coords */
-GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0;
+GLfloat camx = 0.0, camy = 0.0, camz = 0.0, keyrot = 0.0;
+GLfloat factor = 1.0;
 
 /* Length of axis lines */
-GLfloat lineLength = 100;
+GLfloat lineLength = 5;
 
 /* Light 0 parameters */
 GLfloat diffuse0[]={1.0, 0.0, 0.0, 1.0};
@@ -85,7 +83,6 @@ GLfloat specular0[]={1.0, 0.0, 0.0, 1.0};
 GLfloat emission0[] = {0.0, 0.3, 0.3, 1.0};
 
 GLfloat direction0[] = {0.0, 0.0, 0.0};
-GLfloat light0_pos[] ={1.0, 1.0, 0,0, 0.5};
 
 GLfloat shine = 100.0;
 
@@ -96,5 +93,9 @@ GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
 GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
 GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
 
+/* Zoom and rotate tracking */
+GLfloat zoom = 0.0, rotate = 0.0;
+GLfloat zoomFactor = 0.2, rotateFactor = 1.0;
+
 /* Beginning width, height */
 int width = 500, height = 500;
\ No newline at end of file