Mercurial > hg > Game > Cerium
comparison TaskManager/Test/test_render/viewer.cpp @ 268:2b7d631695ca draft
merge
| author | Shinji KONO <kono@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Thu, 04 Jun 2009 00:00:09 +0900 |
| parents | e3b7776b1420 943c2ebe4483 |
| children | abf96b4caee5 |
comparison
equal
deleted
inserted
replaced
| 183:90dcdc080e9d | 268:2b7d631695ca |
|---|---|
| 337 task_draw->add_inData(zRow, | 337 task_draw->add_inData(zRow, |
| 338 sizeof(float)*(endx-startx+1)*rangey); | 338 sizeof(float)*(endx-startx+1)*rangey); |
| 339 } else { | 339 } else { |
| 340 // Draw Background (現在は塗りつぶし) | 340 // Draw Background (現在は塗りつぶし) |
| 341 task_draw = manager->create_task(TASK_DRAW_BACK); | 341 task_draw = manager->create_task(TASK_DRAW_BACK); |
| 342 <<<<<<< local | |
| 342 task_draw->add_param(0xffffffff); | 343 task_draw->add_param(0xffffffff); |
| 344 ======= | |
| 345 <<<<<<< local | |
| 346 task_draw->add_param(0xffffff); | |
| 347 ======= | |
| 348 //task_draw->add_param(0x00ffcc55); | |
| 349 task_draw->add_param(0); | |
| 350 //task_draw->add_param(st_rgb); | |
| 351 >>>>>>> other | |
| 352 >>>>>>> other | |
| 343 } | 353 } |
| 344 | 354 |
| 345 for (int k = 0; k < rangey; k++) { | 355 for (int k = 0; k < rangey; k++) { |
| 346 task_draw->add_outData( | 356 task_draw->add_outData( |
| 347 &pixels[(startx-1)+this->width*(k+starty-1)], | 357 &pixels[(startx-1)+this->width*(k+starty-1)], |