X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=b53163e34bae085df486fcdd22fb367c848750ae;hp=3f7d2be0968dd3545c749102b69d41b27c4a46e3;hb=ec50cae176e4a0ec67a756f779adbdf700362924;hpb=919debbfedb046e7ff335b4e2c617b46f1f83f5a

diff --git a/globals.c b/globals.c
index 3f7d2be..b53163e 100644
--- a/globals.c
+++ b/globals.c
@@ -56,8 +56,8 @@ GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
 /* Near and far parameters - calculates scene size */
-GLfloat near = -15;
-GLfloat far = 15;
+GLfloat near = -30;
+GLfloat far = 30;
 
 /* Near and far clipping planes - calculates clipping planes */
 GLfloat nearClip = -200;
@@ -67,7 +67,7 @@ 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;
@@ -76,12 +76,25 @@ int floorSize = 200;
 GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0;
 
 /* Length of axis lines */
-GLfloat lineLength = 100;
+GLfloat lineLength = 5;
 
 /* Light 0 parameters */
-GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat ambient0[] = {1.0, 1.0, 1.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};
+
+/* Beginning width, height */
+int width = 500, height = 500;
\ No newline at end of file