(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 83e1c29..76b2880 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -291,26 +291,30 @@ void display() {
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
 \r
-  float aspect = (float)height / (float)width;\r
-  if ( width > height ) aspect = (float)width / (float)height;\r
+  float aspect;\r
+  if ( width <= height ) {\r
+    aspect = (float)height / (float)width;\r
+  } else {\r
+    aspect = (float)width / (float)height;\r
+  }\r
 \r
   gluPerspective(\r
-    90.0,\r
+    75.0,\r
     aspect,\r
     0.1,\r
-    100\r
+    200\r
     );\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
 \r
   gluLookAt(\r
-    0.0,  0.0, 30.0,  /* eye is at (x,y,z) */\r
+    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */\r
     0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
     0.0,  1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
-  glRotatef(30.0, 1.0, 0.0, 0.0);\r
+  glRotatef(75.0, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -409,7 +413,10 @@ int main(int argc, char **argv) {
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
   glDepthFunc(GL_LEQUAL);  // the type\r
   glEnable(GL_CULL_FACE);\r
+  glCullFace(GL_BACK);\r
+  glFrontFace(GL_CW);\r
   glEnable(GL_TEXTURE_2D);\r
+  glEnable(GL_NORMALIZE);\r
   glLineWidth(1.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r