[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/pango-render.c

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.12 by root, Mon Aug 13 15:31:21 2007 UTC

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

Diff Legend

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

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.12 by root, Mon Aug 13 15:31:21 2007 UTC

Diff Legend

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.12 by root, Mon Aug 13 15:31:21 2007 UTC