X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=globals.c;h=d01c1f5da973ba91bddc1eba667a5afd526a084a;hp=d1fedddd6f068eab71ba26dc176c3c9a8faf6d47;hb=c9cb76d66ffd1deb1efa100398913934543e35c3;hpb=751a7ad384e80669e71e8e5613227ac450c71944 diff --git a/globals.c b/globals.c index d1feddd..d01c1f5 100644 --- a/globals.c +++ b/globals.c @@ -75,22 +75,20 @@ 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[]={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[]={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 = 180.0, lightHeight1 = 5; +float lightAngle1 = 360.0, lightHeight1 = 5; int lightMoving1 = 0, lightStartX1, lightStartY1; /* Material types */