X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=8e62d328e64214b06cbd8844a247d39d57496eab;hb=9563daa4fab8bac500f476f06c0513c5438335e4;hp=f899dd8e3cd8f5a9ae6b02de8e901563f61d6ddb;hpb=bfb8cab4390e0707a66fa2cdf10ff41d274ebd62;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index f899dd8..8e62d32 100644
--- a/scene.c
+++ b/scene.c
@@ -460,18 +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) {
-    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 */
+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)width / (GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 }
 
 /**
@@ -492,15 +490,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   glTranslatef(-1.5f, 0.0f, -6.0f);
+   glTranslatef(0.0f,0.0f,-4.0f);                 // Move Left 1.5 Units And Into The Screen 6.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();
 }