X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=87a439d812ed28921e1694487db7acf16eeccab4;hp=634060c40ddaa51122ef11267c8df01a6bd561a4;hb=03efe5959d1dd8ca3f254d95e1a1d399d6e41c35;hpb=6e377a4df1d3abdc42daca7dcbb571f340160997 diff --git a/globals.c b/globals.c index 634060c..87a439d 100644 --- a/globals.c +++ b/globals.c @@ -45,17 +45,6 @@ char dataDir[200]; // Stores the directory name for the meshes and textures. int moving, startx, starty; -/* Time varying or user-controled variables. */ -float jump = 0.0; - -/* Near and far parameters - calculates scene size */ -GLfloat near = -30; -GLfloat far = 30; - -/* Near and far clipping planes - calculates clipping planes */ -GLfloat nearClip = -200; -GLfloat farClip = 200; - /* Recursion level for floor drawing */ int drawFloorRecurse = 8; @@ -70,24 +59,22 @@ GLfloat factor = 1.0; GLfloat lineLength = 10; /* Light 0 parameters */ -GLfloat diffuse0[]={0.2, 0.2, 0.2, 1.0}; -GLfloat ambient0[]={0.2, 0.2, 0.2, 1.0}; -GLfloat specular0[]={0.2, 0.2, 0.2, 1.0}; +GLfloat diffuse0[]={1.0, 0.0, 0.0, 1.0}; +GLfloat ambient0[]={1.0, 0.0, 0.0, 1.0}; +GLfloat specular0[]={1.0, 0.0, 0.0, 1.0}; GLfloat direction0[] = {0.0, 0.0, 0.0}; -GLfloat lightColor0[] = {1.0, 1.0, 1.0, 1.0}; // White light GLfloat lightPosition0[4]; float lightAngle0 = 0.0, lightHeight0 = 5; int lightMoving0 = 0, lightStartX0, lightStartY0; /* Light 1 parameters */ -GLfloat diffuse1[]={0.2, 0.2, 0.2, 1.0}; -GLfloat ambient1[]={0.2, 0.2, 0.2, 1.0}; -GLfloat specular1[]={0.2, 0.2, 0.2, 1.0}; +GLfloat diffuse1[]={0.0, 1.0, 0.0, 1.0}; +GLfloat ambient1[]={0.0, 1.0, 0.0, 1.0}; +GLfloat specular1[]={0.0, 1.0, 0.0, 1.0}; GLfloat direction1[] = {0.0, 0.0, 0.0}; -GLfloat lightColor1[] = {1.0, 1.0, 1.0, 1.0}; // White light GLfloat lightPosition1[4]; float lightAngle1 = 360.0, lightHeight1 = 5; @@ -99,7 +86,7 @@ GLfloat diffuse[] = {1.0, 0.8, 0.0, 1.0}; GLfloat specular[] = {1.0, 1.0, 1.0, 1.0}; GLfloat shine = 100.0; GLfloat glightmodel[] = {0.2,0.2,0.2,1}; -GLfloat emission[] = {1.0, 1.0, 1.0, 1.0}; +GLfloat emission[] = {0.0, 0.3, 0.3, 1.0}; /* Zoom and rotate tracking */ GLfloat zoom = 0.0, rotate = 0.0;