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.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.11 by root, Sun Aug 12 08:44:22 2007 UTC

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

Diff Legend

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