X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=df2e79620c38bc93a57b91e48a0ff7563e623dbd;hp=bdabe2d113967167f0de52a3972b9dc31e5514c7;hb=e167fee487eef79406a5baa2757a7262811b027b;hpb=be10e0bdc4f3277599aa5c02fdddfc0d1cc2f66f diff --git a/globals.c b/globals.c index bdabe2d..df2e796 100644 --- a/globals.c +++ b/globals.c @@ -45,12 +45,12 @@ 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[] = {1.0, 0.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 = 0; +GLfloat defaultCutoff = 180; GLfloat defaultExponent = 1; /* Material types */ @@ -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;