X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=19cc58aaae7b84e6a0d7c0e998bd92d0342e1f3c;hp=cfb80c084521b23c751fe8bffb9a2173c5fdf6e2;hb=94b530f4dea0bf804fca4ca966a37a28ffd0d2f6;hpb=91ab47db2c22378c5607e3fb5499a008edfb0289

diff --git a/scene.c b/scene.c
index cfb80c0..19cc58a 100644
--- a/scene.c
+++ b/scene.c
@@ -110,10 +110,10 @@ char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
 char dataDir[200];  // Stores the directory name for the meshes and textures.
 
 static GLfloat floorVertices[4][3] = {
-  { -20.0, 0.0, 20.0 },
-  { 20.0, 0.0, 20.0 },
-  { 20.0, 0.0, -20.0 },
-  { -20.0, 0.0, -20.0 },
+  { -1000.0, 0.0, 1000.0 },
+  { 1000.0, 0.0, 1000.0 },
+  { 1000.0, 0.0, -1000.0 },
+  { -1000.0, 0.0, -1000.0 },
 };
 
 static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
@@ -537,8 +537,8 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   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, 180.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,18 +557,15 @@ void display() {
     glDisable(GL_BLEND);
 
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      
-      glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(0.0, 8.0, 0.0);
+      glLoadIdentity();
+      glTranslatef(0.0, 0.0, 0.0);
 
-      glutSolidTeapot(1); // Draw teapot for test
-      
-      glEnable(GL_LIGHTING);
+      glutSolidTeapot(2); // 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. */