(no commit message)

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