(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 9eb68f0..0bae917 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
+  { -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
+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,12 +530,6 @@ 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
@@ -557,11 +555,11 @@ void display() {
 \r
     glPushMatrix();\r
       glDisable(GL_LIGHTING);\r
-      glColor3f(1.0, 1.0, 0.0);\r
+      glColor3f(1.0, 1.0, 1.0);\r
 \r
       /* Draw a yellow ball at the light source. */\r
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);\r
-      glutSolidSphere(90.0, 5, 5);\r
+      glutSolidSphere(1.0, 5, 5);\r
 \r
       glEnable(GL_LIGHTING);\r
     glPopMatrix();\r
@@ -575,12 +573,8 @@ void display() {
  * init function; sets initial OpenGL state\r
  */\r
 void init() {\r
-  glEnable(GL_CULL_FACE);\r
-  glEnable(GL_DEPTH_TEST);\r
-  glEnable(GL_TEXTURE_2D);\r
-  glLineWidth(3.0);\r
-\r
   glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
   gluPerspective(\r
      60.0,  /* field of view in degree */\r
       1.0,  /* aspect ratio */ \r
@@ -589,8 +583,9 @@ void init() {
     );\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, 50000.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
@@ -633,6 +628,9 @@ int main(int argc, char **argv) {
   glClearDepth(1.0f); // Depth Buffer Setup\r
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
   glDepthFunc(GL_LEQUAL);  // the type\r
+  glEnable(GL_CULL_FACE);\r
+  glEnable(GL_TEXTURE_2D);\r
+  glLineWidth(3.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r