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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 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];
…		…
452	ev.code = 1;	479	ev.code = 1;
453	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
454	ev.data2 = 0;	481	ev.data2 = 0;
455		482
456	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
457	}	490	}
458		491
459	static unsigned int	492	static unsigned int
460	minpot (unsigned int n)	493	minpot (unsigned int n)
461	{	494	{
…		…
816		849
817	IV minpot (UV n)	850	IV minpot (UV n)
818		851
819	IV popcount (UV n)	852	IV popcount (UV n)
820		853
		854	NV distance (NV dx, NV dy)
		855	CODE:
		856	RETVAL = pow (dx * dx + dy * dy, 0.5);
		857	OUTPUT:
		858	RETVAL
		859
821	void	860	void
822	pango_init ()	861	pango_init ()
823	CODE:	862	CODE:
824	{	863	{
825	opengl_fontmap = pango_opengl_font_map_new ();	864	opengl_fontmap = pango_opengl_font_map_new ();
…		…
916		955
917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918	#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);
919	#include "glfunc.h"	958	#include "glfunc.h"
920	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921	}	963	}
922	}	964	}
923	OUTPUT:	965	OUTPUT:
924	RETVAL	966	RETVAL
925		967
…		…
1010		1052
1011	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))));
1012	}	1054	}
1013	}	1055	}
1014		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
1015	int	1070	int
1016	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)
1017	POSTCALL:	1072	POSTCALL:
1018	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1019	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1081	add_font (char *file)	1136	add_font (char *file)
1082	CODE:	1137	CODE:
1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084	OUTPUT:	1139	OUTPUT:
1085	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1086		1144
1087	void	1145	void
1088	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
1089	ALIAS:	1147	ALIAS:
1090	load_image_file = 1	1148	load_image_file = 1
…		…
1206	#if DEBUG	1264	#if DEBUG
1207	VALGRIND_DO_LEAK_CHECK;	1265	VALGRIND_DO_LEAK_CHECK;
1208	#endif	1266	#endif
1209	}	1267	}
1210		1268
		1269	int
		1270	SvREFCNT (SV *sv)
		1271	CODE:
		1272	RETVAL = SvREFCNT (sv);
		1273	OUTPUT:
		1274	RETVAL
		1275
1211	MODULE = Deliantra::Client PACKAGE = DC::Font	1276	MODULE = Deliantra::Client PACKAGE = DC::Font
1212		1277
1213	PROTOTYPES: DISABLE	1278	PROTOTYPES: DISABLE
1214		1279
1215	DC::Font	1280	DC::Font
…		…
1644	if (ix)	1709	if (ix)
1645	{	1710	{
1646	glDisable (GL_ALPHA_TEST);	1711	glDisable (GL_ALPHA_TEST);
1647	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1648	}	1713	}
		1714	}
		1715
		1716	void
		1717	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)
		1718	PROTOTYPE: @
		1719	CODE:
		1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1723	glEnable (GL_TEXTURE_2D);
		1724	glBindTexture (GL_TEXTURE_2D, name1);
		1725
		1726	glColor3f (intensity, intensity, intensity);
		1727	glPushMatrix ();
		1728	glScalef (1./3, 1./3, 1.);
		1729
		1730	if (blend > 0.f)
		1731	{
		1732	float dx3 = dx * -3.f / w;
		1733	float dy3 = dy * -3.f / h;
		1734	GLfloat env_color[4] = { 0., 0., 0., blend };
		1735
		1736	/* interpolate the two shadow textures */
		1737	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1738	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1739
		1740	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1741	gl.ActiveTexture (GL_TEXTURE1);
		1742	glEnable (GL_TEXTURE_2D);
		1743	glBindTexture (GL_TEXTURE_2D, name2);
		1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1745
		1746	/* rgb == rgb(glcolor) */
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1750
		1751	/* alpha = interpolate t0, t1 by env_alpha */
		1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1753
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1757
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glBegin (GL_QUADS);
		1765	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1766	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1767	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1769	glEnd ();
		1770
		1771	glDisable (GL_TEXTURE_2D);
		1772	gl.ActiveTexture (GL_TEXTURE0);
		1773	}
		1774	else
		1775	{
		1776	/* simple blending of one texture, also opengl <1.3 path */
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1778
		1779	glBegin (GL_QUADS);
		1780	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1781	glTexCoord2f (0, t); glVertex2f (0, h);
		1782	glTexCoord2f (s, t); glVertex2f (w, h);
		1783	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1784	glEnd ();
		1785	}
		1786
		1787	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1788	{
		1789	int x, y;
		1790	int dx3 = dx * 3;
		1791	int dy3 = dy * 3;
		1792
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1794	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1795	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1796	glTranslatef (-1., -1., 0);
		1797	glBegin (GL_QUADS);
		1798
		1799	for (y = 1; y < h; y += 3)
		1800	{
		1801	int y1 = y - dy3;
		1802	int y1valid = y1 >= 0 && y1 < h;
		1803
		1804	for (x = 1; x < w; x += 3)
		1805	{
		1806	int x1 = x - dx3;
		1807	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1808	uint8_t h2;
		1809
		1810	if (y1valid && x1 >= 0 && x1 < w)
		1811	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1812	else
		1813	h2 = 1; /* out of range == invisible */
		1814
		1815	if (h1 \|\| h2)
		1816	{
		1817	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1818	glColor4f (1., 1., 1., alpha);
		1819
		1820	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1821	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1822	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1823	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1824	}
		1825	}
		1826	}
		1827	}
		1828
		1829	glEnd ();
		1830
		1831	glPopMatrix ();
		1832
		1833	glDisable (GL_TEXTURE_2D);
		1834	glDisable (GL_BLEND);
1649	}	1835	}
1650		1836
1651	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1837	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652	CODE:	1838	CODE:
1653	{	1839	{
…		…
1759	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1945	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760	// use uglier nearest interpolation because linear suffers	1946	// use uglier nearest interpolation because linear suffers
1761	// from transparent color bleeding and ugly wrapping effects.	1947	// from transparent color bleeding and ugly wrapping effects.
1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1948	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763	}	1949	}
		1950
		1951	void
		1952	expire_textures (DC::Map self, int texid, int count)
		1953	PPCODE:
		1954	for (; texid < self->texs && count; ++texid, --count)
		1955	{
		1956	maptex *tex = self->tex + texid;
		1957
		1958	if (tex->name)
		1959	{
		1960	if (tex->unused)
		1961	{
		1962	tex->name = 0;
		1963	tex->unused = 0;
		1964	XPUSHs (sv_2mortal (newSViv (texid)));
		1965	}
		1966	else
		1967	tex->unused = 1;
		1968	}
		1969	}
1764		1970
1765	int	1971	int
1766	ox (DC::Map self)	1972	ox (DC::Map self)
1767	ALIAS:	1973	ALIAS:
1768	oy = 1	1974	oy = 1
…		…
1849	{	2055	{
1850	ext = *data++;	2056	ext = *data++;
1851	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1852		2058
1853	if (cmd < 4)	2059	if (cmd < 4)
1854	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1855	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1856	{	2062	{
1857	cell->stat_width = 1;	2063	cell->stat_width = 1;
1858	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1859	}	2065	}
…		…
1889	cell->tile [z] = self->face2tile [face];	2095	cell->tile [z] = self->face2tile [face];
1890		2096
1891	if (cell->tile [z])	2097	if (cell->tile [z])
1892	{	2098	{
1893	maptex *tex = self->tex + cell->tile [z];	2099	maptex *tex = self->tex + cell->tile [z];
		2100	tex->unused = 0;
1894	if (!tex->name)	2101	if (!tex->name)
1895	av_push (missing, newSViv (cell->tile [z]));	2102	av_push (missing, newSViv (cell->tile [z]));
1896		2103
1897	if (tex->smoothtile)	2104	if (tex->smoothtile)
1898	{	2105	{
1899	maptex *smooth = self->tex + tex->smoothtile;	2106	maptex *smooth = self->tex + tex->smoothtile;
		2107	smooth->unused = 0;
1900	if (!smooth->name)	2108	if (!smooth->name)
1901	av_push (missing, newSViv (tex->smoothtile));	2109	av_push (missing, newSViv (tex->smoothtile));
1902	}	2110	}
1903	}	2111	}
1904	}	2112	}
…		…
1932	? self->row + y	2140	? self->row + y
1933	: 0;	2141	: 0;
1934		2142
1935	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1936	{	2144	{
1937	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
1938		2146
1939	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
1940	{	2148	{
1941	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
1942		2150
…		…
1944	{	2152	{
1945	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
1946	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
1947	int a1 = tex.a;	2155	int a1 = tex.a;
1948		2156
1949	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
1950	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
1951	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
1952	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
1953	}	2161	}
1954	}	2162	}
1955		2163
1956	*map++ = (r )	2164	*map++ = (r )
1957	\| (g << 8)	2165	\| (g << 8)
…		…
1964	}	2172	}
1965	OUTPUT:	2173	OUTPUT:
1966	RETVAL	2174	RETVAL
1967		2175
1968	void	2176	void
1969	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2177	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1970	CODE:	2178	CODE:
1971	{	2179	{
1972	int x, y, z;	2180	int x, y, z;
1973		2181
1974	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2183	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2184	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977	smooth_key skey;	2185	smooth_key skey;
1978	int pl_x, pl_y;	2186	int pl_x, pl_y;
1979	maptex pl_tex;	2187	maptex pl_tex;
1980	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
		2189	rc_t *rc_ov = rc_alloc ();
1981	rc_key_t key;	2190	rc_key_t key;
1982	rc_array_t *arr;	2191	rc_array_t *arr;
1983		2192
1984	pl_tex.name = 0;	2193	pl_tex.name = 0;
1985		2194
1986	// thats current max. sorry.	2195	// that's current max. sorry.
1987	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
1988	if (sh > 255) sh = 255;	2197	if (sh > 255) sh = 255;
1989		2198
1990	// clear key, in case of extra padding	2199	// clear key, in case of extra padding
1991	memset (&skey, 0, sizeof (skey));	2200	memset (&skey, 0, sizeof (skey));
…		…
1995	key.g = 255;	2204	key.g = 255;
1996	key.b = 255;	2205	key.b = 255;
1997	key.a = 255;	2206	key.a = 255;
1998	key.mode = GL_QUADS;	2207	key.mode = GL_QUADS;
1999	key.format = GL_T2F_V3F;	2208	key.format = GL_T2F_V3F;
2000	key.texname = -1;
2001		2209
2002	mx += self->x;	2210	mx += self->x;
2003	my += self->y;	2211	my += self->y;
2004		2212
2005	// first pass: determine smooth_max	2213	// first pass: determine smooth_max
…		…
2029	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030		2238
2031	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
2032	{	2240	{
2033	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
		2242	key.texname = -1;
2034		2243
2035	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
2036	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
2037	{	2246	{
2038	maprow *row = self->row + (y + my);	2247	maprow *row = self->row + (y + my);
…		…
2044	tileid tile = cell->tile [z];	2253	tileid tile = cell->tile [z];
2045		2254
2046	if (tile)	2255	if (tile)
2047	{	2256	{
2048	maptex tex = self->tex [tile];	2257	maptex tex = self->tex [tile];
2049	int px = (x + 1) * T - tex.w;	2258	int px, py;
2050	int py = (y + 1) * T - tex.h;
2051		2259
2052	if (key.texname != tex.name)	2260	if (key.texname != tex.name)
2053	{	2261	{
		2262	self->tex [tile].unused = 0;
		2263
2054	if (!tex.name)	2264	if (!tex.name)
2055	tex = self->tex [2]; /* missing, replace by noface */	2265	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056		2266
2057	key.texname = tex.name;	2267	key.texname = tex.name;
2058	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
2059	}	2269	}
		2270
		2271	px = (x + 1) * Th - tex.w;
		2272	py = (y + 1) * Tw - tex.h;
2060		2273
2061	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
2062	{	2275	{
2063	pl_x = px;	2276	pl_x = px;
2064	pl_y = py;	2277	pl_y = py;
…		…
2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2282	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2283	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2284	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2285	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073		2286
2074	if (expect_false (cell->flags) && expect_false (z == 2))
2075	{
2076	// overlays such as the speech bubble, probably more to come
2077	if (cell->flags & 1)
2078	{
2079	maptex tex = self->tex [1];
2080	int px = x * T + T * 2 / 32;
2081	int py = y * T - T * 6 / 32;
2082
2083	if (tex.name)
2084	{
2085	if (key.texname != tex.name)
2086	{
2087	key.texname = tex.name;
2088	arr = rc_array (rc, &key);
2089	}
2090
2091	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095	}
2096	}
2097	}
2098
2099	// update smooth hash	2287	// update smooth hash
2100	if (tex.smoothtile)	2288	if (tex.smoothtile)
2101	{	2289	{
2102	skey.tile = tex.smoothtile;	2290	skey.tile = tex.smoothtile;
2103	skey.level = tex.smoothlevel;	2291	skey.level = tex.smoothlevel;
…		…
2131	// corners	2319	// corners
2132	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2320	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2321	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2322	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2323	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2324	}
		2325	}
		2326
		2327	if (expect_false (z == 2) && expect_false (cell->flags))
		2328	{
		2329	// overlays such as the speech bubble, probably more to come
		2330	if (cell->flags & 1)
		2331	{
		2332	rc_key_t key_ov = key;
		2333	maptex tex = self->tex [TEXID_SPEECH];
		2334	rc_array_t *arr;
		2335	int px = x * Tw + Tw * 2 / 32;
		2336	int py = y * Th - Th * 6 / 32;
		2337
		2338	key_ov.texname = tex.name;
		2339	arr = rc_array (rc_ov, &key_ov);
		2340
		2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2342	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2343	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2136	}	2345	}
2137	}	2346	}
2138	}	2347	}
2139	}	2348	}
2140		2349
…		…
2167	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2168	&& skey->level == level	2377	&& skey->level == level
2169	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2170	{	2379	{
2171	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2172	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2173	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2174	int border = bits & 15;	2383	int border = bits & 15;
2175	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2176	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2177	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2178		2387
…		…
2180	{	2389	{
2181	// this time avoiding texture state changes	2390	// this time avoiding texture state changes
2182	// save gobs of state changes.	2391	// save gobs of state changes.
2183	if (key.texname != tex.name)	2392	if (key.texname != tex.name)
2184	{	2393	{
		2394	self->tex [skey->tile].unused = 0;
		2395
2185	glEnd ();	2396	glEnd ();
2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2397	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187	glBegin (GL_QUADS);	2398	glBegin (GL_QUADS);
2188	}	2399	}
2189		2400
2190	if (border)	2401	if (border)
2191	{	2402	{
2192	float ox = border * dx;	2403	float ox = border * dx;
2193		2404
2194	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2195	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2196	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2197	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2198	}	2409	}
2199		2410
2200	if (corner)	2411	if (corner)
2201	{	2412	{
2202	float ox = corner * dx;	2413	float ox = corner * dx;
2203		2414
2204	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2205	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2206	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2207	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2208	}	2419	}
2209	}	2420	}
2210	}	2421	}
2211	}	2422	}
2212	}	2423	}
…		…
2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2446	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236		2447
2237	rc_draw (rc);	2448	rc_draw (rc);
2238	}	2449	}
2239		2450
		2451	rc_draw (rc_ov);
		2452	rc_clear (rc_ov);
		2453
2240	glDisable (GL_BLEND);	2454	glDisable (GL_BLEND);
2241	rc_free (rc);	2455	rc_free (rc);
		2456	rc_free (rc_ov);
2242		2457
2243	// top layer: overlays such as the health bar	2458	// top layer: overlays such as the health bar
2244	for (y = 0; y < sh; y++)	2459	for (y = 0; y < sh; y++)
2245	if (0 <= y + my && y + my < self->rows)	2460	if (0 <= y + my && y + my < self->rows)
2246	{	2461	{
…		…
2249	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2250	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2251	{	2466	{
2252	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2253		2468
2254	int px = x * T;	2469	int px = x * Tw;
2255	int py = y * T;	2470	int py = y * Th;
2256		2471
2257	if (expect_false (cell->player == player))	2472	if (expect_false (cell->player == player))
2258	{	2473	{
2259	px += sdx;	2474	px += sdx;
2260	py += sdy;	2475	py += sdy;
2261	}	2476	}
2262		2477
2263	if (cell->stat_hp)	2478	if (cell->stat_hp)
2264	{	2479	{
2265	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2266	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2267		2482
2268	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2269	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2270	px + width - 1, py);	2485	px + width - 1, py);
2271		2486
…		…
2277	}	2492	}
2278	}	2493	}
2279	}	2494	}
2280		2495
2281	void	2496	void
2282	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2497	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2283	CODE:	2498	CODE:
2284	{	2499	{
2285	static float color[16][3] = {	2500	static float color[16][3] = {
2286	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2287	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2288	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2289	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2290		2505
2291	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2292	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2293	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2294	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2295		2510
2296	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2297	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2298	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2299	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2300		2515
2301	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2302		2517
2303	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2304	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2305	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2306	};	2521	};
2307		2522
2308	int x, y;	2523	int x, y;
2309		2524
2310	glEnable (GL_TEXTURE_2D);	2525	glEnable (GL_TEXTURE_2D);
		2526	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2527	* but the nvidia driver (185.18.14) mishandles alpha textures
		2528	* and takes the colour from god knows where instead of using
		2529	* Cp. MODULATE results in the same colour, but slightly different
		2530	* alpha, but atcually gives us the correct colour with nvidia.
		2531	*/
2311	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2312	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
2313	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2314	glBegin (GL_QUADS);	2535	glBegin (GL_QUADS);
2315		2536
2316	for (y = 0; y < h; y++)	2537	for (y = 0; y < h; y++)
…		…
2320		2541
2321	if (m)	2542	if (m)
2322	{	2543	{
2323	float *c = color [m & 15];	2544	float *c = color [m & 15];
2324		2545
2325	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2326	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2327		2548
2328	glColor4f (c[0], c[1], c[2], 0.75);	2549	glColor4f (c[0], c[1], c[2], 1);
2329	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2330	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2331	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2332	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2333	}	2554	}
…		…
2341	void	2562	void
2342	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2563	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2343	PPCODE:	2564	PPCODE:
2344	{	2565	{
2345	int x, y;	2566	int x, y;
2346	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2347	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2348	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2349	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
2350	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2571	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2351	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2572	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2352	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2573	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2353		2574
2354	SvPOK_only (darkness3_sv);	2575	SvPOK_only (darkness3_sv);
2355	SvCUR_set (darkness3_sv, sw34 * sh3);	2576	SvCUR_set (darkness3_sv, sw3 * sh3);
2356		2577
2357	mx += self->x - 1;	2578	mx += self->x - 1;
2358	my += self->y - 1;	2579	my += self->y - 1;
2359
2360	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2361		2580
2362	for (y = 0; y < sh1; y++)	2581	for (y = 0; y < sh1; y++)
2363	if (0 <= y + my && y + my < self->rows)	2582	if (0 <= y + my && y + my < self->rows)
2364	{	2583	{
2365	maprow *row = self->row + (y + my);	2584	maprow *row = self->row + (y + my);
…		…
2368	if (row->c0 <= x + mx && x + mx < row->c1)	2587	if (row->c0 <= x + mx && x + mx < row->c1)
2369	{	2588	{
2370	mapcell *cell = row->col + (x + mx - row->c0);	2589	mapcell *cell = row->col + (x + mx - row->c0);
2371		2590
2372	darkness1 [y * sw1 + x] = cell->darkness	2591	darkness1 [y * sw1 + x] = cell->darkness
2373	? 255 - (cell->darkness - 1)	2592	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2374	: 255 - FOW_DARKNESS;	2593	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2375	}	2594	}
2376	}	2595	}
2377		2596
2378	for (y = 0; y < sh; ++y)	2597	for (y = 0; y < sh; ++y)
2379	for (x = 0; x < sw; ++x)	2598	for (x = 0; x < sw; ++x)
…		…
2398		2617
2399	uint8_t r13 = (d13 + d23 + d12) / 3;	2618	uint8_t r13 = (d13 + d23 + d12) / 3;
2400	uint8_t r23 = d23;	2619	uint8_t r23 = d23;
2401	uint8_t r33 = (d23 + d33 + d32) / 3;	2620	uint8_t r33 = (d23 + d33 + d32) / 3;
2402		2621
2403	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2622	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2404	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2405	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2406	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2625	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2407	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2626	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2408	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2409	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2628	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2410	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2411	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2412	}	2631	}
2413		2632
2414	free (darkness1);	2633	free (darkness1);
2415		2634
2416	EXTEND (SP, 3);	2635	EXTEND (SP, 3);
2417	PUSHs (sv_2mortal (newSViv (sw34)));	2636	PUSHs (sv_2mortal (newSViv (sw3)));
2418	PUSHs (sv_2mortal (newSViv (sh3)));	2637	PUSHs (sv_2mortal (newSViv (sh3)));
2419	PUSHs (darkness3_sv);	2638	PUSHs (darkness3_sv);
2420	}	2639	}
2421		2640
2422	SV *	2641	SV *
…		…
2620	if (RETVAL < 0)	2839	if (RETVAL < 0)
2621	{	2840	{
2622	RETVAL = Mix_GroupOldest (-1);	2841	RETVAL = Mix_GroupOldest (-1);
2623		2842
2624	if (RETVAL < 0)	2843	if (RETVAL < 0)
		2844	{
		2845	// happens sometimes, maybe it just stopped playing(?)
		2846	RETVAL = Mix_GroupAvailable (-1);
		2847
		2848	if (RETVAL < 0)
2625	XSRETURN_UNDEF;	2849	XSRETURN_UNDEF;
2626		2850	}
		2851	else
2627	Mix_HaltChannel (RETVAL);	2852	Mix_HaltChannel (RETVAL);
2628	}	2853	}
2629		2854
2630	Mix_UnregisterAllEffects (RETVAL);	2855	Mix_UnregisterAllEffects (RETVAL);
2631	Mix_Volume (RETVAL, 128);	2856	Mix_Volume (RETVAL, 128);
2632	}	2857	}
…		…
2679	void	2904	void
2680	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2905	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2681	CODE:	2906	CODE:
2682	{	2907	{
2683	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2908	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2684	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2909	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2685	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2910	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2686	}	2911	}
2687		2912
2688	void	2913	void
2689	set_reverse_stereo (DC::Channel self, int flip)	2914	set_reverse_stereo (DC::Channel self, int flip)
…		…
2691	Mix_SetReverseStereo (self, flip);	2916	Mix_SetReverseStereo (self, flip);
2692		2917
2693	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2918	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2694		2919
2695	PROTOTYPES: DISABLE	2920	PROTOTYPES: DISABLE
		2921
		2922	void
		2923	decoders ()
		2924	PPCODE:
		2925	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2926	int i, num = Mix_GetNumChunkDecoders ();
		2927	EXTEND (SP, num);
		2928	for (i = 0; i < num; ++i)
		2929	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2930	#else
		2931	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2932	#endif
2696		2933
2697	DC::MixChunk	2934	DC::MixChunk
2698	new (SV *class, DC::RW rwops)	2935	new (SV *class, DC::RW rwops)
2699	CODE:	2936	CODE:
2700	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2937	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2733	OUTPUT:	2970	OUTPUT:
2734	RETVAL	2971	RETVAL
2735		2972
2736	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2973	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2737		2974
		2975	void
		2976	decoders ()
		2977	PPCODE:
		2978	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2979	int i, num = Mix_GetNumMusicDecoders ();
		2980	EXTEND (SP, num);
		2981	for (i = 0; i < num; ++i)
		2982	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2983	#else
		2984	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2985	#endif
		2986
2738	int	2987	int
2739	volume (int volume = -1)	2988	volume (int volume = -1)
2740	PROTOTYPE: ;$	2989	PROTOTYPE: ;$
2741	CODE:	2990	CODE:
2742	if (items > 0)	2991	if (items > 0)
…		…
2752		3001
2753	void	3002	void
2754	halt ()	3003	halt ()
2755	CODE:	3004	CODE:
2756	Mix_HaltMusic ();	3005	Mix_HaltMusic ();
		3006
		3007	int
		3008	playing ()
		3009	CODE:
		3010	RETVAL = Mix_PlayingMusic ();
		3011	OUTPUT:
		3012	RETVAL
2757		3013
2758	DC::MixMusic	3014	DC::MixMusic
2759	new (SV *class, DC::RW rwops)	3015	new (SV *class, DC::RW rwops)
2760	CODE:	3016	CODE:
2761	RETVAL = Mix_LoadMUS_RW (rwops);	3017	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2792	} *civ, const_iv[] = {	3048	} *civ, const_iv[] = {
2793	# define const_iv(name) { # name, (IV)name }	3049	# define const_iv(name) { # name, (IV)name }
2794	const_iv (GL_VENDOR),	3050	const_iv (GL_VENDOR),
2795	const_iv (GL_VERSION),	3051	const_iv (GL_VERSION),
2796	const_iv (GL_EXTENSIONS),	3052	const_iv (GL_EXTENSIONS),
		3053	const_iv (GL_MAX_TEXTURE_UNITS),
2797	const_iv (GL_COLOR_MATERIAL),	3054	const_iv (GL_COLOR_MATERIAL),
2798	const_iv (GL_SMOOTH),	3055	const_iv (GL_SMOOTH),
2799	const_iv (GL_FLAT),	3056	const_iv (GL_FLAT),
2800	const_iv (GL_DITHER),	3057	const_iv (GL_DITHER),
2801	const_iv (GL_BLEND),	3058	const_iv (GL_BLEND),
…		…
2813	const_iv (GL_ZERO),	3070	const_iv (GL_ZERO),
2814	const_iv (GL_SRC_ALPHA),	3071	const_iv (GL_SRC_ALPHA),
2815	const_iv (GL_DST_ALPHA),	3072	const_iv (GL_DST_ALPHA),
2816	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3073	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2817	const_iv (GL_ONE_MINUS_DST_ALPHA),	3074	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3075	const_iv (GL_SRC_COLOR),
		3076	const_iv (GL_DST_COLOR),
		3077	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3078	const_iv (GL_ONE_MINUS_DST_COLOR),
2818	const_iv (GL_SRC_ALPHA_SATURATE),	3079	const_iv (GL_SRC_ALPHA_SATURATE),
2819	const_iv (GL_RGB),	3080	const_iv (GL_RGB),
2820	const_iv (GL_RGBA),	3081	const_iv (GL_RGBA),
2821	const_iv (GL_RGBA4),	3082	const_iv (GL_RGBA4),
2822	const_iv (GL_RGBA8),	3083	const_iv (GL_RGBA8),
…		…
2890	const_iv (GL_NICEST),	3151	const_iv (GL_NICEST),
2891	const_iv (GL_V2F),	3152	const_iv (GL_V2F),
2892	const_iv (GL_V3F),	3153	const_iv (GL_V3F),
2893	const_iv (GL_T2F_V3F),	3154	const_iv (GL_T2F_V3F),
2894	const_iv (GL_T2F_N3F_V3F),	3155	const_iv (GL_T2F_N3F_V3F),
		3156	const_iv (GL_FUNC_ADD),
		3157	const_iv (GL_FUNC_SUBTRACT),
		3158	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2895	# undef const_iv	3159	# undef const_iv
2896	};	3160	};
2897		3161
2898	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3162	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2899	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3163	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2906	disable_GL_EXT_blend_func_separate ()	3170	disable_GL_EXT_blend_func_separate ()
2907	CODE:	3171	CODE:
2908	gl.BlendFuncSeparate = 0;	3172	gl.BlendFuncSeparate = 0;
2909	gl.BlendFuncSeparateEXT = 0;	3173	gl.BlendFuncSeparateEXT = 0;
2910		3174
		3175	void
		3176	apple_nvidia_bug (int enable)
		3177
2911	char *	3178	char *
2912	gl_vendor ()	3179	gl_vendor ()
2913	CODE:	3180	CODE:
2914	RETVAL = (char *)glGetString (GL_VENDOR);	3181	RETVAL = (char *)glGetString (GL_VENDOR);
2915	OUTPUT:	3182	OUTPUT:
…		…
2945		3212
2946	int glGetError ()	3213	int glGetError ()
2947		3214
2948	void glFinish ()	3215	void glFinish ()
2949		3216
		3217	void glFlush ()
		3218
2950	void glClear (int mask)	3219	void glClear (int mask)
2951		3220
2952	void glClearColor (float r, float g, float b, float a = 1.0)	3221	void glClearColor (float r, float g, float b, float a = 1.0)
2953	PROTOTYPE: @	3222	PROTOTYPE: @
2954		3223
…		…
2963	void glBlendFunc (int sfactor, int dfactor)	3232	void glBlendFunc (int sfactor, int dfactor)
2964		3233
2965	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3234	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2966	CODE:	3235	CODE:
2967	gl_BlendFuncSeparate (sa, da, saa, daa);	3236	gl_BlendFuncSeparate (sa, da, saa, daa);
		3237
		3238	# void glBlendEquation (int se)
2968		3239
2969	void glDepthMask (int flag)	3240	void glDepthMask (int flag)
2970		3241
2971	void glLogicOp (int opcode)	3242	void glLogicOp (int opcode)
2972		3243
…		…
3122	void glNewList (int list, int mode = GL_COMPILE)	3393	void glNewList (int list, int mode = GL_COMPILE)
3123		3394
3124	void glEndList ()	3395	void glEndList ()
3125		3396
3126	void glCallList (int list)	3397	void glCallList (int list)
		3398
		3399	void c_init ()
		3400	CODE:
		3401	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3402	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3127		3403
3128	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3404	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3129		3405
3130	PROTOTYPES: DISABLE	3406	PROTOTYPES: DISABLE
3131		3407

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC vs. Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.279 by root, Thu Oct 2 15:59:40 2008 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC