# HG changeset patch
# User Yutaka_Kinjyo <yutaka@cr.ie.u-ryukyu.ac.jp>
# Date 1327152319 -32400
# Node ID f97bb81a034f52a2532f4117630dba33bb94b862
# Parent  7afeb56ba212444239498d2af6e907761d56ea71# Parent  66ae94572433f4a11571af17f5d4e15e4b6fa3fb
merge

diff -r 66ae94572433 -r f97bb81a034f Renderer/Engine/SceneGraphRoot.cc
--- 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;
-
 }
 
 
diff -r 66ae94572433 -r f97bb81a034f Renderer/Test/ball_bound.cc
--- 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)