(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index f899dd8..4852a51 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -463,9 +463,19 @@ void makeMenu() {
  * @param w New width\r
  * @param h New height\r
  */\r
  * @param w New width\r
  * @param h New height\r
  */\r

-void windowReshape(int w, int h) {\r
-    glViewport(0, 0, w, h);\r
-    glMatrixMode(GL_PROJECTION); /* switch matrix mode */\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
+  \r
+  /*glViewport(0, 0, w, h);\r
+    glMatrixMode(GL_PROJECTION); /* switch matrix mode\r

     glLoadIdentity();\r
     if (w <= h)\r
       gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);\r
     glLoadIdentity();\r
     if (w <= h)\r
       gluOrtho2D(-2.0, 2.0, -2.0 * (GLfloat) h / (GLfloat) w, 2.0 * (GLfloat) h / (GLfloat) w);\r


@@ -492,7 +502,8 @@ void display() {
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
    glLoadIdentity();\r
 \r
    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
    glLoadIdentity();\r
 \r

-   glTranslatef(-1.5f, 0.0f, -6.0f);\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
 \r
    glBegin(GL_QUADS);\r
      glColor3f(1.0f,0.0f,0.0f);     // Set The Color To Red\r