(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 4962037..7a7875f 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -132,7 +132,7 @@ GLfloat angle2 = 30;   /* in degrees */
 GLfloat near = -10;\r
 GLfloat far = 10;\r
 \r
-static float zoomFactor = 1.0;\r
+static float zoomFactor = 0.0;\r
 \r
 /**\r
  * Prints out error message when file cannot be read\r
@@ -489,10 +489,12 @@ void makeMenu() {
  * @param h New height\r
  */\r
 void windowReshape(int w, int h) {\r
-  zoomFactor = zoomFactor + 1;\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
+  GLfloat x = 2.0f*(200 + 0.5)/w-1.0;\r
+  GLfloat y = 2.0f*(200 + 0.5)/h-1.0;\r
+  glTranslatef(-x,-y,0.0f);\r
   if (w <= h) \r
     glOrtho(zoomFactor*near, zoomFactor*far, zoomFactor*near*(GLfloat)h/(GLfloat)w,\r
              zoomFactor*far*(GLfloat)h/(GLfloat)w, near, far);\r