X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=9e434eb35cf6ee26eb00921f7fdbaa4b9f30f0b1;hb=8a3b27cf7fd3d88a2882449eb0ea8b2c21c7bfae;hp=b50bae1261c443c064c98307c6fe5d0c30032da4;hpb=fa5eba8e23e8445fdcaed45f474a9ab1c308f794;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index b50bae1..9e434eb 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); 
+  glViewport(0, 0, (GLsizei)width, (GLsizei)height);
+  printf("Width: %d, height: %d\n", width, height);
   glMatrixMode(GL_PROJECTION);
-  glLoadIdentity(); 
-  gluPerspective(60, 1.0, 0.1, 1000.0);
+  glLoadIdentity();
+  gluPerspective( 60 * ((GLfloat)width/(GLfloat)height), (GLfloat)width/(GLfloat)height, 0.1, 1000.0);
   glMatrixMode(GL_MODELVIEW);
+
 }
 
 /**
@@ -489,16 +491,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
-
+   glTranslatef(0.0f,0.0f,-10.0f); // Move into the Screen 10.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
-     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();
+   glutSolidTeapot(1);
 
    glutSwapBuffers();
 }