X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=c024bf159a1a47b9b8913d3db753d1e9c57b4e92;hp=cb6fd4e7eca2bea194fe8f1604f867fb4570a9ba;hb=89e90cbd07402f824253fc0a4b2f1cd7e81b31e4;hpb=f5b13f83e5c772873a2ecf72ca33bdd848c2efe9

diff --git a/scene.c b/scene.c
index cb6fd4e..c024bf1 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,19 +256,12 @@ 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 += (x - startx);
+    rotateFactor += (y - starty);
     startx = x;
     starty = y;
     glutPostRedisplay();
   }
-  if (lightMoving) {
-    lightAngle += (x - lightStartX)/40.0;
-    lightHeight += (lightStartY - y)/20.0;
-    lightStartX = x;
-    lightStartY = y;
-    glutPostRedisplay();
-  }
 }
 
 /**
@@ -309,26 +292,19 @@ void display() {
   glLoadIdentity();
 
   gluLookAt(
-    0.0,  0.0,  5.0,  /* eye is at (x,y,z) */
+    0.0,  0.0,  5.0 + 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);
 
-  /* Reposition the light source. */
-  lightPosition[0] = 12*cos(lightAngle);
-  lightPosition[1] = lightHeight;
-  lightPosition[2] = 12*sin(lightAngle);
-  lightPosition[3] = 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.0, 0.0, 1.0);
+    //glTranslatef(camx, camy, camz);
+    //glRotatef(rot, 1.0, 0.0, 0.0);
 
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);
 
@@ -340,7 +316,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
@@ -371,11 +349,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);
@@ -413,8 +391,9 @@ int main(int argc, char **argv) {
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing
   glDepthFunc(GL_LEQUAL);  // the type
   glEnable(GL_TEXTURE_2D);
+  glEnable(GL_CULL_FACE);
   glEnable(GL_NORMALIZE);
-  glLineWidth(1.0);
+  glLineWidth(2.0);
 
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);