Mercurial > hg > Members > tkaito > task_dandy

diff stage_init.cc @ 27:34fde39c0a31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit test.
author koba <koba@cr.ie.u-ryukyu.ac.jp>
date Fri, 10 Dec 2010 02:57:29 +0900
parents 6bea374ee604 a131729d6e4d
children
line wrap: on
line diff
--- a/stage_init.cc	Fri Dec 10 02:20:37 2010 +0900
+++ b/stage_init.cc	Fri Dec 10 02:57:29 2010 +0900
@@ -33,9 +33,9 @@
 }
 
 HTaskPtr
-pad_free(Viewer *sgroot)
+pad_free(SceneGraphRoot *sgroot)
 {
-    HTaskPtr task = sgroot->manager->create_task(PAD_FREE);
+    HTaskPtr task = sgroot->tmanager->create_task(PAD_FREE);
 
     task->set_param(0, PAD_INPUT);
     task->set_cpu(SPE_ANY);
@@ -67,10 +67,11 @@
     SceneGraphPtr root = sgroot->createSceneGraph();
 
     SceneGraphPtr title = (SceneGraphPtr)charactor[0].root;
+    title->set_move_collision(title_move);
     charactor[0].x = w/2;
     charactor[0].y = h/2;
-    charactor[0].vx = 0.0;
-    charactor[0].vy = 0.0;
+    charactor[0].vx = 1.0;
+    charactor[0].vy = 1.0;
     charactor[0].flag = 0;
     charactor[0].parent = (void*)root;
 
@@ -79,7 +80,6 @@
     title->set_move_collision(title_move);
 
     pad_alloc(sgroot);
-
     root->addChild(title);
     sgroot->setSceneData(root);
 }