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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.4 by root, Wed Jul 5 00:16:44 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	if (renderer->curtex)	193	g->generation = tc_generation;
194	glEnd ();
195
196	tc_get (&g->tex, bm.width, bm.height);	194	tc_get (&g->tex, bm.width, bm.height);
197		195
198	g->left = bm.left;	196	g->left = bm.left;
199	g->top = bm.top;	197	g->top = bm.top;
200		198
		199	if (bm.width && bm.height)
		200	{
201	glBindTexture (GL_TEXTURE_2D, g->tex.name);	201	glBindTexture (GL_TEXTURE_2D, g->tex.name);
202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
203	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	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);	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);	205	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207		207	}
208	renderer->curtex = g->tex.name;
209	glBegin (GL_QUADS);
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		216	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	glBegin (GL_QUADS);
229	}	217	}
230		218
231	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);
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	}	220	}
236		221
237	static void	222	static void
238	draw_trapezoid (PangoRenderer *renderer_,	223	draw_trapezoid (PangoRenderer *renderer_,
239	PangoRenderPart part,	224	PangoRenderPart part,
…		…
243	double y2,	228	double y2,
244	double x12,	229	double x12,
245	double x22)	230	double x22)
246	{	231	{
247	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	232	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		233	rc_key_t key = renderer->key;
		234	rc_array_t *arr;
248		235
249	if (renderer->curtex)	236	key.mode = GL_QUADS;
250	{	237	key.format = GL_V2F;
251	glEnd ();	238	key.texname = 0;
252	renderer->curtex = 0;
253	}
254		239
255	glDisable (GL_TEXTURE_2D);	240	arr = rc_array (renderer->rc, &key);
256		241
257	glBegin (GL_QUADS);	242	rc_v2f (arr, x11, y1);
258	glVertex2d (x11, y1);	243	rc_v2f (arr, x21, y1);
259	glVertex2d (x12, y1);	244	rc_v2f (arr, x22, y2);
260	glVertex2d (x22, y2);	245	rc_v2f (arr, x12, y2);
261	glVertex2d (x21, y2);
262	glEnd ();
263
264	glEnable (GL_TEXTURE_2D);
265	}	246	}
266		247
267	void	248	void
268	pango_opengl_render_layout_subpixel (PangoLayout *layout,	249	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		250	rc_t *rc,
269	int x, int y,	251	int x, int y,
270	float r, float g, float b, float a)	252	float r, float g, float b, float a,
		253	int flags)
271	{	254	{
272	PangoContext *context;	255	PangoContext *context;
273	PangoFontMap *fontmap;	256	PangoFontMap *fontmap;
274	PangoRenderer *renderer;	257	PangoRenderer *renderer;
		258	PangoOpenGLRenderer *gl;
275		259
276	context = pango_layout_get_context (layout);	260	context = pango_layout_get_context (layout);
277	fontmap = pango_context_get_font_map (context);	261	fontmap = pango_context_get_font_map (context);
278	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));
279
280	PANGO_OPENGL_RENDERER (renderer)->r = r;	263	gl = PANGO_OPENGL_RENDERER (renderer);
281	PANGO_OPENGL_RENDERER (renderer)->g = g;	264
282	PANGO_OPENGL_RENDERER (renderer)->b = b;	265	gl->rc = rc;
283	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;
284		271
285	pango_renderer_draw_layout (renderer, layout, x, y);	272	pango_renderer_draw_layout (renderer, layout, x, y);
286	}	273	}
287		274
288	void	275	void
289	pango_opengl_render_layout (PangoLayout *layout,	276	pango_opengl_render_layout (PangoLayout *layout,
		277	rc_t *rc,
290	int x, int y,	278	int x, int y,
291	float r, float g, float b, float a)	279	float r, float g, float b, float a,
		280	int flags)
292	{	281	{
293	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	);
294	}	285	}
295		286
296	static void	287	static void
297	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	288	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298	{	289	{
		290	memset (&renderer->key, 0, sizeof (rc_key_t));
		291
299	renderer->r = 1.;	292	renderer->r = 1.;
300	renderer->g = 1.;	293	renderer->g = 1.;
301	renderer->b = 1.;	294	renderer->b = 1.;
302	renderer->a = 1.;	295	renderer->a = 1.;
303	}	296	}
304		297
305	static void	298	static void
306	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	299	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
307	{	300	{
308	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	301	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
309	PangoColor *fg = 0;	302	PangoColor *fg = 0;
310	GSList *l;	303	GSList *l;
		304	unsigned char r, g, b, a;
311		305
312	renderer->underline = PANGO_UNDERLINE_NONE;	306	renderer->underline = PANGO_UNDERLINE_NONE;
313	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;
314		312
315	for (l = run->item->analysis.extra_attrs; l; l = l->next)	313	for (l = run->item->analysis.extra_attrs; l; l = l->next)
316	{	314	{
317	PangoAttribute *attr = l->data;	315	PangoAttribute *attr = l->data;
318		316
…		…
334	break;	332	break;
335	}	333	}
336	}	334	}
337		335
338	if (fg)	336	if (fg)
339	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	}
340	else	342	else
341	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;
342	}	362	}
343		363
344	static void	364	static void
345	draw_begin (PangoRenderer *renderer_)	365	draw_begin (PangoRenderer *renderer_)
346	{	366	{
347	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	367	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	}	368	}
359		369
360	static void	370	static void
361	draw_end (PangoRenderer *renderer_)	371	draw_end (PangoRenderer *renderer_)
362	{	372	{
363	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	373	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	}	374	}
372		375
373	static void	376	static void
374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	377	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375	{	378	{

Diff Legend

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

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