X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=b6e04547993f2e8707a24d5b492f1ebd4be3aa9c;hp=6f6a6262173daad58293c4625724e66fb0635b2c;hb=87b1e4d4ecf968eb100b8d93f929c0574c7f08d0;hpb=84eea711e741871dfb6cc595a0989e1369998d7f

diff --git a/globals.h b/globals.h
index 6f6a626..b6e0454 100644
--- a/globals.h
+++ b/globals.h
@@ -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;
@@ -86,5 +84,11 @@ extern GLfloat ambient[];
 extern GLfloat diffuse[];
 extern GLfloat specular[];
 
-#endif	/* GLOBALS_H */
+/* 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