X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=a12130da459ffeb75c5a1616a25df02728c1c0ef;hp=2fa97d54e96b7f4be4bb0add4a64398f97aa47d8;hb=360116b5d41480d490bd129d5ad431788304b468;hpb=6a9c4794ee755314258c369fe47927c69e158733

diff --git a/globals.c b/globals.c
index 2fa97d5..a12130d 100644
--- 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 floorSize = 300;
+int floorSize = 200;
 float squareSize = 2;
 
 /* Current camera x, y, z coords */
@@ -60,9 +60,9 @@ GLfloat factor = 1.0;
 GLfloat lineLength = 10;
 
 /* Light 0 parameters */
-GLfloat diffuse0[]={1.0, 0.0, 0.0, 1.0};
-GLfloat ambient0[]={1.0, 0.0, 0.0, 1.0};
-GLfloat specular0[]={1.0, 0.0, 0.0, 1.0};
+GLfloat diffuse0[]={1.0, 0.0, 0.0, 0.1};
+GLfloat ambient0[]={1.0, 0.0, 0.0, 0.1};
+GLfloat specular0[]={1.0, 0.0, 0.0, 0.1};
 GLfloat direction0[] = {0.0, 0.0, 0.0};
 
 GLfloat lightPosition0[4];
@@ -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