(no commit message)

[atyndall/cits2231.git] / globals.c

diff --git a/globals.c b/globals.c
index 7a4e5a0..5356319 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -63,9 +63,6 @@ GLfloat far = 30;
 GLfloat nearClip = -200;
 GLfloat farClip = 200;
 
 GLfloat nearClip = -200;
 GLfloat farClip = 200;
 

-/* Zoom factor for mouse movements */
-GLfloat zoomFactor = 1.0;
-

 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 
 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 


@@ -73,10 +70,11 @@ int drawFloorRecurse = 8;
 int floorSize = 200;
 
 /* Current camera x, y, z coords */
 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 */
 
 /* Length of axis lines */

-GLfloat lineLength = 100;
+GLfloat lineLength = 5;

 
 /* Light 0 parameters */
 GLfloat diffuse0[]={1.0, 0.0, 0.0, 1.0};
 
 /* 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 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;
 
 
 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};
 
 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
 /* Beginning width, height */
 int width = 500, height = 500;
\ No newline at end of file