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

diff --git a/scene.c b/scene.c
index ad373f0..ed890af 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);
@@ -329,7 +329,7 @@ void display() {
     glPushMatrix();
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
       glColor3f(0.5, 0.5, 0.5);
-      glutSolidTeapot(100);
+      glutSolidTeapot(25);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -413,6 +413,15 @@ int main(int argc, char **argv) {
   glEnable(GL_TEXTURE_2D);
   glLineWidth(1.0);
 
+    glMatrixMode(GL_PROJECTION);
+  gluPerspective( /* field of view in degree */ 40.0,
+  /* aspect ratio */ 1.0,
+    /* Z near */ 20.0, /* Z far */ 300.0);
+  glMatrixMode(GL_MODELVIEW);
+  gluLookAt(0.0, 35.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.);      /* up is in postivie Y direction */
+
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
   glutReshapeFunc(windowReshape);