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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.280 by root, Wed Nov 26 23:08:34 2008 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 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	{
…		…
456		482
457	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
458	}	484	}
459		485
460	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
461	minpot (unsigned int n)	493	minpot (unsigned int n)
462	{	494	{
463	if (!n)	495	if (!n)
464	return 0;	496	return 0;
465		497
…		…
548		580
549	static void	581	static void
550	deliantra_main ()	582	deliantra_main ()
551	{	583	{
552	char *argv[] = { 0 };	584	char *argv[] = { 0 };
553	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);
554	}	586	}
555		587
556	#ifdef __MACOSX__	588	#ifdef __MACOSX__
557	/* to due surprising braindamage on the side of SDL design, we	589	/* to due surprising braindamage on the side of SDL design, we
558	* do some mind-boggling hack here: SDL requires a custom main()	590	* do some mind-boggling hack here: SDL requires a custom main()
559	* on OS X, so... we provide one and call the original main(), which,	591	* on OS X, so... we provide one and call the original main(), which,
560	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	592	* due to shared library magic, calls -lSDLmain's main, not perl's main,
561	* and which calls our main (== SDL_main) back.	593	* and which calls our main (== SDL_main) back.
562	*/	594	*/
563	extern C_LINKAGE int	595	extern C_LINKAGE int
564	main (int argc, char *argv[])	596	main (int argc, char *argv[])
565	{	597	{
…		…
789		821
790	const_iv (FOW_DARKNESS)	822	const_iv (FOW_DARKNESS)
791	# undef const_iv	823	# undef const_iv
792	};	824	};
793		825
794	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	826	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
795	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
796		828
797	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
798	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
799	}	831	}
800		832
…		…
816	NV ceil (NV x)	848	NV ceil (NV x)
817		849
818	IV minpot (UV n)	850	IV minpot (UV n)
819		851
820	IV popcount (UV n)	852	IV popcount (UV n)
		853
		854	NV distance (NV dx, NV dy)
		855	CODE:
		856	RETVAL = pow (dx * dx + dy * dy, 0.5);
		857	OUTPUT:
		858	RETVAL
821		859
822	void	860	void
823	pango_init ()	861	pango_init ()
824	CODE:	862	CODE:
825	{	863	{
…		…
917		955
918	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
920	#include "glfunc.h"	958	#include "glfunc.h"
921	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922	}	963	}
923	}	964	}
924	OUTPUT:	965	OUTPUT:
925	RETVAL	966	RETVAL
926		967
…		…
1011		1052
1012	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013	}	1054	}
1014	}	1055	}
1015		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
1016	int	1070	int
1017	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018	POSTCALL:	1072	POSTCALL:
1019	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1020	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1082	add_font (char *file)	1136	add_font (char *file)
1083	CODE:	1137	CODE:
1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085	OUTPUT:	1139	OUTPUT:
1086	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1144
		1145	void
		1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)
1087		1147
1088	void	1148	void
1089	load_image_inline (SV *image_)	1149	load_image_inline (SV *image_)
1090	ALIAS:	1150	ALIAS:
1091	load_image_file = 1	1151	load_image_file = 1
…		…
1654	glDisable (GL_ALPHA_TEST);	1714	glDisable (GL_ALPHA_TEST);
1655	glDisable (GL_BLEND);	1715	glDisable (GL_BLEND);
1656	}	1716	}
1657	}	1717	}
1658		1718
		1719	void
		1720	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)
		1721	PROTOTYPE: @
		1722	CODE:
		1723	{
		1724	glEnable (GL_BLEND);
		1725	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1726	glEnable (GL_TEXTURE_2D);
		1727	glBindTexture (GL_TEXTURE_2D, name1);
		1728
		1729	glColor3f (intensity, intensity, intensity);
		1730	glPushMatrix ();
		1731	glScalef (1./3, 1./3, 1.);
		1732
		1733	if (blend > 0.f)
		1734	{
		1735	float dx3 = dx * -3.f / w;
		1736	float dy3 = dy * -3.f / h;
		1737	GLfloat env_color[4] = { 0., 0., 0., blend };
		1738
		1739	/* interpolate the two shadow textures */
		1740	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1741	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1742
		1743	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1744	gl.ActiveTexture (GL_TEXTURE1);
		1745	glEnable (GL_TEXTURE_2D);
		1746	glBindTexture (GL_TEXTURE_2D, name2);
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1748
		1749	/* rgb == rgb(glcolor) */
		1750	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1751	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1753
		1754	/* alpha = interpolate t0, t1 by env_alpha */
		1755	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1756
		1757	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1766
		1767	glBegin (GL_QUADS);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1769	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1770	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1771	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1772	glEnd ();
		1773
		1774	glDisable (GL_TEXTURE_2D);
		1775	gl.ActiveTexture (GL_TEXTURE0);
		1776	}
		1777	else
		1778	{
		1779	/* simple blending of one texture, also opengl <1.3 path */
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1781
		1782	glBegin (GL_QUADS);
		1783	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1784	glTexCoord2f (0, t); glVertex2f (0, h);
		1785	glTexCoord2f (s, t); glVertex2f (w, h);
		1786	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1787	glEnd ();
		1788	}
		1789
		1790	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1791	{
		1792	int x, y;
		1793	int dx3 = dx * 3;
		1794	int dy3 = dy * 3;
		1795
		1796	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1797	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1798	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1799	glTranslatef (-1., -1., 0);
		1800	glBegin (GL_QUADS);
		1801
		1802	for (y = 1; y < h; y += 3)
		1803	{
		1804	int y1 = y - dy3;
		1805	int y1valid = y1 >= 0 && y1 < h;
		1806
		1807	for (x = 1; x < w; x += 3)
		1808	{
		1809	int x1 = x - dx3;
		1810	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1811	uint8_t h2;
		1812
		1813	if (y1valid && x1 >= 0 && x1 < w)
		1814	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1815	else
		1816	h2 = 1; /* out of range == invisible */
		1817
		1818	if (h1 \|\| h2)
		1819	{
		1820	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1821	glColor4f (1., 1., 1., alpha);
		1822
		1823	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1824	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1825	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1826	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1827	}
		1828	}
		1829	}
		1830	}
		1831
		1832	glEnd ();
		1833
		1834	glPopMatrix ();
		1835
		1836	glDisable (GL_TEXTURE_2D);
		1837	glDisable (GL_BLEND);
		1838	}
		1839
1659	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1840	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660	CODE:	1841	CODE:
1661	{	1842	{
1662	GLint width;	1843	GLint width;
1663	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1844	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1780	if (tex->name)	1961	if (tex->name)
1781	{	1962	{
1782	if (tex->unused)	1963	if (tex->unused)
1783	{	1964	{
1784	tex->name = 0;	1965	tex->name = 0;
1785	tex->unused = 0,	1966	tex->unused = 0;
1786	XPUSHs (sv_2mortal (newSViv (texid)));	1967	XPUSHs (sv_2mortal (newSViv (texid)));
1787	}	1968	}
1788	else	1969	else
1789	tex->unused = 1;	1970	tex->unused = 1;
1790	}	1971	}
…		…
1877	{	2058	{
1878	ext = *data++;	2059	ext = *data++;
1879	cmd = ext & 0x7f;	2060	cmd = ext & 0x7f;
1880		2061
1881	if (cmd < 4)	2062	if (cmd < 4)
1882	cell->darkness = 255 - ext * 64 + 1;	2063	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1883	else if (cmd == 5) // health	2064	else if (cmd == 5) // health
1884	{	2065	{
1885	cell->stat_width = 1;	2066	cell->stat_width = 1;
1886	cell->stat_hp = *data++;	2067	cell->stat_hp = *data++;
1887	}	2068	}
…		…
1962	? self->row + y	2143	? self->row + y
1963	: 0;	2144	: 0;
1964		2145
1965	for (x = x0; x < x1; x++)	2146	for (x = x0; x < x1; x++)
1966	{	2147	{
1967	int r = 32, g = 32, b = 32, a = 192;	2148	unsigned int r = 32, g = 32, b = 32, a = 192;
1968		2149
1969	if (row && row->c0 <= x && x < row->c1)	2150	if (row && row->c0 <= x && x < row->c1)
1970	{	2151	{
1971	mapcell *cell = row->col + (x - row->c0);	2152	mapcell *cell = row->col + (x - row->c0);
1972		2153
…		…
1974	{	2155	{
1975	maptex tex = self->tex [cell->tile [z]];	2156	maptex tex = self->tex [cell->tile [z]];
1976	int a0 = 255 - tex.a;	2157	int a0 = 255 - tex.a;
1977	int a1 = tex.a;	2158	int a1 = tex.a;
1978		2159
1979	r = (r * a0 + tex.r * a1) / 255;	2160	r = div255 (r * a0 + tex.r * a1);
1980	g = (g * a0 + tex.g * a1) / 255;	2161	g = div255 (g * a0 + tex.g * a1);
1981	b = (b * a0 + tex.b * a1) / 255;	2162	b = div255 (b * a0 + tex.b * a1);
1982	a = (a * a0 + tex.a * a1) / 255;	2163	a = div255 (a * a0 + tex.a * a1);
1983	}	2164	}
1984	}	2165	}
1985		2166
1986	*map++ = (r )	2167	*map++ = (r )
1987	\| (g << 8)	2168	\| (g << 8)
…		…
1994	}	2175	}
1995	OUTPUT:	2176	OUTPUT:
1996	RETVAL	2177	RETVAL
1997		2178
1998	void	2179	void
1999	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2180	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)
2000	CODE:	2181	CODE:
2001	{	2182	{
2002	int x, y, z;	2183	int x, y, z;
2003		2184
2004	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2185	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2005	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2186	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2006	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2187	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2007	smooth_key skey;	2188	smooth_key skey;
2008	int pl_x, pl_y;	2189	int pl_x, pl_y;
2009	maptex pl_tex;	2190	maptex pl_tex;
2010	rc_t *rc = rc_alloc ();	2191	rc_t *rc = rc_alloc ();
		2192	rc_t *rc_ov = rc_alloc ();
2011	rc_key_t key;	2193	rc_key_t key;
2012	rc_array_t *arr;	2194	rc_array_t *arr;
2013		2195
2014	pl_tex.name = 0;	2196	pl_tex.name = 0;
2015		2197
2016	// thats current max. sorry.	2198	// that's current max. sorry.
2017	if (sw > 255) sw = 255;	2199	if (sw > 255) sw = 255;
2018	if (sh > 255) sh = 255;	2200	if (sh > 255) sh = 255;
2019		2201
2020	// clear key, in case of extra padding	2202	// clear key, in case of extra padding
2021	memset (&skey, 0, sizeof (skey));	2203	memset (&skey, 0, sizeof (skey));
…		…
2025	key.g = 255;	2207	key.g = 255;
2026	key.b = 255;	2208	key.b = 255;
2027	key.a = 255;	2209	key.a = 255;
2028	key.mode = GL_QUADS;	2210	key.mode = GL_QUADS;
2029	key.format = GL_T2F_V3F;	2211	key.format = GL_T2F_V3F;
2030	key.texname = -1;
2031		2212
2032	mx += self->x;	2213	mx += self->x;
2033	my += self->y;	2214	my += self->y;
2034		2215
2035	// first pass: determine smooth_max	2216	// first pass: determine smooth_max
…		…
2059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2240	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060		2241
2061	for (z = 0; z <= 2; z++)	2242	for (z = 0; z <= 2; z++)
2062	{	2243	{
2063	memset (smooth_level, 0, sizeof (smooth_level));	2244	memset (smooth_level, 0, sizeof (smooth_level));
		2245	key.texname = -1;
2064		2246
2065	for (y = 0; y < sh; y++)	2247	for (y = 0; y < sh; y++)
2066	if (0 <= y + my && y + my < self->rows)	2248	if (0 <= y + my && y + my < self->rows)
2067	{	2249	{
2068	maprow *row = self->row + (y + my);	2250	maprow *row = self->row + (y + my);
…		…
2074	tileid tile = cell->tile [z];	2256	tileid tile = cell->tile [z];
2075		2257
2076	if (tile)	2258	if (tile)
2077	{	2259	{
2078	maptex tex = self->tex [tile];	2260	maptex tex = self->tex [tile];
2079	int px = (x + 1) * T - tex.w;	2261	int px, py;
2080	int py = (y + 1) * T - tex.h;
2081		2262
2082	if (key.texname != tex.name)	2263	if (key.texname != tex.name)
2083	{	2264	{
2084	self->tex [tile].unused = 0;	2265	self->tex [tile].unused = 0;
2085		2266
2086	if (!tex.name)	2267	if (!tex.name)
2087	tex = self->tex [2]; /* missing, replace by noface */	2268	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088		2269
2089	key.texname = tex.name;	2270	key.texname = tex.name;
2090	arr = rc_array (rc, &key);	2271	arr = rc_array (rc, &key);
2091	}	2272	}
		2273
		2274	px = (x + 1) * Th - tex.w;
		2275	py = (y + 1) * Tw - tex.h;
2092		2276
2093	if (expect_false (cell->player == player) && expect_false (z == 2))	2277	if (expect_false (cell->player == player) && expect_false (z == 2))
2094	{	2278	{
2095	pl_x = px;	2279	pl_x = px;
2096	pl_y = py;	2280	pl_y = py;
…		…
2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2285	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2286	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2103	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2287	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2104	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2288	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105		2289
2106	if (expect_false (cell->flags) && expect_false (z == 2))
2107	{
2108	// overlays such as the speech bubble, probably more to come
2109	if (cell->flags & 1)
2110	{
2111	maptex tex = self->tex [1];
2112	int px = x * T + T * 2 / 32;
2113	int py = y * T - T * 6 / 32;
2114
2115	if (tex.name)
2116	{
2117	if (key.texname != tex.name)
2118	{
2119	key.texname = tex.name;
2120	arr = rc_array (rc, &key);
2121	}
2122
2123	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127	}
2128	}
2129	}
2130
2131	// update smooth hash	2290	// update smooth hash
2132	if (tex.smoothtile)	2291	if (tex.smoothtile)
2133	{	2292	{
2134	skey.tile = tex.smoothtile;	2293	skey.tile = tex.smoothtile;
2135	skey.level = tex.smoothlevel;	2294	skey.level = tex.smoothlevel;
…		…
2163	// corners	2322	// corners
2164	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2323	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2165	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2324	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2166	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2325	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2167	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2326	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2327	}
		2328	}
		2329
		2330	if (expect_false (z == 2) && expect_false (cell->flags))
		2331	{
		2332	// overlays such as the speech bubble, probably more to come
		2333	if (cell->flags & 1)
		2334	{
		2335	rc_key_t key_ov = key;
		2336	maptex tex = self->tex [TEXID_SPEECH];
		2337	rc_array_t *arr;
		2338	int px = x * Tw + Tw * 2 / 32;
		2339	int py = y * Th - Th * 6 / 32;
		2340
		2341	key_ov.texname = tex.name;
		2342	arr = rc_array (rc_ov, &key_ov);
		2343
		2344	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2345	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2346	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2347	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2168	}	2348	}
2169	}	2349	}
2170	}	2350	}
2171	}	2351	}
2172		2352
…		…
2199	if (!(bits & 0x1000)	2379	if (!(bits & 0x1000)
2200	&& skey->level == level	2380	&& skey->level == level
2201	&& level > smooth_max [skey->x][skey->y])	2381	&& level > smooth_max [skey->x][skey->y])
2202	{	2382	{
2203	maptex tex = self->tex [skey->tile];	2383	maptex tex = self->tex [skey->tile];
2204	int px = (((int)skey->x) - 1) * T;	2384	int px = (((int)skey->x) - 1) * Tw;
2205	int py = (((int)skey->y) - 1) * T;	2385	int py = (((int)skey->y) - 1) * Th;
2206	int border = bits & 15;	2386	int border = bits & 15;
2207	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2387	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208	float dx = tex.s * .0625f; // 16 images/row	2388	float dx = tex.s * .0625f; // 16 images/row
2209	float dy = tex.t * .5f ; // 2 images/column	2389	float dy = tex.t * .5f ; // 2 images/column
2210		2390
…		…
2223		2403
2224	if (border)	2404	if (border)
2225	{	2405	{
2226	float ox = border * dx;	2406	float ox = border * dx;
2227		2407
2228	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2408	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2409	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2410	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2411	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232	}	2412	}
2233		2413
2234	if (corner)	2414	if (corner)
2235	{	2415	{
2236	float ox = corner * dx;	2416	float ox = corner * dx;
2237		2417
2238	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2418	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2419	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2420	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2421	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242	}	2422	}
2243	}	2423	}
2244	}	2424	}
2245	}	2425	}
2246	}	2426	}
…		…
2269	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2449	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270		2450
2271	rc_draw (rc);	2451	rc_draw (rc);
2272	}	2452	}
2273		2453
		2454	rc_draw (rc_ov);
		2455	rc_clear (rc_ov);
		2456
2274	glDisable (GL_BLEND);	2457	glDisable (GL_BLEND);
2275	rc_free (rc);	2458	rc_free (rc);
		2459	rc_free (rc_ov);
2276		2460
2277	// top layer: overlays such as the health bar	2461	// top layer: overlays such as the health bar
2278	for (y = 0; y < sh; y++)	2462	for (y = 0; y < sh; y++)
2279	if (0 <= y + my && y + my < self->rows)	2463	if (0 <= y + my && y + my < self->rows)
2280	{	2464	{
…		…
2283	for (x = 0; x < sw; x++)	2467	for (x = 0; x < sw; x++)
2284	if (row->c0 <= x + mx && x + mx < row->c1)	2468	if (row->c0 <= x + mx && x + mx < row->c1)
2285	{	2469	{
2286	mapcell *cell = row->col + (x + mx - row->c0);	2470	mapcell *cell = row->col + (x + mx - row->c0);
2287		2471
2288	int px = x * T;	2472	int px = x * Tw;
2289	int py = y * T;	2473	int py = y * Th;
2290		2474
2291	if (expect_false (cell->player == player))	2475	if (expect_false (cell->player == player))
2292	{	2476	{
2293	px += sdx;	2477	px += sdx;
2294	py += sdy;	2478	py += sdy;
2295	}	2479	}
2296		2480
2297	if (cell->stat_hp)	2481	if (cell->stat_hp)
2298	{	2482	{
2299	int width = cell->stat_width * T;	2483	int width = cell->stat_width * Tw;
2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2484	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301		2485
2302	glColor3ub (0, 0, 0);	2486	glColor3ub (0, 0, 0);
2303	glRectf (px + 1, py - thick - 2,	2487	glRectf (px + 1, py - thick - 2,
2304	px + width - 1, py);	2488	px + width - 1, py);
2305		2489
…		…
2311	}	2495	}
2312	}	2496	}
2313	}	2497	}
2314		2498
2315	void	2499	void
2316	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2500	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317	CODE:	2501	CODE:
2318	{	2502	{
2319	static float color[16][3] = {	2503	static float color[16][3] = {
2320	{ 0.00F, 0.00F, 0.00F },	2504	{ 0.00f, 0.00f, 0.00f },
2321	{ 1.00F, 1.00F, 1.00F },	2505	{ 1.00f, 1.00f, 1.00f },
2322	{ 0.00F, 0.00F, 0.55F },	2506	{ 0.00f, 0.00f, 0.55f },
2323	{ 1.00F, 0.00F, 0.00F },	2507	{ 1.00f, 0.00f, 0.00f },
2324		2508
2325	{ 1.00F, 0.54F, 0.00F },	2509	{ 1.00f, 0.54f, 0.00f },
2326	{ 0.11F, 0.56F, 1.00F },	2510	{ 0.11f, 0.56f, 1.00f },
2327	{ 0.93F, 0.46F, 0.00F },	2511	{ 0.93f, 0.46f, 0.00f },
2328	{ 0.18F, 0.54F, 0.34F },	2512	{ 0.18f, 0.54f, 0.34f },
2329		2513
2330	{ 0.56F, 0.73F, 0.56F },	2514	{ 0.56f, 0.73f, 0.56f },
2331	{ 0.80F, 0.80F, 0.80F },	2515	{ 0.80f, 0.80f, 0.80f },
2332	{ 0.55F, 0.41F, 0.13F },	2516	{ 0.55f, 0.41f, 0.13f },
2333	{ 0.99F, 0.77F, 0.26F },	2517	{ 0.99f, 0.77f, 0.26f },
2334		2518
2335	{ 0.74F, 0.65F, 0.41F },	2519	{ 0.74f, 0.65f, 0.41f },
2336		2520
2337	{ 0.00F, 1.00F, 1.00F },	2521	{ 0.00f, 1.00f, 1.00f },
2338	{ 1.00F, 0.00F, 1.00F },	2522	{ 1.00f, 0.00f, 1.00f },
2339	{ 1.00F, 1.00F, 0.00F },	2523	{ 1.00f, 1.00f, 0.00f },
2340	};	2524	};
2341		2525
2342	int x, y;	2526	int x, y;
2343		2527
2344	glEnable (GL_TEXTURE_2D);	2528	glEnable (GL_TEXTURE_2D);
		2529	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2530	* but the nvidia driver (185.18.14) mishandles alpha textures
		2531	* and takes the colour from god knows where instead of using
		2532	* Cp. MODULATE results in the same colour, but slightly different
		2533	* alpha, but atcually gives us the correct colour with nvidia.
		2534	*/
2345	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2535	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346	glEnable (GL_BLEND);	2536	glEnable (GL_BLEND);
2347	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2537	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348	glBegin (GL_QUADS);	2538	glBegin (GL_QUADS);
2349		2539
2350	for (y = 0; y < h; y++)	2540	for (y = 0; y < h; y++)
…		…
2354		2544
2355	if (m)	2545	if (m)
2356	{	2546	{
2357	float *c = color [m & 15];	2547	float *c = color [m & 15];
2358		2548
2359	float tx1 = m & 0x40 ? 0.5 : 0.;	2549	float tx1 = m & 0x40 ? 0.5f : 0.f;
2360	float tx2 = tx1 + 0.5;	2550	float tx2 = tx1 + 0.5f;
2361		2551
2362	glColor4f (c[0], c[1], c[2], 0.75);	2552	glColor4f (c[0], c[1], c[2], 1);
2363	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2553	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2554	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2555	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2556	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367	}	2557	}
…		…
2375	void	2565	void
2376	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2566	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377	PPCODE:	2567	PPCODE:
2378	{	2568	{
2379	int x, y;	2569	int x, y;
2380	int sw1 = sw + 2;	2570	int sw1 = sw + 2;
2381	int sh1 = sh + 2;	2571	int sh1 = sh + 2;
2382	int sh3 = sh * 3;	2572	int sh3 = sh * 3;
2383	int sw34 = (sw * 3 + 3) & ~3;	2573	int sw3 = sw * 3;
		2574	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2575	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2384	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2576	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2385	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2577	memset (darkness1, 0, sw1*sh1);
2386	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2387		2578
2388	SvPOK_only (darkness3_sv);	2579	SvPOK_only (darkness3_sv);
2389	SvCUR_set (darkness3_sv, sw34 * sh3);	2580	SvCUR_set (darkness3_sv, sw3 * sh3);
2390		2581
2391	mx += self->x - 1;	2582	mx += self->x - 1;
2392	my += self->y - 1;	2583	my += self->y - 1;
2393
2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395		2584
2396	for (y = 0; y < sh1; y++)	2585	for (y = 0; y < sh1; y++)
2397	if (0 <= y + my && y + my < self->rows)	2586	if (0 <= y + my && y + my < self->rows)
2398	{	2587	{
2399	maprow *row = self->row + (y + my);	2588	maprow *row = self->row + (y + my);
…		…
2402	if (row->c0 <= x + mx && x + mx < row->c1)	2591	if (row->c0 <= x + mx && x + mx < row->c1)
2403	{	2592	{
2404	mapcell *cell = row->col + (x + mx - row->c0);	2593	mapcell *cell = row->col + (x + mx - row->c0);
2405		2594
2406	darkness1 [y * sw1 + x] = cell->darkness	2595	darkness1 [y * sw1 + x] = cell->darkness
2407	? 255 - (cell->darkness - 1)	2596	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408	: 255 - FOW_DARKNESS;	2597	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409	}	2598	}
2410	}	2599	}
2411		2600
2412	for (y = 0; y < sh; ++y)	2601	for (y = 0; y < sh; ++y)
2413	for (x = 0; x < sw; ++x)	2602	for (x = 0; x < sw; ++x)
…		…
2432		2621
2433	uint8_t r13 = (d13 + d23 + d12) / 3;	2622	uint8_t r13 = (d13 + d23 + d12) / 3;
2434	uint8_t r23 = d23;	2623	uint8_t r23 = d23;
2435	uint8_t r33 = (d23 + d33 + d32) / 3;	2624	uint8_t r33 = (d23 + d33 + d32) / 3;
2436		2625
2437	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2626	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2627	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2628	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2629	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2630	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2442	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2631	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2632	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2633	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2634	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446	}	2635	}
2447		2636
2448	free (darkness1);	2637	free (darkness1);
2449		2638
2450	EXTEND (SP, 3);	2639	EXTEND (SP, 3);
2451	PUSHs (sv_2mortal (newSViv (sw34)));	2640	PUSHs (sv_2mortal (newSViv (sw3)));
2452	PUSHs (sv_2mortal (newSViv (sh3)));	2641	PUSHs (sv_2mortal (newSViv (sh3)));
2453	PUSHs (darkness3_sv);	2642	PUSHs (darkness3_sv);
2454	}	2643	}
2455		2644
2456	SV *	2645	SV *
…		…
2654	if (RETVAL < 0)	2843	if (RETVAL < 0)
2655	{	2844	{
2656	RETVAL = Mix_GroupOldest (-1);	2845	RETVAL = Mix_GroupOldest (-1);
2657		2846
2658	if (RETVAL < 0)	2847	if (RETVAL < 0)
		2848	{
		2849	// happens sometimes, maybe it just stopped playing(?)
		2850	RETVAL = Mix_GroupAvailable (-1);
		2851
		2852	if (RETVAL < 0)
2659	XSRETURN_UNDEF;	2853	XSRETURN_UNDEF;
2660		2854	}
		2855	else
2661	Mix_HaltChannel (RETVAL);	2856	Mix_HaltChannel (RETVAL);
2662	}	2857	}
2663		2858
2664	Mix_UnregisterAllEffects (RETVAL);	2859	Mix_UnregisterAllEffects (RETVAL);
2665	Mix_Volume (RETVAL, 128);	2860	Mix_Volume (RETVAL, 128);
2666	}	2861	}
…		…
2713	void	2908	void
2714	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2909	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715	CODE:	2910	CODE:
2716	{	2911	{
2717	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2912	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2718	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2913	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2914	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720	}	2915	}
2721		2916
2722	void	2917	void
2723	set_reverse_stereo (DC::Channel self, int flip)	2918	set_reverse_stereo (DC::Channel self, int flip)
…		…
2725	Mix_SetReverseStereo (self, flip);	2920	Mix_SetReverseStereo (self, flip);
2726		2921
2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2922	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728		2923
2729	PROTOTYPES: DISABLE	2924	PROTOTYPES: DISABLE
		2925
		2926	void
		2927	decoders ()
		2928	PPCODE:
		2929	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2930	int i, num = Mix_GetNumChunkDecoders ();
		2931	EXTEND (SP, num);
		2932	for (i = 0; i < num; ++i)
		2933	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2934	#else
		2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2936	#endif
2730		2937
2731	DC::MixChunk	2938	DC::MixChunk
2732	new (SV *class, DC::RW rwops)	2939	new (SV *class, DC::RW rwops)
2733	CODE:	2940	CODE:
2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2767	OUTPUT:	2974	OUTPUT:
2768	RETVAL	2975	RETVAL
2769		2976
2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2977	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771		2978
		2979	void
		2980	decoders ()
		2981	PPCODE:
		2982	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2983	int i, num = Mix_GetNumMusicDecoders ();
		2984	EXTEND (SP, num);
		2985	for (i = 0; i < num; ++i)
		2986	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2987	#else
		2988	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2989	#endif
		2990
2772	int	2991	int
2773	volume (int volume = -1)	2992	volume (int volume = -1)
2774	PROTOTYPE: ;$	2993	PROTOTYPE: ;$
2775	CODE:	2994	CODE:
2776	if (items > 0)	2995	if (items > 0)
…		…
2786		3005
2787	void	3006	void
2788	halt ()	3007	halt ()
2789	CODE:	3008	CODE:
2790	Mix_HaltMusic ();	3009	Mix_HaltMusic ();
		3010
		3011	int
		3012	playing ()
		3013	CODE:
		3014	RETVAL = Mix_PlayingMusic ();
		3015	OUTPUT:
		3016	RETVAL
2791		3017
2792	DC::MixMusic	3018	DC::MixMusic
2793	new (SV *class, DC::RW rwops)	3019	new (SV *class, DC::RW rwops)
2794	CODE:	3020	CODE:
2795	RETVAL = Mix_LoadMUS_RW (rwops);	3021	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2826	} *civ, const_iv[] = {	3052	} *civ, const_iv[] = {
2827	# define const_iv(name) { # name, (IV)name }	3053	# define const_iv(name) { # name, (IV)name }
2828	const_iv (GL_VENDOR),	3054	const_iv (GL_VENDOR),
2829	const_iv (GL_VERSION),	3055	const_iv (GL_VERSION),
2830	const_iv (GL_EXTENSIONS),	3056	const_iv (GL_EXTENSIONS),
		3057	const_iv (GL_MAX_TEXTURE_UNITS),
2831	const_iv (GL_COLOR_MATERIAL),	3058	const_iv (GL_COLOR_MATERIAL),
2832	const_iv (GL_SMOOTH),	3059	const_iv (GL_SMOOTH),
2833	const_iv (GL_FLAT),	3060	const_iv (GL_FLAT),
2834	const_iv (GL_DITHER),	3061	const_iv (GL_DITHER),
2835	const_iv (GL_BLEND),	3062	const_iv (GL_BLEND),
…		…
2847	const_iv (GL_ZERO),	3074	const_iv (GL_ZERO),
2848	const_iv (GL_SRC_ALPHA),	3075	const_iv (GL_SRC_ALPHA),
2849	const_iv (GL_DST_ALPHA),	3076	const_iv (GL_DST_ALPHA),
2850	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3077	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851	const_iv (GL_ONE_MINUS_DST_ALPHA),	3078	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3079	const_iv (GL_SRC_COLOR),
		3080	const_iv (GL_DST_COLOR),
		3081	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3082	const_iv (GL_ONE_MINUS_DST_COLOR),
2852	const_iv (GL_SRC_ALPHA_SATURATE),	3083	const_iv (GL_SRC_ALPHA_SATURATE),
2853	const_iv (GL_RGB),	3084	const_iv (GL_RGB),
2854	const_iv (GL_RGBA),	3085	const_iv (GL_RGBA),
2855	const_iv (GL_RGBA4),	3086	const_iv (GL_RGBA4),
2856	const_iv (GL_RGBA8),	3087	const_iv (GL_RGBA8),
…		…
2924	const_iv (GL_NICEST),	3155	const_iv (GL_NICEST),
2925	const_iv (GL_V2F),	3156	const_iv (GL_V2F),
2926	const_iv (GL_V3F),	3157	const_iv (GL_V3F),
2927	const_iv (GL_T2F_V3F),	3158	const_iv (GL_T2F_V3F),
2928	const_iv (GL_T2F_N3F_V3F),	3159	const_iv (GL_T2F_N3F_V3F),
		3160	const_iv (GL_FUNC_ADD),
		3161	const_iv (GL_FUNC_SUBTRACT),
		3162	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929	# undef const_iv	3163	# undef const_iv
2930	};	3164	};
2931		3165
2932	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3166	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3167	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934		3168
2935	texture_av = newAV ();	3169	texture_av = newAV ();
2936	AvREAL_off (texture_av);	3170	AvREAL_off (texture_av);
2937	}	3171	}
2938		3172
2939	void	3173	void
2940	disable_GL_EXT_blend_func_separate ()	3174	disable_GL_EXT_blend_func_separate ()
2941	CODE:	3175	CODE:
2942	gl.BlendFuncSeparate = 0;	3176	gl.BlendFuncSeparate = 0;
2943	gl.BlendFuncSeparateEXT = 0;	3177	gl.BlendFuncSeparateEXT = 0;
		3178
		3179	void
		3180	apple_nvidia_bug (int enable)
2944		3181
2945	char *	3182	char *
2946	gl_vendor ()	3183	gl_vendor ()
2947	CODE:	3184	CODE:
2948	RETVAL = (char *)glGetString (GL_VENDOR);	3185	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2979		3216
2980	int glGetError ()	3217	int glGetError ()
2981		3218
2982	void glFinish ()	3219	void glFinish ()
2983		3220
		3221	void glFlush ()
		3222
2984	void glClear (int mask)	3223	void glClear (int mask)
2985		3224
2986	void glClearColor (float r, float g, float b, float a = 1.0)	3225	void glClearColor (float r, float g, float b, float a = 1.0)
2987	PROTOTYPE: @	3226	PROTOTYPE: @
2988		3227
…		…
2997	void glBlendFunc (int sfactor, int dfactor)	3236	void glBlendFunc (int sfactor, int dfactor)
2998		3237
2999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3238	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000	CODE:	3239	CODE:
3001	gl_BlendFuncSeparate (sa, da, saa, daa);	3240	gl_BlendFuncSeparate (sa, da, saa, daa);
		3241
		3242	# void glBlendEquation (int se)
3002		3243
3003	void glDepthMask (int flag)	3244	void glDepthMask (int flag)
3004		3245
3005	void glLogicOp (int opcode)	3246	void glLogicOp (int opcode)
3006		3247
…		…
3156	void glNewList (int list, int mode = GL_COMPILE)	3397	void glNewList (int list, int mode = GL_COMPILE)
3157		3398
3158	void glEndList ()	3399	void glEndList ()
3159		3400
3160	void glCallList (int list)	3401	void glCallList (int list)
		3402
		3403	void c_init ()
		3404	CODE:
		3405	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3406	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3161		3407
3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3408	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163		3409
3164	PROTOTYPES: DISABLE	3410	PROTOTYPES: DISABLE
3165		3411

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.280 by root, Wed Nov 26 23:08:34 2008 UTC vs. Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.280 by root, Wed Nov 26 23:08:34 2008 UTC vs.
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC