X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=890585051301b2e75bce96c1f6b1a404537b5431;hb=1f911126b87d5e8f7788738b970836a6b8ba11c1;hp=1530f0857ce0b8b1d858f7a97f2523c1d3ba79fe;hpb=7061b925b449761171c25f39b34f0d6a66a510f3;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 1530f08..8905850 100644
--- a/scene.c
+++ b/scene.c
@@ -463,25 +463,25 @@ void makeMenu() {
  * @param w New width
  * @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,45.0f,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(-10.0, 10.0, -10.0 * (GLfloat) h / (GLfloat) w, 10.0 * (GLfloat) h / (GLfloat) w);
+void windowReshape(int width, int height) {
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height); 
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity(); 
+  
+  if (width <= height)
+    gluPerspective(60, (GLfloat)height / (GLfloat)width, 0.1, 1000.0);
   else
-    gluOrtho2D(-10.0 * (GLfloat) w / (GLfloat) h, 10.0 * (GLfloat) w / (GLfloat) h, -10.0, 10.0);
-  glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
+    gluPerspective(60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
+  
+  /*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 */
 }
 
 /**
@@ -502,7 +502,8 @@ 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