X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.h;h=b3d0d6bb260dbd488ffe0707e15559fb94a1ef29;hp=8601a4ba2b533ba3e9b70815d1e9bdfc00dd45dc;hb=354428cd17e38c21c4f9f9371f4db0bfe296e866;hpb=9a7035519ce904b75c676fbe2db696ec65d8d32b;ds=sidebyside

diff --git a/globals.h b/globals.h
index 8601a4b..b3d0d6b 100644
--- a/globals.h
+++ b/globals.h
@@ -34,25 +34,12 @@ 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;
 
 /* Size of floor, from -n to n */
 extern int floorSize;
+extern float squareSize;
 
 /* Current camera position */
 extern GLfloat camx, camy, camz, keyrot;
@@ -98,4 +85,7 @@ extern int width, height;
 extern GLfloat zoom, rotate;
 extern GLfloat zoomFactor, rotateFactor;
 
+/* Texture state tracking */
+extern int currentGroundTexture, currentMeshTexture;
+
 #endif	/* GLOBALS_H */
\ No newline at end of file