X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=a379cce781c12d8bfdf11b7e8eae51359c5b1adc;hp=d15258dcbd393e69c44d085788996bbc8d36a0c6;hb=8ce9e04b2f947ad161075ba0a8cf822b5594d199;hpb=ec643184723d626345255a72a3d40cf8c8c76a75

diff --git a/globals.c b/globals.c
index d15258d..a379cce 100644
--- a/globals.c
+++ b/globals.c
@@ -45,9 +45,9 @@ LightObject lightObjs[LIGHTS];
 
 GLfloat defaultPosition[] = {0.0, 0.0, 0.0, 0.0};
 
-GLfloat defaultAmbient[] = {0.0, 1.0, 0.0, 1.0};
-GLfloat defaultDiffuse[] = {0.0, 1.0, 0.0, 1.0};
-GLfloat defaultSpecular[] = {0.0, 1.0, 0.0, 1.0};
+GLfloat defaultAmbient[] = {0.8, 0.8, 0.8, 1.0};
+GLfloat defaultDiffuse[] = {0.8, 0.8, 0.8, 1.0};
+GLfloat defaultSpecular[] = {0.8, 0.8, 0.8, 1.0};
 GLfloat defaultDirection[] = {0.0, 0.0, 0.0};
 
 GLfloat defaultCutoff = 180;
@@ -55,11 +55,11 @@ GLfloat defaultExponent = 1;
 
 /* Material types */
 GLfloat materialAmbient[] = {0.2, 0.2, 0.2, 1.0};
-GLfloat materialDiffuse[] = {1.0, 0.8, 0.0, 1.0};
+GLfloat materialDiffuse[] = {1.0, 1.0, 1.0, 1.0};
 GLfloat materialSpecular[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat materialShine = 50.0;
 
 /* Light parameters */
-GLfloat lightShine = 100.0;
 GLfloat lightGlobalModel[] = {0.2,0.2,0.2,1};
 GLfloat lightGlobalEmission[] = {0.0, 0.3, 0.3, 1.0};
 GLfloat lightBallSize = 0.2;
@@ -84,10 +84,11 @@ GLfloat factor = 1.0;
 GLfloat lineLength = 10;
 
 /* Zoom and rotate tracking */
-GLfloat zoom = 0.0, rotate = 0.0, camAngle = 40.0;
+GLfloat zoom = 0.1, rotate = 0.1, camAngle = 40.0;
 GLfloat zoomFactor = 0.2, camRotateFactor = 0.5, camAngleFactor = 0.5;
 GLfloat leftrightFactor = 0.05, nearfarFactor = 0.1, bigsmallFactor = 0.6;
 GLfloat updownFactor = 0.03, rotateFactor = 0.8, texscaleFactor = 0.2;
+GLfloat lleftrightFactor = 0.05, lnearfarFactor = 0.1;
 
 /* Beginning width, height */
 int width = 700, height = 700;