From: Ash Tyndall <git@atyndall.net>
Date: Tue, 18 Oct 2011 07:36:32 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=c478573ff9f2ecc8761aed6fc60803ff3410162c;p=atyndall%2Fcits2231.git

---

diff --git a/scene.c b/scene.c
index 62ba908..89153a3 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,13 +551,16 @@ 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);
       
       glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(0.0, 8.0, 0.0);
+      glTranslatef(-8, 0, -10.0);
 
       glutSolidTeapot(1); // Draw teapot for test