/**\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
* @param id ID of object selected\r
*/\r
void processObjectEvents(int id) {\r
- // **NOTE: For the testing phase, only have the teapot\r
addSceneObject(id);\r
+ manipulateState = STATE_OBJECT_POSITION_SCALE;\r
glutPostRedisplay();\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
+ glutPostRedisplay();\r
+ }\r
}\r
\r
/**\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("Texture", textureMenu);\r
glutAddSubMenu("Ground texture", gTextureMenu);\r
//glutAddSubMenu("Lights", lightMenu);\r
glutAddMenuEntry("Exit", M_EXIT);\r
* @param y Mouse y position\r
*/\r
void mouse(int button, int state, int x, int y) {\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
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
- rotate += (x - startx);\r
+ // w: rotate\r
+ rotate += diffx;\r
\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
- // w: rotate, h: zoom\r
- zoom += (y - starty);\r
+ // h: zoom\r
+ zoom += diffy;\r
} else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
- // w: rotate, h: tilt\r
- camAngle += (y - starty);\r
+ // h: tilt\r
+ camAngle += diffy;\r
}\r
-\r
- starty = y;\r
- startx = x;\r
-\r
break;\r
\r
case STATE_OBJECT_POSITION_SCALE:\r
- //SceneObject co = sceneObjs[curObject];\r
\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
// w: left/right, h: near/far\r
- \r
+\r
+ // **NOTE: Currently a work in progress, does not work correctly\r
+ printf("cam angle: %f\n", rotate*camRotateFactor);\r
+ // float arc = arctan()\r
+ sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);\r
+ sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);\r
+\r
} else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
- // w: big/small, h: up/down\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
\r
case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
+\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
- // w: rotate on width, h: rotate on h\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 & h, rotate on h\r
+ // w: rotate on x\r
+ sceneObjs[curObject].rotation.x += diffx * rotateFactor;\r
+\r
+ // h: texture scale\r
+ float max = (float)height/texscaleFactor;\r
+ float scaling = (diffy + max) / max;\r
+ sceneObjs[curObject].texture.scale *= scaling;\r
+\r
}\r
+ \r
break;\r
\r
}\r
\r
+ starty = y;\r
+ startx = x;\r
+\r
glutPostRedisplay();\r
}\r
\r
0.0, 10.0, 0.0 /* up is in postivie Y direction */\r
);\r
\r
- glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0);\r
+ glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward\r
\r
/* Reposition the light source 0. */\r
lightPosition0[0] = 12*cos(lightAngle0);\r
glPushMatrix();\r
\r
/* Perform scene rotations based on user mouse/keyboard input. */\r
- glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);\r
+ glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);\r
glTranslatef(camx, camy, camz);\r
glRotatef(keyrot, 1.0, 0.0, 0.0);\r
\r
drawFloor();\r
\r
// Draw sceneObjs array\r
- glPushMatrix();\r
- for ( int i = 0; i < nObjects; i++ ) {\r
+ for ( int i = 0; i < nObjects; i++ ) {\r
+ glPushMatrix();\r
SceneObject so = sceneObjs[i];\r
\r
- // Apply rotation vector\r
- vector* rv = so.rotation.vect;\r
- printf("%f, %f, %f\n", *rv[0], *rv[1], *rv[2]);\r
- /* glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);\r
-\r
- // Apply scaling vector\r
- vector* sv = so.scale;\r
- glScalef(*sv[0], *sv[1], *sv[2]);\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 > 0 ) {\r
- getTexture(so.texture);\r
- glBindTexture(GL_TEXTURE_2D, so.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
\r
// Draw actual object\r
if ( so.mesh > 0 ) {\r
}\r
\r
glBindTexture(GL_TEXTURE_2D, 0);\r
- }\r
- glPopMatrix();\r
+ glPopMatrix();\r
+ }\r
+\r
+ // Draw a white ball over the light sources\r
+ glDisable(GL_LIGHTING);\r
+ glColor3f(1.0, 1.0, 1.0);\r
\r
- // Draw a white ball over the light source\r
glPushMatrix();\r
- glDisable(GL_LIGHTING);\r
- glColor3f(1.0, 1.0, 1.0);\r
glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);\r
glutSolidSphere(0.5, 50, 50);\r
- glEnable(GL_LIGHTING);\r
glPopMatrix();\r
\r
- // Draw a white ball over the light source\r
glPushMatrix();\r
- glDisable(GL_LIGHTING);\r
- glColor3f(1.0, 1.0, 1.0);\r
glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);\r
glutSolidSphere(0.5, 50, 50);\r
- glEnable(GL_LIGHTING);\r
glPopMatrix();\r
\r
+ glEnable(GL_LIGHTING);\r
+\r
drawAxisLines();\r
\r
glPopMatrix();\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
git.ucc.asn.au / atyndall / cits2231.git / blobdiff
UCC git Repository :: git.ucc.asn.au