Mercurial > hg > Game > Cerium
diff TaskManager/Test/test_render/viewer.cpp @ 267:943c2ebe4483 draft
merge 172 264
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Wed, 03 Jun 2009 23:58:22 +0900 |
| parents | 5a4f2497c22d 8c9cae96404b |
| children | 2b7d631695ca |
line wrap: on
line diff
--- a/TaskManager/Test/test_render/viewer.cpp Thu Dec 11 12:04:14 2008 +0900 +++ b/TaskManager/Test/test_render/viewer.cpp Wed Jun 03 23:58:22 2009 +0900 @@ -321,7 +321,17 @@ } else { // Draw Background (現在は塗りつぶし) task_draw = manager->create_task(TASK_DRAW_BACK); +<<<<<<< local task_draw->add_param(0xffffffff); +======= +<<<<<<< local + task_draw->add_param(0xffffff); +======= + //task_draw->add_param(0x00ffcc55); + task_draw->add_param(0); +//task_draw->add_param(st_rgb); +>>>>>>> other +>>>>>>> other } for (int k = 0; k < rangey; k++) {