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

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.15 by root, Sun Jan 13 08:31:45 2008 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.15 by root, Sun Jan 13 08:31:45 2008 UTC