X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=c68ae0472268342af38414459175cc37f6669df0;hb=ca2d5ce66ddb17a4e5b04e9f1a28f8a14240143e;hp=a2f1514e6c8314629052eb5dd89e58ebe2c28252;hpb=f459b7ee740cbf5c5e96987b0871261429cae84c;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index a2f1514..c68ae04 100644
--- a/scene.c
+++ b/scene.c
@@ -460,25 +460,16 @@ 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) {
-  GLfloat aspect = (GLfloat) h / (GLfloat) w;
-  GLdouble n = 10.0;
-
-  glViewport(0, 0, w, h);
-
-  glMatrixMode(GL_PROJECTION); /* switch matrix mode*/
+void windowReshape(int width, int height) {
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height);
+  printf("Width: %d, height: %d\n", width, height);
+  glMatrixMode(GL_PROJECTION);
   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 */
+  gluPerspective(500 * 60 / height, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 }
 
 /**
@@ -499,13 +490,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   glBegin(GL_QUADS);
-     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
-     glVertex3f(-1.0f,-1.0f, 0.0f); // Bottom Left
-   glEnd();
+   glTranslatef(0.0f,0.0f,-10.0f); // Move into the Screen 10.0
+
+   glutSolidTeapot(1);
 
    glutSwapBuffers();
 }