annotate Renderer/Engine/viewer.cc @ 792:f2497e0ecd7c

add light switch
author yutaka@localhost.localdomain
date Sun, 02 May 2010 04:17:34 +0900
parents 4455e7b0caf3
children c260205d3185
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
1 #include <SDL.h>
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
2 #include "viewer.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
3 #include "viewer_types.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
4 #include "SceneGraph.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
5 #include "SceneGraphRoot.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
6 #include "scene_graph_pack.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
7 #include "sys.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
8 #include "Func.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
9 #include "error.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
10 #include "TaskManager.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
11 #include <wchar.h>
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
12 #include "Pad.h"
511
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 510
diff changeset
13 #include "Application.h"
575
0f13810d4492 Linda API worked. (slightly unreliable)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 572
diff changeset
14 #include "lindaapi.h"
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
15 #include "global_alloc.h"
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
16
523
b273767962b8 half finish for Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 514
diff changeset
17 static void post2runLoop(SchedTask *s,void *viewer,void *s1);
b273767962b8 half finish for Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 514
diff changeset
18 static void post2runDraw(SchedTask *s,void *viewer,void *s1);
b273767962b8 half finish for Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 514
diff changeset
19 static void post2speRendering(SchedTask *s,void *viewer,void *s1);
b273767962b8 half finish for Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 514
diff changeset
20 static void post2speDraw(SchedTask *s,void *viewer,void *s1);
b273767962b8 half finish for Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 514
diff changeset
21 static void post2runMoveDrawLoop(SchedTask *s,void *viewer,void *s1);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
22
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
23 /* measure for FPS (Frame Per Second) */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
24 int start_time;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
25 int this_time;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
26 int frames;
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
27 // static void post2speRunLoop(void *viewer);
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
28 //static void post2runMove(void *viewer);
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
29 //static void post2exchange_sgroot(void *viewer);
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
30 //static void post2speRunLoop(void *viewer);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
31
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
32 //SceneGraphRootPtr sgroot_2;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
33
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
34 /* Data Pack sent to Other CPUs (ex. SPE) */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
35 SceneGraphPack *sgpack;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
36 PolygonPack *ppack;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
37 SpanPackPtr spackList;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
38 SpanPackPtr *spackList_ptr;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
39
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
40 int spackList_length;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
41 int spackList_length_align;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
42
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
43 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
44 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
45 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
46
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
47 Viewer::Viewer(TaskManager *m, ViewerDevice *vd, int b, int w, int h, int _num)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
48 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
49 bpp = b;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
50 width = w;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
51 height = h;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
52 spe_num = _num;
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
53 manager = m;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
54 dev = vd;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
55 pixels = dev->video_init(manager, b, w, h);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
56
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
57 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
58
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
59 int
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
60 Viewer::get_ticks(void)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
61 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
62 int time;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
63 time = SDL_GetTicks();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
64 return time;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
65 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
66
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
67 bool
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
68 Viewer::quit_check(void)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
69 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
70 SDL_Event event;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
71
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
72 while(SDL_PollEvent(&event)) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
73 if (event.type==SDL_QUIT) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
74 return true;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
75 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
76 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
77
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
78 Uint8 *keys=SDL_GetKeyState(NULL);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
79
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
80 if (keys[SDLK_q] == SDL_PRESSED) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
81 return true;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
82 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
83
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
84 return false;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
85 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
86
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
87 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
88 Viewer::quit(void)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
89 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
90 SDL_Quit();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
91 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
92
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
93
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
94 void
509
8148c81d2660 Cerium Rendering Library
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 507
diff changeset
95 Viewer::run_init(TaskManager *manager, Application *app)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
96 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
97 this->manager = manager;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
98
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
99 start_time = get_ticks();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
100 this_time = 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
101 frames = 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
102
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
103 if (spe_num == 0) spe_num = 1;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
104
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
105 sgroot = new SceneGraphRoot(this->width, this->height);
572
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 565
diff changeset
106 sgroot->tmanager = manager;
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
107
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
108
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
109 int light_num = 4;
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
110 int size = sizeof(float)*4*light_num; //xyz+alfa(4) * light_num(4)
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
111 int light_size = size / sizeof(float);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
112
760
24a37fe8419a first of all commit, not work Rendering/Test/create_task
hiroki
parents: 748
diff changeset
113 light_xyz_stock = (float *)manager->allocate(size);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
114 light_xyz = (float *)manager->allocate(size);
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
115
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
116
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
117 for (int i = 0; i < light_size ; i++) {
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
118 light_xyz[i] = 0.0f;
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
119 }
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
120
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
121 for(int i = 0; i < spe_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
122 HTaskPtr data_load = manager->create_task(DataLoad);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
123 data_load->set_param(0,(memaddr)size);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
124 data_load->set_param(1,(memaddr)Light);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
125 data_load->set_cpu((CPU_TYPE)((int)SPE_0 + i));
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
126 data_load->spawn();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
127 }
509
8148c81d2660 Cerium Rendering Library
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 507
diff changeset
128
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
129 size = light_num * sizeof(int);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
130 light_switch = (int*)manager->allocate(size);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
131 for (int i = 0; i < light_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
132 light_switch[i] = 0;
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
133 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
134
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
135 for(int i = 0; i < spe_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
136 HTaskPtr data_load = manager->create_task(DataLoad);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
137 data_load->set_param(0,(memaddr)size);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
138 data_load->set_param(1,(memaddr)LightSwitch);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
139 data_load->set_cpu((CPU_TYPE)((int)SPE_0 + i));
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
140 data_load->spawn();
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
141 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
142
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
143 size = 16; // LightSysSwitch は 4byte. 残り 12byte は DMA転送の為のパディング
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
144
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
145 for(int i = 0; i < spe_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
146 HTaskPtr data_load = manager->create_task(DataLoad);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
147 data_load->set_param(0,(memaddr)size);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
148 data_load->set_param(1,(memaddr)LightSysSwitch);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
149 data_load->set_cpu((CPU_TYPE)((int)SPE_0 + i));
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
150 data_load->spawn();
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
151 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
152
511
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 510
diff changeset
153 MainLoop *mainloop = app->init(this, this->width, this->height);
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 510
diff changeset
154 mainloop->mainLoop();
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
155 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
156
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
157
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
158 HTaskPtr
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
159 Viewer::initLoop()
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
160 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
161 HTaskPtr task_next;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
162 HTaskPtr task_tex;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
163
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
164 sgpack = (SceneGraphPack*)manager->allocate(sizeof(SceneGraphPack));
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
165 sgpack->init();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
166 ppack = (PolygonPack*)manager->allocate(sizeof(PolygonPack));
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
167
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
168 spackList_length = (this->height + split_screen_h - 1) / split_screen_h;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
169 spackList = (SpanPack*)manager->allocate(sizeof(SpanPack)*spackList_length);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
170
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
171 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
172 * SPU に送る address list は 16 バイト倍数でないといけない。
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
173 * spackList_length*sizeof(SpanPack*) が 16 バイト倍数になるような
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
174 * length_align を求めている。はみ出した部分は使われない
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
175 * (ex) spackList_length が 13 の場合
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
176 * spackList_length_align = 16;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
177 * 実際に送るデータは64バイトになるのでOK
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
178 * 14,15,16 の部分は何も入らない。
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
179 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
180 spackList_length_align = (spackList_length + 3)&(~3);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
181
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
182 /* 各 SPU が持つ、SpanPack の address list */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
183 spackList_ptr =
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
184 (SpanPack**)manager->allocate(sizeof(SpanPack*)*spackList_length_align);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
185
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
186 for (int i = 0; i < spackList_length; i++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
187 spackList_ptr[i] = &spackList[i];
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
188 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
189
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
190 for (int i = 1; i <= spackList_length; i++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
191 spackList[i-1].init(i*split_screen_h);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
192 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
193
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
194 task_next = manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
195
652
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
196 // ここは、Iterator を用意するべきだよね
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
197 for (int i = 0; i < spe_num; i++) {
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
198 task_tex = manager->create_task(LoadTexture);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
199 task_tex->set_cpu((CPU_TYPE)((int)SPE_0 + i));
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
200 task_next->wait_for(task_tex);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
201 task_tex->spawn();
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
202 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
203
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
204
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
205 return task_next;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
206 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
207
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
208
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
209 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
210 Viewer::getKey()
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
211 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
212 Pad *pad = sgroot->getController();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
213 if (pad->right.isHold()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
214 keyPtr->right = HOLD;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
215 } else if (pad->right.isPush()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
216 keyPtr->right = PUSH;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
217 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
218 keyPtr->right = NONE;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
219 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
220
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
221 if (pad->left.isHold()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
222 keyPtr->left = HOLD;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
223 } else if (pad->left.isPush()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
224 keyPtr->left = PUSH;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
225 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
226 keyPtr->left = NONE;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
227 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
228
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
229 if (pad->up.isHold()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
230 keyPtr->up = HOLD;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
231 } else if (pad->up.isPush()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
232 keyPtr->up = PUSH;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
233 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
234 keyPtr->up = NONE;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
235 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
236
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
237 if (pad->down.isHold()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
238 keyPtr->down = HOLD;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
239 } else if (pad->down.isPush()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
240 keyPtr->down = PUSH;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
241 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
242 keyPtr->down = NONE;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
243 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
244
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
245 if (pad->circle.isHold()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
246 keyPtr->circle = HOLD;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
247 } else if (pad->circle.isPush()) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
248 keyPtr->circle = PUSH;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
249 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
250 keyPtr->circle = NONE;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
251 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
252 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
253
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
254 static void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
255 post2runMoveDrawLoop(SchedTask *m, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
256 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
257 Viewer *viewer = (Viewer*)viewer_;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
258
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
259 // 同じ PPE 上なので sgroot(ポインタ) を set_param で送る。
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
260 //HTaskPtr send_key_task = viewer->manager->create_task(SendKey);
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
261 //send_key_task->set_param((int)sgroot);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
262 // set input data -> viewer keyPtr
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
263 viewer->getKey();
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
264 HTaskPtr update_key = viewer->manager->create_task(UpdateKey);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
265 update_key->add_inData(viewer->keyPtr, sizeof(key_stat));
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
266 //update_key->set_cpu(SPE_0);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
267 update_key->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
268
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
269 /* TASK_MOVE は外から引数で取ってくるべき */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
270 //HTaskPtr move_task = viewer->manager->create_task(viewer->app->move_taskid);
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
271 HTaskPtr move_task = viewer->manager->create_task(Move);
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
272 //move_task->set_param(sgroot);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
273
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
274 //HTaskPtr draw_task = viewer->manager->create_task(Draw);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
275
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
276 /* rendering task test */
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
277 HTaskPtr draw_task = viewer->manager->create_task(Dummy);
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
278 HTaskPtr draw_dummy = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
279
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
280 HTaskPtr switch_task = viewer->manager->create_task(Switch);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
281 viewer->draw_dummy = draw_dummy;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
282 switch_task->wait_for(draw_dummy);
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
283 draw_task->set_post(post2speRendering, (void*)viewer, 0);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
284
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
285 switch_task->wait_for(move_task);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
286 switch_task->wait_for(draw_task);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
287 move_task->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
288 draw_task->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
289
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
290 switch_task->set_post(post2runMoveDrawLoop, (void*)viewer, 0);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
291 switch_task->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
292
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
293 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
294
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
295 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
296 Viewer::mainLoop()
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
297 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
298 HTaskPtr task_next = initLoop();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
299
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
300 task_next->set_post(&post2runLoop, (void *)this, 0); // set_post(function(this->run_loop()), NULL)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
301 task_next->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
302 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
303
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
304 void
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
305 Viewer::run_loop(HTaskPtr task_next)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
306 {
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
307 dev->clear_screen();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
308
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
309 bool quit_flg;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
310 quit_flg = quit_check();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
311 if (quit_flg == true) {
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
312 this_time = get_ticks();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
313 run_finish();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
314 return;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
315 }
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
316
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
317 dev->clean_pixels();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
318
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
319 for (int i = 1; i <= spackList_length; i++) {
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
320 spackList[i-1].reinit(i*split_screen_h);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
321 }
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
322
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
323 sgroot->updateControllerState();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
324 sgroot->allExecute(width, height);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
325 light_xyz_stock = sgroot->getLightVector();
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
326 light_switch_stock = sgroot->getLightSwitch();
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
327 //sgroot->checkRemove();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
328
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
329 // ここから下は Rendering という関数にする
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
330 rendering(task_next);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
331 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
332
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
333
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
334
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
335 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
336 Viewer::run_collision()
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
337 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
338 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
339
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
340 void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
341 post2rendering(SchedTask *s, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
342 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
343 Viewer *viewer = (Viewer *)viewer_;
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
344 HTaskPtr task_next = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
345 viewer->rendering(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
346 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
347
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
348 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
349 Viewer::rendering(HTaskPtr task_next)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
350 {
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
351 common_rendering(task_next, sgroot);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
352
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
353 // Barrier 同期
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
354 // run_draw() を呼ぶ post2runDraw
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
355 task_next->set_post(post2runDraw, (void*)this, 0); // set_post(function(this->run_draw()), NULL)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
356 task_next->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
357
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
358 // TASK_CREATE_SPAN が全て終わったら DUMMY_TASK が Viewer::run_draw() を呼ぶ
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
359 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
360
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
361 static void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
362 post2runLoop(SchedTask *s, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
363 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
364 Viewer *viewer = (Viewer*)viewer_;
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
365 HTaskPtr task_next = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
366 viewer->run_loop(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
367
575
0f13810d4492 Linda API worked. (slightly unreliable)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 572
diff changeset
368 psx_sync_n();
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
369 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
370
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
371 static void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
372 post2runDraw(SchedTask *s, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
373 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
374 Viewer *viewer = (Viewer*)viewer_;
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
375 HTaskPtr task_next = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
376 viewer->run_draw(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
377
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
378 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
379
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
380 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
381 Viewer::run_draw(HTaskPtr task_next) // 引数に post2runLoop を入れるようにする
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
382 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
383 common_draw(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
384
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
385 task_next->set_post(post2runLoop, (void*)this, 0); // set_post(function(this->run_loop()), NULL)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
386 task_next->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
387 // TASK_DRAW_SPAN が全て終わったら DUMMY_TASK が Viewer::run_loop() を呼ぶ
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
388
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
389 frames++;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
390 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
391
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
392
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
393 static void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
394 post2speRendering(SchedTask *s, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
395 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
396 Viewer *viewer = (Viewer*)viewer_;
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
397 HTaskPtr task_next = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
398 viewer->spe_rendering(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
399 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
400
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
401 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
402 Viewer::spe_rendering(HTaskPtr task_next)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
403 {
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
404 common_rendering(task_next, sgroot);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
405
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
406 this->draw_dummy->wait_for(task_next);
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
407 task_next->set_post(post2speDraw, (void*)this, 0);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
408 task_next->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
409
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
410 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
411
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
412 static void
514
2659376067e8 old ball_bound fix...
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 511
diff changeset
413 post2speDraw(SchedTask *s, void *viewer_, void *arg)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
414 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
415 Viewer *viewer = (Viewer*)viewer_;
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
416 HTaskPtr task_next = viewer->manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
417 viewer->spe_draw(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
418 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
419
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
420 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
421 Viewer::spe_draw(HTaskPtr task_next)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
422 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
423 common_draw(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
424
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
425 this->draw_dummy->wait_for(task_next);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
426 task_next->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
427 this->draw_dummy->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
428
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
429 frames++;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
430 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
431
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
432 void
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
433 Viewer::common_rendering(HTaskPtr task_next, SceneGraphRoot *sgroot)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
434 {
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
435 HTaskPtr task_create_pp = manager->create_task(CreatePolygonFromSceneGraph);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
436
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
437 // SceneGraph(木構造) -> PolygonPack
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
438
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
439 task_create_pp->set_param(0,(memaddr)sgroot->getDrawSceneGraph());
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
440 task_create_pp->set_param(1,(memaddr)ppack);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
441
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
442 task_next->wait_for(task_create_pp);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
443
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
444 int range_base = spe_num;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
445
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
446 // 切り上げのつもり
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
447 int range = (spackList_length + range_base - 1) / range_base;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
448
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
449 for (int i = 0; i < range_base; i++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
450 int index_start = range*i;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
451 int index_end = (index_start + range >= spackList_length)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
452 ? spackList_length : index_start + range;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
453
652
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
454 HTaskPtr task_create_sp = manager->create_task(CreateSpan);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
455
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
456 task_create_sp->set_param(0,index_start);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
457
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
458 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
459 * ex. screen_height が 480, spenum が 6 の場合、各SPEのy担当範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
460 * [ 1.. 80] [ 81..160] [161..240]
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
461 * [241..320] [321..400] [401..480]
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
462 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
463 * ex. screen_height が 1080, spenum が 5 の場合、
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
464 * [ 1..216] [217..432] [433..648]
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
465 * [649..864] [865..1080]
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
466 */
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
467
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
468 task_create_sp->set_param(1,index_start*split_screen_h + 1);
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
469 task_create_sp->set_param(2,index_end*split_screen_h);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
470
652
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
471 task_create_sp->add_inData(ppack, sizeof(PolygonPack));
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
472 task_create_sp->add_inData(spackList_ptr,
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
473 sizeof(SpanPack*)*spackList_length_align);
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
474 task_create_sp->add_inData(&spackList[index_start], sizeof(SpanPack));
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
475
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
476 task_next->wait_for(task_create_sp);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
477 task_create_sp->wait_for(task_create_pp);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
478
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
479 task_create_sp->set_cpu(SPE_ANY);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
480 task_create_sp->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
481 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
482
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
483
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
484 task_create_pp->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
485 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
486
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
487 HTaskPtr
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
488 Viewer::update_task_create(void *data, int size,
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
489 int load_id, int spe_id, HTaskPtr wait)
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
490 {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
491
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
492 HTaskPtr data_update = manager->create_task(DataUpdate);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
493 data_update->add_inData(data,size);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
494 data_update->set_param(0,size);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
495 data_update->set_param(1,load_id);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
496 data_update->set_cpu((CPU_TYPE)(spe_id));
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
497 if (wait != NULL) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
498 wait->wait_for(data_update);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
499 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
500 data_update->spawn();
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
501
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
502 return data_update;
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
503
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
504 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
505
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
506 void
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
507 Viewer::common_draw(HTaskPtr task_next)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
508 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
509 HTaskPtr task_draw;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
510
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
511 //task_next = manager->create_task(Dummy);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
512 //task_next->set_post(post2runLoop, (void*)this);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
513
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
514 //Light info update
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
515
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
516 HTaskPtr data_update;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
517 HTaskPtr data_update_wait;
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
518 int light_num = 4;
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
519 int size = sizeof(float)*4*light_num; //xyz+alpha(4) * light_num(4)
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
520 int light_size = size / sizeof(float);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
521
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
522 for (int i = 0; i < light_size; i++) {
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
523 light_xyz[i] = light_xyz_stock[i];
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 760
diff changeset
524 }
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
525
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
526 for (int i = 0; i < light_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
527 light_switch[i] = light_switch_stock[i];
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
528 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
529
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
530 data_update_wait = manager->create_task(DataUpdate);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
531 data_update_wait->add_inData(light_xyz,size);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
532 data_update_wait->set_param(0,size);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
533 data_update_wait->set_param(1,Light);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
534 data_update_wait->set_cpu((CPU_TYPE)((int)SPE_0));
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
535
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
536 for (int i = 1; i < spe_num; i++) {
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
537 update_task_create(light_xyz,size,Light,(int)SPE_0+i,data_update_wait);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
538 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
539
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
540 size = light_num * sizeof(int);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
541
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
542 for (int i = 0; i < spe_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
543 update_task_create(light_xyz,size,LightSwitch,(int)SPE_0+i,data_update_wait);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
544 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
545
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
546 size = 16; // LightSysSwitch は 4byte. 残り 12byte は DMA転送の為のパディング
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
547
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
548 for (int i = 0; i < spe_num; i++) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
549 update_task_create(light_xyz,size,LightSysSwitch,(int)SPE_0+i,data_update_wait);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
550 }
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
551
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
552
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
553 ppack->clear();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
554 for (int i = 0; i < spackList_length; i++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
555 SpanPack *spack = &spackList[i];
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
556 int startx = 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
557 int endx = split_screen_w;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
558
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
559 int starty = spack->info.y_top - split_screen_h + 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
560 //int endy = spack->info.y_top;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
561 int rangey = (starty + split_screen_h - 1 > this->height)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
562 ? this->height - starty + 1 : split_screen_h;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
563
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
564 while (startx < this->width) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
565 if (spack->info.size > 0) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
566 // Draw SpanPack
614
4e44147d78ee remove uncessary Task Name definision
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 603
diff changeset
567 task_draw = manager->create_task(DrawSpan);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
568
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
569 task_draw->set_param(0,
603
42c94f85c779 long -> memaddr (64 or 32)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 602
diff changeset
570 (memaddr)&pixels[(startx-1) + this->width*(starty-1)]);
625
60aa3f241b10 64bit mode worked on Mac OS X.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 616
diff changeset
571 task_draw->set_param(1,this->width);
652
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
572 task_draw->set_param(2,startx);
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
573 task_draw->set_param(3,endx);
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
574 task_draw->set_param(4,rangey);
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
575
dbe137505f2e bulk task list start.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 625
diff changeset
576 task_draw->add_inData(spack, sizeof(SpanPack));
615
f7d78b3c1106 First addOutput rendering try failed.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
577
616
f21603a335aa Rendering not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 615
diff changeset
578 for (int i = 0; i < rangey; i++) {
615
f7d78b3c1106 First addOutput rendering try failed.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
579 task_draw->add_outData(
616
f21603a335aa Rendering not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 615
diff changeset
580 &pixels[(startx-1) + this->width*(starty-1 + i) ],
f21603a335aa Rendering not yet worked.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 615
diff changeset
581 (endx-startx+1)*sizeof(int));
615
f7d78b3c1106 First addOutput rendering try failed.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
582 }
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
583 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
584 // 7.7.3 SL1 Data Cache Range Set to Zero コマンド
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
585 // を使って、DMAでclearするべき... ということは、
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
586 // それもSPEでやる方が良い?
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
587 memset(&pixels[(startx-1)+this->width*(starty-1)],
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
588 0, (this->width)*sizeof(int)*rangey);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
589 break;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
590 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
591
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
592 task_draw->set_cpu(SPE_ANY);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
593 task_next->wait_for(task_draw);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
594 task_draw->wait_for(data_update_wait);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
595 task_draw->spawn();
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
596
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
597 startx += split_screen_w;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
598 endx += split_screen_w;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
599
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
600 if (endx > this->width) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
601 endx = this->width;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
602 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
603 }
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
604 }
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
605
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
606 data_update_wait->spawn();
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
607
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
608 }
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
609
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
610 void
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
611 Viewer::run_finish()
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
612 {
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
613 dev->free_device();
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
614 if (this_time != start_time) {
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
615 printf("%f FPS\n", (((float)frames)/(this_time-start_time))*1000.0);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
616 }
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
617
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
618 delete sgroot;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
619 // delete sgroot_2;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 652
diff changeset
620 quit();
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
621 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
622
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
623 /* end */