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.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.10 by root, Sat Aug 11 12:07:54 2007 UTC

… …
35 35
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 GLuint curtex; // current texture 40 int flags;
41 rc_t *rc; // rendercache
42 rc_key_t key; // current render key
43 rc_array_t *arr;
41}; 44};
42 45
43G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER) 46G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
44 47
45typedef struct 48typedef struct
… …
100} 103}
101 104
102static void 105static void
103font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index) 106font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index)
104{ 107{
108 FT_Face face;
109
105 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG) 110 if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG)
106 { 111 {
107 PangoFontMetrics *metrics; 112 PangoFontMetrics *metrics;
108 113
109 if (!font) 114 if (!font)
… …
120 pango_font_metrics_unref (metrics); 125 pango_font_metrics_unref (metrics);
121 126
122 return; 127 return;
123 } 128 }
124 129
125 FT_Face face = pango_opengl_font_get_face (font); 130 face = pango_opengl_font_get_face (font);
126 131
127 if (face) 132 if (face)
128 { 133 {
129 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font; 134 PangoOpenGLFont *glfont = (PangoOpenGLFont *)font;
130 135
… …
144} 149}
145 150
146typedef struct glyph_info { 151typedef struct glyph_info {
147 tc_area tex; 152 tc_area tex;
148 int left, top; 153 int left, top;
154 int generation;
149} glyph_info; 155} glyph_info;
150 156
151static void 157static void
152free_glyph_info (glyph_info *g) 158free_glyph_info (glyph_info *g)
153{ 159{
… …
157 163
158static void 164static void
159draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) 165draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y)
160{ 166{
161 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); 167 PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
168 glyph_info *g;
169 float x1, y1, x2, y2;
162 170
163 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) 171 if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
164 { 172 {
165 glyph = pango_opengl_get_unknown_glyph (font); 173 glyph = pango_opengl_get_unknown_glyph (font);
166 174
167 if (glyph == PANGO_GLYPH_EMPTY) 175 if (glyph == PANGO_GLYPH_EMPTY)
168 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 176 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
169 } 177 }
170 178
171 glyph_info *g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 179 g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
172 180
173 if (!g) 181 if (!g || g->generation != tc_generation)
174 { 182 {
175 Glyph bm; 183 Glyph bm;
176 font_render_glyph (&bm, font, glyph); 184 font_render_glyph (&bm, font, glyph);
177 185
186 if (g)
187 g->generation = tc_generation;
188 else
189 {
178 g = g_slice_new (glyph_info); 190 g = g_slice_new (glyph_info);
191
192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
194 }
179 195
180 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
181 197
182 g->left = bm.left; 198 g->left = bm.left;
183 g->top = bm.top; 199 g->top = bm.top;
184
185 if (renderer->curtex)
186 {
187 glEnd ();
188 renderer->curtex = 0;
189 }
190 200
191 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
192 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
193 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
194 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);
195 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
196 glPixelStorei (GL_UNPACK_ALIGNMENT, 4); 206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
197
198 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
199 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
200 } 207 }
201 208
202 x += g->left; 209 x += g->left;
203 y -= g->top; 210 y -= g->top;
204 211
205 float x1 = g->tex.x * (1. / TC_WIDTH ); 212 x1 = g->tex.x * (1. / TC_WIDTH );
206 float y1 = g->tex.y * (1. / TC_HEIGHT); 213 y1 = g->tex.y * (1. / TC_HEIGHT);
207 float x2 = g->tex.w * (1. / TC_WIDTH ) + x1; 214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
208 float y2 = g->tex.h * (1. / TC_HEIGHT) + y1; 215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
209 216
210 if (g->tex.name != renderer->curtex) 217 if (g->tex.name != renderer->key.texname)
211 { 218 {
212 if (renderer->curtex)
213 glEnd ();
214
215 glBindTexture (GL_TEXTURE_2D, g->tex.name);
216 renderer->curtex = g->tex.name; 219 renderer->key.texname = g->tex.name;
217 glBegin (GL_QUADS); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
218 } 221 }
219 222
220 glTexCoord2f (x1, y1); glVertex2i (x , y ); 223 rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0);
221 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y ); 224 rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
222 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h); 225 rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
223 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h); 226 rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
224} 227}
225 228
226static void 229static void
227draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
228 PangoRenderPart part, 231 PangoRenderPart part,
… …
232 double y2, 235 double y2,
233 double x12, 236 double x12,
234 double x22) 237 double x22)
235{ 238{
236 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key;
241 rc_array_t *arr;
237 242
238 if (renderer->curtex) 243 key.mode = GL_QUADS;
239 { 244 key.format = GL_V2F;
240 glEnd (); 245 key.texname = 0;
241 renderer->curtex = 0;
242 }
243 246
244 glDisable (GL_TEXTURE_2D); 247 arr = rc_array (renderer->rc, &key);
245 248
246 glBegin (GL_QUADS); 249 rc_v2f (arr, x11, y1);
247 glVertex2d (x11, y1); 250 rc_v2f (arr, x21, y1);
248 glVertex2d (x12, y1); 251 rc_v2f (arr, x22, y2);
249 glVertex2d (x22, y2); 252 rc_v2f (arr, x12, y2);
250 glVertex2d (x21, y2);
251 glEnd ();
252
253 glEnable (GL_TEXTURE_2D);
254} 253}
255 254
256void 255void
257pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
257 rc_t *rc,
258 int x, int y, 258 int x, int y,
259 float r, float g, float b, float a) 259 float r, float g, float b, float a,
260 int flags)
260{ 261{
261 PangoContext *context; 262 PangoContext *context;
262 PangoFontMap *fontmap; 263 PangoFontMap *fontmap;
263 PangoRenderer *renderer; 264 PangoRenderer *renderer;
265 PangoOpenGLRenderer *gl;
264 266
265 context = pango_layout_get_context (layout); 267 context = pango_layout_get_context (layout);
266 fontmap = pango_context_get_font_map (context); 268 fontmap = pango_context_get_font_map (context);
267 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 269 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
268
269 PANGO_OPENGL_RENDERER (renderer)->r = r; 270 gl = PANGO_OPENGL_RENDERER (renderer);
270 PANGO_OPENGL_RENDERER (renderer)->g = g; 271
271 PANGO_OPENGL_RENDERER (renderer)->b = b; 272 gl->rc = rc;
272 PANGO_OPENGL_RENDERER (renderer)->a = a; 273 gl->r = r;
274 gl->g = g;
275 gl->b = b;
276 gl->a = a;
277 gl->flags = flags;
273 278
274 pango_renderer_draw_layout (renderer, layout, x, y); 279 pango_renderer_draw_layout (renderer, layout, x, y);
275} 280}
276 281
277void 282void
278pango_opengl_render_layout (PangoLayout *layout, 283pango_opengl_render_layout (PangoLayout *layout,
284 rc_t *rc,
279 int x, int y, 285 int x, int y,
280 float r, float g, float b, float a) 286 float r, float g, float b, float a,
287 int flags)
281{ 288{
282 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 289 pango_opengl_render_layout_subpixel (
290 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
291 );
283} 292}
284 293
285static void 294static void
286pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 295pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
287{ 296{
297 memset (&renderer->key, 0, sizeof (rc_key_t));
298
288 renderer->r = 1.; 299 renderer->r = 1.;
289 renderer->g = 1.; 300 renderer->g = 1.;
290 renderer->b = 1.; 301 renderer->b = 1.;
291 renderer->a = 1.; 302 renderer->a = 1.;
292} 303}
293 304
294static void 305static void
295prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 306prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
296{ 307{
297 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 308 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
298 PangoColor *fg = 0; 309 PangoColor *fg = 0;
299 GSList *l; 310 GSList *l;
311 unsigned char r, g, b, a;
300 312
301 renderer->underline = PANGO_UNDERLINE_NONE; 313 renderer->underline = PANGO_UNDERLINE_NONE;
302 renderer->strikethrough = FALSE; 314 renderer->strikethrough = FALSE;
315
316 gl->key.mode = GL_QUADS;
317 gl->key.format = GL_T2F_V3F;
318 gl->key.texname = 0;
303 319
304 for (l = run->item->analysis.extra_attrs; l; l = l->next) 320 for (l = run->item->analysis.extra_attrs; l; l = l->next)
305 { 321 {
306 PangoAttribute *attr = l->data; 322 PangoAttribute *attr = l->data;
307 323
… …
323 break; 339 break;
324 } 340 }
325 } 341 }
326 342
327 if (fg) 343 if (fg)
328 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 344 {
345 r = fg->red * (255.f / 65535.f);
346 g = fg->green * (255.f / 65535.f);
347 b = fg->blue * (255.f / 65535.f);
348 }
329 else 349 else
330 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 350 {
351 r = gl->r * 255.f;
352 g = gl->g * 255.f;
353 b = gl->b * 255.f;
354 }
355
356 a = gl->a * 255.f;
357
358 if (gl->flags & FLAG_INVERSE)
359 {
360 r ^= 0xffU;
361 g ^= 0xffU;
362 b ^= 0xffU;
363 }
364
365 gl->key.r = r;
366 gl->key.g = g;
367 gl->key.b = b;
368 gl->key.a = a;
331} 369}
332 370
333static void 371static void
334draw_begin (PangoRenderer *renderer_) 372draw_begin (PangoRenderer *renderer_)
335{ 373{
336 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 374 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
337
338 renderer->curtex = 0;
339
340 glEnable (GL_TEXTURE_2D);
341 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
342 glEnable (GL_BLEND);
343 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
344 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
345 glEnable (GL_ALPHA_TEST);
346 glAlphaFunc (GL_GREATER, 0.01f);
347} 375}
348 376
349static void 377static void
350draw_end (PangoRenderer *renderer_) 378draw_end (PangoRenderer *renderer_)
351{ 379{
352 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 380 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
353
354 if (renderer->curtex)
355 glEnd ();
356
357 glDisable (GL_ALPHA_TEST);
358 glDisable (GL_BLEND);
359 glDisable (GL_TEXTURE_2D);
360} 381}
361 382
362static void 383static void
363pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 384pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
364{ 385{

Diff Legend

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