(no commit message)

[atyndall/cits2231.git] / globals.c

diff --git a/globals.c b/globals.c
index 62d486f..a12130d 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -60,9 +60,9 @@ GLfloat factor = 1.0;
 GLfloat lineLength = 10;
 
 /* Light 0 parameters */
 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];
 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 */
 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