[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.8 by root, Sat Aug 11 11:32:29 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 );	212	x1 = g->tex.x * (1. / TC_WIDTH );
210	y1 = g->tex.y * (1. / TC_HEIGHT);	213	y1 = g->tex.y * (1. / TC_HEIGHT);
211	x2 = g->tex.w * (1. / TC_WIDTH ) + x1;	214	x2 = g->tex.w * (1. / TC_WIDTH ) + x1;
212	y2 = g->tex.h * (1. / TC_HEIGHT) + y1;	215	y2 = g->tex.h * (1. / TC_HEIGHT) + y1;
213		216
214	if (g->tex.name != renderer->curtex)	217	if (g->tex.name != renderer->key.texname)
215	{	218	{
216	if (renderer->curtex)
217	glEnd ();
218
219	glBindTexture (GL_TEXTURE_2D, g->tex.name);
220	renderer->curtex = g->tex.name;	219	renderer->key.texname = g->tex.name;
221	glBegin (GL_QUADS);	220	renderer->arr = rc_array (renderer->rc, &renderer->key);
222	}	221	}
223		222
224	glTexCoord2f (x1, y1); glVertex2i (x , y );	223	rc_t2f_v3f (renderer->arr, x1, y1, x , y , 0);
225	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );	224	rc_t2f_v3f (renderer->arr, x2, y1, x + g->tex.w, y , 0);
226	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);	225	rc_t2f_v3f (renderer->arr, x2, y2, x + g->tex.w, y + g->tex.h, 0);
227	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);	226	rc_t2f_v3f (renderer->arr, x1, y2, x , y + g->tex.h, 0);
228	}	227	}
229		228
230	static void	229	static void
231	draw_trapezoid (PangoRenderer *renderer_,	230	draw_trapezoid (PangoRenderer *renderer_,
232	PangoRenderPart part,	231	PangoRenderPart part,
…		…
236	double y2,	235	double y2,
237	double x12,	236	double x12,
238	double x22)	237	double x22)
239	{	238	{
240	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	239	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		240	rc_key_t key = renderer->key;
		241	rc_array_t *arr;
241		242
242	if (renderer->curtex)	243	key.mode = GL_QUADS;
243	{	244	key.format = GL_V2F;
244	glEnd ();	245	key.texname = 0;
245	renderer->curtex = 0;
246	}
247		246
248	glDisable (GL_TEXTURE_2D);	247	arr = rc_array (renderer->rc, &key);
249		248
250	glBegin (GL_QUADS);	249	rc_v2f (arr, x11, y1);
251	glVertex2d (x11, y1);	250	rc_v2f (arr, x21, y1);
252	glVertex2d (x12, y1);	251	rc_v2f (arr, x22, y2);
253	glVertex2d (x22, y2);	252	rc_v2f (arr, x12, y2);
254	glVertex2d (x21, y2);
255	glEnd ();
256
257	glEnable (GL_TEXTURE_2D);
258	}	253	}
259		254
260	void	255	void
261	pango_opengl_render_layout_subpixel (PangoLayout *layout,	256	pango_opengl_render_layout_subpixel (PangoLayout *layout,
262	int x, int y,	257	int x, int y,
263	float r, float g, float b, float a)	258	float r, float g, float b, float a,
		259	int flags)
264	{	260	{
265	PangoContext *context;	261	PangoContext *context;
266	PangoFontMap *fontmap;	262	PangoFontMap *fontmap;
267	PangoRenderer *renderer;	263	PangoRenderer *renderer;
		264	PangoOpenGLRenderer *gl;
268		265
269	context = pango_layout_get_context (layout);	266	context = pango_layout_get_context (layout);
270	fontmap = pango_context_get_font_map (context);	267	fontmap = pango_context_get_font_map (context);
271	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));	268	renderer = _pango_opengl_font_map_get_renderer (PANGO_OPENGL_FONT_MAP (fontmap));
272
273	PANGO_OPENGL_RENDERER (renderer)->r = r;	269	gl = PANGO_OPENGL_RENDERER (renderer);
274	PANGO_OPENGL_RENDERER (renderer)->g = g;	270
275	PANGO_OPENGL_RENDERER (renderer)->b = b;	271	gl->rc = rc_alloc ();
276	PANGO_OPENGL_RENDERER (renderer)->a = a;	272	gl->r = r;
		273	gl->g = g;
		274	gl->b = b;
		275	gl->a = a;
		276	gl->flags = flags;
277		277
278	pango_renderer_draw_layout (renderer, layout, x, y);	278	pango_renderer_draw_layout (renderer, layout, x, y);
		279
		280	rc_free (gl->rc);
279	}	281	}
280		282
281	void	283	void
282	pango_opengl_render_layout (PangoLayout *layout,	284	pango_opengl_render_layout (PangoLayout *layout,
283	int x, int y,	285	int x, int y,
284	float r, float g, float b, float a)	286	float r, float g, float b, float a,
		287	int flags)
285	{	288	{
286	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a);	289	pango_opengl_render_layout_subpixel (layout, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags);
287	}	290	}
288		291
289	static void	292	static void
290	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	293	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
291	{	294	{
		295	memset (&renderer->key, 0, sizeof (rc_key_t));
		296
292	renderer->r = 1.;	297	renderer->r = 1.;
293	renderer->g = 1.;	298	renderer->g = 1.;
294	renderer->b = 1.;	299	renderer->b = 1.;
295	renderer->a = 1.;	300	renderer->a = 1.;
296	}	301	}
…		…
299	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	304	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
300	{	305	{
301	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	306	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;
302	PangoColor *fg = 0;	307	PangoColor *fg = 0;
303	GSList *l;	308	GSList *l;
		309	unsigned char r, g, b, a;
304		310
305	renderer->underline = PANGO_UNDERLINE_NONE;	311	renderer->underline = PANGO_UNDERLINE_NONE;
306	renderer->strikethrough = FALSE;	312	renderer->strikethrough = FALSE;
		313
		314	glrenderer->key.mode = GL_QUADS;
		315	glrenderer->key.format = GL_T2F_V3F;
		316	glrenderer->key.texname = 0;
307		317
308	for (l = run->item->analysis.extra_attrs; l; l = l->next)	318	for (l = run->item->analysis.extra_attrs; l; l = l->next)
309	{	319	{
310	PangoAttribute *attr = l->data;	320	PangoAttribute *attr = l->data;
311		321
…		…
327	break;	337	break;
328	}	338	}
329	}	339	}
330		340
331	if (fg)	341	if (fg)
332	glColor4f (fg->red / 65535., fg->green / 65535., fg->blue / 65535., glrenderer->a);	342	{
		343	r = fg->red * (255.f / 65535.f);
		344	g = fg->green * (255.f / 65535.f);
		345	b = fg->blue * (255.f / 65535.f);
		346	}
333	else	347	else
334	glColor4f (glrenderer->r, glrenderer->g, glrenderer->b, glrenderer->a);	348	{
		349	r = glrenderer->r * 255.f;
		350	g = glrenderer->g * 255.f;
		351	b = glrenderer->b * 255.f;
		352	}
		353
		354	a = glrenderer->a * 255.f;
		355
		356	if (glrenderer->flags & FLAG_INVERSE)
		357	{
		358	r ^= 0xffU;
		359	g ^= 0xffU;
		360	b ^= 0xffU;
		361	}
		362
		363	glrenderer->key.r = r;
		364	glrenderer->key.g = g;
		365	glrenderer->key.b = b;
		366	glrenderer->key.a = a;
335	}	367	}
336		368
337	static void	369	static void
338	draw_begin (PangoRenderer *renderer_)	370	draw_begin (PangoRenderer *renderer_)
339	{	371	{
340	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	372	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
341
342	renderer->curtex = 0;
343		373
344	glEnable (GL_TEXTURE_2D);	374	glEnable (GL_TEXTURE_2D);
345	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	375	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
346	glEnable (GL_BLEND);	376	glEnable (GL_BLEND);
347	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	377	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
…		…
353	static void	383	static void
354	draw_end (PangoRenderer *renderer_)	384	draw_end (PangoRenderer *renderer_)
355	{	385	{
356	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	386	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
357		387
358	if (renderer->curtex)	388	rc_draw (renderer->rc);
359	glEnd ();
360		389
361	glDisable (GL_ALPHA_TEST);	390	glDisable (GL_ALPHA_TEST);
362	glDisable (GL_BLEND);	391	glDisable (GL_BLEND);
363	glDisable (GL_TEXTURE_2D);	392	glDisable (GL_TEXTURE_2D);
364	}	393	}

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.8 by root, Sat Aug 11 11:32:29 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.8 by root, Sat Aug 11 11:32:29 2007 UTC