X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=d06dd3c3adca97d186b92b82f31de7ace8a43e16;hp=a988ca8181184aef170a5d173b519e59282fa749;hb=241ec710cf9e36891031b23e5bad89beb20c0944;hpb=9474fe66d5e0a92856c91ea19d53edac236c443c diff --git a/scene.c b/scene.c index a988ca8..d06dd3c 100644 --- a/scene.c +++ b/scene.c @@ -182,19 +182,18 @@ void makeMenu() { * @param w New width * @param h New height */ -/*void windowReshape(int w, int h) { +void windowReshape(int w, int h) { glViewport(0, 0, (GLsizei) w, (GLsizei) h); glMatrixMode(GL_PROJECTION); glLoadIdentity(); - if (w <= h) - glOrtho(near, far, near*(GLfloat)h/(GLfloat)w, - far*(GLfloat)h/(GLfloat)w, -100, 100); + if (w <= h) + glFrustum(-near, far, -near*(GLfloat) h / (GLfloat) w, + far*(GLfloat) h / (GLfloat) w, nearClip, farClip); else - glOrtho(near*(GLfloat)w/(GLfloat)h, - far*(GLfloat)w/(GLfloat)h, near, far, nearClip, farClip); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); -}*/ + glFrustum(-near*(GLfloat) w / (GLfloat) h, + far*(GLfloat) w / (GLfloat) h, near, far, nearClip, farClip); + glMatrixMode(GL_MODELVIEW); +} /** * Called when mouse event occurs @@ -226,28 +225,44 @@ void mouse(int button, int state, int x, int y) { } } -void keyboard(unsigned char key, int x1, int y1) { +/** + * Keybord event handler + * w/s increase/decrease the z + * a/d increase/decrease the x + * q/e increase/decrease the y + * z/x increase/decrease the angle + * @param key Key pressed + * @param x x co-ordinate of mouse + * @param y y co-ordinate of mouse + */ +void keyboard(unsigned char key, int x, int y) { switch(key) { case 'w': - z = z - 1; + camz = camz - 1; break; case 'a': - x = x - 1; + camx = camx - 1; break; case 's': - z = z + 1; + camz = camz + 1; break; case 'd': - x = x + 1; + camx = camx + 1; break; case 'q': - y = y + 1; + camy = camy + 1; break; case 'e': - y = y - 1; + camy = camy - 1; + break; + case 'z': + rot = rot + 1; + break; + case 'x': + rot = rot - 1; break; } - printf("Camera is now at (%f, %f, %f)\n", x, y, z); + printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot); glutPostRedisplay(); } @@ -278,19 +293,15 @@ void motion(int x, int y) { */ void display() { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glMatrixMode(GL_MODELVIEW); glLoadIdentity(); + gluLookAt( - 0.0, 0.0, 10.0, /* 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, 8.0, 30.0, /* 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 */ ); - glTranslatef(x, y, z); - - // **NOTE: Currently this rotation function is all that moves the camera off - // the flat surface. Need to integrate function into gluLookAt - glRotatef(30.0, 1.0, 0.0, 0.0); - /* Reposition the light source. */ lightPosition[0] = 12*cos(lightAngle); lightPosition[1] = lightHeight; @@ -299,9 +310,11 @@ void display() { glPushMatrix(); - /* Perform scene rotations based on user mouse input. */ + /* 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); **NOTE: Only one degree of freedom + glRotatef(angle2, 1.0, 0.0, 0.0); + glTranslatef(camx, camy, camz); + glRotatef(rot, 1.0, 0.0, 0.0); glLightfv(GL_LIGHT0, GL_POSITION, lightPosition); @@ -311,15 +324,15 @@ void display() { // Draw teapot for a test object glPushMatrix(); - glTranslatef(0.0, 1.0, 0.0); // **NOTE: Teapot does not rest on surface - glColor3f(0.5, 0.5, 0.5); + glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface + glColor3f(0.0, 0.0, 0.0); glutSolidTeapot(1); glPopMatrix(); // Draw a white ball over the light source glPushMatrix(); glDisable(GL_LIGHTING); - glColor3f(1.0, 1.0, 1.0); + glColor3f(1.0, 1.0, 0.0); glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]); glutSolidSphere(1.0, 50, 50); glEnable(GL_LIGHTING); @@ -334,16 +347,6 @@ void display() { * init function; sets initial OpenGL state */ void init() { - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - gluPerspective( - 60.0, /* field of view in degree */ - 1.0, /* aspect ratio */ - nearClip, /* Z near */ - farClip /* Z far */ - ); - glMatrixMode(GL_MODELVIEW); glLoadIdentity(); @@ -351,16 +354,20 @@ void init() { glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0); glLightfv(GL_LIGHT0, GL_SPECULAR, specular0); + glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0); + + glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel); - glEnable(GL_LIGHT0); - glEnable(GL_LIGHTING); - glEnable(GL_COLOR_MATERIAL); - glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE ); - glMaterialfv( GL_FRONT_AND_BACK, GL_SPECULAR, specular0); - glMaterialfv( GL_FRONT_AND_BACK, GL_EMISSION, emission0); - + 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); } /** @@ -391,15 +398,25 @@ int main(int argc, char **argv) { glShadeModel(GL_SMOOTH); // Enables Smooth Shading glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background glClearDepth(1.0f); // Depth Buffer Setup + 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); + // **NOTE: Currently the perspective and look-at code is static, for testing purposes + //glMatrixMode(GL_PROJECTION); + //gluPerspective( + // 40.0, /* field of view in degree */ + // 1.0, /* aspect ratio */ + // 1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything + // 100.0 /* Z far */ + // ); + glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST); - //glutReshapeFunc(windowReshape); + glutReshapeFunc(windowReshape); glutDisplayFunc(display); glutMouseFunc(mouse); glutKeyboardFunc(keyboard); @@ -410,4 +427,4 @@ int main(int argc, char **argv) { init(); glutMainLoop(); -} +} \ No newline at end of file