X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=b2206698a392a4f9e0aa3f08096aea8838aef4ae;hp=45730510d469a28b3240cfae2267bc746df287e0;hb=fc636ebc890e3181512b29bd8f2ee111d206c068;hpb=ff3dfac490432c6e4ed5cc115da2365e6b1276a6;ds=sidebyside

diff --git a/globals.c b/globals.c
index 4573051..b220669 100644
--- a/globals.c
+++ b/globals.c
@@ -45,22 +45,12 @@ char dataDir[200];  // Stores the directory name for the meshes and textures.
 
 int moving, startx, starty;
 
-/* Time varying or user-controled variables. */
-float jump = 0.0;
-
-/* Near and far parameters - calculates scene size */
-GLfloat near = -30;
-GLfloat far = 30;
-
-/* Near and far clipping planes - calculates clipping planes */
-GLfloat nearClip = -200;
-GLfloat farClip = 200;
-
 /* Recursion level for floor drawing */
 int drawFloorRecurse = 8;
 
-/* Size of floor, from -n to n */
+/* Size of floor, from -n to n, floorSize must be divisible by squareSize */
 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;
@@ -75,26 +65,24 @@ GLfloat ambient0[]={1.0, 0.0, 0.0, 1.0};
 GLfloat specular0[]={1.0, 0.0, 0.0, 1.0};
 GLfloat direction0[] = {0.0, 0.0, 0.0};
 
-GLfloat lightColor0[] = {1.0, 1.0, 1.0, 1.0}; // White light
 GLfloat lightPosition0[4];
 
 float lightAngle0 = 0.0, lightHeight0 = 5;
 int lightMoving0 = 0, lightStartX0, lightStartY0;
 
 /* Light 1 parameters */
-GLfloat diffuse1[]={1.0, 0.0, 0.0, 1.0};
-GLfloat ambient1[]={1.0, 0.0, 0.0, 1.0};
-GLfloat specular1[]={1.0, 0.0, 0.0, 1.0};
+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 direction1[] = {0.0, 0.0, 0.0};
 
-GLfloat lightColor1[] = {1.0, 1.0, 1.0, 1.0}; // White light
 GLfloat lightPosition1[4];
 
-float lightAngle1 = 280.0, lightHeight1 = 5;
+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;
@@ -106,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