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

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