git.ucc.asn.au
/
atyndall
/
cits2231.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[atyndall/cits2231.git]
/
scene.c
diff --git
a/scene.c
b/scene.c
index
c650c05
..
ad7e4bf
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-1,6
+1,6
@@
/**
\r
* CITS2231 Graphics Scene Editor
\r
/**
\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
\r
#include <stdlib.h>
\r
@@
-111,6
+111,7
@@
void processLightEvents(int id) {
*/
\r
void processObjectEvents(int id) {
\r
addSceneObject(id);
\r
*/
\r
void processObjectEvents(int id) {
\r
addSceneObject(id);
\r
+ manipulateState = STATE_OBJECT_POSITION_SCALE;
\r
glutPostRedisplay();
\r
}
\r
\r
glutPostRedisplay();
\r
}
\r
\r
@@
-298,21
+299,29
@@
void motion(int x, int y) {
break;
\r
\r
case STATE_OBJECT_POSITION_SCALE:
\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
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
} else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
\r
// w: big/small, h: up/down
\r
+ float scaling = (y - starty)*bigsmallFactor;
\r
+ printf("Scaling by %f on all axii\n", scaling);
\r
+ sceneObjs[curObject].scale[0] += scaling;
\r
+ sceneObjs[curObject].scale[1] += scaling;
\r
+ sceneObjs[curObject].scale[2] += scaling;
\r
}
\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
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
} 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
}
\r
break;
\r
\r
UCC
git Repository :: git.ucc.asn.au