X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=b66be6f64e289b35db0e48695704f7a3e0879409;hp=7ea99c881300be20394d9cd0474c33fa99463d70;hb=e870d5eada14c45367e8bbd872dc5f9095f8393f;hpb=b360766b6e3bf3808ff1991780e9e25828cee213

diff --git a/scene.c b/scene.c
index 7ea99c8..b66be6f 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] = {
+  { -1000.0, 0.0, 1000.0 },
+  { 1000.0, 0.0, 1000.0 },
+  { 1000.0, 0.0, -1000.0 },
+  { -1000.0, 0.0, -1000.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,18 @@ 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 = 10.0, lightHeight = 20;
-
-
 /**
  * Display function
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
+  gluLookAt(
+    0.0, 90.0, 60.0,  /* eye is at (x,y,z) */
+    0.0, 0.0,  0.0,  /* center is at (x,y,z) */
+    0.0, 100.0,  0.0   /* up is in postivie Y direction */
+    );
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -553,10 +557,16 @@ void display() {
     drawFloor();
     glDisable(GL_BLEND);
 
-    glutSolidTeapot(1); // Draw teapot for test
+    glPushMatrix();
+    glLoadIdentity();
+      glTranslatef(0.0, 0.0, 0.0);
+
+      glutSolidTeapot(5); // Draw teapot for test
+    glPopMatrix();
 
     glPushMatrix();
       glDisable(GL_LIGHTING);
+      glLoadIdentity();
       glColor3f(1.0, 1.0, 1.0);
 
       /* Draw a yellow ball at the light source. */
@@ -575,21 +585,14 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-
   glMatrixMode(GL_PROJECTION);
+
   gluPerspective(
      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);