X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=7e287ed0d188bab5671461239aae2dfadf107569;hp=a21c2997736febb1103c087a62c20fa64fbb1d4f;hb=eeed8ee2fcc8f6d83cdfffd9543b1351dad1ebfe;hpb=bb41d6092544e76540acf9700d2c14741a80ad6e

diff --git a/scene.c b/scene.c
index a21c299..7e287ed 100644
--- a/scene.c
+++ b/scene.c
@@ -184,15 +184,8 @@ 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,
-      far, nearClip, farClip);
-  else
-    glFrustum(-near*((GLfloat) w / (GLfloat) h),
-       far, near, far, nearClip, farClip);
-  glMatrixMode(GL_MODELVIEW);
+  width = w;
+  height = h;
 }
 
 /**
@@ -293,14 +286,31 @@ void motion(int x, int y) {
  */
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  
+  // Redraw projection matrix
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+
+  float aspect = (float)height / (float)width;
+  if ( width > height ) aspect = (float)width / (float)height;
+
+  gluPerspective(
+    75.0,
+    aspect,
+    0.1,
+    200
+    );
+
   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(
+    0.0,  0.0,  5.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 */
+    );
+
+  glRotatef(75.0, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);