X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=1cc9122a2ae68f1668050dfd08e898a02784b1cf;hp=de52ab893e4877ecc94830012c10a9543b9658a8;hb=9bed07eee30fad2272cfba655542de064c2dc816;hpb=71a79323a397f78dba55423678096176a98106cb

diff --git a/scene.c b/scene.c
index de52ab8..1cc9122 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();
@@ -194,7 +194,7 @@ void makeMenu() {
              far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip);
    glMatrixMode(GL_MODELVIEW);
    glLoadIdentity();
-}*/
+}
 
 /**
  * Called when mouse event occurs
@@ -226,6 +226,47 @@ 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
+ * z/x increase/decrease the angle
+ * @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;
+    case 'z':
+      rot = rot + 1;
+      break;
+    case 'x':
+      rot = rot - 1;
+      break;
+  }
+  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);
+  glutPostRedisplay();
+}
+
 /**
  * Called when motion event occurs
  * @param x Mouse x position
@@ -255,15 +296,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, 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);
+  glRotatef(rot, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -275,7 +317,7 @@ void display() {
 
     /* Perform scene rotations based on user mouse input. */
     glRotatef(angle, 0.0, 1.0, 0.0);
-    //glRotatef(angle2, 1.0, 0.0, 0.0); **NOTE: Only one degree of freedom
+    glRotatef(angle2, 1.0, 0.0, 0.0); //**NOTE: Only one degree of freedom
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -287,7 +329,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(25);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -311,12 +353,12 @@ void init() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-   gluPerspective(
-    60.0,  /* field of view in degree */
-     1.0,  /* aspect ratio */
-    near,  /* Z near */
-     far   /* Z far */
-    );
+   //gluPerspective(
+   // 60.0,  /* field of view in degree */
+   //  1.0,  /* aspect ratio */
+   // nearClip,  /* Z near */
+    // farClip   /* Z far */
+   // );
   
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
@@ -376,6 +418,7 @@ int main(int argc, char **argv) {
   //glutReshapeFunc(windowReshape);
   glutDisplayFunc(display);
   glutMouseFunc(mouse);
+  glutKeyboardFunc(keyboard);
   glutMotionFunc(motion);
 
   makeMenu();