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

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.14 by root, Sun Jan 13 08:22:33 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.14 by root, Sun Jan 13 08:22:33 2008 UTC