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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.290 by root, Wed Nov 4 14:40:51 2009 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 64	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
…		…
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
97		101
98	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3	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	}
101		123
102	static AV *texture_av;	124	static AV *texture_av;
103		125
104	static struct	126	static struct
105	{	127	{
…		…
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
462	}	484	}
463		485
464	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
465	minpot (unsigned int n)	493	minpot (unsigned int n)
466	{	494	{
467	if (!n)	495	if (!n)
468	return 0;	496	return 0;
469		497
…		…
552		580
553	static void	581	static void
554	deliantra_main ()	582	deliantra_main ()
555	{	583	{
556	char *argv[] = { 0 };	584	char *argv[] = { 0 };
557	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);
558	}	586	}
559		587
560	#ifdef __MACOSX__	588	#ifdef __MACOSX__
561	/* to due surprising braindamage on the side of SDL design, we	589	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	590	* do some mind-boggling hack here: SDL requires a custom main()
563	* on OS X, so... we provide one and call the original main(), which,	591	* on OS X, so... we provide one and call the original main(), which,
564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	592	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	593	* and which calls our main (== SDL_main) back.
566	*/	594	*/
567	extern C_LINKAGE int	595	extern C_LINKAGE int
568	main (int argc, char *argv[])	596	main (int argc, char *argv[])
569	{	597	{
…		…
793		821
794	const_iv (FOW_DARKNESS)	822	const_iv (FOW_DARKNESS)
795	# undef const_iv	823	# undef const_iv
796	};	824	};
797		825
798	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--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		828
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	831	}
804		832
…		…
820	NV ceil (NV x)	848	NV ceil (NV x)
821		849
822	IV minpot (UV n)	850	IV minpot (UV n)
823		851
824	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
825		859
826	void	860	void
827	pango_init ()	861	pango_init ()
828	CODE:	862	CODE:
829	{	863	{
…		…
921		955
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#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);
924	#include "glfunc.h"	958	#include "glfunc.h"
925	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	963	}
927	}	964	}
928	OUTPUT:	965	OUTPUT:
929	RETVAL	966	RETVAL
930		967
…		…
938	SDL_GetAppState ()	975	SDL_GetAppState ()
939		976
940	int	977	int
941	SDL_GetModState ()	978	SDL_GetModState ()
942		979
		980	int
		981	SDL_WaitEvent ()
		982	C_ARGS: 0
		983
943	void	984	void
		985	SDL_PumpEvents ()
		986
		987	void
944	poll_events ()	988	peep_events ()
945	PPCODE:	989	PPCODE:
946	{	990	{
947	SDL_Event ev;	991	SDL_Event ev;
948		992
949	SDL_PumpEvents ();	993	SDL_PumpEvents ();
…		…
1015		1059
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1060	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1061	}
1018	}	1062	}
1019		1063
		1064	char *
		1065	SDL_AudioDriverName ()
		1066	CODE:
		1067	{
		1068	char buf [256];
		1069	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1070	XSRETURN_UNDEF;
		1071
		1072	RETVAL = buf;
		1073	}
		1074	OUTPUT:
		1075	RETVAL
		1076
1020	int	1077	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1078	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1079	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1080	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1081	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1143	add_font (char *file)
1087	CODE:	1144	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1145	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1146	OUTPUT:
1090	RETVAL	1147	RETVAL
		1148
		1149	void
		1150	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1151
		1152	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1153	void
		1154	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1091		1155
1092	void	1156	void
1093	load_image_inline (SV *image_)	1157	load_image_inline (SV *image_)
1094	ALIAS:	1158	ALIAS:
1095	load_image_file = 1	1159	load_image_file = 1
…		…
1658	glDisable (GL_ALPHA_TEST);	1722	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1723	glDisable (GL_BLEND);
1660	}	1724	}
1661	}	1725	}
1662		1726
		1727	void
		1728	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
		1729	PROTOTYPE: @
		1730	CODE:
		1731	{
		1732	glEnable (GL_BLEND);
		1733	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1734	glEnable (GL_TEXTURE_2D);
		1735	glBindTexture (GL_TEXTURE_2D, name1);
		1736
		1737	glColor3f (intensity, intensity, intensity);
		1738	glPushMatrix ();
		1739	glScalef (1./3, 1./3, 1.);
		1740
		1741	if (blend > 0.f)
		1742	{
		1743	float dx3 = dx * -3.f / w;
		1744	float dy3 = dy * -3.f / h;
		1745	GLfloat env_color[4] = { 0., 0., 0., blend };
		1746
		1747	/* interpolate the two shadow textures */
		1748	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1752	gl.ActiveTexture (GL_TEXTURE1);
		1753	glEnable (GL_TEXTURE_2D);
		1754	glBindTexture (GL_TEXTURE_2D, name2);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1756
		1757	/* rgb == rgb(glcolor) */
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1760	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1761
		1762	/* alpha = interpolate t0, t1 by env_alpha */
		1763	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1768
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1774
		1775	glBegin (GL_QUADS);
		1776	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1777	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1778	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1779	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1780	glEnd ();
		1781
		1782	glDisable (GL_TEXTURE_2D);
		1783	gl.ActiveTexture (GL_TEXTURE0);
		1784	}
		1785	else
		1786	{
		1787	/* simple blending of one texture, also opengl <1.3 path */
		1788	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1789
		1790	glBegin (GL_QUADS);
		1791	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1792	glTexCoord2f (0, t); glVertex2f (0, h);
		1793	glTexCoord2f (s, t); glVertex2f (w, h);
		1794	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1795	glEnd ();
		1796	}
		1797
		1798	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1799	{
		1800	int x, y;
		1801	int dx3 = dx * 3;
		1802	int dy3 = dy * 3;
		1803
		1804	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1805	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1806	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1807	glTranslatef (-1., -1., 0);
		1808	glBegin (GL_QUADS);
		1809
		1810	for (y = 1; y < h; y += 3)
		1811	{
		1812	int y1 = y - dy3;
		1813	int y1valid = y1 >= 0 && y1 < h;
		1814
		1815	for (x = 1; x < w; x += 3)
		1816	{
		1817	int x1 = x - dx3;
		1818	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1819	uint8_t h2;
		1820
		1821	if (y1valid && x1 >= 0 && x1 < w)
		1822	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1823	else
		1824	h2 = 1; /* out of range == invisible */
		1825
		1826	if (h1 \|\| h2)
		1827	{
		1828	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1829	glColor4f (1., 1., 1., alpha);
		1830
		1831	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1832	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1833	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1834	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1835	}
		1836	}
		1837	}
		1838	}
		1839
		1840	glEnd ();
		1841
		1842	glPopMatrix ();
		1843
		1844	glDisable (GL_TEXTURE_2D);
		1845	glDisable (GL_BLEND);
		1846	}
		1847
1663	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1848	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664	CODE:	1849	CODE:
1665	{	1850	{
1666	GLint width;	1851	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1852	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1881	{	2066	{
1882	ext = *data++;	2067	ext = *data++;
1883	cmd = ext & 0x7f;	2068	cmd = ext & 0x7f;
1884		2069
1885	if (cmd < 4)	2070	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;	2071	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1887	else if (cmd == 5) // health	2072	else if (cmd == 5) // health
1888	{	2073	{
1889	cell->stat_width = 1;	2074	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2075	cell->stat_hp = *data++;
1891	}	2076	}
…		…
1966	? self->row + y	2151	? self->row + y
1967	: 0;	2152	: 0;
1968		2153
1969	for (x = x0; x < x1; x++)	2154	for (x = x0; x < x1; x++)
1970	{	2155	{
1971	int r = 32, g = 32, b = 32, a = 192;	2156	unsigned int r = 32, g = 32, b = 32, a = 192;
1972		2157
1973	if (row && row->c0 <= x && x < row->c1)	2158	if (row && row->c0 <= x && x < row->c1)
1974	{	2159	{
1975	mapcell *cell = row->col + (x - row->c0);	2160	mapcell *cell = row->col + (x - row->c0);
1976		2161
…		…
1978	{	2163	{
1979	maptex tex = self->tex [cell->tile [z]];	2164	maptex tex = self->tex [cell->tile [z]];
1980	int a0 = 255 - tex.a;	2165	int a0 = 255 - tex.a;
1981	int a1 = tex.a;	2166	int a1 = tex.a;
1982		2167
1983	r = (r * a0 + tex.r * a1) / 255;	2168	r = div255 (r * a0 + tex.r * a1);
1984	g = (g * a0 + tex.g * a1) / 255;	2169	g = div255 (g * a0 + tex.g * a1);
1985	b = (b * a0 + tex.b * a1) / 255;	2170	b = div255 (b * a0 + tex.b * a1);
1986	a = (a * a0 + tex.a * a1) / 255;	2171	a = div255 (a * a0 + tex.a * a1);
1987	}	2172	}
1988	}	2173	}
1989		2174
1990	*map++ = (r )	2175	*map++ = (r )
1991	\| (g << 8)	2176	\| (g << 8)
…		…
1998	}	2183	}
1999	OUTPUT:	2184	OUTPUT:
2000	RETVAL	2185	RETVAL
2001		2186
2002	void	2187	void
2003	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2188	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2004	CODE:	2189	CODE:
2005	{	2190	{
2006	int x, y, z;	2191	int x, y, z;
2007		2192
2008	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2193	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2012	int pl_x, pl_y;	2197	int pl_x, pl_y;
2013	maptex pl_tex;	2198	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2199	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2200	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2201	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2202	rc_array_t *arr;
2018		2203
2019	pl_tex.name = 0;	2204	pl_tex.name = 0;
2020		2205
2021	// that's current max. sorry.	2206	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2207	if (sw > 255) sw = 255;
…		…
2059	}	2244	}
2060		2245
2061	glEnable (GL_BLEND);	2246	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2247	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2248	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065	key.texname = self->tex [TEXID_HIDDEN].name;
2066	arr_hidden = rc_array (rc_ov, &key);
2067		2249
2068	for (z = 0; z <= 2; z++)	2250	for (z = 0; z <= 2; z++)
2069	{	2251	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2252	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2253	key.texname = -1;
…		…
2095		2277
2096	key.texname = tex.name;	2278	key.texname = tex.name;
2097	arr = rc_array (rc, &key);	2279	arr = rc_array (rc, &key);
2098	}	2280	}
2099		2281
2100	px = (x + 1) * T - tex.w;	2282	px = (x + 1) * Th - tex.w;
2101	py = (y + 1) * T - tex.h;	2283	py = (y + 1) * Tw - tex.h;
2102		2284
2103	if (expect_false (cell->player == player) && expect_false (z == 2))	2285	if (expect_false (cell->player == player) && expect_false (z == 2))
2104	{	2286	{
2105	pl_x = px;	2287	pl_x = px;
2106	pl_y = py;	2288	pl_y = py;
…		…
2151	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2333	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2152	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2334	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153	}	2335	}
2154	}	2336	}
2155		2337
2156	if (expect_false (z == 2))	2338	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2339	{
2158	/* draw question marks on top of hidden spaces */	2340	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2341	if (cell->flags & 1)
2160	{	2342	{
2161	maptex tex = self->tex [TEXID_HIDDEN];
2162	int px = (x + 1) * T - tex.w;
2163	int py = (y + 1) * T - tex.h;
2164
2165	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169	}
2170
2171	if (expect_false (cell->flags))
2172	{
2173	// overlays such as the speech bubble, probably more to come
2174	if (cell->flags & 1)
2175	{
2176	rc_key_t key_ov = key;	2343	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2344	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2345	rc_array_t *arr;
2179	int px = x * T + T * 2 / 32;	2346	int px = x * Tw + Tw * 2 / 32;
2180	int py = y * T - T * 6 / 32;	2347	int py = y * Th - Th * 6 / 32;
2181		2348
2182	key_ov.texname = tex.name;	2349	key_ov.texname = tex.name;
2183	arr = rc_array (rc_ov, &key_ov);	2350	arr = rc_array (rc_ov, &key_ov);
2184		2351
2185	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2352	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2353	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2187	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2354	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2188	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2355	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2189	}
2190	}	2356	}
2191	}	2357	}
2192	}	2358	}
2193	}	2359	}
2194		2360
…		…
2221	if (!(bits & 0x1000)	2387	if (!(bits & 0x1000)
2222	&& skey->level == level	2388	&& skey->level == level
2223	&& level > smooth_max [skey->x][skey->y])	2389	&& level > smooth_max [skey->x][skey->y])
2224	{	2390	{
2225	maptex tex = self->tex [skey->tile];	2391	maptex tex = self->tex [skey->tile];
2226	int px = (((int)skey->x) - 1) * T;	2392	int px = (((int)skey->x) - 1) * Tw;
2227	int py = (((int)skey->y) - 1) * T;	2393	int py = (((int)skey->y) - 1) * Th;
2228	int border = bits & 15;	2394	int border = bits & 15;
2229	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2395	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230	float dx = tex.s * .0625f; // 16 images/row	2396	float dx = tex.s * .0625f; // 16 images/row
2231	float dy = tex.t * .5f ; // 2 images/column	2397	float dy = tex.t * .5f ; // 2 images/column
2232		2398
…		…
2245		2411
2246	if (border)	2412	if (border)
2247	{	2413	{
2248	float ox = border * dx;	2414	float ox = border * dx;
2249		2415
2250	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2416	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2417	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2419	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254	}	2420	}
2255		2421
2256	if (corner)	2422	if (corner)
2257	{	2423	{
2258	float ox = corner * dx;	2424	float ox = corner * dx;
2259		2425
2260	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2426	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2427	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2428	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2429	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264	}	2430	}
2265	}	2431	}
2266	}	2432	}
2267	}	2433	}
2268	}	2434	}
…		…
2309	for (x = 0; x < sw; x++)	2475	for (x = 0; x < sw; x++)
2310	if (row->c0 <= x + mx && x + mx < row->c1)	2476	if (row->c0 <= x + mx && x + mx < row->c1)
2311	{	2477	{
2312	mapcell *cell = row->col + (x + mx - row->c0);	2478	mapcell *cell = row->col + (x + mx - row->c0);
2313		2479
2314	int px = x * T;	2480	int px = x * Tw;
2315	int py = y * T;	2481	int py = y * Th;
2316		2482
2317	if (expect_false (cell->player == player))	2483	if (expect_false (cell->player == player))
2318	{	2484	{
2319	px += sdx;	2485	px += sdx;
2320	py += sdy;	2486	py += sdy;
2321	}	2487	}
2322		2488
2323	if (cell->stat_hp)	2489	if (cell->stat_hp)
2324	{	2490	{
2325	int width = cell->stat_width * T;	2491	int width = cell->stat_width * Tw;
2326	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2492	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327		2493
2328	glColor3ub (0, 0, 0);	2494	glColor3ub (0, 0, 0);
2329	glRectf (px + 1, py - thick - 2,	2495	glRectf (px + 1, py - thick - 2,
2330	px + width - 1, py);	2496	px + width - 1, py);
2331		2497
…		…
2337	}	2503	}
2338	}	2504	}
2339	}	2505	}
2340		2506
2341	void	2507	void
2342	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2508	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2343	CODE:	2509	CODE:
2344	{	2510	{
2345	static float color[16][3] = {	2511	static float color[16][3] = {
2346	{ 0.00F, 0.00F, 0.00F },	2512	{ 0.00f, 0.00f, 0.00f },
2347	{ 1.00F, 1.00F, 1.00F },	2513	{ 1.00f, 1.00f, 1.00f },
2348	{ 0.00F, 0.00F, 0.55F },	2514	{ 0.00f, 0.00f, 0.55f },
2349	{ 1.00F, 0.00F, 0.00F },	2515	{ 1.00f, 0.00f, 0.00f },
2350		2516
2351	{ 1.00F, 0.54F, 0.00F },	2517	{ 1.00f, 0.54f, 0.00f },
2352	{ 0.11F, 0.56F, 1.00F },	2518	{ 0.11f, 0.56f, 1.00f },
2353	{ 0.93F, 0.46F, 0.00F },	2519	{ 0.93f, 0.46f, 0.00f },
2354	{ 0.18F, 0.54F, 0.34F },	2520	{ 0.18f, 0.54f, 0.34f },
2355		2521
2356	{ 0.56F, 0.73F, 0.56F },	2522	{ 0.56f, 0.73f, 0.56f },
2357	{ 0.80F, 0.80F, 0.80F },	2523	{ 0.80f, 0.80f, 0.80f },
2358	{ 0.55F, 0.41F, 0.13F },	2524	{ 0.55f, 0.41f, 0.13f },
2359	{ 0.99F, 0.77F, 0.26F },	2525	{ 0.99f, 0.77f, 0.26f },
2360		2526
2361	{ 0.74F, 0.65F, 0.41F },	2527	{ 0.74f, 0.65f, 0.41f },
2362		2528
2363	{ 0.00F, 1.00F, 1.00F },	2529	{ 0.00f, 1.00f, 1.00f },
2364	{ 1.00F, 0.00F, 1.00F },	2530	{ 1.00f, 0.00f, 1.00f },
2365	{ 1.00F, 1.00F, 0.00F },	2531	{ 1.00f, 1.00f, 0.00f },
2366	};	2532	};
2367		2533
2368	int x, y;	2534	int x, y;
2369		2535
2370	glEnable (GL_TEXTURE_2D);	2536	glEnable (GL_TEXTURE_2D);
2371	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2537	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372	* but the nvidia driver (185.18.14) mishandles alpha textures	2538	* but the nvidia driver (185.18.14) mishandles alpha textures
2373	* ansd takes the colour from god knows where instead of using	2539	* and takes the colour from god knows where instead of using
2374	* Cp. MODULATE results in the same colour, but slightly different	2540	* Cp. MODULATE results in the same colour, but slightly different
2375	* alpha, but atcually gives us the correct colour with nvidia.	2541	* alpha, but atcually gives us the correct colour with nvidia.
2376	*/	2542	*/
2377	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2543	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378	glEnable (GL_BLEND);	2544	glEnable (GL_BLEND);
…		…
2386		2552
2387	if (m)	2553	if (m)
2388	{	2554	{
2389	float *c = color [m & 15];	2555	float *c = color [m & 15];
2390		2556
2391	float tx1 = m & 0x40 ? 0.5 : 0.;	2557	float tx1 = m & 0x40 ? 0.5f : 0.f;
2392	float tx2 = tx1 + 0.5;	2558	float tx2 = tx1 + 0.5f;
2393		2559
2394	glColor4f (c[0], c[1], c[2], 1);	2560	glColor4f (c[0], c[1], c[2], 1);
2395	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2561	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2562	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2563	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2407	void	2573	void
2408	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2574	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2409	PPCODE:	2575	PPCODE:
2410	{	2576	{
2411	int x, y;	2577	int x, y;
2412	int sw1 = sw + 2;	2578	int sw1 = sw + 2;
2413	int sh1 = sh + 2;	2579	int sh1 = sh + 2;
2414	int sh3 = sh * 3;	2580	int sh3 = sh * 3;
2415	int sw34 = (sw * 3 + 3) & ~3;	2581	int sw3 = sw * 3;
		2582	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2583	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2416	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2584	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2417	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2585	memset (darkness1, 0, sw1*sh1);
2418	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2419		2586
2420	SvPOK_only (darkness3_sv);	2587	SvPOK_only (darkness3_sv);
2421	SvCUR_set (darkness3_sv, sw34 * sh3);	2588	SvCUR_set (darkness3_sv, sw3 * sh3);
2422		2589
2423	mx += self->x - 1;	2590	mx += self->x - 1;
2424	my += self->y - 1;	2591	my += self->y - 1;
2425
2426	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427		2592
2428	for (y = 0; y < sh1; y++)	2593	for (y = 0; y < sh1; y++)
2429	if (0 <= y + my && y + my < self->rows)	2594	if (0 <= y + my && y + my < self->rows)
2430	{	2595	{
2431	maprow *row = self->row + (y + my);	2596	maprow *row = self->row + (y + my);
…		…
2434	if (row->c0 <= x + mx && x + mx < row->c1)	2599	if (row->c0 <= x + mx && x + mx < row->c1)
2435	{	2600	{
2436	mapcell *cell = row->col + (x + mx - row->c0);	2601	mapcell *cell = row->col + (x + mx - row->c0);
2437		2602
2438	darkness1 [y * sw1 + x] = cell->darkness	2603	darkness1 [y * sw1 + x] = cell->darkness
2439	? 255 - (cell->darkness - 1)	2604	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440	: 255 - FOW_DARKNESS;	2605	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441	}	2606	}
2442	}	2607	}
2443		2608
2444	for (y = 0; y < sh; ++y)	2609	for (y = 0; y < sh; ++y)
2445	for (x = 0; x < sw; ++x)	2610	for (x = 0; x < sw; ++x)
…		…
2464		2629
2465	uint8_t r13 = (d13 + d23 + d12) / 3;	2630	uint8_t r13 = (d13 + d23 + d12) / 3;
2466	uint8_t r23 = d23;	2631	uint8_t r23 = d23;
2467	uint8_t r33 = (d23 + d33 + d32) / 3;	2632	uint8_t r33 = (d23 + d33 + d32) / 3;
2468		2633
2469	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2634	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2635	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2636	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2637	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2638	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2474	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2639	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2640	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2641	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2642	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478	}	2643	}
2479		2644
2480	free (darkness1);	2645	free (darkness1);
2481		2646
2482	EXTEND (SP, 3);	2647	EXTEND (SP, 3);
2483	PUSHs (sv_2mortal (newSViv (sw34)));	2648	PUSHs (sv_2mortal (newSViv (sw3)));
2484	PUSHs (sv_2mortal (newSViv (sh3)));	2649	PUSHs (sv_2mortal (newSViv (sh3)));
2485	PUSHs (darkness3_sv);	2650	PUSHs (darkness3_sv);
2486	}	2651	}
2487		2652
2488	SV *	2653	SV *
…		…
2686	if (RETVAL < 0)	2851	if (RETVAL < 0)
2687	{	2852	{
2688	RETVAL = Mix_GroupOldest (-1);	2853	RETVAL = Mix_GroupOldest (-1);
2689		2854
2690	if (RETVAL < 0)	2855	if (RETVAL < 0)
		2856	{
		2857	// happens sometimes, maybe it just stopped playing(?)
		2858	RETVAL = Mix_GroupAvailable (-1);
		2859
		2860	if (RETVAL < 0)
2691	XSRETURN_UNDEF;	2861	XSRETURN_UNDEF;
2692		2862	}
		2863	else
2693	Mix_HaltChannel (RETVAL);	2864	Mix_HaltChannel (RETVAL);
2694	}	2865	}
2695		2866
2696	Mix_UnregisterAllEffects (RETVAL);	2867	Mix_UnregisterAllEffects (RETVAL);
2697	Mix_Volume (RETVAL, 128);	2868	Mix_Volume (RETVAL, 128);
2698	}	2869	}
…		…
2745	void	2916	void
2746	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2917	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2747	CODE:	2918	CODE:
2748	{	2919	{
2749	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2920	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2750	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2921	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2751	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2922	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752	}	2923	}
2753		2924
2754	void	2925	void
2755	set_reverse_stereo (DC::Channel self, int flip)	2926	set_reverse_stereo (DC::Channel self, int flip)
…		…
2757	Mix_SetReverseStereo (self, flip);	2928	Mix_SetReverseStereo (self, flip);
2758		2929
2759	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2930	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760		2931
2761	PROTOTYPES: DISABLE	2932	PROTOTYPES: DISABLE
		2933
		2934	void
		2935	decoders ()
		2936	PPCODE:
		2937	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2938	int i, num = Mix_GetNumChunkDecoders ();
		2939	EXTEND (SP, num);
		2940	for (i = 0; i < num; ++i)
		2941	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2942	#else
		2943	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2944	#endif
2762		2945
2763	DC::MixChunk	2946	DC::MixChunk
2764	new (SV *class, DC::RW rwops)	2947	new (SV *class, DC::RW rwops)
2765	CODE:	2948	CODE:
2766	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2949	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2799	OUTPUT:	2982	OUTPUT:
2800	RETVAL	2983	RETVAL
2801		2984
2802	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2985	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803		2986
		2987	void
		2988	decoders ()
		2989	PPCODE:
		2990	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2991	int i, num = Mix_GetNumMusicDecoders ();
		2992	EXTEND (SP, num);
		2993	for (i = 0; i < num; ++i)
		2994	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2995	#else
		2996	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2997	#endif
		2998
2804	int	2999	int
2805	volume (int volume = -1)	3000	volume (int volume = -1)
2806	PROTOTYPE: ;$	3001	PROTOTYPE: ;$
2807	CODE:	3002	CODE:
2808	if (items > 0)	3003	if (items > 0)
…		…
2818		3013
2819	void	3014	void
2820	halt ()	3015	halt ()
2821	CODE:	3016	CODE:
2822	Mix_HaltMusic ();	3017	Mix_HaltMusic ();
		3018
		3019	int
		3020	playing ()
		3021	CODE:
		3022	RETVAL = Mix_PlayingMusic ();
		3023	OUTPUT:
		3024	RETVAL
2823		3025
2824	DC::MixMusic	3026	DC::MixMusic
2825	new (SV *class, DC::RW rwops)	3027	new (SV *class, DC::RW rwops)
2826	CODE:	3028	CODE:
2827	RETVAL = Mix_LoadMUS_RW (rwops);	3029	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2858	} *civ, const_iv[] = {	3060	} *civ, const_iv[] = {
2859	# define const_iv(name) { # name, (IV)name }	3061	# define const_iv(name) { # name, (IV)name }
2860	const_iv (GL_VENDOR),	3062	const_iv (GL_VENDOR),
2861	const_iv (GL_VERSION),	3063	const_iv (GL_VERSION),
2862	const_iv (GL_EXTENSIONS),	3064	const_iv (GL_EXTENSIONS),
		3065	const_iv (GL_MAX_TEXTURE_UNITS),
2863	const_iv (GL_COLOR_MATERIAL),	3066	const_iv (GL_COLOR_MATERIAL),
2864	const_iv (GL_SMOOTH),	3067	const_iv (GL_SMOOTH),
2865	const_iv (GL_FLAT),	3068	const_iv (GL_FLAT),
2866	const_iv (GL_DITHER),	3069	const_iv (GL_DITHER),
2867	const_iv (GL_BLEND),	3070	const_iv (GL_BLEND),
…		…
2879	const_iv (GL_ZERO),	3082	const_iv (GL_ZERO),
2880	const_iv (GL_SRC_ALPHA),	3083	const_iv (GL_SRC_ALPHA),
2881	const_iv (GL_DST_ALPHA),	3084	const_iv (GL_DST_ALPHA),
2882	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3085	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883	const_iv (GL_ONE_MINUS_DST_ALPHA),	3086	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3087	const_iv (GL_SRC_COLOR),
		3088	const_iv (GL_DST_COLOR),
		3089	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3090	const_iv (GL_ONE_MINUS_DST_COLOR),
2884	const_iv (GL_SRC_ALPHA_SATURATE),	3091	const_iv (GL_SRC_ALPHA_SATURATE),
2885	const_iv (GL_RGB),	3092	const_iv (GL_RGB),
2886	const_iv (GL_RGBA),	3093	const_iv (GL_RGBA),
2887	const_iv (GL_RGBA4),	3094	const_iv (GL_RGBA4),
2888	const_iv (GL_RGBA8),	3095	const_iv (GL_RGBA8),
…		…
2956	const_iv (GL_NICEST),	3163	const_iv (GL_NICEST),
2957	const_iv (GL_V2F),	3164	const_iv (GL_V2F),
2958	const_iv (GL_V3F),	3165	const_iv (GL_V3F),
2959	const_iv (GL_T2F_V3F),	3166	const_iv (GL_T2F_V3F),
2960	const_iv (GL_T2F_N3F_V3F),	3167	const_iv (GL_T2F_N3F_V3F),
		3168	const_iv (GL_FUNC_ADD),
		3169	const_iv (GL_FUNC_SUBTRACT),
		3170	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2961	# undef const_iv	3171	# undef const_iv
2962	};	3172	};
2963		3173
2964	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3174	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2965	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3175	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2966		3176
2967	texture_av = newAV ();	3177	texture_av = newAV ();
2968	AvREAL_off (texture_av);	3178	AvREAL_off (texture_av);
2969	}	3179	}
2970		3180
2971	void	3181	void
2972	disable_GL_EXT_blend_func_separate ()	3182	disable_GL_EXT_blend_func_separate ()
2973	CODE:	3183	CODE:
2974	gl.BlendFuncSeparate = 0;	3184	gl.BlendFuncSeparate = 0;
2975	gl.BlendFuncSeparateEXT = 0;	3185	gl.BlendFuncSeparateEXT = 0;
		3186
		3187	void
		3188	apple_nvidia_bug (int enable)
2976		3189
2977	char *	3190	char *
2978	gl_vendor ()	3191	gl_vendor ()
2979	CODE:	3192	CODE:
2980	RETVAL = (char *)glGetString (GL_VENDOR);	3193	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
3011		3224
3012	int glGetError ()	3225	int glGetError ()
3013		3226
3014	void glFinish ()	3227	void glFinish ()
3015		3228
		3229	void glFlush ()
		3230
3016	void glClear (int mask)	3231	void glClear (int mask)
3017		3232
3018	void glClearColor (float r, float g, float b, float a = 1.0)	3233	void glClearColor (float r, float g, float b, float a = 1.0)
3019	PROTOTYPE: @	3234	PROTOTYPE: @
3020		3235
…		…
3029	void glBlendFunc (int sfactor, int dfactor)	3244	void glBlendFunc (int sfactor, int dfactor)
3030		3245
3031	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3246	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3032	CODE:	3247	CODE:
3033	gl_BlendFuncSeparate (sa, da, saa, daa);	3248	gl_BlendFuncSeparate (sa, da, saa, daa);
		3249
		3250	# void glBlendEquation (int se)
3034		3251
3035	void glDepthMask (int flag)	3252	void glDepthMask (int flag)
3036		3253
3037	void glLogicOp (int opcode)	3254	void glLogicOp (int opcode)
3038		3255
…		…
3188	void glNewList (int list, int mode = GL_COMPILE)	3405	void glNewList (int list, int mode = GL_COMPILE)
3189		3406
3190	void glEndList ()	3407	void glEndList ()
3191		3408
3192	void glCallList (int list)	3409	void glCallList (int list)
		3410
		3411	void c_init ()
		3412	CODE:
		3413	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3414	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3193		3415
3194	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3416	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3195		3417
3196	PROTOTYPES: DISABLE	3418	PROTOTYPES: DISABLE
3197		3419

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.290 by root, Wed Nov 4 14:40:51 2009 UTC vs. Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.290 by root, Wed Nov 4 14:40:51 2009 UTC vs.
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC