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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC

…		…
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	int flags;	40	int flags;
41	GLuint curtex; // current texture	41	rc_t *rc; // rendercache
		42	rc_key_t key; // current render key
		43	rc_array_t *arr;
42	};	44	};
43		45
44	G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)	46	G_DEFINE_TYPE (PangoOpenGLRenderer, pango_opengl_renderer, PANGO_TYPE_RENDERER)
45		47
46	typedef struct	48	typedef struct
…		…
162	static void	164	static void
163	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)
164	{	166	{
165	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);	167	PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_);
166	glyph_info *g;	168	glyph_info *g;
167	float x1, y1, x2, y2;
168		169
169	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)	170	if (glyph & PANGO_GLYPH_UNKNOWN_FLAG)
170	{	171	{
171	glyph = pango_opengl_get_unknown_glyph (font);	172	glyph = pango_opengl_get_unknown_glyph (font);
172		173
…		…
179	if (!g \|\| g->generation != tc_generation)	180	if (!g \|\| g->generation != tc_generation)
180	{	181	{
181	Glyph bm;	182	Glyph bm;
182	font_render_glyph (&bm, font, glyph);	183	font_render_glyph (&bm, font, glyph);
183		184
184	if (g)	185	if (!g)
185	g->generation = tc_generation;
186	else
187	{	186	{
188	g = g_slice_new (glyph_info);	187	g = g_slice_new (glyph_info);
189		188
190	_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);
191	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);	190	_pango_opengl_font_set_cache_glyph_data (font, glyph, g);
192	}	191	}
193		192
194	if (renderer->curtex)	193	g->generation = tc_generation;
195	glEnd ();
196
197	tc_get (&g->tex, bm.width, bm.height);
198		194
199	g->left = bm.left;	195	g->left = bm.left;
200	g->top = bm.top;	196	g->top = bm.top;
201		197
		198	tc_get (&g->tex, bm.width, bm.height);
		199
		200	if (bm.width && bm.height)
		201	{
202	glBindTexture (GL_TEXTURE_2D, g->tex.name);	202	glBindTexture (GL_TEXTURE_2D, g->tex.name);
203	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	203	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
204	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	204	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
205	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);
206	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);	206	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
207	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	207	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
208		208	}
209	renderer->curtex = g->tex.name;
210	glBegin (GL_QUADS);
211	}	209	}
212		210
213	x += g->left;	211	x += g->left;
214	y -= g->top;	212	y -= g->top;
215		213
216	x1 = g->tex.x * (1. / TC_WIDTH );
217	y1 = g->tex.y * (1. / TC_HEIGHT);
218	x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
219	y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
220
221	if (g->tex.name != renderer->curtex)	214	if (g->tex.name != renderer->key.texname)
222	{	215	{
223	if (renderer->curtex)
224	glEnd ();
225
226	glBindTexture (GL_TEXTURE_2D, g->tex.name);
227	renderer->curtex = g->tex.name;	216	renderer->key.texname = g->tex.name;
228		217	renderer->arr = rc_array (renderer->rc, &renderer->key);
229	glBegin (GL_QUADS);
230	}	218	}
231		219
232	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);
233	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
234	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
235	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
236	}	221	}
237		222
238	static void	223	static void
239	draw_trapezoid (PangoRenderer *renderer_,	224	draw_trapezoid (PangoRenderer *renderer_,
240	PangoRenderPart part,	225	PangoRenderPart part,
…		…
244	double y2,	229	double y2,
245	double x12,	230	double x12,
246	double x22)	231	double x22)
247	{	232	{
248	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	233	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		234	rc_key_t key = renderer->key;
		235	rc_array_t *arr;
249		236
250	if (renderer->curtex)	237	key.mode = GL_QUADS;
251	{	238	key.format = GL_V2F;
252	glEnd ();	239	key.texname = 0;
253	renderer->curtex = 0;
254	}
255		240
256	glDisable (GL_TEXTURE_2D);	241	arr = rc_array (renderer->rc, &key);
257		242
258	glBegin (GL_QUADS);	243	rc_v2f (arr, x11, y1);
259	glVertex2d (x11, y1);	244	rc_v2f (arr, x21, y1);
260	glVertex2d (x21, y1);	245	rc_v2f (arr, x22, y2);
261	glVertex2d (x22, y2);	246	rc_v2f (arr, x12, y2);
262	glVertex2d (x12, y2);
263	glEnd ();
264
265	glEnable (GL_TEXTURE_2D);
266	}	247	}
267		248
268	void	249	void
269	pango_opengl_render_layout_subpixel (PangoLayout *layout,	250	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		251	rc_t *rc,
270	int x, int y,	252	int x, int y,
271	float r, float g, float b, float a,	253	float r, float g, float b, float a,
272	int flags)	254	int flags)
273	{	255	{
274	PangoContext *context;	256	PangoContext *context;
275	PangoFontMap *fontmap;	257	PangoFontMap *fontmap;
276	PangoRenderer *renderer;	258	PangoRenderer *renderer;
		259	PangoOpenGLRenderer *gl;
277		260
278	context = pango_layout_get_context (layout);	261	context = pango_layout_get_context (layout);
279	fontmap = pango_context_get_font_map (context);	262	fontmap = pango_context_get_font_map (context);
280	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));
281
282	PANGO_OPENGL_RENDERER (renderer)->r = r;	264	gl = PANGO_OPENGL_RENDERER (renderer);
283	PANGO_OPENGL_RENDERER (renderer)->g = g;	265
284	PANGO_OPENGL_RENDERER (renderer)->b = b;	266	gl->rc = rc;
285	PANGO_OPENGL_RENDERER (renderer)->a = a;	267	gl->r = r;
286	PANGO_OPENGL_RENDERER (renderer)->flags = flags;	268	gl->g = g;
		269	gl->b = b;
		270	gl->a = a;
		271	gl->flags = flags;
287		272
288	pango_renderer_draw_layout (renderer, layout, x, y);	273	pango_renderer_draw_layout (renderer, layout, x, y);
289	}	274	}
290		275
291	void	276	void
292	pango_opengl_render_layout (PangoLayout *layout,	277	pango_opengl_render_layout (PangoLayout *layout,
		278	rc_t *rc,
293	int x, int y,	279	int x, int y,
294	float r, float g, float b, float a,	280	float r, float g, float b, float a,
295	int flags)	281	int flags)
296	{	282	{
297	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);	283	pango_opengl_render_layout_subpixel (
		284	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		285	);
298	}	286	}
299		287
300	static void	288	static void
301	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	289	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
302	{	290	{
		291	memset (&renderer->key, 0, sizeof (rc_key_t));
		292
303	renderer->r = 1.;	293	renderer->r = 1.;
304	renderer->g = 1.;	294	renderer->g = 1.;
305	renderer->b = 1.;	295	renderer->b = 1.;
306	renderer->a = 1.;	296	renderer->a = 1.;
307	}	297	}
308		298
309	static void	299	static void
310	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	300	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
311	{	301	{
312	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	302	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
313	PangoColor *fg = 0;	303	PangoColor *fg = 0;
314	GSList *l;	304	GSList *l;
315	unsigned char r, g, b, a;	305	unsigned char r, g, b, a;
316		306
317	renderer->underline = PANGO_UNDERLINE_NONE;	307	renderer->underline = PANGO_UNDERLINE_NONE;
318	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;
319		313
320	for (l = run->item->analysis.extra_attrs; l; l = l->next)	314	for (l = run->item->analysis.extra_attrs; l; l = l->next)
321	{	315	{
322	PangoAttribute *attr = l->data;	316	PangoAttribute *attr = l->data;
323		317
…		…
346	g = fg->green * (255.f / 65535.f);	340	g = fg->green * (255.f / 65535.f);
347	b = fg->blue * (255.f / 65535.f);	341	b = fg->blue * (255.f / 65535.f);
348	}	342	}
349	else	343	else
350	{	344	{
351	r = glrenderer->r * 255.f;	345	r = gl->r * 255.f;
352	g = glrenderer->g * 255.f;	346	g = gl->g * 255.f;
353	b = glrenderer->b * 255.f;	347	b = gl->b * 255.f;
354	}	348	}
355		349
356	a = glrenderer->a * 255.f;	350	a = gl->a * 255.f;
357		351
358	if (glrenderer->flags & FLAG_INVERSE)	352	if (gl->flags & FLAG_INVERSE)
359	{	353	{
360	r ^= 0xffU;	354	r ^= 0xffU;
361	g ^= 0xffU;	355	g ^= 0xffU;
362	b ^= 0xffU;	356	b ^= 0xffU;
363	}	357	}
364		358
365	glColor4ub (r, g, b, a);	359	gl->key.r = r;
		360	gl->key.g = g;
		361	gl->key.b = b;
		362	gl->key.a = a;
366	}	363	}
367		364
368	static void	365	static void
369	draw_begin (PangoRenderer *renderer_)	366	draw_begin (PangoRenderer *renderer_)
370	{	367	{
371	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	368	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
372
373	renderer->curtex = 0;
374
375	glEnable (GL_TEXTURE_2D);
376	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
377	glEnable (GL_BLEND);
378	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
379	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
380	glEnable (GL_ALPHA_TEST);
381	glAlphaFunc (GL_GREATER, 0.01f);
382	}	369	}
383		370
384	static void	371	static void
385	draw_end (PangoRenderer *renderer_)	372	draw_end (PangoRenderer *renderer_)
386	{	373	{
387	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	374	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
388
389	if (renderer->curtex)
390	glEnd ();
391
392	glDisable (GL_ALPHA_TEST);
393	glDisable (GL_BLEND);
394	glDisable (GL_TEXTURE_2D);
395	}	375	}
396		376
397	static void	377	static void
398	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	378	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
399	{	379	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.6 by root, Sun Aug 13 15:14:17 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.6 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC