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.2 by root, Sat Aug 11 11:41:24 2007 UTC vs.
Revision 1.5 by root, Sun Aug 12 08:49:51 2007 UTC

1typedef struct { 1typedef struct {
2 GLenum mode; 2 GLenum mode;
3 GLenum format; // GL_T2F_V3F, GL_V2F 3 GLenum format; // 0, GL_T2F_V3F, GL_V2F
4 GLint texname; 4 GLint 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 {
… …
74 74
75 SvCUR_set (arr, len); 75 SvCUR_set (arr, len);
76} 76}
77 77
78static void 78static void
79rc_glyph (rc_array_t *arr, int u, int v, int w, int h, int x, int y)
80{
81 U8 *c;
82 STRLEN len = SvCUR (arr);
83 SvGROW (arr, len + 2 * 2 + 1 * 4);
84 c = (U8 *)SvEND (arr);
85
86 *c++ = u;
87 *c++ = v;
88 *c++ = w;
89 *c++ = h;
90
91 // use ber-encoding for up to 14 bits (16k)
92 *c = 0x80 | (x >> 7); c += (x >> 7) ? 1 : 0; *c++ = x & 0x7f;
93 *c = 0x80 | (y >> 7); c += (y >> 7) ? 1 : 0; *c++ = y & 0x7f;
94
95 SvCUR_set (arr, c - (U8 *)SvPVX (arr));
96}
97
98static void
79rc_draw (rc_t *rc) 99rc_draw (rc_t *rc)
80{ 100{
81 HE *he; 101 HE *he;
82 102
83 hv_iterinit (rc->hv); 103 hv_iterinit (rc->hv);
… …
87 rc_array_t *arr = HeVAL (he); 107 rc_array_t *arr = HeVAL (he);
88 STRLEN len; 108 STRLEN len;
89 char *arr_pv = SvPV (arr, len); 109 char *arr_pv = SvPV (arr, len);
90 GLsizei stride; 110 GLsizei stride;
91 111
92 stride = key->format == GL_T2F_V3F ? sizeof (float) * 5
93 : key->format == GL_V2F ? sizeof (float) * 2
94 : 65536;
95
96 if (key->texname) 112 if (key->texname)
97 { 113 {
98 glBindTexture (GL_TEXTURE_2D, key->texname); 114 glBindTexture (GL_TEXTURE_2D, key->texname);
99 glEnable (GL_TEXTURE_2D); 115 glEnable (GL_TEXTURE_2D);
100 } 116 }
101 else 117 else
102 glDisable (GL_TEXTURE_2D); 118 glDisable (GL_TEXTURE_2D);
103 119
104 glColor4ub (key->r, key->g, key->b, key->a); 120 glColor4ub (key->r, key->g, key->b, key->a);
121
122 if (key->format)
123 {
124 stride = key->format == GL_T2F_V3F ? sizeof (float) * 5
125 : key->format == GL_V2F ? sizeof (float) * 2
126 : 65536;
127
105 glInterleavedArrays (key->format, 0, (void *)arr_pv); 128 glInterleavedArrays (key->format, 0, (void *)arr_pv);
129 //glLockArraysEXT (0, len / stride);
106 glDrawArrays (key->mode, 0, len / stride); 130 glDrawArrays (key->mode, 0, len / stride);
131 //glUnlockArraysEXT ();
132 }
133 else
134 {
135 // optimised character quad storage. slower but nice on memory.
136 // reduces storage requirements from 80 bytes/char to 6-8
137 U8 *c = (U8 *)arr_pv;
138 U8 *e = c + len;
139
140 glBegin (key->mode); // practically must be quads
141
142 while (c < e)
143 {
144 int u, v, x, y, w, h;
145
146 u = *c++;
147 v = *c++;
148 w = *c++;
149 h = *c++;
150
151 x = *c++; if (x > 0x7f) x = ((x & 0x7f) << 7) | *c++;
152 y = *c++; if (y > 0x7f) y = ((y & 0x7f) << 7) | *c++;
153
154 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 + 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 }
159
160 glEnd ();
161 }
107 } 162 }
108 163
109 glDisable (GL_TEXTURE_2D); 164 glDisable (GL_TEXTURE_2D);
110} 165}
111 166

Diff Legend

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