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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.316 by root, Sun Nov 4 02:13:53 2012 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	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);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 64	89	#define FOW_DARKNESS 50
87	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	90	#define DARKNESS_ADJUST(n) (n)
88		91
89	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
90	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
91		94
92	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
96		99
97	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
98		101
99	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
100	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
101	#define TEXID_HIDDEN 3	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	}
102		123
103	static AV *texture_av;	124	static AV *texture_av;
104		125
105	static struct	126	static struct
106	{	127	{
…		…
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
…		…
821	NV ceil (NV x)	854	NV ceil (NV x)
822		855
823	IV minpot (UV n)	856	IV minpot (UV n)
824		857
825	IV popcount (UV n)	858	IV popcount (UV n)
		859
		860	NV distance (NV dx, NV dy)
		861	CODE:
		862	RETVAL = pow (dx * dx + dy * dy, 0.5);
		863	OUTPUT:
		864	RETVAL
826		865
827	void	866	void
828	pango_init ()	867	pango_init ()
829	CODE:	868	CODE:
830	{	869	{
…		…
838	#endif	877	#endif
839	}	878	}
840		879
841	char *SDL_GetError ()	880	char *SDL_GetError ()
842		881
843	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
844		884
845	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
846		886
847	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
848		888
…		…
917	);	957	);
918		958
919	if (RETVAL)	959	if (RETVAL)
920	{	960	{
921	av_clear (texture_av);	961	av_clear (texture_av);
922
923	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	962	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
925	#include "glfunc.h"	963	#include "glfunc.h"
926	#undef GL_FUNC	964	#undef GL_FUNC
		965	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		966	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927	}	967	}
928	}	968	}
929	OUTPUT:	969	OUTPUT:
930	RETVAL	970	RETVAL
931		971
932	void	972	void
		973	SDL_WM_SetCaption (const char title, const char icon)
		974
		975	void
933	SDL_GL_SwapBuffers ()	976	SDL_GL_SwapBuffers ()
934		977
935	char *	978	char *
936	SDL_GetKeyName (int sym)	979	SDL_GetKeyName (int sym)
937		980
…		…
939	SDL_GetAppState ()	982	SDL_GetAppState ()
940		983
941	int	984	int
942	SDL_GetModState ()	985	SDL_GetModState ()
943		986
		987	int
		988	SDL_WaitEvent ()
		989	C_ARGS: 0
		990
944	void	991	void
		992	SDL_PumpEvents ()
		993
		994	void
945	poll_events ()	995	peep_events ()
946	PPCODE:	996	PPCODE:
947	{	997	{
948	SDL_Event ev;	998	SDL_Event ev;
949		999
950	SDL_PumpEvents ();	1000	SDL_PumpEvents ();
…		…
1016		1066
1017	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1067	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1018	}	1068	}
1019	}	1069	}
1020		1070
		1071	char *
		1072	SDL_AudioDriverName ()
		1073	CODE:
		1074	{
		1075	char buf [256];
		1076	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1077	XSRETURN_UNDEF;
		1078
		1079	RETVAL = buf;
		1080	}
		1081	OUTPUT:
		1082	RETVAL
		1083
1021	int	1084	int
1022	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1085	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023	POSTCALL:	1086	POSTCALL:
1024	Mix_HookMusicFinished (music_finished);	1087	Mix_HookMusicFinished (music_finished);
1025	Mix_ChannelFinished (channel_finished);	1088	Mix_ChannelFinished (channel_finished);
…		…
1087	add_font (char *file)	1150	add_font (char *file)
1088	CODE:	1151	CODE:
1089	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1152	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090	OUTPUT:	1153	OUTPUT:
1091	RETVAL	1154	RETVAL
		1155
		1156	void
		1157	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1158
		1159	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1160	void
		1161	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1092		1162
1093	void	1163	void
1094	load_image_inline (SV *image_)	1164	load_image_inline (SV *image_)
1095	ALIAS:	1165	ALIAS:
1096	load_image_file = 1	1166	load_image_file = 1
…		…
1660	glDisable (GL_BLEND);	1730	glDisable (GL_BLEND);
1661	}	1731	}
1662	}	1732	}
1663		1733
1664	void	1734	void
1665	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)	1735	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)
1666	PROTOTYPE: @	1736	PROTOTYPE: @
1667	CODE:	1737	CODE:
1668	{	1738	{
		1739	glEnable (GL_BLEND);
		1740	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669	glEnable (GL_TEXTURE_2D);	1741	glEnable (GL_TEXTURE_2D);
1670	glEnable (GL_BLEND);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672	glBindTexture (GL_TEXTURE_2D, name1);	1742	glBindTexture (GL_TEXTURE_2D, name1);
1673		1743
1674	glColor3f (intensity, intensity, intensity);	1744	glColor3f (intensity, intensity, intensity);
1675	glPushMatrix ();	1745	glPushMatrix ();
1676	glScalef (1./3, 1./3, 1.);	1746	glScalef (1./3, 1./3, 1.);
1677		1747
1678	if (blend > 0.f)	1748	if (blend > 0.f)
1679	{	1749	{
1680	float S2, T2; /* 0. 0. for texture 2 */	1750	float dx3 = dx * -3.f / w;
1681	float w = w1 > w2 ? w1 : w2;	1751	float dy3 = dy * -3.f / h;
1682	float h = h1 > h2 ? h1 : h2;
1683	GLfloat env_color[4] = { 0., 0., 0., blend };	1752	GLfloat env_color[4] = { 0., 0., 0., blend };
1684		1753
1685	/* interpolate the two shadow textures */	1754	/* interpolate the two shadow textures */
1686	/* stage 0 == rgb(glcolor) + alpha(t0) */	1755	/* stage 0 == rgb(glcolor) + alpha(t0) */
1687	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1756	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1692	glBindTexture (GL_TEXTURE_2D, name2);	1761	glBindTexture (GL_TEXTURE_2D, name2);
1693	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1762	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694		1763
1695	/* rgb == rgb(glcolor) */	1764	/* rgb == rgb(glcolor) */
1696	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699		1768
1700	/* alpha = interpolate t0, t1 by env_alpha */	1769	/* alpha = interpolate t0, t1 by env_alpha */
1701	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1770	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702		1771
…		…
1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709		1778
1710	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712		1781
1713	s1 *= w / w1;
1714	t1 *= h / h1;
1715
1716	dx *= -3.f / w2;
1717	dy *= -3.f / h2;
1718	dx *= w / w2;
1719	dy *= h / h2;
1720
1721	s2 *= w / w2;
1722	t2 *= h / h2;
1723
1724	glBegin (GL_QUADS);	1782	glBegin (GL_QUADS);
1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1783	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);	1784	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);	1785	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);	1786	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729	glEnd ();	1787	glEnd ();
1730		1788
1731	glDisable (GL_TEXTURE_2D);	1789	glDisable (GL_TEXTURE_2D);
1732	gl.ActiveTexture (GL_TEXTURE0);	1790	gl.ActiveTexture (GL_TEXTURE0);
1733	}	1791	}
…		…
1735	{	1793	{
1736	/* simple blending of one texture, also opengl <1.3 path */	1794	/* simple blending of one texture, also opengl <1.3 path */
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1795	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738		1796
1739	glBegin (GL_QUADS);	1797	glBegin (GL_QUADS);
1740	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1798	glTexCoord2f (0, 0); glVertex2f (0, 0);
1741	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1799	glTexCoord2f (0, t); glVertex2f (0, h);
1742	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1800	glTexCoord2f (s, t); glVertex2f (w, h);
1743	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1801	glTexCoord2f (s, 0); glVertex2f (w, 0);
1744	glEnd ();	1802	glEnd ();
1745	}	1803	}
		1804
		1805	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1806	{
		1807	int x, y;
		1808	int dx3 = dx * 3;
		1809	int dy3 = dy * 3;
		1810
		1811	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1812	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1813	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1814	glTranslatef (-1., -1., 0);
		1815	glBegin (GL_QUADS);
		1816
		1817	for (y = 1; y < h; y += 3)
		1818	{
		1819	int y1 = y - dy3;
		1820	int y1valid = y1 >= 0 && y1 < h;
		1821
		1822	for (x = 1; x < w; x += 3)
		1823	{
		1824	int x1 = x - dx3;
		1825	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1826	uint8_t h2;
		1827
		1828	if (y1valid && x1 >= 0 && x1 < w)
		1829	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1830	else
		1831	h2 = 1; /* out of range == invisible */
		1832
		1833	if (h1 \|\| h2)
		1834	{
		1835	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1836	glColor4f (1., 1., 1., alpha);
		1837
		1838	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1839	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1840	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1841	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1842	}
		1843	}
		1844	}
		1845	}
		1846
		1847	glEnd ();
1746		1848
1747	glPopMatrix ();	1849	glPopMatrix ();
1748		1850
1749	glDisable (GL_TEXTURE_2D);	1851	glDisable (GL_TEXTURE_2D);
1750	glDisable (GL_BLEND);	1852	glDisable (GL_BLEND);
…		…
1930	self->y += MAP_EXTEND_Y;	2032	self->y += MAP_EXTEND_Y;
1931	}	2033	}
1932	}	2034	}
1933		2035
1934	SV *	2036	SV *
1935	map1a_update (DC::Map self, SV *data_, int extmap)	2037	map1a_update (DC::Map self, SV *data_)
1936	CODE:	2038	CODE:
1937	{	2039	{
1938	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2040	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1939	uint8_t data_end = (uint8_t )SvEND (data_);	2041	uint8_t data_end = (uint8_t )SvEND (data_);
1940	mapcell *cell;	2042	mapcell *cell;
…		…
1961		2063
1962	//TODO: don't trust server data to be in-range(!)	2064	//TODO: don't trust server data to be in-range(!)
1963		2065
1964	if (flags & 8)	2066	if (flags & 8)
1965	{	2067	{
		2068	uint8_t ext, cmd;
		2069
1966	if (extmap)	2070	do
1967	{	2071	{
1968	uint8_t ext, cmd;	2072	ext = *data++;
		2073	cmd = ext & 0x7f;
1969		2074
1970	do	2075	if (cmd < 4)
		2076	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2077	else if (cmd == 5) // health
1971	{	2078	{
1972	ext = *data++;
1973	cmd = ext & 0x7f;
1974
1975	if (cmd < 4)
1976	cell->darkness = 255 - ext * 64 + 1;
1977	else if (cmd == 5) // health
1978	{
1979	cell->stat_width = 1;	2079	cell->stat_width = 1;
1980	cell->stat_hp = *data++;	2080	cell->stat_hp = *data++;
1981	}
1982	else if (cmd == 6) // monster width
1983	cell->stat_width = *data++ + 1;
1984	else if (cmd == 0x47)
1985	{
1986	if (*data == 1) cell->player = data [1];
1987	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1990
1991	data += *data + 1;
1992	}
1993	else if (cmd == 8) // cell flags
1994	cell->flags = *data++;
1995	else if (ext & 0x40) // unknown, multibyte => skip
1996	data += *data + 1;
1997	else
1998	data++;
1999	}	2081	}
2000	while (ext & 0x80);	2082	else if (cmd == 6) // monster width
		2083	cell->stat_width = *data++ + 1;
		2084	else if (cmd == 0x47)
		2085	{
		2086	if (*data == 1) cell->player = data [1];
		2087	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2088	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2089	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2090
		2091	data += *data + 1;
		2092	}
		2093	else if (cmd == 8) // cell flags
		2094	cell->flags = *data++;
		2095	else if (ext & 0x40) // unknown, multibyte => skip
		2096	data += *data + 1;
		2097	else
		2098	data++;
2001	}	2099	}
2002	else	2100	while (ext & 0x80);
2003	cell->darkness = *data++ + 1;
2004	}	2101	}
2005		2102
2006	for (z = 0; z <= 2; ++z)	2103	for (z = 0; z <= 2; ++z)
2007	if (flags & (4 >> z))	2104	if (flags & (4 >> z))
2008	{	2105	{
…		…
2056	? self->row + y	2153	? self->row + y
2057	: 0;	2154	: 0;
2058		2155
2059	for (x = x0; x < x1; x++)	2156	for (x = x0; x < x1; x++)
2060	{	2157	{
2061	int r = 32, g = 32, b = 32, a = 192;	2158	unsigned int r = 32, g = 32, b = 32, a = 192;
2062		2159
2063	if (row && row->c0 <= x && x < row->c1)	2160	if (row && row->c0 <= x && x < row->c1)
2064	{	2161	{
2065	mapcell *cell = row->col + (x - row->c0);	2162	mapcell *cell = row->col + (x - row->c0);
2066		2163
…		…
2068	{	2165	{
2069	maptex tex = self->tex [cell->tile [z]];	2166	maptex tex = self->tex [cell->tile [z]];
2070	int a0 = 255 - tex.a;	2167	int a0 = 255 - tex.a;
2071	int a1 = tex.a;	2168	int a1 = tex.a;
2072		2169
2073	r = (r * a0 + tex.r * a1) / 255;	2170	r = div255 (r * a0 + tex.r * a1);
2074	g = (g * a0 + tex.g * a1) / 255;	2171	g = div255 (g * a0 + tex.g * a1);
2075	b = (b * a0 + tex.b * a1) / 255;	2172	b = div255 (b * a0 + tex.b * a1);
2076	a = (a * a0 + tex.a * a1) / 255;	2173	a = div255 (a * a0 + tex.a * a1);
2077	}	2174	}
2078	}	2175	}
2079		2176
2080	*map++ = (r )	2177	*map++ = (r )
2081	\| (g << 8)	2178	\| (g << 8)
…		…
2088	}	2185	}
2089	OUTPUT:	2186	OUTPUT:
2090	RETVAL	2187	RETVAL
2091		2188
2092	void	2189	void
2093	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2190	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)
2094	CODE:	2191	CODE:
2095	{	2192	{
2096	int x, y, z;	2193	int x, y, z;
2097		2194
2098	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2195	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2102	int pl_x, pl_y;	2199	int pl_x, pl_y;
2103	maptex pl_tex;	2200	maptex pl_tex;
2104	rc_t *rc = rc_alloc ();	2201	rc_t *rc = rc_alloc ();
2105	rc_t *rc_ov = rc_alloc ();	2202	rc_t *rc_ov = rc_alloc ();
2106	rc_key_t key;	2203	rc_key_t key;
2107	rc_array_t arr, arr_hidden;	2204	rc_array_t *arr;
2108		2205
2109	pl_tex.name = 0;	2206	pl_tex.name = 0;
2110		2207
2111	// that's current max. sorry.	2208	// that's current max. sorry.
2112	if (sw > 255) sw = 255;	2209	if (sw > 255) sw = 255;
…		…
2149	}	2246	}
2150		2247
2151	glEnable (GL_BLEND);	2248	glEnable (GL_BLEND);
2152	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2249	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2250	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155	key.texname = self->tex [TEXID_HIDDEN].name;
2156	arr_hidden = rc_array (rc_ov, &key);
2157		2251
2158	for (z = 0; z <= 2; z++)	2252	for (z = 0; z <= 2; z++)
2159	{	2253	{
2160	memset (smooth_level, 0, sizeof (smooth_level));	2254	memset (smooth_level, 0, sizeof (smooth_level));
2161	key.texname = -1;	2255	key.texname = -1;
…		…
2185		2279
2186	key.texname = tex.name;	2280	key.texname = tex.name;
2187	arr = rc_array (rc, &key);	2281	arr = rc_array (rc, &key);
2188	}	2282	}
2189		2283
2190	px = (x + 1) * T - tex.w;	2284	px = (x + 1) * Th - tex.w;
2191	py = (y + 1) * T - tex.h;	2285	py = (y + 1) * Tw - tex.h;
2192		2286
2193	if (expect_false (cell->player == player) && expect_false (z == 2))	2287	if (expect_false (cell->player == player) && expect_false (z == 2))
2194	{	2288	{
2195	pl_x = px;	2289	pl_x = px;
2196	pl_y = py;	2290	pl_y = py;
…		…
2241	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2335	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2242	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2336	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243	}	2337	}
2244	}	2338	}
2245		2339
2246	if (expect_false (z == 2))	2340	if (expect_false (z == 2) && expect_false (cell->flags))
2247	{	2341	{
2248	/* draw question marks on top of hidden spaces */	2342	// overlays such as the speech bubble, probably more to come
2249	if (!cell->darkness)	2343	if (cell->flags & 1)
2250	{	2344	{
2251	maptex tex = self->tex [TEXID_HIDDEN];
2252	int px = (x + 1) * T - tex.w;
2253	int py = (y + 1) * T - tex.h;
2254
2255	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259	}
2260
2261	if (expect_false (cell->flags))
2262	{
2263	// overlays such as the speech bubble, probably more to come
2264	if (cell->flags & 1)
2265	{
2266	rc_key_t key_ov = key;	2345	rc_key_t key_ov = key;
2267	maptex tex = self->tex [TEXID_SPEECH];	2346	maptex tex = self->tex [TEXID_SPEECH];
2268	rc_array_t *arr;	2347	rc_array_t *arr;
2269	int px = x * T + T * 2 / 32;	2348	int px = x * Tw + Tw * 2 / 32;
2270	int py = y * T - T * 6 / 32;	2349	int py = y * Th - Th * 6 / 32;
2271		2350
2272	key_ov.texname = tex.name;	2351	key_ov.texname = tex.name;
2273	arr = rc_array (rc_ov, &key_ov);	2352	arr = rc_array (rc_ov, &key_ov);
2274		2353
2275	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2354	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2355	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2277	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2356	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2278	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2357	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279	}
2280	}	2358	}
2281	}	2359	}
2282	}	2360	}
2283	}	2361	}
2284		2362
…		…
2311	if (!(bits & 0x1000)	2389	if (!(bits & 0x1000)
2312	&& skey->level == level	2390	&& skey->level == level
2313	&& level > smooth_max [skey->x][skey->y])	2391	&& level > smooth_max [skey->x][skey->y])
2314	{	2392	{
2315	maptex tex = self->tex [skey->tile];	2393	maptex tex = self->tex [skey->tile];
2316	int px = (((int)skey->x) - 1) * T;	2394	int px = (((int)skey->x) - 1) * Tw;
2317	int py = (((int)skey->y) - 1) * T;	2395	int py = (((int)skey->y) - 1) * Th;
2318	int border = bits & 15;	2396	int border = bits & 15;
2319	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2397	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320	float dx = tex.s * .0625f; // 16 images/row	2398	float dx = tex.s * .0625f; // 16 images/row
2321	float dy = tex.t * .5f ; // 2 images/column	2399	float dy = tex.t * .5f ; // 2 images/column
2322		2400
…		…
2335		2413
2336	if (border)	2414	if (border)
2337	{	2415	{
2338	float ox = border * dx;	2416	float ox = border * dx;
2339		2417
2340	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2418	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2419	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2420	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2421	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344	}	2422	}
2345		2423
2346	if (corner)	2424	if (corner)
2347	{	2425	{
2348	float ox = corner * dx;	2426	float ox = corner * dx;
2349		2427
2350	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2428	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2429	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2430	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2431	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354	}	2432	}
2355	}	2433	}
2356	}	2434	}
2357	}	2435	}
2358	}	2436	}
…		…
2399	for (x = 0; x < sw; x++)	2477	for (x = 0; x < sw; x++)
2400	if (row->c0 <= x + mx && x + mx < row->c1)	2478	if (row->c0 <= x + mx && x + mx < row->c1)
2401	{	2479	{
2402	mapcell *cell = row->col + (x + mx - row->c0);	2480	mapcell *cell = row->col + (x + mx - row->c0);
2403		2481
2404	int px = x * T;	2482	int px = x * Tw;
2405	int py = y * T;	2483	int py = y * Th;
2406		2484
2407	if (expect_false (cell->player == player))	2485	if (expect_false (cell->player == player))
2408	{	2486	{
2409	px += sdx;	2487	px += sdx;
2410	py += sdy;	2488	py += sdy;
2411	}	2489	}
2412		2490
2413	if (cell->stat_hp)	2491	if (cell->stat_hp)
2414	{	2492	{
2415	int width = cell->stat_width * T;	2493	int width = cell->stat_width * Tw;
2416	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2494	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417		2495
2418	glColor3ub (0, 0, 0);	2496	glColor3ub (0, 0, 0);
2419	glRectf (px + 1, py - thick - 2,	2497	glRectf (px + 1, py - thick - 2,
2420	px + width - 1, py);	2498	px + width - 1, py);
2421		2499
…		…
2427	}	2505	}
2428	}	2506	}
2429	}	2507	}
2430		2508
2431	void	2509	void
2432	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2510	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433	CODE:	2511	CODE:
2434	{	2512	{
2435	static float color[16][3] = {	2513	static float color[16][3] = {
2436	{ 0.00F, 0.00F, 0.00F },	2514	{ 0.00f, 0.00f, 0.00f },
2437	{ 1.00F, 1.00F, 1.00F },	2515	{ 1.00f, 1.00f, 1.00f },
2438	{ 0.00F, 0.00F, 0.55F },	2516	{ 0.00f, 0.00f, 0.55f },
2439	{ 1.00F, 0.00F, 0.00F },	2517	{ 1.00f, 0.00f, 0.00f },
2440		2518
2441	{ 1.00F, 0.54F, 0.00F },	2519	{ 1.00f, 0.54f, 0.00f },
2442	{ 0.11F, 0.56F, 1.00F },	2520	{ 0.11f, 0.56f, 1.00f },
2443	{ 0.93F, 0.46F, 0.00F },	2521	{ 0.93f, 0.46f, 0.00f },
2444	{ 0.18F, 0.54F, 0.34F },	2522	{ 0.18f, 0.54f, 0.34f },
2445		2523
2446	{ 0.56F, 0.73F, 0.56F },	2524	{ 0.56f, 0.73f, 0.56f },
2447	{ 0.80F, 0.80F, 0.80F },	2525	{ 0.80f, 0.80f, 0.80f },
2448	{ 0.55F, 0.41F, 0.13F },	2526	{ 0.55f, 0.41f, 0.13f },
2449	{ 0.99F, 0.77F, 0.26F },	2527	{ 0.99f, 0.77f, 0.26f },
2450		2528
2451	{ 0.74F, 0.65F, 0.41F },	2529	{ 0.74f, 0.65f, 0.41f },
2452		2530
2453	{ 0.00F, 1.00F, 1.00F },	2531	{ 0.00f, 1.00f, 1.00f },
2454	{ 1.00F, 0.00F, 1.00F },	2532	{ 1.00f, 0.00f, 1.00f },
2455	{ 1.00F, 1.00F, 0.00F },	2533	{ 1.00f, 1.00f, 0.00f },
2456	};	2534	};
2457		2535
2458	int x, y;	2536	int x, y;
2459		2537
2460	glEnable (GL_TEXTURE_2D);	2538	glEnable (GL_TEXTURE_2D);
2461	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2539	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462	* but the nvidia driver (185.18.14) mishandles alpha textures	2540	* but the nvidia driver (185.18.14) mishandles alpha textures
2463	* ansd takes the colour from god knows where instead of using	2541	* and takes the colour from god knows where instead of using
2464	* Cp. MODULATE results in the same colour, but slightly different	2542	* Cp. MODULATE results in the same colour, but slightly different
2465	* alpha, but atcually gives us the correct colour with nvidia.	2543	* alpha, but atcually gives us the correct colour with nvidia.
2466	*/	2544	*/
2467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2545	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468	glEnable (GL_BLEND);	2546	glEnable (GL_BLEND);
…		…
2476		2554
2477	if (m)	2555	if (m)
2478	{	2556	{
2479	float *c = color [m & 15];	2557	float *c = color [m & 15];
2480		2558
2481	float tx1 = m & 0x40 ? 0.5 : 0.;	2559	float tx1 = m & 0x40 ? 0.5f : 0.f;
2482	float tx2 = tx1 + 0.5;	2560	float tx2 = tx1 + 0.5f;
2483		2561
2484	glColor4f (c[0], c[1], c[2], 1);	2562	glColor4f (c[0], c[1], c[2], 1);
2485	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2563	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2564	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2565	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2497	void	2575	void
2498	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2576	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499	PPCODE:	2577	PPCODE:
2500	{	2578	{
2501	int x, y;	2579	int x, y;
2502	int sw1 = sw + 2;	2580	int sw1 = sw + 2;
2503	int sh1 = sh + 2;	2581	int sh1 = sh + 2;
2504	int sh3 = sh * 3;	2582	int sh3 = sh * 3;
2505	int sw34 = (sw * 3 + 3) & ~3;	2583	int sw3 = sw * 3;
		2584	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2585	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2506	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2586	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2507	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2587	memset (darkness1, 0, sw1*sh1);
2508	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2509		2588
2510	SvPOK_only (darkness3_sv);	2589	SvPOK_only (darkness3_sv);
2511	SvCUR_set (darkness3_sv, sw34 * sh3);	2590	SvCUR_set (darkness3_sv, sw3 * sh3);
2512		2591
2513	mx += self->x - 1;	2592	mx += self->x - 1;
2514	my += self->y - 1;	2593	my += self->y - 1;
2515
2516	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517		2594
2518	for (y = 0; y < sh1; y++)	2595	for (y = 0; y < sh1; y++)
2519	if (0 <= y + my && y + my < self->rows)	2596	if (0 <= y + my && y + my < self->rows)
2520	{	2597	{
2521	maprow *row = self->row + (y + my);	2598	maprow *row = self->row + (y + my);
…		…
2554		2631
2555	uint8_t r13 = (d13 + d23 + d12) / 3;	2632	uint8_t r13 = (d13 + d23 + d12) / 3;
2556	uint8_t r23 = d23;	2633	uint8_t r23 = d23;
2557	uint8_t r33 = (d23 + d33 + d32) / 3;	2634	uint8_t r33 = (d23 + d33 + d32) / 3;
2558		2635
2559	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2636	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2637	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2639	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2640	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2564	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2642	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2643	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568	}	2645	}
2569		2646
2570	free (darkness1);	2647	free (darkness1);
2571		2648
2572	EXTEND (SP, 3);	2649	EXTEND (SP, 3);
2573	PUSHs (sv_2mortal (newSViv (sw34)));	2650	PUSHs (sv_2mortal (newSViv (sw3)));
2574	PUSHs (sv_2mortal (newSViv (sh3)));	2651	PUSHs (sv_2mortal (newSViv (sh3)));
2575	PUSHs (darkness3_sv);	2652	PUSHs (darkness3_sv);
2576	}	2653	}
2577		2654
2578	SV *	2655	SV *
…		…
2776	if (RETVAL < 0)	2853	if (RETVAL < 0)
2777	{	2854	{
2778	RETVAL = Mix_GroupOldest (-1);	2855	RETVAL = Mix_GroupOldest (-1);
2779		2856
2780	if (RETVAL < 0)	2857	if (RETVAL < 0)
		2858	{
		2859	// happens sometimes, maybe it just stopped playing(?)
		2860	RETVAL = Mix_GroupAvailable (-1);
		2861
		2862	if (RETVAL < 0)
2781	XSRETURN_UNDEF;	2863	XSRETURN_UNDEF;
2782		2864	}
		2865	else
2783	Mix_HaltChannel (RETVAL);	2866	Mix_HaltChannel (RETVAL);
2784	}	2867	}
2785		2868
2786	Mix_UnregisterAllEffects (RETVAL);	2869	Mix_UnregisterAllEffects (RETVAL);
2787	Mix_Volume (RETVAL, 128);	2870	Mix_Volume (RETVAL, 128);
2788	}	2871	}
…		…
2835	void	2918	void
2836	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2919	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837	CODE:	2920	CODE:
2838	{	2921	{
2839	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2922	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2923	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2924	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842	}	2925	}
2843		2926
2844	void	2927	void
2845	set_reverse_stereo (DC::Channel self, int flip)	2928	set_reverse_stereo (DC::Channel self, int flip)
…		…
2847	Mix_SetReverseStereo (self, flip);	2930	Mix_SetReverseStereo (self, flip);
2848		2931
2849	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2932	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850		2933
2851	PROTOTYPES: DISABLE	2934	PROTOTYPES: DISABLE
		2935
		2936	void
		2937	decoders ()
		2938	PPCODE:
		2939	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2940	int i, num = Mix_GetNumChunkDecoders ();
		2941	EXTEND (SP, num);
		2942	for (i = 0; i < num; ++i)
		2943	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2944	#else
		2945	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2946	#endif
2852		2947
2853	DC::MixChunk	2948	DC::MixChunk
2854	new (SV *class, DC::RW rwops)	2949	new (SV *class, DC::RW rwops)
2855	CODE:	2950	CODE:
2856	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2951	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2889	OUTPUT:	2984	OUTPUT:
2890	RETVAL	2985	RETVAL
2891		2986
2892	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2987	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893		2988
		2989	void
		2990	decoders ()
		2991	PPCODE:
		2992	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2993	int i, num = Mix_GetNumMusicDecoders ();
		2994	EXTEND (SP, num);
		2995	for (i = 0; i < num; ++i)
		2996	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2997	#else
		2998	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2999	#endif
		3000
2894	int	3001	int
2895	volume (int volume = -1)	3002	volume (int volume = -1)
2896	PROTOTYPE: ;$	3003	PROTOTYPE: ;$
2897	CODE:	3004	CODE:
2898	if (items > 0)	3005	if (items > 0)
…		…
2908		3015
2909	void	3016	void
2910	halt ()	3017	halt ()
2911	CODE:	3018	CODE:
2912	Mix_HaltMusic ();	3019	Mix_HaltMusic ();
		3020
		3021	int
		3022	playing ()
		3023	CODE:
		3024	RETVAL = Mix_PlayingMusic ();
		3025	OUTPUT:
		3026	RETVAL
2913		3027
2914	DC::MixMusic	3028	DC::MixMusic
2915	new (SV *class, DC::RW rwops)	3029	new (SV *class, DC::RW rwops)
2916	CODE:	3030	CODE:
2917	RETVAL = Mix_LoadMUS_RW (rwops);	3031	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3057	const_iv (GL_FUNC_SUBTRACT),	3171	const_iv (GL_FUNC_SUBTRACT),
3058	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3172	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059	# undef const_iv	3173	# undef const_iv
3060	};	3174	};
3061		3175
3062	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3176	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3177	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064		3178
3065	texture_av = newAV ();	3179	texture_av = newAV ();
3066	AvREAL_off (texture_av);	3180	AvREAL_off (texture_av);
3067	}	3181	}
3068		3182
…		…
3111	RETVAL	3225	RETVAL
3112		3226
3113	int glGetError ()	3227	int glGetError ()
3114		3228
3115	void glFinish ()	3229	void glFinish ()
		3230
		3231	void glFlush ()
3116		3232
3117	void glClear (int mask)	3233	void glClear (int mask)
3118		3234
3119	void glClearColor (float r, float g, float b, float a = 1.0)	3235	void glClearColor (float r, float g, float b, float a = 1.0)
3120	PROTOTYPE: @	3236	PROTOTYPE: @
…		…
3291	void glNewList (int list, int mode = GL_COMPILE)	3407	void glNewList (int list, int mode = GL_COMPILE)
3292		3408
3293	void glEndList ()	3409	void glEndList ()
3294		3410
3295	void glCallList (int list)	3411	void glCallList (int list)
		3412
		3413	void c_init ()
		3414	CODE:
		3415	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3416	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3296		3417
3297	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3418	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298		3419
3299	PROTOTYPES: DISABLE	3420	PROTOTYPES: DISABLE
3300		3421

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC vs. Revision 1.316 by root, Sun Nov 4 02:13:53 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.316 by root, Sun Nov 4 02:13:53 2012 UTC