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

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.11 by root, Sun Aug 12 08:44:22 2007 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.11 by root, Sun Aug 12 08:44:22 2007 UTC