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

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

Diff Legend

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

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