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

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

Diff Legend

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

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

Diff Legend

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