X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=b6e04547993f2e8707a24d5b492f1ebd4be3aa9c;hp=71a21c24a6e5942d300c4a088933e2fc9c42ba75;hb=04b80f76711fefed66b740898072a6a1fd51171d;hpb=ea1053838ec633c44e509a06a691c3bcc38acd8d

diff --git a/globals.h b/globals.h
index 71a21c2..b6e0454 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,7 +60,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;
@@ -73,8 +71,24 @@ 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 */
+extern GLfloat zoom, rotate;
+extern GLfloat zoomFactor, rotateFactor;
 
+#endif	/* GLOBALS_H */
\ No newline at end of file