X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=4c829c5deddc3a83afe1d9b4a04117b5d1e93e38;hp=07e0efdf2bcfe12499b1bcacd54349340af977c7;hb=a12d6797d3f6cd45fbc65283a7756dae72e61f91;hpb=d3465c5cd0e6e9b414e669e8c8aa464b03f2fd24

diff --git a/globals.c b/globals.c
index 07e0efd..4c829c5 100644
--- a/globals.c
+++ b/globals.c
@@ -55,9 +55,13 @@ float lightAngle = 0.0, lightHeight = 5;
 GLfloat angle = -150;   /* in degrees */
 GLfloat angle2 = 30;   /* in degrees */
 
-/* Near and far parameters */
-GLfloat near = -100;
-GLfloat far = 100;
+/* Near and far parameters - calculates scene size */
+GLfloat near = -15;
+GLfloat far = 15;
+
+/* Near and far clipping planes - calculates clipping planes */
+GLfloat nearClip = -200;
+GLfloat farClip = 200;
 
 /* Zoom factor for mouse movements */
 GLfloat zoomFactor = 1.0;
@@ -68,10 +72,16 @@ int drawFloorRecurse = 5;
 /* Size of floor, from -n to n */
 int floorSize = 200;
 
+/* 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 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[] = {1.0, 1.0, 1.0, 0.5};
+GLfloat light0_pos[] ={1.0, 1.0, 0,0, 0.5};
 GLfloat glightmodel[] = {0.2,0.2,0.2,1};
\ No newline at end of file