(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index dde2125..b183b8e 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -182,7 +182,7 @@ void makeMenu() {
  * @param w New width\r
  * @param h New height\r
  */\r
-void windowReshape(int w, int h) {\r
+/*void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
@@ -191,10 +191,10 @@ void windowReshape(int w, int h) {
              far*(GLfloat)h/(GLfloat)w, -100, 100);\r
   else\r
     glOrtho(near*(GLfloat)w/(GLfloat)h,\r
-             far*(GLfloat)w/(GLfloat)h, near, far, -100, 100);\r
-   glMatrixMode(GL_MODELVIEW); \r
+             far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);\r
+   glMatrixMode(GL_MODELVIEW);\r
    glLoadIdentity();\r
-}\r
+}*/\r
 \r
 /**\r
  * Called when mouse event occurs\r
@@ -263,7 +263,7 @@ void display() {
 \r
   // **NOTE: Currently this rotation function is all that moves the camera off\r
   //         the flat surface. Need to integrate function into gluLookAt\r
-  glRotatef(30.0, 1.0, 0.0, 0.0);\r
+  glRotatef(75.0, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -311,14 +311,16 @@ void init() {
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
 \r
-  gluPerspective(\r
+   gluPerspective(\r
     60.0,  /* field of view in degree */\r
      1.0,  /* aspect ratio */\r
-    near,  /* Z near */\r
-     far   /* Z far */\r
+    nearClip,  /* Z near */\r
+     farClip   /* Z far */\r
     );\r
-\r
   \r
+  glMatrixMode(GL_MODELVIEW);\r
+  glLoadIdentity();\r
+\r
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
@@ -333,8 +335,6 @@ void init() {
 \r
   \r
 \r
-  glMatrixMode(GL_MODELVIEW);\r
-  glLoadIdentity();\r
 }\r
 \r
 /**\r
@@ -373,7 +373,7 @@ int main(int argc, char **argv) {
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r
-  glutReshapeFunc(windowReshape);\r
+  //glutReshapeFunc(windowReshape);\r
   glutDisplayFunc(display);\r
   glutMouseFunc(mouse);\r
   glutMotionFunc(motion);\r