(no commit message)

[atyndall/cits2231.git] / globals.h

diff --git a/globals.h b/globals.h
index 4c6c086..c7d62d2 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -24,6 +24,9 @@ extern const char *objectMenuEntries[];
 // Scene object arrays
 extern SceneObject sceneObjs[];
 extern int nObjects;
+extern int curObject;
+extern int buttonSelected;
+extern int manipulateState;
 
 // Directories containing models
 extern char *dirDefault1;
@@ -32,10 +35,7 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-extern int moving, startx, starty;
-
-/* Recursion level for floor drawing */
-extern int drawFloorRecurse;
+extern int startx, starty;
 
 /* Size of floor, from -n to n */
 extern int floorSize;
@@ -82,7 +82,11 @@ extern GLfloat emission[];
 extern int width, height;
 
 /* Zoom and rotate tracking */
-extern GLfloat zoom, rotate;
-extern GLfloat zoomFactor, rotateFactor;
+extern GLfloat zoom, rotate, camAngle;
+extern GLfloat zoomFactor, rotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor;
+
+/* Texture state tracking */
+extern int currentGroundTexture, currentMeshTexture;
 
 #endif /* GLOBALS_H */
\ No newline at end of file