ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/rendercache.c
(Generate patch)

Comparing deliantra/Deliantra-Client/rendercache.c (file contents):
Revision 1.5 by root, Sun Aug 12 08:49:51 2007 UTC vs.
Revision 1.10 by root, Thu Oct 14 00:02:39 2010 UTC

1typedef struct { 1typedef struct {
2 GLenum mode; 2 GLenum mode;
3 GLenum format; // 0, GL_T2F_V3F, GL_V2F 3 GLenum format; // 0, GL_T2F_V3F, GL_V2F
4 GLint texname; 4 GLuint texname;
5 unsigned char r, g, b, a; 5 unsigned char r, g, b, a;
6} rc_key_t; 6} rc_key_t;
7 7
8typedef struct { 8typedef struct {
9 HV *hv; 9 HV *hv;
10} rc_t; 10} rc_t;
11 11
12typedef SV rc_array_t; 12typedef SV rc_array_t;
13 13
14static rc_t * 14static rc_t *
15rc_alloc () 15rc_alloc (void)
16{ 16{
17 rc_t *rc = g_slice_new0 (rc_t); 17 rc_t *rc = g_slice_new0 (rc_t);
18 rc->hv = newHV (); 18 rc->hv = newHV ();
19 19
20 return rc; 20 return rc;
… …
40 40
41 if (SvTYPE (sv) != SVt_PV) 41 if (SvTYPE (sv) != SVt_PV)
42 { 42 {
43 sv_upgrade (sv, SVt_PV); 43 sv_upgrade (sv, SVt_PV);
44 SvPOK_only (sv); 44 SvPOK_only (sv);
45 sv_grow (sv, 512);
45 } 46 }
46 47
47 return sv; 48 return sv;
48} 49}
49 50
50static void 51static void
51rc_v2f (rc_array_t *arr, float x, float y) 52rc_v2f (rc_array_t *arr, float x, float y)
52{ 53{
53 STRLEN len = SvCUR (arr) + sizeof (float) * 2; 54 char *end = fast_sv_grow (arr, sizeof (float) * 2);
54 SvGROW (arr, len);
55 55
56 ((float *)SvEND (arr))[0] = x; 56 ((float *)end)[0] = x;
57 ((float *)SvEND (arr))[1] = y; 57 ((float *)end)[1] = y;
58
59 SvCUR_set (arr, len);
60} 58}
61 59
62static void 60static void
63rc_t2f_v3f (rc_array_t *arr, float u, float v, float x, float y, float z) 61rc_t2f_v3f (rc_array_t *arr, float u, float v, float x, float y, float z)
64{ 62{
65 STRLEN len = SvCUR (arr) + sizeof (float) * 5; 63 char *end = fast_sv_grow (arr, sizeof (float) * 5);
66 SvGROW (arr, len);
67 64
68 ((float *)SvEND (arr))[0] = u; 65 ((float *)end)[0] = u;
69 ((float *)SvEND (arr))[1] = v; 66 ((float *)end)[1] = v;
70 67
71 ((float *)SvEND (arr))[2] = x; 68 ((float *)end)[2] = x;
72 ((float *)SvEND (arr))[3] = y; 69 ((float *)end)[3] = y;
73 ((float *)SvEND (arr))[4] = z; 70 ((float *)end)[4] = z;
74
75 SvCUR_set (arr, len);
76} 71}
77 72
78static void 73static void
79rc_glyph (rc_array_t *arr, int u, int v, int w, int h, int x, int y) 74rc_glyph (rc_array_t *arr, int u, int v, int w, int h, int x, int y)
80{ 75{
81 U8 *c; 76 if (w && h)
82 STRLEN len = SvCUR (arr); 77 {
83 SvGROW (arr, len + 2 * 2 + 1 * 4); 78 U8 *c = (U8 *)fast_sv_grow (arr, 4 + 4);
84 c = (U8 *)SvEND (arr);
85 79
86 *c++ = u; 80 x += w;
87 *c++ = v; 81 y += h;
88 *c++ = w;
89 *c++ = h;
90 82
91 // use ber-encoding for up to 14 bits (16k) 83 *c++ = u;
92 *c = 0x80 | (x >> 7); c += (x >> 7) ? 1 : 0; *c++ = x & 0x7f; 84 *c++ = v;
93 *c = 0x80 | (y >> 7); c += (y >> 7) ? 1 : 0; *c++ = y & 0x7f; 85 *c++ = w;
86 *c++ = h;
94 87
88 // use ber-encoding for up to 14 bits (16k)
89 *c = 0x80 | (x >> 7); c += (x >> 7) ? 1 : 0; *c++ = x & 0x7f;
90 *c = 0x80 | (y >> 7); c += (y >> 7) ? 1 : 0; *c++ = y & 0x7f;
91
95 SvCUR_set (arr, c - (U8 *)SvPVX (arr)); 92 SvCUR_set (arr, c - (U8 *)SvPVX (arr));
93 }
96} 94}
97 95
98static void 96static void
99rc_draw (rc_t *rc) 97rc_draw (rc_t *rc)
100{ 98{
… …
149 h = *c++; 147 h = *c++;
150 148
151 x = *c++; if (x > 0x7f) x = ((x & 0x7f) << 7) | *c++; 149 x = *c++; if (x > 0x7f) x = ((x & 0x7f) << 7) | *c++;
152 y = *c++; if (y > 0x7f) y = ((y & 0x7f) << 7) | *c++; 150 y = *c++; if (y > 0x7f) y = ((y & 0x7f) << 7) | *c++;
153 151
152 x -= w;
153 y -= h;
154
154 glTexCoord2f ( u * (1.f / TC_WIDTH), v * (1.f / TC_HEIGHT)); glVertex2i (x , y ); 155 glTexCoord2f ( u * (1.f / TC_WIDTH), v * (1.f / TC_HEIGHT)); glVertex2i (x , y );
155 glTexCoord2f ((u + w) * (1.f / TC_WIDTH), v * (1.f / TC_HEIGHT)); glVertex2i (x + w, y ); 156 glTexCoord2f ((u + w) * (1.f / TC_WIDTH), v * (1.f / TC_HEIGHT)); glVertex2i (x + w, y );
156 glTexCoord2f ((u + w) * (1.f / TC_WIDTH), (v + h) * (1.f / TC_HEIGHT)); glVertex2i (x + w, y + h); 157 glTexCoord2f ((u + w) * (1.f / TC_WIDTH), (v + h) * (1.f / TC_HEIGHT)); glVertex2i (x + w, y + h);
157 glTexCoord2f ( u * (1.f / TC_WIDTH), (v + h) * (1.f / TC_HEIGHT)); glVertex2i (x , y + h); 158 glTexCoord2f ( u * (1.f / TC_WIDTH), (v + h) * (1.f / TC_HEIGHT)); glVertex2i (x , y + h);
158 } 159 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines