X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=98296168e91bdcb9e46540d7584812c6d22dc6aa;hp=83e1c299eed996576613192e7f5ec15bf1e9e5c7;hb=04b80f76711fefed66b740898072a6a1fd51171d;hpb=8664ff7d3cbe2e5285d067231f54772b46649653

diff --git a/scene.c b/scene.c
index 83e1c29..9829616 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;
-    }
-  }
 }
 
 /**
@@ -231,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();
 }
 
@@ -266,8 +275,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);
+    zoom += (y - starty);
+    rotate += (x - startx);
     startx = x;
     starty = y;
     glutPostRedisplay();
@@ -291,26 +300,30 @@ void display() {
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
-  float aspect = (float)height / (float)width;
-  if ( width > height ) aspect = (float)width / (float)height;
+  float aspect;
+  if ( width <= height ) {
+    aspect = (float)height / (float)width;
+  } else {
+    aspect = (float)width / (float)height;
+  }
 
   gluPerspective(
-    90.0,
+    75.0,
     aspect,
     0.1,
-    100
+    200
     );
 
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0, 30.0,  /* eye is at (x,y,z) */
+    0.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 */
+    0.0,  10.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(30.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);
@@ -321,10 +334,9 @@ void display() {
   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);
+    glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);
     glTranslatef(camx, camy, camz);
-    glRotatef(rot, 1.0, 0.0, 0.0);
+    glRotatef(keyrot, 1.0, 0.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -336,7 +348,9 @@ void display() {
     glPushMatrix();
       glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface
       glColor3f(0.0, 0.0, 0.0);
+      glFrontFace(GL_CW);
       glutSolidTeapot(1);
+      glFrontFace(GL_CCW);
     glPopMatrix();
 
     // Draw a white ball over the light source
@@ -357,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);
@@ -367,11 +380,11 @@ void init() {
 
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);
 
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);
-  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);
-  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);
+  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);
+  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);
+  glMaterialfv(GL_FRONT, GL_EMISSION, emission0);
+  glMaterialf(GL_FRONT, GL_SHININESS, shine);
 
   glEnable(GL_LIGHT0);
   glEnable(GL_LIGHTING);
@@ -408,9 +421,10 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
-  glEnable(GL_CULL_FACE);
   glEnable(GL_TEXTURE_2D);
-  glLineWidth(1.0);
+  glEnable(GL_CULL_FACE);
+  glEnable(GL_NORMALIZE);
+  glLineWidth(2.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);