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.4 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.11 by root, Sun Aug 12 08:44:22 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
… …
188 191
189 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 192 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
190 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 193 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
191 } 194 }
192 195
193 if (renderer->curtex)
194 glEnd ();
195
196 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
197 197
198 g->left = bm.left; 198 g->left = bm.left;
199 g->top = bm.top; 199 g->top = bm.top;
200 200
… …
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
208 renderer->curtex = g->tex.name;
209 glBegin (GL_QUADS);
210 } 207 }
211 208
212 x += g->left; 209 x += g->left;
213 y -= g->top; 210 y -= g->top;
214 211
215 x1 = g->tex.x * (1. / TC_WIDTH );
216 y1 = g->tex.y * (1. / TC_HEIGHT);
217 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
218 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
219
220 if (g->tex.name != renderer->curtex) 212 if (g->tex.name != renderer->key.texname)
221 { 213 {
222 if (renderer->curtex)
223 glEnd ();
224
225 glBindTexture (GL_TEXTURE_2D, g->tex.name);
226 renderer->curtex = g->tex.name; 214 renderer->key.texname = g->tex.name;
227 215 renderer->arr = rc_array (renderer->rc, &renderer->key);
228 glBegin (GL_QUADS);
229 } 216 }
230 217
231 glTexCoord2f (x1, y1); glVertex2i (x , y ); 218 rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
232 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
233 glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
234 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
235} 219}
236 220
237static void 221static void
238draw_trapezoid (PangoRenderer *renderer_, 222draw_trapezoid (PangoRenderer *renderer_,
239 PangoRenderPart part, 223 PangoRenderPart part,
… …
243 double y2, 227 double y2,
244 double x12, 228 double x12,
245 double x22) 229 double x22)
246{ 230{
247 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 231 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
232 rc_key_t key = renderer->key;
233 rc_array_t *arr;
248 234
249 if (renderer->curtex) 235 key.mode = GL_QUADS;
250 { 236 key.format = GL_V2F;
251 glEnd (); 237 key.texname = 0;
252 renderer->curtex = 0;
253 }
254 238
255 glDisable (GL_TEXTURE_2D); 239 arr = rc_array (renderer->rc, &key);
256 240
257 glBegin (GL_QUADS); 241 rc_v2f (arr, x11, y1);
258 glVertex2d (x11, y1); 242 rc_v2f (arr, x21, y1);
259 glVertex2d (x12, y1); 243 rc_v2f (arr, x22, y2);
260 glVertex2d (x22, y2); 244 rc_v2f (arr, x12, y2);
261 glVertex2d (x21, y2);
262 glEnd ();
263
264 glEnable (GL_TEXTURE_2D);
265} 245}
266 246
267void 247void
268pango_opengl_render_layout_subpixel (PangoLayout *layout, 248pango_opengl_render_layout_subpixel (PangoLayout *layout,
249 rc_t *rc,
269 int x, int y, 250 int x, int y,
270 float r, float g, float b, float a) 251 float r, float g, float b, float a,
252 int flags)
271{ 253{
272 PangoContext *context; 254 PangoContext *context;
273 PangoFontMap *fontmap; 255 PangoFontMap *fontmap;
274 PangoRenderer *renderer; 256 PangoRenderer *renderer;
257 PangoOpenGLRenderer *gl;
275 258
276 context = pango_layout_get_context (layout); 259 context = pango_layout_get_context (layout);
277 fontmap = pango_context_get_font_map (context); 260 fontmap = pango_context_get_font_map (context);
278 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap)); 261 renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
279
280 PANGO_OPENGL_RENDERER (renderer)->r = r; 262 gl = PANGO_OPENGL_RENDERER (renderer);
281 PANGO_OPENGL_RENDERER (renderer)->g = g; 263
282 PANGO_OPENGL_RENDERER (renderer)->b = b; 264 gl->rc = rc;
283 PANGO_OPENGL_RENDERER (renderer)->a = a; 265 gl->r = r;
266 gl->g = g;
267 gl->b = b;
268 gl->a = a;
269 gl->flags = flags;
284 270
285 pango_renderer_draw_layout (renderer, layout, x, y); 271 pango_renderer_draw_layout (renderer, layout, x, y);
286} 272}
287 273
288void 274void
289pango_opengl_render_layout (PangoLayout *layout, 275pango_opengl_render_layout (PangoLayout *layout,
276 rc_t *rc,
290 int x, int y, 277 int x, int y,
291 float r, float g, float b, float a) 278 float r, float g, float b, float a,
279 int flags)
292{ 280{
293 pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a); 281 pango_opengl_render_layout_subpixel (
282 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
283 );
294} 284}
295 285
296static void 286static void
297pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 287pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298{ 288{
289 memset (&renderer->key, 0, sizeof (rc_key_t));
290
299 renderer->r = 1.; 291 renderer->r = 1.;
300 renderer->g = 1.; 292 renderer->g = 1.;
301 renderer->b = 1.; 293 renderer->b = 1.;
302 renderer->a = 1.; 294 renderer->a = 1.;
303} 295}
304 296
305static void 297static void
306prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 298prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
307{ 299{
308 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 300 PangoOpenGLRenderer *gl = (PangoOpenGLRenderer *)renderer;
309 PangoColor *fg = 0; 301 PangoColor *fg = 0;
310 GSList *l; 302 GSList *l;
303 unsigned char r, g, b, a;
311 304
312 renderer->underline = PANGO_UNDERLINE_NONE; 305 renderer->underline = PANGO_UNDERLINE_NONE;
313 renderer->strikethrough = FALSE; 306 renderer->strikethrough = FALSE;
307
308 gl->key.mode = GL_QUADS;
309 gl->key.format = 0; // glyphs
310 gl->key.texname = 0;
314 311
315 for (l = run->item->analysis.extra_attrs; l; l = l->next) 312 for (l = run->item->analysis.extra_attrs; l; l = l->next)
316 { 313 {
317 PangoAttribute *attr = l->data; 314 PangoAttribute *attr = l->data;
318 315
… …
334 break; 331 break;
335 } 332 }
336 } 333 }
337 334
338 if (fg) 335 if (fg)
339 glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a); 336 {
337 r = fg->red * (255.f / 65535.f);
338 g = fg->green * (255.f / 65535.f);
339 b = fg->blue * (255.f / 65535.f);
340 }
340 else 341 else
341 glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a); 342 {
343 r = gl->r * 255.f;
344 g = gl->g * 255.f;
345 b = gl->b * 255.f;
346 }
347
348 a = gl->a * 255.f;
349
350 if (gl->flags & FLAG_INVERSE)
351 {
352 r ^= 0xffU;
353 g ^= 0xffU;
354 b ^= 0xffU;
355 }
356
357 gl->key.r = r;
358 gl->key.g = g;
359 gl->key.b = b;
360 gl->key.a = a;
342} 361}
343 362
344static void 363static void
345draw_begin (PangoRenderer *renderer_) 364draw_begin (PangoRenderer *renderer_)
346{ 365{
347 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 366 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
348
349 renderer->curtex = 0;
350
351 glEnable (GL_TEXTURE_2D);
352 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
353 glEnable (GL_BLEND);
354 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
355 GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
356 glEnable (GL_ALPHA_TEST);
357 glAlphaFunc (GL_GREATER, 0.01f);
358} 367}
359 368
360static void 369static void
361draw_end (PangoRenderer *renderer_) 370draw_end (PangoRenderer *renderer_)
362{ 371{
363 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 372 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
364
365 if (renderer->curtex)
366 glEnd ();
367
368 glDisable (GL_ALPHA_TEST);
369 glDisable (GL_BLEND);
370 glDisable (GL_TEXTURE_2D);
371} 373}
372 374
373static void 375static void
374pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass) 376pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375{ 377{

Diff Legend

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