X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=10163a99e3d5d07cbfb60936c32cc68c8c887813;hp=8a8d488e849154c996b8b70af1d586b08bf37b9f;hb=821c28d874f5560d63a57ed73bc77b11337c3280;hpb=41e9776f7eb522acab751a6126e6ac3924e55214 diff --git a/globals.c b/globals.c index 8a8d488..10163a9 100644 --- a/globals.c +++ b/globals.c @@ -45,13 +45,13 @@ 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 = 1; -GLfloat defaultExponent = 0; +GLfloat defaultCutoff = 180; +GLfloat defaultExponent = 1; /* Material types */ GLfloat materialAmbient[] = {0.2, 0.2, 0.2, 1.0}; @@ -86,10 +86,12 @@ GLfloat lineLength = 10; /* Zoom and rotate tracking */ GLfloat zoom = 0.0, rotate = 0.0, camAngle = 40.0; GLfloat zoomFactor = 0.2, camRotateFactor = 0.5, camAngleFactor = 0.5; -GLfloat leftrightFactor = 0.05, nearfarFactor = 0.1, bigsmallFactor = 0.6, updownFactor = 0.03, rotateFactor = 0.8, texscaleFactor = 0.2; +GLfloat leftrightFactor = 0.05, nearfarFactor = 0.1, bigsmallFactor = 0.6; +GLfloat updownFactor = 0.03, rotateFactor = 0.8, texscaleFactor = 0.2; +GLfloat lleftrightFactor = 0.005, lnearfarFactor = 0.05; /* Beginning width, height */ -int width = 750, height = 750; +int width = 700, height = 700; /* Texture state tracking */ int currentGroundTexture = 0, currentMeshTexture = 0; \ No newline at end of file