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

diff --git a/scene.c b/scene.c
index 6789a41..18f711d 100644
--- a/scene.c
+++ b/scene.c
@@ -464,12 +464,18 @@ 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);
+  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  )*/
 }
 
 /**
@@ -490,15 +496,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   glTranslatef(0.0f,0.0f,10.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();
 }