diff Renderer/Engine/viewer.cc @ 614:4e44147d78ee

remove uncessary Task Name definision
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Sat, 14 Nov 2009 18:21:14 +0900
parents 42c94f85c779
children f7d78b3c1106
line wrap: on
line diff
--- a/Renderer/Engine/viewer.cc	Thu Nov 12 17:06:49 2009 +0900
+++ b/Renderer/Engine/viewer.cc	Sat Nov 14 18:21:14 2009 +0900
@@ -146,10 +146,10 @@
         spackList[i-1].init(i*split_screen_h);
     }
 
-    task_next = manager->create_task(TASK_DUMMY);
+    task_next = manager->create_task(Dummy);
     
     for (int i = 0; i < spe_num; i++) {
-        task_tex = manager->create_task(TASK_INIT_TEXTURE);
+        task_tex = manager->create_task(LoadTexture);
         /*
          * ここはもう少しわかりやすい使い方がいいかもしれぬ。こんなもん?
 		 */
@@ -167,7 +167,7 @@
 {
     HTaskPtr task_next = initLoop();
     // key の情報を格納する領域を確保する (global_alloc(KEY_STATUS))
-    HTaskPtr init_key_task = manager->create_task(INIT_KEY_TASK);
+    HTaskPtr init_key_task = manager->create_task(InitKey);
 	init_key_task->set_cpu(SPE_0);
     init_key_task->spawn();
     
@@ -182,7 +182,7 @@
 
     /* test */
    
-    HTaskPtr task_switch = manager->create_task(TASK_SWITCH);
+    HTaskPtr task_switch = manager->create_task(Switch);
     task_switch->wait_for(task_next);
     task_switch->set_post(post2runMoveDrawLoop, (void*)this, 0);
     task_switch->spawn();
@@ -239,27 +239,27 @@
     Viewer *viewer = (Viewer*)viewer_;
     
     // 同じ PPE 上なので sgroot(ポインタ) を add_param で送る。 
-    //HTaskPtr send_key_task = viewer->manager->create_task(SEND_KEY);
+    //HTaskPtr send_key_task = viewer->manager->create_task(SendKey);
     //send_key_task->add_param((int)sgroot);
     // set input data -> viewer keyPtr
     viewer->getKey();
-    HTaskPtr update_key = viewer->manager->create_task(UPDATE_KEY);
+    HTaskPtr update_key = viewer->manager->create_task(UpdateKey);
     update_key->add_inData(viewer->keyPtr, sizeof(key_stat));
     update_key->set_cpu(SPE_0);
     update_key->spawn();
     
     /* TASK_MOVE は外から引数で取ってくるべき */
     //HTaskPtr move_task = viewer->manager->create_task(viewer->app->move_taskid);    
-    HTaskPtr move_task = viewer->manager->create_task(TASK_MOVE);
+    HTaskPtr move_task = viewer->manager->create_task(Move);
     //move_task->add_param(sgroot);
 
-    //HTaskPtr draw_task = viewer->manager->create_task(TASK_DRAW);
+    //HTaskPtr draw_task = viewer->manager->create_task(Draw);
 
     /* rendering task test */
-    HTaskPtr draw_task = viewer->manager->create_task(TASK_DUMMY);
-    HTaskPtr draw_dummy = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr draw_task = viewer->manager->create_task(Dummy);
+    HTaskPtr draw_dummy = viewer->manager->create_task(Dummy);
 
-    HTaskPtr switch_task = viewer->manager->create_task(TASK_SWITCH);
+    HTaskPtr switch_task = viewer->manager->create_task(Switch);
     viewer->draw_dummy = draw_dummy;
     switch_task->wait_for(draw_dummy);
     draw_task->set_post(post2speRendering, (void*)viewer, 0);
@@ -279,7 +279,7 @@
 post2speRunLoop(void *viewer_)
 {
     Viewer *viewer = (Viewer *)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->run_move(task_next);
 }
 #endif
@@ -298,7 +298,7 @@
 post2runMove(void *viewer_)
 {
     Viewer *viewer = (Viewer*)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->run_move(task_next);
 }
 #endif
@@ -320,7 +320,7 @@
 post2rendering(SchedTask *s, void *viewer_, void *arg)
 {
     Viewer *viewer = (Viewer *)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->rendering(task_next);
 }
 
@@ -341,7 +341,7 @@
 post2runLoop(SchedTask *s, void *viewer_, void *arg)
 {
     Viewer *viewer = (Viewer*)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->run_loop(task_next);
 
     psx_sync_n();
@@ -377,7 +377,7 @@
 post2runDraw(SchedTask *s, void *viewer_, void *arg)
 {
     Viewer *viewer = (Viewer*)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->run_draw(task_next);
 
 }
@@ -410,7 +410,7 @@
 post2speRendering(SchedTask *s, void *viewer_, void *arg)
 {
     Viewer *viewer = (Viewer*)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->spe_rendering(task_next);
 }
 
@@ -429,7 +429,7 @@
 post2speDraw(SchedTask *s, void *viewer_, void *arg)
 {
     Viewer *viewer = (Viewer*)viewer_;
-    HTaskPtr task_next = viewer->manager->create_task(TASK_DUMMY);
+    HTaskPtr task_next = viewer->manager->create_task(Dummy);
     viewer->spe_draw(task_next);
 }
 
@@ -448,7 +448,7 @@
 void
 Viewer::common_rendering(HTaskPtr task_next)
 {
-    HTaskPtr task_create_pp = manager->create_task(TASK_CREATE_PP2);
+    HTaskPtr task_create_pp = manager->create_task(CreatePolygonFromSceneGraph);
     
     // SceneGraph(木構造) -> PolygonPack
 
@@ -466,7 +466,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(CreateSpan);
         task_create_sp->add_inData(ppack, sizeof(PolygonPack));
         task_create_sp->add_inData(spackList_ptr,
                                    sizeof(SpanPack*)*spackList_length_align);
@@ -501,7 +501,7 @@
 {
     HTaskPtr task_draw;
 
-    //task_next = manager->create_task(TASK_DUMMY);
+    //task_next = manager->create_task(Dummy);
     //task_next->set_post(post2runLoop, (void*)this);
 
     ppack->clear();
@@ -518,7 +518,7 @@
         while (startx < this->width) {
             if (spack->info.size > 0) {
                 // Draw SpanPack
-                task_draw = manager->create_task(TASK_DRAW_SPAN);
+                task_draw = manager->create_task(DrawSpan);
                 task_draw->add_inData(spack, sizeof(SpanPack));
 
                 task_draw->add_param(