X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=cbe3b56a773f444f4dba974001ddc4626f82a4bb;hb=2346e516c0f689c1e78d150134ab9781c0413faf;hp=4bfc13c77bef0c37d63c2840b1c3d69b7d4ffd86;hpb=3cf7b0ecfa4d428c7774fc4196adfbe21bd4fe08;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 4bfc13c..cbe3b56 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(
-    90.0, 0.0, 60.0,  /* eye is at (0,8,60) */
-    0.0, 0.0,  0.0,  /* center is at (0,0,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. */
@@ -556,12 +557,12 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
+    glMatrixMode(GL_PROJECTION);
     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();
@@ -600,8 +601,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
-
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**