X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=021962126e093ba94391bbfa15640caf70da6f2e;hb=41e8eb95882abe806e22b182768d2dd9361953d2;hp=457e23d679e43e1a049f7a3c98bec65098555248;hpb=7e5c9a1278e56a10870f26ca4f31359b4697e9a3;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 457e23d..0219621 100644
--- a/scene.c
+++ b/scene.c
@@ -464,24 +464,21 @@ void makeMenu() {
  * @param h New height
  */
 void windowReshape(int w, int h) {
-  glViewport(0, 0, w, h);                    // Reset The Current Viewport
-  glMatrixMode(GL_PROJECTION);               // Select The Projection Matrix
-  glLoadIdentity();                          // Reset The Projection Matrix
-
-  // Calculate The Aspect Ratio Of The Window
-  gluPerspective(45.0f,(GLfloat)w/(GLfloat)h,0.1f,100.0f);
-
-  glMatrixMode(GL_MODELVIEW);                // Select The Modelview Matrix
-  glLoadIdentity();                          // Reset The Modelview Matrix
-
-      /*glViewport(0, 0, w, h);
-    glMatrixMode(GL_PROJECTION); /* switch matrix mode
-    glLoadIdentity();
-    if (w <= h)
-      gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);
-    else
-      gluOrtho2D(-2.0 * (GLfloat) w / (GLfloat) h, 2.0 * (GLfloat) w / (GLfloat) h, -2.0, 2.0);
-    glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
+  GLdouble aspect = (GLfloat) h / (GLfloat) w;
+  GLdouble n = 10.0;
+
+  glViewport(0, 0, w, h);
+
+  glMatrixMode(GL_PROJECTION); /* switch matrix mode*/
+  glLoadIdentity();
+
+  if (w <= h) {
+    gluOrtho2D(-n, n, -n * aspect, n * aspect);
+  } else {
+    gluOrtho2D(-n * aspect, n * aspect, -n, n);
+  }
+
+  glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
 }
 
 /**
@@ -502,8 +499,6 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   glTranslatef(-1.5f, 0.0f, -6.0f);
-
    glBegin(GL_QUADS);
      glColor3f(1.0f,0.0f,0.0f);     // Set The Color To Red
      glVertex3f(-1.0f, 1.0f, 0.0f); // Top left