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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.5 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 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	if (renderer->curtex)	193	g->generation = tc_generation;
194	glEnd ();
195
196	tc_get (&g->tex, bm.width, bm.height);
197		194
198	g->left = bm.left;	195	g->left = bm.left;
199	g->top = bm.top;	196	g->top = bm.top;
200		197
		198	tc_get (&g->tex, bm.width, bm.height);
		199
		200	if (bm.width && bm.height)
		201	{
201	glBindTexture (GL_TEXTURE_2D, g->tex.name);	202	glBindTexture (GL_TEXTURE_2D, g->tex.name);
202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	203	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
203	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	204	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	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_ROW_LENGTH, 0);
206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	207	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207		208	}
208	renderer->curtex = g->tex.name;
209	glBegin (GL_QUADS);
210	}	209	}
211		210
212	x += g->left;	211	x += g->left;
213	y -= g->top;	212	y -= g->top;
214		213
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)	214	if (g->tex.name != renderer->key.texname)
221	{	215	{
222	if (renderer->curtex)
223	glEnd ();
224
225	glBindTexture (GL_TEXTURE_2D, g->tex.name);
226	renderer->curtex = g->tex.name;	216	renderer->key.texname = g->tex.name;
227		217	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	glBegin (GL_QUADS);
229	}	218	}
230		219
231	glTexCoord2f (x1, y1); glVertex2i (x , y );	220	rc_glyph (renderer->arr, g->tex.x, g->tex.y, g->tex.w, g->tex.h, x, y);
232	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
233	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
234	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
235	}	221	}
236		222
237	static void	223	static void
238	draw_trapezoid (PangoRenderer *renderer_,	224	draw_trapezoid (PangoRenderer *renderer_,
239	PangoRenderPart part,	225	PangoRenderPart part,
…		…
243	double y2,	229	double y2,
244	double x12,	230	double x12,
245	double x22)	231	double x22)
246	{	232	{
247	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	233	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		234	rc_key_t key = renderer->key;
		235	rc_array_t *arr;
248		236
249	if (renderer->curtex)	237	key.mode = GL_QUADS;
250	{	238	key.format = GL_V2F;
251	glEnd ();	239	key.texname = 0;
252	renderer->curtex = 0;
253	}
254		240
255	glDisable (GL_TEXTURE_2D);	241	arr = rc_array (renderer->rc, &key);
256		242
257	glBegin (GL_QUADS);	243	rc_v2f (arr, x11, y1);
258	glVertex2d (x11, y1);	244	rc_v2f (arr, x21, y1);
259	glVertex2d (x21, y1);	245	rc_v2f (arr, x22, y2);
260	glVertex2d (x22, y2);	246	rc_v2f (arr, x12, y2);
261	glVertex2d (x12, y2);
262	glEnd ();
263
264	glEnable (GL_TEXTURE_2D);
265	}	247	}
266		248
267	void	249	void
268	pango_opengl_render_layout_subpixel (PangoLayout *layout,	250	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		251	rc_t *rc,
269	int x, int y,	252	int x, int y,
270	float r, float g, float b, float a)	253	float r, float g, float b, float a,
		254	int flags)
271	{	255	{
272	PangoContext *context;	256	PangoContext *context;
273	PangoFontMap *fontmap;	257	PangoFontMap *fontmap;
274	PangoRenderer *renderer;	258	PangoRenderer *renderer;
		259	PangoOpenGLRenderer *gl;
275		260
276	context = pango_layout_get_context (layout);	261	context = pango_layout_get_context (layout);
277	fontmap = pango_context_get_font_map (context);	262	fontmap = pango_context_get_font_map (context);
278	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));	263	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
279
280	PANGO_OPENGL_RENDERER (renderer)->r = r;	264	gl = PANGO_OPENGL_RENDERER (renderer);
281	PANGO_OPENGL_RENDERER (renderer)->g = g;	265
282	PANGO_OPENGL_RENDERER (renderer)->b = b;	266	gl->rc = rc;
283	PANGO_OPENGL_RENDERER (renderer)->a = a;	267	gl->r = r;
		268	gl->g = g;
		269	gl->b = b;
		270	gl->a = a;
		271	gl->flags = flags;
284		272
285	pango_renderer_draw_layout (renderer, layout, x, y);	273	pango_renderer_draw_layout (renderer, layout, x, y);
286	}	274	}
287		275
288	void	276	void
289	pango_opengl_render_layout (PangoLayout *layout,	277	pango_opengl_render_layout (PangoLayout *layout,
		278	rc_t *rc,
290	int x, int y,	279	int x, int y,
291	float r, float g, float b, float a)	280	float r, float g, float b, float a,
		281	int flags)
292	{	282	{
293	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a);	283	pango_opengl_render_layout_subpixel (
		284	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		285	);
294	}	286	}
295		287
296	static void	288	static void
297	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	289	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298	{	290	{
		291	memset (&renderer->key, 0, sizeof (rc_key_t));
		292
299	renderer->r = 1.;	293	renderer->r = 1.;
300	renderer->g = 1.;	294	renderer->g = 1.;
301	renderer->b = 1.;	295	renderer->b = 1.;
302	renderer->a = 1.;	296	renderer->a = 1.;
303	}	297	}
304		298
305	static void	299	static void
306	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	300	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
307	{	301	{
308	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	302	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
309	PangoColor *fg = 0;	303	PangoColor *fg = 0;
310	GSList *l;	304	GSList *l;
		305	unsigned char r, g, b, a;
311		306
312	renderer->underline = PANGO_UNDERLINE_NONE;	307	renderer->underline = PANGO_UNDERLINE_NONE;
313	renderer->strikethrough = FALSE;	308	renderer->strikethrough = FALSE;
		309
		310	gl->key.mode = GL_QUADS;
		311	gl->key.format = 0; // glyphs
		312	gl->key.texname = 0;
314		313
315	for (l = run->item->analysis.extra_attrs; l; l = l->next)	314	for (l = run->item->analysis.extra_attrs; l; l = l->next)
316	{	315	{
317	PangoAttribute *attr = l->data;	316	PangoAttribute *attr = l->data;
318		317
…		…
334	break;	333	break;
335	}	334	}
336	}	335	}
337		336
338	if (fg)	337	if (fg)
339	glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a);	338	{
		339	r = fg->red * (255.f / 65535.f);
		340	g = fg->green * (255.f / 65535.f);
		341	b = fg->blue * (255.f / 65535.f);
		342	}
340	else	343	else
341	glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a);	344	{
		345	r = gl->r * 255.f;
		346	g = gl->g * 255.f;
		347	b = gl->b * 255.f;
		348	}
		349
		350	a = gl->a * 255.f;
		351
		352	if (gl->flags & FLAG_INVERSE)
		353	{
		354	r ^= 0xffU;
		355	g ^= 0xffU;
		356	b ^= 0xffU;
		357	}
		358
		359	gl->key.r = r;
		360	gl->key.g = g;
		361	gl->key.b = b;
		362	gl->key.a = a;
342	}	363	}
343		364
344	static void	365	static void
345	draw_begin (PangoRenderer *renderer_)	366	draw_begin (PangoRenderer *renderer_)
346	{	367	{
347	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	368	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
348
349	renderer->curtex = 0;
350
351	glEnable (GL_TEXTURE_2D);
352	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
353	glEnable (GL_BLEND);
354	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
355	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
356	glEnable (GL_ALPHA_TEST);
357	glAlphaFunc (GL_GREATER, 0.01f);
358	}	369	}
359		370
360	static void	371	static void
361	draw_end (PangoRenderer *renderer_)	372	draw_end (PangoRenderer *renderer_)
362	{	373	{
363	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	374	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
364
365	if (renderer->curtex)
366	glEnd ();
367
368	glDisable (GL_ALPHA_TEST);
369	glDisable (GL_BLEND);
370	glDisable (GL_TEXTURE_2D);
371	}	375	}
372		376
373	static void	377	static void
374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	378	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375	{	379	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.5 by root, Wed Jul 5 01:53:24 2006 UTC vs. Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.5 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC