(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 4852a51..38a9ecc 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -460,19 +460,15 @@ void makeMenu() {
 \r
 /**\r
  * Called when window is resized\r
 \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); \r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity(); \r
   \r
  */\r
 void windowReshape(int width, int height) {\r
   glViewport(0, 0, (GLsizei)width, (GLsizei)height); \r
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity(); \r
   \r

-  if (width <= height)\r
-    gluPerspective(60,  (GLfloat)width / (GLfloat) height, 0.1, 1000.0);\r
-  else\r
-    gluPerspective(60, (GLfloat)height / (GLfloat) width, 0.1, 1000.0);\r
-  glMatrixMode(GL_MODELVIEW);\r
+  gluPerspective(60, (GLfloat)width / (GLfloat)height, 0.1, 1000.0);\r

   \r
   /*glViewport(0, 0, w, h);\r
     glMatrixMode(GL_PROJECTION); /* switch matrix mode\r
   \r
   /*glViewport(0, 0, w, h);\r
     glMatrixMode(GL_PROJECTION); /* switch matrix mode\r


@@ -504,7 +500,6 @@ void display() {
 \r
    glTranslatef(0.0f,0.0f,-6.0f);                 // Move Left 1.5 Units And Into The Screen 6.0\r
 \r
 \r
    glTranslatef(0.0f,0.0f,-6.0f);                 // Move Left 1.5 Units And Into The Screen 6.0\r
 \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
    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