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

Diff Legend

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