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

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.11 by root, Sun Aug 12 08:44:22 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.11 by root, Sun Aug 12 08:44:22 2007 UTC