From: Ash Tyndall <git@atyndall.net>
Date: Thu, 20 Oct 2011 03:37:40 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=71a79323a397f78dba55423678096176a98106cb;p=atyndall%2Fcits2231.git

---

diff --git a/scene.c b/scene.c
index 80c1ee9..de52ab8 100644
--- a/scene.c
+++ b/scene.c
@@ -182,25 +182,19 @@ void makeMenu() {
  * @param w New width
  * @param h New height
  */
-void windowReshape(int w, int h) {
+/*void windowReshape(int w, int h) {
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
-    gluPerspective(
-    60.0,  /* field of view in degree */
-     1.0,  /* aspect ratio */
-    nearClip,  /* Z near */
-     farClip   /* Z far */
-    );
-  /*if (w <= h)
+  if (w <= h) 
     glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
              far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
     glOrtho(near*(GLfloat)w/(GLfloat)h,
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
-   glMatrixMode(GL_MODELVIEW); */
+   glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-}
+}*/
 
 /**
  * Called when mouse event occurs
@@ -265,12 +259,6 @@ void display() {
     0.0, 0.0,  0.0,  /* center is at (x,y,z) */
     0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
-   gluPerspective(
-    60.0,  /* field of view in degree */
-     1.0,  /* aspect ratio */
-    nearClip,  /* Z near */
-     farClip   /* Z far */
-    );
 
 
   // **NOTE: Currently this rotation function is all that moves the camera off
@@ -323,7 +311,16 @@ void init() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
+   gluPerspective(
+    60.0,  /* field of view in degree */
+     1.0,  /* aspect ratio */
+    near,  /* Z near */
+     far   /* Z far */
+    );
   
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
@@ -338,8 +335,6 @@ void init() {
 
   
 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
 }
 
 /**
@@ -378,7 +373,7 @@ int main(int argc, char **argv) {
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-  glutReshapeFunc(windowReshape);
+  //glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
   glutMotionFunc(motion);