(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index af2d52c..642fdcd 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
@@ -336,7 +340,9 @@ void display() {
     glPushMatrix();\r
       glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface\r
       glColor3f(0.0, 0.0, 0.0);\r
+      glFrontFace(GL_CW);\r
       glutSolidTeapot(1);\r
+      glFrontFace(GL_CCW);\r
     glPopMatrix();\r
 \r
     // Draw a white ball over the light source\r
@@ -367,11 +373,11 @@ void init() {
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
 \r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);\r
-  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);\r
+  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);\r
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);\r
+  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);\r
+  glMaterialfv(GL_FRONT, GL_EMISSION, emission0);\r
+  glMaterialf(GL_FRONT, GL_SHININESS, shine);\r
 \r
   glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r
@@ -408,10 +414,10 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);\r
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
   glDepthFunc(GL_LEQUAL);  // the type\r
-  glEnable(GL_CULL_FACE);\r
   glEnable(GL_TEXTURE_2D);\r
+  glEnable(GL_CULL_FACE);\r
   glEnable(GL_NORMALIZE);\r
-  glLineWidth(1.0);\r
+  glLineWidth(2.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r