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.9 by root, Sat Aug 11 11:41:24 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 (renderer->arr, 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 (renderer->arr, x2, y1, x + g->tex.w, y , 0);
225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
226 rc_t2f_v3f (renderer->arr, 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,
… …
252 rc_v2f (arr, 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;
… …
266 context = pango_layout_get_context (layout); 257 context = pango_layout_get_context (layout);
267 fontmap = pango_context_get_font_map (context); 258 fontmap = pango_context_get_font_map (context);
268 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));
269 gl = PANGO_OPENGL_RENDERER (renderer); 260 gl = PANGO_OPENGL_RENDERER (renderer);
270 261
271 gl->rc = rc_alloc (); 262 gl->rc = rc;
272 gl->r = r; 263 gl->r = r;
273 gl->g = g; 264 gl->g = g;
274 gl->b = b; 265 gl->b = b;
275 gl->a = a; 266 gl->a = a;
276 gl->flags = flags; 267 gl->flags = flags;
277 268
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
286 pango_renderer_draw_layout (renderer, layout, x, y); 269 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);
295} 270}
296 271
297void 272void
298pango_opengl_render_layout (PangoLayout *layout, 273pango_opengl_render_layout (PangoLayout *layout,
274 rc_t *rc,
299 int x, int y, 275 int x, int y,
300 float r, float g, float b, float a, 276 float r, float g, float b, float a,
301 int flags) 277 int flags)
302{ 278{
303 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 );
304} 282}
305 283
306static void 284static void
307pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 285pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
308{ 286{
… …
324 302
325 renderer->underline = PANGO_UNDERLINE_NONE; 303 renderer->underline = PANGO_UNDERLINE_NONE;
326 renderer->strikethrough = FALSE; 304 renderer->strikethrough = FALSE;
327 305
328 gl->key.mode = GL_QUADS; 306 gl->key.mode = GL_QUADS;
329 gl->key.format = GL_T2F_V3F; 307 gl->key.format = 0; // glyphs
330 gl->key.texname = 0; 308 gl->key.texname = 0;
331 309
332 for (l = run->item->analysis.extra_attrs; l; l = l->next) 310 for (l = run->item->analysis.extra_attrs; l; l = l->next)
333 { 311 {
334 PangoAttribute *attr = l->data; 312 PangoAttribute *attr = l->data;

Diff Legend

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