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

diff --git a/scene.c b/scene.c
index 0219621..e608b44 100644
--- a/scene.c
+++ b/scene.c
@@ -460,25 +460,17 @@ 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) {
-  GLdouble 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();
+  gluPerspective( 60 * ((GLfloat)height/(GLfloat)width), (GLfloat)width/(GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 
-  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 */
 }
 
 /**
@@ -499,13 +491,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();
 }