Mercurial > hg > Members > kono > Cerium

annotate TaskManager/Test/test_render/spe/DrawSpan.cpp @ 264:a59868d37093

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