X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=ded55aa52891754c38036dd7fb90addf031c60f1;hp=762dd01707faf0fba3f8faedc75e94bca2e85364;hb=837ba2cddb236092d3d2bc30982148760b90d2ab;hpb=bc9637b414b002bf78ecdb54fd73524059723c1a

diff --git a/globals.c b/globals.c
index 762dd01..ded55aa 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 = 220;
+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, 1.0, 1.0, 0.1};
+GLfloat ambient0[]={1.0, 1.0, 1.0, 0.1};
+GLfloat specular0[]={1.0, 1.0, 1.0, 0.1};
 GLfloat direction0[] = {0.0, 0.0, 0.0};
 
 GLfloat lightPosition0[4];
@@ -71,9 +71,9 @@ float lightAngle0 = 0.0, lightHeight0 = 5;
 int lightMoving0 = 0, lightStartX0, lightStartY0;
 
 /* Light 1 parameters */
-GLfloat diffuse1[]={0.0, 1.0, 0.0, 1.0};
-GLfloat ambient1[]={0.0, 1.0, 0.0, 1.0};
-GLfloat specular1[]={0.0, 1.0, 0.0, 1.0};
+GLfloat diffuse1[]={1.0, 1.0, 1.0, 0.1};
+GLfloat ambient1[]={1.0, 1.0, 1.0, 0.1};
+GLfloat specular1[]={1.0, 1.0, 1.0, 0.1};
 GLfloat direction1[] = {0.0, 0.0, 0.0};
 
 GLfloat lightPosition1[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