X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=8101ddb1020e2b91af35917e4edb6d2da96d32d0;hp=a988ca8181184aef170a5d173b519e59282fa749;hb=208a83d9f7ed04bd1929c2c7f804a2eaea4cdd63;hpb=9474fe66d5e0a92856c91ea19d53edac236c443c

diff --git a/scene.c b/scene.c
index a988ca8..8101ddb 100644
--- a/scene.c
+++ b/scene.c
@@ -226,28 +226,37 @@ void mouse(int button, int state, int x, int y) {
   }
 }
 
-void keyboard(unsigned char key, int x1, int y1) {
+/**
+ * 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':
-      z = z - 1;
+      camz = camz - 1;
       break;
     case 'a':
-      x = x - 1;
+      camx = camx - 1;
       break;
     case 's':
-      z = z + 1;
+      camz = camz + 1;
       break;
     case 'd':
-      x = x + 1;
+      camx = camx + 1;
       break;
     case 'q':
-      y = y + 1;
+      camy = camy + 1;
       break;
     case 'e':
-      y = y - 1;
+      camy = camy - 1;
       break;
   }
-  printf("Camera is now at (%f, %f, %f)\n", x, y, z);
+  printf("Camera is now at (%f, %f, %f)\n", camx, camy, camz);
   glutPostRedisplay();
 }
 
@@ -280,16 +289,16 @@ 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, 10.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 */
     );
 
-  glTranslatef(x, y, z);
+  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);
+  //glRotatef(30.0, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -313,7 +322,7 @@ void display() {
     glPushMatrix();
       glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface
       glColor3f(0.5, 0.5, 0.5);
-      glutSolidTeapot(1);
+      glutSolidTeapot(100);
     glPopMatrix();
 
     // Draw a white ball over the light source