X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=6f7e985eb6229d6e940224dd9f3febb1d10ebeb4;hp=cc0f908e51fd6904a1281f2dbb6b65d2381de216;hb=02a8a651d1897a11d266dcd93d27b7f1d4c03a84;hpb=7bc353f0b089403981ebea667c6bf881f9f123c7

diff --git a/globals.c b/globals.c
index cc0f908..6f7e985 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 = -10;
-GLfloat far = 10;
+GLfloat near = -15;
+GLfloat far = 15;
 
 /* Near and far clipping planes - calculates clipping planes */
 GLfloat nearClip = -200;
@@ -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