Mercurial > hg > Members > kono > Cerium
annotate TaskManager/Test/test_render/spe/DrawSpan.cpp @ 155:77dac07efd79
TextureInfoList がずれてたのを修正
author | gongo@gendarme.local |
---|---|
date | Thu, 04 Dec 2008 13:58:41 +0900 |
parents | 9642aeef298d |
children | cd5ad7adc5e1 |
rev | line source |
---|---|
109 | 1 #include <stdlib.h> |
2 #include <string.h> | |
3 #include "DrawSpan.h" | |
4 #include "polygon_pack.h" | |
5 #include "SpanPack.h" | |
6 #include "texture.h" | |
7 #include "viewer_types.h" | |
8 | |
9 #define SPAN_PACK_LOAD 0 | |
120 | 10 #define TEX_LOAD 1 |
147 | 11 #define TILE_INFO_LOAD 2 |
109 | 12 |
13 SchedDefineTask(DrawSpan); | |
14 | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
15 static const int hashsize = 263; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
16 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
17 static TilePtr hash_table[hashsize] = {NULL}; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
18 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
19 unsigned short PRIME[8] = { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
20 0x002, 0x065, 0x0c7, 0x133, 0x191, 0x1f3, 0x259, 0x2bd, |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
21 }; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
22 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
23 static TileListPtr tileList; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
24 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
25 static int |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
26 hash(uint32 data) |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
27 { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
28 int value = 0; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
29 int n = 0; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
30 int key; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
31 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
32 for (int i = 0; i < 8; i ++) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
33 key = data & 0xf; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
34 value += key * PRIME[n++]; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
35 data >>= 4; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
36 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
37 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
38 return value % hashsize; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
39 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
40 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
41 static int |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
42 put(void *key, TilePtr data) |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
43 { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
44 int hashval = hash((uint32)key); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
45 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
46 for (int i = 0; i < hashsize/2; i++) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
47 int index = (hashval + i*i)%hashsize; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
48 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
49 if (hash_table[index] == 0) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
50 hash_table[index] = data; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
51 return index; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
52 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
53 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
54 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
55 return -1; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
56 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
57 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
58 static TilePtr |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
59 get(void *key) |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
60 { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
61 int hashval = hash((uint32)key); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
62 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
63 for (int i = 0; i < hashsize/2; i++) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
64 int index = (hashval + i*i)%hashsize; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
65 |
131 | 66 if (hash_table[index] != NULL && |
67 hash_table[index]->texture_addr == key) { | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
68 return hash_table[index]; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
69 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
70 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
71 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
72 return NULL; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
73 } |
120 | 74 |
109 | 75 void |
76 DrawSpan::linebuf_init(int *buf, int x, int rgb) | |
77 { | |
78 for (int i = 0; i < x; i++) { | |
79 buf[i] = rgb; | |
80 } | |
81 } | |
82 | |
83 float* | |
84 DrawSpan::zRow_init(int w, int h) | |
85 { | |
86 float *zRow = NULL; | |
87 float z = 65535.0f; | |
88 int length = w*h; | |
89 | |
90 zRow = (float*)smanager->allocate(sizeof(float)*length); | |
91 | |
92 for (int i = 0; i < length; i++) { | |
93 zRow[i] = z; | |
94 } | |
95 | |
96 return zRow; | |
97 } | |
98 | |
99 | |
100 char* | |
101 DrawSpan::get_pixel(int tx, int ty, void *texture_image) | |
102 { | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
103 return (char*)texture_image+(4*((TEXTURE_SPLIT_PIXEL)*ty+tx)); |
109 | 104 } |
105 | |
106 Uint32 | |
131 | 107 DrawSpan::get_rgb(int tx, int ty, int tw, int th, void *texture) |
109 | 108 { |
109 Uint8 red, green, blue, alpha; | |
110 | |
111 if (tx<0) tx = 0; | |
131 | 112 if (tw-1< tx) tx = tw-1 ; |
109 | 113 if (ty<0) ty = 0; |
131 | 114 if (th-1< ty) ty = th-1 ; |
109 | 115 |
120 | 116 void *texture_addr; |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
117 TilePtr tile; |
109 | 118 |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
119 #if 0 |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
120 int blockX = tx / TEXTURE_SPLIT_PIXEL; |
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
121 int blockY = ty / TEXTURE_SPLIT_PIXEL; |
120 | 122 void** addrList = (void**)global_get(TEXTURE2_ID); |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
123 |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
124 texture_addr = addrList[blockX + (tw/TEXTURE_SPLIT_PIXEL)*blockY]; |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
125 #else |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
126 texture_addr = texture; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
127 #endif |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
128 |
131 | 129 /** |
130 * get,put ϥ֥(HashȤ)äƥ뤫 | |
131 */ | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
132 tile = get(texture_addr); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
133 if (tile == NULL) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
134 if (tileList->size >= MAX_TILE) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
135 tileList->init(); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
136 bzero(hash_table, sizeof(TilePtr)*hashsize); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
137 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
138 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
139 tile = &tileList->tile[tileList->size]; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
140 tile->texture_addr = texture_addr; |
120 | 141 |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
142 smanager->dma_load(tile->pixel, (uint32)texture_addr, |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
143 sizeof(uint32)*64, TEX_LOAD); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
144 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
145 int index = put(tile->texture_addr, tile); |
131 | 146 |
147 /** | |
148 * TODO: | |
149 * ʤäĤ | |
150 * ޤǤΤĤ褷Ƥ³Ȥ | |
151 */ | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
152 if (index < 0) { |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
153 printf("[%p] Can't entry\n", tile); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
154 return 0xff0000; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
155 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
156 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
157 tileList->size++; |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
158 |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
159 smanager->dma_wait(TEX_LOAD); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
160 } |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
161 |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
162 char *p = get_pixel(tx%TEXTURE_SPLIT_PIXEL, |
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
163 ty%TEXTURE_SPLIT_PIXEL, tile->pixel); |
120 | 164 |
126
7635f223fc7d
fix RGBA mask (bgr -> rgba)
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
123
diff
changeset
|
165 alpha = 255; |
7635f223fc7d
fix RGBA mask (bgr -> rgba)
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
123
diff
changeset
|
166 red = (Uint8) p[0]; |
109 | 167 green = (Uint8) p[1]; |
126
7635f223fc7d
fix RGBA mask (bgr -> rgba)
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
123
diff
changeset
|
168 blue = (Uint8) p[2]; |
109 | 169 |
170 return (red & 0xff) * 0x10000 + (green & 0xff) * 0x100 | |
171 + (blue & 0xff) + (alpha << 24); | |
172 } | |
173 | |
174 int | |
175 DrawSpan::run(void *rbuf, void *wbuf) | |
176 { | |
177 SpanPack *sp = (SpanPack*)smanager->get_input(0); | |
178 SpanPack *next_sp = | |
179 (SpanPack*)smanager->allocate(sizeof(SpanPack)); | |
180 SpanPack *free_sp = next_sp; // next_sp free() | |
181 SpanPack *tmp_sp = NULL; | |
182 Span *span; | |
183 | |
147 | 184 TileInfoListPtr tilist = |
185 (TileInfoListPtr)smanager->allocate(sizeof(TileInfoList)); | |
186 TileInfoListPtr next_tilist = | |
187 (TileInfoListPtr)smanager->allocate(sizeof(TileInfoList)); | |
188 TileInfoPtr tinfo; | |
189 | |
190 | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
191 tileList = (TileListPtr)smanager->allocate(sizeof(TileList)); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
192 tileList->init(); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
193 |
109 | 194 int render_y = sp->info.y_top; |
195 void *texture_image = global_get(TEXTURE_ID); | |
196 | |
197 int rangex_start = get_param(0); // Υô x ϰϤλ | |
198 int rangex_end = get_param(1); // (start <= x <= end) | |
199 int rangey = get_param(2); // y ϰ (render_y + rangey - 1) | |
200 int rangex = rangex_end - rangex_start + 1; | |
201 | |
202 float *zRow = zRow_init(rangex, rangey); | |
203 | |
204 int **linebuf = (int**)smanager->allocate(sizeof(int*)*rangey); | |
205 | |
206 for (int i = 0; i < rangey; i++) { | |
207 linebuf[i] = (int*)smanager->get_output(i); | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
208 linebuf_init(linebuf[i], rangex, 0xffffff); |
109 | 209 } |
210 | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
211 bzero(hash_table, sizeof(TilePtr)*hashsize); |
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
212 |
109 | 213 do { |
214 /** | |
215 * SpanPack->next ¸ߤ硢 | |
216 * ߤ SpanPack Ƥ֤ | |
217 * SpanPack DMA žԤ | |
218 */ | |
219 if (sp->next != NULL) { | |
220 smanager->dma_load(next_sp, (uint32)sp->next, | |
221 sizeof(SpanPack), SPAN_PACK_LOAD); | |
222 } else { | |
223 next_sp = NULL; | |
224 } | |
225 | |
226 for (int t = 0; t < sp->info.size; t++) { | |
227 span = &sp->span[t]; | |
228 | |
147 | 229 smanager->dma_load(tilist, (uint32)span->tilelist, |
230 sizeof(TileInfoList), TILE_INFO_LOAD); | |
231 | |
109 | 232 Uint32 rgb = 0x00ff00; |
233 float tex1 = span->tex_x1; | |
234 float tex2 = span->tex_x2; | |
235 float tey1 = span->tex_y1; | |
236 float tey2 = span->tex_y2; | |
237 int tex_xpos; | |
238 int tex_ypos; | |
239 int tex_zpos; | |
240 int x = span->x; | |
241 int y = span->y; | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
242 int x_len = span->length_x; |
109 | 243 float z = span->start_z; |
244 float zpos = span->end_z; | |
245 | |
246 // ɸ [0 .. split_screen_w-1] 褦 x,y -1 | |
247 int localx = getLocalX(x-1); | |
248 int localy = getLocalY(y-1); | |
131 | 249 |
147 | 250 smanager->dma_wait(TILE_INFO_LOAD); |
251 | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
252 if (x_len == 1) { |
109 | 253 if (x < rangex_start || rangex_end < x) { |
254 continue; | |
255 } | |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
256 |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
257 tex_xpos = (int)((span->tex_width-1) * tex1); |
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
258 tex_ypos = (int)((span->tex_height-1) * tey1); |
109 | 259 tex_zpos = (int)z; |
260 | |
155 | 261 #if 1 |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
262 if (tex_xpos != tilist->tileinfo[0].tix |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
263 && tex_xpos != tilist->tileinfo[0].tix) { |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
264 fprintf(stderr, "1: (%3d, %3d), (%3d, %3d)\n", |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
265 tex_xpos, tex_ypos, tilist->tileinfo[0].tix, |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
266 tilist->tileinfo[0].tiy); |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
267 } |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
268 #endif |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
269 |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
270 tex_xpos = tilist->tileinfo[0].tix; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
271 tex_ypos = tilist->tileinfo[0].tiy; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
272 texture_image = tilist->tileinfo[0].tile; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
273 |
109 | 274 if (zpos < zRow[localx + (rangex * localy)]) { |
131 | 275 rgb = get_rgb(tex_xpos, tex_ypos, span->tex_width, |
276 span->tex_height, texture_image); | |
109 | 277 zRow[localx + (rangex * localy)] = zpos; |
278 linebuf[localy][localx] = rgb; | |
279 } | |
280 } else { | |
281 int js = (x < rangex_start) ? rangex_start - x : 0; | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
282 int je = (x + x_len > rangex_end) ? rangex_end - x : x_len; |
155 | 283 |
147 | 284 if (js > je) continue; |
285 | |
286 int cur_x = 0; | |
287 int max_x = je; | |
155 | 288 int len = 0; |
109 | 289 |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
290 /** |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
291 * Span ɽʤϰ([js..je]) TileInfoList |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
292 * äƤΤǡФ |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
293 */ |
155 | 294 while (cur_x + MAX_TILE_LIST <= js) { |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
295 smanager->dma_load(next_tilist, (uint32)tilist->next, |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
296 sizeof(TileInfoList), TILE_INFO_LOAD); |
147 | 297 smanager->dma_wait(TILE_INFO_LOAD); |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
298 |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
299 TileInfoListPtr tmp = tilist; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
300 tilist = next_tilist; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
301 next_tilist = tmp; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
302 |
147 | 303 cur_x += MAX_TILE_LIST; |
304 } | |
305 | |
306 cur_x = js; | |
133
435e0d24db39
DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
131
diff
changeset
|
307 |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
308 while (cur_x <= max_x) { |
155 | 309 /** |
310 * TileInfoList 30 ĤǶڤƤΤ | |
311 * cur_x TileInfoList 椫ϤޤäƤ | |
312 * MAX_TILE_LIST ˼ޤͤ | |
313 * (ex.) | |
314 * cur_x (=js) 0 Ϥޤä硢 | |
315 * cur_x = 0, len = 29 | |
316 * cur_x (=js) 15 Ϥޤä硢 | |
317 * cur_x = 15, len = 14 ˤʤ | |
318 */ | |
319 int cur_x_diff = MAX_TILE_LIST - (cur_x % MAX_TILE_LIST); | |
320 | |
321 if (cur_x + cur_x_diff - 1 < max_x) { | |
147 | 322 smanager->dma_load(next_tilist, (uint32)tilist->next, |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
323 sizeof(TileInfoList), |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
324 TILE_INFO_LOAD); |
155 | 325 len = cur_x_diff - 1; |
147 | 326 } else { |
327 len = max_x - cur_x; | |
109 | 328 } |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
329 |
147 | 330 float tex_x, tex_y, tex_z; |
155 | 331 |
147 | 332 for (int j = cur_x; j <= cur_x + len; j++) { |
333 localx = getLocalX(x-1+j); | |
334 tex_z = z*(x_len-1-j)/(x_len-1) + zpos*j/(x_len-1); | |
335 | |
336 tex_x = tex1*(x_len-1-j)/(x_len-1) + tex2*j/(x_len-1); | |
337 tex_y = tey1*(x_len-1-j)/(x_len-1) + tey2*j/(x_len-1); | |
338 if (tex_x > 1) tex_x = 1; | |
339 if (tex_y > 1) tex_y = 1; | |
340 tex_xpos = (int)((span->tex_width-1) * tex_x); | |
341 tex_ypos = (int)((span->tex_height-1) * tex_y); | |
148
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
342 |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
343 if (tex_xpos != tilist->tileinfo[j%MAX_TILE_LIST].tix |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
344 && tex_xpos != tilist->tileinfo[j%MAX_TILE_LIST].tix) { |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
345 fprintf(stderr, "size = %d\n", tilist->size); |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
346 fprintf(stderr, "(%3d ..%3d) %d, %d %d\n", |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
347 x, x + x_len, js, max_x, j%MAX_TILE_LIST); |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
348 fprintf(stderr, "(%3d, %3d), (%3d, %3d)\n", |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
349 tex_xpos, tex_ypos, |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
350 tilist->tileinfo[j%MAX_TILE_LIST].tix, |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
351 tilist->tileinfo[j%MAX_TILE_LIST].tiy); |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
352 } |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
353 |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
354 tex_xpos = tilist->tileinfo[j%MAX_TILE_LIST].tix; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
355 tex_ypos = tilist->tileinfo[j%MAX_TILE_LIST].tiy; |
9642aeef298d
Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
147
diff
changeset
|
356 texture_image = tilist->tileinfo[j%MAX_TILE_LIST].tile; |
147 | 357 |
358 if (tex_z < zRow[localx + (rangex*localy)]) { | |
359 rgb = get_rgb(tex_xpos, tex_ypos, span->tex_width, | |
360 span->tex_height, texture_image); | |
361 zRow[localx + (rangex*localy)] = tex_z; | |
362 linebuf[localy][localx] = rgb; | |
363 } | |
364 } | |
365 | |
366 smanager->dma_wait(TILE_INFO_LOAD); | |
367 | |
368 TileInfoListPtr tmp = tilist; | |
369 tilist = next_tilist; | |
370 next_tilist = tmp; | |
371 | |
155 | 372 cur_x += cur_x_diff; |
109 | 373 } |
374 } | |
375 } | |
147 | 376 |
109 | 377 smanager->dma_wait(SPAN_PACK_LOAD); |
378 | |
379 tmp_sp = sp; | |
380 sp = next_sp; | |
381 next_sp = tmp_sp; | |
382 } while (sp); | |
383 | |
384 free(free_sp); | |
385 free(linebuf); | |
386 free(zRow); | |
128
776eca0daa02
texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents:
126
diff
changeset
|
387 free(tileList); |
147 | 388 free(tilist); |
389 free(next_tilist); | |
109 | 390 |
391 return 0; | |
392 } |