Mercurial > hg > Game > Cerium

comparison TaskManager/Test/test_render/viewer.cpp @ 266:8c9cae96404b draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge 151 263
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 03 Jun 2009 23:57:38 +0900
parents 3f467ad8c40d 08e47bbca4f5
children 943c2ebe4483
comparison
equal deleted inserted replaced
151:9d16c8047312 266:8c9cae96404b
347 task_draw = manager->create_task(TASK_DRAW_SPAN); 347 task_draw = manager->create_task(TASK_DRAW_SPAN);
348 task_draw->add_inData(spack, sizeof(SpanPack)); 348 task_draw->add_inData(spack, sizeof(SpanPack));
349 } else { 349 } else {
350 // Draw Background (現在は塗りつぶし) 350 // Draw Background (現在は塗りつぶし)
351 task_draw = manager->create_task(TASK_DRAW_BACK); 351 task_draw = manager->create_task(TASK_DRAW_BACK);
352 <<<<<<< local
352 task_draw->add_param(0xffffff); 353 task_draw->add_param(0xffffff);
354 =======
355 //task_draw->add_param(0x00ffcc55);
356 task_draw->add_param(0);
357 //task_draw->add_param(st_rgb);
358 >>>>>>> other
353 } 359 }
354 360
355 for (int k = 0; k < rangey; k++) { 361 for (int k = 0; k < rangey; k++) {
356 task_draw->add_outData( 362 task_draw->add_outData(
357 &pixels[(startx-1)+this->width*(k+start_y-1)], 363 &pixels[(startx-1)+this->width*(k+start_y-1)],