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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.2 by root, Tue Jul 4 23:44:23 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.2 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.14 by root, Sun Jan 13 08:22:33 2008 UTC