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

diff --git a/scene.c b/scene.c
index 93c9fb7..82d3cef 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. */
@@ -548,6 +549,7 @@ void display() {
   lightPosition[2] = 12*sin(lightAngle);
   lightPosition[3] = 0.0;
 
+  glMatrixMode(GL_PROJECTION);
   glPushMatrix();
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -558,15 +560,14 @@ void display() {
 
     glPushMatrix();
       glLoadIdentity();
-      glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(-8.0, 0.0, -10.0);
+      glTranslatef(0.0, -90.0, -60.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 +601,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
-
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**