X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=a8f37dd3646275b25065cd3d66d9f2148fb53f64;hp=040763aa9e53ea5991dc326faab9f149fdab1986;hb=618a3dd82f7c1ff678b299fb49a66c059b2f380d;hpb=077ddec0d821de69153943349f63df6280504a12

diff --git a/scene.c b/scene.c
index 040763a..a8f37dd 100644
--- a/scene.c
+++ b/scene.c
@@ -327,15 +327,15 @@ 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);
+      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface
+      glColor3f(0.0, 0.0, 0.0);
       glutSolidTeapot(1);
     glPopMatrix();
 
     // Draw a white ball over the light source
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 1.0);
+      glColor3f(1.0, 1.0, 0.0);
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
       glutSolidSphere(1.0, 50, 50);
       glEnable(GL_LIGHTING);
@@ -407,24 +407,26 @@ int main(int argc, char **argv) {
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background
   glClearDepth(1.0f); // Depth Buffer Setup
+  glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
   glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
+  glEnable(GL_BLEND);
   glLineWidth(1.0);
 
   glMatrixMode(GL_PROJECTION);
   gluPerspective(
      40.0, /* field of view in degree */
       1.0, /* aspect ratio */
-     10.0, /* Z near */
-    100.0  /* Z far */
+     1.0, /* Z near */
+    1000000.0  /* Z far */
     );
 
   glMatrixMode(GL_MODELVIEW);
   gluLookAt(
-    0.0, 35.0, 30.0,  /* eye is at (0,8,60) */
-    0.0,  0.0,  0.0,  /* center is at (0,8,0) */
+    0.0, 35.0, -20.0,  /* eye is at (0,8,60) */
+    0.0,  10.0,  0.0,  /* center is at (0,8,0) */
     0.0,  1.0,  0.0   /* up is in postivie Y direction */
     );