X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=ad373f09dcb6fcbd7cfd1803a67b3f7685cc724d;hp=c2cc3814d77d7ac81c965331706ac49a8a11f821;hb=b52538349a594cfb6458e5e3320e33ff67d0ae3e;hpb=3c57c05dfa72533bdca640fabc82a6b34b9a26a9

diff --git a/scene.c b/scene.c
index c2cc381..ad373f0 100644
--- a/scene.c
+++ b/scene.c
@@ -182,19 +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);
+  /*glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   if (w <= h) 
-    glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
+    glFrustum(near, far, near*(GLfloat)h/(GLfloat)w,
              far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
-    glOrtho(near*(GLfloat)w/(GLfloat)h,
+    glFrustum(near*(GLfloat)w/(GLfloat)h,
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
    glMatrixMode(GL_MODELVIEW);
-   glLoadIdentity();
-}*/
+   glLoadIdentity();*/
+}
 
 /**
  * Called when mouse event occurs
@@ -231,6 +231,7 @@ void mouse(int button, int state, int x, int y) {
  * w/s increase/decrease the z
  * a/d increase/decrease the x
  * q/e increase/decrease the y
+ * z/x increase/decrease the angle
  * @param key Key pressed
  * @param x x co-ordinate of mouse
  * @param y y co-ordinate of mouse
@@ -294,17 +295,17 @@ void motion(int x, int y) {
 void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
-  gluLookAt(
-    100.0, 100.0, 100.0,  /* eye is at (x,y,z) */
-    0.0, 0.0,  0.0,  /* center is at (x,y,z) */
-    0.0, 1.0,  0.0   /* up is in postivie Y direction */
-    );
+  //gluLookAt(
+  //  0.0, 0.0, 30.0,  /* eye is at (x,y,z) */
+  //  0.0, 0.0,  0.0,  /* center is at (x,y,z) */
+  //  0.0, 1.0,  0.0   /* up is in postivie Y direction */
+   // );
 
-  glTranslatef(camx, camy, camz);
+  //glTranslatef(camx, camy, camz);
   
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
-  glRotatef(rot, 1.0, 0.0, 0.0);
+  //glRotatef(rot, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -349,15 +350,15 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-
-   gluPerspective(
-    60.0,  /* field of view in degree */
-     1.0,  /* aspect ratio */
-    nearClip,  /* Z near */
-     farClip   /* Z far */
-    );
+  //glMatrixMode(GL_PROJECTION);
+  //glLoadIdentity();
+
+   //gluPerspective(
+   // 60.0,  /* field of view in degree */
+   //  1.0,  /* aspect ratio */
+   // nearClip,  /* Z near */
+    // farClip   /* Z far */
+   // );
   
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
@@ -414,7 +415,7 @@ int main(int argc, char **argv) {
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-  //glutReshapeFunc(windowReshape);
+  glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
   glutKeyboardFunc(keyboard);