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.2 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.7 by root, Sat Aug 11 11:28:03 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
… …
146} 149}
147 150
148typedef struct glyph_info { 151typedef struct glyph_info {
149 tc_area tex; 152 tc_area tex;
150 int left, top; 153 int left, top;
154 int generation;
151} glyph_info; 155} glyph_info;
152 156
153static void 157static void
154free_glyph_info (glyph_info *g) 158free_glyph_info (glyph_info *g)
155{ 159{
… …
172 glyph = PANGO_GLYPH_UNKNOWN_FLAG; 176 glyph = PANGO_GLYPH_UNKNOWN_FLAG;
173 } 177 }
174 178
175 g = _pango_opengl_font_get_cache_glyph_data (font, glyph); 179 g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
176 180
177 if (!g) 181 if (!g || g->generation != tc_generation)
178 { 182 {
179 Glyph bm; 183 Glyph bm;
180 font_render_glyph (&bm, font, glyph); 184 font_render_glyph (&bm, font, glyph);
181 185
186 if (g)
187 g->generation = tc_generation;
188 else
189 {
182 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 }
183 195
184 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
185 197
186 g->left = bm.left; 198 g->left = bm.left;
187 g->top = bm.top; 199 g->top = bm.top;
188
189 if (renderer->curtex)
190 {
191 glEnd ();
192 renderer->curtex = 0;
193 }
194 200
195 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
196 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
197 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
198 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);
199 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
200 glPixelStorei (GL_UNPACK_ALIGNMENT, 4); 206 glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
201
202 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
203 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
204 } 207 }
205 208
206 x += g->left; 209 x += g->left;
207 y -= g->top; 210 y -= g->top;
208 211
209 x1 = g->tex.x * (1. / TC_WIDTH ); 212 x1 = g->tex.x * (1. / TC_WIDTH );
210 y1 = g->tex.y * (1. / TC_HEIGHT); 213 y1 = g->tex.y * (1. / TC_HEIGHT);
211 x2 = g->tex.w * (1. / TC_WIDTH ) + x1; 214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
212 y2 = g->tex.h * (1. / TC_HEIGHT) + y1; 215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
213 216
214 if (g->tex.name != renderer->curtex) 217 if (g->tex.name != renderer->key.texname)
215 { 218 {
216 if (renderer->curtex)
217 glEnd ();
218
219 glBindTexture (GL_TEXTURE_2D, g->tex.name);
220 renderer->curtex = g->tex.name; 219 renderer->key.texname = g->tex.name;
221 glBegin (GL_QUADS); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
222 } 221 }
223 222
224 glTexCoord2f (x1, y1); glVertex2i (x , y ); 223 rc_t2f_v3f (x1, y1, x , y , 0);
225 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y ); 224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
226 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h); 225 rc_t2f_v3f (x2, y2, x + g->tex.w, y + g->tex.h, 0);
227 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h); 226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
228} 227}
229 228
230static void 229static void
231draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
232 PangoRenderPart part, 231 PangoRenderPart part,
… …
236 double y2, 235 double y2,
237 double x12, 236 double x12,
238 double x22) 237 double x22)
239{ 238{
240 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key;
241 rc_array_t *arr;
241 242
242 if (renderer->curtex) 243 key.mode = GL_QUADS;
243 { 244 key.format = GL_V2F;
244 glEnd (); 245 key.texname = 0;
245 renderer->curtex = 0;
246 }
247 246
248 glDisable (GL_TEXTURE_2D); 247 arr = rc_array (renderer->rc, &key);
249 248
250 glBegin (GL_QUADS); 249 rc_v2f (x11, y1);
251 glVertex2d (x11, y1); 250 rc_v2f (x21, y1);
252 glVertex2d (x12, y1); 251 rc_v2f (x22, y2);
253 glVertex2d (x22, y2); 252 rc_v2f (x12, y2);
254 glVertex2d (x21, y2);
255 glEnd ();
256
257 glEnable (GL_TEXTURE_2D);
258} 253}
259 254
260void 255void
261pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
262 int x, int y, 257 int x, int y,
263 float r, float g, float b, float a) 258 float r, float g, float b, float a,
259 int flags)
264{ 260{
265 PangoContext *context; 261 PangoContext *context;
266 PangoFontMap *fontmap; 262 PangoFontMap *fontmap;
267 PangoRenderer *renderer; 263 PangoRenderer *renderer;
268 264
… …
272 268
273 PANGO_OPENGL_RENDERER (renderer)->r = r; 269 PANGO_OPENGL_RENDERER (renderer)->r = r;
274 PANGO_OPENGL_RENDERER (renderer)->g = g; 270 PANGO_OPENGL_RENDERER (renderer)->g = g;
275 PANGO_OPENGL_RENDERER (renderer)->b = b; 271 PANGO_OPENGL_RENDERER (renderer)->b = b;
276 PANGO_OPENGL_RENDERER (renderer)->a = a; 272 PANGO_OPENGL_RENDERER (renderer)->a = a;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags;
277 274
278 pango_renderer_draw_layout (renderer, layout, x, y); 275 pango_renderer_draw_layout (renderer, layout, x, y);
279} 276}
280 277
281void 278void
282pango_opengl_render_layout (PangoLayout *layout, 279pango_opengl_render_layout (PangoLayout *layout,
283 int x, int y, 280 int x, int y,
284 float r, float g, float b, float a) 281 float r, float g, float b, float a,
282 int flags)
285{ 283{
286 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 284 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);
287} 285}
288 286
289static void 287static void
290pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
291{ 289{
290 memset (&renderer->key, 0, sizeof (rc_key_t));
291
292 renderer->r = 1.; 292 renderer->r = 1.;
293 renderer->g = 1.; 293 renderer->g = 1.;
294 renderer->b = 1.; 294 renderer->b = 1.;
295 renderer->a = 1.; 295 renderer->a = 1.;
296} 296}
… …
299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
300{ 300{
301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer;
302 PangoColor *fg = 0; 302 PangoColor *fg = 0;
303 GSList *l; 303 GSList *l;
304 unsigned char r, g, b, a;
304 305
305 renderer->underline = PANGO_UNDERLINE_NONE; 306 renderer->underline = PANGO_UNDERLINE_NONE;
306 renderer->strikethrough = FALSE; 307 renderer->strikethrough = FALSE;
308
309 renderer->key.mode = GL_QUADS;
310 renderer->key.format = GL_T2F_V2F;
311 renderer->key.texname = 0;
307 312
308 for (l = run->item->analysis.extra_attrs; l; l = l->next) 313 for (l = run->item->analysis.extra_attrs; l; l = l->next)
309 { 314 {
310 PangoAttribute *attr = l->data; 315 PangoAttribute *attr = l->data;
311 316
… …
327 break; 332 break;
328 } 333 }
329 } 334 }
330 335
331 if (fg) 336 if (fg)
332 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 337 {
338 r = fg->red * (255.f / 65535.f);
339 g = fg->green * (255.f / 65535.f);
340 b = fg->blue * (255.f / 65535.f);
341 }
333 else 342 else
334 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 343 {
344 r = glrenderer->r * 255.f;
345 g = glrenderer->g * 255.f;
346 b = glrenderer->b * 255.f;
347 }
348
349 a = glrenderer->a * 255.f;
350
351 if (glrenderer->flags & FLAG_INVERSE)
352 {
353 r ^= 0xffU;
354 g ^= 0xffU;
355 b ^= 0xffU;
356 }
357
358 renderer->key.r = r;
359 renderer->key.g = g;
360 renderer->key.b = b;
361 renderer->key.a = a;
335} 362}
336 363
337static void 364static void
338draw_begin (PangoRenderer *renderer_) 365draw_begin (PangoRenderer *renderer_)
339{ 366{
340 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
341
342 renderer->curtex = 0;
343 368
344 glEnable (GL_TEXTURE_2D); 369 glEnable (GL_TEXTURE_2D);
345 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 370 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
346 glEnable (GL_BLEND); 371 glEnable (GL_BLEND);
347 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 372 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
… …
353static void 378static void
354draw_end (PangoRenderer *renderer_) 379draw_end (PangoRenderer *renderer_)
355{ 380{
356 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
357 382
358 if (renderer->curtex) 383 rc_draw (renderer->rc);
359 glEnd ();
360 384
361 glDisable (GL_ALPHA_TEST); 385 glDisable (GL_ALPHA_TEST);
362 glDisable (GL_BLEND); 386 glDisable (GL_BLEND);
363 glDisable (GL_TEXTURE_2D); 387 glDisable (GL_TEXTURE_2D);
364} 388}

Diff Legend

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