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

diff --git a/scene.c b/scene.c
index d5b1665..76b437b 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
@@ -535,12 +535,10 @@ 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, 10000.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 */
     );
 
@@ -558,7 +556,12 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
-    glutSolidTeapot(1); // Draw teapot for test
+    glPushMatrix();
+    
+      //glTranslatef(0.0, 0.0, 0.0);
+    glLoadIdentity();
+      glutSolidTeapot(5); // Draw teapot for test
+    glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
@@ -582,6 +585,7 @@ void display() {
 void init() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
+
   gluPerspective(
      60.0,  /* field of view in degree */
       1.0,  /* aspect ratio */ 
@@ -595,6 +599,9 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
+
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
 }
 
 /**