(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 7ea99c8..19cc58a 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -109,6 +109,17 @@ char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
 \r
 char dataDir[200];  // Stores the directory name for the meshes and textures.\r
 \r
+static GLfloat floorVertices[4][3] = {\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
+static GLfloat lightPosition[4];\r
+static float lightAngle = 10.0, lightHeight = 20;\r
+\r
 /**\r
  * Prints out error message when file cannot be read\r
  * @param fileName Name of file that could not be read\r
@@ -491,17 +502,10 @@ void mouse(int btn, int state, int x, int y) {
   \r
 }\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
-};\r
-\r
-/* Draw a floor (possibly textured). */\r
-static void\r
-drawFloor(void)\r
-{\r
+/**\r
+ * Draw a floor.\r
+ */\r
+void drawFloor() {\r
   glDisable(GL_LIGHTING);\r
 \r
   //if (useTexture) {\r
@@ -526,18 +530,17 @@ drawFloor(void)
   glEnable(GL_LIGHTING);\r
 }\r
 \r
-\r
-static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */\r
-static GLfloat lightPosition[4];\r
-static float lightAngle = 10.0, lightHeight = 20;\r
-\r
-\r
 /**\r
  * Display function\r
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
   glLoadIdentity();\r
+  gluLookAt(\r
+    0.0, 180.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
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -553,10 +556,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(2); // 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
@@ -575,21 +584,14 @@ void display() {
  * init function; sets initial OpenGL state\r
  */\r
 void init() {\r
-\r
   glMatrixMode(GL_PROJECTION);\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
-  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
-    );      \r
+    );    \r
 \r
   glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);\r
@@ -597,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