(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index c584ab0..c93b652 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -460,15 +460,34 @@ void makeMenu() {
 \r
 /**\r
  * Called when window is resized\r
- * @param w New width\r
- * @param h New height\r
+ * @param width New width\r
+ * @param height New height\r
  */\r
-void windowReshape(int width, int height) {\r
-  glViewport(0, 0, (GLsizei)width, (GLsizei)height); // Set our viewport to the size of our window\r
-glMatrixMode(GL_PROJECTION); // Switch to the projection matrix so that we can manipulate how our scene is viewed\r
-glLoadIdentity(); // Reset the projection matrix to the identity matrix so that we don't get any artifacts (cleaning up)\r
-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\r
-glMatrixMode(GL_MODELVIEW); // Switch back to the model view matrix, so that we can start drawing shapes correctly\r
+void windowReshape(int w, int h) {\r
+  /*glViewport(0, 0, (GLsizei)width, (GLsizei)height);\r
+  printf("Width: %d, height: %d\n", width, height);\r
+  glMatrixMode(GL_PROJECTION);\r
+  glLoadIdentity();\r
+  gluPerspective( 60 * ((GLfloat)height/(GLfloat)width), (GLfloat)width/(GLfloat)height, 0.1, 1000.0);\r
+  glMatrixMode(GL_MODELVIEW);\r
+\r
+  GLdouble near = 0.1;\r
+  GLdouble far = 1000.0;\r
+  GLdouble a = (GLfloat)height/(GLfloat)width;\r
+  GLdouble fov = 60;\r
+  glFrustum( -a*near*tan(fov/2),  a*near*tan(fov/2),  -a*near*tan(fov/2),  a*near*tan(fov/2), near, far  )*/\r
+  glViewport(0, 0, (GLsizei) w, (GLsizei) h); // what's GLsizei? Why is it called inside glViewPort?\r
+   glMatrixMode(GL_PROJECTION); // is it necessary to reset the projection matrix?\r
+   glLoadIdentity();\r
+   if (w <= h)  // is this calculation universal, could I use it on another program?\r
+      glOrtho(-5.0, 5.0, -5.0*(GLfloat)h/(GLfloat)w,\r
+               5.0*(GLfloat)h/(GLfloat)w, -5.0, 5.0);\r
+\r
+   else\r
+      glOrtho(-5.0*(GLfloat)w/(GLfloat)h,\r
+               5.0*(GLfloat)w/(GLfloat)h, -5.0, 5.0, -5.0, 5.0);\r
+   glMatrixMode(GL_MODELVIEW); // why do I set to GL_MODELVIEW at the end?\r
+   glLoadIdentity(); // why does it get a reset?\r
 }\r
 \r
 /**\r
@@ -489,13 +508,9 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
    glLoadIdentity();\r
 \r
-   glBegin(GL_QUADS);\r
-     glColor3f(1.0f,0.0f,0.0f);     // Set The Color To Red\r
-     glVertex3f(-1.0f, 1.0f, 0.0f); // Top left\r
-     glVertex3f( 1.0f, 1.0f, 0.0f); // Top Right\r
-     glVertex3f( 1.0f,-1.0f, 0.0f); // Bottom Right\r
-     glVertex3f(-1.0f,-1.0f, 0.0f); // Bottom Left\r
-   glEnd();\r
+   glTranslatef(0.0f,0.0f,-4.0f); // Move into the Screen 10.0\r
+\r
+   glutSolidTeapot(1);\r
 \r
    glutSwapBuffers();\r
 }\r
@@ -538,5 +553,11 @@ int main(int argc, char **argv) {
     glutMouseFunc(mouse);\r
 \r
     makeMenu();\r
+\r
+    glMatrixMode(GL_PROJECTION);\r
+    glLoadIdentity();\r
+    gluPerspective( 60, 1, 0.1, 1000.0);\r
+    glMatrixMode(GL_MODELVIEW);\r
+\r
     glutMainLoop();\r
 }\r