X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=2f97ea19dff35331af591ab35738acc8188eefeb;hb=34aca3182b0a216dd0557cd7337de9b0a2989e89;hp=1530f0857ce0b8b1d858f7a97f2523c1d3ba79fe;hpb=7061b925b449761171c25f39b34f0d6a66a510f3;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 1530f08..2f97ea1 100644
--- a/scene.c
+++ b/scene.c
@@ -460,28 +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) {
- /* glViewport(0, 0, w, h);                    // Reset The Current Viewport
-  glMatrixMode(GL_PROJECTION);               // Select The Projection Matrix
-  glLoadIdentity();                          // Reset The Projection Matrix
-
-  // Calculate The Aspect Ratio Of The Window
-  gluPerspective(45.0f,45.0f,0.1f,100.0f);
-
-  glMatrixMode(GL_MODELVIEW);                // Select The Modelview Matrix
-  glLoadIdentity();                          // Reset The Modelview Matrix*/
-
-  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();
-  if (w <= h)
-    gluOrtho2D(-10.0, 10.0, -10.0 * (GLfloat) h / (GLfloat) w, 10.0 * (GLfloat) h / (GLfloat) w);
-  else
-    gluOrtho2D(-10.0 * (GLfloat) w / (GLfloat) h, 10.0 * (GLfloat) w / (GLfloat) h, -10.0, 10.0);
-  glMatrixMode(GL_MODELVIEW); /* return to modelview mode */
+  gluPerspective( (60.0/500.0) * width, 1, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
+
 }
 
 /**
@@ -502,15 +491,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,-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();
 }