X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=68ee2e92acb4fb58d9a08f85764cad7f3b1ba47a;hb=1d8973326c9d688a8d8a541b51ede75e091b1e31;hp=c584ab064bd1aca98d1a299a46bb0a0078831b03;hpb=5d3484e744dcf795f666370eca304c9e02485c38;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index c584ab0..68ee2e9 100644
--- a/scene.c
+++ b/scene.c
@@ -460,15 +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 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, 1.0, 100.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
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height);
+  printf("Width: %d, height: %d\n", width, height);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluPerspective(60 / width, 1, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
+
 }
 
 /**
@@ -489,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();
 }