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

diff --git a/scene.c b/scene.c
index 62ba908..d1f88e0 100644
--- a/scene.c
+++ b/scene.c
@@ -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();
 
@@ -551,21 +551,22 @@ 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);
 
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      
+      glLoadIdentity();
       glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(0.0, 8.0, 0.0);
+      glTranslatef(-8.0, 0.0, -1.0);
 
       glutSolidTeapot(1); // Draw teapot for test
-      
-      glEnable(GL_LIGHTING);
     glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
+      glLoadIdentity();
       glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */