X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=54ef0d84ea2e0e5e256d95eb39185d418bb83827;hp=ca09d1df6919e2846b6d2bf8d8b5687165b084b2;hb=057887dfb66573803c3e127d47e88a29c02bd6f8;hpb=ce19686e699c3fb014add29642c23ed17586fa88 diff --git a/scene.c b/scene.c index ca09d1d..54ef0d8 100644 --- a/scene.c +++ b/scene.c @@ -1,6 +1,6 @@ /** * CITS2231 Graphics Scene Editor - * @author Ashley Tyndall (20915779) + * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932) */ #include @@ -25,17 +25,14 @@ void processMainEvents(int id) { switch (id) { case M_ROTATE_MOVE_CAMERA: - // Do stuff + manipulateState = STATE_CAMERA_ROTATE_MOVE; break; - case M_POSITION_SCALE: - // Do stuff + manipulateState = STATE_OBJECT_POSITION_SCALE; break; - case M_ROTATION_TEXTURE_SCALE: - // Do stuff + manipulateState = STATE_OBJECT_ROTATION_TEXTURE_SCALE; break; - case M_EXIT: exit(EXIT_SUCCESS); @@ -113,7 +110,9 @@ void processLightEvents(int id) { * @param id ID of object selected */ void processObjectEvents(int id) { - + addSceneObject(id); + manipulateState = STATE_OBJECT_POSITION_SCALE; + glutPostRedisplay(); } /** @@ -121,7 +120,10 @@ void processObjectEvents(int id) { * @param id ID of texutre selected */ void processTextureEvents(int id) { - + if ( curObject >= 0 ) { + sceneObjs[curObject].texture.id = id; + glutPostRedisplay(); + } } /** @@ -164,12 +166,12 @@ void makeMenu() { // Construct main menu glutCreateMenu(processMainEvents); - //glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA); - //glutAddSubMenu("Add object", objectMenu); - //glutAddMenuEntry("Position/Scale", M_POSITION_SCALE); - //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE); + glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA); + glutAddSubMenu("Add object", objectMenu); + glutAddMenuEntry("Position/Scale", M_POSITION_SCALE); + glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE); //glutAddSubMenu("Material", materialMenu); - //glutAddSubMenu("Texture", textureMenu); + glutAddSubMenu("Texture", textureMenu); glutAddSubMenu("Ground texture", gTextureMenu); //glutAddSubMenu("Lights", lightMenu); glutAddMenuEntry("Exit", M_EXIT); @@ -197,15 +199,20 @@ void windowReshape(int w, int h) { * @param y Mouse y position */ void mouse(int button, int state, int x, int y) { - if (button == GLUT_LEFT_BUTTON) { - if (state == GLUT_DOWN) { - moving = 1; + if ( button == GLUT_LEFT_BUTTON && glutGetModifiers() == GLUT_ACTIVE_SHIFT ) { + button = GLUT_MIDDLE_BUTTON; // Holding shift with left button is the same as the middle button + } + switch(button) { + case GLUT_LEFT_BUTTON: + case GLUT_MIDDLE_BUTTON: + if ( state == GLUT_DOWN ) { + buttonSelected = button; + } else if ( state == GLUT_UP ) { + buttonSelected = -1; + } startx = x; starty = y; - } - if (state == GLUT_UP) { - moving = 0; - } + break; } } @@ -275,27 +282,83 @@ void keyboard(unsigned char key, int x, int y) { * @param y Mouse y position */ void motion(int x, int y) { - if (moving) { - zoom += (y - starty); - rotate += (x - startx); - startx = x; - starty = y; - glutPostRedisplay(); - } - 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(); + if ( buttonSelected == -1 ) return; // No button selected, no action + + float diffx = x - startx; + float diffy = y - starty; + + switch ( manipulateState ) { + case STATE_CAMERA_ROTATE_MOVE: + // w: rotate + rotate += diffx; + + if ( buttonSelected == GLUT_LEFT_BUTTON ) { + // h: zoom + zoom += diffy; + } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { + // h: tilt + camAngle += diffy; + } + break; + + case STATE_OBJECT_POSITION_SCALE: + + if ( buttonSelected == GLUT_LEFT_BUTTON ) { + // w: left/right, h: near/far + + // **NOTE: Currently a work in progress, does not work correctly + float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 ); + printf("cam angle: %f\n", rotate*camRotateFactor); + + sceneObjs[curObject].x += diffx * cos(angler) * 0.1; + sceneObjs[curObject].z += diffx * sin(angler) * 0.1; + + sceneObjs[curObject].x += diffy * sin(angler) * 0.1; + sceneObjs[curObject].z += diffy * cos(angler) * 0.1; + + } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { + // w: big/small + float max = (float)height/bigsmallFactor; + float scaling = (diffx + max) / max; + + sceneObjs[curObject].scale[0] *= scaling; + sceneObjs[curObject].scale[1] *= scaling; + sceneObjs[curObject].scale[2] *= scaling; + + // h: up/down + sceneObjs[curObject].y -= diffy * updownFactor; + } + + break; + + case STATE_OBJECT_ROTATION_TEXTURE_SCALE: + + if ( buttonSelected == GLUT_LEFT_BUTTON ) { + // w: rotate on y + sceneObjs[curObject].rotation.y += diffx * rotateFactor; + + // h: rotate on x + sceneObjs[curObject].rotation.x += diffy * rotateFactor; + + } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { + // w: rotate on x + sceneObjs[curObject].rotation.x += diffx * rotateFactor; + + // h: texture scale + float max = (float)height/texscaleFactor; + float scaling = (diffy + max) / max; + sceneObjs[curObject].texture.scale *= scaling; + + } + + break; + } + + starty = y; + startx = x; + + glutPostRedisplay(); } /** @@ -331,7 +394,7 @@ void display() { 0.0, 10.0, 0.0 /* up is in postivie Y direction */ ); - glRotatef(40.0, 1.0, 0.0, 0.0); + glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward /* Reposition the light source 0. */ lightPosition0[0] = 12*cos(lightAngle0); @@ -354,7 +417,7 @@ void display() { glPushMatrix(); /* Perform scene rotations based on user mouse/keyboard input. */ - glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0); + glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0); glTranslatef(camx, camy, camz); glRotatef(keyrot, 1.0, 0.0, 0.0); @@ -363,33 +426,63 @@ void display() { drawFloor(); - // 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); // The teapot does not obey the right-hand rule - glutSolidTeapot(1); - glFrontFace(GL_CCW); - glPopMatrix(); + // Draw sceneObjs array + for ( int i = 0; i < nObjects; i++ ) { + glPushMatrix(); + SceneObject so = sceneObjs[i]; + + // Apply translation vector + glTranslatef(so.x, so.y, so.z); + + // Apply independant rotation vectors + glRotatef(so.rotation.x, 1.0, 0.0, 0.0); + glRotatef(so.rotation.y, 0.0, 1.0, 0.0); + glRotatef(so.rotation.z, 0.0, 0.0, 1.0); + + // Apply scaling vector + glScalef(so.scale[0], so.scale[1], so.scale[2]); + + // Apply texture + if ( so.texture.id > 0 ) { + getTexture(so.texture.id); + glBindTexture(GL_TEXTURE_2D, so.texture.id); + glMatrixMode(GL_TEXTURE); + glScalef(so.texture.scale, so.texture.scale, so.texture.scale); + glMatrixMode(GL_MODELVIEW); + } else { + glBindTexture(GL_TEXTURE_2D, 0); + } + + // Draw actual object + if ( so.mesh > 0 ) { + // drawMesh(); + } else if ( so.mesh == -1 ) { // a mesh of -1 draws the teapot + // The teapot does not obey the right-hand rule + glFrontFace(GL_CW); + glutSolidTeapot(1); + glFrontFace(GL_CCW); + } + + glBindTexture(GL_TEXTURE_2D, 0); + glPopMatrix(); + } + + // Draw a white ball over the light sources + glDisable(GL_LIGHTING); + glColor3f(1.0, 1.0, 1.0); - // Draw a white ball over the light source glPushMatrix(); - glDisable(GL_LIGHTING); - 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(); + glEnable(GL_LIGHTING); + drawAxisLines(); glPopMatrix(); @@ -406,26 +499,14 @@ void init() { glLightfv(GL_LIGHT0, GL_SPECULAR, specular0); glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0); - //glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0); - glLighti(GL_LIGHT0, GL_SPOT_EXPONENT,100); - 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); - glLighti(GL_LIGHT1, GL_SPOT_EXPONENT,100); - 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, emission); - //glMaterialf(GL_FRONT, GL_SHININESS, shine); - glEnable(GL_LIGHT0); glEnable(GL_LIGHT1); glEnable(GL_LIGHTING); @@ -453,8 +534,8 @@ int main(int argc, char **argv) { glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH); - glutInitWindowSize(500, 500); - glutCreateWindow("Scene Editor"); + glutInitWindowSize(width, height); + glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)"); glShadeModel(GL_SMOOTH); // Enables Smooth Shading glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background @@ -462,8 +543,6 @@ int main(int argc, char **argv) { glDepthRange(0,1); glEnable(GL_DEPTH_TEST); // Enables Depth Testing glDepthFunc(GL_LEQUAL); // the type - glEnable(GL_TEXTURE_2D); - //glEnable(GL_CULL_FACE); glEnable(GL_NORMALIZE); glLineWidth(2.0);