X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=4fd0274dfc4e6ad74ef3b8ead2374faef8752b96;hp=d1fedddd6f068eab71ba26dc176c3c9a8faf6d47;hb=e84eec59aded99f41844e639a2ce84871c695002;hpb=751a7ad384e80669e71e8e5613227ac450c71944;ds=sidebyside diff --git a/globals.c b/globals.c index d1feddd..4fd0274 100644 --- a/globals.c +++ b/globals.c @@ -70,9 +70,9 @@ GLfloat factor = 1.0; GLfloat lineLength = 10; /* Light 0 parameters */ -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 diffuse0[]={1.0, 1.0, 1.0, 1.0}; +GLfloat ambient0[]={1.0, 1.0, 1.0, 1.0}; +GLfloat specular0[]={1.0, 1.0, 1.0, 1.0}; GLfloat direction0[] = {0.0, 0.0, 0.0}; GLfloat lightColor0[] = {1.0, 1.0, 1.0, 1.0}; // White light @@ -82,15 +82,15 @@ float lightAngle0 = 0.0, lightHeight0 = 5; int lightMoving0 = 0, lightStartX0, lightStartY0; /* Light 1 parameters */ -GLfloat diffuse1[]={1.0, 0.0, 0.0, 1.0}; -GLfloat ambient1[]={1.0, 0.0, 0.0, 1.0}; -GLfloat specular1[]={1.0, 0.0, 0.0, 1.0}; +GLfloat diffuse1[]={1.0, 1.0, 1.0, 1.0}; +GLfloat ambient1[]={1.0, 1.0, 1.0, 1.0}; +GLfloat specular1[]={1.0, 1.0, 1.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 = 180.0, lightHeight1 = 5; +float lightAngle1 = 360.0, lightHeight1 = 5; int lightMoving1 = 0, lightStartX1, lightStartY1; /* Material types */ @@ -99,7 +99,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[] = {0.0, 0.3, 0.3, 1.0}; +GLfloat emission[] = {1.0, 1.0, 1.0, 1.0}; /* Zoom and rotate tracking */ GLfloat zoom = 0.0, rotate = 0.0;