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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.287 by root, Sun Dec 21 21:54:27 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 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	void
		1153	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)
1091		1154
1092	void	1155	void
1093	load_image_inline (SV *image_)	1156	load_image_inline (SV *image_)
1094	ALIAS:	1157	ALIAS:
1095	load_image_file = 1	1158	load_image_file = 1
…		…
1658	glDisable (GL_ALPHA_TEST);	1721	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1722	glDisable (GL_BLEND);
1660	}	1723	}
1661	}	1724	}
1662		1725
		1726	void
		1727	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)
		1728	PROTOTYPE: @
		1729	CODE:
		1730	{
		1731	glEnable (GL_BLEND);
		1732	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1733	glEnable (GL_TEXTURE_2D);
		1734	glBindTexture (GL_TEXTURE_2D, name1);
		1735
		1736	glColor3f (intensity, intensity, intensity);
		1737	glPushMatrix ();
		1738	glScalef (1./3, 1./3, 1.);
		1739
		1740	if (blend > 0.f)
		1741	{
		1742	float dx3 = dx * -3.f / w;
		1743	float dy3 = dy * -3.f / h;
		1744	GLfloat env_color[4] = { 0., 0., 0., blend };
		1745
		1746	/* interpolate the two shadow textures */
		1747	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1749
		1750	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1751	gl.ActiveTexture (GL_TEXTURE1);
		1752	glEnable (GL_TEXTURE_2D);
		1753	glBindTexture (GL_TEXTURE_2D, name2);
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1755
		1756	/* rgb == rgb(glcolor) */
		1757	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1760
		1761	/* alpha = interpolate t0, t1 by env_alpha */
		1762	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1763
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1767
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1770
		1771	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1773
		1774	glBegin (GL_QUADS);
		1775	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1776	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1777	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1778	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1779	glEnd ();
		1780
		1781	glDisable (GL_TEXTURE_2D);
		1782	gl.ActiveTexture (GL_TEXTURE0);
		1783	}
		1784	else
		1785	{
		1786	/* simple blending of one texture, also opengl <1.3 path */
		1787	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1788
		1789	glBegin (GL_QUADS);
		1790	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1791	glTexCoord2f (0, t); glVertex2f (0, h);
		1792	glTexCoord2f (s, t); glVertex2f (w, h);
		1793	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1794	glEnd ();
		1795	}
		1796
		1797	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1798	{
		1799	int x, y;
		1800	int dx3 = dx * 3;
		1801	int dy3 = dy * 3;
		1802
		1803	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1804	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1805	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1806	glTranslatef (-1., -1., 0);
		1807	glBegin (GL_QUADS);
		1808
		1809	for (y = 1; y < h; y += 3)
		1810	{
		1811	int y1 = y - dy3;
		1812	int y1valid = y1 >= 0 && y1 < h;
		1813
		1814	for (x = 1; x < w; x += 3)
		1815	{
		1816	int x1 = x - dx3;
		1817	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1818	uint8_t h2;
		1819
		1820	if (y1valid && x1 >= 0 && x1 < w)
		1821	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1822	else
		1823	h2 = 1; /* out of range == invisible */
		1824
		1825	if (h1 \|\| h2)
		1826	{
		1827	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1828	glColor4f (1., 1., 1., alpha);
		1829
		1830	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1831	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1832	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1833	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1834	}
		1835	}
		1836	}
		1837	}
		1838
		1839	glEnd ();
		1840
		1841	glPopMatrix ();
		1842
		1843	glDisable (GL_TEXTURE_2D);
		1844	glDisable (GL_BLEND);
		1845	}
		1846
1663	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1847	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664	CODE:	1848	CODE:
1665	{	1849	{
1666	GLint width;	1850	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1851	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1881	{	2065	{
1882	ext = *data++;	2066	ext = *data++;
1883	cmd = ext & 0x7f;	2067	cmd = ext & 0x7f;
1884		2068
1885	if (cmd < 4)	2069	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;	2070	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1887	else if (cmd == 5) // health	2071	else if (cmd == 5) // health
1888	{	2072	{
1889	cell->stat_width = 1;	2073	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2074	cell->stat_hp = *data++;
1891	}	2075	}
…		…
1966	? self->row + y	2150	? self->row + y
1967	: 0;	2151	: 0;
1968		2152
1969	for (x = x0; x < x1; x++)	2153	for (x = x0; x < x1; x++)
1970	{	2154	{
1971	int r = 32, g = 32, b = 32, a = 192;	2155	unsigned int r = 32, g = 32, b = 32, a = 192;
1972		2156
1973	if (row && row->c0 <= x && x < row->c1)	2157	if (row && row->c0 <= x && x < row->c1)
1974	{	2158	{
1975	mapcell *cell = row->col + (x - row->c0);	2159	mapcell *cell = row->col + (x - row->c0);
1976		2160
…		…
1978	{	2162	{
1979	maptex tex = self->tex [cell->tile [z]];	2163	maptex tex = self->tex [cell->tile [z]];
1980	int a0 = 255 - tex.a;	2164	int a0 = 255 - tex.a;
1981	int a1 = tex.a;	2165	int a1 = tex.a;
1982		2166
1983	r = (r * a0 + tex.r * a1) / 255;	2167	r = div255 (r * a0 + tex.r * a1);
1984	g = (g * a0 + tex.g * a1) / 255;	2168	g = div255 (g * a0 + tex.g * a1);
1985	b = (b * a0 + tex.b * a1) / 255;	2169	b = div255 (b * a0 + tex.b * a1);
1986	a = (a * a0 + tex.a * a1) / 255;	2170	a = div255 (a * a0 + tex.a * a1);
1987	}	2171	}
1988	}	2172	}
1989		2173
1990	*map++ = (r )	2174	*map++ = (r )
1991	\| (g << 8)	2175	\| (g << 8)
…		…
1998	}	2182	}
1999	OUTPUT:	2183	OUTPUT:
2000	RETVAL	2184	RETVAL
2001		2185
2002	void	2186	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)	2187	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:	2188	CODE:
2005	{	2189	{
2006	int x, y, z;	2190	int x, y, z;
2007		2191
2008	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2192	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2012	int pl_x, pl_y;	2196	int pl_x, pl_y;
2013	maptex pl_tex;	2197	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2198	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2199	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2200	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2201	rc_array_t *arr;
2018		2202
2019	pl_tex.name = 0;	2203	pl_tex.name = 0;
2020		2204
2021	// thats current max. sorry.	2205	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2206	if (sw > 255) sw = 255;
2023	if (sh > 255) sh = 255;	2207	if (sh > 255) sh = 255;
2024		2208
2025	// clear key, in case of extra padding	2209	// clear key, in case of extra padding
2026	memset (&skey, 0, sizeof (skey));	2210	memset (&skey, 0, sizeof (skey));
…		…
2059	}	2243	}
2060		2244
2061	glEnable (GL_BLEND);	2245	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2246	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2247	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		2248
2068	for (z = 0; z <= 2; z++)	2249	for (z = 0; z <= 2; z++)
2069	{	2250	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2251	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2252	key.texname = -1;
…		…
2095		2276
2096	key.texname = tex.name;	2277	key.texname = tex.name;
2097	arr = rc_array (rc, &key);	2278	arr = rc_array (rc, &key);
2098	}	2279	}
2099		2280
2100	px = (x + 1) * T - tex.w;	2281	px = (x + 1) * Th - tex.w;
2101	py = (y + 1) * T - tex.h;	2282	py = (y + 1) * Tw - tex.h;
2102		2283
2103	if (expect_false (cell->player == player) && expect_false (z == 2))	2284	if (expect_false (cell->player == player) && expect_false (z == 2))
2104	{	2285	{
2105	pl_x = px;	2286	pl_x = px;
2106	pl_y = py;	2287	pl_y = py;
…		…
2151	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2332	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);	2333	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153	}	2334	}
2154	}	2335	}
2155		2336
2156	if (expect_false (z == 2))	2337	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2338	{
2158	/* draw question marks on top of hidden spaces */	2339	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2340	if (cell->flags & 1)
2160	{	2341	{
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;	2342	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2343	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2344	rc_array_t *arr;
		2345	int px = x * Tw + Tw * 2 / 32;
		2346	int py = y * Th - Th * 6 / 32;
2179		2347
2180	key_ov.texname = tex.name;	2348	key_ov.texname = tex.name;
2181	arr = rc_array (rc_ov, &key_ov);	2349	arr = rc_array (rc_ov, &key_ov);
2182		2350
2183	int px = x * T + T * 2 / 32;
2184	int py = y * T - T * 6 / 32;
2185
2186	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2351	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2352	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2188	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2353	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2189	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2354	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2190	}
2191	}	2355	}
2192	}	2356	}
2193	}	2357	}
2194	}	2358	}
2195		2359
…		…
2222	if (!(bits & 0x1000)	2386	if (!(bits & 0x1000)
2223	&& skey->level == level	2387	&& skey->level == level
2224	&& level > smooth_max [skey->x][skey->y])	2388	&& level > smooth_max [skey->x][skey->y])
2225	{	2389	{
2226	maptex tex = self->tex [skey->tile];	2390	maptex tex = self->tex [skey->tile];
2227	int px = (((int)skey->x) - 1) * T;	2391	int px = (((int)skey->x) - 1) * Tw;
2228	int py = (((int)skey->y) - 1) * T;	2392	int py = (((int)skey->y) - 1) * Th;
2229	int border = bits & 15;	2393	int border = bits & 15;
2230	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2394	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231	float dx = tex.s * .0625f; // 16 images/row	2395	float dx = tex.s * .0625f; // 16 images/row
2232	float dy = tex.t * .5f ; // 2 images/column	2396	float dy = tex.t * .5f ; // 2 images/column
2233		2397
…		…
2246		2410
2247	if (border)	2411	if (border)
2248	{	2412	{
2249	float ox = border * dx;	2413	float ox = border * dx;
2250		2414
2251	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2415	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255	}	2419	}
2256		2420
2257	if (corner)	2421	if (corner)
2258	{	2422	{
2259	float ox = corner * dx;	2423	float ox = corner * dx;
2260		2424
2261	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2425	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2426	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2427	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2428	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265	}	2429	}
2266	}	2430	}
2267	}	2431	}
2268	}	2432	}
2269	}	2433	}
…		…
2310	for (x = 0; x < sw; x++)	2474	for (x = 0; x < sw; x++)
2311	if (row->c0 <= x + mx && x + mx < row->c1)	2475	if (row->c0 <= x + mx && x + mx < row->c1)
2312	{	2476	{
2313	mapcell *cell = row->col + (x + mx - row->c0);	2477	mapcell *cell = row->col + (x + mx - row->c0);
2314		2478
2315	int px = x * T;	2479	int px = x * Tw;
2316	int py = y * T;	2480	int py = y * Th;
2317		2481
2318	if (expect_false (cell->player == player))	2482	if (expect_false (cell->player == player))
2319	{	2483	{
2320	px += sdx;	2484	px += sdx;
2321	py += sdy;	2485	py += sdy;
2322	}	2486	}
2323		2487
2324	if (cell->stat_hp)	2488	if (cell->stat_hp)
2325	{	2489	{
2326	int width = cell->stat_width * T;	2490	int width = cell->stat_width * Tw;
2327	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2491	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328		2492
2329	glColor3ub (0, 0, 0);	2493	glColor3ub (0, 0, 0);
2330	glRectf (px + 1, py - thick - 2,	2494	glRectf (px + 1, py - thick - 2,
2331	px + width - 1, py);	2495	px + width - 1, py);
2332		2496
…		…
2338	}	2502	}
2339	}	2503	}
2340	}	2504	}
2341		2505
2342	void	2506	void
2343	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2507	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2344	CODE:	2508	CODE:
2345	{	2509	{
2346	static float color[16][3] = {	2510	static float color[16][3] = {
2347	{ 0.00F, 0.00F, 0.00F },	2511	{ 0.00f, 0.00f, 0.00f },
2348	{ 1.00F, 1.00F, 1.00F },	2512	{ 1.00f, 1.00f, 1.00f },
2349	{ 0.00F, 0.00F, 0.55F },	2513	{ 0.00f, 0.00f, 0.55f },
2350	{ 1.00F, 0.00F, 0.00F },	2514	{ 1.00f, 0.00f, 0.00f },
2351		2515
2352	{ 1.00F, 0.54F, 0.00F },	2516	{ 1.00f, 0.54f, 0.00f },
2353	{ 0.11F, 0.56F, 1.00F },	2517	{ 0.11f, 0.56f, 1.00f },
2354	{ 0.93F, 0.46F, 0.00F },	2518	{ 0.93f, 0.46f, 0.00f },
2355	{ 0.18F, 0.54F, 0.34F },	2519	{ 0.18f, 0.54f, 0.34f },
2356		2520
2357	{ 0.56F, 0.73F, 0.56F },	2521	{ 0.56f, 0.73f, 0.56f },
2358	{ 0.80F, 0.80F, 0.80F },	2522	{ 0.80f, 0.80f, 0.80f },
2359	{ 0.55F, 0.41F, 0.13F },	2523	{ 0.55f, 0.41f, 0.13f },
2360	{ 0.99F, 0.77F, 0.26F },	2524	{ 0.99f, 0.77f, 0.26f },
2361		2525
2362	{ 0.74F, 0.65F, 0.41F },	2526	{ 0.74f, 0.65f, 0.41f },
2363		2527
2364	{ 0.00F, 1.00F, 1.00F },	2528	{ 0.00f, 1.00f, 1.00f },
2365	{ 1.00F, 0.00F, 1.00F },	2529	{ 1.00f, 0.00f, 1.00f },
2366	{ 1.00F, 1.00F, 0.00F },	2530	{ 1.00f, 1.00f, 0.00f },
2367	};	2531	};
2368		2532
2369	int x, y;	2533	int x, y;
2370		2534
2371	glEnable (GL_TEXTURE_2D);	2535	glEnable (GL_TEXTURE_2D);
		2536	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2537	* but the nvidia driver (185.18.14) mishandles alpha textures
		2538	* and takes the colour from god knows where instead of using
		2539	* Cp. MODULATE results in the same colour, but slightly different
		2540	* alpha, but atcually gives us the correct colour with nvidia.
		2541	*/
2372	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2542	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373	glEnable (GL_BLEND);	2543	glEnable (GL_BLEND);
2374	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2544	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375	glBegin (GL_QUADS);	2545	glBegin (GL_QUADS);
2376		2546
2377	for (y = 0; y < h; y++)	2547	for (y = 0; y < h; y++)
…		…
2381		2551
2382	if (m)	2552	if (m)
2383	{	2553	{
2384	float *c = color [m & 15];	2554	float *c = color [m & 15];
2385		2555
2386	float tx1 = m & 0x40 ? 0.5 : 0.;	2556	float tx1 = m & 0x40 ? 0.5f : 0.f;
2387	float tx2 = tx1 + 0.5;	2557	float tx2 = tx1 + 0.5f;
2388		2558
2389	glColor4f (c[0], c[1], c[2], 0.75);	2559	glColor4f (c[0], c[1], c[2], 1);
2390	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2560	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2561	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2562	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2563	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394	}	2564	}
…		…
2402	void	2572	void
2403	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2573	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2404	PPCODE:	2574	PPCODE:
2405	{	2575	{
2406	int x, y;	2576	int x, y;
2407	int sw1 = sw + 2;	2577	int sw1 = sw + 2;
2408	int sh1 = sh + 2;	2578	int sh1 = sh + 2;
2409	int sh3 = sh * 3;	2579	int sh3 = sh * 3;
2410	int sw34 = (sw * 3 + 3) & ~3;	2580	int sw3 = sw * 3;
		2581	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2582	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2411	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2583	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2412	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2584	memset (darkness1, 0, sw1*sh1);
2413	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2414		2585
2415	SvPOK_only (darkness3_sv);	2586	SvPOK_only (darkness3_sv);
2416	SvCUR_set (darkness3_sv, sw34 * sh3);	2587	SvCUR_set (darkness3_sv, sw3 * sh3);
2417		2588
2418	mx += self->x - 1;	2589	mx += self->x - 1;
2419	my += self->y - 1;	2590	my += self->y - 1;
2420
2421	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422		2591
2423	for (y = 0; y < sh1; y++)	2592	for (y = 0; y < sh1; y++)
2424	if (0 <= y + my && y + my < self->rows)	2593	if (0 <= y + my && y + my < self->rows)
2425	{	2594	{
2426	maprow *row = self->row + (y + my);	2595	maprow *row = self->row + (y + my);
…		…
2429	if (row->c0 <= x + mx && x + mx < row->c1)	2598	if (row->c0 <= x + mx && x + mx < row->c1)
2430	{	2599	{
2431	mapcell *cell = row->col + (x + mx - row->c0);	2600	mapcell *cell = row->col + (x + mx - row->c0);
2432		2601
2433	darkness1 [y * sw1 + x] = cell->darkness	2602	darkness1 [y * sw1 + x] = cell->darkness
2434	? 255 - (cell->darkness - 1)	2603	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435	: 255 - FOW_DARKNESS;	2604	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436	}	2605	}
2437	}	2606	}
2438		2607
2439	for (y = 0; y < sh; ++y)	2608	for (y = 0; y < sh; ++y)
2440	for (x = 0; x < sw; ++x)	2609	for (x = 0; x < sw; ++x)
…		…
2459		2628
2460	uint8_t r13 = (d13 + d23 + d12) / 3;	2629	uint8_t r13 = (d13 + d23 + d12) / 3;
2461	uint8_t r23 = d23;	2630	uint8_t r23 = d23;
2462	uint8_t r33 = (d23 + d33 + d32) / 3;	2631	uint8_t r33 = (d23 + d33 + d32) / 3;
2463		2632
2464	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2633	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2634	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2635	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2636	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2637	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2469	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2638	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2639	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2640	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2641	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473	}	2642	}
2474		2643
2475	free (darkness1);	2644	free (darkness1);
2476		2645
2477	EXTEND (SP, 3);	2646	EXTEND (SP, 3);
2478	PUSHs (sv_2mortal (newSViv (sw34)));	2647	PUSHs (sv_2mortal (newSViv (sw3)));
2479	PUSHs (sv_2mortal (newSViv (sh3)));	2648	PUSHs (sv_2mortal (newSViv (sh3)));
2480	PUSHs (darkness3_sv);	2649	PUSHs (darkness3_sv);
2481	}	2650	}
2482		2651
2483	SV *	2652	SV *
…		…
2681	if (RETVAL < 0)	2850	if (RETVAL < 0)
2682	{	2851	{
2683	RETVAL = Mix_GroupOldest (-1);	2852	RETVAL = Mix_GroupOldest (-1);
2684		2853
2685	if (RETVAL < 0)	2854	if (RETVAL < 0)
		2855	{
		2856	// happens sometimes, maybe it just stopped playing(?)
		2857	RETVAL = Mix_GroupAvailable (-1);
		2858
		2859	if (RETVAL < 0)
2686	XSRETURN_UNDEF;	2860	XSRETURN_UNDEF;
2687		2861	}
		2862	else
2688	Mix_HaltChannel (RETVAL);	2863	Mix_HaltChannel (RETVAL);
2689	}	2864	}
2690		2865
2691	Mix_UnregisterAllEffects (RETVAL);	2866	Mix_UnregisterAllEffects (RETVAL);
2692	Mix_Volume (RETVAL, 128);	2867	Mix_Volume (RETVAL, 128);
2693	}	2868	}
…		…
2740	void	2915	void
2741	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2916	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742	CODE:	2917	CODE:
2743	{	2918	{
2744	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2919	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2745	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2920	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2746	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2921	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747	}	2922	}
2748		2923
2749	void	2924	void
2750	set_reverse_stereo (DC::Channel self, int flip)	2925	set_reverse_stereo (DC::Channel self, int flip)
…		…
2752	Mix_SetReverseStereo (self, flip);	2927	Mix_SetReverseStereo (self, flip);
2753		2928
2754	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2929	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755		2930
2756	PROTOTYPES: DISABLE	2931	PROTOTYPES: DISABLE
		2932
		2933	void
		2934	decoders ()
		2935	PPCODE:
		2936	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2937	int i, num = Mix_GetNumChunkDecoders ();
		2938	EXTEND (SP, num);
		2939	for (i = 0; i < num; ++i)
		2940	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2941	#else
		2942	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2943	#endif
2757		2944
2758	DC::MixChunk	2945	DC::MixChunk
2759	new (SV *class, DC::RW rwops)	2946	new (SV *class, DC::RW rwops)
2760	CODE:	2947	CODE:
2761	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2948	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2794	OUTPUT:	2981	OUTPUT:
2795	RETVAL	2982	RETVAL
2796		2983
2797	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2984	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798		2985
		2986	void
		2987	decoders ()
		2988	PPCODE:
		2989	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2990	int i, num = Mix_GetNumMusicDecoders ();
		2991	EXTEND (SP, num);
		2992	for (i = 0; i < num; ++i)
		2993	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2994	#else
		2995	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2996	#endif
		2997
2799	int	2998	int
2800	volume (int volume = -1)	2999	volume (int volume = -1)
2801	PROTOTYPE: ;$	3000	PROTOTYPE: ;$
2802	CODE:	3001	CODE:
2803	if (items > 0)	3002	if (items > 0)
…		…
2813		3012
2814	void	3013	void
2815	halt ()	3014	halt ()
2816	CODE:	3015	CODE:
2817	Mix_HaltMusic ();	3016	Mix_HaltMusic ();
		3017
		3018	int
		3019	playing ()
		3020	CODE:
		3021	RETVAL = Mix_PlayingMusic ();
		3022	OUTPUT:
		3023	RETVAL
2818		3024
2819	DC::MixMusic	3025	DC::MixMusic
2820	new (SV *class, DC::RW rwops)	3026	new (SV *class, DC::RW rwops)
2821	CODE:	3027	CODE:
2822	RETVAL = Mix_LoadMUS_RW (rwops);	3028	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2853	} *civ, const_iv[] = {	3059	} *civ, const_iv[] = {
2854	# define const_iv(name) { # name, (IV)name }	3060	# define const_iv(name) { # name, (IV)name }
2855	const_iv (GL_VENDOR),	3061	const_iv (GL_VENDOR),
2856	const_iv (GL_VERSION),	3062	const_iv (GL_VERSION),
2857	const_iv (GL_EXTENSIONS),	3063	const_iv (GL_EXTENSIONS),
		3064	const_iv (GL_MAX_TEXTURE_UNITS),
2858	const_iv (GL_COLOR_MATERIAL),	3065	const_iv (GL_COLOR_MATERIAL),
2859	const_iv (GL_SMOOTH),	3066	const_iv (GL_SMOOTH),
2860	const_iv (GL_FLAT),	3067	const_iv (GL_FLAT),
2861	const_iv (GL_DITHER),	3068	const_iv (GL_DITHER),
2862	const_iv (GL_BLEND),	3069	const_iv (GL_BLEND),
…		…
2874	const_iv (GL_ZERO),	3081	const_iv (GL_ZERO),
2875	const_iv (GL_SRC_ALPHA),	3082	const_iv (GL_SRC_ALPHA),
2876	const_iv (GL_DST_ALPHA),	3083	const_iv (GL_DST_ALPHA),
2877	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3084	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878	const_iv (GL_ONE_MINUS_DST_ALPHA),	3085	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3086	const_iv (GL_SRC_COLOR),
		3087	const_iv (GL_DST_COLOR),
		3088	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3089	const_iv (GL_ONE_MINUS_DST_COLOR),
2879	const_iv (GL_SRC_ALPHA_SATURATE),	3090	const_iv (GL_SRC_ALPHA_SATURATE),
2880	const_iv (GL_RGB),	3091	const_iv (GL_RGB),
2881	const_iv (GL_RGBA),	3092	const_iv (GL_RGBA),
2882	const_iv (GL_RGBA4),	3093	const_iv (GL_RGBA4),
2883	const_iv (GL_RGBA8),	3094	const_iv (GL_RGBA8),
…		…
2951	const_iv (GL_NICEST),	3162	const_iv (GL_NICEST),
2952	const_iv (GL_V2F),	3163	const_iv (GL_V2F),
2953	const_iv (GL_V3F),	3164	const_iv (GL_V3F),
2954	const_iv (GL_T2F_V3F),	3165	const_iv (GL_T2F_V3F),
2955	const_iv (GL_T2F_N3F_V3F),	3166	const_iv (GL_T2F_N3F_V3F),
		3167	const_iv (GL_FUNC_ADD),
		3168	const_iv (GL_FUNC_SUBTRACT),
		3169	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2956	# undef const_iv	3170	# undef const_iv
2957	};	3171	};
2958		3172
2959	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3173	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2960	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3174	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961		3175
2962	texture_av = newAV ();	3176	texture_av = newAV ();
2963	AvREAL_off (texture_av);	3177	AvREAL_off (texture_av);
2964	}	3178	}
2965		3179
2966	void	3180	void
2967	disable_GL_EXT_blend_func_separate ()	3181	disable_GL_EXT_blend_func_separate ()
2968	CODE:	3182	CODE:
2969	gl.BlendFuncSeparate = 0;	3183	gl.BlendFuncSeparate = 0;
2970	gl.BlendFuncSeparateEXT = 0;	3184	gl.BlendFuncSeparateEXT = 0;
		3185
		3186	void
		3187	apple_nvidia_bug (int enable)
2971		3188
2972	char *	3189	char *
2973	gl_vendor ()	3190	gl_vendor ()
2974	CODE:	3191	CODE:
2975	RETVAL = (char *)glGetString (GL_VENDOR);	3192	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
3006		3223
3007	int glGetError ()	3224	int glGetError ()
3008		3225
3009	void glFinish ()	3226	void glFinish ()
3010		3227
		3228	void glFlush ()
		3229
3011	void glClear (int mask)	3230	void glClear (int mask)
3012		3231
3013	void glClearColor (float r, float g, float b, float a = 1.0)	3232	void glClearColor (float r, float g, float b, float a = 1.0)
3014	PROTOTYPE: @	3233	PROTOTYPE: @
3015		3234
…		…
3024	void glBlendFunc (int sfactor, int dfactor)	3243	void glBlendFunc (int sfactor, int dfactor)
3025		3244
3026	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3245	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027	CODE:	3246	CODE:
3028	gl_BlendFuncSeparate (sa, da, saa, daa);	3247	gl_BlendFuncSeparate (sa, da, saa, daa);
		3248
		3249	# void glBlendEquation (int se)
3029		3250
3030	void glDepthMask (int flag)	3251	void glDepthMask (int flag)
3031		3252
3032	void glLogicOp (int opcode)	3253	void glLogicOp (int opcode)
3033		3254
…		…
3183	void glNewList (int list, int mode = GL_COMPILE)	3404	void glNewList (int list, int mode = GL_COMPILE)
3184		3405
3185	void glEndList ()	3406	void glEndList ()
3186		3407
3187	void glCallList (int list)	3408	void glCallList (int list)
		3409
		3410	void c_init ()
		3411	CODE:
		3412	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3413	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3188		3414
3189	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3415	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190		3416
3191	PROTOTYPES: DISABLE	3417	PROTOTYPES: DISABLE
3192		3418

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.287 by root, Sun Dec 21 21:54:27 2008 UTC vs. Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.287 by root, Sun Dec 21 21:54:27 2008 UTC vs.
Revision 1.311 by root, Tue Dec 27 09:17:27 2011 UTC