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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.4 by root, Wed Jul 5 00:16:44 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	if (renderer->curtex)	193	g->generation = tc_generation;
194	glEnd ();
195
196	tc_get (&g->tex, bm.width, bm.height);	194	tc_get (&g->tex, bm.width, bm.height);
197		195
198	g->left = bm.left;	196	g->left = bm.left;
199	g->top = bm.top;	197	g->top = bm.top;
200		198
…		…
202	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);	200	glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
203	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);	201	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
204	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);
205	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);	203	glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
206	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);	204	glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
207
208	renderer->curtex = g->tex.name;
209	glBegin (GL_QUADS);
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		213	renderer->arr = rc_array (renderer->rc, &renderer->key);
228	glBegin (GL_QUADS);
229	}	214	}
230		215
231	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);
232	glTexCoord2f (x2, y1); glVertex2i (x + g->tex.w, y );
233	glTexCoord2f (x2, y2); glVertex2i (x + g->tex.w, y + g->tex.h);
234	glTexCoord2f (x1, y2); glVertex2i (x , y + g->tex.h);
235	}	217	}
236		218
237	static void	219	static void
238	draw_trapezoid (PangoRenderer *renderer_,	220	draw_trapezoid (PangoRenderer *renderer_,
239	PangoRenderPart part,	221	PangoRenderPart part,
…		…
243	double y2,	225	double y2,
244	double x12,	226	double x12,
245	double x22)	227	double x22)
246	{	228	{
247	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	229	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
		230	rc_key_t key = renderer->key;
		231	rc_array_t *arr;
248		232
249	if (renderer->curtex)	233	key.mode = GL_QUADS;
250	{	234	key.format = GL_V2F;
251	glEnd ();	235	key.texname = 0;
252	renderer->curtex = 0;
253	}
254		236
255	glDisable (GL_TEXTURE_2D);	237	arr = rc_array (renderer->rc, &key);
256		238
257	glBegin (GL_QUADS);	239	rc_v2f (arr, x11, y1);
258	glVertex2d (x11, y1);	240	rc_v2f (arr, x21, y1);
259	glVertex2d (x12, y1);	241	rc_v2f (arr, x22, y2);
260	glVertex2d (x22, y2);	242	rc_v2f (arr, x12, y2);
261	glVertex2d (x21, y2);
262	glEnd ();
263
264	glEnable (GL_TEXTURE_2D);
265	}	243	}
266		244
267	void	245	void
268	pango_opengl_render_layout_subpixel (PangoLayout *layout,	246	pango_opengl_render_layout_subpixel (PangoLayout *layout,
		247	rc_t *rc,
269	int x, int y,	248	int x, int y,
270	float r, float g, float b, float a)	249	float r, float g, float b, float a,
		250	int flags)
271	{	251	{
272	PangoContext *context;	252	PangoContext *context;
273	PangoFontMap *fontmap;	253	PangoFontMap *fontmap;
274	PangoRenderer *renderer;	254	PangoRenderer *renderer;
		255	PangoOpenGLRenderer *gl;
275		256
276	context = pango_layout_get_context (layout);	257	context = pango_layout_get_context (layout);
277	fontmap = pango_context_get_font_map (context);	258	fontmap = pango_context_get_font_map (context);
278	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));
279
280	PANGO_OPENGL_RENDERER (renderer)->r = r;	260	gl = PANGO_OPENGL_RENDERER (renderer);
281	PANGO_OPENGL_RENDERER (renderer)->g = g;	261
282	PANGO_OPENGL_RENDERER (renderer)->b = b;	262	gl->rc = rc;
283	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;
284		268
285	pango_renderer_draw_layout (renderer, layout, x, y);	269	pango_renderer_draw_layout (renderer, layout, x, y);
286	}	270	}
287		271
288	void	272	void
289	pango_opengl_render_layout (PangoLayout *layout,	273	pango_opengl_render_layout (PangoLayout *layout,
		274	rc_t *rc,
290	int x, int y,	275	int x, int y,
291	float r, float g, float b, float a)	276	float r, float g, float b, float a,
		277	int flags)
292	{	278	{
293	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	);
294	}	282	}
295		283
296	static void	284	static void
297	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)	285	pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)
298	{	286	{
		287	memset (&renderer->key, 0, sizeof (rc_key_t));
		288
299	renderer->r = 1.;	289	renderer->r = 1.;
300	renderer->g = 1.;	290	renderer->g = 1.;
301	renderer->b = 1.;	291	renderer->b = 1.;
302	renderer->a = 1.;	292	renderer->a = 1.;
303	}	293	}
304		294
305	static void	295	static void
306	prepare_run (PangoRenderer renderer, PangoLayoutRun run)	296	prepare_run (PangoRenderer renderer, PangoLayoutRun run)
307	{	297	{
308	PangoOpenGLRenderer glrenderer = (PangoOpenGLRenderer )renderer;	298	PangoOpenGLRenderer gl = (PangoOpenGLRenderer )renderer;
309	PangoColor *fg = 0;	299	PangoColor *fg = 0;
310	GSList *l;	300	GSList *l;
		301	unsigned char r, g, b, a;
311		302
312	renderer->underline = PANGO_UNDERLINE_NONE;	303	renderer->underline = PANGO_UNDERLINE_NONE;
313	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;
314		309
315	for (l = run->item->analysis.extra_attrs; l; l = l->next)	310	for (l = run->item->analysis.extra_attrs; l; l = l->next)
316	{	311	{
317	PangoAttribute *attr = l->data;	312	PangoAttribute *attr = l->data;
318		313
…		…
334	break;	329	break;
335	}	330	}
336	}	331	}
337		332
338	if (fg)	333	if (fg)
339	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	}
340	else	339	else
341	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;
342	}	359	}
343		360
344	static void	361	static void
345	draw_begin (PangoRenderer *renderer_)	362	draw_begin (PangoRenderer *renderer_)
346	{	363	{
347	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	364	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
348
349	renderer->curtex = 0;
350
351	glEnable (GL_TEXTURE_2D);
352	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
353	glEnable (GL_BLEND);
354	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
355	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
356	glEnable (GL_ALPHA_TEST);
357	glAlphaFunc (GL_GREATER, 0.01f);
358	}	365	}
359		366
360	static void	367	static void
361	draw_end (PangoRenderer *renderer_)	368	draw_end (PangoRenderer *renderer_)
362	{	369	{
363	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;	370	PangoOpenGLRenderer renderer = (PangoOpenGLRenderer )renderer_;
364
365	if (renderer->curtex)
366	glEnd ();
367
368	glDisable (GL_ALPHA_TEST);
369	glDisable (GL_BLEND);
370	glDisable (GL_TEXTURE_2D);
371	}	371	}
372		372
373	static void	373	static void
374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)	374	pango_opengl_renderer_class_init (PangoOpenGLRendererClass *klass)
375	{	375	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents): Revision 1.4 by root, Wed Jul 5 00:16:44 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.4 by root, Wed Jul 5 00:16:44 2006 UTC vs.
Revision 1.13 by root, Wed Dec 26 10:34:23 2007 UTC