Mercurial > hg > Game > Cerium

comparison TaskManager/Test/test_render/viewer.cpp @ 269:abf96b4caee5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:01:11 +0900
parents e9735a64cd90 2b7d631695ca
children 237a75ab7a9b
comparison
equal deleted inserted replaced
246:4a0300aa4a1b 269:abf96b4caee5
334 } else { 334 } else {
335 #if 0 335 #if 0
336 //break; 336 //break;
337 // Draw Background (現在は塗りつぶし) 337 // Draw Background (現在は塗りつぶし)
338 task_draw = manager->create_task(TASK_DRAW_BACK); 338 task_draw = manager->create_task(TASK_DRAW_BACK);
339 <<<<<<< local
339 task_draw->add_param(0xffffffff); 340 task_draw->add_param(0xffffffff);
341 <<<<<<< local
340 342
341 for (int k = 0; k < rangey; k++) { 343 for (int k = 0; k < rangey; k++) {
342 task_draw->add_outData( 344 task_draw->add_outData(
343 &pixels[(startx-1)+this->width*(k+starty-1)], 345 &pixels[(startx-1)+this->width*(k+starty-1)],
344 (endx - startx + 1)*sizeof(int)); 346 (endx - startx + 1)*sizeof(int));
348 0, (this->width)*sizeof(int)*rangey); 350 0, (this->width)*sizeof(int)*rangey);
349 //wmemset((wchar_t*)&pixels[(startx-1)+this->width*(starty-1)], 351 //wmemset((wchar_t*)&pixels[(startx-1)+this->width*(starty-1)],
350 //0xFFFFFFFF, (this->width)*sizeof(int)*rangey/sizeof(wchar_t)); 352 //0xFFFFFFFF, (this->width)*sizeof(int)*rangey/sizeof(wchar_t));
351 break; 353 break;
352 #endif 354 #endif
355 =======
356 =======
357 <<<<<<< local
358 task_draw->add_param(0xffffff);
359 =======
360 //task_draw->add_param(0x00ffcc55);
361 task_draw->add_param(0);
362 //task_draw->add_param(st_rgb);
363 >>>>>>> other
364 >>>>>>> other
365 }
366
367 for (int k = 0; k < rangey; k++) {
368 task_draw->add_outData(
369 &pixels[(startx-1)+this->width*(k+starty-1)],
370 (endx - startx + 1)*sizeof(int));
371 >>>>>>> other
353 } 372 }
354 373
355 task_draw->add_param(startx); 374 task_draw->add_param(startx);
356 task_draw->add_param(endx); 375 task_draw->add_param(endx);
357 task_draw->add_param(rangey); 376 task_draw->add_param(rangey);