Mercurial > hg > Members > kono > Cerium
changeset 328:bd3690d8cd7c
merge
| author | aaa |
|---|---|
| date | Fri, 12 Jun 2009 02:15:06 +0900 |
| parents | e299bd5e6c85 (diff) 7c6d4b101956 (current diff) |
| children | 7839cb3e928f |
| files | TaskManager/Test/test_render/Camera.cpp TaskManager/Test/test_render/Func.h TaskManager/Test/test_render/show_time.cpp TaskManager/Test/test_render/task/ShowTime.cpp TaskManager/Test/test_render/task/task_init.cpp |
| diffstat | 5 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/Camera.cpp Fri Jun 12 02:07:06 2009 +0900 +++ b/TaskManager/Test/test_render/Camera.cpp Fri Jun 12 02:15:06 2009 +0900 @@ -166,7 +166,6 @@ m_view[ 5] = cy[1]; m_view[ 6] = cz[1]; m_view[ 7] = 0.0f; - m_view[ 8] = cx[2]; m_view[ 9] = cy[2]; m_view[10] = cz[2];
--- a/TaskManager/Test/test_render/Func.h Fri Jun 12 02:07:06 2009 +0900 +++ b/TaskManager/Test/test_render/Func.h Fri Jun 12 02:15:06 2009 +0900 @@ -20,5 +20,6 @@ TASK_DRAW_BACK, TASK_SET_TEXTURE, TASK_DUMMY, + SHOW_TIME, };
--- a/TaskManager/Test/test_render/show_time.cpp Fri Jun 12 02:07:06 2009 +0900 +++ b/TaskManager/Test/test_render/show_time.cpp Fri Jun 12 02:15:06 2009 +0900 @@ -5,5 +5,11 @@ void show_time() { - printf("これは実戦ではない、訓練だ！\n"); + HTaskPtr show; + + show = manager->create_task(SHOW_TIME); + show->set_cpu(SPE_ANY); + show->spawn(); + printf("testですよ\n"); + }
--- a/TaskManager/Test/test_render/task/ShowTime.cpp Fri Jun 12 02:07:06 2009 +0900 +++ b/TaskManager/Test/test_render/task/ShowTime.cpp Fri Jun 12 02:15:06 2009 +0900 @@ -10,5 +10,7 @@ * ここで show_dma_wait() を呼びたい */ printf("Show Time !\n"); + + return 0; }
--- a/TaskManager/Test/test_render/task/task_init.cpp Fri Jun 12 02:07:06 2009 +0900 +++ b/TaskManager/Test/test_render/task/task_init.cpp Fri Jun 12 02:15:06 2009 +0900 @@ -38,6 +38,5 @@ SchedRegisterTask(TASK_SET_TEXTURE, SetTexture); SchedRegisterTask(TASK_DUMMY, Dummy); - SchedRegisterTask(SHOW_TIME, ShowTime); }