annotate TaskManager/Test/test_render/spe/CreateSpan.cpp @ 172:c09f506bf5c9

CreateSpan に getScale を追加
author gongo@localhost.localdomain
date Thu, 11 Dec 2008 12:04:14 +0900
parents d1f2ce3bdb2f
children 559b48b69b76
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 "CreateSpan.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
2 #include "viewer_types.h"
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
3
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
4 static const int SPAN_PACK_LOAD = 5;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
5 static const int SPAN_PACK_STORE = 6;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
6 static const int POLYGON_PACK_LOAD = 7;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
7 static const int TILE_ALLOCATE = 8;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
8 static const int TILE_LOAD = 9;
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
9 static const int TILE_STORE = 10;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
10
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
11 static SpanPackPtr spack = NULL;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
12 static SpanPackPtr send_spack = NULL;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
13 static int prev_index = 0;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
14
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
15 SchedDefineTask(CreateSpan);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
16
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
17 static float
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
18 calc(float f1, float f2,int i, float base)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
19 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
20 float ans;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
21 ans = f1/f2*i + base;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
22 return ans;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
23 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
24
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
25
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
26 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
27 * TrianglePack から、vMin, vMid, vMax を求める
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
28 *
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
29 * @param [triPack] TrianglePack
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
30 * @param [vMin] [vMid] [vMax]
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
31 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
32 static void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
33 make_vertex(TrianglePack *triPack,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
34 VertexPackPtr *vMin, VertexPackPtr *vMid, VertexPackPtr *vMax)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
35 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
36 if (triPack->ver1.y <= triPack->ver2.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
37 if (triPack->ver2.y <= triPack->ver3.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
38 *vMin = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
39 *vMid = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
40 *vMax = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
41 } else if (triPack->ver3.y <= triPack->ver1.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
42 *vMin = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
43 *vMid = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
44 *vMax = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
45 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
46 *vMin = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
47 *vMid = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
48 *vMax = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
49 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
50 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
51 if (triPack->ver1.y <= triPack->ver3.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
52 *vMin = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
53 *vMid = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
54 *vMax = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
55 } else if (triPack->ver3.y <= triPack->ver2.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
56 *vMin = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
57 *vMid = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
58 *vMax = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
59 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
60 *vMin = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
61 *vMid = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
62 *vMax = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
63 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
64 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
65 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
66
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
67 static void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
68 make_vMid10(VertexPack *v, VertexPack *vMin,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
69 VertexPack *vMid, VertexPack *vMax)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
70 {
146
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
71 //int d, d1;
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
72 float d;
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
73 int d1;
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
74
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
75 d = vMax->y - vMin->y;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
76 d1 = (int)(vMid->y - vMin->y);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
77
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
78 v->tex_x = calc(vMax->tex_x - vMin->tex_x, d, d1, vMin->tex_x);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
79 v->tex_y = calc(vMax->tex_y - vMin->tex_y, d, d1, vMin->tex_y);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
80 v->x = calc(vMax->x - vMin->x, d, d1, vMin->x);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
81 v->y = vMid->y;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
82 v->z = calc(vMax->z - vMin->z, d, d1, vMin->z);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
83 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
84
156
gongo@gendarme.local
parents: 155
diff changeset
85 /**
161
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
86 * テクスチャは、TEXTURE_SPLIT_PIXEL^2 のブロックに分割する
156
gongo@gendarme.local
parents: 155
diff changeset
87 *
161
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
88 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
89 * | 0 | 1 | 2 | 3 | 4 | 5 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
90 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
91 * | | | | | |11 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
92 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
93 * | | | | | |17 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
94 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
95 * | | | | | |23 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
96 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
97 * | | | | | |29 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
98 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
99 * | | | | | |35 |
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
100 * +---+---+---+---+---+---+
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
101 *
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
102 * 一辺を TEXTURE_SPLIT とする
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
103 * 各ブロックの数字がブロックIDとなる。
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
104 */
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
105
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
106 /**
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
107 * テクスチャの座標から、
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
108 * テクスチャのどのブロックかを求める
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
109 *
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
110 * @param[in] tx X coordinates of texture
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
111 * @param[in] tx Y coordinates of texture
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
112 * @param[in] twidth Width of texture
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
113 * @return block ID
156
gongo@gendarme.local
parents: 155
diff changeset
114 */
gongo@gendarme.local
parents: 155
diff changeset
115 static int
161
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
116 get_tex_block(int tx, int ty, int twidth)
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
117 {
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
118 int blockX, blockY;
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
119
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
120 blockX = tx / TEXTURE_SPLIT_PIXEL;
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
121 blockY = ty / TEXTURE_SPLIT_PIXEL;
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
122
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
123 return blockX + (twidth/TEXTURE_SPLIT_PIXEL)*blockY;
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
124 }
1f4c3f3238e6 texture の座標がマイナスになったあと、それを 0 にし忘れてた
gongo@localhost.localdomain
parents: 156
diff changeset
125
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
126 /**
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
127 * span の width,height と texture の width,height を比べて
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
128 * span を描画する際に使う texture の比率を求める
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
129 *
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
130 * @param width Width of span
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
131 * @param height Height of span
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
132 * @param tex_width Width of 1/1 texture that span use
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
133 * @param tex_height Height of 1/1 texture that span use
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
134 * @return 描画に使う texture の比率
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
135 * width と height は 1/scale の画像を使う
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
136 *
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
137 * @todo scale_max を設定するべき
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
138 * 縮小は 1/8 までしかやってなくて、scale が 16 になる場合もある
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
139 */
169
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
140 static int
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
141 getScale(int width, int height, int tex_width, int tex_height)
169
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
142 {
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
143 int base, tex_base;
169
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
144 int scale = 1;
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
145
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
146 /**
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
147 * width と height で、長い方を基準に、
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
148 * texture の scale を決める
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
149 */
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
150 if (width > height) {
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
151 base = width;
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
152 tex_base = tex_width;
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
153 } else {
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
154 base = height;
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
155 tex_base = tex_height;
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
156 }
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
157
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
158 if (tex_base > base) {
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
159 int t_scale = tex_base/base;
169
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
160
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
161 while (t_scale >>= 1) {
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
162 scale <<= 1;
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
163 }
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
164 }
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
165
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
166 return scale;
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
167 }
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 164
diff changeset
168
141
fc314f28b66e TileList を作ろうとしたがに動かない。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 137
diff changeset
169 /**
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
170 * x軸に水平な辺を持つ三角形ポリゴンから、
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
171 * Span を抜き出す
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
172 *
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
173 * @param spackList triangle から生成された span を格納する List
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
174 * @param charge_y_top 担当する y の範囲開始地点
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
175 * @param charge_y_end 担当する y の範囲終了地点
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
176 * @param tex_addr triangle が参照するテクスチャの先頭アドレス
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
177 * @param tex_width テクスチャの width
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
178 * @param tex_height テクスチャの height
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
179 * @param vMin triangle の座標
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
180 * @param vMid triangle の座標。triangle を二つに分けて出来た新しい座標
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
181 * @param vMid10 triangle の座標
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
182 * @param y_length 分割する前の Triangle の y の長さ
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
183 *
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
184 */
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
185 void
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
186 CreateSpan::half_triangle(SpanPackPtr *spackList,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
187 int charge_y_top, int charge_y_end,
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
188 uint32 *tex_addr, int tex_width, int tex_height,
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
189 VertexPack *vMin,VertexPack *vMid,VertexPack *vMid10,
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
190 int y_length)
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
191 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
192 float tmp_z,tmp_tex1, tmp_tex2 ,tmp_tey1,tmp_tey2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
193 float tmp_xpos,tmp_end,tmp_zpos;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
194 float start_z, end_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
195 float start_tex_x, end_tex_x, start_tex_y, end_tex_y;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
196 int x, y, length;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
197
137
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
198 #if 1
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
199 // これじゃないと
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
200 // テクスチャの貼りに微妙に隙間が。謎だ
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
201 int start_y = (int)vMid->y;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
202 int end_y = (int)vMin->y;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
203 #else
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
204 float start_y = vMid->y;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
205 float end_y = vMin->y;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
206 #endif
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
207 float div_y = start_y - end_y;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
208 int k = 0;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
209 int l = 1;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
210
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
211 SpanPackPtr tmp_spack;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
212
135
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
213 /**
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
214 * 三角形ポリゴンをx軸に水平に二つに分けようとして
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
215 * ある一辺がすでに水平だった場合、つまり
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
216 *
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
217 * |\
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
218 * | \
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
219 * | \
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
220 * -----
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
221 *
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
222 *
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
223 * 上のようなポリゴンだった場合は、本来なら上の部分の三角形にだけ
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
224 * half_triangle の処理をするべきだが、現在の処理だと
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
225 * この half_triangle に「上の部分の三角形」と、
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
226 * 「『下の部分の三角形と判断してしまった』直線」が来てしまう。
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
227 * 直線の部分が来ると、calc() で 0 除算とかで、値不定で暴走するので
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
228 * 現在はこれで代用。
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
229 * half_triangle 呼ぶ前にこれを判断できれば良いかもしれない。
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
230 * てかこんなんでいいのかよ。。。
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
231 *
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
232 */
137
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
233 #if 1
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
234 if ((int)div_y == 0) {
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
235 return;
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
236 }
6cf991f28c6c SceneGraphPack の代わりに、今は SceneGraph をそのまま使う様に設定。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 135
diff changeset
237 #else
135
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
238 if (vMid10->x == vMin->x && vMid10->y == vMin->y) {
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
239 return;
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
240 }
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
241 #endif
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
242
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
243 if (div_y < 0) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
244 div_y = -div_y;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
245 k = 1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
246 l = -1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
247 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
248
135
c65aee1528ef remove xml file
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 133
diff changeset
249 for (int i = k; i < (int)div_y+1; i++) {
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
250 y = (int)vMin->y + i*l;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
251
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
252 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
253 * 担当 y 範囲内
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
254 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
255 if (charge_y_top <= y && y <= charge_y_end) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
256 // 1..8 を index0, 9..16 を index1 にするために y を -1
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
257 int index = (y-1) / split_screen_h;
164
38cbb7aecc70 TilePtr は SPE で計算した方がいいと判断して変更。
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 161
diff changeset
258
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
259 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
260 * 違う SpanPack を扱う場合、
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
261 * 現在の SpanPack をメインメモリに送り、
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
262 * 新しい SpanPack を取ってくる
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
263 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
264 if (index != prev_index) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
265 tmp_spack = spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
266 spack = send_spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
267 send_spack = tmp_spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
268
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
269 smanager->dma_wait(SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
270 smanager->dma_store(send_spack, (uint32)spackList[prev_index],
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
271 sizeof(SpanPack), SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
272
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
273 smanager->dma_load(spack, (uint32)spackList[index],
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
274 sizeof(SpanPack), SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
275 prev_index = index;
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 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
278
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
279 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
280 * 書き込む SpanPack が満杯だったら
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
281 * メインメモリで allocate した領域 (next) を持ってきて
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
282 * 現在の spack->next につなぎ、next を次の spack とする。
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
283 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
284 if (spack->info.size >= MAX_SIZE_SPAN) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
285 SpanPackPtr next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
286
141
fc314f28b66e TileList を作ろうとしたがに動かない。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 137
diff changeset
287 smanager->mainMem_alloc(0, sizeof(SpanPack));
fc314f28b66e TileList を作ろうとしたがに動かない。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 137
diff changeset
288 smanager->mainMem_wait();
fc314f28b66e TileList を作ろうとしたがに動かない。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 137
diff changeset
289 next = (SpanPackPtr)smanager->mainMem_get(0);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
290
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
291 spack->next = next;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
292
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
293 tmp_spack = spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
294 spack = send_spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
295 send_spack = tmp_spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
296
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
297 smanager->dma_wait(SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
298 smanager->dma_store(send_spack, (uint32)spackList[index],
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
299 sizeof(SpanPack), SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
300
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
301 spackList[index] = next;
141
fc314f28b66e TileList を作ろうとしたがに動かない。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 137
diff changeset
302
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
303 smanager->dma_load(spack, (uint32)spackList[index],
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
304 sizeof(SpanPack), SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
305 smanager->dma_wait(SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
306 spack->init((index+1)*split_screen_h);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
307 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
308 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
309 /**
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
310 * 担当範囲外だったら無視
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
311 */
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
312 continue;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
313 }
146
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
314
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
315 tmp_xpos = calc(vMid10->x - vMin->x ,div_y, i, vMin->x);
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
316 tmp_end = calc(vMid->x - vMin->x ,div_y, i, vMin->x);
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
317 tmp_z = calc(vMid10->z - vMin->z ,div_y, i, vMin->z);
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
318 tmp_zpos = calc(vMid->z - vMin->z ,div_y, i, vMin->z);
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
319
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
320 length = (tmp_xpos > tmp_end)
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
321 ? (int)tmp_xpos - (int)tmp_end : (int)tmp_end - (int)tmp_xpos;
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
322 if (length == 0) {
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
323 continue;
2284efc89f63 TileList の生成の修正
gongo@gendarme.cr.ie.u-ryukyu.ac.jp
parents: 141
diff changeset
324 }
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
325
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
326 tmp_tex1 =((i/(div_y)) * vMid10->tex_x) +
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
327 ( ((div_y - i)/(div_y)) * vMin->tex_x);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
328 tmp_tex2 =( (i/(div_y)) * vMid->tex_x) +
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
329 ( ((div_y - i)/(div_y)) * vMin->tex_x);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
330
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
331 tmp_tey1 =( (i/(div_y)) * vMid10->tex_y) +
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
332 ( ((div_y - i)/(div_y)) * vMin->tex_y);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
333 tmp_tey2 =( (i/(div_y)) * vMid->tex_y) +
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
334 ( ((div_y - i)/(div_y)) * vMin->tex_y);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
335
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
336 if (tmp_xpos > tmp_end) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
337 x = (int)tmp_end;
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
338 length = (int)(tmp_xpos)-(int)(tmp_end)+1;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
339 start_z = tmp_zpos;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
340 end_z = tmp_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
341 start_tex_x = tmp_tex2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
342 end_tex_x = tmp_tex1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
343 start_tex_y = tmp_tey2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
344 end_tex_y = tmp_tey1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
345 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
346 x = (int)tmp_xpos;
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
347 length = (int)(tmp_end)-(int)(tmp_xpos)+1;
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
348 start_z = tmp_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
349 end_z = tmp_zpos;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
350 start_tex_x = tmp_tex1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
351 end_tex_x = tmp_tex2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
352 start_tex_y = tmp_tey1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
353 end_tex_y = tmp_tey2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
354 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
355
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
356 smanager->dma_wait(SPAN_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
357
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
358 Span *span = &spack->span[spack->info.size++];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
359
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
360 span->tex_addr = tex_addr;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
361 span->tex_width = tex_width;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
362 span->tex_height = tex_height;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
363 span->x = x;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
364 span->y = y;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
365 span->length_x = length;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
366 span->start_z = start_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
367 span->end_z = end_z;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
368 span->tex_x1 = start_tex_x;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
369 span->tex_x2 = end_tex_x;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
370 span->tex_y1 = start_tex_y;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
371 span->tex_y2 = end_tex_y;
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
372
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
373 int scale = getScale(span->length_x, y_length,
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
374 span->tex_width, span->tex_height);
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
375 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
376 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
377
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
378
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
379 int
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
380 CreateSpan::run(void *rbuf, void *wbuf)
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
381 {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
382 PolygonPack *pp = (PolygonPack*)smanager->get_input(0);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
383 PolygonPack *next_pp =
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
384 (PolygonPack*)smanager->allocate(sizeof(PolygonPack));
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
385 PolygonPack *free_pp = next_pp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
386 PolygonPack *tmp_pp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
387
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
388 TrianglePackPtr triPack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
389 VertexPackPtr vMin, vMid, vMax;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
390 VertexPackPtr vMid10
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
391 = (VertexPackPtr)smanager->allocate(sizeof(VertexPack));
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
392
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
393 SpanPackPtr *spackList = (SpanPackPtr*)smanager->get_input(1);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
394 spack = (SpanPackPtr)smanager->get_input(2);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
395 send_spack = (SpanPackPtr)smanager->allocate(sizeof(SpanPack));
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
396 prev_index = get_param(0);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
397
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
398 // spack と send_spack は swap しながら DMA を繰り返すので
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
399 // 自分で allocate した send_spack を覚えてないといけない
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
400 SpanPackPtr free_spack = send_spack;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
401
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
402 int charge_y_top = get_param(1);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
403 int charge_y_end = get_param(2);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
404
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
405 do {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
406 if (pp->next != NULL) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
407 smanager->dma_load(next_pp, (uint32)pp->next,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
408 sizeof(PolygonPack), POLYGON_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
409 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
410 next_pp = NULL;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
411 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
412
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
413 for (int i = 0; i < pp->info.size; i++) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
414 triPack = &pp->tri[i];
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
415
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
416 #if 0
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
417 make_vertex(triPack, &vMin, &vMid, &vMax);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
418 #else
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
419 if (triPack->ver1.y <= triPack->ver2.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
420 if (triPack->ver2.y <= triPack->ver3.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
421 vMin = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
422 vMid = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
423 vMax = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
424 } else if (triPack->ver3.y <= triPack->ver1.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
425 vMin = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
426 vMid = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
427 vMax = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
428 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
429 vMin = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
430 vMid = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
431 vMax = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
432 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
433 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
434 if (triPack->ver1.y <= triPack->ver3.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
435 vMin = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
436 vMid = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
437 vMax = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
438 } else if (triPack->ver3.y <= triPack->ver2.y) {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
439 vMin = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
440 vMid = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
441 vMax = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
442 } else {
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
443 vMin = &triPack->ver2;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
444 vMid = &triPack->ver3;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
445 vMax = &triPack->ver1;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
446 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
447 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
448 #endif
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
449 make_vMid10(vMid10, vMin, vMid, vMax);
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
450
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
451 /**
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
452 * ポリゴンを、x軸に水平に分割して二つの三角形を作り、
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
453 * それぞれから Span を求める
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
454 *
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
455 * vMax
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
456 * |\
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
457 * | \
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
458 * | \
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
459 * | \
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
460 * vMid10 ------ vMid
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
461 * | /
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
462 * | /
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
463 * | /
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
464 * |/
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
465 * vMin
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
466 *
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
467 * (vMax, vMid, vMin) という triangle を
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
468 * (vMax, vMid, vMid10) (vMin, vMid, vMid10) という
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
469 * 二つの Triangle に分けている
133
435e0d24db39 DrawSpan のテクスチャ座標を求める部分で、width と height が逆に使われてた。
gongo@charles.cr.ie.u-ryukyu.ac.jp
parents: 113
diff changeset
470 */
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
471 half_triangle(spackList, charge_y_top, charge_y_end,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
472 triPack->tex_addr, triPack->tex_width,
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
473 triPack->tex_height, vMin, vMid, vMid10,
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
474 (int)(vMax->y - vMin->y));
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
475 half_triangle(spackList, charge_y_top, charge_y_end,
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
476 pp->tri[0].tex_addr, pp->tri[0].tex_width,
172
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
477 pp->tri[0].tex_height, vMax, vMid, vMid10,
c09f506bf5c9 CreateSpan に getScale を追加
gongo@localhost.localdomain
parents: 170
diff changeset
478 (int)(vMax->y - vMin->y));
109
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
479 }
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
480
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
481 smanager->dma_wait(POLYGON_PACK_LOAD);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
482
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
483 tmp_pp = pp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
484 pp = next_pp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
485 next_pp = tmp_pp;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
486 } while (pp);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
487
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
488 smanager->dma_wait(SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
489 smanager->dma_store(spack, (uint32)spackList[prev_index],
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
490 sizeof(SpanPack), SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
491 smanager->dma_wait(SPAN_PACK_STORE);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
492
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
493 free(free_pp);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
494 free(free_spack);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
495 free(vMid10);
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
496
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
497 return 0;
5c194c71eca8 Cerium cvs version
gongo@gendarme.local
parents:
diff changeset
498 }