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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 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	{
…		…
233	int w, h;	259	int w, h;
234	float s, t;	260	float s, t;
235	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
236	tileid smoothtile;	262	tileid smoothtile;
237	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
238	} maptex;	265	} maptex;
239		266
240	typedef struct {	267	typedef struct {
241	uint32_t player;	268	uint32_t player;
242	tileid tile[3];	269	tileid tile[3];
…		…
455		482
456	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
457	}	484	}
458		485
459	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
460	minpot (unsigned int n)	493	minpot (unsigned int n)
461	{	494	{
462	if (!n)	495	if (!n)
463	return 0;	496	return 0;
464		497
…		…
528	if (!svp \|\| !SvTRUE (*svp))	561	if (!svp \|\| !SvTRUE (*svp))
529	return 0;	562	return 0;
530		563
531	return 1;	564	return 1;
532	}	565	}
		566
		567	/******************************************************************************/
533		568
534	/* process keyboard modifiers */	569	/* process keyboard modifiers */
535	static int	570	static int
536	mod_munge (int mod)	571	mod_munge (int mod)
537	{	572	{
…		…
786		821
787	const_iv (FOW_DARKNESS)	822	const_iv (FOW_DARKNESS)
788	# undef const_iv	823	# undef const_iv
789	};	824	};
790		825
791	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--)
792	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
793		828
794	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
795	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
796	}	831	}
797		832
…		…
813	NV ceil (NV x)	848	NV ceil (NV x)
814		849
815	IV minpot (UV n)	850	IV minpot (UV n)
816		851
817	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
818		859
819	void	860	void
820	pango_init ()	861	pango_init ()
821	CODE:	862	CODE:
822	{	863	{
…		…
914		955
915	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
916	#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);
917	#include "glfunc.h"	958	#include "glfunc.h"
918	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
919	}	963	}
920	}	964	}
921	OUTPUT:	965	OUTPUT:
922	RETVAL	966	RETVAL
923		967
…		…
1008		1052
1009	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))));
1010	}	1054	}
1011	}	1055	}
1012		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
1013	int	1070	int
1014	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)
1015	POSTCALL:	1072	POSTCALL:
1016	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1017	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1079	add_font (char *file)	1136	add_font (char *file)
1080	CODE:	1137	CODE:
1081	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1082	OUTPUT:	1139	OUTPUT:
1083	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1084		1144
1085	void	1145	void
1086	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
1087	ALIAS:	1147	ALIAS:
1088	load_image_file = 1	1148	load_image_file = 1
…		…
1204	#if DEBUG	1264	#if DEBUG
1205	VALGRIND_DO_LEAK_CHECK;	1265	VALGRIND_DO_LEAK_CHECK;
1206	#endif	1266	#endif
1207	}	1267	}
1208		1268
		1269	int
		1270	SvREFCNT (SV *sv)
		1271	CODE:
		1272	RETVAL = SvREFCNT (sv);
		1273	OUTPUT:
		1274	RETVAL
		1275
1209	MODULE = Deliantra::Client PACKAGE = DC::Font	1276	MODULE = Deliantra::Client PACKAGE = DC::Font
1210		1277
1211	PROTOTYPES: DISABLE	1278	PROTOTYPES: DISABLE
1212		1279
1213	DC::Font	1280	DC::Font
…		…
1642	if (ix)	1709	if (ix)
1643	{	1710	{
1644	glDisable (GL_ALPHA_TEST);	1711	glDisable (GL_ALPHA_TEST);
1645	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1646	}	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);
1647	}	1835	}
1648		1836
1649	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)
1650	CODE:	1838	CODE:
1651	{	1839	{
…		…
1757	//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);
1758	// use uglier nearest interpolation because linear suffers	1946	// use uglier nearest interpolation because linear suffers
1759	// from transparent color bleeding and ugly wrapping effects.	1947	// from transparent color bleeding and ugly wrapping effects.
1760	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1948	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1761	}	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	}
1762		1970
1763	int	1971	int
1764	ox (DC::Map self)	1972	ox (DC::Map self)
1765	ALIAS:	1973	ALIAS:
1766	oy = 1	1974	oy = 1
…		…
1847	{	2055	{
1848	ext = *data++;	2056	ext = *data++;
1849	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1850		2058
1851	if (cmd < 4)	2059	if (cmd < 4)
1852	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1853	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1854	{	2062	{
1855	cell->stat_width = 1;	2063	cell->stat_width = 1;
1856	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1857	}	2065	}
…		…
1887	cell->tile [z] = self->face2tile [face];	2095	cell->tile [z] = self->face2tile [face];
1888		2096
1889	if (cell->tile [z])	2097	if (cell->tile [z])
1890	{	2098	{
1891	maptex *tex = self->tex + cell->tile [z];	2099	maptex *tex = self->tex + cell->tile [z];
		2100	tex->unused = 0;
1892	if (!tex->name)	2101	if (!tex->name)
1893	av_push (missing, newSViv (cell->tile [z]));	2102	av_push (missing, newSViv (cell->tile [z]));
1894		2103
1895	if (tex->smoothtile)	2104	if (tex->smoothtile)
1896	{	2105	{
1897	maptex *smooth = self->tex + tex->smoothtile;	2106	maptex *smooth = self->tex + tex->smoothtile;
		2107	smooth->unused = 0;
1898	if (!smooth->name)	2108	if (!smooth->name)
1899	av_push (missing, newSViv (tex->smoothtile));	2109	av_push (missing, newSViv (tex->smoothtile));
1900	}	2110	}
1901	}	2111	}
1902	}	2112	}
…		…
1930	? self->row + y	2140	? self->row + y
1931	: 0;	2141	: 0;
1932		2142
1933	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1934	{	2144	{
1935	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
1936		2146
1937	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
1938	{	2148	{
1939	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
1940		2150
…		…
1942	{	2152	{
1943	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
1944	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
1945	int a1 = tex.a;	2155	int a1 = tex.a;
1946		2156
1947	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
1948	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
1949	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
1950	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
1951	}	2161	}
1952	}	2162	}
1953		2163
1954	*map++ = (r )	2164	*map++ = (r )
1955	\| (g << 8)	2165	\| (g << 8)
…		…
1962	}	2172	}
1963	OUTPUT:	2173	OUTPUT:
1964	RETVAL	2174	RETVAL
1965		2175
1966	void	2176	void
1967	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	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)
1968	CODE:	2178	CODE:
1969	{	2179	{
1970	int x, y, z;	2180	int x, y, z;
1971		2181
1972	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1973	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
1974	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)
1975	smooth_key skey;	2185	smooth_key skey;
1976	int pl_x, pl_y;	2186	int pl_x, pl_y;
1977	maptex pl_tex;	2187	maptex pl_tex;
1978	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
		2189	rc_t *rc_ov = rc_alloc ();
1979	rc_key_t key;	2190	rc_key_t key;
1980	rc_array_t *arr;	2191	rc_array_t *arr;
1981		2192
1982	pl_tex.name = 0;	2193	pl_tex.name = 0;
1983		2194
1984	// thats current max. sorry.	2195	// that's current max. sorry.
1985	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
1986	if (sh > 255) sh = 255;	2197	if (sh > 255) sh = 255;
1987		2198
1988	// clear key, in case of extra padding	2199	// clear key, in case of extra padding
1989	memset (&skey, 0, sizeof (skey));	2200	memset (&skey, 0, sizeof (skey));
…		…
1993	key.g = 255;	2204	key.g = 255;
1994	key.b = 255;	2205	key.b = 255;
1995	key.a = 255;	2206	key.a = 255;
1996	key.mode = GL_QUADS;	2207	key.mode = GL_QUADS;
1997	key.format = GL_T2F_V3F;	2208	key.format = GL_T2F_V3F;
1998	key.texname = -1;
1999		2209
2000	mx += self->x;	2210	mx += self->x;
2001	my += self->y;	2211	my += self->y;
2002		2212
2003	// first pass: determine smooth_max	2213	// first pass: determine smooth_max
…		…
2027	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2028		2238
2029	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
2030	{	2240	{
2031	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
		2242	key.texname = -1;
2032		2243
2033	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
2034	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
2035	{	2246	{
2036	maprow *row = self->row + (y + my);	2247	maprow *row = self->row + (y + my);
…		…
2042	tileid tile = cell->tile [z];	2253	tileid tile = cell->tile [z];
2043		2254
2044	if (tile)	2255	if (tile)
2045	{	2256	{
2046	maptex tex = self->tex [tile];	2257	maptex tex = self->tex [tile];
2047	int px = (x + 1) * T - tex.w;	2258	int px, py;
2048	int py = (y + 1) * T - tex.h;
2049		2259
2050	if (key.texname != tex.name)	2260	if (key.texname != tex.name)
2051	{	2261	{
		2262	self->tex [tile].unused = 0;
		2263
2052	if (!tex.name)	2264	if (!tex.name)
2053	tex = self->tex [2]; /* missing, replace by noface */	2265	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2054		2266
2055	key.texname = tex.name;	2267	key.texname = tex.name;
2056	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
2057	}	2269	}
		2270
		2271	px = (x + 1) * Th - tex.w;
		2272	py = (y + 1) * Tw - tex.h;
2058		2273
2059	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
2060	{	2275	{
2061	pl_x = px;	2276	pl_x = px;
2062	pl_y = py;	2277	pl_y = py;
…		…
2067	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2282	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2068	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);
2069	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);
2070	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);
2071		2286
2072	if (expect_false (cell->flags) && expect_false (z == 2))
2073	{
2074	// overlays such as the speech bubble, probably more to come
2075	if (cell->flags & 1)
2076	{
2077	maptex tex = self->tex [1];
2078	int px = x * T + T * 2 / 32;
2079	int py = y * T - T * 6 / 32;
2080
2081	if (tex.name)
2082	{
2083	if (key.texname != tex.name)
2084	{
2085	key.texname = tex.name;
2086	arr = rc_array (rc, &key);
2087	}
2088
2089	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2090	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2091	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2092	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2093	}
2094	}
2095	}
2096
2097	// update smooth hash	2287	// update smooth hash
2098	if (tex.smoothtile)	2288	if (tex.smoothtile)
2099	{	2289	{
2100	skey.tile = tex.smoothtile;	2290	skey.tile = tex.smoothtile;
2101	skey.level = tex.smoothlevel;	2291	skey.level = tex.smoothlevel;
…		…
2129	// corners	2319	// corners
2130	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);
2131	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);
2132	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);
2133	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);
2134	}	2345	}
2135	}	2346	}
2136	}	2347	}
2137	}	2348	}
2138		2349
…		…
2165	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2166	&& skey->level == level	2377	&& skey->level == level
2167	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2168	{	2379	{
2169	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2170	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2171	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2172	int border = bits & 15;	2383	int border = bits & 15;
2173	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2174	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2175	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2176		2387
…		…
2178	{	2389	{
2179	// this time avoiding texture state changes	2390	// this time avoiding texture state changes
2180	// save gobs of state changes.	2391	// save gobs of state changes.
2181	if (key.texname != tex.name)	2392	if (key.texname != tex.name)
2182	{	2393	{
		2394	self->tex [skey->tile].unused = 0;
		2395
2183	glEnd ();	2396	glEnd ();
2184	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2397	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2185	glBegin (GL_QUADS);	2398	glBegin (GL_QUADS);
2186	}	2399	}
2187		2400
2188	if (border)	2401	if (border)
2189	{	2402	{
2190	float ox = border * dx;	2403	float ox = border * dx;
2191		2404
2192	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2193	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2194	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2195	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2196	}	2409	}
2197		2410
2198	if (corner)	2411	if (corner)
2199	{	2412	{
2200	float ox = corner * dx;	2413	float ox = corner * dx;
2201		2414
2202	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2203	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2204	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2205	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2206	}	2419	}
2207	}	2420	}
2208	}	2421	}
2209	}	2422	}
2210	}	2423	}
…		…
2233	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);
2234		2447
2235	rc_draw (rc);	2448	rc_draw (rc);
2236	}	2449	}
2237		2450
		2451	rc_draw (rc_ov);
		2452	rc_clear (rc_ov);
		2453
2238	glDisable (GL_BLEND);	2454	glDisable (GL_BLEND);
2239	rc_free (rc);	2455	rc_free (rc);
		2456	rc_free (rc_ov);
2240		2457
2241	// top layer: overlays such as the health bar	2458	// top layer: overlays such as the health bar
2242	for (y = 0; y < sh; y++)	2459	for (y = 0; y < sh; y++)
2243	if (0 <= y + my && y + my < self->rows)	2460	if (0 <= y + my && y + my < self->rows)
2244	{	2461	{
…		…
2247	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2248	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2249	{	2466	{
2250	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2251		2468
2252	int px = x * T;	2469	int px = x * Tw;
2253	int py = y * T;	2470	int py = y * Th;
		2471
		2472	if (expect_false (cell->player == player))
		2473	{
		2474	px += sdx;
		2475	py += sdy;
		2476	}
2254		2477
2255	if (cell->stat_hp)	2478	if (cell->stat_hp)
2256	{	2479	{
2257	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2258	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2259		2482
2260	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2261	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2262	px + width - 1, py);	2485	px + width - 1, py);
2263		2486
…		…
2269	}	2492	}
2270	}	2493	}
2271	}	2494	}
2272		2495
2273	void	2496	void
2274	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)
2275	CODE:	2498	CODE:
2276	{	2499	{
2277	static float color[16][3] = {	2500	static float color[16][3] = {
2278	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2279	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2280	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2281	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2282		2505
2283	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2284	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2285	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2286	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2287		2510
2288	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2289	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2290	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2291	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2292		2515
2293	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2294		2517
2295	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2296	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2297	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2298	};	2521	};
2299		2522
2300	int x, y;	2523	int x, y;
2301		2524
2302	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	*/
2303	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2304	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
2305	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2306	glBegin (GL_QUADS);	2535	glBegin (GL_QUADS);
2307		2536
2308	for (y = 0; y < h; y++)	2537	for (y = 0; y < h; y++)
…		…
2312		2541
2313	if (m)	2542	if (m)
2314	{	2543	{
2315	float *c = color [m & 15];	2544	float *c = color [m & 15];
2316		2545
2317	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2318	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2319		2548
2320	glColor4f (c[0], c[1], c[2], 0.75);	2549	glColor4f (c[0], c[1], c[2], 1);
2321	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2322	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2323	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2324	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2325	}	2554	}
…		…
2333	void	2562	void
2334	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)
2335	PPCODE:	2564	PPCODE:
2336	{	2565	{
2337	int x, y;	2566	int x, y;
2338	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2339	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2340	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2341	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
		2571	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2572	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2342	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2573	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2343	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2574	memset (darkness1, 0, sw1*sh1);
2344	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2345		2575
2346	SvPOK_only (darkness3_sv);	2576	SvPOK_only (darkness3_sv);
2347	SvCUR_set (darkness3_sv, sw34 * sh3);	2577	SvCUR_set (darkness3_sv, sw3 * sh3);
2348		2578
2349	mx += self->x - 1;	2579	mx += self->x - 1;
2350	my += self->y - 1;	2580	my += self->y - 1;
2351
2352	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2353		2581
2354	for (y = 0; y < sh1; y++)	2582	for (y = 0; y < sh1; y++)
2355	if (0 <= y + my && y + my < self->rows)	2583	if (0 <= y + my && y + my < self->rows)
2356	{	2584	{
2357	maprow *row = self->row + (y + my);	2585	maprow *row = self->row + (y + my);
…		…
2360	if (row->c0 <= x + mx && x + mx < row->c1)	2588	if (row->c0 <= x + mx && x + mx < row->c1)
2361	{	2589	{
2362	mapcell *cell = row->col + (x + mx - row->c0);	2590	mapcell *cell = row->col + (x + mx - row->c0);
2363		2591
2364	darkness1 [y * sw1 + x] = cell->darkness	2592	darkness1 [y * sw1 + x] = cell->darkness
2365	? 255 - (cell->darkness - 1)	2593	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2366	: 255 - FOW_DARKNESS;	2594	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2367	}	2595	}
2368	}	2596	}
2369		2597
2370	for (y = 0; y < sh; ++y)	2598	for (y = 0; y < sh; ++y)
2371	for (x = 0; x < sw; ++x)	2599	for (x = 0; x < sw; ++x)
…		…
2390		2618
2391	uint8_t r13 = (d13 + d23 + d12) / 3;	2619	uint8_t r13 = (d13 + d23 + d12) / 3;
2392	uint8_t r23 = d23;	2620	uint8_t r23 = d23;
2393	uint8_t r33 = (d23 + d33 + d32) / 3;	2621	uint8_t r33 = (d23 + d33 + d32) / 3;
2394		2622
2395	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2396	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2397	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2625	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2398	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2626	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2399	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2400	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2628	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2401	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2402	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2403	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2631	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2404	}	2632	}
2405		2633
2406	free (darkness1);	2634	free (darkness1);
2407		2635
2408	EXTEND (SP, 3);	2636	EXTEND (SP, 3);
2409	PUSHs (sv_2mortal (newSViv (sw34)));	2637	PUSHs (sv_2mortal (newSViv (sw3)));
2410	PUSHs (sv_2mortal (newSViv (sh3)));	2638	PUSHs (sv_2mortal (newSViv (sh3)));
2411	PUSHs (darkness3_sv);	2639	PUSHs (darkness3_sv);
2412	}	2640	}
2413		2641
2414	SV *	2642	SV *
…		…
2612	if (RETVAL < 0)	2840	if (RETVAL < 0)
2613	{	2841	{
2614	RETVAL = Mix_GroupOldest (-1);	2842	RETVAL = Mix_GroupOldest (-1);
2615		2843
2616	if (RETVAL < 0)	2844	if (RETVAL < 0)
		2845	{
		2846	// happens sometimes, maybe it just stopped playing(?)
		2847	RETVAL = Mix_GroupAvailable (-1);
		2848
		2849	if (RETVAL < 0)
2617	XSRETURN_UNDEF;	2850	XSRETURN_UNDEF;
2618		2851	}
		2852	else
2619	Mix_HaltChannel (RETVAL);	2853	Mix_HaltChannel (RETVAL);
2620	}	2854	}
2621		2855
2622	Mix_UnregisterAllEffects (RETVAL);	2856	Mix_UnregisterAllEffects (RETVAL);
2623	Mix_Volume (RETVAL, 128);	2857	Mix_Volume (RETVAL, 128);
2624	}	2858	}
…		…
2671	void	2905	void
2672	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2906	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2673	CODE:	2907	CODE:
2674	{	2908	{
2675	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2909	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2676	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2910	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2677	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2911	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2678	}	2912	}
2679		2913
2680	void	2914	void
2681	set_reverse_stereo (DC::Channel self, int flip)	2915	set_reverse_stereo (DC::Channel self, int flip)
…		…
2683	Mix_SetReverseStereo (self, flip);	2917	Mix_SetReverseStereo (self, flip);
2684		2918
2685	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2919	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2686		2920
2687	PROTOTYPES: DISABLE	2921	PROTOTYPES: DISABLE
		2922
		2923	void
		2924	decoders ()
		2925	PPCODE:
		2926	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2927	int i, num = Mix_GetNumChunkDecoders ();
		2928	EXTEND (SP, num);
		2929	for (i = 0; i < num; ++i)
		2930	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2931	#else
		2932	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2933	#endif
2688		2934
2689	DC::MixChunk	2935	DC::MixChunk
2690	new (SV *class, DC::RW rwops)	2936	new (SV *class, DC::RW rwops)
2691	CODE:	2937	CODE:
2692	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2938	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2725	OUTPUT:	2971	OUTPUT:
2726	RETVAL	2972	RETVAL
2727		2973
2728	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2974	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2729		2975
		2976	void
		2977	decoders ()
		2978	PPCODE:
		2979	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2980	int i, num = Mix_GetNumMusicDecoders ();
		2981	EXTEND (SP, num);
		2982	for (i = 0; i < num; ++i)
		2983	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2984	#else
		2985	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2986	#endif
		2987
2730	int	2988	int
2731	volume (int volume = -1)	2989	volume (int volume = -1)
2732	PROTOTYPE: ;$	2990	PROTOTYPE: ;$
2733	CODE:	2991	CODE:
2734	if (items > 0)	2992	if (items > 0)
…		…
2744		3002
2745	void	3003	void
2746	halt ()	3004	halt ()
2747	CODE:	3005	CODE:
2748	Mix_HaltMusic ();	3006	Mix_HaltMusic ();
		3007
		3008	int
		3009	playing ()
		3010	CODE:
		3011	RETVAL = Mix_PlayingMusic ();
		3012	OUTPUT:
		3013	RETVAL
2749		3014
2750	DC::MixMusic	3015	DC::MixMusic
2751	new (SV *class, DC::RW rwops)	3016	new (SV *class, DC::RW rwops)
2752	CODE:	3017	CODE:
2753	RETVAL = Mix_LoadMUS_RW (rwops);	3018	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2784	} *civ, const_iv[] = {	3049	} *civ, const_iv[] = {
2785	# define const_iv(name) { # name, (IV)name }	3050	# define const_iv(name) { # name, (IV)name }
2786	const_iv (GL_VENDOR),	3051	const_iv (GL_VENDOR),
2787	const_iv (GL_VERSION),	3052	const_iv (GL_VERSION),
2788	const_iv (GL_EXTENSIONS),	3053	const_iv (GL_EXTENSIONS),
		3054	const_iv (GL_MAX_TEXTURE_UNITS),
2789	const_iv (GL_COLOR_MATERIAL),	3055	const_iv (GL_COLOR_MATERIAL),
2790	const_iv (GL_SMOOTH),	3056	const_iv (GL_SMOOTH),
2791	const_iv (GL_FLAT),	3057	const_iv (GL_FLAT),
2792	const_iv (GL_DITHER),	3058	const_iv (GL_DITHER),
2793	const_iv (GL_BLEND),	3059	const_iv (GL_BLEND),
…		…
2805	const_iv (GL_ZERO),	3071	const_iv (GL_ZERO),
2806	const_iv (GL_SRC_ALPHA),	3072	const_iv (GL_SRC_ALPHA),
2807	const_iv (GL_DST_ALPHA),	3073	const_iv (GL_DST_ALPHA),
2808	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3074	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2809	const_iv (GL_ONE_MINUS_DST_ALPHA),	3075	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3076	const_iv (GL_SRC_COLOR),
		3077	const_iv (GL_DST_COLOR),
		3078	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3079	const_iv (GL_ONE_MINUS_DST_COLOR),
2810	const_iv (GL_SRC_ALPHA_SATURATE),	3080	const_iv (GL_SRC_ALPHA_SATURATE),
2811	const_iv (GL_RGB),	3081	const_iv (GL_RGB),
2812	const_iv (GL_RGBA),	3082	const_iv (GL_RGBA),
2813	const_iv (GL_RGBA4),	3083	const_iv (GL_RGBA4),
2814	const_iv (GL_RGBA8),	3084	const_iv (GL_RGBA8),
…		…
2882	const_iv (GL_NICEST),	3152	const_iv (GL_NICEST),
2883	const_iv (GL_V2F),	3153	const_iv (GL_V2F),
2884	const_iv (GL_V3F),	3154	const_iv (GL_V3F),
2885	const_iv (GL_T2F_V3F),	3155	const_iv (GL_T2F_V3F),
2886	const_iv (GL_T2F_N3F_V3F),	3156	const_iv (GL_T2F_N3F_V3F),
		3157	const_iv (GL_FUNC_ADD),
		3158	const_iv (GL_FUNC_SUBTRACT),
		3159	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2887	# undef const_iv	3160	# undef const_iv
2888	};	3161	};
2889		3162
2890	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3163	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2891	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3164	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2892		3165
2893	texture_av = newAV ();	3166	texture_av = newAV ();
2894	AvREAL_off (texture_av);	3167	AvREAL_off (texture_av);
2895	}	3168	}
2896		3169
2897	void	3170	void
2898	disable_GL_EXT_blend_func_separate ()	3171	disable_GL_EXT_blend_func_separate ()
2899	CODE:	3172	CODE:
2900	gl.BlendFuncSeparate = 0;	3173	gl.BlendFuncSeparate = 0;
2901	gl.BlendFuncSeparateEXT = 0;	3174	gl.BlendFuncSeparateEXT = 0;
		3175
		3176	void
		3177	apple_nvidia_bug (int enable)
2902		3178
2903	char *	3179	char *
2904	gl_vendor ()	3180	gl_vendor ()
2905	CODE:	3181	CODE:
2906	RETVAL = (char *)glGetString (GL_VENDOR);	3182	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2937		3213
2938	int glGetError ()	3214	int glGetError ()
2939		3215
2940	void glFinish ()	3216	void glFinish ()
2941		3217
		3218	void glFlush ()
		3219
2942	void glClear (int mask)	3220	void glClear (int mask)
2943		3221
2944	void glClearColor (float r, float g, float b, float a = 1.0)	3222	void glClearColor (float r, float g, float b, float a = 1.0)
2945	PROTOTYPE: @	3223	PROTOTYPE: @
2946		3224
…		…
2955	void glBlendFunc (int sfactor, int dfactor)	3233	void glBlendFunc (int sfactor, int dfactor)
2956		3234
2957	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3235	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2958	CODE:	3236	CODE:
2959	gl_BlendFuncSeparate (sa, da, saa, daa);	3237	gl_BlendFuncSeparate (sa, da, saa, daa);
		3238
		3239	# void glBlendEquation (int se)
2960		3240
2961	void glDepthMask (int flag)	3241	void glDepthMask (int flag)
2962		3242
2963	void glLogicOp (int opcode)	3243	void glLogicOp (int opcode)
2964		3244
…		…
2999	void glRotate (float angle, float x, float y, float z)	3279	void glRotate (float angle, float x, float y, float z)
3000	CODE:	3280	CODE:
3001	glRotatef (angle, x, y, z);	3281	glRotatef (angle, x, y, z);
3002		3282
3003	void glColor (float r, float g, float b, float a = 1.0)	3283	void glColor (float r, float g, float b, float a = 1.0)
		3284	PROTOTYPE: @
3004	ALIAS:	3285	ALIAS:
3005	glColor_premultiply = 1	3286	glColor_premultiply = 1
3006	CODE:	3287	CODE:
3007	if (ix)	3288	if (ix)
3008	{	3289	{
…		…
3113	void glNewList (int list, int mode = GL_COMPILE)	3394	void glNewList (int list, int mode = GL_COMPILE)
3114		3395
3115	void glEndList ()	3396	void glEndList ()
3116		3397
3117	void glCallList (int list)	3398	void glCallList (int list)
		3399
		3400	void c_init ()
		3401	CODE:
		3402	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3403	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3118		3404
3119	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3405	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3120		3406
3121	PROTOTYPES: DISABLE	3407	PROTOTYPES: DISABLE
3122		3408

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs. Revision 1.308 by root, Fri Jul 29 08:35:35 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.308 by root, Fri Jul 29 08:35:35 2011 UTC