X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=cb6fd4e7eca2bea194fe8f1604f867fb4570a9ba;hp=618fef14917ba6f5fb27bf80f099ab8a9a5b2105;hb=2813933dbf92ed25a4b00c514ad20c1893145538;hpb=4170b70cae8f5773dc059299a3c2ee0fe9cceaf1

diff --git a/scene.c b/scene.c
index 618fef1..cb6fd4e 100644
--- a/scene.c
+++ b/scene.c
@@ -291,26 +291,30 @@ void display() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-  float aspect = (float)height / (float)width;
-  if ( width > height ) aspect = (float)width / (float)height;
+  float aspect;
+  if ( width <= height ) {
+    aspect = (float)height / (float)width;
+  } else {
+    aspect = (float)width / (float)height;
+  }
 
   gluPerspective(
-    90.0,
+    75.0,
     aspect,
     0.1,
-    100
+    200
     );
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0, 15.0,  /* eye is at (x,y,z) */
+    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */
     0.0,  0.0,  0.0,  /* center is at (x,y,z) */
     0.0,  1.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(45.0, 1.0, 0.0, 0.0);
+  glRotatef(75.0, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -408,8 +412,8 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
+  glEnable(GL_NORMALIZE);
   glLineWidth(1.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);