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

Diff Legend

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