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

diff --git a/scene.c b/scene.c
index 642fdcd..d9a4ea3 100644
--- a/scene.c
+++ b/scene.c
@@ -206,16 +206,6 @@ void mouse(int button, int state, int x, int y) {
       moving = 0;
     }
   }
-  if (button == GLUT_MIDDLE_BUTTON) {
-    if (state == GLUT_DOWN) {
-      lightMoving = 1;
-      lightStartX = x;
-      lightStartY = y;
-    }
-    if (state == GLUT_UP) {
-      lightMoving = 0;
-    }
-  }
 }
 
 /**
@@ -266,8 +256,8 @@ void keyboard(unsigned char key, int x, int y) {
  */
 void motion(int x, int y) {
   if (moving) {
-    angle = angle + (x - startx);
-    angle2 = angle2 + (y - starty);
+    zoomFactor += (y - starty);
+    rotateFactor += (x - startx);
     startx = x;
     starty = y;
     glutPostRedisplay();
@@ -309,7 +299,7 @@ void display() {
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */
+    0.0,  0.0,  5.0 + (zoomFactor*0.2),  /* 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 */
     );
@@ -322,13 +312,16 @@ 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(angle, 0.0, 1.0, 0.0);
-    glRotatef(angle2, 1.0, 0.0, 0.0);
-    glTranslatef(camx, camy, camz);
-    glRotatef(rot, 1.0, 0.0, 0.0);
+    glRotatef(rotateFactor*0.5, 0.0, 1.0, 0.0);
+    //glTranslatef(camx, camy, camz);
+    //glRotatef(rot, 1.0, 0.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);