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

diff --git a/scene.c b/scene.c
index 82d3cef..76b437b 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, 90.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 10000.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. */
@@ -549,7 +548,6 @@ void display() {
   lightPosition[2] = 12*sin(lightAngle);
   lightPosition[3] = 0.0;
 
-  glMatrixMode(GL_PROJECTION);
   glPushMatrix();
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -559,15 +557,14 @@ void display() {
     glDisable(GL_BLEND);
 
     glPushMatrix();
-      glLoadIdentity();
-      glTranslatef(0.0, -90.0, -60.0);
-
+    
+      //glTranslatef(0.0, 0.0, 0.0);
+    glLoadIdentity();
       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. */
@@ -587,6 +584,7 @@ void display() {
  */
 void init() {
   glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
 
   gluPerspective(
      60.0,  /* field of view in degree */
@@ -601,6 +599,9 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
+
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
 }
 
 /**