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.10 by root, Sat Aug 11 12:07:54 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,
257 rc_t *rc,
268 int x, int y, 258 int x, int y,
269 float r, float g, float b, float a) 259 float r, float g, float b, float a,
260 int flags)
270{ 261{
271 PangoContext *context; 262 PangoContext *context;
272 PangoFontMap *fontmap; 263 PangoFontMap *fontmap;
273 PangoRenderer *renderer; 264 PangoRenderer *renderer;
265 PangoOpenGLRenderer *gl;
274 266
275 context = pango_layout_get_context (layout); 267 context = pango_layout_get_context (layout);
276 fontmap = pango_context_get_font_map (context); 268 fontmap = pango_context_get_font_map (context);
277 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));
278
279 PANGO_OPENGL_RENDERER (renderer)->r = r; 270 gl = PANGO_OPENGL_RENDERER (renderer);
280 PANGO_OPENGL_RENDERER (renderer)->g = g; 271
281 PANGO_OPENGL_RENDERER (renderer)->b = b; 272 gl->rc = rc;
282 PANGO_OPENGL_RENDERER (renderer)->a = a; 273 gl->r = r;
274 gl->g = g;
275 gl->b = b;
276 gl->a = a;
277 gl->flags = flags;
283 278
284 pango_renderer_draw_layout (renderer, layout, x, y); 279 pango_renderer_draw_layout (renderer, layout, x, y);
285} 280}
286 281
287void 282void
288pango_opengl_render_layout (PangoLayout *layout, 283pango_opengl_render_layout (PangoLayout *layout,
284 rc_t *rc,
289 int x, int y, 285 int x, int y,
290 float r, float g, float b, float a) 286 float r, float g, float b, float a,
287 int flags)
291{ 288{
292 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 289 pango_opengl_render_layout_subpixel (
290 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
291 );
293} 292}
294 293
295static void 294static void
296pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 295pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
297{ 296{
297 memset (&renderer->key, 0, sizeof (rc_key_t));
298
298 renderer->r = 1.; 299 renderer->r = 1.;
299 renderer->g = 1.; 300 renderer->g = 1.;
300 renderer->b = 1.; 301 renderer->b = 1.;
301 renderer->a = 1.; 302 renderer->a = 1.;
302} 303}
303 304
304static void 305static void
305prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 306prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
306{ 307{
307 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 308 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
308 PangoColor *fg = 0; 309 PangoColor *fg = 0;
309 GSList *l; 310 GSList *l;
311 unsigned char r, g, b, a;
310 312
311 renderer->underline = PANGO_UNDERLINE_NONE; 313 renderer->underline = PANGO_UNDERLINE_NONE;
312 renderer->strikethrough = FALSE; 314 renderer->strikethrough = FALSE;
315
316 gl->key.mode = GL_QUADS;
317 gl->key.format = GL_T2F_V3F;
318 gl->key.texname = 0;
313 319
314 for (l = run->item->analysis.extra_attrs; l; l = l->next) 320 for (l = run->item->analysis.extra_attrs; l; l = l->next)
315 { 321 {
316 PangoAttribute *attr = l->data; 322 PangoAttribute *attr = l->data;
317 323
… …
333 break; 339 break;
334 } 340 }
335 } 341 }
336 342
337 if (fg) 343 if (fg)
338 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 344 {
345 r = fg->red * (255.f / 65535.f);
346 g = fg->green * (255.f / 65535.f);
347 b = fg->blue * (255.f / 65535.f);
348 }
339 else 349 else
340 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 350 {
351 r = gl->r * 255.f;
352 g = gl->g * 255.f;
353 b = gl->b * 255.f;
354 }
355
356 a = gl->a * 255.f;
357
358 if (gl->flags & FLAG_INVERSE)
359 {
360 r ^= 0xffU;
361 g ^= 0xffU;
362 b ^= 0xffU;
363 }
364
365 gl->key.r = r;
366 gl->key.g = g;
367 gl->key.b = b;
368 gl->key.a = a;
341} 369}
342 370
343static void 371static void
344draw_begin (PangoRenderer *renderer_) 372draw_begin (PangoRenderer *renderer_)
345{ 373{
346 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 374 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} 375}
358 376
359static void 377static void
360draw_end (PangoRenderer *renderer_) 378draw_end (PangoRenderer *renderer_)
361{ 379{
362 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 380 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} 381}
371 382
372static void 383static void
373pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 384pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
374{ 385{

Diff Legend

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