diff TaskManager/Test/test_render/viewer.cc @ 450:baefa979bb31 draft

KeyStat fixed...
author kazz@henri.cr.ie.u-ryukyu.ac.jp
date Fri, 25 Sep 2009 22:04:17 +0900
parents 0bed2a9889f5
children 574be19530a5
line wrap: on
line diff
--- a/TaskManager/Test/test_render/viewer.cc	Fri Sep 25 18:06:01 2009 +0900
+++ b/TaskManager/Test/test_render/viewer.cc	Fri Sep 25 22:04:17 2009 +0900
@@ -121,54 +121,54 @@
     switch (sg_number) {
     case 0:
     case 1:
-	create_cube_split(manager, sg_number);
+		create_cube_split(manager, sg_number);
         break;
     case 2:
     case 3:
     case 4:
-	panel_init(manager, sg_number);
+		panel_init(manager, sg_number);
         break;
     case 5:
-	universe_init(manager);
+		universe_init(manager);
         break;
     case 6:
-	ieshoot_init(manager);
+		ieshoot_init(manager);
         break;
     case 7:
-	ball_bound_init(manager, this->width, this->height);
+		ball_bound_init(manager, this->width, this->height);
         break;
     case 8:
-	lcube_init(manager, this->width, this->height);
+		lcube_init(manager, this->width, this->height);
         break;
     case 9:
-	direction_init(manager);
+		direction_init(manager);
         break;
     case 10:
-	init_position(manager, this->width, this->height);
+		init_position(manager, this->width, this->height);
         break;
     case 11:
         //        vacuum_init(manager, this->width, this->height);
         break;
     case 12:
-	untitled_init(manager);
+		untitled_init(manager);
         break;
     case 13:
-	boss1_init(manager, this->width, this->height);
+		boss1_init(manager, this->width, this->height);
         break;
     case 14:
-	init_gaplant(manager, this->width, this->height);
+		init_gaplant(manager, this->width, this->height);
         break;
     case 15:
-	vacuum_init2(manager, this->width, this->height);
+		vacuum_init2(manager, this->width, this->height);
         break;
     case 16:
         chain_init(manager, this->width, this-> height);
-	speLoop();
-	return;
+		speLoop();
+		return;
         break;
     case 17:
         chain_old_init(manager, this->width, this-> height);
-	break;
+		break;
     default:
         node_init(manager);
         break;
@@ -220,7 +220,7 @@
         task_tex = manager->create_task(TASK_INIT_TEXTURE);
         /*
          * ここはもう少しわかりやすい使い方がいいかもしれぬ。こんなもん?
-        */
+		 */
         task_tex->set_cpu((CPU_TYPE)((int)SPE_0 + i));
         task_next->wait_for(task_tex);
         task_tex->spawn();
@@ -236,6 +236,7 @@
     HTaskPtr task_next = initLoop();
     // key の情報を格納する領域を確保する (global_alloc(KEY_STATUS))
     HTaskPtr init_key_task = manager->create_task(INIT_KEY_TASK);
+	init_key_task->set_cpu(SPE_0);
     init_key_task->spawn();
     
     // SPE に送信する KEY_STATUS の領域確保
@@ -260,43 +261,43 @@
 {
     Pad *pad = sgroot->getController();
     if (pad->right.isHold()) {
-	keyPtr->right = HOLD;
+		keyPtr->right = HOLD;
     } else if (pad->right.isPush()) {
-	keyPtr->right = PUSH;
+		keyPtr->right = PUSH;
     } else {
-	keyPtr->right = NONE;
+		keyPtr->right = NONE;
     }
     
     if (pad->left.isHold()) {
-	keyPtr->left = HOLD;
+		keyPtr->left = HOLD;
     } else if (pad->left.isPush()) {
-	keyPtr->left = PUSH;
+		keyPtr->left = PUSH;
     } else {
-	keyPtr->left = NONE;
+		keyPtr->left = NONE;
     }
 
     if (pad->up.isHold()) {
-	keyPtr->up = HOLD;
+		keyPtr->up = HOLD;
     } else if (pad->up.isPush()) {
-	keyPtr->up = PUSH;
+		keyPtr->up = PUSH;
     } else {
-	keyPtr->up = NONE;
+		keyPtr->up = NONE;
     }
 
     if (pad->down.isHold()) {
-	keyPtr->down = HOLD;
+		keyPtr->down = HOLD;
     } else if (pad->down.isPush()) {
-	keyPtr->down = PUSH;
+		keyPtr->down = PUSH;
     } else {
-	keyPtr->down = NONE;
+		keyPtr->down = NONE;
     }
 
     if (pad->circle.isHold()) {
-	keyPtr->circle = HOLD;
+		keyPtr->circle = HOLD;
     } else if (pad->circle.isPush()) {
-	keyPtr->circle = PUSH;
+		keyPtr->circle = PUSH;
     } else {
-	keyPtr->circle = NONE;
+		keyPtr->circle = NONE;
     }
 }
 
@@ -312,6 +313,7 @@
     viewer->getKey();
     HTaskPtr update_key = viewer->manager->create_task(UPDATE_KEY);
     update_key->add_inData(viewer->keyPtr, sizeof(key_stat));
+	update_key->set_cpu(SPE_0);
     update_key->spawn();
 
     /* TASK_MOVE は外から引数で取ってくるべき */
@@ -391,7 +393,7 @@
         int index_end = (index_start + range >= spackList_length)
             ? spackList_length : index_start + range;
 
-	HTaskPtr task_create_sp = manager->create_task(TASK_CREATE_SPAN);
+		HTaskPtr task_create_sp = manager->create_task(TASK_CREATE_SPAN);
         task_create_sp->add_inData(ppack, sizeof(PolygonPack));
         task_create_sp->add_inData(spackList_ptr,
                                    sizeof(SpanPack*)*spackList_length_align);
@@ -503,7 +505,7 @@
             } else {
                 memset(&pixels[(startx-1)+this->width*(starty-1)],
                        0, (this->width)*sizeof(int)*rangey);
-		break;
+				break;
             }
 
             task_draw->add_param(startx);