(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 0219621..2f97ea1 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -460,25 +460,17 @@ 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 w, int h) {\r
-  GLdouble aspect = (GLfloat) h / (GLfloat) w;\r
-  GLdouble n = 10.0;\r
-\r
-  glViewport(0, 0, w, h);\r
-\r
-  glMatrixMode(GL_PROJECTION); /* switch matrix mode*/\r
+void windowReshape(int width, int height) {\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.0/500.0) * width, 1, 0.1, 1000.0);\r
+  glMatrixMode(GL_MODELVIEW);\r
 \r
-  if (w <= h) {\r
-    gluOrtho2D(-n, n, -n * aspect, n * aspect);\r
-  } else {\r
-    gluOrtho2D(-n * aspect, n * aspect, -n, n);\r
-  }\r
-\r
-  glMatrixMode(GL_MODELVIEW); /* return to modelview mode */\r
 }\r
 \r
 /**\r
@@ -499,13 +491,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,-10.0f); // Move into the Screen 10.0\r
+\r
+   glutSolidTeapot(1);\r
 \r
    glutSwapBuffers();\r
 }\r