X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=69e1714a1699841edc01983b37bf8754795d307a;hp=aa9f2838503df8e027dee9c52f35fc4b03577c6a;hb=f8d40619ed0eba4ec9f0174f8bbf0981013185b0;hpb=f82d84288a2402a0ebab3c81a2da6299b90ffc13 diff --git a/globals.c b/globals.c index aa9f283..69e1714 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 */ @@ -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.05, lnearfarFactor = 0.1; /* 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