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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 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 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
92		96
93	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
		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	}
97		123
98	static AV *texture_av;	124	static AV *texture_av;
99		125
100	static struct	126	static struct
101	{	127	{
…		…
233	int w, h;	259	int w, h;
234	float s, t;	260	float s, t;
235	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
236	tileid smoothtile;	262	tileid smoothtile;
237	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
238	} maptex;	265	} maptex;
239		266
240	typedef struct {	267	typedef struct {
241	uint32_t player;	268	uint32_t player;
242	tileid tile[3];	269	tileid tile[3];
…		…
455		482
456	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
457	}	484	}
458		485
459	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
460	minpot (unsigned int n)	493	minpot (unsigned int n)
461	{	494	{
462	if (!n)	495	if (!n)
463	return 0;	496	return 0;
464		497
…		…
544		577
545	return mod;	578	return mod;
546	}	579	}
547		580
548	static void	581	static void
549	deliantra_main ()	582	deliantra_main (SV *real_main)
550	{	583	{
551	char *argv[] = { 0 };	584	dSP;
552	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
553	}	588	}
554		589
555	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
556	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
557	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
558	* 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,
559	* 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,
560	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
561	*/	598	*/
562	extern C_LINKAGE int	599	extern C_LINKAGE int
563	main (int argc, char *argv[])	600	main (int argc, char *argv[])
564	{	601	{
565	deliantra_main ();	602	deliantra_main (real_main);
566	}	603	}
567		604
568	#undef main	605	#undef main
569		606
570	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
571		608
572	static void	609	static void
573	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
574	{	611	{
		612	real_main = real_main_;
		613
575	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
576	(main) (1, argv);	615	(main) (1, argv);
577	}	616	}
578	#else	617	#else
579	static void	618	static void
580	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
581	{	620	{
582	deliantra_main ();	621	deliantra_main (real_main);
583	}	622	}
584	#endif	623	#endif
585		624
586	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
587		626
…		…
788		827
789	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
790	# undef const_iv	829	# undef const_iv
791	};	830	};
792		831
793	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--)
794	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
795		834
796	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
797	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
798	}	837	}
799		838
…		…
815	NV ceil (NV x)	854	NV ceil (NV x)
816		855
817	IV minpot (UV n)	856	IV minpot (UV n)
818		857
819	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
820		865
821	void	866	void
822	pango_init ()	867	pango_init ()
823	CODE:	868	CODE:
824	{	869	{
…		…
832	#endif	877	#endif
833	}	878	}
834		879
835	char *SDL_GetError ()	880	char *SDL_GetError ()
836		881
837	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
838		884
839	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
840		886
841	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
842		888
…		…
911	);	957	);
912		958
913	if (RETVAL)	959	if (RETVAL)
914	{	960	{
915	av_clear (texture_av);	961	av_clear (texture_av);
916
917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918	#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);
919	#include "glfunc.h"	963	#include "glfunc.h"
920	#undef GL_FUNC	964	#undef GL_FUNC
		965	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		966	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921	}	967	}
922	}	968	}
923	OUTPUT:	969	OUTPUT:
924	RETVAL	970	RETVAL
925		971
926	void	972	void
		973	SDL_WM_SetCaption (const char title, const char icon)
		974
		975	void
927	SDL_GL_SwapBuffers ()	976	SDL_GL_SwapBuffers ()
928		977
929	char *	978	char *
930	SDL_GetKeyName (int sym)	979	SDL_GetKeyName (int sym)
931		980
…		…
933	SDL_GetAppState ()	982	SDL_GetAppState ()
934		983
935	int	984	int
936	SDL_GetModState ()	985	SDL_GetModState ()
937		986
		987	int
		988	SDL_WaitEvent ()
		989	C_ARGS: 0
		990
938	void	991	void
		992	SDL_PumpEvents ()
		993
		994	void
939	poll_events ()	995	peep_events ()
940	PPCODE:	996	PPCODE:
941	{	997	{
942	SDL_Event ev;	998	SDL_Event ev;
943		999
944	SDL_PumpEvents ();	1000	SDL_PumpEvents ();
…		…
1010		1066
1011	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))));
1012	}	1068	}
1013	}	1069	}
1014		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
1015	int	1084	int
1016	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)
1017	POSTCALL:	1086	POSTCALL:
1018	Mix_HookMusicFinished (music_finished);	1087	Mix_HookMusicFinished (music_finished);
1019	Mix_ChannelFinished (channel_finished);	1088	Mix_ChannelFinished (channel_finished);
…		…
1081	add_font (char *file)	1150	add_font (char *file)
1082	CODE:	1151	CODE:
1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1152	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084	OUTPUT:	1153	OUTPUT:
1085	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)
1086		1162
1087	void	1163	void
1088	load_image_inline (SV *image_)	1164	load_image_inline (SV *image_)
1089	ALIAS:	1165	ALIAS:
1090	load_image_file = 1	1166	load_image_file = 1
…		…
1206	#if DEBUG	1282	#if DEBUG
1207	VALGRIND_DO_LEAK_CHECK;	1283	VALGRIND_DO_LEAK_CHECK;
1208	#endif	1284	#endif
1209	}	1285	}
1210		1286
		1287	int
		1288	SvREFCNT (SV *sv)
		1289	CODE:
		1290	RETVAL = SvREFCNT (sv);
		1291	OUTPUT:
		1292	RETVAL
		1293
1211	MODULE = Deliantra::Client PACKAGE = DC::Font	1294	MODULE = Deliantra::Client PACKAGE = DC::Font
1212		1295
1213	PROTOTYPES: DISABLE	1296	PROTOTYPES: DISABLE
1214		1297
1215	DC::Font	1298	DC::Font
…		…
1409		1492
1410	void	1493	void
1411	set_height (DC::Layout self, int base_height)	1494	set_height (DC::Layout self, int base_height)
1412	CODE:	1495	CODE:
1413	if (self->base_height != base_height)	1496	if (self->base_height != base_height)
1414	{	1497	{
1415	self->base_height = base_height;	1498	self->base_height = base_height;
1416	layout_update_font (self);	1499	layout_update_font (self);
1417	}	1500	}
1418		1501
1419	void	1502	void
…		…
1644	if (ix)	1727	if (ix)
1645	{	1728	{
1646	glDisable (GL_ALPHA_TEST);	1729	glDisable (GL_ALPHA_TEST);
1647	glDisable (GL_BLEND);	1730	glDisable (GL_BLEND);
1648	}	1731	}
		1732	}
		1733
		1734	void
		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)
		1736	PROTOTYPE: @
		1737	CODE:
		1738	{
		1739	glEnable (GL_BLEND);
		1740	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1741	glEnable (GL_TEXTURE_2D);
		1742	glBindTexture (GL_TEXTURE_2D, name1);
		1743
		1744	glColor3f (intensity, intensity, intensity);
		1745	glPushMatrix ();
		1746	glScalef (1./3, 1./3, 1.);
		1747
		1748	if (blend > 0.f)
		1749	{
		1750	float dx3 = dx * -3.f / w;
		1751	float dy3 = dy * -3.f / h;
		1752	GLfloat env_color[4] = { 0., 0., 0., blend };
		1753
		1754	/* interpolate the two shadow textures */
		1755	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1757
		1758	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1759	gl.ActiveTexture (GL_TEXTURE1);
		1760	glEnable (GL_TEXTURE_2D);
		1761	glBindTexture (GL_TEXTURE_2D, name2);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1763
		1764	/* rgb == rgb(glcolor) */
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1768
		1769	/* alpha = interpolate t0, t1 by env_alpha */
		1770	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1774	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1775
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1778
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1781
		1782	glBegin (GL_QUADS);
		1783	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1784	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1785	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1787	glEnd ();
		1788
		1789	glDisable (GL_TEXTURE_2D);
		1790	gl.ActiveTexture (GL_TEXTURE0);
		1791	}
		1792	else
		1793	{
		1794	/* simple blending of one texture, also opengl <1.3 path */
		1795	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1796
		1797	glBegin (GL_QUADS);
		1798	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1799	glTexCoord2f (0, t); glVertex2f (0, h);
		1800	glTexCoord2f (s, t); glVertex2f (w, h);
		1801	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1802	glEnd ();
		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 ();
		1848
		1849	glPopMatrix ();
		1850
		1851	glDisable (GL_TEXTURE_2D);
		1852	glDisable (GL_BLEND);
1649	}	1853	}
1650		1854
1651	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1855	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652	CODE:	1856	CODE:
1653	{	1857	{
…		…
1759	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1963	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760	// use uglier nearest interpolation because linear suffers	1964	// use uglier nearest interpolation because linear suffers
1761	// from transparent color bleeding and ugly wrapping effects.	1965	// from transparent color bleeding and ugly wrapping effects.
1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1966	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763	}	1967	}
		1968
		1969	void
		1970	expire_textures (DC::Map self, int texid, int count)
		1971	PPCODE:
		1972	for (; texid < self->texs && count; ++texid, --count)
		1973	{
		1974	maptex *tex = self->tex + texid;
		1975
		1976	if (tex->name)
		1977	{
		1978	if (tex->unused)
		1979	{
		1980	tex->name = 0;
		1981	tex->unused = 0;
		1982	XPUSHs (sv_2mortal (newSViv (texid)));
		1983	}
		1984	else
		1985	tex->unused = 1;
		1986	}
		1987	}
1764		1988
1765	int	1989	int
1766	ox (DC::Map self)	1990	ox (DC::Map self)
1767	ALIAS:	1991	ALIAS:
1768	oy = 1	1992	oy = 1
…		…
1808	self->y += MAP_EXTEND_Y;	2032	self->y += MAP_EXTEND_Y;
1809	}	2033	}
1810	}	2034	}
1811		2035
1812	SV *	2036	SV *
1813	map1a_update (DC::Map self, SV *data_, int extmap)	2037	map1a_update (DC::Map self, SV *data_)
1814	CODE:	2038	CODE:
1815	{	2039	{
1816	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2040	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1817	uint8_t data_end = (uint8_t )SvEND (data_);	2041	uint8_t data_end = (uint8_t )SvEND (data_);
1818	mapcell *cell;	2042	mapcell *cell;
…		…
1839		2063
1840	//TODO: don't trust server data to be in-range(!)	2064	//TODO: don't trust server data to be in-range(!)
1841		2065
1842	if (flags & 8)	2066	if (flags & 8)
1843	{	2067	{
		2068	uint8_t ext, cmd;
		2069
1844	if (extmap)	2070	do
1845	{	2071	{
1846	uint8_t ext, cmd;	2072	ext = *data++;
		2073	cmd = ext & 0x7f;
1847		2074
1848	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
1849	{	2078	{
1850	ext = *data++;
1851	cmd = ext & 0x7f;
1852
1853	if (cmd < 4)
1854	cell->darkness = 255 - ext * 64 + 1;
1855	else if (cmd == 5) // health
1856	{
1857	cell->stat_width = 1;	2079	cell->stat_width = 1;
1858	cell->stat_hp = *data++;	2080	cell->stat_hp = *data++;
1859	}
1860	else if (cmd == 6) // monster width
1861	cell->stat_width = *data++ + 1;
1862	else if (cmd == 0x47)
1863	{
1864	if (*data == 1) cell->player = data [1];
1865	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1868
1869	data += *data + 1;
1870	}
1871	else if (cmd == 8) // cell flags
1872	cell->flags = *data++;
1873	else if (ext & 0x40) // unknown, multibyte => skip
1874	data += *data + 1;
1875	else
1876	data++;
1877	}	2081	}
1878	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++;
1879	}	2099	}
1880	else	2100	while (ext & 0x80);
1881	cell->darkness = *data++ + 1;
1882	}	2101	}
1883		2102
1884	for (z = 0; z <= 2; ++z)	2103	for (z = 0; z <= 2; ++z)
1885	if (flags & (4 >> z))	2104	if (flags & (4 >> z))
1886	{	2105	{
…		…
1889	cell->tile [z] = self->face2tile [face];	2108	cell->tile [z] = self->face2tile [face];
1890		2109
1891	if (cell->tile [z])	2110	if (cell->tile [z])
1892	{	2111	{
1893	maptex *tex = self->tex + cell->tile [z];	2112	maptex *tex = self->tex + cell->tile [z];
		2113	tex->unused = 0;
1894	if (!tex->name)	2114	if (!tex->name)
1895	av_push (missing, newSViv (cell->tile [z]));	2115	av_push (missing, newSViv (cell->tile [z]));
1896		2116
1897	if (tex->smoothtile)	2117	if (tex->smoothtile)
1898	{	2118	{
1899	maptex *smooth = self->tex + tex->smoothtile;	2119	maptex *smooth = self->tex + tex->smoothtile;
		2120	smooth->unused = 0;
1900	if (!smooth->name)	2121	if (!smooth->name)
1901	av_push (missing, newSViv (tex->smoothtile));	2122	av_push (missing, newSViv (tex->smoothtile));
1902	}	2123	}
1903	}	2124	}
1904	}	2125	}
…		…
1932	? self->row + y	2153	? self->row + y
1933	: 0;	2154	: 0;
1934		2155
1935	for (x = x0; x < x1; x++)	2156	for (x = x0; x < x1; x++)
1936	{	2157	{
1937	int r = 32, g = 32, b = 32, a = 192;	2158	unsigned int r = 32, g = 32, b = 32, a = 192;
1938		2159
1939	if (row && row->c0 <= x && x < row->c1)	2160	if (row && row->c0 <= x && x < row->c1)
1940	{	2161	{
1941	mapcell *cell = row->col + (x - row->c0);	2162	mapcell *cell = row->col + (x - row->c0);
1942		2163
…		…
1944	{	2165	{
1945	maptex tex = self->tex [cell->tile [z]];	2166	maptex tex = self->tex [cell->tile [z]];
1946	int a0 = 255 - tex.a;	2167	int a0 = 255 - tex.a;
1947	int a1 = tex.a;	2168	int a1 = tex.a;
1948		2169
1949	r = (r * a0 + tex.r * a1) / 255;	2170	r = div255 (r * a0 + tex.r * a1);
1950	g = (g * a0 + tex.g * a1) / 255;	2171	g = div255 (g * a0 + tex.g * a1);
1951	b = (b * a0 + tex.b * a1) / 255;	2172	b = div255 (b * a0 + tex.b * a1);
1952	a = (a * a0 + tex.a * a1) / 255;	2173	a = div255 (a * a0 + tex.a * a1);
1953	}	2174	}
1954	}	2175	}
1955		2176
1956	*map++ = (r )	2177	*map++ = (r )
1957	\| (g << 8)	2178	\| (g << 8)
…		…
1964	}	2185	}
1965	OUTPUT:	2186	OUTPUT:
1966	RETVAL	2187	RETVAL
1967		2188
1968	void	2189	void
1969	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)
1970	CODE:	2191	CODE:
1971	{	2192	{
1972	int x, y, z;	2193	int x, y, z;
1973		2194
1974	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2195	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2196	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2197	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977	smooth_key skey;	2198	smooth_key skey;
1978	int pl_x, pl_y;	2199	int pl_x, pl_y;
1979	maptex pl_tex;	2200	maptex pl_tex;
1980	rc_t *rc = rc_alloc ();	2201	rc_t *rc = rc_alloc ();
		2202	rc_t *rc_ov = rc_alloc ();
1981	rc_key_t key;	2203	rc_key_t key;
1982	rc_array_t *arr;	2204	rc_array_t *arr;
1983		2205
1984	pl_tex.name = 0;	2206	pl_tex.name = 0;
1985		2207
1986	// thats current max. sorry.	2208	// that's current max. sorry.
1987	if (sw > 255) sw = 255;	2209	if (sw > 255) sw = 255;
1988	if (sh > 255) sh = 255;	2210	if (sh > 255) sh = 255;
1989		2211
1990	// clear key, in case of extra padding	2212	// clear key, in case of extra padding
1991	memset (&skey, 0, sizeof (skey));	2213	memset (&skey, 0, sizeof (skey));
…		…
1995	key.g = 255;	2217	key.g = 255;
1996	key.b = 255;	2218	key.b = 255;
1997	key.a = 255;	2219	key.a = 255;
1998	key.mode = GL_QUADS;	2220	key.mode = GL_QUADS;
1999	key.format = GL_T2F_V3F;	2221	key.format = GL_T2F_V3F;
2000	key.texname = -1;
2001		2222
2002	mx += self->x;	2223	mx += self->x;
2003	my += self->y;	2224	my += self->y;
2004		2225
2005	// first pass: determine smooth_max	2226	// first pass: determine smooth_max
…		…
2029	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2250	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030		2251
2031	for (z = 0; z <= 2; z++)	2252	for (z = 0; z <= 2; z++)
2032	{	2253	{
2033	memset (smooth_level, 0, sizeof (smooth_level));	2254	memset (smooth_level, 0, sizeof (smooth_level));
		2255	key.texname = -1;
2034		2256
2035	for (y = 0; y < sh; y++)	2257	for (y = 0; y < sh; y++)
2036	if (0 <= y + my && y + my < self->rows)	2258	if (0 <= y + my && y + my < self->rows)
2037	{	2259	{
2038	maprow *row = self->row + (y + my);	2260	maprow *row = self->row + (y + my);
…		…
2044	tileid tile = cell->tile [z];	2266	tileid tile = cell->tile [z];
2045		2267
2046	if (tile)	2268	if (tile)
2047	{	2269	{
2048	maptex tex = self->tex [tile];	2270	maptex tex = self->tex [tile];
2049	int px = (x + 1) * T - tex.w;	2271	int px, py;
2050	int py = (y + 1) * T - tex.h;
2051		2272
2052	if (key.texname != tex.name)	2273	if (key.texname != tex.name)
2053	{	2274	{
		2275	self->tex [tile].unused = 0;
		2276
2054	if (!tex.name)	2277	if (!tex.name)
2055	tex = self->tex [2]; /* missing, replace by noface */	2278	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056		2279
2057	key.texname = tex.name;	2280	key.texname = tex.name;
2058	arr = rc_array (rc, &key);	2281	arr = rc_array (rc, &key);
2059	}	2282	}
		2283
		2284	px = (x + 1) * Th - tex.w;
		2285	py = (y + 1) * Tw - tex.h;
2060		2286
2061	if (expect_false (cell->player == player) && expect_false (z == 2))	2287	if (expect_false (cell->player == player) && expect_false (z == 2))
2062	{	2288	{
2063	pl_x = px;	2289	pl_x = px;
2064	pl_y = py;	2290	pl_y = py;
…		…
2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2295	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2296	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2297	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2298	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073		2299
2074	if (expect_false (cell->flags) && expect_false (z == 2))
2075	{
2076	// overlays such as the speech bubble, probably more to come
2077	if (cell->flags & 1)
2078	{
2079	maptex tex = self->tex [1];
2080	int px = x * T + T * 2 / 32;
2081	int py = y * T - T * 6 / 32;
2082
2083	if (tex.name)
2084	{
2085	if (key.texname != tex.name)
2086	{
2087	key.texname = tex.name;
2088	arr = rc_array (rc, &key);
2089	}
2090
2091	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095	}
2096	}
2097	}
2098
2099	// update smooth hash	2300	// update smooth hash
2100	if (tex.smoothtile)	2301	if (tex.smoothtile)
2101	{	2302	{
2102	skey.tile = tex.smoothtile;	2303	skey.tile = tex.smoothtile;
2103	skey.level = tex.smoothlevel;	2304	skey.level = tex.smoothlevel;
…		…
2131	// corners	2332	// corners
2132	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2333	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2334	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134	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);
2135	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);
		2337	}
		2338	}
		2339
		2340	if (expect_false (z == 2) && expect_false (cell->flags))
		2341	{
		2342	// overlays such as the speech bubble, probably more to come
		2343	if (cell->flags & 1)
		2344	{
		2345	rc_key_t key_ov = key;
		2346	maptex tex = self->tex [TEXID_SPEECH];
		2347	rc_array_t *arr;
		2348	int px = x * Tw + Tw * 2 / 32;
		2349	int py = y * Th - Th * 6 / 32;
		2350
		2351	key_ov.texname = tex.name;
		2352	arr = rc_array (rc_ov, &key_ov);
		2353
		2354	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2355	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2356	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2357	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136	}	2358	}
2137	}	2359	}
2138	}	2360	}
2139	}	2361	}
2140		2362
…		…
2167	if (!(bits & 0x1000)	2389	if (!(bits & 0x1000)
2168	&& skey->level == level	2390	&& skey->level == level
2169	&& level > smooth_max [skey->x][skey->y])	2391	&& level > smooth_max [skey->x][skey->y])
2170	{	2392	{
2171	maptex tex = self->tex [skey->tile];	2393	maptex tex = self->tex [skey->tile];
2172	int px = (((int)skey->x) - 1) * T;	2394	int px = (((int)skey->x) - 1) * Tw;
2173	int py = (((int)skey->y) - 1) * T;	2395	int py = (((int)skey->y) - 1) * Th;
2174	int border = bits & 15;	2396	int border = bits & 15;
2175	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2397	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176	float dx = tex.s * .0625f; // 16 images/row	2398	float dx = tex.s * .0625f; // 16 images/row
2177	float dy = tex.t * .5f ; // 2 images/column	2399	float dy = tex.t * .5f ; // 2 images/column
2178		2400
…		…
2180	{	2402	{
2181	// this time avoiding texture state changes	2403	// this time avoiding texture state changes
2182	// save gobs of state changes.	2404	// save gobs of state changes.
2183	if (key.texname != tex.name)	2405	if (key.texname != tex.name)
2184	{	2406	{
		2407	self->tex [skey->tile].unused = 0;
		2408
2185	glEnd ();	2409	glEnd ();
2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2410	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187	glBegin (GL_QUADS);	2411	glBegin (GL_QUADS);
2188	}	2412	}
2189		2413
2190	if (border)	2414	if (border)
2191	{	2415	{
2192	float ox = border * dx;	2416	float ox = border * dx;
2193		2417
2194	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2418	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2419	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2420	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2421	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198	}	2422	}
2199		2423
2200	if (corner)	2424	if (corner)
2201	{	2425	{
2202	float ox = corner * dx;	2426	float ox = corner * dx;
2203		2427
2204	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2428	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2429	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2430	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2431	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208	}	2432	}
2209	}	2433	}
2210	}	2434	}
2211	}	2435	}
2212	}	2436	}
…		…
2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2459	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236		2460
2237	rc_draw (rc);	2461	rc_draw (rc);
2238	}	2462	}
2239		2463
		2464	rc_draw (rc_ov);
		2465	rc_clear (rc_ov);
		2466
2240	glDisable (GL_BLEND);	2467	glDisable (GL_BLEND);
2241	rc_free (rc);	2468	rc_free (rc);
		2469	rc_free (rc_ov);
2242		2470
2243	// top layer: overlays such as the health bar	2471	// top layer: overlays such as the health bar
2244	for (y = 0; y < sh; y++)	2472	for (y = 0; y < sh; y++)
2245	if (0 <= y + my && y + my < self->rows)	2473	if (0 <= y + my && y + my < self->rows)
2246	{	2474	{
…		…
2249	for (x = 0; x < sw; x++)	2477	for (x = 0; x < sw; x++)
2250	if (row->c0 <= x + mx && x + mx < row->c1)	2478	if (row->c0 <= x + mx && x + mx < row->c1)
2251	{	2479	{
2252	mapcell *cell = row->col + (x + mx - row->c0);	2480	mapcell *cell = row->col + (x + mx - row->c0);
2253		2481
2254	int px = x * T;	2482	int px = x * Tw;
2255	int py = y * T;	2483	int py = y * Th;
		2484
		2485	if (expect_false (cell->player == player))
		2486	{
		2487	px += sdx;
		2488	py += sdy;
		2489	}
2256		2490
2257	if (cell->stat_hp)	2491	if (cell->stat_hp)
2258	{	2492	{
2259	int width = cell->stat_width * T;	2493	int width = cell->stat_width * Tw;
2260	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2494	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2261		2495
2262	glColor3ub (0, 0, 0);	2496	glColor3ub (0, 0, 0);
2263	glRectf (px + 1, py - thick - 2,	2497	glRectf (px + 1, py - thick - 2,
2264	px + width - 1, py);	2498	px + width - 1, py);
2265		2499
…		…
2271	}	2505	}
2272	}	2506	}
2273	}	2507	}
2274		2508
2275	void	2509	void
2276	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)
2277	CODE:	2511	CODE:
2278	{	2512	{
2279	static float color[16][3] = {	2513	static float color[16][3] = {
2280	{ 0.00F, 0.00F, 0.00F },	2514	{ 0.00f, 0.00f, 0.00f },
2281	{ 1.00F, 1.00F, 1.00F },	2515	{ 1.00f, 1.00f, 1.00f },
2282	{ 0.00F, 0.00F, 0.55F },	2516	{ 0.00f, 0.00f, 0.55f },
2283	{ 1.00F, 0.00F, 0.00F },	2517	{ 1.00f, 0.00f, 0.00f },
2284		2518
2285	{ 1.00F, 0.54F, 0.00F },	2519	{ 1.00f, 0.54f, 0.00f },
2286	{ 0.11F, 0.56F, 1.00F },	2520	{ 0.11f, 0.56f, 1.00f },
2287	{ 0.93F, 0.46F, 0.00F },	2521	{ 0.93f, 0.46f, 0.00f },
2288	{ 0.18F, 0.54F, 0.34F },	2522	{ 0.18f, 0.54f, 0.34f },
2289		2523
2290	{ 0.56F, 0.73F, 0.56F },	2524	{ 0.56f, 0.73f, 0.56f },
2291	{ 0.80F, 0.80F, 0.80F },	2525	{ 0.80f, 0.80f, 0.80f },
2292	{ 0.55F, 0.41F, 0.13F },	2526	{ 0.55f, 0.41f, 0.13f },
2293	{ 0.99F, 0.77F, 0.26F },	2527	{ 0.99f, 0.77f, 0.26f },
2294		2528
2295	{ 0.74F, 0.65F, 0.41F },	2529	{ 0.74f, 0.65f, 0.41f },
2296		2530
2297	{ 0.00F, 1.00F, 1.00F },	2531	{ 0.00f, 1.00f, 1.00f },
2298	{ 1.00F, 0.00F, 1.00F },	2532	{ 1.00f, 0.00f, 1.00f },
2299	{ 1.00F, 1.00F, 0.00F },	2533	{ 1.00f, 1.00f, 0.00f },
2300	};	2534	};
2301		2535
2302	int x, y;	2536	int x, y;
2303		2537
2304	glEnable (GL_TEXTURE_2D);	2538	glEnable (GL_TEXTURE_2D);
		2539	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2540	* but the nvidia driver (185.18.14) mishandles alpha textures
		2541	* and takes the colour from god knows where instead of using
		2542	* Cp. MODULATE results in the same colour, but slightly different
		2543	* alpha, but atcually gives us the correct colour with nvidia.
		2544	*/
2305	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2545	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306	glEnable (GL_BLEND);	2546	glEnable (GL_BLEND);
2307	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2547	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308	glBegin (GL_QUADS);	2548	glBegin (GL_QUADS);
2309		2549
2310	for (y = 0; y < h; y++)	2550	for (y = 0; y < h; y++)
…		…
2314		2554
2315	if (m)	2555	if (m)
2316	{	2556	{
2317	float *c = color [m & 15];	2557	float *c = color [m & 15];
2318		2558
2319	float tx1 = m & 0x40 ? 0.5 : 0.;	2559	float tx1 = m & 0x40 ? 0.5f : 0.f;
2320	float tx2 = tx1 + 0.5;	2560	float tx2 = tx1 + 0.5f;
2321		2561
2322	glColor4f (c[0], c[1], c[2], 0.75);	2562	glColor4f (c[0], c[1], c[2], 1);
2323	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2563	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2564	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2565	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2566	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327	}	2567	}
…		…
2335	void	2575	void
2336	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)
2337	PPCODE:	2577	PPCODE:
2338	{	2578	{
2339	int x, y;	2579	int x, y;
2340	int sw1 = sw + 2;	2580	int sw1 = sw + 2;
2341	int sh1 = sh + 2;	2581	int sh1 = sh + 2;
2342	int sh3 = sh * 3;	2582	int sh3 = sh * 3;
2343	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);
2344	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2586	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2345	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2587	memset (darkness1, 0, sw1*sh1);
2346	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2347		2588
2348	SvPOK_only (darkness3_sv);	2589	SvPOK_only (darkness3_sv);
2349	SvCUR_set (darkness3_sv, sw34 * sh3);	2590	SvCUR_set (darkness3_sv, sw3 * sh3);
2350		2591
2351	mx += self->x - 1;	2592	mx += self->x - 1;
2352	my += self->y - 1;	2593	my += self->y - 1;
2353
2354	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355		2594
2356	for (y = 0; y < sh1; y++)	2595	for (y = 0; y < sh1; y++)
2357	if (0 <= y + my && y + my < self->rows)	2596	if (0 <= y + my && y + my < self->rows)
2358	{	2597	{
2359	maprow *row = self->row + (y + my);	2598	maprow *row = self->row + (y + my);
…		…
2362	if (row->c0 <= x + mx && x + mx < row->c1)	2601	if (row->c0 <= x + mx && x + mx < row->c1)
2363	{	2602	{
2364	mapcell *cell = row->col + (x + mx - row->c0);	2603	mapcell *cell = row->col + (x + mx - row->c0);
2365		2604
2366	darkness1 [y * sw1 + x] = cell->darkness	2605	darkness1 [y * sw1 + x] = cell->darkness
2367	? 255 - (cell->darkness - 1)	2606	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368	: 255 - FOW_DARKNESS;	2607	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369	}	2608	}
2370	}	2609	}
2371		2610
2372	for (y = 0; y < sh; ++y)	2611	for (y = 0; y < sh; ++y)
2373	for (x = 0; x < sw; ++x)	2612	for (x = 0; x < sw; ++x)
…		…
2392		2631
2393	uint8_t r13 = (d13 + d23 + d12) / 3;	2632	uint8_t r13 = (d13 + d23 + d12) / 3;
2394	uint8_t r23 = d23;	2633	uint8_t r23 = d23;
2395	uint8_t r33 = (d23 + d33 + d32) / 3;	2634	uint8_t r33 = (d23 + d33 + d32) / 3;
2396		2635
2397	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2636	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2637	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2639	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401	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 */
2402	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2642	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2643	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406	}	2645	}
2407		2646
2408	free (darkness1);	2647	free (darkness1);
2409		2648
2410	EXTEND (SP, 3);	2649	EXTEND (SP, 3);
2411	PUSHs (sv_2mortal (newSViv (sw34)));	2650	PUSHs (sv_2mortal (newSViv (sw3)));
2412	PUSHs (sv_2mortal (newSViv (sh3)));	2651	PUSHs (sv_2mortal (newSViv (sh3)));
2413	PUSHs (darkness3_sv);	2652	PUSHs (darkness3_sv);
2414	}	2653	}
2415		2654
2416	SV *	2655	SV *
…		…
2614	if (RETVAL < 0)	2853	if (RETVAL < 0)
2615	{	2854	{
2616	RETVAL = Mix_GroupOldest (-1);	2855	RETVAL = Mix_GroupOldest (-1);
2617		2856
2618	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)
2619	XSRETURN_UNDEF;	2863	XSRETURN_UNDEF;
2620		2864	}
		2865	else
2621	Mix_HaltChannel (RETVAL);	2866	Mix_HaltChannel (RETVAL);
2622	}	2867	}
2623		2868
2624	Mix_UnregisterAllEffects (RETVAL);	2869	Mix_UnregisterAllEffects (RETVAL);
2625	Mix_Volume (RETVAL, 128);	2870	Mix_Volume (RETVAL, 128);
2626	}	2871	}
…		…
2673	void	2918	void
2674	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)
2675	CODE:	2920	CODE:
2676	{	2921	{
2677	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));
2678	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;
2679	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2924	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680	}	2925	}
2681		2926
2682	void	2927	void
2683	set_reverse_stereo (DC::Channel self, int flip)	2928	set_reverse_stereo (DC::Channel self, int flip)
…		…
2685	Mix_SetReverseStereo (self, flip);	2930	Mix_SetReverseStereo (self, flip);
2686		2931
2687	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2932	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688		2933
2689	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
2690		2947
2691	DC::MixChunk	2948	DC::MixChunk
2692	new (SV *class, DC::RW rwops)	2949	new (SV *class, DC::RW rwops)
2693	CODE:	2950	CODE:
2694	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2951	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2727	OUTPUT:	2984	OUTPUT:
2728	RETVAL	2985	RETVAL
2729		2986
2730	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2987	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731		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
2732	int	3001	int
2733	volume (int volume = -1)	3002	volume (int volume = -1)
2734	PROTOTYPE: ;$	3003	PROTOTYPE: ;$
2735	CODE:	3004	CODE:
2736	if (items > 0)	3005	if (items > 0)
…		…
2746		3015
2747	void	3016	void
2748	halt ()	3017	halt ()
2749	CODE:	3018	CODE:
2750	Mix_HaltMusic ();	3019	Mix_HaltMusic ();
		3020
		3021	int
		3022	playing ()
		3023	CODE:
		3024	RETVAL = Mix_PlayingMusic ();
		3025	OUTPUT:
		3026	RETVAL
2751		3027
2752	DC::MixMusic	3028	DC::MixMusic
2753	new (SV *class, DC::RW rwops)	3029	new (SV *class, DC::RW rwops)
2754	CODE:	3030	CODE:
2755	RETVAL = Mix_LoadMUS_RW (rwops);	3031	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2786	} *civ, const_iv[] = {	3062	} *civ, const_iv[] = {
2787	# define const_iv(name) { # name, (IV)name }	3063	# define const_iv(name) { # name, (IV)name }
2788	const_iv (GL_VENDOR),	3064	const_iv (GL_VENDOR),
2789	const_iv (GL_VERSION),	3065	const_iv (GL_VERSION),
2790	const_iv (GL_EXTENSIONS),	3066	const_iv (GL_EXTENSIONS),
		3067	const_iv (GL_MAX_TEXTURE_UNITS),
2791	const_iv (GL_COLOR_MATERIAL),	3068	const_iv (GL_COLOR_MATERIAL),
2792	const_iv (GL_SMOOTH),	3069	const_iv (GL_SMOOTH),
2793	const_iv (GL_FLAT),	3070	const_iv (GL_FLAT),
2794	const_iv (GL_DITHER),	3071	const_iv (GL_DITHER),
2795	const_iv (GL_BLEND),	3072	const_iv (GL_BLEND),
…		…
2807	const_iv (GL_ZERO),	3084	const_iv (GL_ZERO),
2808	const_iv (GL_SRC_ALPHA),	3085	const_iv (GL_SRC_ALPHA),
2809	const_iv (GL_DST_ALPHA),	3086	const_iv (GL_DST_ALPHA),
2810	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3087	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811	const_iv (GL_ONE_MINUS_DST_ALPHA),	3088	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3089	const_iv (GL_SRC_COLOR),
		3090	const_iv (GL_DST_COLOR),
		3091	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3092	const_iv (GL_ONE_MINUS_DST_COLOR),
2812	const_iv (GL_SRC_ALPHA_SATURATE),	3093	const_iv (GL_SRC_ALPHA_SATURATE),
2813	const_iv (GL_RGB),	3094	const_iv (GL_RGB),
2814	const_iv (GL_RGBA),	3095	const_iv (GL_RGBA),
2815	const_iv (GL_RGBA4),	3096	const_iv (GL_RGBA4),
2816	const_iv (GL_RGBA8),	3097	const_iv (GL_RGBA8),
…		…
2884	const_iv (GL_NICEST),	3165	const_iv (GL_NICEST),
2885	const_iv (GL_V2F),	3166	const_iv (GL_V2F),
2886	const_iv (GL_V3F),	3167	const_iv (GL_V3F),
2887	const_iv (GL_T2F_V3F),	3168	const_iv (GL_T2F_V3F),
2888	const_iv (GL_T2F_N3F_V3F),	3169	const_iv (GL_T2F_N3F_V3F),
		3170	const_iv (GL_FUNC_ADD),
		3171	const_iv (GL_FUNC_SUBTRACT),
		3172	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889	# undef const_iv	3173	# undef const_iv
2890	};	3174	};
2891		3175
2892	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--)
2893	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3177	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2894		3178
2895	texture_av = newAV ();	3179	texture_av = newAV ();
2896	AvREAL_off (texture_av);	3180	AvREAL_off (texture_av);
2897	}	3181	}
2898		3182
2899	void	3183	void
2900	disable_GL_EXT_blend_func_separate ()	3184	disable_GL_EXT_blend_func_separate ()
2901	CODE:	3185	CODE:
2902	gl.BlendFuncSeparate = 0;	3186	gl.BlendFuncSeparate = 0;
2903	gl.BlendFuncSeparateEXT = 0;	3187	gl.BlendFuncSeparateEXT = 0;
		3188
		3189	void
		3190	apple_nvidia_bug (int enable)
2904		3191
2905	char *	3192	char *
2906	gl_vendor ()	3193	gl_vendor ()
2907	CODE:	3194	CODE:
2908	RETVAL = (char *)glGetString (GL_VENDOR);	3195	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2939		3226
2940	int glGetError ()	3227	int glGetError ()
2941		3228
2942	void glFinish ()	3229	void glFinish ()
2943		3230
		3231	void glFlush ()
		3232
2944	void glClear (int mask)	3233	void glClear (int mask)
2945		3234
2946	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)
2947	PROTOTYPE: @	3236	PROTOTYPE: @
2948		3237
…		…
2957	void glBlendFunc (int sfactor, int dfactor)	3246	void glBlendFunc (int sfactor, int dfactor)
2958		3247
2959	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3248	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960	CODE:	3249	CODE:
2961	gl_BlendFuncSeparate (sa, da, saa, daa);	3250	gl_BlendFuncSeparate (sa, da, saa, daa);
		3251
		3252	# void glBlendEquation (int se)
2962		3253
2963	void glDepthMask (int flag)	3254	void glDepthMask (int flag)
2964		3255
2965	void glLogicOp (int opcode)	3256	void glLogicOp (int opcode)
2966		3257
…		…
3001	void glRotate (float angle, float x, float y, float z)	3292	void glRotate (float angle, float x, float y, float z)
3002	CODE:	3293	CODE:
3003	glRotatef (angle, x, y, z);	3294	glRotatef (angle, x, y, z);
3004		3295
3005	void glColor (float r, float g, float b, float a = 1.0)	3296	void glColor (float r, float g, float b, float a = 1.0)
		3297	PROTOTYPE: @
3006	ALIAS:	3298	ALIAS:
3007	glColor_premultiply = 1	3299	glColor_premultiply = 1
3008	CODE:	3300	CODE:
3009	if (ix)	3301	if (ix)
3010	{	3302	{
…		…
3115	void glNewList (int list, int mode = GL_COMPILE)	3407	void glNewList (int list, int mode = GL_COMPILE)
3116		3408
3117	void glEndList ()	3409	void glEndList ()
3118		3410
3119	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);
3120		3417
3121	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3418	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3122		3419
3123	PROTOTYPES: DISABLE	3420	PROTOTYPES: DISABLE
3124		3421

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.277 by root, Mon Sep 1 06:18:09 2008 UTC vs. Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.277 by root, Mon Sep 1 06:18:09 2008 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC