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.14 by root, Sun Jan 13 08:22:33 2008 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
199 if (bm.width && bm.height)
200 {
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
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 }
207 } 208 }
208 209
209 x += g->left; 210 x += g->left;
210 y -= g->top; 211 y -= g->top;
211 212
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) 213 if (g->tex.name != renderer->key.texname)
218 { 214 {
219 renderer->key.texname = g->tex.name; 215 renderer->key.texname = g->tex.name;
220 renderer->arr = rc_array (renderer->rc, &renderer->key); 216 renderer->arr = rc_array (renderer->rc, &renderer->key);
221 } 217 }
222 218
223 rc_t2f_v3f (x1, y1, x , y , 0); 219 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} 220}
228 221
229static void 222static void
230draw_trapezoid (PangoRenderer *renderer_, 223draw_trapezoid (PangoRenderer *renderer_,
231 PangoRenderPart part, 224 PangoRenderPart part,
… …
244 key.format = GL_V2F; 237 key.format = GL_V2F;
245 key.texname = 0; 238 key.texname = 0;
246 239
247 arr = rc_array (renderer->rc, &key); 240 arr = rc_array (renderer->rc, &key);
248 241
249 rc_v2f (x11, y1); 242 rc_v2f (arr, x11, y1);
250 rc_v2f (x21, y1); 243 rc_v2f (arr, x21, y1);
251 rc_v2f (x22, y2); 244 rc_v2f (arr, x22, y2);
252 rc_v2f (x12, y2); 245 rc_v2f (arr, x12, y2);
253} 246}
254 247
255void 248void
256pango_opengl_render_layout_subpixel (PangoLayout *layout, 249pango_opengl_render_layout_subpixel (PangoLayout *layout,
250 rc_t *rc,
257 int x, int y, 251 int x, int y,
258 float r, float g, float b, float a, 252 float r, float g, float b, float a,
259 int flags) 253 int flags)
260{ 254{
261 PangoContext *context; 255 PangoContext *context;
262 PangoFontMap *fontmap; 256 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 257 PangoRenderer *renderer;
258 PangoOpenGLRenderer *gl;
264 259
265 context = pango_layout_get_context (layout); 260 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 261 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 262 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 263 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 264
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 265 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 266 gl->r = r;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags; 267 gl->g = g;
268 gl->b = b;
269 gl->a = a;
270 gl->flags = flags;
274 271
275 pango_renderer_draw_layout (renderer, layout, x, y); 272 pango_renderer_draw_layout (renderer, layout, x, y);
276} 273}
277 274
278void 275void
279pango_opengl_render_layout (PangoLayout *layout, 276pango_opengl_render_layout (PangoLayout *layout,
277 rc_t *rc,
280 int x, int y, 278 int x, int y,
281 float r, float g, float b, float a, 279 float r, float g, float b, float a,
282 int flags) 280 int flags)
283{ 281{
284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags); 282 pango_opengl_render_layout_subpixel (
283 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
284 );
285} 285}
286 286
287static void 287static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
289{ 289{
… …
296} 296}
297 297
298static void 298static void
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 300{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 301 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 302 PangoColor *fg = 0;
303 GSList *l; 303 GSList *l;
304 unsigned char r, g, b, a; 304 unsigned char r, g, b, a;
305 305
306 renderer->underline = PANGO_UNDERLINE_NONE; 306 renderer->underline = PANGO_UNDERLINE_NONE;
307 renderer->strikethrough = FALSE; 307 renderer->strikethrough = FALSE;
308 308
309 renderer->key.mode = GL_QUADS; 309 gl->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F; 310 gl->key.format = 0; // glyphs
311 renderer->key.texname = 0; 311 gl->key.texname = 0;
312 312
313 for (l = run->item->analysis.extra_attrs; l; l = l->next) 313 for (l = run->item->analysis.extra_attrs; l; l = l->next)
314 { 314 {
315 PangoAttribute *attr = l->data; 315 PangoAttribute *attr = l->data;
316 316
… …
339 g = fg->green * (255.f / 65535.f); 339 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f); 340 b = fg->blue * (255.f / 65535.f);
341 } 341 }
342 else 342 else
343 { 343 {
344 r = glrenderer->r * 255.f; 344 r = gl->r * 255.f;
345 g = glrenderer->g * 255.f; 345 g = gl->g * 255.f;
346 b = glrenderer->b * 255.f; 346 b = gl->b * 255.f;
347 } 347 }
348 348
349 a = glrenderer->a * 255.f; 349 a = gl->a * 255.f;
350 350
351 if (glrenderer->flags & FLAG_INVERSE) 351 if (gl->flags & FLAG_INVERSE)
352 { 352 {
353 r ^= 0xffU; 353 r ^= 0xffU;
354 g ^= 0xffU; 354 g ^= 0xffU;
355 b ^= 0xffU; 355 b ^= 0xffU;
356 } 356 }
357 357
358 renderer->key.r = r; 358 gl->key.r = r;
359 renderer->key.g = g; 359 gl->key.g = g;
360 renderer->key.b = b; 360 gl->key.b = b;
361 renderer->key.a = a; 361 gl->key.a = a;
362} 362}
363 363
364static void 364static void
365draw_begin (PangoRenderer *renderer_) 365draw_begin (PangoRenderer *renderer_)
366{ 366{
367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 367 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} 368}
377 369
378static void 370static void
379draw_end (PangoRenderer *renderer_) 371draw_end (PangoRenderer *renderer_)
380{ 372{
381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 373 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} 374}
389 375
390static void 376static void
391pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 377pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
392{ 378{

Diff Legend

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