X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=cb6fd4e7eca2bea194fe8f1604f867fb4570a9ba;hp=af2d52c398280e3013e2c948952161c5ef3bbb39;hb=b32b74865d4cc2913383e3a38c629eb2d4d983f6;hpb=b0a8c04c993514d979c7bff6a56ad5e437ce38b9

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