(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index e58ec7e..a21c299 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -187,11 +187,11 @@ void windowReshape(int w, int h) {
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
   if (w <= h)\r
-    glFrustum(-near, far, -near*(GLfloat) h / (GLfloat) w,\r
-      far*(GLfloat) h / (GLfloat) w, nearClip, farClip);\r
+    glFrustum(-near, far, -near,\r
+      far, nearClip, farClip);\r
   else\r
-    glFrustum(-near*(GLfloat) w / (GLfloat) h,\r
-       far*(GLfloat) w / (GLfloat) h, near, far, nearClip, farClip);\r
+    glFrustum(-near*((GLfloat) w / (GLfloat) h),\r
+       far, near, far, nearClip, farClip);\r
   glMatrixMode(GL_MODELVIEW);\r
 }\r
 \r
@@ -357,11 +357,11 @@ void init() {
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
 \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
+  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
 \r
   glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r