X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=dc9245309dd1a511bc29bf3bfde6298b74ce1817;hp=e85ea2597e80243b9176a36fe83542f7e0352dca;hb=65949d92003e506ddbcc3285abfc9d4b5070df13;hpb=d3465c5cd0e6e9b414e669e8c8aa464b03f2fd24

diff --git a/globals.h b/globals.h
index e85ea25..dc92453 100644
--- a/globals.h
+++ b/globals.h
@@ -39,18 +39,19 @@ 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;
 extern GLfloat angle2;
 
-/* Near and far parameters */
+/* Near and far parameters - calculates scene size */
 extern GLfloat near;
 extern GLfloat far;
 
-/* Zoom factor for mouse movements */
-extern GLfloat zoomFactor;
+/* Near and far clipping planes - calculates clipping planes */
+extern GLfloat nearClip;
+extern GLfloat farClip;
 
 /* Recursion level for floor drawing */
 extern int drawFloorRecurse;
@@ -58,13 +59,34 @@ extern int drawFloorRecurse;
 /* Size of floor, from -n to n */
 extern int floorSize;
 
+/* Current camera position */
+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