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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

…		…
83		83
84	#include "pango-font.c"	84	#include "pango-font.c"
85	#include "pango-fontmap.c"	85	#include "pango-fontmap.c"
86	#include "pango-render.c"	86	#include "pango-render.c"
87		87
88	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
89	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
90		90
91	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
92		92
93	static int	93	static int
94	shape_attr_p (PangoLayoutRun *run)	94	shape_attr_p (PangoLayoutRun *run)
95	{	95	{
96	GSList *attrs = run->item->analysis.extra_attrs;	96	GSList *attrs = run->item->analysis.extra_attrs;
…		…
110		110
111	typedef struct cf_layout {	111	typedef struct cf_layout {
112	PangoLayout *pl;	112	PangoLayout *pl;
113	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
114	int base_height;	114	int base_height;
115	CFClient__Font font;	115	CFPlus__Font font;
116	} *CFClient__Layout;	116	} *CFPlus__Layout;
117		117
118	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
119	static PangoContext *opengl_context;	119	static PangoContext *opengl_context;
120	static PangoFontMap *opengl_fontmap;	120	static PangoFontMap *opengl_fontmap;
121		121
122	static void	122	static void
123	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
…		…
128	#endif	128	#endif
129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130	}	130	}
131		131
132	static void	132	static void
133	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
134	{	134	{
135	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
136	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
137	*/	137	*/
138	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
142		142
143	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
144	}	144	}
145		145
146	static void	146	static void
147	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
148	{	148	{
149	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
150		150
151	if (!w) w = 1;	151	if (!w) w = 1;
152	if (!h) h = 1;	152	if (!h) h = 1;
…		…
182	int texs;	182	int texs;
183	maptex *tex;	183	maptex *tex;
184		184
185	int32_t rows;	185	int32_t rows;
186	maprow *row;	186	maprow *row;
187	} *CFClient__Map;	187	} *CFPlus__Map;
188		188
189	static char *	189	static char *
190	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
191	{	191	{
192	char *p;	192	char *p;
…		…
210		210
211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213		213
214	static maprow *	214	static maprow *
215	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
216	{	216	{
217	if (0 > y)	217	if (0 > y)
218	{	218	{
219	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
220	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
258		258
259	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
260	}	260	}
261		261
262	static mapcell *	262	static mapcell *
263	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
264	{	264	{
265	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
266	}	266	}
267		267
268	static void	268	static void
269	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
270	{	270	{
271	int r;	271	int r;
272		272
273	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
274	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
282	self->row = 0;	282	self->row = 0;
283	self->rows = 0;	283	self->rows = 0;
284	}	284	}
285		285
286	static void	286	static void
287	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288	{	288	{
289	int x, y;	289	int x, y;
290	maprow *row;	290	maprow *row;
291		291
292	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
349	n \|= n >> 16;	349	n \|= n >> 16;
350		350
351	return n + 1;	351	return n + 1;
352	}	352	}
353		353
354	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
355		355
356	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
357		357
358	BOOT:	358	BOOT:
359	{	359	{
360	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
361	static const struct {	361	static const struct {
362	const char *name;	362	const char *name;
363	IV iv;	363	IV iv;
364	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
365	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612	break;	612	break;
613	}	613	}
614		614
615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFClient::UI::Event", 1))));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616	}	616	}
617	}	617	}
618		618
619	int	619	int
620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
749	void	749	void
750	_exit (int retval)	750	_exit (int retval)
751	CODE:	751	CODE:
752	_exit (retval);	752	_exit (retval);
753		753
754	MODULE = CFClient PACKAGE = CFClient::Font	754	MODULE = CFPlus PACKAGE = CFPlus::Font
755		755
756	CFClient::Font	756	CFPlus::Font
757	new_from_file (SV class, char path, int id = 0)	757	new_from_file (SV class, char path, int id = 0)
758	CODE:	758	CODE:
759	{	759	{
760	int count;	760	int count;
761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
764	}	764	}
765	OUTPUT:	765	OUTPUT:
766	RETVAL	766	RETVAL
767		767
768	void	768	void
769	DESTROY (CFClient::Font self)	769	DESTROY (CFPlus::Font self)
770	CODE:	770	CODE:
771	pango_font_description_free (self);	771	pango_font_description_free (self);
772		772
773	void	773	void
774	make_default (CFClient::Font self)	774	make_default (CFPlus::Font self)
775	CODE:	775	CODE:
776	default_font = self;	776	default_font = self;
777		777
778	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFPlus PACKAGE = CFPlus::Layout
779		779
780	void	780	void
781	reset_glyph_cache ()	781	reset_glyph_cache ()
782	CODE:	782	CODE:
783	tc_clear ();	783	tc_clear ();
784		784
785	CFClient::Layout	785	CFPlus::Layout
786	new (SV *class)	786	new (SV *class)
787	CODE:	787	CODE:
788	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
789		789
790	RETVAL->pl = pango_layout_new (opengl_context);	790	RETVAL->pl = pango_layout_new (opengl_context);
…		…
799	layout_update_font (RETVAL);	799	layout_update_font (RETVAL);
800	OUTPUT:	800	OUTPUT:
801	RETVAL	801	RETVAL
802		802
803	void	803	void
804	DESTROY (CFClient::Layout self)	804	DESTROY (CFPlus::Layout self)
805	CODE:	805	CODE:
806	g_object_unref (self->pl);	806	g_object_unref (self->pl);
807	Safefree (self);	807	Safefree (self);
808		808
809	void	809	void
810	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFPlus::Layout self, SV *text_)
811	CODE:	811	CODE:
812	{	812	{
813	STRLEN textlen;	813	STRLEN textlen;
814	char *text = SvPVutf8 (text_, textlen);	814	char *text = SvPVutf8 (text_, textlen);
815		815
816	pango_layout_set_text (self->pl, text, textlen);	816	pango_layout_set_text (self->pl, text, textlen);
817	}	817	}
818		818
819	void	819	void
820	set_markup (CFClient::Layout self, SV *text_)	820	set_markup (CFPlus::Layout self, SV *text_)
821	CODE:	821	CODE:
822	{	822	{
823	STRLEN textlen;	823	STRLEN textlen;
824	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
825		825
826	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
827	}	827	}
828		828
829	void	829	void
830	set_shapes (CFClient::Layout self, ...)	830	set_shapes (CFPlus::Layout self, ...)
831	CODE:	831	CODE:
832	{	832	{
833	PangoAttrList *attrs = 0;	833	PangoAttrList *attrs = 0;
834	const char *text = pango_layout_get_text (self->pl);	834	const char *text = pango_layout_get_text (self->pl);
835	const char *pos = text;	835	const char *pos = text;
…		…
870	if (attrs)	870	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	871	pango_layout_set_attributes (self->pl, attrs);
872	}	872	}
873		873
874	void	874	void
875	get_shapes (CFClient::Layout self)	875	get_shapes (CFPlus::Layout self)
876	PPCODE:	876	PPCODE:
877	{	877	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		879
880	do	880	do
…		…
895		895
896	pango_layout_iter_free (iter);	896	pango_layout_iter_free (iter);
897	}	897	}
898		898
899	int	899	int
900	has_wrapped (CFClient::Layout self)	900	has_wrapped (CFPlus::Layout self)
901	CODE:	901	CODE:
902	{	902	{
903	int lines = 1;	903	int lines = 1;
904	const char *text = pango_layout_get_text (self->pl);	904	const char *text = pango_layout_get_text (self->pl);
905		905
…		…
910	}	910	}
911	OUTPUT:	911	OUTPUT:
912	RETVAL	912	RETVAL
913		913
914	SV *	914	SV *
915	get_text (CFClient::Layout self)	915	get_text (CFPlus::Layout self)
916	CODE:	916	CODE:
917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918	sv_utf8_decode (RETVAL);	918	sv_utf8_decode (RETVAL);
919	OUTPUT:	919	OUTPUT:
920	RETVAL	920	RETVAL
921		921
922	void	922	void
923	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	923	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924	CODE:	924	CODE:
925	self->r = r;	925	self->r = r;
926	self->g = g;	926	self->g = g;
927	self->b = b;	927	self->b = b;
928	self->a = a;	928	self->a = a;
929		929
930	void	930	void
931	set_font (CFClient::Layout self, CFClient::Font font = 0)	931	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932	CODE:	932	CODE:
933	if (self->font != font)	933	if (self->font != font)
934	{	934	{
935	self->font = font;	935	self->font = font;
936	layout_update_font (self);	936	layout_update_font (self);
937	}	937	}
938		938
939	void	939	void
940	set_height (CFClient::Layout self, int base_height)	940	set_height (CFPlus::Layout self, int base_height)
941	CODE:	941	CODE:
942	if (self->base_height != base_height)	942	if (self->base_height != base_height)
943	{	943	{
944	self->base_height = base_height;	944	self->base_height = base_height;
945	layout_update_font (self);	945	layout_update_font (self);
946	}	946	}
947		947
948	void	948	void
949	set_width (CFClient::Layout self, int max_width = -1)	949	set_width (CFPlus::Layout self, int max_width = -1)
950	CODE:	950	CODE:
951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952		952
953	void	953	void
954	set_indent (CFClient::Layout self, int indent)	954	set_indent (CFPlus::Layout self, int indent)
955	CODE:	955	CODE:
956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957		957
958	void	958	void
959	set_spacing (CFClient::Layout self, int spacing)	959	set_spacing (CFPlus::Layout self, int spacing)
960	CODE:	960	CODE:
961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962		962
963	void	963	void
964	set_ellipsise (CFClient::Layout self, int ellipsise)	964	set_ellipsise (CFPlus::Layout self, int ellipsise)
965	CODE:	965	CODE:
966	pango_layout_set_ellipsize (self->pl,	966	pango_layout_set_ellipsize (self->pl,
967	ellipsise == 1 ? PANGO_ELLIPSIZE_START	967	ellipsise == 1 ? PANGO_ELLIPSIZE_START
968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
970	: PANGO_ELLIPSIZE_NONE	970	: PANGO_ELLIPSIZE_NONE
971	);	971	);
972		972
973	void	973	void
974	set_single_paragraph_mode (CFClient::Layout self, int spm)	974	set_single_paragraph_mode (CFPlus::Layout self, int spm)
975	CODE:	975	CODE:
976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977		977
978	void	978	void
979	size (CFClient::Layout self)	979	size (CFPlus::Layout self)
980	PPCODE:	980	PPCODE:
981	{	981	{
982	int w, h;	982	int w, h;
983		983
984	layout_get_pixel_size (self, &w, &h);	984	layout_get_pixel_size (self, &w, &h);
…		…
987	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
988	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
989	}	989	}
990		990
991	int	991	int
992	descent (CFClient::Layout self)	992	descent (CFPlus::Layout self)
993	CODE:	993	CODE:
994	{	994	{
995	PangoRectangle rect;	995	PangoRectangle rect;
996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997	pango_layout_line_get_pixel_extents (line, 0, &rect);	997	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
999	}	999	}
1000	OUTPUT:	1000	OUTPUT:
1001	RETVAL	1001	RETVAL
1002		1002
1003	int	1003	int
1004	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFPlus::Layout self, int x, int y)
1005	CODE:	1005	CODE:
1006	{	1006	{
1007	int index, trailing;	1007	int index, trailing;
1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009	RETVAL = index;	1009	RETVAL = index;
1010	}	1010	}
1011	OUTPUT:	1011	OUTPUT:
1012	RETVAL	1012	RETVAL
1013		1013
1014	void	1014	void
1015	cursor_pos (CFClient::Layout self, int index)	1015	cursor_pos (CFPlus::Layout self, int index)
1016	PPCODE:	1016	PPCODE:
1017	{	1017	{
1018	PangoRectangle strong_pos;	1018	PangoRectangle strong_pos;
1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020		1020
…		…
1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025	}	1025	}
1026		1026
1027	void	1027	void
1028	render (CFClient::Layout self, float x, float y)	1028	render (CFPlus::Layout self, float x, float y)
1029	PPCODE:	1029	PPCODE:
1030	pango_opengl_render_layout_subpixel (	1030	pango_opengl_render_layout_subpixel (
1031	self->pl,	1031	self->pl,
1032	x * PANGO_SCALE, y * PANGO_SCALE,	1032	x * PANGO_SCALE, y * PANGO_SCALE,
1033	self->r, self->g, self->b, self->a	1033	self->r, self->g, self->b, self->a
1034	);	1034	);
1035		1035
1036	MODULE = CFClient PACKAGE = CFClient::Texture	1036	MODULE = CFPlus PACKAGE = CFPlus::Texture
1037		1037
1038	void	1038	void
1039	pad2pot (SV data_, SV w_, SV *h_)	1039	pad2pot (SV data_, SV w_, SV *h_)
1040	CODE:	1040	CODE:
1041	{	1041	{
…		…
1119	glDisable (GL_ALPHA_TEST);	1119	glDisable (GL_ALPHA_TEST);
1120	glDisable (GL_BLEND);	1120	glDisable (GL_BLEND);
1121	}	1121	}
1122	}	1122	}
1123		1123
1124	MODULE = CFClient PACKAGE = CFClient::Map	1124	MODULE = CFPlus PACKAGE = CFPlus::Map
1125		1125
1126	CFClient::Map	1126	CFPlus::Map
1127	new (SV *class, int map_width, int map_height)	1127	new (SV *class, int map_width, int map_height)
1128	CODE:	1128	CODE:
1129	New (0, RETVAL, 1, struct map);	1129	New (0, RETVAL, 1, struct map);
1130	RETVAL->x = 0;	1130	RETVAL->x = 0;
1131	RETVAL->y = 0;	1131	RETVAL->y = 0;
…		…
1141	RETVAL->row = 0;	1141	RETVAL->row = 0;
1142	OUTPUT:	1142	OUTPUT:
1143	RETVAL	1143	RETVAL
1144		1144
1145	void	1145	void
1146	DESTROY (CFClient::Map self)	1146	DESTROY (CFPlus::Map self)
1147	CODE:	1147	CODE:
1148	{	1148	{
1149	map_clear (self);	1149	map_clear (self);
1150	Safefree (self->face);	1150	Safefree (self->face);
1151	Safefree (self->tex);	1151	Safefree (self->tex);
1152	Safefree (self);	1152	Safefree (self);
1153	}	1153	}
1154		1154
1155	void	1155	void
1156	clear (CFClient::Map self)	1156	clear (CFPlus::Map self)
1157	CODE:	1157	CODE:
1158	map_clear (self);	1158	map_clear (self);
1159		1159
1160	void	1160	void
1161	set_face (CFClient::Map self, int face, int texid)	1161	set_face (CFPlus::Map self, int face, int texid)
1162	CODE:	1162	CODE:
1163	{	1163	{
1164	while (self->faces <= face)	1164	while (self->faces <= face)
1165	{	1165	{
1166	Append (mapface, self->face, self->faces, self->faces);	1166	Append (mapface, self->face, self->faces, self->faces);
…		…
1169		1169
1170	self->face [face] = texid;	1170	self->face [face] = texid;
1171	}	1171	}
1172		1172
1173	void	1173	void
1174	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1174	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1175	CODE:	1175	CODE:
1176	{	1176	{
1177	while (self->texs <= texid)	1177	while (self->texs <= texid)
1178	{	1178	{
1179	Append (maptex, self->tex, self->texs, self->texs);	1179	Append (maptex, self->tex, self->texs, self->texs);
…		…
1203	// from transparent color bleeding and ugly wrapping effects.	1203	// from transparent color bleeding and ugly wrapping effects.
1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205	}	1205	}
1206		1206
1207	int	1207	int
1208	ox (CFClient::Map self)	1208	ox (CFPlus::Map self)
1209	ALIAS:	1209	ALIAS:
1210	oy = 1	1210	oy = 1
1211	x = 2	1211	x = 2
1212	y = 3	1212	y = 3
1213	w = 4	1213	w = 4
…		…
1224	}	1224	}
1225	OUTPUT:	1225	OUTPUT:
1226	RETVAL	1226	RETVAL
1227		1227
1228	void	1228	void
1229	scroll (CFClient::Map self, int dx, int dy)	1229	scroll (CFPlus::Map self, int dx, int dy)
1230	CODE:	1230	CODE:
1231	{	1231	{
1232	if (dx > 0)	1232	if (dx > 0)
1233	map_blank (self, self->x, self->y, dx - 1, self->h);	1233	map_blank (self, self->x, self->y, dx - 1, self->h);
1234	else if (dx < 0)	1234	else if (dx < 0)
…		…
1250	self->y += MAP_EXTEND_Y;	1250	self->y += MAP_EXTEND_Y;
1251	}	1251	}
1252	}	1252	}
1253		1253
1254	void	1254	void
1255	map1a_update (CFClient::Map self, SV *data_)	1255	map1a_update (CFPlus::Map self, SV *data_)
1256	CODE:	1256	CODE:
1257	{	1257	{
1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1259	uint8_t data_end = (uint8_t )SvEND (data_);	1259	uint8_t data_end = (uint8_t )SvEND (data_);
1260	mapcell *cell;	1260	mapcell *cell;
…		…
1302	cell->darkness = -1;	1302	cell->darkness = -1;
1303	}	1303	}
1304	}	1304	}
1305		1305
1306	SV *	1306	SV *
1307	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1307	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308	CODE:	1308	CODE:
1309	{	1309	{
1310	int x1, x;	1310	int x1, x;
1311	int y1, y;	1311	int y1, y;
1312	int z;	1312	int z;
…		…
1362	}	1362	}
1363	OUTPUT:	1363	OUTPUT:
1364	RETVAL	1364	RETVAL
1365		1365
1366	void	1366	void
1367	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1367	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1368	CODE:	1368	CODE:
1369	{	1369	{
1370	int vx, vy;	1370	int vx, vy;
1371	int x, y, z;	1371	int x, y, z;
1372	int last_name;	1372	int last_name;
…		…
1437	glDisable (GL_TEXTURE_2D);	1437	glDisable (GL_TEXTURE_2D);
1438	glDisable (GL_BLEND);	1438	glDisable (GL_BLEND);
1439	}	1439	}
1440		1440
1441	void	1441	void
1442	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1442	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443	CODE:	1443	CODE:
1444	{	1444	{
1445	static float color[16][3] = {	1445	static float color[16][3] = {
1446	{ 0.00F, 0.00F, 0.00F },	1446	{ 0.00F, 0.00F, 0.00F },
1447	{ 1.00F, 1.00F, 1.00F },	1447	{ 1.00F, 1.00F, 1.00F },
…		…
1497	glDisable (GL_BLEND);	1497	glDisable (GL_BLEND);
1498	glDisable (GL_TEXTURE_2D);	1498	glDisable (GL_TEXTURE_2D);
1499	}	1499	}
1500		1500
1501	void	1501	void
1502	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1502	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1503	PPCODE:	1503	PPCODE:
1504	{	1504	{
1505	int vx, vy;	1505	int vx, vy;
1506	int x, y;	1506	int x, y;
1507	int sw4 = (sw + 3) & ~3;	1507	int sw4 = (sw + 3) & ~3;
…		…
1536	PUSHs (sv_2mortal (newSViv (sh)));	1536	PUSHs (sv_2mortal (newSViv (sh)));
1537	PUSHs (darkness_sv);	1537	PUSHs (darkness_sv);
1538	}	1538	}
1539		1539
1540	SV *	1540	SV *
1541	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1541	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542	CODE:	1542	CODE:
1543	{	1543	{
1544	int x, y, x1, y1;	1544	int x, y, x1, y1;
1545	SV data_sv = newSV (w h * 7 + 5);	1545	SV data_sv = newSV (w h * 7 + 5);
1546	uint8_t data = (uint8_t )SvPVX (data_sv);	1546	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1608	}	1608	}
1609	OUTPUT:	1609	OUTPUT:
1610	RETVAL	1610	RETVAL
1611		1611
1612	void	1612	void
1613	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1613	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614	PPCODE:	1614	PPCODE:
1615	{	1615	{
1616	int x, y, z;	1616	int x, y, z;
1617	int w, h;	1617	int w, h;
1618	int x1, y1;	1618	int x1, y1;
…		…
1667	}	1667	}
1668	}	1668	}
1669	}	1669	}
1670	}	1670	}
1671		1671
1672	MODULE = CFClient PACKAGE = CFClient::MixChunk	1672	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673		1673
1674	CFClient::MixChunk	1674	CFPlus::MixChunk
1675	new_from_file (SV class, char path)	1675	new_from_file (SV class, char path)
1676	CODE:	1676	CODE:
1677	RETVAL = Mix_LoadWAV (path);	1677	RETVAL = Mix_LoadWAV (path);
1678	OUTPUT:	1678	OUTPUT:
1679	RETVAL	1679	RETVAL
1680		1680
1681	void	1681	void
1682	DESTROY (CFClient::MixChunk self)	1682	DESTROY (CFPlus::MixChunk self)
1683	CODE:	1683	CODE:
1684	Mix_FreeChunk (self);	1684	Mix_FreeChunk (self);
1685		1685
1686	int	1686	int
1687	volume (CFClient::MixChunk self, int volume = -1)	1687	volume (CFPlus::MixChunk self, int volume = -1)
1688	CODE:	1688	CODE:
1689	RETVAL = Mix_VolumeChunk (self, volume);	1689	RETVAL = Mix_VolumeChunk (self, volume);
1690	OUTPUT:	1690	OUTPUT:
1691	RETVAL	1691	RETVAL
1692		1692
1693	int	1693	int
1694	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1694	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695	CODE:	1695	CODE:
1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697	OUTPUT:	1697	OUTPUT:
1698	RETVAL	1698	RETVAL
1699		1699
1700	MODULE = CFClient PACKAGE = CFClient::MixMusic	1700	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701		1701
1702	int	1702	int
1703	volume (int volume = -1)	1703	volume (int volume = -1)
1704	CODE:	1704	CODE:
1705	RETVAL = Mix_VolumeMusic (volume);	1705	RETVAL = Mix_VolumeMusic (volume);
1706	OUTPUT:	1706	OUTPUT:
1707	RETVAL	1707	RETVAL
1708		1708
1709	CFClient::MixMusic	1709	CFPlus::MixMusic
1710	new_from_file (SV class, char path)	1710	new_from_file (SV class, char path)
1711	CODE:	1711	CODE:
1712	RETVAL = Mix_LoadMUS (path);	1712	RETVAL = Mix_LoadMUS (path);
1713	OUTPUT:	1713	OUTPUT:
1714	RETVAL	1714	RETVAL
1715		1715
1716	void	1716	void
1717	DESTROY (CFClient::MixMusic self)	1717	DESTROY (CFPlus::MixMusic self)
1718	CODE:	1718	CODE:
1719	Mix_FreeMusic (self);	1719	Mix_FreeMusic (self);
1720		1720
1721	int	1721	int
1722	play (CFClient::MixMusic self, int loops = -1)	1722	play (CFPlus::MixMusic self, int loops = -1)
1723	CODE:	1723	CODE:
1724	RETVAL = Mix_PlayMusic (self, loops);	1724	RETVAL = Mix_PlayMusic (self, loops);
1725	OUTPUT:	1725	OUTPUT:
1726	RETVAL	1726	RETVAL
1727		1727
1728	MODULE = CFClient PACKAGE = CFClient::OpenGL	1728	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729		1729
1730	BOOT:	1730	BOOT:
1731	{	1731	{
1732	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1732	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733	static const struct {	1733	static const struct {
1734	const char *name;	1734	const char *name;
1735	IV iv;	1735	IV iv;
1736	} *civ, const_iv[] = {	1736	} *civ, const_iv[] = {
1737	# define const_iv(name) { # name, (IV)name }	1737	# define const_iv(name) { # name, (IV)name }

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs. Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.132 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC