X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=b2206698a392a4f9e0aa3f08096aea8838aef4ae;hp=506cb15e6c523b91a5c96508adc46332b68e3588;hb=fc636ebc890e3181512b29bd8f2ee111d206c068;hpb=c3d286211e4f462930b4640150e619faf4787c31

diff --git a/globals.c b/globals.c
index 506cb15..b220669 100644
--- a/globals.c
+++ b/globals.c
@@ -49,8 +49,8 @@ int moving, startx, starty;
 int drawFloorRecurse = 8;
 
 /* Size of floor, from -n to n, floorSize must be divisible by squareSize */
-int floorSize = 400;
-float squareSize = 0.5;
+int floorSize = 200;
+float squareSize = 2;
 
 /* Current camera x, y, z coords */
 GLfloat camx = 0.0, camy = 0.0, camz = 0.0, keyrot = 0.0;
@@ -82,7 +82,7 @@ float lightAngle1 = 360.0, lightHeight1 = 5;
 int lightMoving1 = 0, lightStartX1, lightStartY1;
 
 /* Material types */
-GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
+GLfloat ambient[] = {1.0, 1.0, 1.0, 1.0};
 GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
 GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
 GLfloat shine = 100.0;
@@ -94,4 +94,7 @@ GLfloat zoom = 0.0, rotate = 0.0;
 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