[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.308 by root, Fri Jul 29 08:35:35 2011 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 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	{
…		…
457	ev.code = 1;	479	ev.code = 1;
458	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
459	ev.data2 = 0;	481	ev.data2 = 0;
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
462	}	490	}
463		491
464	static unsigned int	492	static unsigned int
465	minpot (unsigned int n)	493	minpot (unsigned int n)
466	{	494	{
…		…
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
…		…
1015		1052
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1054	}
1018	}	1055	}
1019		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
1020	int	1070	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1072	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1136	add_font (char *file)
1087	CODE:	1137	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1139	OUTPUT:
1090	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1091		1144
1092	void	1145	void
1093	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
1094	ALIAS:	1147	ALIAS:
1095	load_image_file = 1	1148	load_image_file = 1
…		…
1658	glDisable (GL_ALPHA_TEST);	1711	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1660	}	1713	}
1661	}	1714	}
1662		1715
		1716	void
		1717	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
		1718	PROTOTYPE: @
		1719	CODE:
		1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1723	glEnable (GL_TEXTURE_2D);
		1724	glBindTexture (GL_TEXTURE_2D, name1);
		1725
		1726	glColor3f (intensity, intensity, intensity);
		1727	glPushMatrix ();
		1728	glScalef (1./3, 1./3, 1.);
		1729
		1730	if (blend > 0.f)
		1731	{
		1732	float dx3 = dx * -3.f / w;
		1733	float dy3 = dy * -3.f / h;
		1734	GLfloat env_color[4] = { 0., 0., 0., blend };
		1735
		1736	/* interpolate the two shadow textures */
		1737	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1738	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1739
		1740	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1741	gl.ActiveTexture (GL_TEXTURE1);
		1742	glEnable (GL_TEXTURE_2D);
		1743	glBindTexture (GL_TEXTURE_2D, name2);
		1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1745
		1746	/* rgb == rgb(glcolor) */
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1750
		1751	/* alpha = interpolate t0, t1 by env_alpha */
		1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1753
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1757
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glBegin (GL_QUADS);
		1765	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1766	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1767	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1769	glEnd ();
		1770
		1771	glDisable (GL_TEXTURE_2D);
		1772	gl.ActiveTexture (GL_TEXTURE0);
		1773	}
		1774	else
		1775	{
		1776	/* simple blending of one texture, also opengl <1.3 path */
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1778
		1779	glBegin (GL_QUADS);
		1780	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1781	glTexCoord2f (0, t); glVertex2f (0, h);
		1782	glTexCoord2f (s, t); glVertex2f (w, h);
		1783	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1784	glEnd ();
		1785	}
		1786
		1787	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1788	{
		1789	int x, y;
		1790	int dx3 = dx * 3;
		1791	int dy3 = dy * 3;
		1792
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1794	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1795	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1796	glTranslatef (-1., -1., 0);
		1797	glBegin (GL_QUADS);
		1798
		1799	for (y = 1; y < h; y += 3)
		1800	{
		1801	int y1 = y - dy3;
		1802	int y1valid = y1 >= 0 && y1 < h;
		1803
		1804	for (x = 1; x < w; x += 3)
		1805	{
		1806	int x1 = x - dx3;
		1807	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1808	uint8_t h2;
		1809
		1810	if (y1valid && x1 >= 0 && x1 < w)
		1811	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1812	else
		1813	h2 = 1; /* out of range == invisible */
		1814
		1815	if (h1 \|\| h2)
		1816	{
		1817	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1818	glColor4f (1., 1., 1., alpha);
		1819
		1820	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1821	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1822	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1823	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1824	}
		1825	}
		1826	}
		1827	}
		1828
		1829	glEnd ();
		1830
		1831	glPopMatrix ();
		1832
		1833	glDisable (GL_TEXTURE_2D);
		1834	glDisable (GL_BLEND);
		1835	}
		1836
1663	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1837	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664	CODE:	1838	CODE:
1665	{	1839	{
1666	GLint width;	1840	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1841	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1881	{	2055	{
1882	ext = *data++;	2056	ext = *data++;
1883	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1884		2058
1885	if (cmd < 4)	2059	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1887	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1888	{	2062	{
1889	cell->stat_width = 1;	2063	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1891	}	2065	}
…		…
1966	? self->row + y	2140	? self->row + y
1967	: 0;	2141	: 0;
1968		2142
1969	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1970	{	2144	{
1971	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
1972		2146
1973	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
1974	{	2148	{
1975	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
1976		2150
…		…
1978	{	2152	{
1979	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
1980	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
1981	int a1 = tex.a;	2155	int a1 = tex.a;
1982		2156
1983	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
1984	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
1985	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
1986	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
1987	}	2161	}
1988	}	2162	}
1989		2163
1990	*map++ = (r )	2164	*map++ = (r )
1991	\| (g << 8)	2165	\| (g << 8)
…		…
1998	}	2172	}
1999	OUTPUT:	2173	OUTPUT:
2000	RETVAL	2174	RETVAL
2001		2175
2002	void	2176	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)	2177	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2004	CODE:	2178	CODE:
2005	{	2179	{
2006	int x, y, z;	2180	int x, y, z;
2007		2181
2008	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2012	int pl_x, pl_y;	2186	int pl_x, pl_y;
2013	maptex pl_tex;	2187	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2189	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2190	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2191	rc_array_t *arr;
2018		2192
2019	pl_tex.name = 0;	2193	pl_tex.name = 0;
2020		2194
2021	// thats current max. sorry.	2195	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
2023	if (sh > 255) sh = 255;	2197	if (sh > 255) sh = 255;
2024		2198
2025	// clear key, in case of extra padding	2199	// clear key, in case of extra padding
2026	memset (&skey, 0, sizeof (skey));	2200	memset (&skey, 0, sizeof (skey));
…		…
2059	}	2233	}
2060		2234
2061	glEnable (GL_BLEND);	2235	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2236	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	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		2238
2068	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
2069	{	2240	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2242	key.texname = -1;
…		…
2095		2266
2096	key.texname = tex.name;	2267	key.texname = tex.name;
2097	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
2098	}	2269	}
2099		2270
2100	px = (x + 1) * T - tex.w;	2271	px = (x + 1) * Th - tex.w;
2101	py = (y + 1) * T - tex.h;	2272	py = (y + 1) * Tw - tex.h;
2102		2273
2103	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
2104	{	2275	{
2105	pl_x = px;	2276	pl_x = px;
2106	pl_y = py;	2277	pl_y = py;
…		…
2151	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2322	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2152	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2323	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153	}	2324	}
2154	}	2325	}
2155		2326
2156	if (expect_false (z == 2))	2327	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2328	{
2158	/* draw question marks on top of hidden spaces */	2329	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2330	if (cell->flags & 1)
2160	{	2331	{
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;	2332	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2333	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2334	rc_array_t *arr;
		2335	int px = x * Tw + Tw * 2 / 32;
		2336	int py = y * Th - Th * 6 / 32;
2179		2337
2180	key_ov.texname = tex.name;	2338	key_ov.texname = tex.name;
2181	arr = rc_array (rc_ov, &key_ov);	2339	arr = rc_array (rc_ov, &key_ov);
2182		2340
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);	2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2187	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2342	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);	2343	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);	2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2190	}
2191	}	2345	}
2192	}	2346	}
2193	}	2347	}
2194	}	2348	}
2195		2349
…		…
2222	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2223	&& skey->level == level	2377	&& skey->level == level
2224	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2225	{	2379	{
2226	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2227	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2228	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2229	int border = bits & 15;	2383	int border = bits & 15;
2230	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2231	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2232	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2233		2387
…		…
2246		2400
2247	if (border)	2401	if (border)
2248	{	2402	{
2249	float ox = border * dx;	2403	float ox = border * dx;
2250		2404
2251	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2252	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2253	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2254	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2255	}	2409	}
2256		2410
2257	if (corner)	2411	if (corner)
2258	{	2412	{
2259	float ox = corner * dx;	2413	float ox = corner * dx;
2260		2414
2261	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2262	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2263	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2264	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2265	}	2419	}
2266	}	2420	}
2267	}	2421	}
2268	}	2422	}
2269	}	2423	}
…		…
2310	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2311	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2312	{	2466	{
2313	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2314		2468
2315	int px = x * T;	2469	int px = x * Tw;
2316	int py = y * T;	2470	int py = y * Th;
2317		2471
2318	if (expect_false (cell->player == player))	2472	if (expect_false (cell->player == player))
2319	{	2473	{
2320	px += sdx;	2474	px += sdx;
2321	py += sdy;	2475	py += sdy;
2322	}	2476	}
2323		2477
2324	if (cell->stat_hp)	2478	if (cell->stat_hp)
2325	{	2479	{
2326	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2327	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2328		2482
2329	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2330	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2331	px + width - 1, py);	2485	px + width - 1, py);
2332		2486
…		…
2338	}	2492	}
2339	}	2493	}
2340	}	2494	}
2341		2495
2342	void	2496	void
2343	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2497	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2344	CODE:	2498	CODE:
2345	{	2499	{
2346	static float color[16][3] = {	2500	static float color[16][3] = {
2347	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2348	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2349	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2350	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2351		2505
2352	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2353	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2354	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2355	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2356		2510
2357	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2358	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2359	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2360	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2361		2515
2362	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2363		2517
2364	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2365	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2366	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2367	};	2521	};
2368		2522
2369	int x, y;	2523	int x, y;
2370		2524
2371	glEnable (GL_TEXTURE_2D);	2525	glEnable (GL_TEXTURE_2D);
		2526	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2527	* but the nvidia driver (185.18.14) mishandles alpha textures
		2528	* and takes the colour from god knows where instead of using
		2529	* Cp. MODULATE results in the same colour, but slightly different
		2530	* alpha, but atcually gives us the correct colour with nvidia.
		2531	*/
2372	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2373	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
2374	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2375	glBegin (GL_QUADS);	2535	glBegin (GL_QUADS);
2376		2536
2377	for (y = 0; y < h; y++)	2537	for (y = 0; y < h; y++)
…		…
2381		2541
2382	if (m)	2542	if (m)
2383	{	2543	{
2384	float *c = color [m & 15];	2544	float *c = color [m & 15];
2385		2545
2386	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2387	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2388		2548
2389	glColor4f (c[0], c[1], c[2], 0.75);	2549	glColor4f (c[0], c[1], c[2], 1);
2390	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2391	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2392	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2393	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2394	}	2554	}
…		…
2402	void	2562	void
2403	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2563	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2404	PPCODE:	2564	PPCODE:
2405	{	2565	{
2406	int x, y;	2566	int x, y;
2407	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2408	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2409	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2410	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
		2571	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2572	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2411	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2573	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2412	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2574	memset (darkness1, 0, sw1*sh1);
2413	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2414		2575
2415	SvPOK_only (darkness3_sv);	2576	SvPOK_only (darkness3_sv);
2416	SvCUR_set (darkness3_sv, sw34 * sh3);	2577	SvCUR_set (darkness3_sv, sw3 * sh3);
2417		2578
2418	mx += self->x - 1;	2579	mx += self->x - 1;
2419	my += self->y - 1;	2580	my += self->y - 1;
2420
2421	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2422		2581
2423	for (y = 0; y < sh1; y++)	2582	for (y = 0; y < sh1; y++)
2424	if (0 <= y + my && y + my < self->rows)	2583	if (0 <= y + my && y + my < self->rows)
2425	{	2584	{
2426	maprow *row = self->row + (y + my);	2585	maprow *row = self->row + (y + my);
…		…
2429	if (row->c0 <= x + mx && x + mx < row->c1)	2588	if (row->c0 <= x + mx && x + mx < row->c1)
2430	{	2589	{
2431	mapcell *cell = row->col + (x + mx - row->c0);	2590	mapcell *cell = row->col + (x + mx - row->c0);
2432		2591
2433	darkness1 [y * sw1 + x] = cell->darkness	2592	darkness1 [y * sw1 + x] = cell->darkness
2434	? 255 - (cell->darkness - 1)	2593	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2435	: 255 - FOW_DARKNESS;	2594	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2436	}	2595	}
2437	}	2596	}
2438		2597
2439	for (y = 0; y < sh; ++y)	2598	for (y = 0; y < sh; ++y)
2440	for (x = 0; x < sw; ++x)	2599	for (x = 0; x < sw; ++x)
…		…
2459		2618
2460	uint8_t r13 = (d13 + d23 + d12) / 3;	2619	uint8_t r13 = (d13 + d23 + d12) / 3;
2461	uint8_t r23 = d23;	2620	uint8_t r23 = d23;
2462	uint8_t r33 = (d23 + d33 + d32) / 3;	2621	uint8_t r33 = (d23 + d33 + d32) / 3;
2463		2622
2464	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2465	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2466	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2625	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2467	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2626	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2468	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2469	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2628	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2470	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2471	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2472	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2631	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2473	}	2632	}
2474		2633
2475	free (darkness1);	2634	free (darkness1);
2476		2635
2477	EXTEND (SP, 3);	2636	EXTEND (SP, 3);
2478	PUSHs (sv_2mortal (newSViv (sw34)));	2637	PUSHs (sv_2mortal (newSViv (sw3)));
2479	PUSHs (sv_2mortal (newSViv (sh3)));	2638	PUSHs (sv_2mortal (newSViv (sh3)));
2480	PUSHs (darkness3_sv);	2639	PUSHs (darkness3_sv);
2481	}	2640	}
2482		2641
2483	SV *	2642	SV *
…		…
2681	if (RETVAL < 0)	2840	if (RETVAL < 0)
2682	{	2841	{
2683	RETVAL = Mix_GroupOldest (-1);	2842	RETVAL = Mix_GroupOldest (-1);
2684		2843
2685	if (RETVAL < 0)	2844	if (RETVAL < 0)
		2845	{
		2846	// happens sometimes, maybe it just stopped playing(?)
		2847	RETVAL = Mix_GroupAvailable (-1);
		2848
		2849	if (RETVAL < 0)
2686	XSRETURN_UNDEF;	2850	XSRETURN_UNDEF;
2687		2851	}
		2852	else
2688	Mix_HaltChannel (RETVAL);	2853	Mix_HaltChannel (RETVAL);
2689	}	2854	}
2690		2855
2691	Mix_UnregisterAllEffects (RETVAL);	2856	Mix_UnregisterAllEffects (RETVAL);
2692	Mix_Volume (RETVAL, 128);	2857	Mix_Volume (RETVAL, 128);
2693	}	2858	}
…		…
2740	void	2905	void
2741	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2906	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2742	CODE:	2907	CODE:
2743	{	2908	{
2744	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2909	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2745	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2910	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2746	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2911	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2747	}	2912	}
2748		2913
2749	void	2914	void
2750	set_reverse_stereo (DC::Channel self, int flip)	2915	set_reverse_stereo (DC::Channel self, int flip)
…		…
2752	Mix_SetReverseStereo (self, flip);	2917	Mix_SetReverseStereo (self, flip);
2753		2918
2754	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2919	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2755		2920
2756	PROTOTYPES: DISABLE	2921	PROTOTYPES: DISABLE
		2922
		2923	void
		2924	decoders ()
		2925	PPCODE:
		2926	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2927	int i, num = Mix_GetNumChunkDecoders ();
		2928	EXTEND (SP, num);
		2929	for (i = 0; i < num; ++i)
		2930	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2931	#else
		2932	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2933	#endif
2757		2934
2758	DC::MixChunk	2935	DC::MixChunk
2759	new (SV *class, DC::RW rwops)	2936	new (SV *class, DC::RW rwops)
2760	CODE:	2937	CODE:
2761	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2938	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2794	OUTPUT:	2971	OUTPUT:
2795	RETVAL	2972	RETVAL
2796		2973
2797	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2974	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2798		2975
		2976	void
		2977	decoders ()
		2978	PPCODE:
		2979	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2980	int i, num = Mix_GetNumMusicDecoders ();
		2981	EXTEND (SP, num);
		2982	for (i = 0; i < num; ++i)
		2983	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2984	#else
		2985	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2986	#endif
		2987
2799	int	2988	int
2800	volume (int volume = -1)	2989	volume (int volume = -1)
2801	PROTOTYPE: ;$	2990	PROTOTYPE: ;$
2802	CODE:	2991	CODE:
2803	if (items > 0)	2992	if (items > 0)
…		…
2813		3002
2814	void	3003	void
2815	halt ()	3004	halt ()
2816	CODE:	3005	CODE:
2817	Mix_HaltMusic ();	3006	Mix_HaltMusic ();
		3007
		3008	int
		3009	playing ()
		3010	CODE:
		3011	RETVAL = Mix_PlayingMusic ();
		3012	OUTPUT:
		3013	RETVAL
2818		3014
2819	DC::MixMusic	3015	DC::MixMusic
2820	new (SV *class, DC::RW rwops)	3016	new (SV *class, DC::RW rwops)
2821	CODE:	3017	CODE:
2822	RETVAL = Mix_LoadMUS_RW (rwops);	3018	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2853	} *civ, const_iv[] = {	3049	} *civ, const_iv[] = {
2854	# define const_iv(name) { # name, (IV)name }	3050	# define const_iv(name) { # name, (IV)name }
2855	const_iv (GL_VENDOR),	3051	const_iv (GL_VENDOR),
2856	const_iv (GL_VERSION),	3052	const_iv (GL_VERSION),
2857	const_iv (GL_EXTENSIONS),	3053	const_iv (GL_EXTENSIONS),
		3054	const_iv (GL_MAX_TEXTURE_UNITS),
2858	const_iv (GL_COLOR_MATERIAL),	3055	const_iv (GL_COLOR_MATERIAL),
2859	const_iv (GL_SMOOTH),	3056	const_iv (GL_SMOOTH),
2860	const_iv (GL_FLAT),	3057	const_iv (GL_FLAT),
2861	const_iv (GL_DITHER),	3058	const_iv (GL_DITHER),
2862	const_iv (GL_BLEND),	3059	const_iv (GL_BLEND),
…		…
2874	const_iv (GL_ZERO),	3071	const_iv (GL_ZERO),
2875	const_iv (GL_SRC_ALPHA),	3072	const_iv (GL_SRC_ALPHA),
2876	const_iv (GL_DST_ALPHA),	3073	const_iv (GL_DST_ALPHA),
2877	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3074	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2878	const_iv (GL_ONE_MINUS_DST_ALPHA),	3075	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3076	const_iv (GL_SRC_COLOR),
		3077	const_iv (GL_DST_COLOR),
		3078	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3079	const_iv (GL_ONE_MINUS_DST_COLOR),
2879	const_iv (GL_SRC_ALPHA_SATURATE),	3080	const_iv (GL_SRC_ALPHA_SATURATE),
2880	const_iv (GL_RGB),	3081	const_iv (GL_RGB),
2881	const_iv (GL_RGBA),	3082	const_iv (GL_RGBA),
2882	const_iv (GL_RGBA4),	3083	const_iv (GL_RGBA4),
2883	const_iv (GL_RGBA8),	3084	const_iv (GL_RGBA8),
…		…
2951	const_iv (GL_NICEST),	3152	const_iv (GL_NICEST),
2952	const_iv (GL_V2F),	3153	const_iv (GL_V2F),
2953	const_iv (GL_V3F),	3154	const_iv (GL_V3F),
2954	const_iv (GL_T2F_V3F),	3155	const_iv (GL_T2F_V3F),
2955	const_iv (GL_T2F_N3F_V3F),	3156	const_iv (GL_T2F_N3F_V3F),
		3157	const_iv (GL_FUNC_ADD),
		3158	const_iv (GL_FUNC_SUBTRACT),
		3159	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2956	# undef const_iv	3160	# undef const_iv
2957	};	3161	};
2958		3162
2959	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3163	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2960	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3164	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2961		3165
2962	texture_av = newAV ();	3166	texture_av = newAV ();
2963	AvREAL_off (texture_av);	3167	AvREAL_off (texture_av);
2964	}	3168	}
2965		3169
2966	void	3170	void
2967	disable_GL_EXT_blend_func_separate ()	3171	disable_GL_EXT_blend_func_separate ()
2968	CODE:	3172	CODE:
2969	gl.BlendFuncSeparate = 0;	3173	gl.BlendFuncSeparate = 0;
2970	gl.BlendFuncSeparateEXT = 0;	3174	gl.BlendFuncSeparateEXT = 0;
		3175
		3176	void
		3177	apple_nvidia_bug (int enable)
2971		3178
2972	char *	3179	char *
2973	gl_vendor ()	3180	gl_vendor ()
2974	CODE:	3181	CODE:
2975	RETVAL = (char *)glGetString (GL_VENDOR);	3182	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
3006		3213
3007	int glGetError ()	3214	int glGetError ()
3008		3215
3009	void glFinish ()	3216	void glFinish ()
3010		3217
		3218	void glFlush ()
		3219
3011	void glClear (int mask)	3220	void glClear (int mask)
3012		3221
3013	void glClearColor (float r, float g, float b, float a = 1.0)	3222	void glClearColor (float r, float g, float b, float a = 1.0)
3014	PROTOTYPE: @	3223	PROTOTYPE: @
3015		3224
…		…
3024	void glBlendFunc (int sfactor, int dfactor)	3233	void glBlendFunc (int sfactor, int dfactor)
3025		3234
3026	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3235	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3027	CODE:	3236	CODE:
3028	gl_BlendFuncSeparate (sa, da, saa, daa);	3237	gl_BlendFuncSeparate (sa, da, saa, daa);
		3238
		3239	# void glBlendEquation (int se)
3029		3240
3030	void glDepthMask (int flag)	3241	void glDepthMask (int flag)
3031		3242
3032	void glLogicOp (int opcode)	3243	void glLogicOp (int opcode)
3033		3244
…		…
3183	void glNewList (int list, int mode = GL_COMPILE)	3394	void glNewList (int list, int mode = GL_COMPILE)
3184		3395
3185	void glEndList ()	3396	void glEndList ()
3186		3397
3187	void glCallList (int list)	3398	void glCallList (int list)
		3399
		3400	void c_init ()
		3401	CODE:
		3402	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3403	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3188		3404
3189	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3405	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3190		3406
3191	PROTOTYPES: DISABLE	3407	PROTOTYPES: DISABLE
3192		3408

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.308 by root, Fri Jul 29 08:35:35 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.308 by root, Fri Jul 29 08:35:35 2011 UTC