X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=374d8b304ce4529681ebe8e2cd1fd8f79bb371cc;hp=800f363c217c53535038f4281f5604fef41bfcc2;hb=65949d92003e506ddbcc3285abfc9d4b5070df13;hpb=8664ff7d3cbe2e5285d067231f54772b46649653 diff --git a/globals.c b/globals.c index 800f363..374d8b3 100644 --- a/globals.c +++ b/globals.c @@ -63,20 +63,17 @@ GLfloat far = 30; GLfloat nearClip = -200; GLfloat farClip = 200; -/* Zoom factor for mouse movements */ -GLfloat zoomFactor = 1.0; - /* Recursion level for floor drawing */ int drawFloorRecurse = 8; /* Size of floor, from -n to n */ -int floorSize = 50; +int floorSize = 200; /* Current camera x, y, z coords */ GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0; /* Length of axis lines */ -GLfloat lineLength = 100; +GLfloat lineLength = 5; /* Light 0 parameters */ GLfloat diffuse0[]={1.0, 0.0, 0.0, 1.0}; @@ -96,5 +93,8 @@ 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 zoomFactor = 0.0, rotateFactor = 0.0; + /* Beginning width, height */ int width = 500, height = 500; \ No newline at end of file