X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=d1429415842e1868c8a7803faab92e684998bf47;hp=3320b82a51e4329f9c0113ecba33676335836707;hb=dc65ca1020fbda1ad57d1a3d30cfe4d37323bf64;hpb=eaa610e6479d38249adb401fe0826ce94d53bd99

diff --git a/scene.c b/scene.c
index 3320b82..d142941 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(25);
+      glutSolidTeapot(1);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -413,14 +413,20 @@ 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 */ -200.0, /* Z far */ 200.0);
+  glMatrixMode(GL_PROJECTION);
+  gluPerspective(
+     40.0, /* field of view in degree */
+      1.0, /* aspect ratio */
+     10.0, /* Z near */
+    1000.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.);      /* up is in postivie Y direction */
+  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);