X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=9803e13b7ed0e6f7bfc681488a2357547aec7523;hp=ad373f09dcb6fcbd7cfd1803a67b3f7685cc724d;hb=96724689b00d37e1194ea52ff664b41e7fe508fd;hpb=b52538349a594cfb6458e5e3320e33ff67d0ae3e

diff --git a/scene.c b/scene.c
index ad373f0..9803e13 100644
--- a/scene.c
+++ b/scene.c
@@ -301,11 +301,11 @@ void display() {
   //  0.0, 1.0,  0.0   /* up is in postivie Y direction */
    // );
 
-  //glTranslatef(camx, camy, camz);
+  glTranslatef(camx, camy, camz);
   
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
-  //glRotatef(rot, 1.0, 0.0, 0.0);
+  glRotatef(rot, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -327,9 +327,9 @@ void display() {
     
     // Draw teapot for a test object
     glPushMatrix();
-      glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
-      glColor3f(0.5, 0.5, 0.5);
-      glutSolidTeapot(100);
+      glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot does not rest on surface
+      glColor3f(0.0, 0.0, 0.0);
+      glutSolidTeapot(1);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -407,12 +407,28 @@ int main(int argc, char **argv) {
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background
   glClearDepth(1.0f); // Depth Buffer Setup
+  glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
   glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
+  glMatrixMode(GL_PROJECTION);
+  gluPerspective(
+     40.0, /* field of view in degree */
+      1.0, /* aspect ratio */
+     1.0, /* Z near */
+    1000000.0  /* Z far */
+    );
+
+  glMatrixMode(GL_MODELVIEW);
+  gluLookAt(
+    0.0, 35.0, -20.0,  /* eye is at (0,8,60) */
+    0.0,  10.0,  0.0,  /* center is at (0,8,0) */
+    0.0,  1.0,  0.0   /* up is in postivie Y direction */
+    );
+
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);