(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index af2d52c..9b4db15 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -291,8 +291,7 @@ 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 = (float)width / (float)height;\r
 \r
   gluPerspective(\r
     75.0,\r
@@ -321,7 +320,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