X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=ff4b99be03196e44682382ac13673ae5e1a5b335;hb=30c06bc0593c1c8a38de51effc1128cf6bc68d8b;hp=38a9eccda6150877c1cdaa5d296f632f3c2918dd;hpb=2ea091e608bd5ab0538959c92f2f0c1d83ac61ad;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 38a9ecc..ff4b99b 100644
--- a/scene.c
+++ b/scene.c
@@ -464,20 +464,12 @@ void makeMenu() {
  * @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, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
-  
-  /*glViewport(0, 0, w, h);
-    glMatrixMode(GL_PROJECTION); /* switch matrix mode
-    glLoadIdentity();
-    if (w <= h)
-      gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);
-    else
-      gluOrtho2D(-2.0 * (GLfloat) w / (GLfloat) h, 2.0 * (GLfloat) w / (GLfloat) h, -2.0, 2.0);
-    glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
+  glLoadIdentity();
+  gluPerspective(height / 60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 }
 
 /**
@@ -498,15 +490,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();
 }