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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

…		…
41	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
42		42
43	/* work around os x broken headers */	43	/* work around os x broken headers */
44	#ifdef __MACOSX__	44	#ifdef __MACOSX__
45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46	#endif	48	#endif
47		49
48	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
50		52
51	#include <glib/gmacros.h>	53	#include <glib.h>
52		54
53	#include <pango/pango.h>	55	#include <pango/pango.h>
54		56
55	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
56	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
98	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
99		101
100	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
101	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
102		104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
		123
103	static AV *texture_av;	124	static AV *texture_av;
104		125
105	static struct	126	static struct
106	{	127	{
107	#define GL_FUNC(ptr,name) ptr name;	128	#define GL_FUNC(ptr,name) ptr name;
…		…
163	{	184	{
164	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
165		186
166	while (attrs)	187	while (attrs)
167	{	188	{
168	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
169		190
170	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
171	return 1;	192	return 1;
172		193
173	attrs = attrs->next;	194	attrs = attrs->next;
…		…
191	static void	212	static void
192	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
193	{	214	{
194	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
195	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
196	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197	#endif	218	#endif
198	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199	}	220	}
200		221
201	static void	222	static void
…		…
461		482
462	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
463	}	484	}
464		485
465	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
466	minpot (unsigned int n)	493	minpot (unsigned int n)
467	{	494	{
468	if (!n)	495	if (!n)
469	return 0;	496	return 0;
470		497
…		…
550		577
551	return mod;	578	return mod;
552	}	579	}
553		580
554	static void	581	static void
555	deliantra_main ()	582	deliantra_main (SV *real_main)
556	{	583	{
557	char *argv[] = { 0 };	584	dSP;
558	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
559	}	588	}
560		589
561	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
562	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
563	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
564	* on OS X, so... we provide one and call the original main(), which,	595	* on OS X, so... we provide one and call the original main(), which,
565	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
566	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
567	*/	598	*/
568	extern C_LINKAGE int	599	extern C_LINKAGE int
569	main (int argc, char *argv[])	600	main (int argc, char *argv[])
570	{	601	{
571	deliantra_main ();	602	deliantra_main (real_main);
572	}	603	}
573		604
574	#undef main	605	#undef main
575		606
576	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
577		608
578	static void	609	static void
579	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
580	{	611	{
		612	real_main = real_main_;
		613
581	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
582	(main) (1, argv);	615	(main) (1, argv);
583	}	616	}
584	#else	617	#else
585	static void	618	static void
586	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
587	{	620	{
588	deliantra_main ();	621	deliantra_main (real_main);
589	}	622	}
590	#endif	623	#endif
591		624
592	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
593		626
…		…
794		827
795	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
796	# undef const_iv	829	# undef const_iv
797	};	830	};
798		831
799	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	832	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801		834
802	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804	}	837	}
805		838
…		…
844	#endif	877	#endif
845	}	878	}
846		879
847	char *SDL_GetError ()	880	char *SDL_GetError ()
848		881
849	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
850		884
851	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
852		886
853	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
854		888
855	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
856		890
857	void SDL_Quit ()	891	void SDL_Quit ()
858		892
859	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
860		895
861	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
862	CODE:	897	CODE:
863	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
864	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
865	OUTPUT:	900	OUTPUT:
866	RETVAL	901	RETVAL
867		902
868	void	903	void
…		…
923	);	958	);
924		959
925	if (RETVAL)	960	if (RETVAL)
926	{	961	{
927	av_clear (texture_av);	962	av_clear (texture_av);
928
929	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	963	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
931	#include "glfunc.h"	964	#include "glfunc.h"
932	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933	}	968	}
934	}	969	}
935	OUTPUT:	970	OUTPUT:
936	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
937		975
938	void	976	void
939	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
940		978
941	char *	979	char *
942	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
943		982
944	int	983	int
945	SDL_GetAppState ()	984	SDL_GetAppState ()
946		985
947	int	986	int
948	SDL_GetModState ()	987	SDL_GetModState ()
949		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
950	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
951	poll_events ()	997	peep_events ()
952	PPCODE:	998	PPCODE:
953	{	999	{
954	SDL_Event ev;	1000	SDL_Event ev;
955		1001
956	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1022		1068
1023	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1069	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1024	}	1070	}
1025	}	1071	}
1026		1072
		1073	char *
		1074	SDL_AudioDriverName ()
		1075	CODE:
		1076	{
		1077	char buf [256];
		1078	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1079	XSRETURN_UNDEF;
		1080
		1081	RETVAL = buf;
		1082	}
		1083	OUTPUT:
		1084	RETVAL
		1085
1027	int	1086	int
1028	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1087	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1029	POSTCALL:	1088	POSTCALL:
1030	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1031	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1093	add_font (char *file)	1152	add_font (char *file)
1094	CODE:	1153	CODE:
1095	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096	OUTPUT:	1155	OUTPUT:
1097	RETVAL	1156	RETVAL
		1157
		1158	void
		1159	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1160
		1161	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1162	void
		1163	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1098		1164
1099	void	1165	void
1100	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1101	ALIAS:	1167	ALIAS:
1102	load_image_file = 1	1168	load_image_file = 1
…		…
1148		1214
1149	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1150	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1151	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1152	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1153	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1154	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1220	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1155	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1156	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1157	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1158		1224
…		…
1230	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1231		1297
1232	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1233		1299
1234	DC::Font	1300	DC::Font
1235	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1236	CODE:	1302	CODE:
1237	{	1303	{
1238	int count;	1304	int count;
1239	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1240	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1269	PROTOTYPE:	1335	PROTOTYPE:
1270	CODE:	1336	CODE:
1271	tc_restore ();	1337	tc_restore ();
1272		1338
1273	DC::Layout	1339	DC::Layout
1274	new (SV *class)	1340	new (SV *klass)
1275	CODE:	1341	CODE:
1276	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1277		1343
1278	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1279	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1428		1494
1429	void	1495	void
1430	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1431	CODE:	1497	CODE:
1432	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1433	{	1499	{
1434	self->base_height = base_height;	1500	self->base_height = base_height;
1435	layout_update_font (self);	1501	layout_update_font (self);
1436	}	1502	}
1437		1503
1438	void	1504	void
…		…
1670	void	1736	void
1671	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)	1737	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
1672	PROTOTYPE: @	1738	PROTOTYPE: @
1673	CODE:	1739	CODE:
1674	{	1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675	glEnable (GL_TEXTURE_2D);	1743	glEnable (GL_TEXTURE_2D);
1676	glEnable (GL_BLEND);
1677	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678	glBindTexture (GL_TEXTURE_2D, name1);	1744	glBindTexture (GL_TEXTURE_2D, name1);
1679		1745
1680	glColor3f (intensity, intensity, intensity);	1746	glColor3f (intensity, intensity, intensity);
1681	glPushMatrix ();	1747	glPushMatrix ();
1682	glScalef (1./3, 1./3, 1.);	1748	glScalef (1./3, 1./3, 1.);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1763	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1765
1700	/* rgb == rgb(glcolor) */	1766	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1770
1705	/* alpha = interpolate t0, t1 by env_alpha */	1771	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1773
…		…
1802	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1803		1869
1804	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1805		1871
1806	DC::Map	1872	DC::Map
1807	new (SV *class)	1873	new (SV *klass)
1808	CODE:	1874	CODE:
1809	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1810	RETVAL->x = 0;	1876	RETVAL->x = 0;
1811	RETVAL->y = 0;	1877	RETVAL->y = 0;
1812	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1968	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1969	}	2035	}
1970	}	2036	}
1971		2037
1972	SV *	2038	SV *
1973	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1974	CODE:	2040	CODE:
1975	{	2041	{
1976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1977	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1978	mapcell *cell;	2044	mapcell *cell;
…		…
1999		2065
2000	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
2001		2067
2002	if (flags & 8)	2068	if (flags & 8)
2003	{	2069	{
		2070	uint8_t ext, cmd;
		2071
2004	if (extmap)	2072	do
2005	{	2073	{
2006	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
2007		2076
2008	do	2077	if (cmd < 4)
		2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2079	else if (cmd == 5) // health
2009	{	2080	{
2010	ext = *data++;
2011	cmd = ext & 0x7f;
2012
2013	if (cmd < 4)
2014	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2015	else if (cmd == 5) // health
2016	{
2017	cell->stat_width = 1;	2081	cell->stat_width = 1;
2018	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
2019	}
2020	else if (cmd == 6) // monster width
2021	cell->stat_width = *data++ + 1;
2022	else if (cmd == 0x47)
2023	{
2024	if (*data == 1) cell->player = data [1];
2025	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2028
2029	data += *data + 1;
2030	}
2031	else if (cmd == 8) // cell flags
2032	cell->flags = *data++;
2033	else if (ext & 0x40) // unknown, multibyte => skip
2034	data += *data + 1;
2035	else
2036	data++;
2037	}	2083	}
2038	while (ext & 0x80);	2084	else if (cmd == 6) // monster width
		2085	cell->stat_width = *data++ + 1;
		2086	else if (cmd == 0x47)
		2087	{
		2088	if (*data == 1) cell->player = data [1];
		2089	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2090	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2091	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2092
		2093	data += *data + 1;
		2094	}
		2095	else if (cmd == 8) // cell flags
		2096	cell->flags = *data++;
		2097	else if (ext & 0x40) // unknown, multibyte => skip
		2098	data += *data + 1;
		2099	else
		2100	data++;
2039	}	2101	}
2040	else	2102	while (ext & 0x80);
2041	cell->darkness = *data++ + 1;
2042	}	2103	}
2043		2104
2044	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2045	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2046	{	2107	{
…		…
2094	? self->row + y	2155	? self->row + y
2095	: 0;	2156	: 0;
2096		2157
2097	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
2098	{	2159	{
2099	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2100		2161
2101	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2102	{	2163	{
2103	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2104		2165
…		…
2106	{	2167	{
2107	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2108	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2109	int a1 = tex.a;	2170	int a1 = tex.a;
2110		2171
2111	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2112	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2113	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2114	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2115	}	2176	}
2116	}	2177	}
2117		2178
2118	*map++ = (r )	2179	*map++ = (r )
2119	\| (g << 8)	2180	\| (g << 8)
…		…
2126	}	2187	}
2127	OUTPUT:	2188	OUTPUT:
2128	RETVAL	2189	RETVAL
2129		2190
2130	void	2191	void
2131	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2192	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2132	CODE:	2193	CODE:
2133	{	2194	{
2134	int x, y, z;	2195	int x, y, z;
2135		2196
2136	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2220		2281
2221	key.texname = tex.name;	2282	key.texname = tex.name;
2222	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2223	}	2284	}
2224		2285
2225	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2226	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2227		2288
2228	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2229	{	2290	{
2230	pl_x = px;	2291	pl_x = px;
2231	pl_y = py;	2292	pl_y = py;
…		…
2284	if (cell->flags & 1)	2345	if (cell->flags & 1)
2285	{	2346	{
2286	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2287	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2288	rc_array_t *arr;	2349	rc_array_t *arr;
2289	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2290	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2291		2352
2292	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2293	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2294		2355
2295	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2297	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2358	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2298	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2299	}	2360	}
2300	}	2361	}
2301	}	2362	}
2302	}	2363	}
2303		2364
…		…
2330	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2331	&& skey->level == level	2392	&& skey->level == level
2332	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2333	{	2394	{
2334	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2335	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2336	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2337	int border = bits & 15;	2398	int border = bits & 15;
2338	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2340	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2341		2402
…		…
2354		2415
2355	if (border)	2416	if (border)
2356	{	2417	{
2357	float ox = border * dx;	2418	float ox = border * dx;
2358		2419
2359	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363	}	2424	}
2364		2425
2365	if (corner)	2426	if (corner)
2366	{	2427	{
2367	float ox = corner * dx;	2428	float ox = corner * dx;
2368		2429
2369	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373	}	2434	}
2374	}	2435	}
2375	}	2436	}
2376	}	2437	}
2377	}	2438	}
…		…
2418	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2419	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2420	{	2481	{
2421	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2422		2483
2423	int px = x * T;	2484	int px = x * Tw;
2424	int py = y * T;	2485	int py = y * Th;
2425		2486
2426	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2427	{	2488	{
2428	px += sdx;	2489	px += sdx;
2429	py += sdy;	2490	py += sdy;
2430	}	2491	}
2431		2492
2432	if (cell->stat_hp)	2493	if (cell->stat_hp)
2433	{	2494	{
2434	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2435	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436		2497
2437	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2438	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2439	px + width - 1, py);	2500	px + width - 1, py);
2440		2501
…		…
2520	int x, y;	2581	int x, y;
2521	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2522	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2523	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2524	int sw3 = sw * 3;	2585	int sw3 = sw * 3;
2525	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2526	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2586	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2527	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2587	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2589	memset (darkness1, 0, sw1*sh1);
2528		2590
2529	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2530	SvCUR_set (darkness3_sv, sw3 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2531		2593
2532	mx += self->x - 1;	2594	mx += self->x - 1;
…		…
2682	STRLEN len;	2744	STRLEN len;
2683	uint8_t data, end;	2745	uint8_t data, end;
2684		2746
2685	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2686	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2688	end = data + len + 8;	2750	end = data + len + 8;
2689		2751
2690	if (len < 5)	2752	if (len < 5)
2691	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2692		2754
…		…
2753	}	2815	}
2754		2816
2755	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2756		2818
2757	DC::RW	2819	DC::RW
2758	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2759	CODE:	2821	CODE:
2760	{	2822	{
2761	STRLEN datalen;	2823	STRLEN datalen;
2762	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2763		2825
…		…
2765	}	2827	}
2766	OUTPUT:	2828	OUTPUT:
2767	RETVAL	2829	RETVAL
2768		2830
2769	DC::RW	2831	DC::RW
2770	new_from_file (SV class, const char path, const char *mode = "rb")	2832	new_from_file (SV klass, const char path, const char *mode = "rb")
2771	CODE:	2833	CODE:
2772	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2773	OUTPUT:	2835	OUTPUT:
2774	RETVAL	2836	RETVAL
2775		2837
…		…
2793	if (RETVAL < 0)	2855	if (RETVAL < 0)
2794	{	2856	{
2795	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2796		2858
2797	if (RETVAL < 0)	2859	if (RETVAL < 0)
		2860	{
		2861	// happens sometimes, maybe it just stopped playing(?)
		2862	RETVAL = Mix_GroupAvailable (-1);
		2863
		2864	if (RETVAL < 0)
2798	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2799		2866	}
		2867	else
2800	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2801	}	2869	}
2802		2870
2803	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2804	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2805	}	2873	}
…		…
2865		2933
2866	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867		2935
2868	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2869		2937
		2938	void
		2939	decoders ()
		2940	PPCODE:
		2941	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2942	int i, num = Mix_GetNumChunkDecoders ();
		2943	EXTEND (SP, num);
		2944	for (i = 0; i < num; ++i)
		2945	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2946	#else
		2947	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2948	#endif
		2949
2870	DC::MixChunk	2950	DC::MixChunk
2871	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2872	CODE:	2952	CODE:
2873	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2874	OUTPUT:	2954	OUTPUT:
2875	RETVAL	2955	RETVAL
2876		2956
…		…
2906	OUTPUT:	2986	OUTPUT:
2907	RETVAL	2987	RETVAL
2908		2988
2909	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910		2990
		2991	void
		2992	decoders ()
		2993	PPCODE:
		2994	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2995	int i, num = Mix_GetNumMusicDecoders ();
		2996	EXTEND (SP, num);
		2997	for (i = 0; i < num; ++i)
		2998	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2999	#else
		3000	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3001	#endif
		3002
2911	int	3003	int
2912	volume (int volume = -1)	3004	volume (int volume = -1)
2913	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2914	CODE:	3006	CODE:
2915	if (items > 0)	3007	if (items > 0)
…		…
2926	void	3018	void
2927	halt ()	3019	halt ()
2928	CODE:	3020	CODE:
2929	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2930		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2931	DC::MixMusic	3030	DC::MixMusic
2932	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2933	CODE:	3032	CODE:
2934	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2935	OUTPUT:	3034	OUTPUT:
2936	RETVAL	3035	RETVAL
2937		3036
…		…
3074	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
3075	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076	# undef const_iv	3175	# undef const_iv
3077	};	3176	};
3078		3177
3079	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3178	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3080	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081		3180
3082	texture_av = newAV ();	3181	texture_av = newAV ();
3083	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3084	}	3183	}
3085		3184
…		…
3090	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3091		3190
3092	void	3191	void
3093	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3094		3193
3095	char *	3194	const char *
3096	gl_vendor ()	3195	gl_vendor ()
3097	CODE:	3196	CODE:
3098	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3099	OUTPUT:	3198	OUTPUT:
3100	RETVAL	3199	RETVAL
3101		3200
3102	char *	3201	const char *
3103	gl_version ()	3202	gl_version ()
3104	CODE:	3203	CODE:
3105	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3106	OUTPUT:	3205	OUTPUT:
3107	RETVAL	3206	RETVAL
3108		3207
3109	char *	3208	const char *
3110	gl_extensions ()	3209	gl_extensions ()
3111	CODE:	3210	CODE:
3112	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3113	OUTPUT:	3212	OUTPUT:
3114	RETVAL	3213	RETVAL
3115		3214
3116	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3117		3220
3118	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3119	CODE:	3222	CODE:
3120	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3121	OUTPUT:	3224	OUTPUT:
…		…
3128	RETVAL	3231	RETVAL
3129		3232
3130	int glGetError ()	3233	int glGetError ()
3131		3234
3132	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3133		3238
3134	void glClear (int mask)	3239	void glClear (int mask)
3135		3240
3136	void glClearColor (float r, float g, float b, float a = 1.0)	3241	void glClearColor (float r, float g, float b, float a = 1.0)
3137	PROTOTYPE: @	3242	PROTOTYPE: @

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs. Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC