(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 62ba908..8d90cf7 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
@@ -537,8 +537,8 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\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, 0.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, 1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
@@ -551,17 +551,16 @@ 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
-\r
-      glutSolidTeapot(1); // Draw teapot for test\r
-      \r
-      glEnable(GL_LIGHTING);\r
+    \r
+      glTranslatef(0.0, 0.0, 0.0);\r
+ \r
+      glutSolidTeapot(30); // Draw teapot for test\r
     glPopMatrix();\r
 \r
     glPushMatrix();\r
@@ -585,6 +584,7 @@ void display() {
  */\r
 void init() {\r
   glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
 \r
   gluPerspective(\r
      60.0,  /* field of view in degree */\r
@@ -601,6 +601,7 @@ void init() {
   glEnable(GL_LIGHTING);\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
+  glLoadIdentity();\r
 }\r
 \r
 /**\r