X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=8567414dd7d0de1f856b2908dcc977608d067638;hb=d8b5957481c1945c3a5ab71201e6b194c2cf4658;hp=d848ddf0164545120316e7cbe387768fb02aeb47;hpb=2e49aaa1b0e1fcb2c82ab979920ff23de5df0e51;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index d848ddf..8567414 100644
--- a/scene.c
+++ b/scene.c
@@ -535,10 +535,11 @@ void drawFloor() {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   gluLookAt(
-    40.0, 180.0, 60.0,  /* eye is at (0,8,60) */
-    0.0, 0.0,  0.0,  /* center is at (0,0,0) */
+    0.0, 0.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0,  0.0,  /* center is at (x,y,z) */
     0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
 
@@ -557,16 +558,13 @@ void display() {
     glDisable(GL_BLEND);
 
     glPushMatrix();
-      glLoadIdentity();
-      glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(0.0, 0.0, -1.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();
       glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
@@ -600,8 +598,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
-
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**