(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 62ba908..b66be6f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -513,13 +513,13 @@ void drawFloor() {
   //}\r
 \r
   glBegin(GL_QUADS);\r
-    //glTexCoord2f(0.0, 0.0);\r
+    glTexCoord2f(0.0, 0.0);\r
     glVertex3fv(floorVertices[0]);\r
-    //glTexCoord2f(0.0, 16.0);\r
+    glTexCoord2f(0.0, 16.0);\r
     glVertex3fv(floorVertices[1]);\r
-    //glTexCoord2f(16.0, 16.0);\r
+    glTexCoord2f(16.0, 16.0);\r
     glVertex3fv(floorVertices[2]);\r
-    //glTexCoord2f(16.0, 0.0);\r
+    glTexCoord2f(16.0, 0.0);\r
     glVertex3fv(floorVertices[3]);\r
   glEnd();\r
 \r
@@ -535,11 +535,12 @@ void drawFloor() {
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
+  glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
   gluLookAt(\r
-    0.0, 8.0, 60.0,  /* eye is at (0,8,60) */\r
-    0.0, 8.0,  0.0,  /* center is at (0,8,0) */\r
-    0.0, 1.0,  0.0   /* up is in postivie Y direction */\r
+    0.0, 90.0, 60.0,  /* eye is at (x,y,z) */\r
+    0.0, 0.0,  0.0,  /* center is at (x,y,z) */\r
+    0.0, 100.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
   /* Reposition the light source. */\r
@@ -551,21 +552,21 @@ void display() {
   glPushMatrix();\r
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);\r
 \r
+    glEnable(GL_BLEND);\r
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);\r
     drawFloor();\r
+    glDisable(GL_BLEND);\r
 \r
     glPushMatrix();\r
-      glDisable(GL_LIGHTING);\r
-      \r
-      glColor3f(1.0, 0.0, 1.0);\r
-      glTranslatef(0.0, 8.0, 0.0);\r
+    glLoadIdentity();\r
+      glTranslatef(0.0, 0.0, 0.0);\r
 \r
-      glutSolidTeapot(1); // Draw teapot for test\r
-      \r
-      glEnable(GL_LIGHTING);\r
+      glutSolidTeapot(5); // Draw teapot for test\r
     glPopMatrix();\r
 \r
     glPushMatrix();\r
       glDisable(GL_LIGHTING);\r
+      glLoadIdentity();\r
       glColor3f(1.0, 1.0, 1.0);\r
 \r
       /* Draw a yellow ball at the light source. */\r
@@ -599,8 +600,6 @@ void init() {
   glLightf(GL_LIGHT0, GL_LINEAR_ATTENUATION, 0.05);\r
   glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r
-\r
-  glMatrixMode(GL_MODELVIEW);\r
 }\r
 \r
 /**\r