X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=e1dbe146f5afc4f4caf275c9f0a1d660539bcaf7;hb=1ab820e2cf1b498ff7c88a4480ec85fa2dc4a45a;hp=93c9fb7c44180a77dc54ab99a18384d0dc65cab0;hpb=779017aa98e939a06fa38c94dd5f7fe4c0a6833e;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 93c9fb7..e1dbe14 100644
--- a/scene.c
+++ b/scene.c
@@ -535,11 +535,12 @@ void drawFloor() {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   gluLookAt(
-    0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
-    0.0, 8.0,  0.0,  /* center is at (0,8,0) */
-    0.0, 1.0,  0.0   /* up is in postivie Y direction */
+    0.0, 90.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0,  0.0,  /* center is at (x,y,z) */
+    0.0, 100.0,  0.0   /* up is in postivie Y direction */
     );
 
   /* Reposition the light source. */
@@ -557,16 +558,15 @@ void display() {
     glDisable(GL_BLEND);
 
     glPushMatrix();
-      glLoadIdentity();
-      glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(-8.0, 0.0, -10.0);
+   
+      glTranslatef(0.0, 0.0, 0.0);
 
-      glutSolidTeapot(1); // Draw teapot for test
+      glutSolidTeapot(5); // Draw teapot for test
     glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      //glLoadIdentity();
+      glLoadIdentity();
       glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
@@ -600,8 +600,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
-
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**