From: Ash Tyndall <git@atyndall.net>
Date: Tue, 18 Oct 2011 03:52:37 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=759c8b323c9020bde9a1006db2029413cbc3f99f;p=atyndall%2Fcits2231.git

---

diff --git a/scene.c b/scene.c
index 46feed9..c13268c 100644
--- a/scene.c
+++ b/scene.c
@@ -527,7 +527,7 @@ drawFloor(void)
 }
 
 
-static GLfloat lightColor[] = {0.8, 1.0, 0.8, 1.0}; /* green-tinted */
+static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */
 static GLfloat lightPosition[4];
 static float lightAngle = 0.0, lightHeight = 20;
 
@@ -536,41 +536,16 @@ static float lightAngle = 0.0, lightHeight = 20;
  * Display function
  */
 void display() {
-   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-   glLoadIdentity();
-
-   /*glTranslatef( 0.0f,  0.0f,  0.0f);
-   glBegin(GL_QUADS);
-     glVertex3f( 0.0f,  1.0f, -1.0f);
-     glVertex3f( 0.0f,  1.0f,  1.0f);
-     glVertex3f( 0.0f, -1.0f,  1.0f);
-     glVertex3f( 0.0f, -1.0f, -1.0f);
-   glEnd();*/
-
-
-   //glTranslatef( 0.0f, 0.0f, -5.0f); // Move into the Screen 10.0
-   //glutSolidTeapot(1);
-
-  /* glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-   gluLookAt(0.7f, 0.4f, 0.9f, -2.0f, -1.0f, -7.0f, 1.0f, 10.0f, 1.0f);
-
-
-   glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();*/
-
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glLoadIdentity();
 
-   /* Reposition the light source. */
+  /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
   lightPosition[1] = lightHeight;
   lightPosition[2] = 12*sin(lightAngle);
-  //if (directionalLight) {
-    lightPosition[3] = 0.0;
-  //} else {
-  //  lightPosition[3] = 1.0;
-  //}
+  lightPosition[3] = 0.0;
 
-   glPushMatrix();
+  glPushMatrix();
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
     glEnable(GL_BLEND);
@@ -578,21 +553,22 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
-    glutSolidTeapot(1);
+    glutSolidTeapot(1); // Draw teapot for test
 
-        glPushMatrix();
-    glDisable(GL_LIGHTING);
+    glPushMatrix();
+      glDisable(GL_LIGHTING);
+      glColor3f(1.0, 1.0, 0.0);
 
-     /* Draw a yellow ball at the light source. */
+      /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
       glutSolidSphere(1.0, 5, 5);
 
-         glEnable(GL_LIGHTING);
+      glEnable(GL_LIGHTING);
     glPopMatrix();
 
   glPopMatrix();
 
-    glutSwapBuffers();
+  glutSwapBuffers();
 }