X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=fe6d362eae69430bfbc5c9321951c377cef1d173;hp=640c323a6f90368d3784921d798523778f026cf9;hb=c04cf2176fc88d341416c24667ba66dc3600c4d0;hpb=751a7ad384e80669e71e8e5613227ac450c71944

diff --git a/globals.h b/globals.h
index 640c323..fe6d362 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,27 +39,11 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-extern int moving, startx, starty;
-
-/* Time varying or user-controled variables. */
-extern float jump;
-extern float lightAngle, lightHeight;
-extern GLfloat angle;
-extern GLfloat angle2;
-
-/* Near and far parameters - calculates scene size */
-extern GLfloat near;
-extern GLfloat far;
-
-/* Near and far clipping planes - calculates clipping planes */
-extern GLfloat nearClip;
-extern GLfloat farClip;
-
-/* 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;
@@ -67,7 +58,6 @@ extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat direction0[];
 
-extern GLfloat lightColor0[];
 extern GLfloat lightPosition0[];
 
 extern float lightAngle0, lightHeight0;
@@ -79,7 +69,6 @@ extern GLfloat ambient1[];
 extern GLfloat specular1[];
 extern GLfloat direction1[];
 
-extern GLfloat lightColor1[];
 extern GLfloat lightPosition1[];
 
 extern float lightAngle1, lightHeight1;
@@ -97,7 +86,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