X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=08e78d81501d20aafe064a67d2a45f2e54bd71e4;hp=642fdcdc5bfce55a355ca9e68597233e8effdc66;hb=fc636ebc890e3181512b29bd8f2ee111d206c068;hpb=279764e831c70dd8e02a5d70b1c3715464b1b731 diff --git a/scene.c b/scene.c index 642fdcd..08e78d8 100644 --- a/scene.c +++ b/scene.c @@ -129,7 +129,8 @@ void processTextureEvents(int id) { * @param id ID of ground texture selected */ void processGTextureEvents(int id) { - + currentGroundTexture = id; + glutPostRedisplay(); } /** @@ -169,7 +170,7 @@ void makeMenu() { //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE); //glutAddSubMenu("Material", materialMenu); //glutAddSubMenu("Texture", textureMenu); - //glutAddSubMenu("Ground texture", gTextureMenu); + glutAddSubMenu("Ground texture", gTextureMenu); //glutAddSubMenu("Lights", lightMenu); glutAddMenuEntry("Exit", M_EXIT); @@ -206,16 +207,6 @@ void mouse(int button, int state, int x, int y) { moving = 0; } } - if (button == GLUT_MIDDLE_BUTTON) { - if (state == GLUT_DOWN) { - lightMoving = 1; - lightStartX = x; - lightStartY = y; - } - if (state == GLUT_UP) { - lightMoving = 0; - } - } } /** @@ -231,31 +222,50 @@ void mouse(int button, int state, int x, int y) { void keyboard(unsigned char key, int x, int y) { switch(key) { case 'w': - camz = camz - 1; + case 'W': + camz -= factor; break; case 'a': - camx = camx - 1; + case 'A': + camx -= factor; break; case 's': - camz = camz + 1; + case 'S': + camz += factor; break; case 'd': - camx = camx + 1; + case 'D': + camx += factor; break; case 'q': - camy = camy + 1; + case 'Q': + camy += factor; break; case 'e': - camy = camy - 1; + case 'E': + camy -= factor; break; case 'z': - rot = rot + 1; + case 'Z': + keyrot += factor; break; case 'x': - rot = rot - 1; + case 'X': + keyrot -= factor; + break; + case '=': + case '+': + factor += 0.1; + printf("Factor of change is now %f\n", factor); + break; + case '-': + case '_': + factor -= 0.1; + printf("Factor of change is now %f\n", factor); break; + } - printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, rot); + printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, keyrot); glutPostRedisplay(); } @@ -266,17 +276,24 @@ void keyboard(unsigned char key, int x, int y) { */ void motion(int x, int y) { if (moving) { - angle = angle + (x - startx); - angle2 = angle2 + (y - starty); + zoom += (y - starty); + rotate += (x - startx); startx = x; starty = y; glutPostRedisplay(); } - if (lightMoving) { - lightAngle += (x - lightStartX)/40.0; - lightHeight += (lightStartY - y)/20.0; - lightStartX = x; - lightStartY = y; + if (lightMoving0) { + lightAngle0 += (x - lightStartX0)/40.0; + lightHeight0 += (lightStartY0 - y)/20.0; + lightStartX0 = x; + lightStartY0 = y; + glutPostRedisplay(); + } + if (lightMoving1) { + lightAngle1 += (x - lightStartX1)/40.0; + lightHeight1 += (lightStartY1 - y)/20.0; + lightStartX1 = x; + lightStartY1 = y; glutPostRedisplay(); } } @@ -302,45 +319,49 @@ void display() { 75.0, aspect, 0.1, - 200 + 300 ); glMatrixMode(GL_MODELVIEW); glLoadIdentity(); gluLookAt( - 0.0, 0.0, 5.0, /* eye is at (x,y,z) */ + 0.0, 0.0, 15.0 + (zoom*zoomFactor), /* 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, 10.0, 0.0 /* up is in postivie Y direction */ ); - glRotatef(75.0, 1.0, 0.0, 0.0); + glRotatef(40.0, 1.0, 0.0, 0.0); - /* Reposition the light source. */ - lightPosition[0] = 12*cos(lightAngle); - lightPosition[1] = lightHeight; - lightPosition[2] = 12*sin(lightAngle); - lightPosition[3] = 0.0; + /* Reposition the light source 0. */ + lightPosition0[0] = 12*cos(lightAngle0); + lightPosition0[1] = lightHeight0; + lightPosition0[2] = 12*sin(lightAngle0); + lightPosition0[3] = 0.0; + + /* Reposition the light source 1. */ + lightPosition1[0] = 12*cos(lightAngle1); + lightPosition1[1] = lightHeight1; + lightPosition1[2] = 12*sin(lightAngle1); + lightPosition1[3] = 0.0; glPushMatrix(); /* 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); + glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0); glTranslatef(camx, camy, camz); - glRotatef(rot, 1.0, 0.0, 0.0); + glRotatef(keyrot, 1.0, 0.0, 0.0); - glLightfv(GL_LIGHT0, GL_POSITION, lightPosition); + glLightfv(GL_LIGHT0, GL_POSITION, lightPosition0); + glLightfv(GL_LIGHT1, GL_POSITION, lightPosition1); drawFloor(); - - drawLine(); // Draw teapot for a test object glPushMatrix(); glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface glColor3f(0.0, 0.0, 0.0); - glFrontFace(GL_CW); + glFrontFace(GL_CW); // The teapot does not obey the right-hand rule glutSolidTeapot(1); glFrontFace(GL_CCW); glPopMatrix(); @@ -348,12 +369,23 @@ void display() { // Draw a white ball over the light source glPushMatrix(); glDisable(GL_LIGHTING); - glColor3f(1.0, 1.0, 0.0); - glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]); - glutSolidSphere(1.0, 50, 50); + glColor3f(1.0, 1.0, 1.0); + glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]); + glutSolidSphere(0.5, 50, 50); glEnable(GL_LIGHTING); glPopMatrix(); + // Draw a white ball over the light source + glPushMatrix(); + glDisable(GL_LIGHTING); + glColor3f(1.0, 1.0, 1.0); + glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]); + glutSolidSphere(0.5, 50, 50); + glEnable(GL_LIGHTING); + glPopMatrix(); + + drawAxisLines(); + glPopMatrix(); glutSwapBuffers(); @@ -363,7 +395,6 @@ void display() { * init function; sets initial OpenGL state */ void init() { - glLightfv(GL_LIGHT0, GL_POSITION, light0_pos); glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0); glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0); glLightfv(GL_LIGHT0, GL_SPECULAR, specular0); @@ -371,15 +402,24 @@ void init() { glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0); + glLightfv(GL_LIGHT1, GL_AMBIENT, ambient1); + glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse1); + glLightfv(GL_LIGHT1, GL_SPECULAR, specular1); + glLightfv(GL_LIGHT1, GL_SPOT_DIRECTION, direction1); + + glLightf(GL_LIGHT1, GL_SPOT_CUTOFF, 90.0); + glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel); + glLightModeli(GL_LIGHT_MODEL_COLOR_CONTROL, GL_SEPARATE_SPECULAR_COLOR); glMaterialfv(GL_FRONT, GL_AMBIENT, ambient); glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse); glMaterialfv(GL_FRONT, GL_SPECULAR, specular); - glMaterialfv(GL_FRONT, GL_EMISSION, emission0); + glMaterialfv(GL_FRONT, GL_EMISSION, emission); glMaterialf(GL_FRONT, GL_SHININESS, shine); glEnable(GL_LIGHT0); + //glEnable(GL_LIGHT1); glEnable(GL_LIGHTING); } @@ -415,7 +455,7 @@ int main(int argc, char **argv) { glEnable(GL_DEPTH_TEST); // Enables Depth Testing glDepthFunc(GL_LEQUAL); // the type glEnable(GL_TEXTURE_2D); - glEnable(GL_CULL_FACE); + //glEnable(GL_CULL_FACE); glEnable(GL_NORMALIZE); glLineWidth(2.0);