(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index b47fbe9..8ce005b 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -226,6 +226,30 @@ void mouse(int button, int state, int x, int y) {
   }\r
 }\r
 \r
+void keyboard(unsigned char key, int x1, int y1) {\r
+  switch(key) {\r
+    case 'w':\r
+      z = z - 1;\r
+      break;\r
+    case 'a':\r
+      x = x - 1;\r
+      break;\r
+    case 's':\r
+      z = z + 1;\r
+      break;\r
+    case 'd':\r
+      x = x + 1;\r
+      break;\r
+    case 'q':\r
+      y = y + 1;\r
+      break;\r
+    case 'e':\r
+      y = y - 1;\r
+      break;\r
+  }\r
+  printf("Camera is now at (%f, %f, %f)\n", x, y, z);\r
+}\r
+\r
 /**\r
  * Called when motion event occurs\r
  * @param x Mouse x position\r
@@ -260,10 +284,11 @@ void display() {
     0.0, 1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
-\r
+  glTranslatef(x, y, z);\r
+  \r
   // **NOTE: Currently this rotation function is all that moves the camera off\r
   //         the flat surface. Need to integrate function into gluLookAt\r
-  //glRotatef(30.0, 1.0, 0.0, 0.0);\r
+  glRotatef(30.0, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -376,6 +401,7 @@ int main(int argc, char **argv) {
   //glutReshapeFunc(windowReshape);\r
   glutDisplayFunc(display);\r
   glutMouseFunc(mouse);\r
+  glutKeyboardFunc(keyboard);\r
   glutMotionFunc(motion);\r
 \r
   makeMenu();\r