X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=8ce005bade04a86858131ec1ddd995dd027dc1bb;hp=dde21250a2676d16a4b93079f1edeedef72ee0dd;hb=9ef3cb688ee424d11b9b9549ec3cb3dac29334c4;hpb=805a86b6d1deded8f3f69fa059e1916e0e490ce5

diff --git a/scene.c b/scene.c
index dde2125..8ce005b 100644
--- a/scene.c
+++ b/scene.c
@@ -182,7 +182,7 @@ 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();
@@ -191,10 +191,10 @@ void windowReshape(int w, int h) {
              far*(GLfloat)h/(GLfloat)w, -100, 100);
   else
     glOrtho(near*(GLfloat)w/(GLfloat)h,
-             far*(GLfloat)w/(GLfloat)h, near, far, -100, 100);
-   glMatrixMode(GL_MODELVIEW); 
+             far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
+   glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-}
+}*/
 
 /**
  * Called when mouse event occurs
@@ -226,6 +226,30 @@ void mouse(int button, int state, int x, int y) {
   }
 }
 
+void keyboard(unsigned char key, int x1, int y1) {
+  switch(key) {
+    case 'w':
+      z = z - 1;
+      break;
+    case 'a':
+      x = x - 1;
+      break;
+    case 's':
+      z = z + 1;
+      break;
+    case 'd':
+      x = x + 1;
+      break;
+    case 'q':
+      y = y + 1;
+      break;
+    case 'e':
+      y = y - 1;
+      break;
+  }
+  printf("Camera is now at (%f, %f, %f)\n", x, y, z);
+}
+
 /**
  * Called when motion event occurs
  * @param x Mouse x position
@@ -260,7 +284,8 @@ void display() {
     0.0, 1.0,  0.0   /* up is in postivie Y direction */
     );
 
-
+  glTranslatef(x, y, z);
+  
   // **NOTE: Currently this rotation function is all that moves the camera off
   //         the flat surface. Need to integrate function into gluLookAt
   glRotatef(30.0, 1.0, 0.0, 0.0);
@@ -311,14 +336,16 @@ void init() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-  gluPerspective(
+   gluPerspective(
     60.0,  /* field of view in degree */
      1.0,  /* aspect ratio */
-    near,  /* Z near */
-     far   /* Z far */
+    nearClip,  /* Z near */
+     farClip   /* 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);
@@ -333,8 +360,6 @@ void init() {
 
   
 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
 }
 
 /**
@@ -373,9 +398,10 @@ int main(int argc, char **argv) {
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 
-  glutReshapeFunc(windowReshape);
+  //glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
+  glutKeyboardFunc(keyboard);
   glutMotionFunc(motion);
 
   makeMenu();