X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=16eae700682562b2dde4c022e3756edfc58ab8b5;hp=fae8cde55a1e20579835269d839baa3cb8d6482c;hb=9434d3fa1a3b6cc21dfea45b9a439bee63ef0561;hpb=07c1a3269730a26617d9818677092f3227c83f77

diff --git a/scene.c b/scene.c
index fae8cde..16eae70 100644
--- a/scene.c
+++ b/scene.c
@@ -535,12 +535,11 @@ void drawFloor() {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   gluLookAt(
     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, 100.0,  0.0   /* up is in postivie Y direction */
+    0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
 
   /* Reposition the light source. */
@@ -557,11 +556,12 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
-    //glPushMatrix();
-      glTranslatef(0.0, 0.0, 0.0);
+    glPushMatrix();
+    
+      //glTranslatef(0.0, 0.0, 0.0);
 
       glutSolidTeapot(5); // Draw teapot for test
-   // glPopMatrix();
+    glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
@@ -584,6 +584,7 @@ void display() {
  */
 void init() {
   glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
 
   gluPerspective(
      60.0,  /* field of view in degree */
@@ -598,6 +599,9 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
+
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
 }
 
 /**