(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index fe67e13..8ea0985 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(-1.0, 1.0, -1.0*(GLfloat) h / (GLfloat) w,\r
-      1.0*(GLfloat) h / (GLfloat) w, 2.0, 10.0);\r
+    glFrustum(-nearClip, farClip, -nearClip*(GLfloat) h / (GLfloat) w,\r
+      farClip*(GLfloat) h / (GLfloat) w, nearClip, farClip);\r
   else\r
-    glFrustum(-1.0*(GLfloat) w / (GLfloat) h,\r
-       1.0*(GLfloat) w / (GLfloat) h, -1.0, 1.0, 2.0, 10.0);\r
+    glFrustum(-nearClip*(GLfloat) w / (GLfloat) h,\r
+       farClip*(GLfloat) w / (GLfloat) h, nearClip, farClip, nearClip, farClip);\r
   glMatrixMode(GL_MODELVIEW);\r
 }\r
 \r
@@ -399,13 +399,13 @@ int main(int argc, char **argv) {
   glLineWidth(1.0);\r
 \r
   // **NOTE: Currently the perspective and look-at code is static, for testing purposes\r
-  glMatrixMode(GL_PROJECTION);\r
-  gluPerspective(\r
-     40.0, /* field of view in degree */\r
-      1.0, /* aspect ratio */\r
-      1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything\r
-    100.0  /* Z far */\r
-    );\r
+  //glMatrixMode(GL_PROJECTION);\r
+  //gluPerspective(\r
+  //   40.0, /* field of view in degree */\r
+  //    1.0, /* aspect ratio */\r
+  //    1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything\r
+   // 100.0  /* Z far */\r
+  //  );\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
   gluLookAt(\r