annotate Renderer/Engine/spe/DrawSpan.cc @ 994:33616b2789de

SDL mode fix
author yutaka@charles.cr.ie.u-ryukyu.ac.jp
date Mon, 11 Oct 2010 14:21:02 +0900
parents 05696567d1d2
children
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 <stdlib.h>
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
2 #include <string.h>
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
3 #include "DrawSpan.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
4 #include "polygon_pack.h"
860
649e4cb84683 Still on the way
yutaka@localhost.localdomain
parents: 856
diff changeset
5 #include "task_texture.h"
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
6 #include "viewer_types.h"
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
7 #include "Func.h"
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
8 #include "sys.h"
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
9 #include "SchedTask.h"
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
10 #include "Tapestry.h"
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
11 #include "SpanPack.h"
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
12 #include <spu_intrinsics.h>
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
13 #include <math.h>
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
14
623
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
15 #if (__LITTLE_ENDIAN__)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
16 #define LITTLEENDIAN 1
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
17 #else
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
18 #define LITTLEENDIAN 0
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
19 #endif
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
20
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
21 SchedDefineTask(DrawSpan);
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 #define TEX_LOAD1 0
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
24 #define TEX_LOAD2 1
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
25 #define SPAN_PACK_LOAD 2
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
26 #define FB_STORE 3
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
27
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
28 typedef struct {
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
29 int **linebuf;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
30 float *zRow;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
31 TileListPtr tileList;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
32 int doneWrite;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
33 } G, *Gptr;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
34
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
35 static int** linebuf_init(SchedTask *smanager, int width, int height, int rgb);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
36 static float* zRow_init(SchedTask *smanager, int width, int height);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
37 // static TilePtr set_rgb(memaddr addr, int wait_tag);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
38 // static void set_rgbs(memaddr addr, uint32 *max_addr, int wait_tag);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
39 static uint32 get_rgb(int tx, int ty, TilePtr tile);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
40 // static TilePtr isAvailableTile(memaddr addr);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
41 static memaddr getTile(int tx, int ty, int tw, memaddr tex_addr_top);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
42 static int getTexBlock(int tx, int ty, int twidth);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
43
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
44 static void updateBuffer(Gptr g, float zpos, int rangex, int loaclx, int localy,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
45 int tex_x, int tex_y, float normal_x, float nomral_x, float normal_z,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
46 TilePtr tile, int world_x, int world_y, float world_z,SchedTask *smanager);
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
47
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
48 // static void reboot(SpanPackPtr spack, int cur_span_x);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
49
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
50 static int drawDot1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
51 //static void drawDot2(SchedTask *smanager, SpanPtr span, int startx, int endx, int js, int wait_tag);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
52 static int drawLine1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
53 // static void drawLine2(SchedTask *smanager, SpanPtr span, int startx, int endx, int js, int wait_tag);
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
54
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
55 static int infinity_light_calc(int color,float normal_x, float normal_y, float normal_z,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
56 SchedTask *smanager,int x, int y, float z, int world_x, int world_y, float world_z);
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
57
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
58
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
59
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
60 static inline void
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
61 normalize(vector float& v0, vector float& v1)
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
62 {
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
63 float norm;
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
64 vector float ret __attribute__((aligned(16))) = {0,0,0,0};
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
65
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
66 ret = spu_mul(v0,v1);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
67 norm = (ret[0] + ret[1] + ret[2]);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
68
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
69 ret = (vector float)spu_splats(norm);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
70 ret = spu_rsqrte(ret);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
71 v0 = spu_mul(v1,ret);
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
72 }
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
73
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
74 static inline float
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
75 innerProduct1(vector float& v0, vector float& v1)
621
5b178db5988a Cell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 619
diff changeset
76 {
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
77
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
78 vector float ret __attribute__((aligned(16))) = {0,0,0,0};
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
79 float inner;
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
80 ret = spu_mul(v0,v1);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
81
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
82 inner = (ret[0] + ret[1] + ret[2]);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
83 if (inner < 0) {
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
84 inner = 0;
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
85 }
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
86
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
87 return inner;
621
5b178db5988a Cell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 619
diff changeset
88 }
5b178db5988a Cell fix
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 619
diff changeset
89
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
90
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
91
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
92
507
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 * テクスチャは、TEXTURE_SPLIT_PIXEL^2 のブロックに分割する
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
95 *
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 * | 0 | 1 | 2 | 3 | 4 | 5 |
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 * | | | | | |11 |
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
100 * +---+---+---+---+---+---+
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
101 * | | | | | |17 |
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
102 * +---+---+---+---+---+---+
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
103 * | | | | | |23 |
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
104 * +---+---+---+---+---+---+
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
105 * | | | | | |29 |
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
106 * +---+---+---+---+---+---+
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
107 * | | | | | |35 |
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
108 * +---+---+---+---+---+---+
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
109 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
110 * 一辺を TEXTURE_SPLIT とする
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
111 * 各ブロックの数字がブロックIDとなる。
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
112 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
113
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
114 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
115 * テクスチャの座標から、
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
116 * テクスチャのどのブロックかを求める
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
117 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
118 * @param[in] tx X coordinates of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
119 * @param[in] tx Y coordinates of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
120 * @param[in] twidth Width of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
121 * @return block ID
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
122 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
123 static int
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
124 getTexBlock(int tx, int ty, int twidth)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
125 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
126 int blockX, blockY;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
127
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
128 blockX = tx / TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
129 blockY = ty / TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
130
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
131 return blockX + (twidth/TEXTURE_SPLIT_PIXEL)*blockY;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
132 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
133
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
134 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
135 * block ID と、テクスチャの TOP address から
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
136 * (tx,ty) で使われるテクスチャの Tile addres を求める
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
137 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
138 * @param[in] tx X coordinates of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
139 * @param[in] tx Y coordinates of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
140 * @param[in] tw Width of texture
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
141 * @param[in] tex_addr_top (tx,ty) で使うテクスチャの先頭address
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
142 * @return block ID
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
143 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
144 static memaddr
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
145 getTile(int tx, int ty, int tw, memaddr tex_addr_top)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
146 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
147 int block = getTexBlock(tx, ty, tw);
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
148 return tex_addr_top + block * TEXTURE_BLOCK_SIZE * sizeof(uint32);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
149 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
150
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
151 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
152 * FrameBuffer に書き込む rgb の領域初期化
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
153 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
154 * @param width Width of Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
155 * @param height Height of Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
156 * @param rgb Initial value of RGB at Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
157 * @return Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
158 */
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
159 static int **
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
160 linebuf_init(SchedTask *smanager, int width, int height, int rgb)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
161 {
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
162 int **linebuf = (int**)smanager->allocate(height*sizeof(int*));
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
163 for(int h = 0;h<height;h++) {
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
164 int *buf = linebuf[h] = (int*)smanager->get_output(h);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
165 for (int i = 0; i < width; i++) {
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
166 buf[i] = rgb;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
167 }
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
168 }
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
169 return linebuf;
507
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 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
173 * Z-Buffer の初期化
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
174 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
175 * @param width Width of Z-Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
176 * @param height Height of Z-Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
177 * @return Z-Buffer
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
178 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
179 static float*
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
180 zRow_init(SchedTask *smanager, int width, int height)
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 float *buf = (float*)smanager->allocate(sizeof(float)*width*height);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
183 float def = 65535.0f;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
184
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
185 for (int i = 0; i < width*height; i++) {
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
186 buf[i] = def;
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
187 }
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 return buf;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
190 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
191
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 static uint32
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
194 get_rgb(int tx, int ty, TilePtr tile)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
195 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
196 uint32 *data = (uint32 *)tile->data;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
197 return data[(TEXTURE_SPLIT_PIXEL)*ty+tx];
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
198 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
199
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
200
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
201
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 * zRow と Linebuf を更新する
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
204 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
205 * @param zpos 更新する pixel のZ座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
206 * @param rangex このタスクが処理する描画領域の x の長さ
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
207 * @param x pixel の、描画領域内での x 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
208 * @param y 〃 の、y 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
209 * @param tex_x pixel が使用するテクスチャの、Tile (8x8) 内での x 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
210 * @param tex_y 〃 の y 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
211 * @param tex_addr テクスチャのアドレス(MainMemory)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
212 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
213 static void
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
214 updateBuffer(Gptr g, float zpos, int rangex, int localx, int localy, int tex_x, int tex_y,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
215 float normal_x, float normal_y, float normal_z, TilePtr tile,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
216 int world_x, int world_y, float world_z, SchedTask *smanager)
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
217 {
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
218
994
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
219 uint32 color = get_rgb(tex_x, tex_y, tile);
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
220 /*下位4bitを抽出*/
623
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
221 #if LITTLEENDIAN
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
222 int alpha = color & 0x000000ff;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
223 #else
599
e923249c318a change alpha
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 594
diff changeset
224 int alpha = color & 0xff000000;
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
225 #endif
994
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
226
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
227 //完全に透けているか判断
855
e2af25174a05 light fix--
Yutaka_Kinjyo
parents: 838
diff changeset
228 int flag = (alpha != 0 && normal_z < 0);
793
c260205d3185 add light switch api
yutaka@localhost.localdomain
parents: 792
diff changeset
229 int *light_sysswitch = (int*)smanager->global_get(LightSysSwitch);
c260205d3185 add light switch api
yutaka@localhost.localdomain
parents: 792
diff changeset
230 //smanager->printf("sys %d\n",light_sysswitch);
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
231
856
Yutaka_Kinjyo
parents: 855
diff changeset
232 if ( *light_sysswitch == 1 && flag) {
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
233 color = infinity_light_calc(color,normal_x,normal_y,normal_z,
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
234 smanager,localx,localy,zpos,
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
235 world_x,world_y,world_z);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
236 }
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
237
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
238 g->zRow[localx + (rangex*localy)] = zpos*flag + g->zRow[localx + (rangex*localy)]*(1-flag);
994
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
239 int *point = &g->linebuf[localy][localx];
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
240 *point = color*flag + *point *(1-flag);
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
241
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
242 }
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 * 長さが 1 の Span の描画 (要するに 1 pixel)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
246 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
247 * @param span Span
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
248 * @param startx 描画開始範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
249 * @param endx 描画終了範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
250 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
251 static int
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
252 drawDot1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag)
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 int rangex = endx - startx + 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
255
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
256 float normal_x = span->normal_x;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
257 float normal_y = span->normal_y;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
258 float normal_z = span->normal_z;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
259
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
260
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
261 /* span->x に対応する Texture の座標 (tex_xpos, tex_ypos) */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
262 int tex_xpos, tex_ypos;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
263
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
264 // span の始点に対応する Texture の座標 (tex1, tey1)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
265 float tex = span->tex_x1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
266 float tey = span->tex_y1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
267
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
268 // span の始点に対応する z 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
269 float zpos = span->start_z;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
270
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
271 /* Tile 内での座標 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
272 int localx = getLocalX(span->x-1);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
273 int localy = getLocalY(span->y-1);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
274
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 * (tex_xpos, tex_ypos) の、Tile 内(上の図参照)での座標と
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
277 * そのブロックのアドレス(MainMemory)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
278 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
279 int tex_localx;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
280 int tex_localy;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
281 memaddr tex_addr;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
282
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
283 if (span->x < startx || endx < span->x) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
284 return -1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
285 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
286
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
287 tex_xpos = (int)((span->tex_width-1) * tex);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
288 tex_ypos = (int)((span->tex_height-1) * tey);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
289
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
290 if (zpos < g->zRow[localx + (rangex*localy)]) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
291 tex_addr = getTile(tex_xpos, tex_ypos,
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
292 span->tex_width, (memaddr)span->tex_addr);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
293 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
294 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
295
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
296 TilePtr tile = smanager->get_segment(tex_addr,g->tileList);
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
297 smanager->wait_segment(tile);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
298
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
299 updateBuffer(g, zpos, rangex, localx, localy,
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
300 tex_localx, tex_localy,
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
301 normal_x,normal_y,normal_z,tile,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
302 span->x, span->y, zpos, smanager);
507
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
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
305 return -1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
306 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
307
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
308 #if 0
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
309 static void
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
310 drawDot2(SchedTask *smanager, SpanPtr span, int startx, int end, int js, int wait_tag)
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
311 {
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
312 //printf("%d\n", js);
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
313 }
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
314 #endif
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
315
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
316 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
317 * 長さが 1 より大きい Span の描画
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
318 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
319 * 本来の目的として、この関数(drawLine1) では
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
320 * : 既に SPE 上に Tile のある pixel だけ描画
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
321 * : それ以外は、ここで予め DMA load しておき、
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
322 * : drawLine2 で一気に描画する
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
323 * ってものだったんだけど、どうも上手く行かなかったので
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
324 * 今は drawLine1 で load -> wait -> rendering を全部やってます
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
325 * (rendering といっても、rendering buffer に書き込むだけで
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
326 * まだ main memory (frame buffer) に dma store してるわけではない)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
327 *
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
328 * @param span Span
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
329 * @param startx 描画開始範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
330 * @param endx 描画終了範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
331 * @return 「span のどの位置まで rendering が終わったか」の x 座標
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 static int
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
334 drawLine1(SchedTask *smanager, Gptr g, SpanPtr span, int startx, int endx, int wait_tag)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
335 {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
336 int x = span->x;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
337 int rangex = endx - startx + 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
338 int x_len = span->length_x;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
339
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
340 float normal_x = span->normal_x;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
341 float normal_y = span->normal_y;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
342 float normal_z = span->normal_z;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
343
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
344
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
345 int js = (x < startx) ? startx - x : 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
346 int je = (x + x_len > endx) ? endx - x : x_len;
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 /* span->x に対応する Texture の座標 (tex_xpos, tex_ypos) */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
349 int tex_xpos, tex_ypos;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
350
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
351 // span の始点に対応する座標 (tex1, tey1)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
352 float tex1 = span->tex_x1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
353 float tey1 = span->tex_y1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
354
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
355 // span の終点に対応する座標 (tex2, tey2)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
356 float tex2 = span->tex_x2;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
357 float tey2 = span->tex_y2;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
358
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
359 // span の始点、終点に対応する z 座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
360 float zpos1 = span->start_z;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
361 float zpos2 = span->end_z;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
362
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
363 //spanを右から左に見ていくうちに、zが下がるのか、上がっていくのか。
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
364 float z_inclination = (zpos2 - zpos1) / x_len;
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
365 float world_z = zpos2;
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
366
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
367 // Tile 内での座標
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
368 int localx, localy = getLocalY(span->y-1);
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 int ret = je+1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
371
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
372 //for (int j = js; j <= je; j++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
373 for (int j = je; j >= js; j--) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
374 float tex_x, tex_y, tex_z;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
375
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
376 world_z -= z_inclination;
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
377
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
378 localx = getLocalX(x-1+j);
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 tex_z = zpos1*(x_len-1-j)/(x_len-1) + zpos2*j/(x_len-1);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
381
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
382 tex_x = tex1*(x_len-1-j)/(x_len-1) + tex2*j/(x_len-1);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
383 tex_y = tey1*(x_len-1-j)/(x_len-1) + tey2*j/(x_len-1);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
384 if (tex_x > 1) tex_x = 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
385 if (tex_x < 0) tex_x = 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
386 if (tex_y > 1) tex_y = 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
387 if (tex_y < 0) tex_y = 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
388 tex_xpos = (int)((span->tex_width-1) * tex_x);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
389 tex_ypos = (int)((span->tex_height-1) * tex_y);
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 if (tex_z < g->zRow[localx + (rangex*localy)]) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
392 // (tex_xpos, tex_ypos) の、Tile 内(上の図参照)での座標と
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
393 // そのブロックのアドレス(MainMemory)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
394 memaddr tex_addr;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
395 int tex_localx;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
396 int tex_localy;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
397
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
398 tex_addr = getTile(tex_xpos, tex_ypos,
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
399 span->tex_width, (memaddr)span->tex_addr);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
400 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
401 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
402 TilePtr tile = smanager->get_segment(tex_addr,g->tileList);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
403 smanager->wait_segment(tile);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
404
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
405 updateBuffer(g, tex_z, rangex, localx, localy,
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
406 tex_localx, tex_localy,
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
407 normal_x, normal_y, normal_z, tile,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
408 span->x+j, span->y, world_z, smanager);
507
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 return ret;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
413 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
414
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
415 static int
748
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
416 infinity_light_calc(int color,float normal_x, float normal_y,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
417 float normal_z, SchedTask *smanager, int x, int y, float z,
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
418 int world_x, int world_y, float world_z)
b7376415fa5f TaskManager changeset 683, Renderer changeset 746
hiroki
parents: 650
diff changeset
419
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
420 {
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
421
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
422 unsigned char rgb[4];
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
423
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
424 // 引数で受け取った color の rgb 情報の抜き出し
623
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
425 #if LITTLEENDIAN
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
426 rgb[0] = (color & 0xff000000) >> 24;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
427 rgb[1] = (color & 0x00ff0000) >> 16;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
428 rgb[2] = (color & 0x0000ff00) >> 8;
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
429 rgb[3] = (color & 0x000000ff);
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
430 #else
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
431 rgb[3] = (color & 0xff000000) >> 24;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
432 rgb[2] = (color & 0x00ff0000) >> 16;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
433 rgb[1] = (color & 0x0000ff00) >> 8;
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
434 rgb[0] = (color & 0x000000ff);
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
435 #endif
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
436
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
437
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
438 vector float *light_xyz = (vector float*)smanager->global_get(Light);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
439
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
440 vector float v_rgb __attribute__((aligned(16))) = {(float)rgb[0],(float)rgb[1],(float)rgb[2],0};
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
441 vector float normal_vector __attribute__((aligned(16))) = {normal_x,normal_y,normal_z,0};
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
442 vector float light_vector __attribute__((aligned(16))) = {0,0,0,0};
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
443 vector float v_inner __attribute__((aligned(16)));
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
444 vector float v_world[4] __attribute__((aligned(16))) = {{world_x, world_y, -world_z, 0},
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
445 {world_x, world_y, -world_z, 0},
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
446 {world_x, world_y, -world_z, 0},
793
c260205d3185 add light switch api
yutaka@localhost.localdomain
parents: 792
diff changeset
447 {world_x, world_y, -world_z, 0}};
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
448
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
449
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
450 int light_rgb;
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
451 float inner_product;
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
452
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
453 normalize(normal_vector, normal_vector);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
454
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
455 vector float vtmp_rgb __attribute__((aligned(16))) = {0,0,0,0};
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
456
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
457 int light_num = 4;
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
458 int *light_switch = (int*)smanager->global_get(LightSwitch);
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
459
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
460 for (int i = 0; i < light_num; i++) {
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
461
792
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
462 if (light_switch[i] == 1) {
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
463 light_vector = spu_sub(v_world[i],light_xyz[i]);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
464 normalize(light_vector, light_vector);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
465 inner_product = innerProduct1(normal_vector,light_vector);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
466 v_inner = spu_splats(inner_product);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
467 vtmp_rgb = spu_madd(v_rgb,v_inner,vtmp_rgb);
f2497e0ecd7c add light switch
yutaka@localhost.localdomain
parents: 779
diff changeset
468 }
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
469
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
470 }
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
471
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
472 vector unsigned int v_flag __attribute__((aligned(16)));
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
473 vector float max_rgb __attribute__((aligned(16))) = (vector float)spu_splats((float)255.0f);
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
474
775
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
475 v_flag = spu_cmpgt(max_rgb,vtmp_rgb);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
476 vtmp_rgb = spu_sel(max_rgb,vtmp_rgb,v_flag);
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
477
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
478 vector unsigned int last_rgb __attribute__((aligned(16)));
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 765
diff changeset
479 last_rgb = spu_convtu(vtmp_rgb,0);
762
10a8a80c2ea7 add lights
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 748
diff changeset
480
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
481
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
482 //計算した rgb を light_rgb にまとめる。
623
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
483 #if LITTLEENDIAN
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
484 light_rgb = (last_rgb[0] << 24) + (last_rgb[1] << 16) + (last_rgb[2] << 8) + (last_rgb[3]);
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
485 #else
765
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 762
diff changeset
486 light_rgb = (last_rgb[3] << 24) + (last_rgb[2] << 16) + (last_rgb[1] << 8) + (last_rgb[0]);
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
487 #endif
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
488
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
489 return light_rgb;
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
490 }
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
491
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
492
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
493 static int
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
494 run(SchedTask *smanager, void *rbuf, void *wbuf)
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
495 {
838
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
496
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
497 if ((int)smanager->get_param(5) == 0) {
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
498
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
499 int rangex_start = (long)smanager->get_param(2);
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
500 int rangex_end = (long)smanager->get_param(3);
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
501
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
502 int rangex = rangex_end - rangex_start + 1;
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
503 int rangey = (long)smanager->get_param(4);
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
504
914
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
505 for(int h = 0; h < rangey; h++) {
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
506 int *buf = (int*)smanager->get_output(h);
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
507 for (int i = 0; i < rangex; i++) {
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
508 buf[i] = 0;
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
509 }
05696567d1d2 0 is filled on the spe side.
yutaka@localhost.localdomain
parents: 860
diff changeset
510 }
838
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
511
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
512 return 0;
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
513
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
514 }
41302b72c895 Draw Span Task -> Task Array
Yutaka_Kinjyo
parents: 802
diff changeset
515
623
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
516 G g0;
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 622
diff changeset
517 Gptr g = &g0;
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
518
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
519 SpanPackPtr spack = (SpanPackPtr)smanager->get_input(0);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
520 SpanPackPtr next_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
521 SpanPackPtr free_spack = next_spack; // next_spack の free() 用
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
522 Span *span;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
523
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
524 Span nop_span;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
525 nop_span.length_x = 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
526
626
ab866bc8a624 64bit mode compatibility on Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 623
diff changeset
527 // uint32 display = (long)smanager->get_param(0);
ab866bc8a624 64bit mode compatibility on Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 623
diff changeset
528 // int screen_width = (long)smanager->get_param(1);
ab866bc8a624 64bit mode compatibility on Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 623
diff changeset
529 int rangex_start = (long)smanager->get_param(2);
ab866bc8a624 64bit mode compatibility on Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 623
diff changeset
530 int rangex_end = (long)smanager->get_param(3);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
531
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
532 // このタスクが担当する x の範囲
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
533 int rangex = rangex_end - rangex_start + 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
534
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
535 // y の範囲
626
ab866bc8a624 64bit mode compatibility on Cell
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 623
diff changeset
536 int rangey = (long)smanager->get_param(4);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
537 g->tileList = (TileListPtr)smanager->global_get(GLOBAL_TILE_LIST);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
538
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
539 g->zRow = zRow_init(smanager, rangex, rangey);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
540 g->linebuf = linebuf_init(smanager, rangex, rangey, 0);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
541
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
542 int tl_tag[2] = {TEX_LOAD1, TEX_LOAD2};
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
543 int tl_tag_flg1 = 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
544 int tl_tag_flg2 = 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
545
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
546 do {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
547 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
548 * SpanPack->next が存在する場合、
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
549 * 現在の SpanPack を処理してる間に
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
550 * 次の SpanPack の DMA 転送を行う
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
551 */
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
552 if (spack->next != NULL) {
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
553 smanager->dma_load(next_spack, (memaddr)spack->next,
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
554 sizeof(SpanPack), SPAN_PACK_LOAD);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
555 } else {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
556 next_spack = NULL;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
557 }
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 SpanPtr resume_span = &nop_span;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
560
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
561 for (int t = 0; t < spack->info.size; t++) {
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
562 SpanPtr next_span;
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 span = &spack->span[t];
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
565
622
6a5e88112ed9 remove non relocatable funcion call.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
566 if (span->length_x != 1) {
994
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
567 drawLine1(
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
568 smanager, g,
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
569 span, rangex_start, rangex_end, tl_tag[tl_tag_flg1]);
622
6a5e88112ed9 remove non relocatable funcion call.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
570 } else {
994
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
571 drawDot1(
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
572 smanager, g,
33616b2789de SDL mode fix
yutaka@charles.cr.ie.u-ryukyu.ac.jp
parents: 914
diff changeset
573 span, rangex_start, rangex_end, tl_tag[tl_tag_flg1]);
622
6a5e88112ed9 remove non relocatable funcion call.
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 621
diff changeset
574 }
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
575 next_span = span;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
576
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
577 resume_span = next_span;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
578
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
579 tl_tag_flg1 ^= 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
580 tl_tag_flg2 ^= 1;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
581 }
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
582
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
583 smanager->dma_wait(SPAN_PACK_LOAD);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
584
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
585 SpanPackPtr tmp_spack = spack;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
586 spack = next_spack;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
587 next_spack = tmp_spack;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
588 } while (spack);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
589
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 free(g->zRow);
618
360032cc500e worked. Cell fix. (not yet tested)
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 614
diff changeset
592 free(g->linebuf);
507
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
593
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
594 //FINISH:
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
595 /**
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
596 * goto FINISH; の時は reboot なので
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
597 * linebuf, zRow は free() しない
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
598 */
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 free(free_spack);
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
601
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 return 0;
735f76483bb2 Reorganization..
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents:
diff changeset
604 }
594
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
605
20166ecb1a78 add light
yutaka@henri.cr.ie.u-ryukyu.ac.jp
parents: 507
diff changeset
606 /* end */