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

diff --git a/scene.c b/scene.c
index 0219621..c176af0 100644
--- a/scene.c
+++ b/scene.c
@@ -463,22 +463,12 @@ void makeMenu() {
  * @param w New width
  * @param h New height
  */
-void windowReshape(int w, int h) {
-  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 */
+void windowReshape(int width, int height) {
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height); // Set our viewport to the size of our window
+  glMatrixMode(GL_PROJECTION); // Switch to the projection matrix so that we can manipulate how our scene is viewed
+  glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up)
+  gluPerspective(60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0); // Set the Field of view angle (in degrees), the aspect ratio of our window, and the new and far planes
+  glMatrixMode(GL_MODELVIEW); // Switch back to the model view matrix, so that we can start drawing shapes correctly
 }
 
 /**
@@ -499,6 +489,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
+   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
      glVertex3f(-1.0f, 1.0f, 0.0f); // Top left