(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 4a5a686..2a3b61a 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -184,15 +184,8 @@ void makeMenu() {
  */\r
 void windowReshape(int w, int h) {\r
   glViewport(0, 0, (GLsizei) w, (GLsizei) h);\r
-  glMatrixMode(GL_PROJECTION);\r
-  glLoadIdentity();\r
-  if (w <= h)\r
-    glFrustum(-1.0, 1.0, -1.0*(GLfloat) h / (GLfloat) w,\r
-      1.0*(GLfloat) h / (GLfloat) w, 2.0, 10.0);\r
-  else\r
-    glFrustum(-1.0*(GLfloat) w / (GLfloat) h,\r
-       1.0*(GLfloat) w / (GLfloat) h, -1.0, 1.0, 2.0, 10.0);\r
-  glMatrixMode(GL_MODELVIEW);\r
+  width = w;\r
+  height = h;\r
 }\r
 \r
 /**\r
@@ -213,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
@@ -238,31 +221,50 @@ void mouse(int button, int state, int x, int y) {
 void keyboard(unsigned char key, int x, int y) {\r
   switch(key) {\r
     case 'w':\r
-      camz = camz - 1;\r
+    case 'W':\r
+      camz -= factor;\r
       break;\r
     case 'a':\r
-      camx = camx - 1;\r
+    case 'A':\r
+      camx -= factor;\r
       break;\r
     case 's':\r
-      camz = camz + 1;\r
+    case 'S':\r
+      camz += factor;\r
       break;\r
     case 'd':\r
-      camx = camx + 1;\r
+    case 'D':\r
+      camx += factor;\r
       break;\r
     case 'q':\r
-      camy = camy + 1;\r
+    case 'Q':\r
+      camy += factor;\r
       break;\r
     case 'e':\r
-      camy = camy - 1;\r
+    case 'E':\r
+      camy -= factor;\r
       break;\r
     case 'z':\r
-      rot = rot + 1;\r
+    case 'Z':\r
+      keyrot += factor;\r
       break;\r
     case 'x':\r
-      rot = rot - 1;\r
+    case 'X':\r
+      keyrot -= factor;\r
+      break;\r
+    case '=':\r
+    case '+':\r
+      factor += 0.1;\r
+      printf("Factor of change is now %f\n", factor);\r
       break;\r
+    case '-':\r
+    case '_':\r
+      factor -= 0.1;\r
+      printf("Factor of change is now %f\n", factor);\r
+      break;\r
+\r
   }\r
-  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot);\r
+  printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, keyrot);\r
   glutPostRedisplay();\r
 }\r
 \r
@@ -273,8 +275,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
+    zoom += (y - starty);\r
+    rotate += (x - startx);\r
     startx = x;\r
     starty = y;\r
     glutPostRedisplay();\r
@@ -293,8 +295,36 @@ void motion(int x, int y) {
  */\r
 void display() {\r
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);\r
+  \r
+  // Redraw projection matrix\r
+  glMatrixMode(GL_PROJECTION);\r
   glLoadIdentity();\r
 \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
+    75.0,\r
+    aspect,\r
+    0.1,\r
+    200\r
+    );\r
+\r
+  glMatrixMode(GL_MODELVIEW);\r
+  glLoadIdentity();\r
+\r
+  gluLookAt(\r
+    15.0 + (zoom*zoomFactor),  0.0,  15.0 + (zoom*zoomFactor),  /* eye is at (x,y,z) */\r
+    0.0,  0.0,  0.0,  /* center is at (x,y,z) */\r
+    0.0,  10.0,  0.0   /* up is in postivie Y direction */\r
+    );\r
+\r
+  glRotatef(50.0, 1.0, 0.0, 0.0);\r
+\r
   /* Reposition the light source. */\r
   lightPosition[0] = 12*cos(lightAngle);\r
   lightPosition[1] = lightHeight;\r
@@ -304,10 +334,9 @@ void display() {
   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
+    glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);\r
     glTranslatef(camx, camy, camz);\r
-    glRotatef(rot, 1.0, 0.0, 0.0);\r
+    glRotatef(keyrot, 1.0, 0.0, 0.0);\r
 \r
     glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);\r
 \r
@@ -319,7 +348,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
@@ -340,10 +371,6 @@ void display() {
  * init function; sets initial OpenGL state\r
  */\r
 void init() {\r
-  glMatrixMode(GL_MODELVIEW);\r
-  glLoadIdentity();\r
-\r
-  glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);\r
   glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
   glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
   glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
@@ -394,25 +421,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
-\r
-  // **NOTE: Currently the perspective and look-at code is static, for testing purposes\r
-  //glMatrixMode(GL_PROJECTION);\r
-  //gluPerspective(\r
-  //   40.0, /* field of view in degree */\r
-  //    1.0, /* aspect ratio */\r
-  //    1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything\r
-   // 100.0  /* Z far */\r
-  //  );\r
-\r
-  glMatrixMode(GL_MODELVIEW);\r
-  gluLookAt(\r
-    0.0,  35.0, -20.0,  /* eye is at (x,y,z) */\r
-    0.0,  10.0,  0.0,  /* center is at (x,y,z) */\r
-    0.0,  1.0,   0.0   /* up is in postivie Y direction */\r
-    );\r
+  glEnable(GL_CULL_FACE);\r
+  glEnable(GL_NORMALIZE);\r
+  glLineWidth(2.0);\r
 \r
   glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
 \r