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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.1 by root, Tue Jul 4 23:23:32 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.1 by root, Tue Jul 4 23:23:32 2006 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC