X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=4c0dede3e7cfb7221913f92daac9322b790e806a;hb=24ebaf565d47962321c66c4558384906458a2283;hp=d57ce236c2cb3e1cd1d8059d647c2555bf57ee98;hpb=2c476859ea065ecf70df3f54f2b88a519a02cece;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index d57ce23..4c0dede 100644
--- a/scene.c
+++ b/scene.c
@@ -109,6 +109,17 @@ char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
 
 char dataDir[200];  // Stores the directory name for the meshes and textures.
 
+static GLfloat floorVertices[4][3] = {
+  { -20.0, 0.0, 20.0 },
+  { 20.0, 0.0, 20.0 },
+  { 20.0, 0.0, -20.0 },
+  { -20.0, 0.0, -20.0 },
+};
+
+static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
+static GLfloat lightPosition[4];
+static float lightAngle = 10.0, lightHeight = 20;
+
 /**
  * Prints out error message when file cannot be read
  * @param fileName Name of file that could not be read
@@ -491,17 +502,10 @@ void mouse(int btn, int state, int x, int y) {
   
 }
 
-static GLfloat floorVertices[4][3] = {
-  { -20.0, 0.0, 20.0 },
-  { 20.0, 0.0, 20.0 },
-  { 20.0, 0.0, -20.0 },
-  { -20.0, 0.0, -20.0 },
-};
-
-/* Draw a floor (possibly textured). */
-static void
-drawFloor(void)
-{
+/**
+ * Draw a floor.
+ */
+void drawFloor() {
   glDisable(GL_LIGHTING);
 
   //if (useTexture) {
@@ -526,18 +530,19 @@ drawFloor(void)
   glEnable(GL_LIGHTING);
 }
 
-
-static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */
-static GLfloat lightPosition[4];
-static float lightAngle = 0.0, lightHeight = 20;
-
-
 /**
  * Display function
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
+  gluLookAt(
+    0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
+    0.0, 0.0,  0.0,  /* center is at (0,8,0) */
+    0.0, 1.0,  0.0   /* up is in postivie Y direction */
+    );
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -557,7 +562,7 @@ void display() {
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 0.0);
+      glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
       glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);
@@ -575,25 +580,14 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glEnable(GL_CULL_FACE);
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_TEXTURE_2D);
-  glLineWidth(3.0);
-
   glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
   gluPerspective(
-     40.0,  /* field of view in degree */ 
+     60.0,  /* field of view in degree */
       1.0,  /* aspect ratio */ 
       0.0,  /* Z near */
     900.0   /* Z far */
-    );
-  
-  glMatrixMode(GL_MODELVIEW);
-  gluLookAt(
-    0.0, 8.0, 60.0,  /* eye is at (0,8,60) */
-    0.0, 8.0,  0.0,  /* center is at (0,8,0) */
-    0.0, 1.0,  0.0   /* up is in postivie Y direction */
-    );      
+    );    
 
   glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, lightColor);
@@ -633,6 +627,9 @@ int main(int argc, char **argv) {
   glClearDepth(1.0f); // Depth Buffer Setup
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
+  glEnable(GL_CULL_FACE);
+  glEnable(GL_TEXTURE_2D);
+  glLineWidth(3.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);