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

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.10 by root, Sat Aug 11 12:07:54 2007 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.10 by root, Sat Aug 11 12:07:54 2007 UTC