/**\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
*/\r
void processObjectEvents(int id) {\r
addSceneObject(id);\r
+ manipulateState = STATE_OBJECT_POSITION_SCALE;\r
glutPostRedisplay();\r
}\r
\r
break;\r
\r
case STATE_OBJECT_POSITION_SCALE:\r
- //SceneObject co = sceneObjs[curObject];\r
-\r
+ //so.x, so.y, so.z\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
// w: left/right, h: near/far\r
- \r
+ //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
} else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
// w: big/small, h: up/down\r
+\r
+ // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
+ float diff = (x - startx);\r
+ float scaling = ( diff + (float)height/2 ) / ( (float)height/2 ) * bigsmallFactor;\r
+\r
+ sceneObjs[curObject].scale[0] *= scaling;\r
+ sceneObjs[curObject].scale[1] *= scaling;\r
+ sceneObjs[curObject].scale[2] *= scaling;\r
+ printf("Diff is %f, Scaling by %f on all axii, 1/map is %f\n", diff, sceneObjs[curObject].scale[0], scaling);\r
}\r
+\r
+ startx = x;\r
break;\r
\r
case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
// w: rotate on width, h: rotate on h\r
+\r
} else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
- // w & h, rotate on h\r
+ // w: rotate on height, h: texture scale\r
+ \r
}\r
break;\r
\r