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

diff --git a/globals.c b/globals.c
index b441f8c..f8ba810 100644
--- a/globals.c
+++ b/globals.c
@@ -56,26 +56,46 @@ 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;
 GLfloat farClip = 200;
 
-/* Zoom factor for mouse movements */
-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;
 
+/* Current camera x, y, z coords */
+GLfloat camx = 0.0, camy = 0.0, camz = 0.0, keyrot = 0.0;
+GLfloat factor = 1.0;
+
+/* Length of axis lines */
+GLfloat lineLength = 10;
+
 /* 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 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};
+
+/* Zoom and rotate tracking */
+GLfloat zoom = 0.0, rotate = 0.0;
+GLfloat zoomFactor = 0.2, rotateFactor = 0.5;
+
+/* Beginning width, height */
+int width = 500, height = 500;
\ No newline at end of file