X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=5dd4300ff9b752da63fcab86cd4f3b098ad43679;hp=5a2b6413c88334a7c41fcef79eb2146368d4f935;hb=7862999a5314cfc2b287d719e3d2dde05df21ae8;hpb=03efe5959d1dd8ca3f254d95e1a1d399d6e41c35

diff --git a/globals.h b/globals.h
index 5a2b641..5dd4300 100644
--- 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,13 +35,11 @@ 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;
+extern float squareSize;
 
 /* Current camera position */
 extern GLfloat camx, camy, camz, keyrot;
@@ -81,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, camRotateFactor, camAngleFactor;
+extern GLfloat leftrightFactor, nearfarFactor, bigsmallFactor, updownFactor, rotateFactor, texscaleFactor;
+
+/* Texture state tracking */
+extern int currentGroundTexture, currentMeshTexture;
 
 #endif	/* GLOBALS_H */
\ No newline at end of file