Mercurial > hg > Members > kono > Cerium
diff TaskManager/Test/test_render/viewer.cpp @ 264:a59868d37093
merge 151 263
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 03 Jun 2009 23:57:38 +0900 |
| parents | bbf774c57544 a802b19ab9ae |
| children | d949e590da26 |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/viewer.cpp Tue Dec 02 19:14:52 2008 +0900 +++ b/TaskManager/Test/test_render/viewer.cpp Wed Jun 03 23:57:38 2009 +0900 @@ -349,7 +349,13 @@ } else { // Draw Background (現在は塗りつぶし) task_draw = manager->create_task(TASK_DRAW_BACK); +<<<<<<< local task_draw->add_param(0xffffff); +======= + //task_draw->add_param(0x00ffcc55); + task_draw->add_param(0); +//task_draw->add_param(st_rgb); +>>>>>>> other } for (int k = 0; k < rangey; k++) {