Members/kono/Cerium: Renderer/Engine/viewer.cc comparison

comparison Renderer/Engine/viewer.cc @ 1034:a0faa0cfc271

merge.

author	koba <koba@cr.ie.u-ryukyu.ac.jp>
date	Fri, 26 Nov 2010 04:35:34 +0900
parents	431936c0cc96 3191cae6f7a2
children	ff0e6d00c060

comparison

equal deleted inserted replaced

-:431936c0cc96
+:a0faa0cfc271
 }
 }
-void
+/* flag_drawable な Scenegraph の総数を求める */
-create_pp_task(SceneGraphPtr sg, TaskManager *manager, int spe_num, HTaskPtr task_next)
+int
-{
+sg_drawable_num(SceneGraphPtr scenegraph)
+{
-MatrixListInfo *matrix_info = (MatrixListInfo*)manager->allocate(sizeof(MatrixListInfo));
+SceneGraphPtr sg = scenegraph;
-collect_matrix(sg, matrix_info, manager);
+int sg_count = 0;
+while (sg) {
-//HTaskPtr phase_wait = manager->create_task(Dummy);
+if (sg->flag_drawable) {
+sg_count++;
-for (MatrixListInfo* t = matrix_info; t != NULL; t = t->next) {
+}
+if (sg->children != NULL) {
-printf("list_length %d \n", t->list_length);
+sg = sg->children;
+} else if (sg->brother != NULL) {
-int alloc_size = 16*1024;
+sg = sg->brother;
+} else {
-if (t->coord_pack_size < alloc_size) {
+while (sg) {
-alloc_size = t->coord_pack_size;
+	if (sg->brother != NULL) {
-}
+	  sg = sg->brother;
+	  break;
+	} else {
-int division_num = (t->coord_pack_size + alloc_size - 1) / alloc_size;
+	  if (sg->parent == NULL) {
-int phase_num = (division_num + spe_num -1) / spe_num;
+	    sg = NULL;
-int cur_point = 0;
+	    break;
+	  } else {
-for (int i = 0; i < phase_num; i++) {
+	    sg = sg->parent;
+	  }
+	}
+}
+}
+}
+return sg_count;
+}
+void
+create_pp_task(SceneGraphPtr sg, TaskManager *manager, int spe_num, HTaskPtr task_next, SceneGraphRootPtr sgroot)
+{
+/*
+* SceneGraph を辿って coord_xyz, coord_tex, normal, matrix, real_matrix 及び、
+* PolygonPack の TrianglePack (空) を送る。pp->info.size の計算もここで。
+*
+*/
+int sg_num = sg_drawable_num(sg);
+int sg_division = sg_num / spe_num;
+int residue = sg_num % spe_num;
+HTask **task_array = (HTask**)manager->allocate(sizeof(HTask*)*spe_num);
+Task **pptask = (Task**)manager->allocate(sizeof(Task*)*spe_num);
+for (int k = 0; k < spe_num-1; k++) {
+task_array[k] = manager->create_task_array(CreatePolygonFromSceneGraph,sg_division,4,6,1);
+pptask[k] = 0;
+}
+task_array[spe_num] = manager->create_task_array(CreatePolygonFromSceneGraph,
+						   sg_division+residue,4,6,1);
+pptask[spe_num] = 0;
+int k = 0;
+while (sg) {
+if (sg->flag_drawable) {
+if(k < spe_num * sg_division) {
+	k %= spe_num-1;
+} else {
+	k = spe_num;
+}
+pptask[k] = task_array[k]->next_task_array(CreatePolygonFromSceneGraph,pptask[k]);
+pptask[k]->set_inData(0, &sg->coord_xyz, sizeof(float)*sg->size/3);
+pptask[k]->set_inData(1, &sg->coord_tex, sizeof(float)*sg->size/3);
+pptask[k]->set_inData(2, &sg->normal   , sizeof(float)*sg->size/3);
+pptask[k]->set_inData(3, &sg->matrix   , sizeof(float)*12);
+pptask[k]->set_inData(4, &sg->real_matrix, sizeof(float)*8);
+pptask[k]->set_inData(5, &sg->texture_info.pixels, sizeof(uint32));
+pptask[k]->set_param(0,(memaddr)sg->size);
+pptask[k]->set_param(1,(memaddr)sg->texture_info.t_w);
+pptask[k]->set_param(2,(memaddr)sg->texture_info.t_h);
+pptask[k]->set_param(3,(memaddr)sg->texture_info.scale_max);
-HTaskPtr alloc_wait = manager->create_task(Dummy);
+}
-coord_allocate(cur_point, t->coord_pack, spe_num,
+if (sg->children != NULL) {
-		     alloc_size, alloc_wait, manager);
+sg = sg->children;
+} else if (sg->brother != NULL) {
+sg = sg->brother;
-for (MatrixList* u = t->first; u != NULL; u = u->next) {
+} else {
+while (sg) {
-	//HTaskPtr free_wait = manager->create_task(Dummy);
+	if (sg->brother != NULL) {
+	  sg = sg->brother;
-	//phase_wait = manager->create_task(Dummy);
+	  break;
+	} else {
+	  if (sg->parent == NULL) {
+	    sg = NULL;
+	    break;
+	  } else {
+	    sg = sg->parent;
+	  }
+	}
 }
+}
-coord_free(spe_num, manager, alloc_wait);
+k++;
-alloc_wait->spawn();
-}
 }
+for (int k = 0; k < spe_num; k++) {
-printf("-----------------------\n");
+task_array[k]->spawn_task_array(pptask[k]->next());
-//return create_pp_wait;
+task_array[k]->set_cpu(SPE_ANY);
+task_array[k]->spawn();
+if (sgroot->gtask_array != NULL) {
+HTaskPtr game_task_array = sgroot->gtask_array->get_task_array();
+task_array[k]->wait_for(game_task_array);
+}
+task_next->wait_for(task_array[k]);
+}
 }
 void
 Viewer::common_rendering(HTaskPtr task_next, SceneGraphRoot *sgroot)
 {
 #if SPE_CREATE_POLYGON
 SceneGraphPtr sg = sgroot->getDrawSceneGraph();
-create_pp_task(sg, manager, spe_num, task_next);
+create_pp_task(sg, manager, spe_num, task_next, sgroot);
 #if SPE_CREATE_POLYGON_CHECK
 check_matrix(matrix_info,sg);
 #endif
 #else
+//SceneGraphPtr sg = sgroot->getDrawSceneGraph();
+//printf("sg->size = %lld\n", sg->size);
 HTaskPtr task_create_pp = manager->create_task(CreatePolygonFromSceneGraph);
 // SceneGraph(木構造) -> PolygonPack
 task_create_pp->set_param(0,(memaddr)sgroot->getDrawSceneGraph());
 task_create_pp->set_param(1,(memaddr)r[ppi].ppack);
 /* GameTask の処理の終了を待ってからポリゴンを作る */
 if (sgroot->gtask_array != NULL) {
 	HTaskPtr game_task_array = sgroot->gtask_array->get_task_array();
 	task_create_pp->wait_for(game_task_array);
 }
 task_next->wait_for(task_create_pp);
 #endif
 int  range_base = spe_num;

Mercurial > hg > Members > kono > Cerium

comparison Renderer/Engine/viewer.cc @ 1034:a0faa0cfc271