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

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.13 by root, Wed Dec 26 10:34:23 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.13 by root, Wed Dec 26 10:34:23 2007 UTC