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.3 by root, Tue Jul 4 23:56:34 2006 UTC vs.
Revision 1.9 by root, Sat Aug 11 11:41:24 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
… …
193 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
194 197
195 g->left = bm.left; 198 g->left = bm.left;
196 g->top = bm.top; 199 g->top = bm.top;
197 200
198 if (renderer->curtex)
199 {
200 glEnd ();
201 renderer->curtex = 0;
202 }
203
204 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
205 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
206 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
207 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);
208 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
… …
215 x1 = g->tex.x * (1. / TC_WIDTH ); 212 x1 = g->tex.x * (1. / TC_WIDTH );
216 y1 = g->tex.y * (1. / TC_HEIGHT); 213 y1 = g->tex.y * (1. / TC_HEIGHT);
217 x2 = g->tex.w * (1. / TC_WIDTH ) + x1; 214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
218 y2 = g->tex.h * (1. / TC_HEIGHT) + y1; 215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
219 216
220 if (g->tex.name != renderer->curtex) 217 if (g->tex.name != renderer->key.texname)
221 { 218 {
222 if (renderer->curtex)
223 glEnd ();
224
225 glBindTexture (GL_TEXTURE_2D, g->tex.name);
226 renderer->curtex = g->tex.name; 219 renderer->key.texname = g->tex.name;
227 glBegin (GL_QUADS); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
228 } 221 }
229 222
230 glTexCoord2f (x1, y1); glVertex2i (x , y ); 223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0);
231 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y ); 224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
232 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h); 225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
233 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h); 226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
234} 227}
235 228
236static void 229static void
237draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
238 PangoRenderPart part, 231 PangoRenderPart part,
… …
242 double y2, 235 double y2,
243 double x12, 236 double x12,
244 double x22) 237 double x22)
245{ 238{
246 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key;
241 rc_array_t *arr;
247 242
248 if (renderer->curtex) 243 key.mode = GL_QUADS;
249 { 244 key.format = GL_V2F;
250 glEnd (); 245 key.texname = 0;
251 renderer->curtex = 0;
252 }
253 246
254 glDisable (GL_TEXTURE_2D); 247 arr = rc_array (renderer->rc, &key);
255 248
256 glBegin (GL_QUADS); 249 rc_v2f (arr, x11, y1);
257 glVertex2d (x11, y1); 250 rc_v2f (arr, x21, y1);
258 glVertex2d (x12, y1); 251 rc_v2f (arr, x22, y2);
259 glVertex2d (x22, y2); 252 rc_v2f (arr, x12, y2);
260 glVertex2d (x21, y2);
261 glEnd ();
262
263 glEnable (GL_TEXTURE_2D);
264} 253}
265 254
266void 255void
267pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
268 int x, int y, 257 int x, int y,
269 float r, float g, float b, float a) 258 float r, float g, float b, float a,
259 int flags)
270{ 260{
271 PangoContext *context; 261 PangoContext *context;
272 PangoFontMap *fontmap; 262 PangoFontMap *fontmap;
273 PangoRenderer *renderer; 263 PangoRenderer *renderer;
264 PangoOpenGLRenderer *gl;
274 265
275 context = pango_layout_get_context (layout); 266 context = pango_layout_get_context (layout);
276 fontmap = pango_context_get_font_map (context); 267 fontmap = pango_context_get_font_map (context);
277 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 268 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
278
279 PANGO_OPENGL_RENDERER (renderer)->r = r; 269 gl = PANGO_OPENGL_RENDERER (renderer);
280 PANGO_OPENGL_RENDERER (renderer)->g = g; 270
281 PANGO_OPENGL_RENDERER (renderer)->b = b; 271 gl->rc = rc_alloc ();
282 PANGO_OPENGL_RENDERER (renderer)->a = a; 272 gl->r = r;
273 gl->g = g;
274 gl->b = b;
275 gl->a = a;
276 gl->flags = flags;
283 277
278 glEnable (GL_TEXTURE_2D);
279 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
280 glEnable (GL_BLEND);
281 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
282 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
283 glEnable (GL_ALPHA_TEST);
284 glAlphaFunc (GL_GREATER, 0.01f);
285
284 pango_renderer_draw_layout (renderer, layout, x, y); 286 pango_renderer_draw_layout (renderer, layout, x, y);
287
288 rc_draw (gl->rc);
289
290 glDisable (GL_ALPHA_TEST);
291 glDisable (GL_BLEND);
292 glDisable (GL_TEXTURE_2D);
293
294 rc_free (gl->rc);
285} 295}
286 296
287void 297void
288pango_opengl_render_layout (PangoLayout *layout, 298pango_opengl_render_layout (PangoLayout *layout,
289 int x, int y, 299 int x, int y,
290 float r, float g, float b, float a) 300 float r, float g, float b, float a,
301 int flags)
291{ 302{
292 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 303 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);
293} 304}
294 305
295static void 306static void
296pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 307pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
297{ 308{
309 memset (&renderer->key, 0, sizeof (rc_key_t));
310
298 renderer->r = 1.; 311 renderer->r = 1.;
299 renderer->g = 1.; 312 renderer->g = 1.;
300 renderer->b = 1.; 313 renderer->b = 1.;
301 renderer->a = 1.; 314 renderer->a = 1.;
302} 315}
303 316
304static void 317static void
305prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 318prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
306{ 319{
307 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 320 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
308 PangoColor *fg = 0; 321 PangoColor *fg = 0;
309 GSList *l; 322 GSList *l;
323 unsigned char r, g, b, a;
310 324
311 renderer->underline = PANGO_UNDERLINE_NONE; 325 renderer->underline = PANGO_UNDERLINE_NONE;
312 renderer->strikethrough = FALSE; 326 renderer->strikethrough = FALSE;
327
328 gl->key.mode = GL_QUADS;
329 gl->key.format = GL_T2F_V3F;
330 gl->key.texname = 0;
313 331
314 for (l = run->item->analysis.extra_attrs; l; l = l->next) 332 for (l = run->item->analysis.extra_attrs; l; l = l->next)
315 { 333 {
316 PangoAttribute *attr = l->data; 334 PangoAttribute *attr = l->data;
317 335
… …
333 break; 351 break;
334 } 352 }
335 } 353 }
336 354
337 if (fg) 355 if (fg)
338 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 356 {
357 r = fg->red * (255.f / 65535.f);
358 g = fg->green * (255.f / 65535.f);
359 b = fg->blue * (255.f / 65535.f);
360 }
339 else 361 else
340 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 362 {
363 r = gl->r * 255.f;
364 g = gl->g * 255.f;
365 b = gl->b * 255.f;
366 }
367
368 a = gl->a * 255.f;
369
370 if (gl->flags & FLAG_INVERSE)
371 {
372 r ^= 0xffU;
373 g ^= 0xffU;
374 b ^= 0xffU;
375 }
376
377 gl->key.r = r;
378 gl->key.g = g;
379 gl->key.b = b;
380 gl->key.a = a;
341} 381}
342 382
343static void 383static void
344draw_begin (PangoRenderer *renderer_) 384draw_begin (PangoRenderer *renderer_)
345{ 385{
346 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 386 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
347
348 renderer->curtex = 0;
349
350 glEnable (GL_TEXTURE_2D);
351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
352 glEnable (GL_BLEND);
353 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
354 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
355 glEnable (GL_ALPHA_TEST);
356 glAlphaFunc (GL_GREATER, 0.01f);
357} 387}
358 388
359static void 389static void
360draw_end (PangoRenderer *renderer_) 390draw_end (PangoRenderer *renderer_)
361{ 391{
362 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 392 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
363
364 if (renderer->curtex)
365 glEnd ();
366
367 glDisable (GL_ALPHA_TEST);
368 glDisable (GL_BLEND);
369 glDisable (GL_TEXTURE_2D);
370} 393}
371 394
372static void 395static void
373pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 396pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
374{ 397{

Diff Legend

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