X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=dc9245309dd1a511bc29bf3bfde6298b74ce1817;hp=04841f8da9037e88f8e2de8349cfefa1bf25d042;hb=ddf25313dfc93155b958b2838b6dba330e2706d9;hpb=d95870a5f740a7ed8c1adbd63b6ffd26fb5a3940

diff --git a/globals.h b/globals.h
index 04841f8..dc92453 100644
--- a/globals.h
+++ b/globals.h
@@ -39,7 +39,7 @@ extern GLfloat lightPosition[];
 extern int moving, startx, starty;
 extern int lightMoving, lightStartX, lightStartY;
 
-
+/* Time varying or user-controled variables. */
 extern float jump;
 extern float lightAngle, lightHeight;
 extern GLfloat angle;
@@ -53,9 +53,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,15 +60,33 @@ extern int drawFloorRecurse;
 extern int floorSize;
 
 /* Current camera position */
-extern GLfloat x, y, z;
+extern GLfloat camx, camy, camz, rot;
+
+/* Length of axis lines */
+extern GLfloat lineLength;
 
 /* Light 0 parameters */
 extern GLfloat diffuse0[];
 extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat emission0[];
+
+extern GLfloat direction0[];
 extern GLfloat light0_pos[];
+
+extern GLfloat shine;
+
 extern GLfloat glightmodel[];
 
-#endif	/* GLOBALS_H */
+/* Material types */
+extern GLfloat ambient[];
+extern GLfloat diffuse[];
+extern GLfloat specular[];
+
+/* Beginning width, height */
+extern int width, height;
+
+/* Zoom and rotate tracking */
+GLfloat zoomFactor, rotateFactor;
 
+#endif	/* GLOBALS_H */
\ No newline at end of file