(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 19df7a5..b66be6f 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
@@ -535,7 +535,13 @@ 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, 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
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -551,10 +557,16 @@ void display() {
     drawFloor();\r
     glDisable(GL_BLEND);\r
 \r
-    glutSolidTeapot(1); // Draw teapot for test\r
+    glPushMatrix();\r
+    glLoadIdentity();\r
+      glTranslatef(0.0, 0.0, 0.0);\r
+\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
@@ -574,21 +586,13 @@ 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
       0.0,  /* Z near */\r
     900.0   /* Z far */\r
-    );\r
-  \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, 0.0,  1.0   /* up is in postivie Y direction */\r
-    );      \r
+    );    \r
 \r
   glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);\r