(no commit message)

diff --git a/globals.c b/globals.c
index 03d2f6f..91fb87b 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -73,7 +73,7 @@ int drawFloorRecurse = 5;
 int floorSize = 200;
 
 /* Current camera x, y, z coords */
-GLfloat camx = 0.0, camy = 0.0, camz = 0.0;
+GLfloat camx = 0.0, camy = 0.0, camz = 0.0, rot = 0.0;
 
 /* Light 0 parameters */
 GLfloat diffuse0[] = {1.0, 1.0, 1.0, 1.0};

diff --git a/globals.h b/globals.h
index d856c57..728bf6a 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -63,7 +63,7 @@ extern int drawFloorRecurse;
 extern int floorSize;
 
 /* Current camera position */
-extern GLfloat camx, camy, camz;
+extern GLfloat camx, camy, camz, rot;
 
 /* Light 0 parameters */
 extern GLfloat diffuse0[];

diff --git a/scene.c b/scene.c
index d40ef09..1654527 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -255,8 +255,14 @@ void keyboard(unsigned char key, int x, int y) {
     case 'e':\r
       camy = camy - 1;\r
       break;\r
+    case 'z':\r
+      rot = rot + 1;\r
+      break;\r
+    case 'x':\r
+      rot = rot - 1;\r
+      break;\r
   }\r
-  printf("Camera is now at (%f, %f, %f)\n", camx, camy, camz);\r
+  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);\r
   glutPostRedisplay();\r
 }\r
 \r
@@ -298,7 +304,7 @@ void display() {
   \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(rot, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r