X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=640c323a6f90368d3784921d798523778f026cf9;hp=4c7854af55674e11e02191adc7b936e6f9ca2fc9;hb=e84eec59aded99f41844e639a2ce84871c695002;hpb=8664ff7d3cbe2e5285d067231f54772b46649653

diff --git a/globals.h b/globals.h
index 4c7854a..640c323 100644
--- a/globals.h
+++ b/globals.h
@@ -32,12 +32,7 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-// Lighting
-extern GLfloat lightColor[];
-extern GLfloat lightPosition[];
-
 extern int moving, startx, starty;
-extern int lightMoving, lightStartX, lightStartY;
 
 /* Time varying or user-controled variables. */
 extern float jump;
@@ -53,9 +48,6 @@ extern GLfloat far;
 extern GLfloat nearClip;
 extern GLfloat farClip;
 
-/* Zoom factor for mouse movements */
-extern GLfloat zoomFactor;
-
 /* Recursion level for floor drawing */
 extern int drawFloorRecurse;
 
@@ -63,7 +55,8 @@ extern int drawFloorRecurse;
 extern int floorSize;
 
 /* Current camera position */
-extern GLfloat camx, camy, camz, rot;
+extern GLfloat camx, camy, camz, keyrot;
+extern GLfloat factor;
 
 /* Length of axis lines */
 extern GLfloat lineLength;
@@ -72,21 +65,39 @@ extern GLfloat lineLength;
 extern GLfloat diffuse0[];
 extern GLfloat ambient0[];
 extern GLfloat specular0[];
-extern GLfloat emission0[];
-
 extern GLfloat direction0[];
-extern GLfloat light0_pos[];
 
-extern GLfloat shine;
+extern GLfloat lightColor0[];
+extern GLfloat lightPosition0[];
 
-extern GLfloat glightmodel[];
+extern float lightAngle0, lightHeight0;
+extern int lightMoving0, lightStartX0, lightStartY0;
+
+/* Light 1 parameters */
+extern GLfloat diffuse1[];
+extern GLfloat ambient1[];
+extern GLfloat specular1[];
+extern GLfloat direction1[];
+
+extern GLfloat lightColor1[];
+extern GLfloat lightPosition1[];
+
+extern float lightAngle1, lightHeight1;
+extern int lightMoving1, lightStartX1, lightStartY1;
 
 /* Material types */
 extern GLfloat ambient[];
 extern GLfloat diffuse[];
 extern GLfloat specular[];
+extern GLfloat shine;
+extern GLfloat glightmodel[];
+extern GLfloat emission[];
 
 /* Beginning width, height */
 extern int width, height;
 
+/* Zoom and rotate tracking */
+extern GLfloat zoom, rotate;
+extern GLfloat zoomFactor, rotateFactor;
+
 #endif	/* GLOBALS_H */
\ No newline at end of file