# HG changeset patch # User Yutaka_Kinjyo # Date 1327152291 -32400 # Node ID 7afeb56ba212444239498d2af6e907761d56ea71 # Parent 6e388be03bb1fb16c618e064d708f2b7d5d5643d old API compatible diff -r 6e388be03bb1 -r 7afeb56ba212 Renderer/Engine/SceneGraphRoot.cc --- a/Renderer/Engine/SceneGraphRoot.cc Fri Jan 20 16:50:30 2012 +0900 +++ b/Renderer/Engine/SceneGraphRoot.cc Sat Jan 21 22:24:51 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; - } diff -r 6e388be03bb1 -r 7afeb56ba212 Renderer/Test/ball_bound.cc --- a/Renderer/Test/ball_bound.cc Fri Jan 20 16:50:30 2012 +0900 +++ b/Renderer/Test/ball_bound.cc Sat Jan 21 22:24:51 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)