/**\r
* CITS2231 Graphics Scene Editor\r
- * @author Ashley Tyndall (20915779)\r
+ * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932)\r
*/\r
\r
#include <stdlib.h>\r
void processMainEvents(int id) {\r
switch (id) {\r
case M_ROTATE_MOVE_CAMERA:\r
- // Do stuff\r
+ manipulateState = STATE_CAMERA_ROTATE_MOVE;\r
break;\r
-\r
case M_POSITION_SCALE:\r
- // Do stuff\r
+ manipulateState = STATE_OBJECT_POSITION_SCALE;\r
break;\r
-\r
case M_ROTATION_TEXTURE_SCALE:\r
- // Do stuff\r
+ manipulateState = STATE_OBJECT_ROTATION_TEXTURE_SCALE;\r
break;\r
-\r
case M_EXIT:\r
exit(EXIT_SUCCESS);\r
\r
void processLightEvents(int id) {\r
switch (id) {\r
case M_LIGHT_MOVE_LIGHT_1:\r
- // Do stuff\r
+ manipulateState = STATE_LIGHT_1_MOVE;\r
break;\r
\r
case M_LIGHT_RGBALL_LIGHT_1:\r
break;\r
\r
case M_LIGHT_MOVE_LIGHT_2:\r
- // Do stuff\r
+ manipulateState = STATE_LIGHT_2_MOVE;\r
break;\r
\r
case M_LIGHT_RGBALL_LIGHT_2:\r
* @param id ID of object selected\r
*/\r
void processObjectEvents(int id) {\r
-\r
+ addSceneObject(id);\r
+ manipulateState = STATE_OBJECT_POSITION_SCALE;\r
+ glutPostRedisplay();\r
}\r
\r
/**\r
* @param id ID of texutre selected\r
*/\r
void processTextureEvents(int id) {\r
-\r
+ if ( curObject >= 0 ) {\r
+ sceneObjs[curObject].texture.id = id;\r
+ sceneObjs[curObject].texture.scale = 1;\r
+ glutPostRedisplay();\r
+ }\r
}\r
\r
/**\r
* @param id ID of ground texture selected\r
*/\r
void processGTextureEvents(int id) {\r
-\r
+ currentGroundTexture = id;\r
+ glutPostRedisplay();\r
}\r
\r
/**\r
// Construct light menu\r
int lightMenu = glutCreateMenu(processLightEvents);\r
glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);\r
- glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);\r
+ //glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);\r
glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);\r
- glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r
+ //glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);\r
\r
// Construct object menu\r
int objectMenu = makeSubmenuFromArray( objectMenuEntries, NMESH, processObjectEvents );\r
\r
// Construct main menu\r
glutCreateMenu(processMainEvents);\r
- //glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);\r
- //glutAddSubMenu("Add object", objectMenu);\r
- //glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
- //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
+ glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);\r
+ glutAddSubMenu("Add object", objectMenu);\r
+ glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
+ glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
//glutAddSubMenu("Material", materialMenu);\r
- //glutAddSubMenu("Texture", textureMenu);\r
- //glutAddSubMenu("Ground texture", gTextureMenu);\r
- //glutAddSubMenu("Lights", lightMenu);\r
+ glutAddSubMenu("Texture", textureMenu);\r
+ glutAddSubMenu("Ground texture", gTextureMenu);\r
+ glutAddSubMenu("Lights", lightMenu);\r
glutAddMenuEntry("Exit", M_EXIT);\r
\r
// Bind to right mouse button\r
* @param y Mouse y position\r
*/\r
void mouse(int button, int state, int x, int y) {\r
- if (button == GLUT_LEFT_BUTTON) {\r
- if (state == GLUT_DOWN) {\r
- moving = 1;\r
+ if ( button == GLUT_LEFT_BUTTON && glutGetModifiers() == GLUT_ACTIVE_SHIFT ) {\r
+ button = GLUT_MIDDLE_BUTTON; // Holding shift with left button is the same as the middle button\r
+ }\r
+ switch(button) {\r
+ case GLUT_LEFT_BUTTON:\r
+ case GLUT_MIDDLE_BUTTON:\r
+ if ( state == GLUT_DOWN ) {\r
+ buttonSelected = button;\r
+ } else if ( state == GLUT_UP ) {\r
+ buttonSelected = -1;\r
+ }\r
startx = x;\r
starty = y;\r
- }\r
- if (state == GLUT_UP) {\r
- moving = 0;\r
- }\r
+ break;\r
}\r
}\r
\r
/**\r
- * Keybord event handler\r
- * w/s increase/decrease the z\r
- * a/d increase/decrease the x\r
- * q/e increase/decrease the y\r
- * z/x increase/decrease the angle\r
- * @param key Key pressed\r
- * @param x x co-ordinate of mouse\r
- * @param y y co-ordinate of mouse\r
+ * Called when motion event occurs\r
+ * @param x Mouse x position\r
+ * @param y Mouse y position\r
*/\r
-void keyboard(unsigned char key, int x, int y) {\r
- switch(key) {\r
- case 'w':\r
- case 'W':\r
- camz -= factor;\r
- break;\r
- case 'a':\r
- case 'A':\r
- camx -= factor;\r
- break;\r
- case 's':\r
- case 'S':\r
- camz += factor;\r
- break;\r
- case 'd':\r
- case 'D':\r
- camx += factor;\r
- break;\r
- case 'q':\r
- case 'Q':\r
- camy += factor;\r
- break;\r
- case 'e':\r
- case 'E':\r
- camy -= factor;\r
- break;\r
- case 'z':\r
- case 'Z':\r
- keyrot += factor;\r
+void motion(int x, int y) {\r
+ if ( buttonSelected == -1 ) return; // No button selected, no action\r
+\r
+ float diffx = x - startx;\r
+ float diffy = y - starty;\r
+\r
+ switch ( manipulateState ) {\r
+ case STATE_CAMERA_ROTATE_MOVE:\r
+ // w: rotate\r
+ rotate += diffx;\r
+\r
+ if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
+ // h: zoom\r
+ zoom += diffy;\r
+ } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+ // h: tilt\r
+ camAngle += diffy;\r
+ }\r
break;\r
- case 'x':\r
- case 'X':\r
- keyrot -= factor;\r
+\r
+ case STATE_OBJECT_POSITION_SCALE:\r
+\r
+ if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
+ // w: left/right, h: near/far\r
+ float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
+ sceneObjs[curObject].x += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;\r
+ sceneObjs[curObject].z += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;\r
+\r
+ } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+ // w: big/small\r
+ float max = (float)height/bigsmallFactor;\r
+ float scaling = (diffx + max) / max;\r
+\r
+ sceneObjs[curObject].scale[0] *= scaling;\r
+ sceneObjs[curObject].scale[1] *= scaling;\r
+ sceneObjs[curObject].scale[2] *= scaling;\r
+\r
+ // h: up/down\r
+ sceneObjs[curObject].y -= diffy * updownFactor;\r
+ }\r
+\r
break;\r
- case '=':\r
- case '+':\r
- factor += 0.1;\r
- printf("Factor of change is now %f\n", factor);\r
+\r
+ case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
+\r
+ if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
+ // w: rotate on y\r
+ sceneObjs[curObject].rotation.y += diffx * rotateFactor;\r
+\r
+ // h: rotate on x\r
+ sceneObjs[curObject].rotation.x += diffy * rotateFactor;\r
+\r
+ } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+ // w: rotate on x\r
+ sceneObjs[curObject].rotation.x += diffx * rotateFactor;\r
+\r
+ // h: texture scale\r
+ // **NOTE: Seems to be problem with scaling, delayed action\r
+ float max = (float)height/texscaleFactor;\r
+ float scaling = (-diffy + max) / max;\r
+ sceneObjs[curObject].texture.scale *= scaling;\r
+\r
+ }\r
+ \r
break;\r
- case '-':\r
- case '_':\r
- factor -= 0.1;\r
- printf("Factor of change is now %f\n", factor);\r
+\r
+ case STATE_LIGHT_1_MOVE:\r
+ case STATE_LIGHT_2_MOVE:\r
+ ; // Semi-colon required to allow variable declaration below\r
+ \r
+ int i = 0;\r
+ if ( manipulateState == STATE_LIGHT_2_MOVE ) i = 1;\r
+\r
+ if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
+ // w: left/right, h: near/far\r
+ float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );\r
+ lightObjs[i].position[0] += diffx * cos(angler) * lleftrightFactor + diffy * cos(M_PI/2 + angler) * lnearfarFactor;\r
+ lightObjs[i].position[2] += diffx * sin(angler) * lleftrightFactor + diffy * sin(M_PI/2 + angler) * lnearfarFactor;\r
+\r
+ } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
+ // w: increase/decrease some light param\r
+ // **NOTE: Currently not implemented\r
+\r
+ // h: up/down\r
+ lightObjs[i].position[1] -= diffy * updownFactor;\r
+ }\r
+\r
break;\r
\r
}\r
- printf("Camera is now at (%f, %f, %f), angle %f\n", camx, camy, camz, keyrot);\r
- glutPostRedisplay();\r
-}\r
\r
-/**\r
- * Called when motion event occurs\r
- * @param x Mouse x position\r
- * @param y Mouse y position\r
- */\r
-void motion(int x, int y) {\r
- if (moving) {\r
- zoom += (y - starty);\r
- rotate += (x - startx);\r
- startx = x;\r
- starty = y;\r
- glutPostRedisplay();\r
- }\r
- if (lightMoving) {\r
- lightAngle += (x - lightStartX)/40.0;\r
- lightHeight += (lightStartY - y)/20.0;\r
- lightStartX = x;\r
- lightStartY = y;\r
- glutPostRedisplay();\r
- }\r
+ starty = y;\r
+ startx = x;\r
+\r
+ glutPostRedisplay();\r
}\r
\r
/**\r
}\r
\r
gluPerspective(\r
- 60.0,\r
+ 75.0,\r
aspect,\r
0.1,\r
- 200\r
+ 300\r
);\r
\r
glMatrixMode(GL_MODELVIEW);\r
0.0, 10.0, 0.0 /* up is in postivie Y direction */\r
);\r
\r
- glRotatef(50.0, 1.0, 0.0, 0.0);\r
-\r
- /* Reposition the light source. */\r
- lightPosition[0] = 12*cos(lightAngle);\r
- lightPosition[1] = lightHeight;\r
- lightPosition[2] = 12*sin(lightAngle);\r
- lightPosition[3] = 0.0;\r
+ glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward\r
\r
glPushMatrix();\r
\r
- /* Perform scene rotations based on user mouse/keyboard input. */\r
- glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);\r
- glTranslatef(camx, camy, camz);\r
- glRotatef(keyrot, 1.0, 0.0, 0.0);\r
-\r
- glLightfv(GL_LIGHT0, GL_POSITION, lightPosition);\r
+ /* Perform scene rotations based on user mouse input. */\r
+ glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);\r
\r
drawFloor();\r
-\r
- drawLine();\r
\r
- // Draw teapot for a test object\r
- glPushMatrix();\r
- glTranslatef(0.0, 0.5, 0.0); // **NOTE: Teapot currently does not rest on surface\r
- glColor3f(0.0, 0.0, 0.0);\r
- glFrontFace(GL_CW);\r
- glutSolidTeapot(1);\r
- glFrontFace(GL_CCW);\r
- glPopMatrix();\r
-\r
- // Draw a white ball over the light source\r
- glPushMatrix();\r
- glDisable(GL_LIGHTING);\r
- glColor3f(1.0, 1.0, 0.0);\r
- glTranslatef(lightPosition[0], lightPosition[1], lightPosition[2]);\r
- glutSolidSphere(1.0, 50, 50);\r
- glEnable(GL_LIGHTING);\r
- glPopMatrix();\r
-\r
- glPopMatrix();\r
-\r
- glutSwapBuffers();\r
-}\r
-\r
-/**\r
- * init function; sets initial OpenGL state\r
- */\r
-void init() {\r
- glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);\r
- glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);\r
- glLightfv(GL_LIGHT0, GL_SPECULAR, specular0);\r
- glLightfv(GL_LIGHT0, GL_SPOT_DIRECTION, direction0);\r
+ // Draw sceneObjs array\r
+ for ( int i = 0; i < nObjects; i++ ) {\r
+ glPushMatrix();\r
+ SceneObject so = sceneObjs[i];\r
+\r
+ // Apply translation vector\r
+ glTranslatef(so.x, so.y, so.z);\r
+\r
+ // Apply independant rotation vectors\r
+ glRotatef(so.rotation.x, 1.0, 0.0, 0.0);\r
+ glRotatef(so.rotation.y, 0.0, 1.0, 0.0);\r
+ glRotatef(so.rotation.z, 0.0, 0.0, 1.0);\r
+\r
+ // Apply scaling vector\r
+ glScalef(so.scale[0], so.scale[1], so.scale[2]);\r
+\r
+ // Apply texture\r
+ if ( so.texture.id > 0 ) {\r
+ getTexture(so.texture.id);\r
+ glBindTexture(GL_TEXTURE_2D, so.texture.id);\r
+ glMatrixMode(GL_TEXTURE);\r
+ glScalef(so.texture.scale, so.texture.scale, so.texture.scale);\r
+ glMatrixMode(GL_MODELVIEW);\r
+ } else {\r
+ glBindTexture(GL_TEXTURE_2D, 0);\r
+ }\r
+\r
+ // Draw actual object\r
+ if ( so.mesh > 0 ) {\r
+ // drawMesh();\r
+ } else if ( so.mesh == -1 ) { // a mesh of -1 draws the teapot\r
+ // The teapot does not obey the right-hand rule\r
+ glFrontFace(GL_CW);\r
+ glutSolidTeapot(1);\r
+ glFrontFace(GL_CCW);\r
+ }\r
+\r
+ glBindTexture(GL_TEXTURE_2D, 0);\r
+ glPopMatrix();\r
+ }\r
\r
- glLightf(GL_LIGHT0, GL_SPOT_CUTOFF, 90.0);\r
+ updateLights();\r
\r
- glLightModelfv(GL_LIGHT_MODEL_AMBIENT, glightmodel);\r
+ drawAxisLines();\r
\r
- glMaterialfv(GL_FRONT, GL_AMBIENT, ambient);\r
- glMaterialfv(GL_FRONT, GL_DIFFUSE, diffuse);\r
- glMaterialfv(GL_FRONT, GL_SPECULAR, specular);\r
- glMaterialfv(GL_FRONT, GL_EMISSION, emission0);\r
- glMaterialf(GL_FRONT, GL_SHININESS, shine);\r
+ glPopMatrix();\r
\r
- glEnable(GL_LIGHT0);\r
- glEnable(GL_LIGHTING);\r
+ glutSwapBuffers();\r
}\r
\r
/**\r
\r
glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);\r
\r
- glutInitWindowSize(500, 500);\r
- glutCreateWindow("Scene Editor");\r
+ glutInitWindowSize(width, height);\r
+ glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)");\r
\r
glShadeModel(GL_SMOOTH); // Enables Smooth Shading\r
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background\r
glDepthRange(0,1);\r
glEnable(GL_DEPTH_TEST); // Enables Depth Testing\r
glDepthFunc(GL_LEQUAL); // the type\r
- glEnable(GL_TEXTURE_2D);\r
- glEnable(GL_CULL_FACE);\r
- glEnable(GL_NORMALIZE);\r
- glLineWidth(2.0);\r
+ //glEnable(GL_CULL_FACE);\r
+ glLineWidth(1.0);\r
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);\r
\r
glutReshapeFunc(windowReshape);\r
glutDisplayFunc(display);\r
glutMouseFunc(mouse);\r
- glutKeyboardFunc(keyboard);\r
glutMotionFunc(motion);\r
\r
makeMenu();\r
-\r
- init();\r
+ initializeLights();\r
+ initializeState();\r
\r
glutMainLoop();\r
}
\ No newline at end of file
git.ucc.asn.au / atyndall / cits2231.git / blobdiff
UCC git Repository :: git.ucc.asn.au