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

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