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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.282 by root, Fri Dec 5 14:50:01 2008 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 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 16	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
…		…
934	SDL_GetAppState ()	975	SDL_GetAppState ()
935		976
936	int	977	int
937	SDL_GetModState ()	978	SDL_GetModState ()
938		979
		980	int
		981	SDL_WaitEvent ()
		982	C_ARGS: 0
		983
939	void	984	void
		985	SDL_PumpEvents ()
		986
		987	void
940	poll_events ()	988	peep_events ()
941	PPCODE:	989	PPCODE:
942	{	990	{
943	SDL_Event ev;	991	SDL_Event ev;
944		992
945	SDL_PumpEvents ();	993	SDL_PumpEvents ();
…		…
1011		1059
1012	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1060	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1013	}	1061	}
1014	}	1062	}
1015		1063
		1064	char *
		1065	SDL_AudioDriverName ()
		1066	CODE:
		1067	{
		1068	char buf [256];
		1069	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1070	XSRETURN_UNDEF;
		1071
		1072	RETVAL = buf;
		1073	}
		1074	OUTPUT:
		1075	RETVAL
		1076
1016	int	1077	int
1017	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1078	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1018	POSTCALL:	1079	POSTCALL:
1019	Mix_HookMusicFinished (music_finished);	1080	Mix_HookMusicFinished (music_finished);
1020	Mix_ChannelFinished (channel_finished);	1081	Mix_ChannelFinished (channel_finished);
…		…
1082	add_font (char *file)	1143	add_font (char *file)
1083	CODE:	1144	CODE:
1084	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1145	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1085	OUTPUT:	1146	OUTPUT:
1086	RETVAL	1147	RETVAL
		1148
		1149	void
		1150	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1151
		1152	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1153	void
		1154	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1087		1155
1088	void	1156	void
1089	load_image_inline (SV *image_)	1157	load_image_inline (SV *image_)
1090	ALIAS:	1158	ALIAS:
1091	load_image_file = 1	1159	load_image_file = 1
…		…
1654	glDisable (GL_ALPHA_TEST);	1722	glDisable (GL_ALPHA_TEST);
1655	glDisable (GL_BLEND);	1723	glDisable (GL_BLEND);
1656	}	1724	}
1657	}	1725	}
1658		1726
		1727	void
		1728	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)
		1729	PROTOTYPE: @
		1730	CODE:
		1731	{
		1732	glEnable (GL_BLEND);
		1733	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1734	glEnable (GL_TEXTURE_2D);
		1735	glBindTexture (GL_TEXTURE_2D, name1);
		1736
		1737	glColor3f (intensity, intensity, intensity);
		1738	glPushMatrix ();
		1739	glScalef (1./3, 1./3, 1.);
		1740
		1741	if (blend > 0.f)
		1742	{
		1743	float dx3 = dx * -3.f / w;
		1744	float dy3 = dy * -3.f / h;
		1745	GLfloat env_color[4] = { 0., 0., 0., blend };
		1746
		1747	/* interpolate the two shadow textures */
		1748	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1752	gl.ActiveTexture (GL_TEXTURE1);
		1753	glEnable (GL_TEXTURE_2D);
		1754	glBindTexture (GL_TEXTURE_2D, name2);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1756
		1757	/* rgb == rgb(glcolor) */
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1760	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1761
		1762	/* alpha = interpolate t0, t1 by env_alpha */
		1763	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1768
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1774
		1775	glBegin (GL_QUADS);
		1776	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1777	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1778	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1779	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1780	glEnd ();
		1781
		1782	glDisable (GL_TEXTURE_2D);
		1783	gl.ActiveTexture (GL_TEXTURE0);
		1784	}
		1785	else
		1786	{
		1787	/* simple blending of one texture, also opengl <1.3 path */
		1788	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1789
		1790	glBegin (GL_QUADS);
		1791	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1792	glTexCoord2f (0, t); glVertex2f (0, h);
		1793	glTexCoord2f (s, t); glVertex2f (w, h);
		1794	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1795	glEnd ();
		1796	}
		1797
		1798	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1799	{
		1800	int x, y;
		1801	int dx3 = dx * 3;
		1802	int dy3 = dy * 3;
		1803
		1804	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1805	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1806	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1807	glTranslatef (-1., -1., 0);
		1808	glBegin (GL_QUADS);
		1809
		1810	for (y = 1; y < h; y += 3)
		1811	{
		1812	int y1 = y - dy3;
		1813	int y1valid = y1 >= 0 && y1 < h;
		1814
		1815	for (x = 1; x < w; x += 3)
		1816	{
		1817	int x1 = x - dx3;
		1818	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1819	uint8_t h2;
		1820
		1821	if (y1valid && x1 >= 0 && x1 < w)
		1822	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1823	else
		1824	h2 = 1; /* out of range == invisible */
		1825
		1826	if (h1 \|\| h2)
		1827	{
		1828	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1829	glColor4f (1., 1., 1., alpha);
		1830
		1831	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1832	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1833	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1834	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1835	}
		1836	}
		1837	}
		1838	}
		1839
		1840	glEnd ();
		1841
		1842	glPopMatrix ();
		1843
		1844	glDisable (GL_TEXTURE_2D);
		1845	glDisable (GL_BLEND);
		1846	}
		1847
1659	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1848	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1660	CODE:	1849	CODE:
1661	{	1850	{
1662	GLint width;	1851	GLint width;
1663	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1852	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1877	{	2066	{
1878	ext = *data++;	2067	ext = *data++;
1879	cmd = ext & 0x7f;	2068	cmd = ext & 0x7f;
1880		2069
1881	if (cmd < 4)	2070	if (cmd < 4)
1882	cell->darkness = 255 - ext * 64 + 1;	2071	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1883	else if (cmd == 5) // health	2072	else if (cmd == 5) // health
1884	{	2073	{
1885	cell->stat_width = 1;	2074	cell->stat_width = 1;
1886	cell->stat_hp = *data++;	2075	cell->stat_hp = *data++;
1887	}	2076	}
…		…
1962	? self->row + y	2151	? self->row + y
1963	: 0;	2152	: 0;
1964		2153
1965	for (x = x0; x < x1; x++)	2154	for (x = x0; x < x1; x++)
1966	{	2155	{
1967	int r = 32, g = 32, b = 32, a = 192;	2156	unsigned int r = 32, g = 32, b = 32, a = 192;
1968		2157
1969	if (row && row->c0 <= x && x < row->c1)	2158	if (row && row->c0 <= x && x < row->c1)
1970	{	2159	{
1971	mapcell *cell = row->col + (x - row->c0);	2160	mapcell *cell = row->col + (x - row->c0);
1972		2161
…		…
1974	{	2163	{
1975	maptex tex = self->tex [cell->tile [z]];	2164	maptex tex = self->tex [cell->tile [z]];
1976	int a0 = 255 - tex.a;	2165	int a0 = 255 - tex.a;
1977	int a1 = tex.a;	2166	int a1 = tex.a;
1978		2167
1979	r = (r * a0 + tex.r * a1) / 255;	2168	r = div255 (r * a0 + tex.r * a1);
1980	g = (g * a0 + tex.g * a1) / 255;	2169	g = div255 (g * a0 + tex.g * a1);
1981	b = (b * a0 + tex.b * a1) / 255;	2170	b = div255 (b * a0 + tex.b * a1);
1982	a = (a * a0 + tex.a * a1) / 255;	2171	a = div255 (a * a0 + tex.a * a1);
1983	}	2172	}
1984	}	2173	}
1985		2174
1986	*map++ = (r )	2175	*map++ = (r )
1987	\| (g << 8)	2176	\| (g << 8)
…		…
1994	}	2183	}
1995	OUTPUT:	2184	OUTPUT:
1996	RETVAL	2185	RETVAL
1997		2186
1998	void	2187	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)	2188	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:	2189	CODE:
2001	{	2190	{
2002	int x, y, z;	2191	int x, y, z;
2003		2192
2004	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2193	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2005	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2194	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)	2195	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2007	smooth_key skey;	2196	smooth_key skey;
2008	int pl_x, pl_y;	2197	int pl_x, pl_y;
2009	maptex pl_tex;	2198	maptex pl_tex;
2010	rc_t *rc = rc_alloc ();	2199	rc_t *rc = rc_alloc ();
		2200	rc_t *rc_ov = rc_alloc ();
2011	rc_key_t key;	2201	rc_key_t key;
2012	rc_array_t *arr;	2202	rc_array_t *arr;
2013		2203
2014	pl_tex.name = 0;	2204	pl_tex.name = 0;
2015		2205
2016	// thats current max. sorry.	2206	// that's current max. sorry.
2017	if (sw > 255) sw = 255;	2207	if (sw > 255) sw = 255;
2018	if (sh > 255) sh = 255;	2208	if (sh > 255) sh = 255;
2019		2209
2020	// clear key, in case of extra padding	2210	// clear key, in case of extra padding
2021	memset (&skey, 0, sizeof (skey));	2211	memset (&skey, 0, sizeof (skey));
…		…
2025	key.g = 255;	2215	key.g = 255;
2026	key.b = 255;	2216	key.b = 255;
2027	key.a = 255;	2217	key.a = 255;
2028	key.mode = GL_QUADS;	2218	key.mode = GL_QUADS;
2029	key.format = GL_T2F_V3F;	2219	key.format = GL_T2F_V3F;
2030	key.texname = -1;
2031		2220
2032	mx += self->x;	2221	mx += self->x;
2033	my += self->y;	2222	my += self->y;
2034		2223
2035	// first pass: determine smooth_max	2224	// first pass: determine smooth_max
…		…
2059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2248	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2060		2249
2061	for (z = 0; z <= 2; z++)	2250	for (z = 0; z <= 2; z++)
2062	{	2251	{
2063	memset (smooth_level, 0, sizeof (smooth_level));	2252	memset (smooth_level, 0, sizeof (smooth_level));
		2253	key.texname = -1;
2064		2254
2065	for (y = 0; y < sh; y++)	2255	for (y = 0; y < sh; y++)
2066	if (0 <= y + my && y + my < self->rows)	2256	if (0 <= y + my && y + my < self->rows)
2067	{	2257	{
2068	maprow *row = self->row + (y + my);	2258	maprow *row = self->row + (y + my);
…		…
2074	tileid tile = cell->tile [z];	2264	tileid tile = cell->tile [z];
2075		2265
2076	if (tile)	2266	if (tile)
2077	{	2267	{
2078	maptex tex = self->tex [tile];	2268	maptex tex = self->tex [tile];
2079	int px = (x + 1) * T - tex.w;	2269	int px, py;
2080	int py = (y + 1) * T - tex.h;
2081		2270
2082	if (key.texname != tex.name)	2271	if (key.texname != tex.name)
2083	{	2272	{
2084	self->tex [tile].unused = 0;	2273	self->tex [tile].unused = 0;
2085		2274
2086	if (!tex.name)	2275	if (!tex.name)
2087	tex = self->tex [2]; /* missing, replace by noface */	2276	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088		2277
2089	key.texname = tex.name;	2278	key.texname = tex.name;
2090	arr = rc_array (rc, &key);	2279	arr = rc_array (rc, &key);
2091	}	2280	}
		2281
		2282	px = (x + 1) * Th - tex.w;
		2283	py = (y + 1) * Tw - tex.h;
2092		2284
2093	if (expect_false (cell->player == player) && expect_false (z == 2))	2285	if (expect_false (cell->player == player) && expect_false (z == 2))
2094	{	2286	{
2095	pl_x = px;	2287	pl_x = px;
2096	pl_y = py;	2288	pl_y = py;
…		…
2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2293	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2294	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);	2295	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);	2296	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2105		2297
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	2298	// update smooth hash
2132	if (tex.smoothtile)	2299	if (tex.smoothtile)
2133	{	2300	{
2134	skey.tile = tex.smoothtile;	2301	skey.tile = tex.smoothtile;
2135	skey.level = tex.smoothlevel;	2302	skey.level = tex.smoothlevel;
…		…
2163	// corners	2330	// corners
2164	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2331	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);	2332	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);	2333	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);	2334	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2335	}
		2336	}
		2337
		2338	if (expect_false (z == 2) && expect_false (cell->flags))
		2339	{
		2340	// overlays such as the speech bubble, probably more to come
		2341	if (cell->flags & 1)
		2342	{
		2343	rc_key_t key_ov = key;
		2344	maptex tex = self->tex [TEXID_SPEECH];
		2345	rc_array_t *arr;
		2346	int px = x * Tw + Tw * 2 / 32;
		2347	int py = y * Th - Th * 6 / 32;
		2348
		2349	key_ov.texname = tex.name;
		2350	arr = rc_array (rc_ov, &key_ov);
		2351
		2352	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2353	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2354	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2355	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2168	}	2356	}
2169	}	2357	}
2170	}	2358	}
2171	}	2359	}
2172		2360
…		…
2199	if (!(bits & 0x1000)	2387	if (!(bits & 0x1000)
2200	&& skey->level == level	2388	&& skey->level == level
2201	&& level > smooth_max [skey->x][skey->y])	2389	&& level > smooth_max [skey->x][skey->y])
2202	{	2390	{
2203	maptex tex = self->tex [skey->tile];	2391	maptex tex = self->tex [skey->tile];
2204	int px = (((int)skey->x) - 1) * T;	2392	int px = (((int)skey->x) - 1) * Tw;
2205	int py = (((int)skey->y) - 1) * T;	2393	int py = (((int)skey->y) - 1) * Th;
2206	int border = bits & 15;	2394	int border = bits & 15;
2207	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2395	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2208	float dx = tex.s * .0625f; // 16 images/row	2396	float dx = tex.s * .0625f; // 16 images/row
2209	float dy = tex.t * .5f ; // 2 images/column	2397	float dy = tex.t * .5f ; // 2 images/column
2210		2398
…		…
2223		2411
2224	if (border)	2412	if (border)
2225	{	2413	{
2226	float ox = border * dx;	2414	float ox = border * dx;
2227		2415
2228	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2416	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2229	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2417	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2230	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2231	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2419	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2232	}	2420	}
2233		2421
2234	if (corner)	2422	if (corner)
2235	{	2423	{
2236	float ox = corner * dx;	2424	float ox = corner * dx;
2237		2425
2238	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2426	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2239	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2427	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2240	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2428	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2241	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2429	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2242	}	2430	}
2243	}	2431	}
2244	}	2432	}
2245	}	2433	}
2246	}	2434	}
…		…
2269	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2457	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270		2458
2271	rc_draw (rc);	2459	rc_draw (rc);
2272	}	2460	}
2273		2461
		2462	rc_draw (rc_ov);
		2463	rc_clear (rc_ov);
		2464
2274	glDisable (GL_BLEND);	2465	glDisable (GL_BLEND);
2275	rc_free (rc);	2466	rc_free (rc);
		2467	rc_free (rc_ov);
2276		2468
2277	// top layer: overlays such as the health bar	2469	// top layer: overlays such as the health bar
2278	for (y = 0; y < sh; y++)	2470	for (y = 0; y < sh; y++)
2279	if (0 <= y + my && y + my < self->rows)	2471	if (0 <= y + my && y + my < self->rows)
2280	{	2472	{
…		…
2283	for (x = 0; x < sw; x++)	2475	for (x = 0; x < sw; x++)
2284	if (row->c0 <= x + mx && x + mx < row->c1)	2476	if (row->c0 <= x + mx && x + mx < row->c1)
2285	{	2477	{
2286	mapcell *cell = row->col + (x + mx - row->c0);	2478	mapcell *cell = row->col + (x + mx - row->c0);
2287		2479
2288	int px = x * T;	2480	int px = x * Tw;
2289	int py = y * T;	2481	int py = y * Th;
2290		2482
2291	if (expect_false (cell->player == player))	2483	if (expect_false (cell->player == player))
2292	{	2484	{
2293	px += sdx;	2485	px += sdx;
2294	py += sdy;	2486	py += sdy;
2295	}	2487	}
2296		2488
2297	if (cell->stat_hp)	2489	if (cell->stat_hp)
2298	{	2490	{
2299	int width = cell->stat_width * T;	2491	int width = cell->stat_width * Tw;
2300	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2492	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2301		2493
2302	glColor3ub (0, 0, 0);	2494	glColor3ub (0, 0, 0);
2303	glRectf (px + 1, py - thick - 2,	2495	glRectf (px + 1, py - thick - 2,
2304	px + width - 1, py);	2496	px + width - 1, py);
2305		2497
…		…
2311	}	2503	}
2312	}	2504	}
2313	}	2505	}
2314		2506
2315	void	2507	void
2316	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2508	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2317	CODE:	2509	CODE:
2318	{	2510	{
2319	static float color[16][3] = {	2511	static float color[16][3] = {
2320	{ 0.00F, 0.00F, 0.00F },	2512	{ 0.00f, 0.00f, 0.00f },
2321	{ 1.00F, 1.00F, 1.00F },	2513	{ 1.00f, 1.00f, 1.00f },
2322	{ 0.00F, 0.00F, 0.55F },	2514	{ 0.00f, 0.00f, 0.55f },
2323	{ 1.00F, 0.00F, 0.00F },	2515	{ 1.00f, 0.00f, 0.00f },
2324		2516
2325	{ 1.00F, 0.54F, 0.00F },	2517	{ 1.00f, 0.54f, 0.00f },
2326	{ 0.11F, 0.56F, 1.00F },	2518	{ 0.11f, 0.56f, 1.00f },
2327	{ 0.93F, 0.46F, 0.00F },	2519	{ 0.93f, 0.46f, 0.00f },
2328	{ 0.18F, 0.54F, 0.34F },	2520	{ 0.18f, 0.54f, 0.34f },
2329		2521
2330	{ 0.56F, 0.73F, 0.56F },	2522	{ 0.56f, 0.73f, 0.56f },
2331	{ 0.80F, 0.80F, 0.80F },	2523	{ 0.80f, 0.80f, 0.80f },
2332	{ 0.55F, 0.41F, 0.13F },	2524	{ 0.55f, 0.41f, 0.13f },
2333	{ 0.99F, 0.77F, 0.26F },	2525	{ 0.99f, 0.77f, 0.26f },
2334		2526
2335	{ 0.74F, 0.65F, 0.41F },	2527	{ 0.74f, 0.65f, 0.41f },
2336		2528
2337	{ 0.00F, 1.00F, 1.00F },	2529	{ 0.00f, 1.00f, 1.00f },
2338	{ 1.00F, 0.00F, 1.00F },	2530	{ 1.00f, 0.00f, 1.00f },
2339	{ 1.00F, 1.00F, 0.00F },	2531	{ 1.00f, 1.00f, 0.00f },
2340	};	2532	};
2341		2533
2342	int x, y;	2534	int x, y;
2343		2535
2344	glEnable (GL_TEXTURE_2D);	2536	glEnable (GL_TEXTURE_2D);
		2537	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2538	* but the nvidia driver (185.18.14) mishandles alpha textures
		2539	* and takes the colour from god knows where instead of using
		2540	* Cp. MODULATE results in the same colour, but slightly different
		2541	* alpha, but atcually gives us the correct colour with nvidia.
		2542	*/
2345	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2543	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346	glEnable (GL_BLEND);	2544	glEnable (GL_BLEND);
2347	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2545	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348	glBegin (GL_QUADS);	2546	glBegin (GL_QUADS);
2349		2547
2350	for (y = 0; y < h; y++)	2548	for (y = 0; y < h; y++)
…		…
2354		2552
2355	if (m)	2553	if (m)
2356	{	2554	{
2357	float *c = color [m & 15];	2555	float *c = color [m & 15];
2358		2556
2359	float tx1 = m & 0x40 ? 0.5 : 0.;	2557	float tx1 = m & 0x40 ? 0.5f : 0.f;
2360	float tx2 = tx1 + 0.5;	2558	float tx2 = tx1 + 0.5f;
2361		2559
2362	glColor4f (c[0], c[1], c[2], 0.75);	2560	glColor4f (c[0], c[1], c[2], 1);
2363	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2561	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2562	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2563	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2564	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367	}	2565	}
…		…
2375	void	2573	void
2376	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2574	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2377	PPCODE:	2575	PPCODE:
2378	{	2576	{
2379	int x, y;	2577	int x, y;
2380	int sw1 = sw + 2;	2578	int sw1 = sw + 2;
2381	int sh1 = sh + 2;	2579	int sh1 = sh + 2;
2382	int sh3 = sh * 3;	2580	int sh3 = sh * 3;
2383	int sw34 = (sw * 3 + 3) & ~3;	2581	int sw3 = sw * 3;
		2582	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2583	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2384	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2584	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2385	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2585	memset (darkness1, 0, sw1*sh1);
2386	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2387		2586
2388	SvPOK_only (darkness3_sv);	2587	SvPOK_only (darkness3_sv);
2389	SvCUR_set (darkness3_sv, sw34 * sh3);	2588	SvCUR_set (darkness3_sv, sw3 * sh3);
2390		2589
2391	mx += self->x - 1;	2590	mx += self->x - 1;
2392	my += self->y - 1;	2591	my += self->y - 1;
2393
2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395		2592
2396	for (y = 0; y < sh1; y++)	2593	for (y = 0; y < sh1; y++)
2397	if (0 <= y + my && y + my < self->rows)	2594	if (0 <= y + my && y + my < self->rows)
2398	{	2595	{
2399	maprow *row = self->row + (y + my);	2596	maprow *row = self->row + (y + my);
…		…
2402	if (row->c0 <= x + mx && x + mx < row->c1)	2599	if (row->c0 <= x + mx && x + mx < row->c1)
2403	{	2600	{
2404	mapcell *cell = row->col + (x + mx - row->c0);	2601	mapcell *cell = row->col + (x + mx - row->c0);
2405		2602
2406	darkness1 [y * sw1 + x] = cell->darkness	2603	darkness1 [y * sw1 + x] = cell->darkness
2407	? 255 - (cell->darkness - 1)	2604	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408	: 255 - FOW_DARKNESS;	2605	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409	}	2606	}
2410	}	2607	}
2411		2608
2412	for (y = 0; y < sh; ++y)	2609	for (y = 0; y < sh; ++y)
2413	for (x = 0; x < sw; ++x)	2610	for (x = 0; x < sw; ++x)
…		…
2432		2629
2433	uint8_t r13 = (d13 + d23 + d12) / 3;	2630	uint8_t r13 = (d13 + d23 + d12) / 3;
2434	uint8_t r23 = d23;	2631	uint8_t r23 = d23;
2435	uint8_t r33 = (d23 + d33 + d32) / 3;	2632	uint8_t r33 = (d23 + d33 + d32) / 3;
2436		2633
2437	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2634	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2635	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2636	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2637	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2638	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);	2639	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2640	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2641	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2642	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446	}	2643	}
2447		2644
2448	free (darkness1);	2645	free (darkness1);
2449		2646
2450	EXTEND (SP, 3);	2647	EXTEND (SP, 3);
2451	PUSHs (sv_2mortal (newSViv (sw34)));	2648	PUSHs (sv_2mortal (newSViv (sw3)));
2452	PUSHs (sv_2mortal (newSViv (sh3)));	2649	PUSHs (sv_2mortal (newSViv (sh3)));
2453	PUSHs (darkness3_sv);	2650	PUSHs (darkness3_sv);
2454	}	2651	}
2455		2652
2456	SV *	2653	SV *
…		…
2654	if (RETVAL < 0)	2851	if (RETVAL < 0)
2655	{	2852	{
2656	RETVAL = Mix_GroupOldest (-1);	2853	RETVAL = Mix_GroupOldest (-1);
2657		2854
2658	if (RETVAL < 0)	2855	if (RETVAL < 0)
		2856	{
		2857	// happens sometimes, maybe it just stopped playing(?)
		2858	RETVAL = Mix_GroupAvailable (-1);
		2859
		2860	if (RETVAL < 0)
2659	XSRETURN_UNDEF;	2861	XSRETURN_UNDEF;
2660		2862	}
		2863	else
2661	Mix_HaltChannel (RETVAL);	2864	Mix_HaltChannel (RETVAL);
2662	}	2865	}
2663		2866
2664	Mix_UnregisterAllEffects (RETVAL);	2867	Mix_UnregisterAllEffects (RETVAL);
2665	Mix_Volume (RETVAL, 128);	2868	Mix_Volume (RETVAL, 128);
2666	}	2869	}
…		…
2713	void	2916	void
2714	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2917	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2715	CODE:	2918	CODE:
2716	{	2919	{
2717	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2920	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);	2921	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2922	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720	}	2923	}
2721		2924
2722	void	2925	void
2723	set_reverse_stereo (DC::Channel self, int flip)	2926	set_reverse_stereo (DC::Channel self, int flip)
…		…
2725	Mix_SetReverseStereo (self, flip);	2928	Mix_SetReverseStereo (self, flip);
2726		2929
2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2930	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728		2931
2729	PROTOTYPES: DISABLE	2932	PROTOTYPES: DISABLE
		2933
		2934	void
		2935	decoders ()
		2936	PPCODE:
		2937	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2938	int i, num = Mix_GetNumChunkDecoders ();
		2939	EXTEND (SP, num);
		2940	for (i = 0; i < num; ++i)
		2941	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2942	#else
		2943	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2944	#endif
2730		2945
2731	DC::MixChunk	2946	DC::MixChunk
2732	new (SV *class, DC::RW rwops)	2947	new (SV *class, DC::RW rwops)
2733	CODE:	2948	CODE:
2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2949	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2767	OUTPUT:	2982	OUTPUT:
2768	RETVAL	2983	RETVAL
2769		2984
2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2985	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771		2986
		2987	void
		2988	decoders ()
		2989	PPCODE:
		2990	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2991	int i, num = Mix_GetNumMusicDecoders ();
		2992	EXTEND (SP, num);
		2993	for (i = 0; i < num; ++i)
		2994	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2995	#else
		2996	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2997	#endif
		2998
2772	int	2999	int
2773	volume (int volume = -1)	3000	volume (int volume = -1)
2774	PROTOTYPE: ;$	3001	PROTOTYPE: ;$
2775	CODE:	3002	CODE:
2776	if (items > 0)	3003	if (items > 0)
…		…
2786		3013
2787	void	3014	void
2788	halt ()	3015	halt ()
2789	CODE:	3016	CODE:
2790	Mix_HaltMusic ();	3017	Mix_HaltMusic ();
		3018
		3019	int
		3020	playing ()
		3021	CODE:
		3022	RETVAL = Mix_PlayingMusic ();
		3023	OUTPUT:
		3024	RETVAL
2791		3025
2792	DC::MixMusic	3026	DC::MixMusic
2793	new (SV *class, DC::RW rwops)	3027	new (SV *class, DC::RW rwops)
2794	CODE:	3028	CODE:
2795	RETVAL = Mix_LoadMUS_RW (rwops);	3029	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2826	} *civ, const_iv[] = {	3060	} *civ, const_iv[] = {
2827	# define const_iv(name) { # name, (IV)name }	3061	# define const_iv(name) { # name, (IV)name }
2828	const_iv (GL_VENDOR),	3062	const_iv (GL_VENDOR),
2829	const_iv (GL_VERSION),	3063	const_iv (GL_VERSION),
2830	const_iv (GL_EXTENSIONS),	3064	const_iv (GL_EXTENSIONS),
		3065	const_iv (GL_MAX_TEXTURE_UNITS),
2831	const_iv (GL_COLOR_MATERIAL),	3066	const_iv (GL_COLOR_MATERIAL),
2832	const_iv (GL_SMOOTH),	3067	const_iv (GL_SMOOTH),
2833	const_iv (GL_FLAT),	3068	const_iv (GL_FLAT),
2834	const_iv (GL_DITHER),	3069	const_iv (GL_DITHER),
2835	const_iv (GL_BLEND),	3070	const_iv (GL_BLEND),
…		…
2847	const_iv (GL_ZERO),	3082	const_iv (GL_ZERO),
2848	const_iv (GL_SRC_ALPHA),	3083	const_iv (GL_SRC_ALPHA),
2849	const_iv (GL_DST_ALPHA),	3084	const_iv (GL_DST_ALPHA),
2850	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3085	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851	const_iv (GL_ONE_MINUS_DST_ALPHA),	3086	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3087	const_iv (GL_SRC_COLOR),
		3088	const_iv (GL_DST_COLOR),
		3089	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3090	const_iv (GL_ONE_MINUS_DST_COLOR),
2852	const_iv (GL_SRC_ALPHA_SATURATE),	3091	const_iv (GL_SRC_ALPHA_SATURATE),
2853	const_iv (GL_RGB),	3092	const_iv (GL_RGB),
2854	const_iv (GL_RGBA),	3093	const_iv (GL_RGBA),
2855	const_iv (GL_RGBA4),	3094	const_iv (GL_RGBA4),
2856	const_iv (GL_RGBA8),	3095	const_iv (GL_RGBA8),
…		…
2924	const_iv (GL_NICEST),	3163	const_iv (GL_NICEST),
2925	const_iv (GL_V2F),	3164	const_iv (GL_V2F),
2926	const_iv (GL_V3F),	3165	const_iv (GL_V3F),
2927	const_iv (GL_T2F_V3F),	3166	const_iv (GL_T2F_V3F),
2928	const_iv (GL_T2F_N3F_V3F),	3167	const_iv (GL_T2F_N3F_V3F),
		3168	const_iv (GL_FUNC_ADD),
		3169	const_iv (GL_FUNC_SUBTRACT),
		3170	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2929	# undef const_iv	3171	# undef const_iv
2930	};	3172	};
2931		3173
2932	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3174	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2933	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3175	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2934		3176
2935	texture_av = newAV ();	3177	texture_av = newAV ();
2936	AvREAL_off (texture_av);	3178	AvREAL_off (texture_av);
2937	}	3179	}
2938		3180
2939	void	3181	void
2940	disable_GL_EXT_blend_func_separate ()	3182	disable_GL_EXT_blend_func_separate ()
2941	CODE:	3183	CODE:
2942	gl.BlendFuncSeparate = 0;	3184	gl.BlendFuncSeparate = 0;
2943	gl.BlendFuncSeparateEXT = 0;	3185	gl.BlendFuncSeparateEXT = 0;
		3186
		3187	void
		3188	apple_nvidia_bug (int enable)
2944		3189
2945	char *	3190	char *
2946	gl_vendor ()	3191	gl_vendor ()
2947	CODE:	3192	CODE:
2948	RETVAL = (char *)glGetString (GL_VENDOR);	3193	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2979		3224
2980	int glGetError ()	3225	int glGetError ()
2981		3226
2982	void glFinish ()	3227	void glFinish ()
2983		3228
		3229	void glFlush ()
		3230
2984	void glClear (int mask)	3231	void glClear (int mask)
2985		3232
2986	void glClearColor (float r, float g, float b, float a = 1.0)	3233	void glClearColor (float r, float g, float b, float a = 1.0)
2987	PROTOTYPE: @	3234	PROTOTYPE: @
2988		3235
…		…
2997	void glBlendFunc (int sfactor, int dfactor)	3244	void glBlendFunc (int sfactor, int dfactor)
2998		3245
2999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3246	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000	CODE:	3247	CODE:
3001	gl_BlendFuncSeparate (sa, da, saa, daa);	3248	gl_BlendFuncSeparate (sa, da, saa, daa);
		3249
		3250	# void glBlendEquation (int se)
3002		3251
3003	void glDepthMask (int flag)	3252	void glDepthMask (int flag)
3004		3253
3005	void glLogicOp (int opcode)	3254	void glLogicOp (int opcode)
3006		3255
…		…
3156	void glNewList (int list, int mode = GL_COMPILE)	3405	void glNewList (int list, int mode = GL_COMPILE)
3157		3406
3158	void glEndList ()	3407	void glEndList ()
3159		3408
3160	void glCallList (int list)	3409	void glCallList (int list)
		3410
		3411	void c_init ()
		3412	CODE:
		3413	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3414	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3161		3415
3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3416	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163		3417
3164	PROTOTYPES: DISABLE	3418	PROTOTYPES: DISABLE
3165		3419

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.282 by root, Fri Dec 5 14:50:01 2008 UTC vs. Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.282 by root, Fri Dec 5 14:50:01 2008 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC