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.3 by root, Tue Jul 4 23:56:34 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
… …
193 tc_get (&g->tex, bm.width, bm.height); 196 tc_get (&g->tex, bm.width, bm.height);
194 197
195 g->left = bm.left; 198 g->left = bm.left;
196 g->top = bm.top; 199 g->top = bm.top;
197 200
198 if (renderer->curtex)
199 {
200 glEnd ();
201 renderer->curtex = 0;
202 }
203
204 glBindTexture (GL_TEXTURE_2D, g->tex.name); 201 glBindTexture (GL_TEXTURE_2D, g->tex.name);
205 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
206 glPixelStorei (GL_UNPACK_ALIGNMENT, 1); 203 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
207 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);
208 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0); 205 glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
… …
215 x1 = g->tex.x * (1. / TC_WIDTH ); 212 x1 = g->tex.x * (1. / TC_WIDTH );
216 y1 = g->tex.y * (1. / TC_HEIGHT); 213 y1 = g->tex.y * (1. / TC_HEIGHT);
217 x2 = g->tex.w * (1. / TC_WIDTH ) + x1; 214 x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
218 y2 = g->tex.h * (1. / TC_HEIGHT) + y1; 215 y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
219 216
220 if (g->tex.name != renderer->curtex) 217 if (g->tex.name != renderer->key.texname)
221 { 218 {
222 if (renderer->curtex)
223 glEnd ();
224
225 glBindTexture (GL_TEXTURE_2D, g->tex.name);
226 renderer->curtex = g->tex.name; 219 renderer->key.texname = g->tex.name;
227 glBegin (GL_QUADS); 220 renderer->arr = rc_array (renderer->rc, &renderer->key);
228 } 221 }
229 222
230 glTexCoord2f (x1, y1); glVertex2i (x , y ); 223 rc_t2f_v3f (x1, y1, x , y , 0);
231 glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y ); 224 rc_t2f_v3f (x2, y1, x + g->tex.w, y , 0);
232 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);
233 glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h); 226 rc_t2f_v3f (x1, y2, x , y + g->tex.h, 0);
234} 227}
235 228
236static void 229static void
237draw_trapezoid (PangoRenderer *renderer_, 230draw_trapezoid (PangoRenderer *renderer_,
238 PangoRenderPart part, 231 PangoRenderPart part,
… …
242 double y2, 235 double y2,
243 double x12, 236 double x12,
244 double x22) 237 double x22)
245{ 238{
246 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 239 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
240 rc_key_t key = renderer->key;
241 rc_array_t *arr;
247 242
248 if (renderer->curtex) 243 key.mode = GL_QUADS;
249 { 244 key.format = GL_V2F;
250 glEnd (); 245 key.texname = 0;
251 renderer->curtex = 0;
252 }
253 246
254 glDisable (GL_TEXTURE_2D); 247 arr = rc_array (renderer->rc, &key);
255 248
256 glBegin (GL_QUADS); 249 rc_v2f (x11, y1);
257 glVertex2d (x11, y1); 250 rc_v2f (x21, y1);
258 glVertex2d (x12, y1); 251 rc_v2f (x22, y2);
259 glVertex2d (x22, y2); 252 rc_v2f (x12, y2);
260 glVertex2d (x21, y2);
261 glEnd ();
262
263 glEnable (GL_TEXTURE_2D);
264} 253}
265 254
266void 255void
267pango_opengl_render_layout_subpixel (PangoLayout *layout, 256pango_opengl_render_layout_subpixel (PangoLayout *layout,
268 int x, int y, 257 int x, int y,
269 float r, float g, float b, float a) 258 float r, float g, float b, float a,
259 int flags)
270{ 260{
271 PangoContext *context; 261 PangoContext *context;
272 PangoFontMap *fontmap; 262 PangoFontMap *fontmap;
273 PangoRenderer *renderer; 263 PangoRenderer *renderer;
274 264
… …
278 268
279 PANGO_OPENGL_RENDERER (renderer)->r = r; 269 PANGO_OPENGL_RENDERER (renderer)->r = r;
280 PANGO_OPENGL_RENDERER (renderer)->g = g; 270 PANGO_OPENGL_RENDERER (renderer)->g = g;
281 PANGO_OPENGL_RENDERER (renderer)->b = b; 271 PANGO_OPENGL_RENDERER (renderer)->b = b;
282 PANGO_OPENGL_RENDERER (renderer)->a = a; 272 PANGO_OPENGL_RENDERER (renderer)->a = a;
273 PANGO_OPENGL_RENDERER (renderer)->flags = flags;
283 274
284 pango_renderer_draw_layout (renderer, layout, x, y); 275 pango_renderer_draw_layout (renderer, layout, x, y);
285} 276}
286 277
287void 278void
288pango_opengl_render_layout (PangoLayout *layout, 279pango_opengl_render_layout (PangoLayout *layout,
289 int x, int y, 280 int x, int y,
290 float r, float g, float b, float a) 281 float r, float g, float b, float a,
282 int flags)
291{ 283{
292 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);
293} 285}
294 286
295static void 287static void
296pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
297{ 289{
290 memset (&renderer->key, 0, sizeof (rc_key_t));
291
298 renderer->r = 1.; 292 renderer->r = 1.;
299 renderer->g = 1.; 293 renderer->g = 1.;
300 renderer->b = 1.; 294 renderer->b = 1.;
301 renderer->a = 1.; 295 renderer->a = 1.;
302} 296}
… …
305prepare_run (PangoRenderer *renderer, PangoLayoutRun *run) 299prepare_run (PangoRenderer *renderer, PangoLayoutRun *run)
306{ 300{
307 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer; 301 PangoOpenGLRenderer *glrenderer = (PangoOpenGLRenderer *)renderer;
308 PangoColor *fg = 0; 302 PangoColor *fg = 0;
309 GSList *l; 303 GSList *l;
304 unsigned char r, g, b, a;
310 305
311 renderer->underline = PANGO_UNDERLINE_NONE; 306 renderer->underline = PANGO_UNDERLINE_NONE;
312 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;
313 312
314 for (l = run->item->analysis.extra_attrs; l; l = l->next) 313 for (l = run->item->analysis.extra_attrs; l; l = l->next)
315 { 314 {
316 PangoAttribute *attr = l->data; 315 PangoAttribute *attr = l->data;
317 316
… …
333 break; 332 break;
334 } 333 }
335 } 334 }
336 335
337 if (fg) 336 if (fg)
338 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 }
339 else 342 else
340 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;
341} 362}
342 363
343static void 364static void
344draw_begin (PangoRenderer *renderer_) 365draw_begin (PangoRenderer *renderer_)
345{ 366{
346 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 367 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
347
348 renderer->curtex = 0;
349 368
350 glEnable (GL_TEXTURE_2D); 369 glEnable (GL_TEXTURE_2D);
351 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 370 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
352 glEnable (GL_BLEND); 371 glEnable (GL_BLEND);
353 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 372 gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
… …
359static void 378static void
360draw_end (PangoRenderer *renderer_) 379draw_end (PangoRenderer *renderer_)
361{ 380{
362 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_; 381 PangoOpenGLRenderer *renderer = (PangoOpenGLRenderer *)renderer_;
363 382
364 if (renderer->curtex) 383 rc_draw (renderer->rc);
365 glEnd ();
366 384
367 glDisable (GL_ALPHA_TEST); 385 glDisable (GL_ALPHA_TEST);
368 glDisable (GL_BLEND); 386 glDisable (GL_BLEND);
369 glDisable (GL_TEXTURE_2D); 387 glDisable (GL_TEXTURE_2D);
370} 388}

Diff Legend

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