(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 83e1c29..d9a4ea3 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -206,16 +206,6 @@ void mouse(int button, int state, int x, int y) {
       moving = 0;\r
     }\r
   }\r
-  if (button == GLUT_MIDDLE_BUTTON) {\r
-    if (state == GLUT_DOWN) {\r
-      lightMoving = 1;\r
-      lightStartX = x;\r
-      lightStartY = y;\r
-    }\r
-    if (state == GLUT_UP) {\r
-      lightMoving = 0;\r
-    }\r
-  }\r
 }\r
 \r
 /**\r
@@ -266,8 +256,8 @@ void keyboard(unsigned char key, int x, int y) {
  */\r
 void motion(int x, int y) {\r
   if (moving) {\r
-    angle = angle + (x - startx);\r
-    angle2 = angle2 + (y - starty);\r
+    zoomFactor += (y - starty);\r
+    rotateFactor += (x - startx);\r
     startx = x;\r
     starty = y;\r
     glutPostRedisplay();\r
@@ -291,26 +281,30 @@ void display() {
   glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
 \r
-  float aspect = (float)height / (float)width;\r
-  if ( width > height ) aspect = (float)width / (float)height;\r
+  float aspect;\r
+  if ( width <= height ) {\r
+    aspect = (float)height / (float)width;\r
+  } else {\r
+    aspect = (float)width / (float)height;\r
+  }\r
 \r
   gluPerspective(\r
-    90.0,\r
+    75.0,\r
     aspect,\r
     0.1,\r
-    100\r
+    200\r
     );\r
 \r
   glMatrixMode(GL_MODELVIEW);\r
   glLoadIdentity();\r
 \r
   gluLookAt(\r
-    0.0,  0.0, 30.0,  /* eye is at (x,y,z) */\r
+    0.0,  0.0,  5.0 + (zoomFactor*0.2),  /* eye is at (x,y,z) */\r
     0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
     0.0,  1.0,  0.0   /* up is in postivie Y direction */\r
     );\r
 \r
-  glRotatef(30.0, 1.0, 0.0, 0.0);\r
+  glRotatef(75.0, 1.0, 0.0, 0.0);\r
 \r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
@@ -318,13 +312,16 @@ void display() {
   lightPosition[2] = 12*sin(lightAngle);\r
   lightPosition[3] = 0.0;\r
 \r
+\r
+    //glRotatef(angle, 0.0, 1.0, 0.0);\r
+   // glRotatef(angle2, 1.0, 0.0, 0.0);\r
+\r
   glPushMatrix();\r
 \r
     /* Perform scene rotations based on user mouse/keyboard input. */\r
-    glRotatef(angle, 0.0, 1.0, 0.0);\r
-    glRotatef(angle2, 1.0, 0.0, 0.0);\r
-    glTranslatef(camx, camy, camz);\r
-    glRotatef(rot, 1.0, 0.0, 0.0);\r
+    glRotatef(rotateFactor*0.5, 0.0, 1.0, 0.0);\r
+    //glTranslatef(camx, camy, camz);\r
+    //glRotatef(rot, 1.0, 0.0, 0.0);\r
 \r
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);\r
 \r
@@ -336,7 +333,9 @@ void display() {
     glPushMatrix();\r
       glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface\r
       glColor3f(0.0, 0.0, 0.0);\r
+      glFrontFace(GL_CW);\r
       glutSolidTeapot(1);\r
+      glFrontFace(GL_CCW);\r
     glPopMatrix();\r
 \r
     // Draw a white ball over the light source\r
@@ -367,11 +366,11 @@ void init() {
 \r
   glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
 \r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, ambient);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, diffuse);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, specular);\r
-  glMaterialfv(GL_FRONT_AND_BACK, GL_EMISSION, emission0);\r
-  glMaterialf(GL_FRONT_AND_BACK, GL_SHININESS, shine);\r
+  glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);\r
+  glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);\r
+  glMaterialfv(GL_FRONT, GL_SPECULAR, specular);\r
+  glMaterialfv(GL_FRONT, GL_EMISSION, emission0);\r
+  glMaterialf(GL_FRONT, GL_SHININESS, shine);\r
 \r
   glEnable(GL_LIGHT0);\r
   glEnable(GL_LIGHTING);\r
@@ -408,9 +407,10 @@ int main(int argc, char **argv) {
   glDepthRange(0,1);\r
   glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
   glDepthFunc(GL_LEQUAL);  // the type\r
-  glEnable(GL_CULL_FACE);\r
   glEnable(GL_TEXTURE_2D);\r
-  glLineWidth(1.0);\r
+  glEnable(GL_CULL_FACE);\r
+  glEnable(GL_NORMALIZE);\r
+  glLineWidth(2.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r