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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 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
…		…
529	return 0;	562	return 0;
530		563
531	return 1;	564	return 1;
532	}	565	}
533		566
		567	/******************************************************************************/
		568
534	/* process keyboard modifiers */	569	/* process keyboard modifiers */
535	static int	570	static int
536	mod_munge (int mod)	571	mod_munge (int mod)
537	{	572	{
538	mod &= MOD_MASK;	573	mod &= MOD_MASK;
…		…
542		577
543	return mod;	578	return mod;
544	}	579	}
545		580
546	static void	581	static void
547	deliantra_main ()	582	deliantra_main (SV *real_main)
548	{	583	{
549	char *argv[] = { 0 };	584	dSP;
550	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
551	}	588	}
552		589
553	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
554	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
555	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
556	* 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,
557	* 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,
558	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
559	*/	598	*/
560	extern C_LINKAGE int	599	extern C_LINKAGE int
561	main (int argc, char *argv[])	600	main (int argc, char *argv[])
562	{	601	{
563	deliantra_main ();	602	deliantra_main (real_main);
564	}	603	}
565		604
566	#undef main	605	#undef main
567		606
568	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
569		608
570	static void	609	static void
571	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
572	{	611	{
		612	real_main = real_main_;
		613
573	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
574	(main) (1, argv);	615	(main) (1, argv);
575	}	616	}
576	#else	617	#else
577	static void	618	static void
578	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
579	{	620	{
580	deliantra_main ();	621	deliantra_main (real_main);
581	}	622	}
582	#endif	623	#endif
583		624
584	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
585		626
…		…
786		827
787	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
788	# undef const_iv	829	# undef const_iv
789	};	830	};
790		831
791	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--)
792	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793		834
794	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796	}	837	}
797		838
…		…
813	NV ceil (NV x)	854	NV ceil (NV x)
814		855
815	IV minpot (UV n)	856	IV minpot (UV n)
816		857
817	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
818		865
819	void	866	void
820	pango_init ()	867	pango_init ()
821	CODE:	868	CODE:
822	{	869	{
…		…
830	#endif	877	#endif
831	}	878	}
832		879
833	char *SDL_GetError ()	880	char *SDL_GetError ()
834		881
835	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
836		884
837	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
838		886
839	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
840		888
…		…
909	);	957	);
910		958
911	if (RETVAL)	959	if (RETVAL)
912	{	960	{
913	av_clear (texture_av);	961	av_clear (texture_av);
914
915	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916	#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);
917	#include "glfunc.h"	963	#include "glfunc.h"
918	#undef GL_FUNC	964	#undef GL_FUNC
		965	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		966	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919	}	967	}
920	}	968	}
921	OUTPUT:	969	OUTPUT:
922	RETVAL	970	RETVAL
923		971
924	void	972	void
		973	SDL_WM_SetCaption (const char title, const char icon)
		974
		975	void
925	SDL_GL_SwapBuffers ()	976	SDL_GL_SwapBuffers ()
926		977
927	char *	978	char *
928	SDL_GetKeyName (int sym)	979	SDL_GetKeyName (int sym)
929		980
…		…
931	SDL_GetAppState ()	982	SDL_GetAppState ()
932		983
933	int	984	int
934	SDL_GetModState ()	985	SDL_GetModState ()
935		986
		987	int
		988	SDL_WaitEvent ()
		989	C_ARGS: 0
		990
936	void	991	void
		992	SDL_PumpEvents ()
		993
		994	void
937	poll_events ()	995	peep_events ()
938	PPCODE:	996	PPCODE:
939	{	997	{
940	SDL_Event ev;	998	SDL_Event ev;
941		999
942	SDL_PumpEvents ();	1000	SDL_PumpEvents ();
…		…
1008		1066
1009	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))));
1010	}	1068	}
1011	}	1069	}
1012		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
1013	int	1084	int
1014	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)
1015	POSTCALL:	1086	POSTCALL:
1016	Mix_HookMusicFinished (music_finished);	1087	Mix_HookMusicFinished (music_finished);
1017	Mix_ChannelFinished (channel_finished);	1088	Mix_ChannelFinished (channel_finished);
…		…
1079	add_font (char *file)	1150	add_font (char *file)
1080	CODE:	1151	CODE:
1081	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1152	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082	OUTPUT:	1153	OUTPUT:
1083	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)
1084		1162
1085	void	1163	void
1086	load_image_inline (SV *image_)	1164	load_image_inline (SV *image_)
1087	ALIAS:	1165	ALIAS:
1088	load_image_file = 1	1166	load_image_file = 1
…		…
1204	#if DEBUG	1282	#if DEBUG
1205	VALGRIND_DO_LEAK_CHECK;	1283	VALGRIND_DO_LEAK_CHECK;
1206	#endif	1284	#endif
1207	}	1285	}
1208		1286
		1287	int
		1288	SvREFCNT (SV *sv)
		1289	CODE:
		1290	RETVAL = SvREFCNT (sv);
		1291	OUTPUT:
		1292	RETVAL
		1293
1209	MODULE = Deliantra::Client PACKAGE = DC::Font	1294	MODULE = Deliantra::Client PACKAGE = DC::Font
1210		1295
1211	PROTOTYPES: DISABLE	1296	PROTOTYPES: DISABLE
1212		1297
1213	DC::Font	1298	DC::Font
…		…
1642	if (ix)	1727	if (ix)
1643	{	1728	{
1644	glDisable (GL_ALPHA_TEST);	1729	glDisable (GL_ALPHA_TEST);
1645	glDisable (GL_BLEND);	1730	glDisable (GL_BLEND);
1646	}	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);
1647	}	1853	}
1648		1854
1649	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)
1650	CODE:	1856	CODE:
1651	{	1857	{
…		…
1757	//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);
1758	// use uglier nearest interpolation because linear suffers	1964	// use uglier nearest interpolation because linear suffers
1759	// from transparent color bleeding and ugly wrapping effects.	1965	// from transparent color bleeding and ugly wrapping effects.
1760	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1966	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761	}	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	}
1762		1988
1763	int	1989	int
1764	ox (DC::Map self)	1990	ox (DC::Map self)
1765	ALIAS:	1991	ALIAS:
1766	oy = 1	1992	oy = 1
…		…
1847	{	2073	{
1848	ext = *data++;	2074	ext = *data++;
1849	cmd = ext & 0x7f;	2075	cmd = ext & 0x7f;
1850		2076
1851	if (cmd < 4)	2077	if (cmd < 4)
1852	cell->darkness = 255 - ext * 64 + 1;	2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1853	else if (cmd == 5) // health	2079	else if (cmd == 5) // health
1854	{	2080	{
1855	cell->stat_width = 1;	2081	cell->stat_width = 1;
1856	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1857	}	2083	}
…		…
1887	cell->tile [z] = self->face2tile [face];	2113	cell->tile [z] = self->face2tile [face];
1888		2114
1889	if (cell->tile [z])	2115	if (cell->tile [z])
1890	{	2116	{
1891	maptex *tex = self->tex + cell->tile [z];	2117	maptex *tex = self->tex + cell->tile [z];
		2118	tex->unused = 0;
1892	if (!tex->name)	2119	if (!tex->name)
1893	av_push (missing, newSViv (cell->tile [z]));	2120	av_push (missing, newSViv (cell->tile [z]));
1894		2121
1895	if (tex->smoothtile)	2122	if (tex->smoothtile)
1896	{	2123	{
1897	maptex *smooth = self->tex + tex->smoothtile;	2124	maptex *smooth = self->tex + tex->smoothtile;
		2125	smooth->unused = 0;
1898	if (!smooth->name)	2126	if (!smooth->name)
1899	av_push (missing, newSViv (tex->smoothtile));	2127	av_push (missing, newSViv (tex->smoothtile));
1900	}	2128	}
1901	}	2129	}
1902	}	2130	}
…		…
1930	? self->row + y	2158	? self->row + y
1931	: 0;	2159	: 0;
1932		2160
1933	for (x = x0; x < x1; x++)	2161	for (x = x0; x < x1; x++)
1934	{	2162	{
1935	int r = 32, g = 32, b = 32, a = 192;	2163	unsigned int r = 32, g = 32, b = 32, a = 192;
1936		2164
1937	if (row && row->c0 <= x && x < row->c1)	2165	if (row && row->c0 <= x && x < row->c1)
1938	{	2166	{
1939	mapcell *cell = row->col + (x - row->c0);	2167	mapcell *cell = row->col + (x - row->c0);
1940		2168
…		…
1942	{	2170	{
1943	maptex tex = self->tex [cell->tile [z]];	2171	maptex tex = self->tex [cell->tile [z]];
1944	int a0 = 255 - tex.a;	2172	int a0 = 255 - tex.a;
1945	int a1 = tex.a;	2173	int a1 = tex.a;
1946		2174
1947	r = (r * a0 + tex.r * a1) / 255;	2175	r = div255 (r * a0 + tex.r * a1);
1948	g = (g * a0 + tex.g * a1) / 255;	2176	g = div255 (g * a0 + tex.g * a1);
1949	b = (b * a0 + tex.b * a1) / 255;	2177	b = div255 (b * a0 + tex.b * a1);
1950	a = (a * a0 + tex.a * a1) / 255;	2178	a = div255 (a * a0 + tex.a * a1);
1951	}	2179	}
1952	}	2180	}
1953		2181
1954	*map++ = (r )	2182	*map++ = (r )
1955	\| (g << 8)	2183	\| (g << 8)
…		…
1962	}	2190	}
1963	OUTPUT:	2191	OUTPUT:
1964	RETVAL	2192	RETVAL
1965		2193
1966	void	2194	void
1967	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2195	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)
1968	CODE:	2196	CODE:
1969	{	2197	{
1970	int x, y, z;	2198	int x, y, z;
1971		2199
1972	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2200	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1973	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2201	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1974	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2202	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1975	smooth_key skey;	2203	smooth_key skey;
1976	int pl_x, pl_y;	2204	int pl_x, pl_y;
1977	maptex pl_tex;	2205	maptex pl_tex;
1978	rc_t *rc = rc_alloc ();	2206	rc_t *rc = rc_alloc ();
		2207	rc_t *rc_ov = rc_alloc ();
1979	rc_key_t key;	2208	rc_key_t key;
1980	rc_array_t *arr;	2209	rc_array_t *arr;
1981		2210
1982	pl_tex.name = 0;	2211	pl_tex.name = 0;
1983		2212
1984	// thats current max. sorry.	2213	// that's current max. sorry.
1985	if (sw > 255) sw = 255;	2214	if (sw > 255) sw = 255;
1986	if (sh > 255) sh = 255;	2215	if (sh > 255) sh = 255;
1987		2216
1988	// clear key, in case of extra padding	2217	// clear key, in case of extra padding
1989	memset (&skey, 0, sizeof (skey));	2218	memset (&skey, 0, sizeof (skey));
…		…
1993	key.g = 255;	2222	key.g = 255;
1994	key.b = 255;	2223	key.b = 255;
1995	key.a = 255;	2224	key.a = 255;
1996	key.mode = GL_QUADS;	2225	key.mode = GL_QUADS;
1997	key.format = GL_T2F_V3F;	2226	key.format = GL_T2F_V3F;
1998	key.texname = -1;
1999		2227
2000	mx += self->x;	2228	mx += self->x;
2001	my += self->y;	2229	my += self->y;
2002		2230
2003	// first pass: determine smooth_max	2231	// first pass: determine smooth_max
…		…
2027	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2255	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028		2256
2029	for (z = 0; z <= 2; z++)	2257	for (z = 0; z <= 2; z++)
2030	{	2258	{
2031	memset (smooth_level, 0, sizeof (smooth_level));	2259	memset (smooth_level, 0, sizeof (smooth_level));
		2260	key.texname = -1;
2032		2261
2033	for (y = 0; y < sh; y++)	2262	for (y = 0; y < sh; y++)
2034	if (0 <= y + my && y + my < self->rows)	2263	if (0 <= y + my && y + my < self->rows)
2035	{	2264	{
2036	maprow *row = self->row + (y + my);	2265	maprow *row = self->row + (y + my);
…		…
2042	tileid tile = cell->tile [z];	2271	tileid tile = cell->tile [z];
2043		2272
2044	if (tile)	2273	if (tile)
2045	{	2274	{
2046	maptex tex = self->tex [tile];	2275	maptex tex = self->tex [tile];
2047	int px = (x + 1) * T - tex.w;	2276	int px, py;
2048	int py = (y + 1) * T - tex.h;
2049		2277
2050	if (key.texname != tex.name)	2278	if (key.texname != tex.name)
2051	{	2279	{
		2280	self->tex [tile].unused = 0;
		2281
2052	if (!tex.name)	2282	if (!tex.name)
2053	tex = self->tex [2]; /* missing, replace by noface */	2283	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054		2284
2055	key.texname = tex.name;	2285	key.texname = tex.name;
2056	arr = rc_array (rc, &key);	2286	arr = rc_array (rc, &key);
2057	}	2287	}
		2288
		2289	px = (x + 1) * Th - tex.w;
		2290	py = (y + 1) * Tw - tex.h;
2058		2291
2059	if (expect_false (cell->player == player) && expect_false (z == 2))	2292	if (expect_false (cell->player == player) && expect_false (z == 2))
2060	{	2293	{
2061	pl_x = px;	2294	pl_x = px;
2062	pl_y = py;	2295	pl_y = py;
…		…
2067	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2069	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2302	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2070	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2303	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2071		2304
2072	if (expect_false (cell->flags) && expect_false (z == 2))
2073	{
2074	// overlays such as the speech bubble, probably more to come
2075	if (cell->flags & 1)
2076	{
2077	maptex tex = self->tex [1];
2078	int px = x * T + T * 2 / 32;
2079	int py = y * T - T * 6 / 32;
2080
2081	if (tex.name)
2082	{
2083	if (key.texname != tex.name)
2084	{
2085	key.texname = tex.name;
2086	arr = rc_array (rc, &key);
2087	}
2088
2089	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093	}
2094	}
2095	}
2096
2097	// update smooth hash	2305	// update smooth hash
2098	if (tex.smoothtile)	2306	if (tex.smoothtile)
2099	{	2307	{
2100	skey.tile = tex.smoothtile;	2308	skey.tile = tex.smoothtile;
2101	skey.level = tex.smoothlevel;	2309	skey.level = tex.smoothlevel;
…		…
2129	// corners	2337	// corners
2130	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2338	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2131	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2339	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2132	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2340	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2133	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2341	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2342	}
		2343	}
		2344
		2345	if (expect_false (z == 2) && expect_false (cell->flags))
		2346	{
		2347	// overlays such as the speech bubble, probably more to come
		2348	if (cell->flags & 1)
		2349	{
		2350	rc_key_t key_ov = key;
		2351	maptex tex = self->tex [TEXID_SPEECH];
		2352	rc_array_t *arr;
		2353	int px = x * Tw + Tw * 2 / 32;
		2354	int py = y * Th - Th * 6 / 32;
		2355
		2356	key_ov.texname = tex.name;
		2357	arr = rc_array (rc_ov, &key_ov);
		2358
		2359	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2360	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2361	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2362	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2134	}	2363	}
2135	}	2364	}
2136	}	2365	}
2137	}	2366	}
2138		2367
…		…
2165	if (!(bits & 0x1000)	2394	if (!(bits & 0x1000)
2166	&& skey->level == level	2395	&& skey->level == level
2167	&& level > smooth_max [skey->x][skey->y])	2396	&& level > smooth_max [skey->x][skey->y])
2168	{	2397	{
2169	maptex tex = self->tex [skey->tile];	2398	maptex tex = self->tex [skey->tile];
2170	int px = (((int)skey->x) - 1) * T;	2399	int px = (((int)skey->x) - 1) * Tw;
2171	int py = (((int)skey->y) - 1) * T;	2400	int py = (((int)skey->y) - 1) * Th;
2172	int border = bits & 15;	2401	int border = bits & 15;
2173	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2402	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174	float dx = tex.s * .0625f; // 16 images/row	2403	float dx = tex.s * .0625f; // 16 images/row
2175	float dy = tex.t * .5f ; // 2 images/column	2404	float dy = tex.t * .5f ; // 2 images/column
2176		2405
…		…
2178	{	2407	{
2179	// this time avoiding texture state changes	2408	// this time avoiding texture state changes
2180	// save gobs of state changes.	2409	// save gobs of state changes.
2181	if (key.texname != tex.name)	2410	if (key.texname != tex.name)
2182	{	2411	{
		2412	self->tex [skey->tile].unused = 0;
		2413
2183	glEnd ();	2414	glEnd ();
2184	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2415	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185	glBegin (GL_QUADS);	2416	glBegin (GL_QUADS);
2186	}	2417	}
2187		2418
2188	if (border)	2419	if (border)
2189	{	2420	{
2190	float ox = border * dx;	2421	float ox = border * dx;
2191		2422
2192	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2423	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2424	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2425	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2426	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196	}	2427	}
2197		2428
2198	if (corner)	2429	if (corner)
2199	{	2430	{
2200	float ox = corner * dx;	2431	float ox = corner * dx;
2201		2432
2202	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2433	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2434	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2435	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2436	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206	}	2437	}
2207	}	2438	}
2208	}	2439	}
2209	}	2440	}
2210	}	2441	}
…		…
2233	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2464	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2234		2465
2235	rc_draw (rc);	2466	rc_draw (rc);
2236	}	2467	}
2237		2468
		2469	rc_draw (rc_ov);
		2470	rc_clear (rc_ov);
		2471
2238	glDisable (GL_BLEND);	2472	glDisable (GL_BLEND);
2239	rc_free (rc);	2473	rc_free (rc);
		2474	rc_free (rc_ov);
2240		2475
2241	// top layer: overlays such as the health bar	2476	// top layer: overlays such as the health bar
2242	for (y = 0; y < sh; y++)	2477	for (y = 0; y < sh; y++)
2243	if (0 <= y + my && y + my < self->rows)	2478	if (0 <= y + my && y + my < self->rows)
2244	{	2479	{
…		…
2247	for (x = 0; x < sw; x++)	2482	for (x = 0; x < sw; x++)
2248	if (row->c0 <= x + mx && x + mx < row->c1)	2483	if (row->c0 <= x + mx && x + mx < row->c1)
2249	{	2484	{
2250	mapcell *cell = row->col + (x + mx - row->c0);	2485	mapcell *cell = row->col + (x + mx - row->c0);
2251		2486
2252	int px = x * T;	2487	int px = x * Tw;
2253	int py = y * T;	2488	int py = y * Th;
		2489
		2490	if (expect_false (cell->player == player))
		2491	{
		2492	px += sdx;
		2493	py += sdy;
		2494	}
2254		2495
2255	if (cell->stat_hp)	2496	if (cell->stat_hp)
2256	{	2497	{
2257	int width = cell->stat_width * T;	2498	int width = cell->stat_width * Tw;
2258	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2499	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259		2500
2260	glColor3ub (0, 0, 0);	2501	glColor3ub (0, 0, 0);
2261	glRectf (px + 1, py - thick - 2,	2502	glRectf (px + 1, py - thick - 2,
2262	px + width - 1, py);	2503	px + width - 1, py);
2263		2504
…		…
2269	}	2510	}
2270	}	2511	}
2271	}	2512	}
2272		2513
2273	void	2514	void
2274	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2515	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2275	CODE:	2516	CODE:
2276	{	2517	{
2277	static float color[16][3] = {	2518	static float color[16][3] = {
2278	{ 0.00F, 0.00F, 0.00F },	2519	{ 0.00f, 0.00f, 0.00f },
2279	{ 1.00F, 1.00F, 1.00F },	2520	{ 1.00f, 1.00f, 1.00f },
2280	{ 0.00F, 0.00F, 0.55F },	2521	{ 0.00f, 0.00f, 0.55f },
2281	{ 1.00F, 0.00F, 0.00F },	2522	{ 1.00f, 0.00f, 0.00f },
2282		2523
2283	{ 1.00F, 0.54F, 0.00F },	2524	{ 1.00f, 0.54f, 0.00f },
2284	{ 0.11F, 0.56F, 1.00F },	2525	{ 0.11f, 0.56f, 1.00f },
2285	{ 0.93F, 0.46F, 0.00F },	2526	{ 0.93f, 0.46f, 0.00f },
2286	{ 0.18F, 0.54F, 0.34F },	2527	{ 0.18f, 0.54f, 0.34f },
2287		2528
2288	{ 0.56F, 0.73F, 0.56F },	2529	{ 0.56f, 0.73f, 0.56f },
2289	{ 0.80F, 0.80F, 0.80F },	2530	{ 0.80f, 0.80f, 0.80f },
2290	{ 0.55F, 0.41F, 0.13F },	2531	{ 0.55f, 0.41f, 0.13f },
2291	{ 0.99F, 0.77F, 0.26F },	2532	{ 0.99f, 0.77f, 0.26f },
2292		2533
2293	{ 0.74F, 0.65F, 0.41F },	2534	{ 0.74f, 0.65f, 0.41f },
2294		2535
2295	{ 0.00F, 1.00F, 1.00F },	2536	{ 0.00f, 1.00f, 1.00f },
2296	{ 1.00F, 0.00F, 1.00F },	2537	{ 1.00f, 0.00f, 1.00f },
2297	{ 1.00F, 1.00F, 0.00F },	2538	{ 1.00f, 1.00f, 0.00f },
2298	};	2539	};
2299		2540
2300	int x, y;	2541	int x, y;
2301		2542
2302	glEnable (GL_TEXTURE_2D);	2543	glEnable (GL_TEXTURE_2D);
		2544	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2545	* but the nvidia driver (185.18.14) mishandles alpha textures
		2546	* and takes the colour from god knows where instead of using
		2547	* Cp. MODULATE results in the same colour, but slightly different
		2548	* alpha, but atcually gives us the correct colour with nvidia.
		2549	*/
2303	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2550	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304	glEnable (GL_BLEND);	2551	glEnable (GL_BLEND);
2305	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2552	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306	glBegin (GL_QUADS);	2553	glBegin (GL_QUADS);
2307		2554
2308	for (y = 0; y < h; y++)	2555	for (y = 0; y < h; y++)
…		…
2312		2559
2313	if (m)	2560	if (m)
2314	{	2561	{
2315	float *c = color [m & 15];	2562	float *c = color [m & 15];
2316		2563
2317	float tx1 = m & 0x40 ? 0.5 : 0.;	2564	float tx1 = m & 0x40 ? 0.5f : 0.f;
2318	float tx2 = tx1 + 0.5;	2565	float tx2 = tx1 + 0.5f;
2319		2566
2320	glColor4f (c[0], c[1], c[2], 0.75);	2567	glColor4f (c[0], c[1], c[2], 1);
2321	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2568	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2569	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2570	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2571	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325	}	2572	}
…		…
2333	void	2580	void
2334	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2581	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2335	PPCODE:	2582	PPCODE:
2336	{	2583	{
2337	int x, y;	2584	int x, y;
2338	int sw1 = sw + 2;	2585	int sw1 = sw + 2;
2339	int sh1 = sh + 2;	2586	int sh1 = sh + 2;
2340	int sh3 = sh * 3;	2587	int sh3 = sh * 3;
2341	int sw34 = (sw * 3 + 3) & ~3;	2588	int sw3 = sw * 3;
		2589	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2590	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2342	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2591	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2343	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2592	memset (darkness1, 0, sw1*sh1);
2344	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2345		2593
2346	SvPOK_only (darkness3_sv);	2594	SvPOK_only (darkness3_sv);
2347	SvCUR_set (darkness3_sv, sw34 * sh3);	2595	SvCUR_set (darkness3_sv, sw3 * sh3);
2348		2596
2349	mx += self->x - 1;	2597	mx += self->x - 1;
2350	my += self->y - 1;	2598	my += self->y - 1;
2351
2352	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353		2599
2354	for (y = 0; y < sh1; y++)	2600	for (y = 0; y < sh1; y++)
2355	if (0 <= y + my && y + my < self->rows)	2601	if (0 <= y + my && y + my < self->rows)
2356	{	2602	{
2357	maprow *row = self->row + (y + my);	2603	maprow *row = self->row + (y + my);
…		…
2360	if (row->c0 <= x + mx && x + mx < row->c1)	2606	if (row->c0 <= x + mx && x + mx < row->c1)
2361	{	2607	{
2362	mapcell *cell = row->col + (x + mx - row->c0);	2608	mapcell *cell = row->col + (x + mx - row->c0);
2363		2609
2364	darkness1 [y * sw1 + x] = cell->darkness	2610	darkness1 [y * sw1 + x] = cell->darkness
2365	? 255 - (cell->darkness - 1)	2611	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366	: 255 - FOW_DARKNESS;	2612	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367	}	2613	}
2368	}	2614	}
2369		2615
2370	for (y = 0; y < sh; ++y)	2616	for (y = 0; y < sh; ++y)
2371	for (x = 0; x < sw; ++x)	2617	for (x = 0; x < sw; ++x)
…		…
2390		2636
2391	uint8_t r13 = (d13 + d23 + d12) / 3;	2637	uint8_t r13 = (d13 + d23 + d12) / 3;
2392	uint8_t r23 = d23;	2638	uint8_t r23 = d23;
2393	uint8_t r33 = (d23 + d33 + d32) / 3;	2639	uint8_t r33 = (d23 + d33 + d32) / 3;
2394		2640
2395	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2642	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2643	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2645	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2646	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2648	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2649	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404	}	2650	}
2405		2651
2406	free (darkness1);	2652	free (darkness1);
2407		2653
2408	EXTEND (SP, 3);	2654	EXTEND (SP, 3);
2409	PUSHs (sv_2mortal (newSViv (sw34)));	2655	PUSHs (sv_2mortal (newSViv (sw3)));
2410	PUSHs (sv_2mortal (newSViv (sh3)));	2656	PUSHs (sv_2mortal (newSViv (sh3)));
2411	PUSHs (darkness3_sv);	2657	PUSHs (darkness3_sv);
2412	}	2658	}
2413		2659
2414	SV *	2660	SV *
…		…
2612	if (RETVAL < 0)	2858	if (RETVAL < 0)
2613	{	2859	{
2614	RETVAL = Mix_GroupOldest (-1);	2860	RETVAL = Mix_GroupOldest (-1);
2615		2861
2616	if (RETVAL < 0)	2862	if (RETVAL < 0)
		2863	{
		2864	// happens sometimes, maybe it just stopped playing(?)
		2865	RETVAL = Mix_GroupAvailable (-1);
		2866
		2867	if (RETVAL < 0)
2617	XSRETURN_UNDEF;	2868	XSRETURN_UNDEF;
2618		2869	}
		2870	else
2619	Mix_HaltChannel (RETVAL);	2871	Mix_HaltChannel (RETVAL);
2620	}	2872	}
2621		2873
2622	Mix_UnregisterAllEffects (RETVAL);	2874	Mix_UnregisterAllEffects (RETVAL);
2623	Mix_Volume (RETVAL, 128);	2875	Mix_Volume (RETVAL, 128);
2624	}	2876	}
…		…
2671	void	2923	void
2672	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2924	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673	CODE:	2925	CODE:
2674	{	2926	{
2675	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2927	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2928	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2929	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678	}	2930	}
2679		2931
2680	void	2932	void
2681	set_reverse_stereo (DC::Channel self, int flip)	2933	set_reverse_stereo (DC::Channel self, int flip)
…		…
2683	Mix_SetReverseStereo (self, flip);	2935	Mix_SetReverseStereo (self, flip);
2684		2936
2685	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2937	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686		2938
2687	PROTOTYPES: DISABLE	2939	PROTOTYPES: DISABLE
		2940
		2941	void
		2942	decoders ()
		2943	PPCODE:
		2944	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2945	int i, num = Mix_GetNumChunkDecoders ();
		2946	EXTEND (SP, num);
		2947	for (i = 0; i < num; ++i)
		2948	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2949	#else
		2950	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2951	#endif
2688		2952
2689	DC::MixChunk	2953	DC::MixChunk
2690	new (SV *class, DC::RW rwops)	2954	new (SV *class, DC::RW rwops)
2691	CODE:	2955	CODE:
2692	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2956	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2725	OUTPUT:	2989	OUTPUT:
2726	RETVAL	2990	RETVAL
2727		2991
2728	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2992	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729		2993
		2994	void
		2995	decoders ()
		2996	PPCODE:
		2997	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2998	int i, num = Mix_GetNumMusicDecoders ();
		2999	EXTEND (SP, num);
		3000	for (i = 0; i < num; ++i)
		3001	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3002	#else
		3003	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3004	#endif
		3005
2730	int	3006	int
2731	volume (int volume = -1)	3007	volume (int volume = -1)
2732	PROTOTYPE: ;$	3008	PROTOTYPE: ;$
2733	CODE:	3009	CODE:
2734	if (items > 0)	3010	if (items > 0)
…		…
2744		3020
2745	void	3021	void
2746	halt ()	3022	halt ()
2747	CODE:	3023	CODE:
2748	Mix_HaltMusic ();	3024	Mix_HaltMusic ();
		3025
		3026	int
		3027	playing ()
		3028	CODE:
		3029	RETVAL = Mix_PlayingMusic ();
		3030	OUTPUT:
		3031	RETVAL
2749		3032
2750	DC::MixMusic	3033	DC::MixMusic
2751	new (SV *class, DC::RW rwops)	3034	new (SV *class, DC::RW rwops)
2752	CODE:	3035	CODE:
2753	RETVAL = Mix_LoadMUS_RW (rwops);	3036	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2784	} *civ, const_iv[] = {	3067	} *civ, const_iv[] = {
2785	# define const_iv(name) { # name, (IV)name }	3068	# define const_iv(name) { # name, (IV)name }
2786	const_iv (GL_VENDOR),	3069	const_iv (GL_VENDOR),
2787	const_iv (GL_VERSION),	3070	const_iv (GL_VERSION),
2788	const_iv (GL_EXTENSIONS),	3071	const_iv (GL_EXTENSIONS),
		3072	const_iv (GL_MAX_TEXTURE_UNITS),
2789	const_iv (GL_COLOR_MATERIAL),	3073	const_iv (GL_COLOR_MATERIAL),
2790	const_iv (GL_SMOOTH),	3074	const_iv (GL_SMOOTH),
2791	const_iv (GL_FLAT),	3075	const_iv (GL_FLAT),
2792	const_iv (GL_DITHER),	3076	const_iv (GL_DITHER),
2793	const_iv (GL_BLEND),	3077	const_iv (GL_BLEND),
…		…
2805	const_iv (GL_ZERO),	3089	const_iv (GL_ZERO),
2806	const_iv (GL_SRC_ALPHA),	3090	const_iv (GL_SRC_ALPHA),
2807	const_iv (GL_DST_ALPHA),	3091	const_iv (GL_DST_ALPHA),
2808	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3092	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809	const_iv (GL_ONE_MINUS_DST_ALPHA),	3093	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3094	const_iv (GL_SRC_COLOR),
		3095	const_iv (GL_DST_COLOR),
		3096	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3097	const_iv (GL_ONE_MINUS_DST_COLOR),
2810	const_iv (GL_SRC_ALPHA_SATURATE),	3098	const_iv (GL_SRC_ALPHA_SATURATE),
2811	const_iv (GL_RGB),	3099	const_iv (GL_RGB),
2812	const_iv (GL_RGBA),	3100	const_iv (GL_RGBA),
2813	const_iv (GL_RGBA4),	3101	const_iv (GL_RGBA4),
2814	const_iv (GL_RGBA8),	3102	const_iv (GL_RGBA8),
…		…
2882	const_iv (GL_NICEST),	3170	const_iv (GL_NICEST),
2883	const_iv (GL_V2F),	3171	const_iv (GL_V2F),
2884	const_iv (GL_V3F),	3172	const_iv (GL_V3F),
2885	const_iv (GL_T2F_V3F),	3173	const_iv (GL_T2F_V3F),
2886	const_iv (GL_T2F_N3F_V3F),	3174	const_iv (GL_T2F_N3F_V3F),
		3175	const_iv (GL_FUNC_ADD),
		3176	const_iv (GL_FUNC_SUBTRACT),
		3177	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887	# undef const_iv	3178	# undef const_iv
2888	};	3179	};
2889		3180
2890	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3181	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3182	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892		3183
2893	texture_av = newAV ();	3184	texture_av = newAV ();
2894	AvREAL_off (texture_av);	3185	AvREAL_off (texture_av);
2895	}	3186	}
2896		3187
2897	void	3188	void
2898	disable_GL_EXT_blend_func_separate ()	3189	disable_GL_EXT_blend_func_separate ()
2899	CODE:	3190	CODE:
2900	gl.BlendFuncSeparate = 0;	3191	gl.BlendFuncSeparate = 0;
2901	gl.BlendFuncSeparateEXT = 0;	3192	gl.BlendFuncSeparateEXT = 0;
		3193
		3194	void
		3195	apple_nvidia_bug (int enable)
2902		3196
2903	char *	3197	char *
2904	gl_vendor ()	3198	gl_vendor ()
2905	CODE:	3199	CODE:
2906	RETVAL = (char *)glGetString (GL_VENDOR);	3200	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2937		3231
2938	int glGetError ()	3232	int glGetError ()
2939		3233
2940	void glFinish ()	3234	void glFinish ()
2941		3235
		3236	void glFlush ()
		3237
2942	void glClear (int mask)	3238	void glClear (int mask)
2943		3239
2944	void glClearColor (float r, float g, float b, float a = 1.0)	3240	void glClearColor (float r, float g, float b, float a = 1.0)
2945	PROTOTYPE: @	3241	PROTOTYPE: @
2946		3242
…		…
2955	void glBlendFunc (int sfactor, int dfactor)	3251	void glBlendFunc (int sfactor, int dfactor)
2956		3252
2957	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3253	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958	CODE:	3254	CODE:
2959	gl_BlendFuncSeparate (sa, da, saa, daa);	3255	gl_BlendFuncSeparate (sa, da, saa, daa);
		3256
		3257	# void glBlendEquation (int se)
2960		3258
2961	void glDepthMask (int flag)	3259	void glDepthMask (int flag)
2962		3260
2963	void glLogicOp (int opcode)	3261	void glLogicOp (int opcode)
2964		3262
…		…
2999	void glRotate (float angle, float x, float y, float z)	3297	void glRotate (float angle, float x, float y, float z)
3000	CODE:	3298	CODE:
3001	glRotatef (angle, x, y, z);	3299	glRotatef (angle, x, y, z);
3002		3300
3003	void glColor (float r, float g, float b, float a = 1.0)	3301	void glColor (float r, float g, float b, float a = 1.0)
		3302	PROTOTYPE: @
3004	ALIAS:	3303	ALIAS:
3005	glColor_premultiply = 1	3304	glColor_premultiply = 1
3006	CODE:	3305	CODE:
3007	if (ix)	3306	if (ix)
3008	{	3307	{
…		…
3113	void glNewList (int list, int mode = GL_COMPILE)	3412	void glNewList (int list, int mode = GL_COMPILE)
3114		3413
3115	void glEndList ()	3414	void glEndList ()
3116		3415
3117	void glCallList (int list)	3416	void glCallList (int list)
		3417
		3418	void c_init ()
		3419	CODE:
		3420	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3421	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3118		3422
3119	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3423	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120		3424
3121	PROTOTYPES: DISABLE	3425	PROTOTYPES: DISABLE
3122		3426

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs. Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC