X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=5356319f5bd493ee53b4a1f2336c415a6f78b9e8;hp=374d8b304ce4529681ebe8e2cd1fd8f79bb371cc;hb=9679e75a0bac57d3a2dc8602963c2ac4b94905b3;hpb=89e90cbd07402f824253fc0a4b2f1cd7e81b31e4 diff --git a/globals.c b/globals.c index 374d8b3..5356319 100644 --- a/globals.c +++ b/globals.c @@ -70,7 +70,8 @@ int drawFloorRecurse = 8; int floorSize = 200; /* Current camera x, y, z coords */ -GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0; +GLfloat camx = 0.0, camy = 0.0, camz = 0.0, keyrot = 0.0; +GLfloat factor = 1.0; /* Length of axis lines */ GLfloat lineLength = 5; @@ -82,7 +83,6 @@ GLfloat specular0[]={1.0, 0.0, 0.0, 1.0}; GLfloat emission0[] = {0.0, 0.3, 0.3, 1.0}; GLfloat direction0[] = {0.0, 0.0, 0.0}; -GLfloat light0_pos[] ={1.0, 1.0, 0,0, 0.5}; GLfloat shine = 100.0; @@ -94,7 +94,8 @@ 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; +GLfloat zoom = 0.0, rotate = 0.0; +GLfloat zoomFactor = 0.2, rotateFactor = 1.0; /* Beginning width, height */ int width = 500, height = 500; \ No newline at end of file