(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index d5b1665..62ba908 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -110,10 +110,10 @@ char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
 char dataDir[200];  // Stores the directory name for the meshes and textures.\r
 \r
 static GLfloat floorVertices[4][3] = {\r
-  { -20.0, 0.0, 20.0 },\r
-  { 20.0, 0.0, 20.0 },\r
-  { 20.0, 0.0, -20.0 },\r
-  { -20.0, 0.0, -20.0 },\r
+  { -1000.0, 0.0, 1000.0 },\r
+  { 1000.0, 0.0, 1000.0 },\r
+  { 1000.0, 0.0, -1000.0 },\r
+  { -1000.0, 0.0, -1000.0 },\r
 };\r
 \r
 static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light\r
@@ -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,8 +535,6 @@ void drawFloor() {
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
-\r
-  glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
   gluLookAt(\r
     0.0, 8.0, 60.0,  /* eye is at (0,8,60) */\r
@@ -553,12 +551,18 @@ 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
-    glutSolidTeapot(1); // Draw teapot for test\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
+    glPopMatrix();\r
 \r
     glPushMatrix();\r
       glDisable(GL_LIGHTING);\r
@@ -581,7 +585,7 @@ void display() {
  */\r
 void init() {\r
   glMatrixMode(GL_PROJECTION);\r
-  glLoadIdentity();\r
+\r
   gluPerspective(\r
      60.0,  /* field of view in degree */\r
       1.0,  /* aspect ratio */ \r
@@ -595,6 +599,8 @@ 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