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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.7 by root, Sat Aug 11 11:28:03 2007 UTC

… …
35 35
36struct _PangoOpenGLRenderer 36struct _PangoOpenGLRenderer
37{ 37{
38 PangoRenderer parent_instance; 38 PangoRenderer parent_instance;
39 float r, g, b, a; // modulate 39 float r, g, b, a; // modulate
40 GLuint curtex; // current texture 40 int flags;
41 rc_t *rc; // rendercache
42 rc_key_t key; // current render key
43 rc_array_t *arr;
41}; 44};
42 45
43G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER) 46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
44 47
45typedef struct 48typedef struct
… …
100} 103}
101 104
102static void 105static void
103font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index) 106font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index)
104{ 107{
108 FT_Face face;
109
105 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG) 110 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG)
106 { 111 {
107 PangoFontMetrics *metrics; 112 PangoFontMetrics *metrics;
108 113
109 if (!font) 114 if (!font)
… …
120 pango_font_metrics_unref (metrics); 125 pango_font_metrics_unref (metrics);
121 126
122 return; 127 return;
123 } 128 }
124 129
125 FT_Face face = pango_opengl_font_get_face (font); 130 face = pango_opengl_font_get_face (font);
126 131
127 if (face) 132 if (face)
128 { 133 {
129 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font; 134 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font;
130 135
… …
144} 149}
145 150
146typedef struct glyph_info { 151typedef struct glyph_info {
147 tc_area tex; 152 tc_area tex;
148 int left, top; 153 int left, top;
154 int generation;
149} glyph_info; 155} glyph_info;
150 156
151static void 157static void
152free_glyph_info (glyph_info *g) 158free_glyph_info (glyph_info *g)
153{ 159{
… …
157 163
158static void 164static void
159draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
160{ 166{
161 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g;
169 float x1, y1, x2, y2;
162 170
163 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
164 { 172 {
165 glyph = pango_opengl_get_unknown_glyph (font); 173 glyph = pango_opengl_get_unknown_glyph (font);
166 174
167 if (glyph == PANGO_GLYPH_EMPTY) 175 if (glyph == PANGO_GLYPH_EMPTY)
168 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 176 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
169 } 177 }
170 178
171 glyph_info *g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 179 g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
172 180
173 if (!g) 181 if (!g || g->generation != tc_generation)
174 { 182 {
175 Glyph bm; 183 Glyph bm;
176 font_render_glyph (&bm, font, glyph); 184 font_render_glyph (&bm, font, glyph);
177 185
186 if (g)
187 g->generation = tc_generation;
188 else
189 {
178 g = g_slice_new (glyph_info); 190 g = g_slice_new (glyph_info);
191
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 }
179 195
180 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
181 197
182 g->left = bm.left; 198 g->left = bm.left;
183 g->top = bm.top; 199 g->top = bm.top;
184
185 if (renderer->curtex)
186 {
187 glEnd ();
188 renderer->curtex = 0;
189 }
190 200
191 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
192 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
193 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
194 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap); 204 glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
195 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
196 glPixelStorei (GL_UNPACK_ALIGNMENT, 4); 206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
197
198 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
199 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
200 } 207 }
201 208
202 x += g->left; 209 x += g->left;
203 y -= g->top; 210 y -= g->top;
204 211
205 float x1 = g->tex.x * (1. / TC_WIDTH ); 212 x1 = g->tex.x * (1. / TC_WIDTH );
206 float y1 = g->tex.y * (1. / TC_HEIGHT); 213 y1 = g->tex.y * (1. / TC_HEIGHT);
207 float x2 = g->tex.w * (1. / TC_WIDTH ) + x1; 214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
208 float y2 = g->tex.h * (1. / TC_HEIGHT) + y1; 215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
209 216
210 if (g->tex.name != renderer->curtex) 217 if (g->tex.name != renderer->key.texname)
211 { 218 {
212 if (renderer->curtex)
213 glEnd ();
214
215 glBindTexture (GL_TEXTURE_2D, g->tex.name);
216 renderer->curtex = g->tex.name; 219 renderer->key.texname = g->tex.name;
217 glBegin (GL_QUADS); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
218 } 221 }
219 222
220 glTexCoord2f (x1, y1); glVertex2i (x , y ); 223 rc_t2f_v3f (x1, y1, x , y , 0);
221 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y ); 224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
222 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h); 225 rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0);
223 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h); 226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
224} 227}
225 228
226static void 229static void
227draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
228 PangoRenderPart part, 231 PangoRenderPart part,
… …
232 double y2, 235 double y2,
233 double x12, 236 double x12,
234 double x22) 237 double x22)
235{ 238{
236 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key;
241 rc_array_t *arr;
237 242
238 if (renderer->curtex) 243 key.mode = GL_QUADS;
239 { 244 key.format = GL_V2F;
240 glEnd (); 245 key.texname = 0;
241 renderer->curtex = 0;
242 }
243 246
244 glDisable (GL_TEXTURE_2D); 247 arr = rc_array (renderer->rc, &key);
245 248
246 glBegin (GL_QUADS); 249 rc_v2f (x11, y1);
247 glVertex2d (x11, y1); 250 rc_v2f (x21, y1);
248 glVertex2d (x12, y1); 251 rc_v2f (x22, y2);
249 glVertex2d (x22, y2); 252 rc_v2f (x12, y2);
250 glVertex2d (x21, y2);
251 glEnd ();
252
253 glEnable (GL_TEXTURE_2D);
254} 253}
255 254
256void 255void
257pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
258 int x, int y, 257 int x, int y,
259 float r, float g, float b, float a) 258 float r, float g, float b, float a,
259 int flags)
260{ 260{
261 PangoContext *context; 261 PangoContext *context;
262 PangoFontMap *fontmap; 262 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 263 PangoRenderer *renderer;
264 264
… …
268 268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 269 PANGO_OPENGL_RENDERER (renderer)->r = r;
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 270 PANGO_OPENGL_RENDERER (renderer)->g = g;
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 271 PANGO_OPENGL_RENDERER (renderer)->b = b;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 272 PANGO_OPENGL_RENDERER (renderer)->a = a;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags;
273 274
274 pango_renderer_draw_layout (renderer, layout, x, y); 275 pango_renderer_draw_layout (renderer, layout, x, y);
275} 276}
276 277
277void 278void
278pango_opengl_render_layout (PangoLayout *layout, 279pango_opengl_render_layout (PangoLayout *layout,
279 int x, int y, 280 int x, int y,
280 float r, float g, float b, float a) 281 float r, float g, float b, float a,
282 int flags)
281{ 283{
282 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);
283} 285}
284 286
285static void 287static void
286pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
287{ 289{
290 memset (&renderer->key, 0, sizeof (rc_key_t));
291
288 renderer->r = 1.; 292 renderer->r = 1.;
289 renderer->g = 1.; 293 renderer->g = 1.;
290 renderer->b = 1.; 294 renderer->b = 1.;
291 renderer->a = 1.; 295 renderer->a = 1.;
292} 296}
… …
295prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
296{ 300{
297 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer;
298 PangoColor *fg = 0; 302 PangoColor *fg = 0;
299 GSList *l; 303 GSList *l;
304 unsigned char r, g, b, a;
300 305
301 renderer->underline = PANGO_UNDERLINE_NONE; 306 renderer->underline = PANGO_UNDERLINE_NONE;
302 renderer->strikethrough = FALSE; 307 renderer->strikethrough = FALSE;
308
309 renderer->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F;
311 renderer->key.texname = 0;
303 312
304 for (l = run->item->analysis.extra_attrs; l; l = l->next) 313 for (l = run->item->analysis.extra_attrs; l; l = l->next)
305 { 314 {
306 PangoAttribute *attr = l->data; 315 PangoAttribute *attr = l->data;
307 316
… …
323 break; 332 break;
324 } 333 }
325 } 334 }
326 335
327 if (fg) 336 if (fg)
328 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 337 {
338 r = fg->red * (255.f / 65535.f);
339 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f);
341 }
329 else 342 else
330 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 343 {
344 r = glrenderer->r * 255.f;
345 g = glrenderer->g * 255.f;
346 b = glrenderer->b * 255.f;
347 }
348
349 a = glrenderer->a * 255.f;
350
351 if (glrenderer->flags & FLAG_INVERSE)
352 {
353 r ^= 0xffU;
354 g ^= 0xffU;
355 b ^= 0xffU;
356 }
357
358 renderer->key.r = r;
359 renderer->key.g = g;
360 renderer->key.b = b;
361 renderer->key.a = a;
331} 362}
332 363
333static void 364static void
334draw_begin (PangoRenderer *renderer_) 365draw_begin (PangoRenderer *renderer_)
335{ 366{
336 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
337
338 renderer->curtex = 0;
339 368
340 glEnable (GL_TEXTURE_2D); 369 glEnable (GL_TEXTURE_2D);
341 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 370 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
342 glEnable (GL_BLEND); 371 glEnable (GL_BLEND);
343 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 372 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
… …
349static void 378static void
350draw_end (PangoRenderer *renderer_) 379draw_end (PangoRenderer *renderer_)
351{ 380{
352 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
353 382
354 if (renderer->curtex) 383 rc_draw (renderer->rc);
355 glEnd ();
356 384
357 glDisable (GL_ALPHA_TEST); 385 glDisable (GL_ALPHA_TEST);
358 glDisable (GL_BLEND); 386 glDisable (GL_BLEND);
359 glDisable (GL_TEXTURE_2D); 387 glDisable (GL_TEXTURE_2D);
360} 388}

Diff Legend

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