git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f58aed9
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 04:56:03 +0000
(12:56 +0800)
committer
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 04:56:03 +0000
(12:56 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
f4b4343
..
99ccfa0
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-308,6
+308,7
@@
void motion(int x, int y) {
\r
// **NOTE: Currently a work in progress, does not work correctly
\r
printf("cam angle: %f\n", rotate*camRotateFactor);
\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
sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);
\r
sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);
\r
\r
@@
-328,8
+329,6
@@
void motion(int x, int y) {
\r
case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
\r
\r
\r
case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
\r
\r
- // FML DOES NOT ROTATE PROPERLY
\r
-
\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {
\r
// w: rotate on y
\r
sceneObjs[curObject].rotation.y += diffx * rotateFactor;
\r
if ( buttonSelected == GLUT_LEFT_BUTTON ) {
\r
// w: rotate on y
\r
sceneObjs[curObject].rotation.y += diffx * rotateFactor;
\r
UCC
git Repository :: git.ucc.asn.au