X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=c93b652c0d38b66041836d2cc6202b2bb094df4a;hb=445575ee93a4f400cbe4c89e844831ff3b3a76b9;hp=c584ab064bd1aca98d1a299a46bb0a0078831b03;hpb=5d3484e744dcf795f666370eca304c9e02485c38;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index c584ab0..c93b652 100644
--- a/scene.c
+++ b/scene.c
@@ -460,15 +460,34 @@ 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 width, int height) {
-  glViewport(0, 0, (GLsizei)width, (GLsizei)height); // Set our viewport to the size of our window
-glMatrixMode(GL_PROJECTION); // Switch to the projection matrix so that we can manipulate how our scene is viewed
-glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up)
-gluPerspective(60, (GLfloat)width / (GLfloat)height, 1.0, 100.0); // Set the Field of view angle (in degrees), the aspect ratio of our window, and the new and far planes
-glMatrixMode(GL_MODELVIEW); // Switch back to the model view matrix, so that we can start drawing shapes correctly
+void windowReshape(int w, int h) {
+  /*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  )*/
+  glViewport(0, 0, (GLsizei) w, (GLsizei) h); // what's GLsizei? Why is it called inside glViewPort?
+   glMatrixMode(GL_PROJECTION); // is it necessary to reset the projection matrix?
+   glLoadIdentity();
+   if (w <= h)  // is this calculation universal, could I use it on another program?
+      glOrtho(-5.0, 5.0, -5.0*(GLfloat)h/(GLfloat)w,
+               5.0*(GLfloat)h/(GLfloat)w, -5.0, 5.0);
+
+   else
+      glOrtho(-5.0*(GLfloat)w/(GLfloat)h,
+               5.0*(GLfloat)w/(GLfloat)h, -5.0, 5.0, -5.0, 5.0);
+   glMatrixMode(GL_MODELVIEW); // why do I set to GL_MODELVIEW at the end?
+   glLoadIdentity(); // why does it get a reset?
 }
 
 /**
@@ -489,13 +508,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    glLoadIdentity();
 
-   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();
+   glTranslatef(0.0f,0.0f,-4.0f); // Move into the Screen 10.0
+
+   glutSolidTeapot(1);
 
    glutSwapBuffers();
 }
@@ -538,5 +553,11 @@ int main(int argc, char **argv) {
     glutMouseFunc(mouse);
 
     makeMenu();
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    gluPerspective( 60, 1, 0.1, 1000.0);
+    glMatrixMode(GL_MODELVIEW);
+
     glutMainLoop();
 }