X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=8b524344e0d173d35dac92f09f6620fb43e9aadc;hp=fff3726991576b1552ae947471a5776be9b25b84;hb=458e414cd39888ce2a949d1a8169a6f1046f85c8;hpb=545900bc8b607326aed358ac455b632f8fd6fdbe

diff --git a/scene.c b/scene.c
index fff3726..8b52434 100644
--- a/scene.c
+++ b/scene.c
@@ -140,7 +140,8 @@ GLfloat diffuse0[] = {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 emission0[] = {0.0, 0.0, 0.0, 0.0};
-GLfloat light0_pos[] ={ 1.0, 1.0, 0,0, 1.0};
+GLfloat light0_pos[] ={1.0, 1.0, 0,0, 1.0};
+GLfloat glightmodel[] = {0.2,0.2,0.2,1};
 
 
 /**
@@ -665,7 +666,8 @@ void display() {
     // Draw teapot for a test object
     glPushMatrix();
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
-      glutWireTeapot(1);
+      glColor3f(0.5, 0.5, 0.5);
+      glutSolidTeapot(1);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -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();