X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=c322eb85def36ae01a81500e40bff77fae8cb5d8;hb=916773443101d71d573d82c5e699a1c94b9cb2e4;hp=b62756cba0b2bf69a9afc424e9a252e5e6482646;hpb=d2f95696176f02685511cb96ca7d9664323feb42;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index b62756c..c322eb8 100644
--- a/scene.c
+++ b/scene.c
@@ -184,15 +184,6 @@ void makeMenu() {
  */
 void windowReshape(int w, int h) {
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  if (w <= h)
-    glFrustum(-near, far, -near*(GLfloat) h / (GLfloat) w,
-      far*(GLfloat) h / (GLfloat) w, nearClip, farClip);
-  else
-    glFrustum(-near*(GLfloat) w / (GLfloat) h,
-       far*(GLfloat) w / (GLfloat) h, near, far, nearClip, farClip);
-  glMatrixMode(GL_MODELVIEW);
 }
 
 /**
@@ -296,11 +287,11 @@ void display() {
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
-  gluLookAt(
-    -30.0,  -30.0, -30.0,  /* eye is at (x,y,z) */
-    0.0,  0.0,  0.0,  /* center is at (x,y,z) */
-    0.0,  1.0,   0.0   /* up is in postivie Y direction */
-    );
+  //gluLookAt(
+  //  -30.0,  -30.0, -30.0,  /* eye is at (x,y,z) */
+  ///  0.0,  0.0,  0.0,  /* center is at (x,y,z) */
+  //  0.0,  1.0,   0.0   /* up is in postivie Y direction */
+  //  );
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -357,11 +348,11 @@ void init() {
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
 
-  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
-  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
-  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT, GL_EMISSION, emission0);
-  glMaterialf(GL_FRONT, GL_SHININESS, shine);
+  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);
+  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);
+  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
+  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);
+  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);