X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=6f7e985eb6229d6e940224dd9f3febb1d10ebeb4;hp=b441f8cea1bfb9e86d035d8a909051aeccb46e2e;hb=3ec168e4f99e004e9bcc18bad462a627462ba870;hpb=a185b770048a8f9bca29b9b10593998cc9c8d2a3

diff --git a/globals.c b/globals.c
index b441f8c..6f7e985 100644
--- a/globals.c
+++ b/globals.c
@@ -67,15 +67,31 @@ GLfloat farClip = 200;
 GLfloat zoomFactor = 1.0;
 
 /* Recursion level for floor drawing */
-int drawFloorRecurse = 5;
+int drawFloorRecurse = 8;
 
 /* Size of floor, from -n to n */
-int floorSize = 200;
+int floorSize = 50;
+
+/* Current camera x, y, z coords */
+GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0;
+
+/* Length of axis lines */
+GLfloat lineLength = 100;
 
 /* Light 0 parameters */
-GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat ambient0[] = {0.0, 0.0, 0.0, 1.0};
-GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat emission0[] = {0.0, 0.0, 0.0, 0.0};
-GLfloat light0_pos[] ={1.0, 1.0, 0,0, 1.0};
-GLfloat glightmodel[] = {0.2,0.2,0.2,1};
\ No newline at end of file
+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 emission0[] = {0.0, 0.3, 0.3, 1.0};
+
+GLfloat direction0[] = {0.0, 0.0, 0.0};
+GLfloat light0_pos[] ={1.0, 1.0, 0,0, 0.5};
+
+GLfloat shine = 100.0;
+
+GLfloat glightmodel[] = {0.2,0.2,0.2,1};
+
+/* Material types */
+GLfloat ambient[] = {0.2, 0.2, 0.2, 1.0};
+GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0};
+GLfloat specular[] = {1.0, 1.0, 1.0, 1.0};
\ No newline at end of file