[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC

…		…
9		9
10	#include <string.h>	10	#include <string.h>
11	#include <stdio.h>	11	#include <stdio.h>
12		12
13	#include <SDL.h>	13	#include <SDL.h>
		14	#include <SDL_endian.h>
14	#include <SDL_image.h>	15	#include <SDL_image.h>
15	#include <SDL_mixer.h>	16	#include <SDL_mixer.h>
16	#include <SDL_opengl.h>	17	#include <SDL_opengl.h>
17		18
18	#include <glib/gmacros.h>	19	#include <glib/gmacros.h>
19		20
20	#include <pango/pango.h>	21	#include <pango/pango.h>
21	#include <pango/pangofc-fontmap.h>	22	#include <pango/pangofc-fontmap.h>
22	#include <pango/pangoft2.h>	23	#include <pango/pangoft2.h>
		24	#include <pango/pangocairo.h>
23		25
24	#ifndef _WIN32	26	#ifndef _WIN32
25	# include <sys/types.h>	27	# include <sys/types.h>
26	# include <sys/socket.h>	28	# include <sys/socket.h>
27	# include <netinet/in.h>	29	# include <netinet/in.h>
…		…
64	typedef Mix_Music *CFClient__MixMusic;	66	typedef Mix_Music *CFClient__MixMusic;
65		67
66	typedef PangoFontDescription *CFClient__Font;	68	typedef PangoFontDescription *CFClient__Font;
67		69
68	typedef struct cf_layout {	70	typedef struct cf_layout {
69	PangoLayout *pl;	71	PangoLayout *pl; // either derived from a cairo or ft2 context
		72	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
		73	float r, g, b, a; // default color for rgba mode
70	int base_height;	74	int base_height;
71	CFClient__Font font;	75	CFClient__Font font;
72	} *CFClient__Layout;	76	} *CFClient__Layout;
73		77
74	static CFClient__Font default_font;	78	static CFClient__Font default_font;
75	static PangoContext *context;	79	static PangoContext ft2_context, cairo_context;
76	static PangoFontMap *fontmap;	80	static PangoFontMap ft2_fontmap, cairo_fontmap;
77		81
78	static void	82	static void
79	substitute_func (FcPattern *pattern, gpointer data)	83	substitute_func (FcPattern *pattern, gpointer data)
80	{	84	{
81	FcPatternAddBool (pattern, FC_HINTING , 1);	85	FcPatternAddBool (pattern, FC_HINTING , 1);
…		…
99	static void	103	static void
100	layout_get_pixel_size (CFClient__Layout self, int w, int h)	104	layout_get_pixel_size (CFClient__Layout self, int w, int h)
101	{	105	{
102	pango_layout_get_pixel_size (self->pl, w, h);	106	pango_layout_get_pixel_size (self->pl, w, h);
103		107
104	w = (w + 3) & ~3;
105	if (!w) w = 1;	108	if (!w) w = 1;
106	if (!h) h = 1;	109	if (!h) h = 1;
		110
		111	w = (w + 3) & ~3;
107	}	112	}
108		113
109	typedef uint16_t mapface;	114	typedef uint16_t mapface;
110		115
111	typedef struct {	116	typedef struct {
…		…
400	};	405	};
401		406
402	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
403	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
404		409
405	fontmap = pango_ft2_font_map_new ();	410	ft2_fontmap = pango_ft2_font_map_new ();
406	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);	411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
407	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);	412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		413
		414	cairo_fontmap = pango_cairo_font_map_get_default ();
		415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
408	}	416	}
409		417
410	int	418	int
411	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
412		420
…		…
687	default_font = self;	695	default_font = self;
688		696
689	MODULE = CFClient PACKAGE = CFClient::Layout	697	MODULE = CFClient PACKAGE = CFClient::Layout
690		698
691	CFClient::Layout	699	CFClient::Layout
692	new (SV *class, int base_height = MIN_FONT_HEIGHT)	700	new (SV *class, int rgba = 0)
693	CODE:	701	CODE:
694	New (0, RETVAL, 1, struct cf_layout);	702	New (0, RETVAL, 1, struct cf_layout);
695	RETVAL->pl = pango_layout_new (context);	703
696	RETVAL->base_height = base_height;	704	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
		705	RETVAL->rgba = rgba;
		706	RETVAL->r = 1.;
		707	RETVAL->g = 1.;
		708	RETVAL->b = 1.;
		709	RETVAL->a = 1.;
		710	RETVAL->base_height = MIN_FONT_HEIGHT;
697	RETVAL->font = 0;	711	RETVAL->font = 0;
		712
698	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	713	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
699	pango_layout_set_font_description (RETVAL->pl, default_font);	714	layout_update_font (RETVAL);
700	OUTPUT:	715	OUTPUT:
701	RETVAL	716	RETVAL
702		717
703	void	718	void
704	DESTROY (CFClient::Layout self)	719	DESTROY (CFClient::Layout self)
705	CODE:	720	CODE:
706	g_object_unref (self->pl);	721	g_object_unref (self->pl);
707	Safefree (self);	722	Safefree (self);
708		723
		724	int
		725	is_rgba (CFClient::Layout self)
		726	CODE:
		727	RETVAL = self->rgba;
		728	OUTPUT:
		729	RETVAL
		730
709	void	731	void
710	set_text (CFClient::Layout self, SV *text_)	732	set_text (CFClient::Layout self, SV *text_)
711	CODE:	733	CODE:
712	{	734	{
713	STRLEN textlen;	735	STRLEN textlen;
…		…
731	CODE:	753	CODE:
732	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
733	SvUTF8_on (RETVAL);	755	SvUTF8_on (RETVAL);
734	OUTPUT:	756	OUTPUT:
735	RETVAL	757	RETVAL
		758
		759	void
		760	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
		761	CODE:
		762	self->r = r;
		763	self->g = g;
		764	self->b = b;
		765	self->a = a;
736		766
737	void	767	void
738	set_font (CFClient::Layout self, CFClient::Font font = 0)	768	set_font (CFClient::Layout self, CFClient::Font font = 0)
739	CODE:	769	CODE:
740	if (self->font != font)	770	if (self->font != font)
…		…
798	render (CFClient::Layout self)	828	render (CFClient::Layout self)
799	PPCODE:	829	PPCODE:
800	{	830	{
801	SV *retval;	831	SV *retval;
802	int w, h;	832	int w, h;
803	FT_Bitmap bitmap;
804		833
805	layout_get_pixel_size (self, &w, &h);	834	layout_get_pixel_size (self, &w, &h);
806		835
		836	if (self->rgba)
		837	{
		838	cairo_surface_t *surface;
		839	cairo_t *cairo;
		840
		841	retval = newSV (w * h * 4);
		842	SvPOK_only (retval);
		843	SvCUR_set (retval, w * h * 4);
		844
		845	memset (SvPVX (retval), 0, w * h * 4);
		846
		847	surface = cairo_image_surface_create_for_data (
		848	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
		849	cairo = cairo_create (surface);
		850	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
		851
		852	pango_cairo_show_layout (cairo, self->pl);
		853
		854	cairo_destroy (cairo);
		855	cairo_surface_destroy (surface);
		856
		857	// what a mess, and its premultiplied, too :(
		858	{
		859	uint32_t p = (uint32_t )SvPVX (retval);
		860	uint32_t e = p + w h;
		861
		862	while (p < e)
		863	{
		864	uint32_t rgba = *p;
		865	rgba = (rgba >> 24) \| (rgba << 8);
		866	rgba = SDL_SwapBE32 (rgba);
		867	*p++ = rgba;
		868	}
		869	}
		870
		871	EXTEND (SP, 5);
		872	PUSHs (sv_2mortal (newSViv (w)));
		873	PUSHs (sv_2mortal (newSViv (h)));
		874	PUSHs (sv_2mortal (retval));
		875	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		876	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
		877	}
		878	else
		879	{
		880	FT_Bitmap bitmap;
		881
807	retval = newSV (w * h);	882	retval = newSV (w * h);
808	SvPOK_only (retval);	883	SvPOK_only (retval);
809	SvCUR_set (retval, w * h);	884	SvCUR_set (retval, w * h);
810		885
811	bitmap.rows = h;	886	bitmap.rows = h;
812	bitmap.width = w;	887	bitmap.width = w;
813	bitmap.pitch = w;	888	bitmap.pitch = w;
814	bitmap.buffer = (unsigned char*)SvPVX (retval);	889	bitmap.buffer = (unsigned char*)SvPVX (retval);
815	bitmap.num_grays = 256;	890	bitmap.num_grays = 256;
816	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;	891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
817		892
818	memset (bitmap.buffer, 0, w * h);	893	memset (bitmap.buffer, 0, w * h);
819		894
820	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	895	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
821		896
822	EXTEND (SP, 3);	897	EXTEND (SP, 5);
823	PUSHs (sv_2mortal (newSViv (w)));	898	PUSHs (sv_2mortal (newSViv (w)));
824	PUSHs (sv_2mortal (newSViv (h)));	899	PUSHs (sv_2mortal (newSViv (h)));
825	PUSHs (sv_2mortal (retval));	900	PUSHs (sv_2mortal (retval));
		901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
		903	}
826	}	904	}
827		905
828	MODULE = CFClient PACKAGE = CFClient::Texture	906	MODULE = CFClient PACKAGE = CFClient::Texture
829		907
830	void	908	void
831	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	909	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
832	PROTOTYPE: $$$;$$	910	PROTOTYPE: $$$;$$
		911	ALIAS:
		912	draw_quad_alpha = 1
		913	draw_quad_alpha_premultiplied = 2
833	CODE:	914	CODE:
834	{	915	{
835	HV hv = (HV )SvRV (self);	916	HV hv = (HV )SvRV (self);
836	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
837	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
…		…
842	{	923	{
843	w = SvNV (*hv_fetch (hv, "w", 1, 1));	924	w = SvNV (*hv_fetch (hv, "w", 1, 1));
844	h = SvNV (*hv_fetch (hv, "h", 1, 1));	925	h = SvNV (*hv_fetch (hv, "h", 1, 1));
845	}	926	}
846		927
		928	if (ix)
		929	{
		930	glEnable (GL_BLEND);
		931	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		932	}
		933
847	glBindTexture (GL_TEXTURE_2D, name);	934	glBindTexture (GL_TEXTURE_2D, name);
		935
848	if (wrap_mode) {	936	if (wrap_mode)
		937	{
849	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
850	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
851	}	940	}
		941
852	glBegin (GL_QUADS);	942	glBegin (GL_QUADS);
853	glTexCoord2f (0, 0); glVertex2f (x , y );	943	glTexCoord2f (0, 0); glVertex2f (x , y );
854	glTexCoord2f (0, t); glVertex2f (x , y + h);	944	glTexCoord2f (0, t); glVertex2f (x , y + h);
855	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
856	glTexCoord2f (s, 0); glVertex2f (x + w, y );	946	glTexCoord2f (s, 0); glVertex2f (x + w, y );
857	glEnd ();	947	glEnd ();
		948
		949	if (ix)
		950	glDisable (GL_BLEND);
858	}	951	}
859		952
860	MODULE = CFClient PACKAGE = CFClient::Map	953	MODULE = CFClient PACKAGE = CFClient::Map
861		954
862	CFClient::Map	955	CFClient::Map
…		…
1385	const_iv (GL_ONE_MINUS_DST_ALPHA),	1478	const_iv (GL_ONE_MINUS_DST_ALPHA),
1386	const_iv (GL_RGB),	1479	const_iv (GL_RGB),
1387	const_iv (GL_RGBA),	1480	const_iv (GL_RGBA),
1388	const_iv (GL_UNSIGNED_BYTE),	1481	const_iv (GL_UNSIGNED_BYTE),
1389	const_iv (GL_ALPHA),	1482	const_iv (GL_ALPHA),
		1483	const_iv (GL_LUMINANCE),
1390	const_iv (GL_FLOAT),	1484	const_iv (GL_FLOAT),
1391	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1392	const_iv (GL_COMPILE),	1486	const_iv (GL_COMPILE),
1393	const_iv (GL_TEXTURE_1D),	1487	const_iv (GL_TEXTURE_1D),
1394	const_iv (GL_TEXTURE_2D),	1488	const_iv (GL_TEXTURE_2D),

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs. Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.75 by root, Mon May 8 18:28:40 2006 UTC vs.
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC