Mercurial > hg > Members > kono > Cerium

annotate TaskManager/Test/test_render/spe/DrawSpan.cpp @ 266:5c9dbd54cd51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 04 Jun 2009 00:00:09 +0900
parents 54787f182881 d949e590da26
children 7f2b30acf311
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"
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
8 #include "TileHash.h"
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
9
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
10 #define SPAN_PACK_LOAD 0
120
a52e193f9a42 fix Load Texture
gongo@gendarme.local
parents: 109
diff changeset
11 #define TEX_LOAD 1
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
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
16 static TileHashPtr hash;
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
17 =======
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
18 <<<<<<< local
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
19 static const int hashsize = 263;
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
20
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
21 static TilePtr hash_table[hashsize] = {NULL};
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 unsigned short PRIME[8] = {
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
24 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
25 };
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
26
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
27 >>>>>>> other
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
28 static TileListPtr tileList;
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
29
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
30 /**
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
31 * ƥϡTEXTURE_SPLIT_PIXEL^2 Υ֥åʬ䤹
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
32 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
33 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
34 * | 0 | 1 | 2 | 3 | 4 | 5 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
35 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
36 * | | | | | |11 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
37 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
38 * | | | | | |17 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
39 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
40 * | | | | | |23 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
41 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
42 * | | | | | |29 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
43 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
44 * | | | | | |35 |
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
45 * +---+---+---+---+---+---+
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
46 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
47 * դ TEXTURE_SPLIT Ȥ
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
48 * ƥ֥åο֥åIDȤʤ롣
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
49 */
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
50
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
51 /**
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
52 * ƥκɸ顢
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
53 * ƥΤɤΥ֥å
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
54 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
55 * @param[in] tx X coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
56 * @param[in] tx Y coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
57 * @param[in] twidth Width of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
58 * @return block ID
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
59 */
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
60 static inline int
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
61 get_tex_block(int tx, int ty, int twidth)
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
62 {
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
63 int blockX, blockY;
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
64
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
65 blockX = tx / TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
66 blockY = ty / TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
67
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
68 return blockX + (twidth/TEXTURE_SPLIT_PIXEL)*blockY;
128
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
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
71 /**
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
72 * block ID ȡƥ TOP address
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
73 * (tx,ty) ǻȤƥ Tile addres
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
74 *
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
75 * @param[in] tx X coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
76 * @param[in] tx Y coordinates of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
77 * @param[in] tw Width of texture
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
78 * @param[in] tex_addr_top (tx,ty) ǻȤƥƬaddress
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
79 * @return block ID
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
80 */
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
81 static inline uint32*
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
82 getTile(int tx, int ty, int tw, uint32 *tex_addr_top)
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
83 {
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
84 int block = get_tex_block(tx, ty, tw);
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
85 return tex_addr_top + block*TEXTURE_BLOCK_SIZE;
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
86 }
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
87 =======
122
a802b19ab9ae add SceneGraph move
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 120
diff changeset
88 static unsigned char *tex;
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
89 >>>>>>> other
120
a52e193f9a42 fix Load Texture
gongo@gendarme.local
parents: 109
diff changeset
90
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
91 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
92 DrawSpan::linebuf_init(int *buf, int x, int rgb)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
93 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
94 for (int i = 0; i < x; i++) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
95 buf[i] = rgb;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
96 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
97 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
98
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
99 Uint32
166
gongo@localhost.localdomain
parents: 165
diff changeset
100 DrawSpan::get_rgb(int tx, int ty, uint32 *addr)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
101 {
148
9642aeef298d Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 147
diff changeset
102 TilePtr tile;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
103
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
104 tile = hash->get(addr);
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
105 if (tile == NULL) {
173
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
106 tile = tileList->nextTile();
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
107
173
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
108 /**
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
109 * FIFO ʤΤǡ⤷ΤĤäƤк
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
110 */
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
111 hash->remove(tile->texture_addr);
56be4a6e5513 add scale
gongo@localhost.localdomain
parents: 170
diff changeset
112
156
gongo@gendarme.local
parents: 155
diff changeset
113 tile->texture_addr = addr;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
114
156
gongo@gendarme.local
parents: 155
diff changeset
115 smanager->dma_load(tile->pixel, (uint32)addr,
161
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
116 sizeof(uint32)*TEXTURE_BLOCK_SIZE, TEX_LOAD);
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
117
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
118 int index = hash->put(tile->texture_addr, tile);
131
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
119
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
120 /**
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
121 * TODO:
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
122 * ʤäĤ
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
123 * ޤǤΤĤ褷Ƥ³򤹤Ȥ
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
124 */
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
125 if (index < 0) {
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
126 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
127 return 0xff0000;
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
128 }
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
129
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
130 smanager->dma_wait(TEX_LOAD);
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
131 }
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
132
168
cf2aa37d2fe7 Delete DrawSpan::get_pixel().
gongo@localhost.localdomain
parents: 167
diff changeset
133 return tile->pixel[(TEXTURE_SPLIT_PIXEL)*ty+tx];
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
134 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
135
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
136
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
137
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
138 int
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
139 DrawSpan::run(void *rbuf, void *wbuf)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
140 {
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
141 SpanPack *spack = (SpanPack*)smanager->get_input(0);
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
142 SpanPack *next_spack =
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
143 (SpanPack*)smanager->allocate(sizeof(SpanPack));
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
144 SpanPack *free_spack = next_spack; // next_spack free()
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
145 Span *span;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
146
167
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
147 hash = (TileHashPtr)smanager->global_get(GLOBAL_TEXTURE_HASH);
c8b868871dce DrawSpan で使う Tile の Hash の扱いは class TileHash を生成する事に。
gongo@localhost.localdomain
parents: 166
diff changeset
148 tileList = (TileListPtr)smanager->global_get(GLOBAL_TILE_LIST);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
149
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
150 int rangex_start = smanager->get_param(0);
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
151 int rangex_end = smanager->get_param(1);
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
152
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
153 // Υô x ϰ
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
154 int rangex = rangex_end - rangex_start + 1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
155
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
156 // y ϰ (render_y + rangey - 1)
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
157 int rangey = smanager->get_param(2);
177
e742053c4c87 zRow の生成、初期化の変更
gongo@localhost.localdomain
parents: 174
diff changeset
158
e742053c4c87 zRow の生成、初期化の変更
gongo@localhost.localdomain
parents: 174
diff changeset
159 float *zRow = (float*)smanager->get_input(1);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
160 int **linebuf = (int**)smanager->allocate(sizeof(int*)*rangey);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
161
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
162 for (int i = 0; i < rangey; i++) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
163 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
164 <<<<<<< local
170
d1f2ce3bdb2f fix ViewerSDL
gongo@localhost.localdomain
parents: 168
diff changeset
165 linebuf_init(linebuf[i], rangex, 0xffffffff);
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
166 =======
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
167 <<<<<<< local
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 131
diff changeset
168 linebuf_init(linebuf[i], rangex, 0xffffff);
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
169 =======
122
a802b19ab9ae add SceneGraph move
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 120
diff changeset
170 //linebuf_init(linebuf[i], rangex, 0x00ff00ff);
a802b19ab9ae add SceneGraph move
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 120
diff changeset
171 linebuf_init(linebuf[i], rangex, 0);
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
172 >>>>>>> other
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
173 >>>>>>> other
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
174 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
175
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
176 do {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
177 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
178 * SpanPack->next ¸ߤ硢
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
179 * ߤ SpanPack Ƥ֤
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
180 * SpanPack DMA žԤ
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
181 */
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
182 if (spack->next != NULL) {
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
183 smanager->dma_load(next_spack, (uint32)spack->next,
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
184 sizeof(SpanPack), SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
185 } else {
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
186 next_spack = NULL;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
187 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
188
183
gongo@localhost.localdomain
parents: 182
diff changeset
189 for (int t = spack->info.start; t < spack->info.size; t++) {
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
190 span = &spack->span[t];
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
191
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
192 Uint32 rgb = 0x00ff00;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
193 float tex1 = span->tex_x1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
194 float tex2 = span->tex_x2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
195 float tey1 = span->tex_y1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
196 float tey2 = span->tex_y2;
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
197
166
gongo@localhost.localdomain
parents: 165
diff changeset
198 /**
gongo@localhost.localdomain
parents: 165
diff changeset
199 * Span 1 pixel
gongo@localhost.localdomain
parents: 165
diff changeset
200 * ƥκɸ
gongo@localhost.localdomain
parents: 165
diff changeset
201 */
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
202 int tex_xpos;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
203 int tex_ypos;
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
204
166
gongo@localhost.localdomain
parents: 165
diff changeset
205 /**
gongo@localhost.localdomain
parents: 165
diff changeset
206 * (tex_xpos, tex_ypos) Ρ֥å(ο޻)Ǥκɸ
gongo@localhost.localdomain
parents: 165
diff changeset
207 * Υ֥åΥɥ쥹(MainMemory)
gongo@localhost.localdomain
parents: 165
diff changeset
208 */
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
209 int tex_localx;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
210 int tex_localy;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
211 uint32 *tex_addr;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
212
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
213 int x = span->x;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
214 int y = span->y;
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 131
diff changeset
215 int x_len = span->length_x;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
216 float z = span->start_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
217 float zpos = span->end_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
218
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
219 // ɸ [0 .. split_screen_w-1] 褦 x,y -1
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
220 int localx = getLocalX(x-1);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
221 int localy = getLocalY(y-1);
131
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 128
diff changeset
222
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 131
diff changeset
223 if (x_len == 1) {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
224 if (x < rangex_start || rangex_end < x) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
225 continue;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
226 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
227
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 131
diff changeset
228 tex_xpos = (int)((span->tex_width-1) * tex1);
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 131
diff changeset
229 tex_ypos = (int)((span->tex_height-1) * tey1);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
230
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
231 if (zpos < zRow[localx + (rangex * localy)]) {
166
gongo@localhost.localdomain
parents: 165
diff changeset
232 tex_addr = getTile(tex_xpos, tex_ypos,
gongo@localhost.localdomain
parents: 165
diff changeset
233 span->tex_width, span->tex_addr);
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
234 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
235 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
166
gongo@localhost.localdomain
parents: 165
diff changeset
236
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
237 rgb = get_rgb(tex_localx, tex_localy, tex_addr);
148
9642aeef298d Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 147
diff changeset
238
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
239 zRow[localx + (rangex * localy)] = zpos;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
240 linebuf[localy][localx] = rgb;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
241 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
242 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
243 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
244 int je = (x + x_len > rangex_end) ? rangex_end - x : x_len;
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
245 float tex_x, tex_y, tex_z;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
246
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
247 for (int j = js; j <= je; j++) {
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
248 localx = getLocalX(x-1+j);
148
9642aeef298d Span への Texture List の渡し。じゃっかん texture がバグってるので
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 147
diff changeset
249
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
250 tex_z = z*(x_len-1-j)/(x_len-1) + zpos*j/(x_len-1);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
251
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
252 tex_x = tex1*(x_len-1-j)/(x_len-1) + tex2*j/(x_len-1);
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
253 tex_y = tey1*(x_len-1-j)/(x_len-1) + tey2*j/(x_len-1);
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
254 if (tex_x > 1) tex_x = 1;
165
gongo@localhost.localdomain
parents: 164
diff changeset
255 if (tex_x < 0) tex_x = 0;
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
256 if (tex_y > 1) tex_y = 1;
165
gongo@localhost.localdomain
parents: 164
diff changeset
257 if (tex_y < 0) tex_y = 0;
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
258 tex_xpos = (int)((span->tex_width-1) * tex_x);
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
259 tex_ypos = (int)((span->tex_height-1) * tex_y);
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
260
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
261 if (tex_z < zRow[localx + (rangex*localy)]) {
166
gongo@localhost.localdomain
parents: 165
diff changeset
262 tex_addr = getTile(tex_xpos, tex_ypos,
gongo@localhost.localdomain
parents: 165
diff changeset
263 span->tex_width, span->tex_addr);
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
264 tex_localx = tex_xpos % TEXTURE_SPLIT_PIXEL;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
265 tex_localy = tex_ypos % TEXTURE_SPLIT_PIXEL;
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
266
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
267 rgb = get_rgb(tex_localx, tex_localy, tex_addr);
168
cf2aa37d2fe7 Delete DrawSpan::get_pixel().
gongo@localhost.localdomain
parents: 167
diff changeset
268
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
269 zRow[localx + (rangex*localy)] = tex_z;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
270 linebuf[localy][localx] = rgb;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
271 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
272 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
273 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
274 }
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
275
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
276 smanager->dma_wait(SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
277
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
278 SpanPack *tmp_spack = spack;
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
279 spack = next_spack;
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
280 next_spack = tmp_spack;
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
281 } while (spack);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
282
182
df3cfc04e796 add get_inputAddr, get_outputAddr
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 180
diff changeset
283 free(free_spack);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
284 free(linebuf);
266
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 183 265
diff changeset
285 <<<<<<< local
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 183 265
diff changeset
286 =======
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
287 free(zRow);
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
288 <<<<<<< local
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
289 =======
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
290 <<<<<<< local
128
776eca0daa02 texture load use hash table
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 126
diff changeset
291 free(tileList);
147
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
292 free(tilist);
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
293 free(next_tilist);
265
d949e590da26 merge 172 264
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 170 264
diff changeset
294 >>>>>>> other
266
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 183 265
diff changeset
295 >>>>>>> other
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
296
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
297 =======
122
a802b19ab9ae add SceneGraph move
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 120
diff changeset
298 free(tex);
264
a59868d37093 merge 151 263
Shinji KONO <kono@ie.u-ryukyu.ac.jp>
parents: 148 122
diff changeset
299 >>>>>>> other
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
300 return 0;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
301 }