X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=d22aa94ad05979d4f1f2cef59ea0917a29a75235;hp=d9a4ea3be32f39ed4ab99b5a8cb52c6971cabe3c;hb=2edfbf59af3b619100c7d2174f693937045a227a;hpb=ddf25313dfc93155b958b2838b6dba330e2706d9

diff --git a/scene.c b/scene.c
index d9a4ea3..d22aa94 100644
--- a/scene.c
+++ b/scene.c
@@ -221,31 +221,50 @@ void mouse(int button, int state, int x, int y) {
 void keyboard(unsigned char key, int x, int y) {
   switch(key) {
     case 'w':
-      camz = camz - 1;
+    case 'W':
+      camz -= factor;
       break;
     case 'a':
-      camx = camx - 1;
+    case 'A':
+      camx -= factor;
       break;
     case 's':
-      camz = camz + 1;
+    case 'S':
+      camz += factor;
       break;
     case 'd':
-      camx = camx + 1;
+    case 'D':
+      camx += factor;
       break;
     case 'q':
-      camy = camy + 1;
+    case 'Q':
+      camy += factor;
       break;
     case 'e':
-      camy = camy - 1;
+    case 'E':
+      camy -= factor;
       break;
     case 'z':
-      rot = rot + 1;
+    case 'Z':
+      keyrot += factor;
       break;
     case 'x':
-      rot = rot - 1;
+    case 'X':
+      keyrot -= factor;
       break;
+    case '=':
+    case '+':
+      factor += 0.1;
+      printf("Factor of change is now %f\n", factor);
+      break;
+    case '-':
+    case '_':
+      factor -= 0.1;
+      printf("Factor of change is now %f\n", factor);
+      break;
+
   }
-  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);
+  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, keyrot);
   glutPostRedisplay();
 }
 
@@ -256,8 +275,8 @@ void keyboard(unsigned char key, int x, int y) {
  */
 void motion(int x, int y) {
   if (moving) {
-    zoomFactor += (y - starty);
-    rotateFactor += (x - startx);
+    zoom += (y - starty);
+    rotate += (x - startx);
     startx = x;
     starty = y;
     glutPostRedisplay();
@@ -299,12 +318,12 @@ void display() {
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0,  5.0 + (zoomFactor*0.2),  /* eye is at (x,y,z) */
+    10.0,  0.0,  15.0 + (zoom*zoomFactor),  /* 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 */
     );
 
-  glRotatef(75.0, 1.0, 0.0, 0.0);
+  glRotatef(50.0, 1.0, 0.0, 0.0);
 
   /* Reposition the light source. */
   lightPosition[0] = 12*cos(lightAngle);
@@ -312,16 +331,12 @@ void display() {
   lightPosition[2] = 12*sin(lightAngle);
   lightPosition[3] = 0.0;
 
-
-    //glRotatef(angle, 0.0, 1.0, 0.0);
-   // glRotatef(angle2, 1.0, 0.0, 0.0);
-
   glPushMatrix();
 
     /* Perform scene rotations based on user mouse/keyboard input. */
-    glRotatef(rotateFactor*0.5, 0.0, 1.0, 0.0);
-    //glTranslatef(camx, camy, camz);
-    //glRotatef(rot, 1.0, 0.0, 0.0);
+    glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);
+    glTranslatef(camx, camy, camz);
+    glRotatef(keyrot, 1.0, 0.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -356,7 +371,6 @@ void display() {
  * init function; sets initial OpenGL state
  */
 void init() {
-  glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);