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

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