X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=scene.c;h=2f97ea19dff35331af591ab35738acc8188eefeb;hb=34aca3182b0a216dd0557cd7337de9b0a2989e89;hp=e7becbfbe8b5bf07cbdc0bb690901f6b3f51dd39;hpb=2c3d87668d2109715078808dfd3e32b92e21d430;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index e7becbf..2f97ea1 100644
--- a/scene.c
+++ b/scene.c
@@ -460,19 +460,17 @@ 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
+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.0/500.0) * width, 1, 0.1, 1000.0);
+  glMatrixMode(GL_MODELVIEW);
 
-  // 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
 }
 
 /**
@@ -493,15 +491,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();
 }
@@ -539,8 +531,6 @@ int main(int argc, char **argv) {
 
     glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);          // Really Nice Perspective Calculations
 
-    glutSwapBuffers();
-
     glutReshapeFunc(windowReshape);
     glutDisplayFunc(display);
     glutMouseFunc(mouse);