X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=e9e42f26276a184ea39f4f9d3e54956cfad17fb9;hp=4c6c0866091fc79dbf12a9b27866f92c6b85f3f4;hb=156ee3d62238bda349822b1f72009dcdaf1daf80;hpb=7664cdd0015a7d16ea6fdb0b06fca1a23586f0c1

diff --git a/globals.h b/globals.h
index 4c6c086..e9e42f2 100644
--- a/globals.h
+++ b/globals.h
@@ -13,6 +13,10 @@
 #define NTEXTURE 30     // The number of textures (in the models-textures dir)
 #define MAXOBJECTS 256
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
 // Meshes and textures arrays
 extern mesh* meshes[];
 extern texture* textures[];
@@ -24,6 +28,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 +39,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;
@@ -78,11 +82,17 @@ extern GLfloat shine;
 extern GLfloat glightmodel[];
 extern GLfloat emission[];
 
+extern GLfloat lightBallSize;
+
 /* Beginning width, height */
 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