Mercurial > hg > Game > Cerium
changeset 1373:f97bb81a034f draft
merge
| author | Yutaka_Kinjyo <yutaka@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Sat, 21 Jan 2012 22:25:19 +0900 |
| parents | 7afeb56ba212 (diff) 66ae94572433 (current diff) |
| children | 75d5eededecb |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Engine/SceneGraphRoot.cc Sat Jan 21 13:44:48 2012 +0900 +++ b/Renderer/Engine/SceneGraphRoot.cc Sat Jan 21 22:25:19 2012 +0900 @@ -1076,7 +1076,8 @@ // どこかで、オブジェクトの状態は保持してないといけない。 // なので、c->matrix でもつ。 - matrix4x4(c->out_matrix, c->matrix, cur_parent->out_matrix); + //matrix4x4(c->out_matrix, c->matrix, cur_parent->out_matrix); + get_matrix(c->out_matrix, c->angle, c->xyz, cur_parent->out_matrix); } @@ -1107,7 +1108,6 @@ removeMatrix(mlist); delete mlist; - }
--- a/Renderer/Test/ball_bound.cc Sat Jan 21 13:44:48 2012 +0900 +++ b/Renderer/Test/ball_bound.cc Sat Jan 21 22:25:19 2012 +0900 @@ -31,9 +31,9 @@ if (pad->circle.isHold()) { if (pad->left.isHold()) { - node->xyz[0] -= speed; + node->xyz[0] -= speed; if(node->xyz[0] < ball_radius) - node->xyz[0] = ball_radius; + node->xyz[0] = ball_radius; } else if (pad->right.isHold()) { node->xyz[0] += speed; if(node->xyz[0] > screen_w - ball_radius)