(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index a21c299..cb6fd4e 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -184,15 +184,8 @@ void makeMenu() {
  */\r
 void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
-  glMatrixMode(GL_PROJECTION);\r
-  glLoadIdentity();\r
-  if (w <= h)\r
-    glFrustum(-near, far, -near,\r
-      far, nearClip, farClip);\r
-  else\r
-    glFrustum(-near*((GLfloat) w / (GLfloat) h),\r
-       far, near, far, nearClip, farClip);\r
-  glMatrixMode(GL_MODELVIEW);\r
+  width = w;\r
+  height = h;\r
 }\r
 \r
 /**\r
@@ -293,14 +286,35 @@ void motion(int x, int y) {
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
+  \r
+  // Redraw projection matrix\r
+  glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
+\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
+    aspect,\r
+    0.1,\r
+    200\r
+    );\r
+\r
   glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
 \r
-  //gluLookAt(\r
-  //  -30.0,  -30.0, -30.0,  /* eye is at (x,y,z) */\r
-  ///  0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
-  //  0.0,  1.0,   0.0   /* up is in postivie Y direction */\r
-  //  );\r
+  gluLookAt(\r
+    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */\r
+    0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
+    0.0,  1.0,  0.0   /* up is in postivie Y direction */\r
+    );\r
+\r
+  glRotatef(75.0, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -398,8 +412,8 @@ 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_NORMALIZE);\r
   glLineWidth(1.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r