[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.14 by root, Sun Jan 13 08:22:33 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);	194	tc_get (&g->tex, bm.width, bm.height);
198		195
199	g->left = bm.left;	196	g->left = bm.left;
200	g->top = bm.top;	197	g->top = bm.top;
201		198
		199	if (bm.width && bm.height)
		200	{
202	glBindTexture (GL_TEXTURE_2D, g->tex.name);	201	glBindTexture (GL_TEXTURE_2D, g->tex.name);
203	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
204	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	203	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);	204	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);	205	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
207	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
208		207	}
209	renderer->curtex = g->tex.name;
210	glBegin (GL_QUADS);
211	}	208	}
212		209
213	x += g->left;	210	x += g->left;
214	y -= g->top;	211	y -= g->top;
215		212
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)	213	if (g->tex.name != renderer->key.texname)
222	{	214	{
223	if (renderer->curtex)
224	glEnd ();
225
226	glBindTexture (GL_TEXTURE_2D, g->tex.name);
227	renderer->curtex = g->tex.name;	215	renderer->key.texname = g->tex.name;
228		216	renderer->arr = rc_array (renderer->rc, &renderer->key);
229	glBegin (GL_QUADS);
230	}	217	}
231		218
232	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);
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	}	220	}
237		221
238	static void	222	static void
239	draw_trapezoid (PangoRenderer *renderer_,	223	draw_trapezoid (PangoRenderer *renderer_,
240	PangoRenderPart part,	224	PangoRenderPart part,
…		…
244	double y2,	228	double y2,
245	double x12,	229	double x12,
246	double x22)	230	double x22)
247	{	231	{
248	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	232	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		233	rc_key_t key = renderer->key;
		234	rc_array_t *arr;
249		235
250	if (renderer->curtex)	236	key.mode = GL_QUADS;
251	{	237	key.format = GL_V2F;
252	glEnd ();	238	key.texname = 0;
253	renderer->curtex = 0;
254	}
255		239
256	glDisable (GL_TEXTURE_2D);	240	arr = rc_array (renderer->rc, &key);
257		241
258	glBegin (GL_QUADS);	242	rc_v2f (arr, x11, y1);
259	glVertex2d (x11, y1);	243	rc_v2f (arr, x21, y1);
260	glVertex2d (x21, y1);	244	rc_v2f (arr, x22, y2);
261	glVertex2d (x22, y2);	245	rc_v2f (arr, x12, y2);
262	glVertex2d (x12, y2);
263	glEnd ();
264
265	glEnable (GL_TEXTURE_2D);
266	}	246	}
267		247
268	void	248	void
269	pango_opengl_render_layout_subpixel (PangoLayout *layout,	249	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		250	rc_t *rc,
270	int x, int y,	251	int x, int y,
271	float r, float g, float b, float a,	252	float r, float g, float b, float a,
272	int flags)	253	int flags)
273	{	254	{
274	PangoContext *context;	255	PangoContext *context;
275	PangoFontMap *fontmap;	256	PangoFontMap *fontmap;
276	PangoRenderer *renderer;	257	PangoRenderer *renderer;
		258	PangoOpenGLRenderer *gl;
277		259
278	context = pango_layout_get_context (layout);	260	context = pango_layout_get_context (layout);
279	fontmap = pango_context_get_font_map (context);	261	fontmap = pango_context_get_font_map (context);
280	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));
281
282	PANGO_OPENGL_RENDERER (renderer)->r = r;	263	gl = PANGO_OPENGL_RENDERER (renderer);
283	PANGO_OPENGL_RENDERER (renderer)->g = g;	264
284	PANGO_OPENGL_RENDERER (renderer)->b = b;	265	gl->rc = rc;
285	PANGO_OPENGL_RENDERER (renderer)->a = a;	266	gl->r = r;
286	PANGO_OPENGL_RENDERER (renderer)->flags = flags;	267	gl->g = g;
		268	gl->b = b;
		269	gl->a = a;
		270	gl->flags = flags;
287		271
288	pango_renderer_draw_layout (renderer, layout, x, y);	272	pango_renderer_draw_layout (renderer, layout, x, y);
289	}	273	}
290		274
291	void	275	void
292	pango_opengl_render_layout (PangoLayout *layout,	276	pango_opengl_render_layout (PangoLayout *layout,
		277	rc_t *rc,
293	int x, int y,	278	int x, int y,
294	float r, float g, float b, float a,	279	float r, float g, float b, float a,
295	int flags)	280	int flags)
296	{	281	{
297	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);	282	pango_opengl_render_layout_subpixel (
		283	layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
		284	);
298	}	285	}
299		286
300	static void	287	static void
301	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	288	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
302	{	289	{
		290	memset (&renderer->key, 0, sizeof (rc_key_t));
		291
303	renderer->r = 1.;	292	renderer->r = 1.;
304	renderer->g = 1.;	293	renderer->g = 1.;
305	renderer->b = 1.;	294	renderer->b = 1.;
306	renderer->a = 1.;	295	renderer->a = 1.;
307	}	296	}
308		297
309	static void	298	static void
310	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	299	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
311	{	300	{
312	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	301	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
313	PangoColor *fg = 0;	302	PangoColor *fg = 0;
314	GSList *l;	303	GSList *l;
315	unsigned char r, g, b, a;	304	unsigned char r, g, b, a;
316		305
317	renderer->underline = PANGO_UNDERLINE_NONE;	306	renderer->underline = PANGO_UNDERLINE_NONE;
318	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;
319		312
320	for (l = run->item->analysis.extra_attrs; l; l = l->next)	313	for (l = run->item->analysis.extra_attrs; l; l = l->next)
321	{	314	{
322	PangoAttribute *attr = l->data;	315	PangoAttribute *attr = l->data;
323		316
…		…
346	g = fg->green * (255.f / 65535.f);	339	g = fg->green * (255.f / 65535.f);
347	b = fg->blue * (255.f / 65535.f);	340	b = fg->blue * (255.f / 65535.f);
348	}	341	}
349	else	342	else
350	{	343	{
351	r = glrenderer->r * 255.f;	344	r = gl->r * 255.f;
352	g = glrenderer->g * 255.f;	345	g = gl->g * 255.f;
353	b = glrenderer->b * 255.f;	346	b = gl->b * 255.f;
354	}	347	}
355		348
356	a = glrenderer->a * 255.f;	349	a = gl->a * 255.f;
357		350
358	if (glrenderer->flags & FLAG_INVERSE)	351	if (gl->flags & FLAG_INVERSE)
359	{	352	{
360	r ^= 0xffU;	353	r ^= 0xffU;
361	g ^= 0xffU;	354	g ^= 0xffU;
362	b ^= 0xffU;	355	b ^= 0xffU;
363	}	356	}
364		357
365	glColor4ub (r, g, b, a);	358	gl->key.r = r;
		359	gl->key.g = g;
		360	gl->key.b = b;
		361	gl->key.a = a;
366	}	362	}
367		363
368	static void	364	static void
369	draw_begin (PangoRenderer *renderer_)	365	draw_begin (PangoRenderer *renderer_)
370	{	366	{
371	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	367	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	}	368	}
383		369
384	static void	370	static void
385	draw_end (PangoRenderer *renderer_)	371	draw_end (PangoRenderer *renderer_)
386	{	372	{
387	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	373	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	}	374	}
396		375
397	static void	376	static void
398	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	377	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
399	{	378	{

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.14 by root, Sun Jan 13 08:22:33 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.14 by root, Sun Jan 13 08:22:33 2008 UTC