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.7 by root, Sat Aug 11 11:28:03 2007 UTC vs.
Revision 1.10 by root, Sat Aug 11 12:07:54 2007 UTC

… …
218 { 218 {
219 renderer->key.texname = g->tex.name; 219 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 221 }
222 222
223 rc_t2f_v3f (x1, y1, x , y , 0); 223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0);
224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0); 224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0); 225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0); 226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
227} 227}
228 228
229static void 229static void
230draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 231 PangoRenderPart part,
… …
244 key.format = GL_V2F; 244 key.format = GL_V2F;
245 key.texname = 0; 245 key.texname = 0;
246 246
247 arr = rc_array (renderer->rc, &key); 247 arr = rc_array (renderer->rc, &key);
248 248
249 rc_v2f (x11, y1); 249 rc_v2f (arr, x11, y1);
250 rc_v2f (x21, y1); 250 rc_v2f (arr, x21, y1);
251 rc_v2f (x22, y2); 251 rc_v2f (arr, x22, y2);
252 rc_v2f (x12, y2); 252 rc_v2f (arr, x12, y2);
253} 253}
254 254
255void 255void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
257 rc_t *rc,
257 int x, int y, 258 int x, int y,
258 float r, float g, float b, float a, 259 float r, float g, float b, float a,
259 int flags) 260 int flags)
260{ 261{
261 PangoContext *context; 262 PangoContext *context;
262 PangoFontMap *fontmap; 263 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 264 PangoRenderer *renderer;
265 PangoOpenGLRenderer *gl;
264 266
265 context = pango_layout_get_context (layout); 267 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 268 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 269 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 270 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 271
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 272 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 273 gl->r = r;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 274 gl->g = g;
275 gl->b = b;
276 gl->a = a;
277 gl->flags = flags;
274 278
275 pango_renderer_draw_layout (renderer, layout, x, y); 279 pango_renderer_draw_layout (renderer, layout, x, y);
276} 280}
277 281
278void 282void
279pango_opengl_render_layout (PangoLayout *layout, 283pango_opengl_render_layout (PangoLayout *layout,
284 rc_t *rc,
280 int x, int y, 285 int x, int y,
281 float r, float g, float b, float a, 286 float r, float g, float b, float a,
282 int flags) 287 int flags)
283{ 288{
284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 289 pango_opengl_render_layout_subpixel (
290 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
291 );
285} 292}
286 293
287static void 294static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 295pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289{ 296{
… …
296} 303}
297 304
298static void 305static void
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 306prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 307{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 308 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 309 PangoColor *fg = 0;
303 GSList *l; 310 GSList *l;
304 unsigned char r, g, b, a; 311 unsigned char r, g, b, a;
305 312
306 renderer->underline = PANGO_UNDERLINE_NONE; 313 renderer->underline = PANGO_UNDERLINE_NONE;
307 renderer->strikethrough = FALSE; 314 renderer->strikethrough = FALSE;
308 315
309 renderer->key.mode = GL_QUADS; 316 gl->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F; 317 gl->key.format = GL_T2F_V3F;
311 renderer->key.texname = 0; 318 gl->key.texname = 0;
312 319
313 for (l = run->item->analysis.extra_attrs; l; l = l->next) 320 for (l = run->item->analysis.extra_attrs; l; l = l->next)
314 { 321 {
315 PangoAttribute *attr = l->data; 322 PangoAttribute *attr = l->data;
316 323
… …
339 g = fg->green * (255.f / 65535.f); 346 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f); 347 b = fg->blue * (255.f / 65535.f);
341 } 348 }
342 else 349 else
343 { 350 {
344 r = glrenderer->r * 255.f; 351 r = gl->r * 255.f;
345 g = glrenderer->g * 255.f; 352 g = gl->g * 255.f;
346 b = glrenderer->b * 255.f; 353 b = gl->b * 255.f;
347 } 354 }
348 355
349 a = glrenderer->a * 255.f; 356 a = gl->a * 255.f;
350 357
351 if (glrenderer->flags & FLAG_INVERSE) 358 if (gl->flags & FLAG_INVERSE)
352 { 359 {
353 r ^= 0xffU; 360 r ^= 0xffU;
354 g ^= 0xffU; 361 g ^= 0xffU;
355 b ^= 0xffU; 362 b ^= 0xffU;
356 } 363 }
357 364
358 renderer->key.r = r; 365 gl->key.r = r;
359 renderer->key.g = g; 366 gl->key.g = g;
360 renderer->key.b = b; 367 gl->key.b = b;
361 renderer->key.a = a; 368 gl->key.a = a;
362} 369}
363 370
364static void 371static void
365draw_begin (PangoRenderer *renderer_) 372draw_begin (PangoRenderer *renderer_)
366{ 373{
367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 374 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
368
369 glEnable (GL_TEXTURE_2D);
370 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
371 glEnable (GL_BLEND);
372 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
373 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
374 glEnable (GL_ALPHA_TEST);
375 glAlphaFunc (GL_GREATER, 0.01f);
376} 375}
377 376
378static void 377static void
379draw_end (PangoRenderer *renderer_) 378draw_end (PangoRenderer *renderer_)
380{ 379{
381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 380 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
382
383 rc_draw (renderer->rc);
384
385 glDisable (GL_ALPHA_TEST);
386 glDisable (GL_BLEND);
387 glDisable (GL_TEXTURE_2D);
388} 381}
389 382
390static void 383static void
391pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 384pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392{ 385{

Diff Legend

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