X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=38a9eccda6150877c1cdaa5d296f632f3c2918dd;hb=2ea091e608bd5ab0538959c92f2f0c1d83ac61ad;hp=e7becbfbe8b5bf07cbdc0bb690901f6b3f51dd39;hpb=2c3d87668d2109715078808dfd3e32b92e21d430;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index e7becbf..38a9ecc 100644
--- a/scene.c
+++ b/scene.c
@@ -460,19 +460,24 @@ void makeMenu() {
 
 /**
  * Called when window is resized
- * @param w New width
- * @param h New height
+ * @param width New width
+ * @param height 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
+void windowReshape(int width, int height) {
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height); 
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity(); 
+  
+  gluPerspective(60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
+  
+  /*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 */
 }
 
 /**
@@ -493,10 +498,10 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   glTranslatef(-1.5f, 0.0f, -6.0f);
+   glTranslatef(0.0f,0.0f,-6.0f);                 // Move Left 1.5 Units And Into The Screen 6.0
 
    glBegin(GL_QUADS);
-     glColor3f(1.0f,0.0f,0.0f);          // Set The Color To Red
+     glColor3f(1.0f,0.0f,0.0f);     // Set The Color To Red
      glVertex3f(-1.0f, 1.0f, 0.0f); // Top left
      glVertex3f( 1.0f, 1.0f, 0.0f); // Top Right
      glVertex3f( 1.0f,-1.0f, 0.0f); // Bottom Right
@@ -539,8 +544,6 @@ int main(int argc, char **argv) {
 
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations
 
-    glutSwapBuffers();
-
     glutReshapeFunc(windowReshape);
     glutDisplayFunc(display);
     glutMouseFunc(mouse);