[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.11 by root, Sun Aug 12 08:44:22 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	{
…		…
172	glyph = PANGO_GLYPH_UNKNOWN_FLAG;	176	glyph = PANGO_GLYPH_UNKNOWN_FLAG;
173	}	177	}
174		178
175	g = _pango_opengl_font_get_cache_glyph_data (font, glyph);	179	g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
176		180
177	if (!g)	181	if (!g \|\| g->generation != tc_generation)
178	{	182	{
179	Glyph bm;	183	Glyph bm;
180	font_render_glyph (&bm, font, glyph);	184	font_render_glyph (&bm, font, glyph);
181		185
		186	if (g)
		187	g->generation = tc_generation;
		188	else
		189	{
182	g = g_slice_new (glyph_info);	190	g = g_slice_new (glyph_info);
		191
		192	_pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
		193	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
		194	}
183		195
184	tc_get (&g->tex, bm.width, bm.height);	196	tc_get (&g->tex, bm.width, bm.height);
185		197
186	g->left = bm.left;	198	g->left = bm.left;
187	g->top = bm.top;	199	g->top = bm.top;
188
189	if (renderer->curtex)
190	{
191	glEnd ();
192	renderer->curtex = 0;
193	}
194		200
195	glBindTexture (GL_TEXTURE_2D, g->tex.name);	201	glBindTexture (GL_TEXTURE_2D, g->tex.name);
196	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
197	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	203	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);	204	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);	205	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
200	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	206	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	}	207	}
205		208
206	x += g->left;	209	x += g->left;
207	y -= g->top;	210	y -= g->top;
208		211
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)	212	if (g->tex.name != renderer->key.texname)
215	{	213	{
216	if (renderer->curtex)
217	glEnd ();
218
219	glBindTexture (GL_TEXTURE_2D, g->tex.name);
220	renderer->curtex = g->tex.name;	214	renderer->key.texname = g->tex.name;
221	glBegin (GL_QUADS);	215	renderer->arr = rc_array (renderer->rc, &renderer->key);
222	}	216	}
223		217
224	glTexCoord2f (x1, y1); glVertex2i (x , y );	218	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	}	219	}
229		220
230	static void	221	static void
231	draw_trapezoid (PangoRenderer *renderer_,	222	draw_trapezoid (PangoRenderer *renderer_,
232	PangoRenderPart part,	223	PangoRenderPart part,
…		…
236	double y2,	227	double y2,
237	double x12,	228	double x12,
238	double x22)	229	double x22)
239	{	230	{
240	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	231	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		232	rc_key_t key = renderer->key;
		233	rc_array_t *arr;
241		234
242	if (renderer->curtex)	235	key.mode = GL_QUADS;
243	{	236	key.format = GL_V2F;
244	glEnd ();	237	key.texname = 0;
245	renderer->curtex = 0;
246	}
247		238
248	glDisable (GL_TEXTURE_2D);	239	arr = rc_array (renderer->rc, &key);
249		240
250	glBegin (GL_QUADS);	241	rc_v2f (arr, x11, y1);
251	glVertex2d (x11, y1);	242	rc_v2f (arr, x21, y1);
252	glVertex2d (x12, y1);	243	rc_v2f (arr, x22, y2);
253	glVertex2d (x22, y2);	244	rc_v2f (arr, x12, y2);
254	glVertex2d (x21, y2);
255	glEnd ();
256
257	glEnable (GL_TEXTURE_2D);
258	}	245	}
259		246
260	void	247	void
261	pango_opengl_render_layout_subpixel (PangoLayout *layout,	248	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		249	rc_t *rc,
262	int x, int y,	250	int x, int y,
263	float r, float g, float b, float a)	251	float r, float g, float b, float a,
		252	int flags)
264	{	253	{
265	PangoContext *context;	254	PangoContext *context;
266	PangoFontMap *fontmap;	255	PangoFontMap *fontmap;
267	PangoRenderer *renderer;	256	PangoRenderer *renderer;
		257	PangoOpenGLRenderer *gl;
268		258
269	context = pango_layout_get_context (layout);	259	context = pango_layout_get_context (layout);
270	fontmap = pango_context_get_font_map (context);	260	fontmap = pango_context_get_font_map (context);
271	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));	261	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
272
273	PANGO_OPENGL_RENDERER (renderer)->r = r;	262	gl = PANGO_OPENGL_RENDERER (renderer);
274	PANGO_OPENGL_RENDERER (renderer)->g = g;	263
275	PANGO_OPENGL_RENDERER (renderer)->b = b;	264	gl->rc = rc;
276	PANGO_OPENGL_RENDERER (renderer)->a = a;	265	gl->r = r;
		266	gl->g = g;
		267	gl->b = b;
		268	gl->a = a;
		269	gl->flags = flags;
277		270
278	pango_renderer_draw_layout (renderer, layout, x, y);	271	pango_renderer_draw_layout (renderer, layout, x, y);
279	}	272	}
280		273
281	void	274	void
282	pango_opengl_render_layout (PangoLayout *layout,	275	pango_opengl_render_layout (PangoLayout *layout,
		276	rc_t *rc,
283	int x, int y,	277	int x, int y,
284	float r, float g, float b, float a)	278	float r, float g, float b, float a,
		279	int flags)
285	{	280	{
286	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a);	281	pango_opengl_render_layout_subpixel (
		282	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		283	);
287	}	284	}
288		285
289	static void	286	static void
290	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	287	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
291	{	288	{
		289	memset (&renderer->key, 0, sizeof (rc_key_t));
		290
292	renderer->r = 1.;	291	renderer->r = 1.;
293	renderer->g = 1.;	292	renderer->g = 1.;
294	renderer->b = 1.;	293	renderer->b = 1.;
295	renderer->a = 1.;	294	renderer->a = 1.;
296	}	295	}
297		296
298	static void	297	static void
299	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	298	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
300	{	299	{
301	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	300	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
302	PangoColor *fg = 0;	301	PangoColor *fg = 0;
303	GSList *l;	302	GSList *l;
		303	unsigned char r, g, b, a;
304		304
305	renderer->underline = PANGO_UNDERLINE_NONE;	305	renderer->underline = PANGO_UNDERLINE_NONE;
306	renderer->strikethrough = FALSE;	306	renderer->strikethrough = FALSE;
		307
		308	gl->key.mode = GL_QUADS;
		309	gl->key.format = 0; // glyphs
		310	gl->key.texname = 0;
307		311
308	for (l = run->item->analysis.extra_attrs; l; l = l->next)	312	for (l = run->item->analysis.extra_attrs; l; l = l->next)
309	{	313	{
310	PangoAttribute *attr = l->data;	314	PangoAttribute *attr = l->data;
311		315
…		…
327	break;	331	break;
328	}	332	}
329	}	333	}
330		334
331	if (fg)	335	if (fg)
332	glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a);	336	{
		337	r = fg->red * (255.f / 65535.f);
		338	g = fg->green * (255.f / 65535.f);
		339	b = fg->blue * (255.f / 65535.f);
		340	}
333	else	341	else
334	glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a);	342	{
		343	r = gl->r * 255.f;
		344	g = gl->g * 255.f;
		345	b = gl->b * 255.f;
		346	}
		347
		348	a = gl->a * 255.f;
		349
		350	if (gl->flags & FLAG_INVERSE)
		351	{
		352	r ^= 0xffU;
		353	g ^= 0xffU;
		354	b ^= 0xffU;
		355	}
		356
		357	gl->key.r = r;
		358	gl->key.g = g;
		359	gl->key.b = b;
		360	gl->key.a = a;
335	}	361	}
336		362
337	static void	363	static void
338	draw_begin (PangoRenderer *renderer_)	364	draw_begin (PangoRenderer *renderer_)
339	{	365	{
340	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	366	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	}	367	}
352		368
353	static void	369	static void
354	draw_end (PangoRenderer *renderer_)	370	draw_end (PangoRenderer *renderer_)
355	{	371	{
356	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	372	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	}	373	}
365		374
366	static void	375	static void
367	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	376	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
368	{	377	{

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.11 by root, Sun Aug 12 08:44:22 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.11 by root, Sun Aug 12 08:44:22 2007 UTC