X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=18f711ddeb89a1b59f63d19afe6817927ec162e3;hb=1659dea816cf9172d482dd9d19ca883a39eefb58;hp=457e23d679e43e1a049f7a3c98bec65098555248;hpb=7e5c9a1278e56a10870f26ca4f31359b4697e9a3;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 457e23d..18f711d 100644
--- a/scene.c
+++ b/scene.c
@@ -460,28 +460,22 @@ 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,(GLfloat)w/(GLfloat)h,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
-    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)height/(GLfloat)width), (GLfloat)width/(GLfloat)height, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
+
+  GLdouble near = 0.1;
+  GLdouble far = 1000.0;
+  GLdouble a = (GLfloat)height/(GLfloat)width;
+  GLdouble fov = 60;
+  glFrustum( -a*near*tan(fov/2),  a*near*tan(fov/2),  -a*near*tan(fov/2),  a*near*tan(fov/2), near, far  )*/
 }
 
 /**
@@ -502,15 +496,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();
 }