X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=3d7dcd3d490aed938e1c9948038e4e8fa58bec59;hp=260169d9621a0eb62d99ca39305d7defb4b2ae8e;hb=4db627cb2b67a5fd49b65b2b8cde754deeddf3e3;hpb=a8892e6dc7feb8282b95681498b6931cdbe0f2da

diff --git a/scene.c b/scene.c
index 260169d..3d7dcd3 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
@@ -232,6 +226,40 @@ void mouse(int button, int state, int x, int y) {
   }
 }
 
+/**
+ * Keybord event handler
+ * w/s increase/decrease the z
+ * a/d increase/decrease the x
+ * q/e increase/decrease the y
+ * @param key Key pressed
+ * @param x x co-ordinate of mouse
+ * @param y y co-ordinate of mouse
+ */
+void keyboard(unsigned char key, int x, int y) {
+  switch(key) {
+    case 'w':
+      camz = camz - 1;
+      break;
+    case 'a':
+      camx = camx - 1;
+      break;
+    case 's':
+      camz = camz + 1;
+      break;
+    case 'd':
+      camx = camx + 1;
+      break;
+    case 'q':
+      camy = camy + 1;
+      break;
+    case 'e':
+      camy = camy - 1;
+      break;
+  }
+  printf("Camera is now at (%f, %f, %f)\n", camx, camy, camz);
+  glutPostRedisplay();
+}
+
 /**
  * Called when motion event occurs
  * @param x Mouse x position
@@ -261,12 +289,13 @@ void display() {
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   glLoadIdentity();
   gluLookAt(
-    0.0, 0.0, 10.0,  /* eye is at (x,y,z) */
+    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);
+  
   // **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);
@@ -317,7 +346,16 @@ 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_MODELVIEW);
+  glLoadIdentity();
+
   glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
@@ -332,8 +370,6 @@ void init() {
 
   
 
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
 }
 
 /**
@@ -372,9 +408,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();