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

diff --git a/scene.c b/scene.c
index d5b1665..62ba908 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
@@ -513,13 +513,13 @@ void drawFloor() {
   //}
 
   glBegin(GL_QUADS);
-    glTexCoord2f(0.0, 0.0);
+    //glTexCoord2f(0.0, 0.0);
     glVertex3fv(floorVertices[0]);
-    glTexCoord2f(0.0, 16.0);
+    //glTexCoord2f(0.0, 16.0);
     glVertex3fv(floorVertices[1]);
-    glTexCoord2f(16.0, 16.0);
+    //glTexCoord2f(16.0, 16.0);
     glVertex3fv(floorVertices[2]);
-    glTexCoord2f(16.0, 0.0);
+    //glTexCoord2f(16.0, 0.0);
     glVertex3fv(floorVertices[3]);
   glEnd();
 
@@ -535,8 +535,6 @@ 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) */
@@ -553,12 +551,18 @@ void display() {
   glPushMatrix();
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
-    glEnable(GL_BLEND);
-    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     drawFloor();
-    glDisable(GL_BLEND);
 
-    glutSolidTeapot(1); // Draw teapot for test
+    glPushMatrix();
+      glDisable(GL_LIGHTING);
+      
+      glColor3f(1.0, 0.0, 1.0);
+      glTranslatef(0.0, 8.0, 0.0);
+
+      glutSolidTeapot(1); // Draw teapot for test
+      
+      glEnable(GL_LIGHTING);
+    glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
@@ -581,7 +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,8 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
+
+  glMatrixMode(GL_MODELVIEW);
 }
 
 /**