(no commit message)

[atyndall/cits2231.git] / globals.h

diff --git a/globals.h b/globals.h
index 6f6a626..b6e0454 100644 (file)
--- 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