(no commit message)

[atyndall/cits2231.git] / globals.c

diff --git a/globals.c b/globals.c
index 160d869..0124faf 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -49,7 +49,7 @@ int moving, startx, starty;
 int drawFloorRecurse = 8;
 
 /* Size of floor, from -n to n, floorSize must be divisible by squareSize */
 int drawFloorRecurse = 8;
 
 /* Size of floor, from -n to n, floorSize must be divisible by squareSize */

-int floorSize = 400;
+int floorSize = 200;

 float squareSize = 2;
 
 /* Current camera x, y, z coords */
 float squareSize = 2;
 
 /* Current camera x, y, z coords */


@@ -94,4 +94,7 @@ GLfloat zoom = 0.0, rotate = 0.0;
 GLfloat zoomFactor = 0.2, rotateFactor = 0.5;
 
 /* Beginning width, height */
 GLfloat zoomFactor = 0.2, rotateFactor = 0.5;
 
 /* Beginning width, height */

-int width = 500, height = 500;
\ No newline at end of file
+int width = 500, height = 500;
+
+/* Texture state tracking */
+int currentGroundTexture = 0, currentMeshTexture = 0;
\ No newline at end of file