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

diff --git a/globals.h b/globals.h
index 640c323..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;
@@ -67,7 +54,6 @@ extern GLfloat ambient0[];
 extern GLfloat specular0[];
 extern GLfloat direction0[];
 
-extern GLfloat lightColor0[];
 extern GLfloat lightPosition0[];
 
 extern float lightAngle0, lightHeight0;
@@ -79,7 +65,6 @@ extern GLfloat ambient1[];
 extern GLfloat specular1[];
 extern GLfloat direction1[];
 
-extern GLfloat lightColor1[];
 extern GLfloat lightPosition1[];
 
 extern float lightAngle1, lightHeight1;
@@ -100,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