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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 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)
		99
		100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
95		104
96	static AV *texture_av;	105	static AV *texture_av;
97		106
98	static struct	107	static struct
99	{	108	{
…		…
231	int w, h;	240	int w, h;
232	float s, t;	241	float s, t;
233	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
234	tileid smoothtile;	243	tileid smoothtile;
235	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
236	} maptex;	246	} maptex;
237		247
238	typedef struct {	248	typedef struct {
239	uint32_t player;	249	uint32_t player;
240	tileid tile[3];	250	tileid tile[3];
…		…
525	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);	535	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526	if (!svp \|\| !SvTRUE (*svp))	536	if (!svp \|\| !SvTRUE (*svp))
527	return 0;	537	return 0;
528		538
529	return 1;	539	return 1;
		540	}
		541
		542	/******************************************************************************/
		543
		544	/* process keyboard modifiers */
		545	static int
		546	mod_munge (int mod)
		547	{
		548	mod &= MOD_MASK;
		549
		550	if (mod & (KMOD_META \| KMOD_ALT))
		551	mod \|= KMOD_LRAM;
		552
		553	return mod;
530	}	554	}
531		555
532	static void	556	static void
533	deliantra_main ()	557	deliantra_main ()
534	{	558	{
…		…
737	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
738	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
739	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
740	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
741		765
		766	const_iv (KMOD_LRAM),
		767
742	const_iv (MIX_DEFAULT_FORMAT),	768	const_iv (MIX_DEFAULT_FORMAT),
743		769
744	const_iv (SDL_INIT_TIMER),	770	const_iv (SDL_INIT_TIMER),
745	const_iv (SDL_INIT_AUDIO),	771	const_iv (SDL_INIT_AUDIO),
746	const_iv (SDL_INIT_VIDEO),	772	const_iv (SDL_INIT_VIDEO),
…		…
798		824
799	IV minpot (UV n)	825	IV minpot (UV n)
800		826
801	IV popcount (UV n)	827	IV popcount (UV n)
802		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
803	void	835	void
804	pango_init ()	836	pango_init ()
805	CODE:	837	CODE:
806	{	838	{
807	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
…		…
898		930
899	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901	#include "glfunc.h"	933	#include "glfunc.h"
902	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903	}	938	}
904	}	939	}
905	OUTPUT:	940	OUTPUT:
906	RETVAL	941	RETVAL
907		942
…		…
933	{	968	{
934	case SDL_KEYDOWN:	969	case SDL_KEYDOWN:
935	case SDL_KEYUP:	970	case SDL_KEYUP:
936	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	971	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	972	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	973	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	974	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	975	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941	break;	976	break;
942		977
943	case SDL_ACTIVEEVENT:	978	case SDL_ACTIVEEVENT:
944	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	979	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
962	x = ev.motion.x;	997	x = ev.motion.x;
963	y = ev.motion.y;	998	y = ev.motion.y;
964	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	999	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965	}	1000	}
966		1001
967	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1002	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968	hv_store (hv, "state", 5, newSViv (state), 0);	1003	hv_store (hv, "state", 5, newSViv (state), 0);
969	hv_store (hv, "x", 1, newSViv (x), 0);	1004	hv_store (hv, "x", 1, newSViv (x), 0);
970	hv_store (hv, "y", 1, newSViv (y), 0);	1005	hv_store (hv, "y", 1, newSViv (y), 0);
971	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1006	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1007	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
991	}	1026	}
992		1027
993	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994	}	1029	}
995	}	1030	}
		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
996		1044
997	int	1045	int
998	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999	POSTCALL:	1047	POSTCALL:
1000	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
…		…
1188	#if DEBUG	1236	#if DEBUG
1189	VALGRIND_DO_LEAK_CHECK;	1237	VALGRIND_DO_LEAK_CHECK;
1190	#endif	1238	#endif
1191	}	1239	}
1192		1240
		1241	int
		1242	SvREFCNT (SV *sv)
		1243	CODE:
		1244	RETVAL = SvREFCNT (sv);
		1245	OUTPUT:
		1246	RETVAL
		1247
1193	MODULE = Deliantra::Client PACKAGE = DC::Font	1248	MODULE = Deliantra::Client PACKAGE = DC::Font
1194		1249
1195	PROTOTYPES: DISABLE	1250	PROTOTYPES: DISABLE
1196		1251
1197	DC::Font	1252	DC::Font
…		…
1626	if (ix)	1681	if (ix)
1627	{	1682	{
1628	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1629	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1630	}	1685	}
		1686	}
		1687
		1688	void
		1689	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)
		1690	PROTOTYPE: @
		1691	CODE:
		1692	{
		1693	glEnable (GL_BLEND);
		1694	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1695	glEnable (GL_TEXTURE_2D);
		1696	glBindTexture (GL_TEXTURE_2D, name1);
		1697
		1698	glColor3f (intensity, intensity, intensity);
		1699	glPushMatrix ();
		1700	glScalef (1./3, 1./3, 1.);
		1701
		1702	if (blend > 0.f)
		1703	{
		1704	float dx3 = dx * -3.f / w;
		1705	float dy3 = dy * -3.f / h;
		1706	GLfloat env_color[4] = { 0., 0., 0., blend };
		1707
		1708	/* interpolate the two shadow textures */
		1709	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1711
		1712	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1713	gl.ActiveTexture (GL_TEXTURE1);
		1714	glEnable (GL_TEXTURE_2D);
		1715	glBindTexture (GL_TEXTURE_2D, name2);
		1716	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1717
		1718	/* rgb == rgb(glcolor) */
		1719	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1722
		1723	/* alpha = interpolate t0, t1 by env_alpha */
		1724	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1725
		1726	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1727	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1728	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1729
		1730	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1732
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1735
		1736	glBegin (GL_QUADS);
		1737	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1738	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1739	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1740	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1741	glEnd ();
		1742
		1743	glDisable (GL_TEXTURE_2D);
		1744	gl.ActiveTexture (GL_TEXTURE0);
		1745	}
		1746	else
		1747	{
		1748	/* simple blending of one texture, also opengl <1.3 path */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	glBegin (GL_QUADS);
		1752	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1753	glTexCoord2f (0, t); glVertex2f (0, h);
		1754	glTexCoord2f (s, t); glVertex2f (w, h);
		1755	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1756	glEnd ();
		1757	}
		1758
		1759	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1760	{
		1761	int x, y;
		1762	int dx3 = dx * 3;
		1763	int dy3 = dy * 3;
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1766	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1767	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1768	glTranslatef (-1., -1., 0);
		1769	glBegin (GL_QUADS);
		1770
		1771	for (y = 1; y < h; y += 3)
		1772	{
		1773	int y1 = y - dy3;
		1774	int y1valid = y1 >= 0 && y1 < h;
		1775
		1776	for (x = 1; x < w; x += 3)
		1777	{
		1778	int x1 = x - dx3;
		1779	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1780	uint8_t h2;
		1781
		1782	if (y1valid && x1 >= 0 && x1 < w)
		1783	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1784	else
		1785	h2 = 1; /* out of range == invisible */
		1786
		1787	if (h1 \|\| h2)
		1788	{
		1789	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1790	glColor4f (1., 1., 1., alpha);
		1791
		1792	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1793	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1794	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1795	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1796	}
		1797	}
		1798	}
		1799	}
		1800
		1801	glEnd ();
		1802
		1803	glPopMatrix ();
		1804
		1805	glDisable (GL_TEXTURE_2D);
		1806	glDisable (GL_BLEND);
1631	}	1807	}
1632		1808
1633	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1809	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634	CODE:	1810	CODE:
1635	{	1811	{
…		…
1741	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1917	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742	// use uglier nearest interpolation because linear suffers	1918	// use uglier nearest interpolation because linear suffers
1743	// from transparent color bleeding and ugly wrapping effects.	1919	// from transparent color bleeding and ugly wrapping effects.
1744	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1920	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745	}	1921	}
		1922
		1923	void
		1924	expire_textures (DC::Map self, int texid, int count)
		1925	PPCODE:
		1926	for (; texid < self->texs && count; ++texid, --count)
		1927	{
		1928	maptex *tex = self->tex + texid;
		1929
		1930	if (tex->name)
		1931	{
		1932	if (tex->unused)
		1933	{
		1934	tex->name = 0;
		1935	tex->unused = 0;
		1936	XPUSHs (sv_2mortal (newSViv (texid)));
		1937	}
		1938	else
		1939	tex->unused = 1;
		1940	}
		1941	}
1746		1942
1747	int	1943	int
1748	ox (DC::Map self)	1944	ox (DC::Map self)
1749	ALIAS:	1945	ALIAS:
1750	oy = 1	1946	oy = 1
…		…
1831	{	2027	{
1832	ext = *data++;	2028	ext = *data++;
1833	cmd = ext & 0x7f;	2029	cmd = ext & 0x7f;
1834		2030
1835	if (cmd < 4)	2031	if (cmd < 4)
1836	cell->darkness = 255 - ext * 64 + 1;	2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1837	else if (cmd == 5) // health	2033	else if (cmd == 5) // health
1838	{	2034	{
1839	cell->stat_width = 1;	2035	cell->stat_width = 1;
1840	cell->stat_hp = *data++;	2036	cell->stat_hp = *data++;
1841	}	2037	}
…		…
1871	cell->tile [z] = self->face2tile [face];	2067	cell->tile [z] = self->face2tile [face];
1872		2068
1873	if (cell->tile [z])	2069	if (cell->tile [z])
1874	{	2070	{
1875	maptex *tex = self->tex + cell->tile [z];	2071	maptex *tex = self->tex + cell->tile [z];
		2072	tex->unused = 0;
1876	if (!tex->name)	2073	if (!tex->name)
1877	av_push (missing, newSViv (cell->tile [z]));	2074	av_push (missing, newSViv (cell->tile [z]));
1878		2075
1879	if (tex->smoothtile)	2076	if (tex->smoothtile)
1880	{	2077	{
1881	maptex *smooth = self->tex + tex->smoothtile;	2078	maptex *smooth = self->tex + tex->smoothtile;
		2079	smooth->unused = 0;
1882	if (!smooth->name)	2080	if (!smooth->name)
1883	av_push (missing, newSViv (tex->smoothtile));	2081	av_push (missing, newSViv (tex->smoothtile));
1884	}	2082	}
1885	}	2083	}
1886	}	2084	}
…		…
1957	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2155	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2156	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1959	smooth_key skey;	2157	smooth_key skey;
1960	int pl_x, pl_y;	2158	int pl_x, pl_y;
1961	maptex pl_tex;	2159	maptex pl_tex;
1962	rc_t *rc = rc_alloc ();	2160	rc_t *rc = rc_alloc ();
		2161	rc_t *rc_ov = rc_alloc ();
1963	rc_key_t key;	2162	rc_key_t key;
1964	rc_array_t *arr;	2163	rc_array_t *arr;
1965		2164
1966	pl_tex.name = 0;	2165	pl_tex.name = 0;
1967		2166
1968	// thats current max. sorry.	2167	// that's current max. sorry.
1969	if (sw > 255) sw = 255;	2168	if (sw > 255) sw = 255;
1970	if (sh > 255) sh = 255;	2169	if (sh > 255) sh = 255;
1971		2170
1972	// clear key, in case of extra padding	2171	// clear key, in case of extra padding
1973	memset (&skey, 0, sizeof (skey));	2172	memset (&skey, 0, sizeof (skey));
…		…
1977	key.g = 255;	2176	key.g = 255;
1978	key.b = 255;	2177	key.b = 255;
1979	key.a = 255;	2178	key.a = 255;
1980	key.mode = GL_QUADS;	2179	key.mode = GL_QUADS;
1981	key.format = GL_T2F_V3F;	2180	key.format = GL_T2F_V3F;
1982	key.texname = -1;
1983		2181
1984	mx += self->x;	2182	mx += self->x;
1985	my += self->y;	2183	my += self->y;
1986		2184
1987	// first pass: determine smooth_max	2185	// first pass: determine smooth_max
…		…
2011	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012		2210
2013	for (z = 0; z <= 2; z++)	2211	for (z = 0; z <= 2; z++)
2014	{	2212	{
2015	memset (smooth_level, 0, sizeof (smooth_level));	2213	memset (smooth_level, 0, sizeof (smooth_level));
		2214	key.texname = -1;
2016		2215
2017	for (y = 0; y < sh; y++)	2216	for (y = 0; y < sh; y++)
2018	if (0 <= y + my && y + my < self->rows)	2217	if (0 <= y + my && y + my < self->rows)
2019	{	2218	{
2020	maprow *row = self->row + (y + my);	2219	maprow *row = self->row + (y + my);
…		…
2026	tileid tile = cell->tile [z];	2225	tileid tile = cell->tile [z];
2027		2226
2028	if (tile)	2227	if (tile)
2029	{	2228	{
2030	maptex tex = self->tex [tile];	2229	maptex tex = self->tex [tile];
2031	int px = (x + 1) * T - tex.w;	2230	int px, py;
2032	int py = (y + 1) * T - tex.h;
2033		2231
2034	if (key.texname != tex.name)	2232	if (key.texname != tex.name)
2035	{	2233	{
		2234	self->tex [tile].unused = 0;
		2235
2036	if (!tex.name)	2236	if (!tex.name)
2037	tex = self->tex [2]; /* missing, replace by noface */	2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038		2238
2039	key.texname = tex.name;	2239	key.texname = tex.name;
2040	arr = rc_array (rc, &key);	2240	arr = rc_array (rc, &key);
2041	}	2241	}
		2242
		2243	px = (x + 1) * T - tex.w;
		2244	py = (y + 1) * T - tex.h;
2042		2245
2043	if (expect_false (cell->player == player) && expect_false (z == 2))	2246	if (expect_false (cell->player == player) && expect_false (z == 2))
2044	{	2247	{
2045	pl_x = px;	2248	pl_x = px;
2046	pl_y = py;	2249	pl_y = py;
…		…
2051	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2255	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2256	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2257	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055		2258
2056	if (expect_false (cell->flags) && expect_false (z == 2))
2057	{
2058	// overlays such as the speech bubble, probably more to come
2059	if (cell->flags & 1)
2060	{
2061	maptex tex = self->tex [1];
2062	int px = x * T + T * 2 / 32;
2063	int py = y * T - T * 6 / 32;
2064
2065	if (tex.name)
2066	{
2067	if (key.texname != tex.name)
2068	{
2069	key.texname = tex.name;
2070	arr = rc_array (rc, &key);
2071	}
2072
2073	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077	}
2078	}
2079	}
2080
2081	// update smooth hash	2259	// update smooth hash
2082	if (tex.smoothtile)	2260	if (tex.smoothtile)
2083	{	2261	{
2084	skey.tile = tex.smoothtile;	2262	skey.tile = tex.smoothtile;
2085	skey.level = tex.smoothlevel;	2263	skey.level = tex.smoothlevel;
…		…
2113	// corners	2291	// corners
2114	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2292	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2115	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2293	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2116	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2294	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2117	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2295	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2296	}
		2297	}
		2298
		2299	if (expect_false (z == 2) && expect_false (cell->flags))
		2300	{
		2301	// overlays such as the speech bubble, probably more to come
		2302	if (cell->flags & 1)
		2303	{
		2304	rc_key_t key_ov = key;
		2305	maptex tex = self->tex [TEXID_SPEECH];
		2306	rc_array_t *arr;
		2307	int px = x * T + T * 2 / 32;
		2308	int py = y * T - T * 6 / 32;
		2309
		2310	key_ov.texname = tex.name;
		2311	arr = rc_array (rc_ov, &key_ov);
		2312
		2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2315	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2118	}	2317	}
2119	}	2318	}
2120	}	2319	}
2121	}	2320	}
2122		2321
…		…
2162	{	2361	{
2163	// this time avoiding texture state changes	2362	// this time avoiding texture state changes
2164	// save gobs of state changes.	2363	// save gobs of state changes.
2165	if (key.texname != tex.name)	2364	if (key.texname != tex.name)
2166	{	2365	{
		2366	self->tex [skey->tile].unused = 0;
		2367
2167	glEnd ();	2368	glEnd ();
2168	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2369	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169	glBegin (GL_QUADS);	2370	glBegin (GL_QUADS);
2170	}	2371	}
2171		2372
…		…
2217	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2418	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218		2419
2219	rc_draw (rc);	2420	rc_draw (rc);
2220	}	2421	}
2221		2422
		2423	rc_draw (rc_ov);
		2424	rc_clear (rc_ov);
		2425
2222	glDisable (GL_BLEND);	2426	glDisable (GL_BLEND);
2223	rc_free (rc);	2427	rc_free (rc);
		2428	rc_free (rc_ov);
2224		2429
2225	// top layer: overlays such as the health bar	2430	// top layer: overlays such as the health bar
2226	for (y = 0; y < sh; y++)	2431	for (y = 0; y < sh; y++)
2227	if (0 <= y + my && y + my < self->rows)	2432	if (0 <= y + my && y + my < self->rows)
2228	{	2433	{
…		…
2233	{	2438	{
2234	mapcell *cell = row->col + (x + mx - row->c0);	2439	mapcell *cell = row->col + (x + mx - row->c0);
2235		2440
2236	int px = x * T;	2441	int px = x * T;
2237	int py = y * T;	2442	int py = y * T;
		2443
		2444	if (expect_false (cell->player == player))
		2445	{
		2446	px += sdx;
		2447	py += sdy;
		2448	}
2238		2449
2239	if (cell->stat_hp)	2450	if (cell->stat_hp)
2240	{	2451	{
2241	int width = cell->stat_width * T;	2452	int width = cell->stat_width * T;
2242	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2453	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2253	}	2464	}
2254	}	2465	}
2255	}	2466	}
2256		2467
2257	void	2468	void
2258	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2469	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259	CODE:	2470	CODE:
2260	{	2471	{
2261	static float color[16][3] = {	2472	static float color[16][3] = {
2262	{ 0.00F, 0.00F, 0.00F },	2473	{ 0.00f, 0.00f, 0.00f },
2263	{ 1.00F, 1.00F, 1.00F },	2474	{ 1.00f, 1.00f, 1.00f },
2264	{ 0.00F, 0.00F, 0.55F },	2475	{ 0.00f, 0.00f, 0.55f },
2265	{ 1.00F, 0.00F, 0.00F },	2476	{ 1.00f, 0.00f, 0.00f },
2266		2477
2267	{ 1.00F, 0.54F, 0.00F },	2478	{ 1.00f, 0.54f, 0.00f },
2268	{ 0.11F, 0.56F, 1.00F },	2479	{ 0.11f, 0.56f, 1.00f },
2269	{ 0.93F, 0.46F, 0.00F },	2480	{ 0.93f, 0.46f, 0.00f },
2270	{ 0.18F, 0.54F, 0.34F },	2481	{ 0.18f, 0.54f, 0.34f },
2271		2482
2272	{ 0.56F, 0.73F, 0.56F },	2483	{ 0.56f, 0.73f, 0.56f },
2273	{ 0.80F, 0.80F, 0.80F },	2484	{ 0.80f, 0.80f, 0.80f },
2274	{ 0.55F, 0.41F, 0.13F },	2485	{ 0.55f, 0.41f, 0.13f },
2275	{ 0.99F, 0.77F, 0.26F },	2486	{ 0.99f, 0.77f, 0.26f },
2276		2487
2277	{ 0.74F, 0.65F, 0.41F },	2488	{ 0.74f, 0.65f, 0.41f },
2278		2489
2279	{ 0.00F, 1.00F, 1.00F },	2490	{ 0.00f, 1.00f, 1.00f },
2280	{ 1.00F, 0.00F, 1.00F },	2491	{ 1.00f, 0.00f, 1.00f },
2281	{ 1.00F, 1.00F, 0.00F },	2492	{ 1.00f, 1.00f, 0.00f },
2282	};	2493	};
2283		2494
2284	int x, y;	2495	int x, y;
2285		2496
2286	glEnable (GL_TEXTURE_2D);	2497	glEnable (GL_TEXTURE_2D);
		2498	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2499	* but the nvidia driver (185.18.14) mishandles alpha textures
		2500	* and takes the colour from god knows where instead of using
		2501	* Cp. MODULATE results in the same colour, but slightly different
		2502	* alpha, but atcually gives us the correct colour with nvidia.
		2503	*/
2287	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2504	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288	glEnable (GL_BLEND);	2505	glEnable (GL_BLEND);
2289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2506	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290	glBegin (GL_QUADS);	2507	glBegin (GL_QUADS);
2291		2508
2292	for (y = 0; y < h; y++)	2509	for (y = 0; y < h; y++)
…		…
2296		2513
2297	if (m)	2514	if (m)
2298	{	2515	{
2299	float *c = color [m & 15];	2516	float *c = color [m & 15];
2300		2517
2301	float tx1 = m & 0x40 ? 0.5 : 0.;	2518	float tx1 = m & 0x40 ? 0.5f : 0.f;
2302	float tx2 = tx1 + 0.5;	2519	float tx2 = tx1 + 0.5f;
2303		2520
2304	glColor4f (c[0], c[1], c[2], 0.75);	2521	glColor4f (c[0], c[1], c[2], 1);
2305	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2522	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2523	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2524	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2525	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309	}	2526	}
…		…
2317	void	2534	void
2318	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2535	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319	PPCODE:	2536	PPCODE:
2320	{	2537	{
2321	int x, y;	2538	int x, y;
2322	int sw1 = sw + 2;	2539	int sw1 = sw + 2;
2323	int sh1 = sh + 2;	2540	int sh1 = sh + 2;
2324	int sh3 = sh * 3;	2541	int sh3 = sh * 3;
2325	int sw34 = (sw * 3 + 3) & ~3;	2542	int sw3 = sw * 3;
2326	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2327	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2328	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2545	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2329		2546
2330	SvPOK_only (darkness3_sv);	2547	SvPOK_only (darkness3_sv);
2331	SvCUR_set (darkness3_sv, sw34 * sh3);	2548	SvCUR_set (darkness3_sv, sw3 * sh3);
2332		2549
2333	mx += self->x - 1;	2550	mx += self->x - 1;
2334	my += self->y - 1;	2551	my += self->y - 1;
2335
2336	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337		2552
2338	for (y = 0; y < sh1; y++)	2553	for (y = 0; y < sh1; y++)
2339	if (0 <= y + my && y + my < self->rows)	2554	if (0 <= y + my && y + my < self->rows)
2340	{	2555	{
2341	maprow *row = self->row + (y + my);	2556	maprow *row = self->row + (y + my);
…		…
2344	if (row->c0 <= x + mx && x + mx < row->c1)	2559	if (row->c0 <= x + mx && x + mx < row->c1)
2345	{	2560	{
2346	mapcell *cell = row->col + (x + mx - row->c0);	2561	mapcell *cell = row->col + (x + mx - row->c0);
2347		2562
2348	darkness1 [y * sw1 + x] = cell->darkness	2563	darkness1 [y * sw1 + x] = cell->darkness
2349	? 255 - (cell->darkness - 1)	2564	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350	: 255 - FOW_DARKNESS;	2565	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351	}	2566	}
2352	}	2567	}
2353		2568
2354	for (y = 0; y < sh; ++y)	2569	for (y = 0; y < sh; ++y)
2355	for (x = 0; x < sw; ++x)	2570	for (x = 0; x < sw; ++x)
…		…
2374		2589
2375	uint8_t r13 = (d13 + d23 + d12) / 3;	2590	uint8_t r13 = (d13 + d23 + d12) / 3;
2376	uint8_t r23 = d23;	2591	uint8_t r23 = d23;
2377	uint8_t r33 = (d23 + d33 + d32) / 3;	2592	uint8_t r33 = (d23 + d33 + d32) / 3;
2378		2593
2379	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2594	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2595	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2596	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2597	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2598	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2599	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2600	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2601	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2602	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388	}	2603	}
2389		2604
2390	free (darkness1);	2605	free (darkness1);
2391		2606
2392	EXTEND (SP, 3);	2607	EXTEND (SP, 3);
2393	PUSHs (sv_2mortal (newSViv (sw34)));	2608	PUSHs (sv_2mortal (newSViv (sw3)));
2394	PUSHs (sv_2mortal (newSViv (sh3)));	2609	PUSHs (sv_2mortal (newSViv (sh3)));
2395	PUSHs (darkness3_sv);	2610	PUSHs (darkness3_sv);
2396	}	2611	}
2397		2612
2398	SV *	2613	SV *
…		…
2596	if (RETVAL < 0)	2811	if (RETVAL < 0)
2597	{	2812	{
2598	RETVAL = Mix_GroupOldest (-1);	2813	RETVAL = Mix_GroupOldest (-1);
2599		2814
2600	if (RETVAL < 0)	2815	if (RETVAL < 0)
		2816	{
		2817	// happens sometimes, maybe it just stopped playing(?)
		2818	RETVAL = Mix_GroupAvailable (-1);
		2819
		2820	if (RETVAL < 0)
2601	XSRETURN_UNDEF;	2821	XSRETURN_UNDEF;
2602		2822	}
		2823	else
2603	Mix_HaltChannel (RETVAL);	2824	Mix_HaltChannel (RETVAL);
2604	}	2825	}
2605		2826
2606	Mix_UnregisterAllEffects (RETVAL);	2827	Mix_UnregisterAllEffects (RETVAL);
2607	Mix_Volume (RETVAL, 128);	2828	Mix_Volume (RETVAL, 128);
2608	}	2829	}
…		…
2655	void	2876	void
2656	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2877	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657	CODE:	2878	CODE:
2658	{	2879	{
2659	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2880	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2881	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2882	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662	}	2883	}
2663		2884
2664	void	2885	void
2665	set_reverse_stereo (DC::Channel self, int flip)	2886	set_reverse_stereo (DC::Channel self, int flip)
…		…
2667	Mix_SetReverseStereo (self, flip);	2888	Mix_SetReverseStereo (self, flip);
2668		2889
2669	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2890	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670		2891
2671	PROTOTYPES: DISABLE	2892	PROTOTYPES: DISABLE
		2893
		2894	void
		2895	decoders ()
		2896	PPCODE:
		2897	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2898	int i, num = Mix_GetNumChunkDecoders ();
		2899	EXTEND (SP, num);
		2900	for (i = 0; i < num; ++i)
		2901	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2902	#else
		2903	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2904	#endif
2672		2905
2673	DC::MixChunk	2906	DC::MixChunk
2674	new (SV *class, DC::RW rwops)	2907	new (SV *class, DC::RW rwops)
2675	CODE:	2908	CODE:
2676	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2709	OUTPUT:	2942	OUTPUT:
2710	RETVAL	2943	RETVAL
2711		2944
2712	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2945	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713		2946
		2947	void
		2948	decoders ()
		2949	PPCODE:
		2950	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2951	int i, num = Mix_GetNumMusicDecoders ();
		2952	EXTEND (SP, num);
		2953	for (i = 0; i < num; ++i)
		2954	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2955	#else
		2956	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2957	#endif
		2958
2714	int	2959	int
2715	volume (int volume = -1)	2960	volume (int volume = -1)
2716	PROTOTYPE: ;$	2961	PROTOTYPE: ;$
2717	CODE:	2962	CODE:
2718	if (items > 0)	2963	if (items > 0)
…		…
2728		2973
2729	void	2974	void
2730	halt ()	2975	halt ()
2731	CODE:	2976	CODE:
2732	Mix_HaltMusic ();	2977	Mix_HaltMusic ();
		2978
		2979	int
		2980	playing ()
		2981	CODE:
		2982	RETVAL = Mix_PlayingMusic ();
		2983	OUTPUT:
		2984	RETVAL
2733		2985
2734	DC::MixMusic	2986	DC::MixMusic
2735	new (SV *class, DC::RW rwops)	2987	new (SV *class, DC::RW rwops)
2736	CODE:	2988	CODE:
2737	RETVAL = Mix_LoadMUS_RW (rwops);	2989	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2768	} *civ, const_iv[] = {	3020	} *civ, const_iv[] = {
2769	# define const_iv(name) { # name, (IV)name }	3021	# define const_iv(name) { # name, (IV)name }
2770	const_iv (GL_VENDOR),	3022	const_iv (GL_VENDOR),
2771	const_iv (GL_VERSION),	3023	const_iv (GL_VERSION),
2772	const_iv (GL_EXTENSIONS),	3024	const_iv (GL_EXTENSIONS),
		3025	const_iv (GL_MAX_TEXTURE_UNITS),
2773	const_iv (GL_COLOR_MATERIAL),	3026	const_iv (GL_COLOR_MATERIAL),
2774	const_iv (GL_SMOOTH),	3027	const_iv (GL_SMOOTH),
2775	const_iv (GL_FLAT),	3028	const_iv (GL_FLAT),
2776	const_iv (GL_DITHER),	3029	const_iv (GL_DITHER),
2777	const_iv (GL_BLEND),	3030	const_iv (GL_BLEND),
…		…
2789	const_iv (GL_ZERO),	3042	const_iv (GL_ZERO),
2790	const_iv (GL_SRC_ALPHA),	3043	const_iv (GL_SRC_ALPHA),
2791	const_iv (GL_DST_ALPHA),	3044	const_iv (GL_DST_ALPHA),
2792	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3045	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793	const_iv (GL_ONE_MINUS_DST_ALPHA),	3046	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3047	const_iv (GL_SRC_COLOR),
		3048	const_iv (GL_DST_COLOR),
		3049	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3050	const_iv (GL_ONE_MINUS_DST_COLOR),
2794	const_iv (GL_SRC_ALPHA_SATURATE),	3051	const_iv (GL_SRC_ALPHA_SATURATE),
2795	const_iv (GL_RGB),	3052	const_iv (GL_RGB),
2796	const_iv (GL_RGBA),	3053	const_iv (GL_RGBA),
2797	const_iv (GL_RGBA4),	3054	const_iv (GL_RGBA4),
2798	const_iv (GL_RGBA8),	3055	const_iv (GL_RGBA8),
…		…
2866	const_iv (GL_NICEST),	3123	const_iv (GL_NICEST),
2867	const_iv (GL_V2F),	3124	const_iv (GL_V2F),
2868	const_iv (GL_V3F),	3125	const_iv (GL_V3F),
2869	const_iv (GL_T2F_V3F),	3126	const_iv (GL_T2F_V3F),
2870	const_iv (GL_T2F_N3F_V3F),	3127	const_iv (GL_T2F_N3F_V3F),
		3128	const_iv (GL_FUNC_ADD),
		3129	const_iv (GL_FUNC_SUBTRACT),
		3130	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871	# undef const_iv	3131	# undef const_iv
2872	};	3132	};
2873		3133
2874	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3134	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2875	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2882	disable_GL_EXT_blend_func_separate ()	3142	disable_GL_EXT_blend_func_separate ()
2883	CODE:	3143	CODE:
2884	gl.BlendFuncSeparate = 0;	3144	gl.BlendFuncSeparate = 0;
2885	gl.BlendFuncSeparateEXT = 0;	3145	gl.BlendFuncSeparateEXT = 0;
2886		3146
		3147	void
		3148	apple_nvidia_bug (int enable)
		3149
2887	char *	3150	char *
2888	gl_vendor ()	3151	gl_vendor ()
2889	CODE:	3152	CODE:
2890	RETVAL = (char *)glGetString (GL_VENDOR);	3153	RETVAL = (char *)glGetString (GL_VENDOR);
2891	OUTPUT:	3154	OUTPUT:
…		…
2939	void glBlendFunc (int sfactor, int dfactor)	3202	void glBlendFunc (int sfactor, int dfactor)
2940		3203
2941	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3204	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942	CODE:	3205	CODE:
2943	gl_BlendFuncSeparate (sa, da, saa, daa);	3206	gl_BlendFuncSeparate (sa, da, saa, daa);
		3207
		3208	# void glBlendEquation (int se)
2944		3209
2945	void glDepthMask (int flag)	3210	void glDepthMask (int flag)
2946		3211
2947	void glLogicOp (int opcode)	3212	void glLogicOp (int opcode)
2948		3213
…		…
2983	void glRotate (float angle, float x, float y, float z)	3248	void glRotate (float angle, float x, float y, float z)
2984	CODE:	3249	CODE:
2985	glRotatef (angle, x, y, z);	3250	glRotatef (angle, x, y, z);
2986		3251
2987	void glColor (float r, float g, float b, float a = 1.0)	3252	void glColor (float r, float g, float b, float a = 1.0)
		3253	PROTOTYPE: @
2988	ALIAS:	3254	ALIAS:
2989	glColor_premultiply = 1	3255	glColor_premultiply = 1
2990	CODE:	3256	CODE:
2991	if (ix)	3257	if (ix)
2992	{	3258	{
…		…
3097	void glNewList (int list, int mode = GL_COMPILE)	3363	void glNewList (int list, int mode = GL_COMPILE)
3098		3364
3099	void glEndList ()	3365	void glEndList ()
3100		3366
3101	void glCallList (int list)	3367	void glCallList (int list)
		3368
		3369	void c_init ()
		3370	CODE:
		3371	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3372	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3102		3373
3103	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3374	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104		3375
3105	PROTOTYPES: DISABLE	3376	PROTOTYPES: DISABLE
3106		3377

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC vs. Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC