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
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
*/\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
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 + (zoom*zoomFactor), /* 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(50.0, 1.0, 0.0, 0.0);\r
\r
/* Reposition the light source. */\r
lightPosition[0] = 12*cos(lightAngle);\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
+ 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
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
* init function; sets initial OpenGL state\r
*/\r
void init() {\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
\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
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