Mercurial > hg > Game > Cerium
diff TaskManager/Test/test_render/viewer.cc @ 435:7705fa2025da draft
ChainCal task fix
| author | game@henri.cr.ie.u-ryukyu.ac.jp |
|---|---|
| date | Thu, 24 Sep 2009 22:35:46 +0900 |
| parents | b40a9b901d71 |
| children | efe8584a7b5a |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/viewer.cc Thu Sep 24 20:44:11 2009 +0900 +++ b/TaskManager/Test/test_render/viewer.cc Thu Sep 24 22:35:46 2009 +0900 @@ -108,7 +108,6 @@ void Viewer::run_init(TaskManager *manager, const char *xml, int sg_number) { - Application application; this->manager = manager; start_time = get_ticks(); @@ -165,7 +164,7 @@ case 16: //chain_init(manager, this->width, this-> height); application = new Chain(); - application->chain_init(manager, this->width, this->height); + application->init(manager, this->width, this->height); speInit(); return; break; @@ -311,14 +310,17 @@ update_key->spawn(); /* TASK_MOVE は外から引数で取ってくるべき */ - //HTaskPtr move_task = viewer->manager->create_task(viewer->move_taskid); - HTaskPtr move_task = viewer->manager->create_task(TASK_MOVE); - move_task->add_param(sgroot_2); + //HTaskPtr move_task = viewer->manager->create_task(viewer->move_taskid); + HTaskPtr move_task = viewer->manager->create_task(application->move_taskid); + move_task->add_inData(application->propertyPtr, application->property_size); + move_task->add_outData(application->propertyPtr, application->property_size); + + HTaskPtr sg_update_task = viewer->manager->create_task(TASK_SG_UPDATE); HTaskPtr draw_task = viewer->manager->create_task(TASK_DRAW); move_task->add_param(sgroot); - HTaskPtr switch_task = viewer->manager->create_task(TASK_SWITCH); + HTaskPtr switch_task = viewer->manager->create_task( TASK_SWITCH); switch_task->wait_for(move_task); switch_task->wait_for(draw_task);