From: Ash Tyndall <git@atyndall.net>
Date: Wed, 19 Oct 2011 12:34:46 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=commitdiff_plain;h=832b617a2019cb59220227dfd563808b83b3b6ef

---

diff --git a/scene.c b/scene.c
index 02033d9..de3a2f7 100644
--- a/scene.c
+++ b/scene.c
@@ -137,10 +137,11 @@ int floorSize = 100;
 
 /* Light 0 parameters */
 GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat ambient0[] = {1.0, 1.0, 1.0, 1.0};
+GLfloat ambient0[] = {0.0, 0.0, 0.0, 1.0};
 GLfloat specular0[] = {1.0, 1.0, 1.0, 1.0};
-GLfloat light0_pos[] ={ 1.0, 2.0, 3,0, 1.0};
 GLfloat emission0[] = {0.0, 0.0, 0.0, 0.0};
+GLfloat light0_pos[] ={1.0, 1.0, 0,0, 1.0};
+GLfloat glightmodel[] = {0.2,0.2,0.2,1};
 
 
 /**
@@ -665,6 +666,7 @@ void display() {
     // Draw teapot for a test object
     glPushMatrix();
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
+      glColor3f(0.5, 0.5, 0.5);
       glutWireTeapot(1);
     glPopMatrix();
 
@@ -696,17 +698,20 @@ void init() {
      far   /* Z far */
     );    
 
-  glEnable(GL_LIGHT0);
+  
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);
+  glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
+  glEnable(GL_LIGHT0);
+  glEnable(GL_LIGHTING);
+  glEnable(GL_COLOR_MATERIAL);
   glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
   glMaterialfv( GL_FRONT_AND_BACK, GL_SPECULAR, specular0);
   glMaterialfv( GL_FRONT_AND_BACK, GL_EMISSION, emission0);
-  glEnable(GL_COLOR_MATERIAL);
 
-  glEnable(GL_LIGHTING);
+  
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();