X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=99ccfa0b902ca7fdbc6102addaf2b1708302d733;hp=2410cd1229d4485727a927b6093a3ffc4a2edf0b;hb=97f14d98d0a9bee56fdaebcea092dba1925c9552;hpb=c5b6444706db82ca82d0b86cce1ef976172ec621 diff --git a/scene.c b/scene.c index 2410cd1..99ccfa0 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,8 +110,9 @@ void processLightEvents(int id) { * @param id ID of object selected */ void processObjectEvents(int id) { - // **NOTE: For the testing phase, only have the teapot addSceneObject(id); + manipulateState = STATE_OBJECT_POSITION_SCALE; + glutPostRedisplay(); } /** @@ -122,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(); + } } /** @@ -165,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); @@ -198,6 +199,9 @@ 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 && 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: @@ -280,44 +284,76 @@ void keyboard(unsigned char key, int x, int y) { void motion(int x, int y) { if ( buttonSelected == -1 ) return; // No button selected, no action + float diffx = x - startx; + float diffy = y - starty; + switch ( manipulateState ) { case STATE_CAMERA_ROTATE_MOVE: - rotate += (x - startx); + // w: rotate + rotate += diffx; if ( buttonSelected == GLUT_LEFT_BUTTON ) { - // w: rotate, h: zoom - zoom += (y - starty); + // h: zoom + zoom += diffy; } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { - // w: rotate, h: tilt - camAngle += (y - starty); + // h: tilt + camAngle += diffy; } - - starty = y; - startx = x; - break; case STATE_OBJECT_POSITION_SCALE: - //SceneObject co = sceneObjs[curObject]; if ( buttonSelected == GLUT_LEFT_BUTTON ) { // w: left/right, h: near/far - + + // **NOTE: Currently a work in progress, does not work correctly + printf("cam angle: %f\n", rotate*camRotateFactor); + // float arc = arctan() + sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor); + sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor); + } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) { - // w: big/small, h: up/down + // 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 width, h: rotate on h + // 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 & h, rotate on h + // 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(); } @@ -354,7 +390,7 @@ void display() { 0.0, 10.0, 0.0 /* up is in postivie Y direction */ ); - glRotatef(camAngle*camAngleFactor, 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); @@ -377,7 +413,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); @@ -387,27 +423,29 @@ void display() { drawFloor(); // Draw sceneObjs array - glPushMatrix(); - for ( int i = 0; i < nObjects; i++ ) { + for ( int i = 0; i < nObjects; i++ ) { + glPushMatrix(); SceneObject so = sceneObjs[i]; - // Apply rotation vector - vector* rv = so.rotation.vect; - glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]); - - // Apply scaling vector - vector* sv = so.scale; - glScalef(*sv[0], *sv[1], *sv[2]); - // 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 > 0 ) { - getTexture(so.texture); - glBindTexture(GL_TEXTURE_2D, so.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 { - getTexture(0); glBindTexture(GL_TEXTURE_2D, 0); } @@ -422,27 +460,25 @@ void display() { } glBindTexture(GL_TEXTURE_2D, 0); - } - glPopMatrix(); + 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(); @@ -494,8 +530,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