(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index af2d52c..76b2880 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -291,8 +291,12 @@ 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
     75.0,\r
@@ -321,7 +325,7 @@ void display() {
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
-    glRotatef(angle, 0.0, 0.0,1.0);\r
+    glRotatef(angle, 0.0, 1.0, 0.0);\r
     glRotatef(angle2, 1.0, 0.0, 0.0);\r
     glTranslatef(camx, camy, camz);\r
     glRotatef(rot, 1.0, 0.0, 0.0);\r
@@ -409,6 +413,8 @@ 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