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.13 by root, Wed Dec 26 10:34:23 2007 UTC

… …
164static void 164static void
165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
166{ 166{
167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g; 168 glyph_info *g;
169 float x1, y1, x2, y2;
170 169
171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 170 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
172 { 171 {
173 glyph = pango_opengl_get_unknown_glyph (font); 172 glyph = pango_opengl_get_unknown_glyph (font);
174 173
… …
181 if (!g || g->generation != tc_generation) 180 if (!g || g->generation != tc_generation)
182 { 181 {
183 Glyph bm; 182 Glyph bm;
184 font_render_glyph (&bm, font, glyph); 183 font_render_glyph (&bm, font, glyph);
185 184
186 if (g) 185 if (!g)
187 g->generation = tc_generation;
188 else
189 { 186 {
190 g = g_slice_new (glyph_info); 187 g = g_slice_new (glyph_info);
191 188
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 189 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 190 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 } 191 }
195 192
193 g->generation = tc_generation;
196 tc_get (&g->tex, bm.width, bm.height); 194 tc_get (&g->tex, bm.width, bm.height);
197 195
198 g->left = bm.left; 196 g->left = bm.left;
199 g->top = bm.top; 197 g->top = bm.top;
200 198
… …
207 } 205 }
208 206
209 x += g->left; 207 x += g->left;
210 y -= g->top; 208 y -= g->top;
211 209
212 x1 = g->tex.x * (1. / TC_WIDTH );
213 y1 = g->tex.y * (1. / TC_HEIGHT);
214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
216
217 if (g->tex.name != renderer->key.texname) 210 if (g->tex.name != renderer->key.texname)
218 { 211 {
219 renderer->key.texname = g->tex.name; 212 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 213 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 214 }
222 215
223 rc_t2f_v3f (x1, y1, x , y , 0); 216 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
227} 217}
228 218
229static void 219static void
230draw_trapezoid (PangoRenderer *renderer_, 220draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 221 PangoRenderPart part,
… …
244 key.format = GL_V2F; 234 key.format = GL_V2F;
245 key.texname = 0; 235 key.texname = 0;
246 236
247 arr = rc_array (renderer->rc, &key); 237 arr = rc_array (renderer->rc, &key);
248 238
249 rc_v2f (x11, y1); 239 rc_v2f (arr, x11, y1);
250 rc_v2f (x21, y1); 240 rc_v2f (arr, x21, y1);
251 rc_v2f (x22, y2); 241 rc_v2f (arr, x22, y2);
252 rc_v2f (x12, y2); 242 rc_v2f (arr, x12, y2);
253} 243}
254 244
255void 245void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 246pango_opengl_render_layout_subpixel (PangoLayout *layout,
247 rc_t *rc,
257 int x, int y, 248 int x, int y,
258 float r, float g, float b, float a, 249 float r, float g, float b, float a,
259 int flags) 250 int flags)
260{ 251{
261 PangoContext *context; 252 PangoContext *context;
262 PangoFontMap *fontmap; 253 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 254 PangoRenderer *renderer;
255 PangoOpenGLRenderer *gl;
264 256
265 context = pango_layout_get_context (layout); 257 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 258 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 259 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 260 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 261
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 262 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 263 gl->r = r;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 264 gl->g = g;
265 gl->b = b;
266 gl->a = a;
267 gl->flags = flags;
274 268
275 pango_renderer_draw_layout (renderer, layout, x, y); 269 pango_renderer_draw_layout (renderer, layout, x, y);
276} 270}
277 271
278void 272void
279pango_opengl_render_layout (PangoLayout *layout, 273pango_opengl_render_layout (PangoLayout *layout,
274 rc_t *rc,
280 int x, int y, 275 int x, int y,
281 float r, float g, float b, float a, 276 float r, float g, float b, float a,
282 int flags) 277 int flags)
283{ 278{
284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 279 pango_opengl_render_layout_subpixel (
280 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
281 );
285} 282}
286 283
287static void 284static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 285pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289{ 286{
… …
296} 293}
297 294
298static void 295static void
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 296prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 297{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 298 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 299 PangoColor *fg = 0;
303 GSList *l; 300 GSList *l;
304 unsigned char r, g, b, a; 301 unsigned char r, g, b, a;
305 302
306 renderer->underline = PANGO_UNDERLINE_NONE; 303 renderer->underline = PANGO_UNDERLINE_NONE;
307 renderer->strikethrough = FALSE; 304 renderer->strikethrough = FALSE;
308 305
309 renderer->key.mode = GL_QUADS; 306 gl->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F; 307 gl->key.format = 0; // glyphs
311 renderer->key.texname = 0; 308 gl->key.texname = 0;
312 309
313 for (l = run->item->analysis.extra_attrs; l; l = l->next) 310 for (l = run->item->analysis.extra_attrs; l; l = l->next)
314 { 311 {
315 PangoAttribute *attr = l->data; 312 PangoAttribute *attr = l->data;
316 313
… …
339 g = fg->green * (255.f / 65535.f); 336 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f); 337 b = fg->blue * (255.f / 65535.f);
341 } 338 }
342 else 339 else
343 { 340 {
344 r = glrenderer->r * 255.f; 341 r = gl->r * 255.f;
345 g = glrenderer->g * 255.f; 342 g = gl->g * 255.f;
346 b = glrenderer->b * 255.f; 343 b = gl->b * 255.f;
347 } 344 }
348 345
349 a = glrenderer->a * 255.f; 346 a = gl->a * 255.f;
350 347
351 if (glrenderer->flags & FLAG_INVERSE) 348 if (gl->flags & FLAG_INVERSE)
352 { 349 {
353 r ^= 0xffU; 350 r ^= 0xffU;
354 g ^= 0xffU; 351 g ^= 0xffU;
355 b ^= 0xffU; 352 b ^= 0xffU;
356 } 353 }
357 354
358 renderer->key.r = r; 355 gl->key.r = r;
359 renderer->key.g = g; 356 gl->key.g = g;
360 renderer->key.b = b; 357 gl->key.b = b;
361 renderer->key.a = a; 358 gl->key.a = a;
362} 359}
363 360
364static void 361static void
365draw_begin (PangoRenderer *renderer_) 362draw_begin (PangoRenderer *renderer_)
366{ 363{
367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 364 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} 365}
377 366
378static void 367static void
379draw_end (PangoRenderer *renderer_) 368draw_end (PangoRenderer *renderer_)
380{ 369{
381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 370 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} 371}
389 372
390static void 373static void
391pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 374pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392{ 375{

Diff Legend

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