X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=347e681a3e826928cdc7f3179a9ccdd04d2346e2;hp=c322eb85def36ae01a81500e40bff77fae8cb5d8;hb=0135f530575ab4fb093c9b33791e00a9824bb12d;hpb=916773443101d71d573d82c5e699a1c94b9cb2e4 diff --git a/scene.c b/scene.c index c322eb8..347e681 100644 --- a/scene.c +++ b/scene.c @@ -184,6 +184,8 @@ void makeMenu() { */ void windowReshape(int w, int h) { glViewport(0, 0, (GLsizei) w, (GLsizei) h); + width = w; + height = h; } /** @@ -284,14 +286,31 @@ void motion(int x, int y) { */ void display() { glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + // Redraw projection matrix + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + + float aspect = (float)height / (float)width; + if ( width > height ) aspect = (float)width / (float)height; + + gluPerspective( + 90.0, + aspect, + 0.1, + 100 + ); + glMatrixMode(GL_MODELVIEW); glLoadIdentity(); - //gluLookAt( - // -30.0, -30.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 */ - // ); + gluLookAt( + 0.0, 0.0, 5.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 */ + ); + + glRotatef(75.0, 1.0, 0.0, 0.0); /* Reposition the light source. */ lightPosition[0] = 12*cos(lightAngle);