From: Ash Tyndall Date: Fri, 21 Oct 2011 03:53:04 +0000 (+0800) Subject: (no commit message) X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=9a7035519ce904b75c676fbe2db696ec65d8d32b;p=atyndall%2Fcits2231.git --- diff --git a/globals.c b/globals.c index 237e399..1714496 100644 --- a/globals.c +++ b/globals.c @@ -75,19 +75,17 @@ 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[]={1.0, 1.0, 0.0, 1.0}; +GLfloat ambient1[]={1.0, 1.0, 0.0, 1.0}; +GLfloat specular1[]={1.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; diff --git a/globals.h b/globals.h index 640c323..8601a4b 100644 --- a/globals.h +++ b/globals.h @@ -67,7 +67,6 @@ extern GLfloat ambient0[]; extern GLfloat specular0[]; extern GLfloat direction0[]; -extern GLfloat lightColor0[]; extern GLfloat lightPosition0[]; extern float lightAngle0, lightHeight0; @@ -79,7 +78,6 @@ extern GLfloat ambient1[]; extern GLfloat specular1[]; extern GLfloat direction1[]; -extern GLfloat lightColor1[]; extern GLfloat lightPosition1[]; extern float lightAngle1, lightHeight1;