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

diff --git a/scene.c b/scene.c
index 62ba908..cbe3b56 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();
 
@@ -535,11 +535,12 @@ 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, 1.0,  0.0   /* up is in postivie Y direction */
+    0.0, 90.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0,  0.0,  /* center is at (x,y,z) */
+    0.0, 100.0,  0.0   /* up is in postivie Y direction */
     );
 
   /* Reposition the light source. */
@@ -551,21 +552,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);
 
+    glMatrixMode(GL_PROJECTION);
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      
-      glColor3f(1.0, 0.0, 1.0);
-      glTranslatef(0.0, 8.0, 0.0);
+    
+      glTranslatef(0.0, 0.0, 0.0);
 
-      glutSolidTeapot(1); // Draw teapot for test
-      
-      glEnable(GL_LIGHTING);
+      glutSolidTeapot(5); // 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. */
@@ -599,8 +601,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
-
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**