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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.278 by root, Wed Sep 3 10:36:25 2008 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
92		96
93	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
97		104
98	static AV *texture_av;	105	static AV *texture_av;
99		106
100	static struct	107	static struct
101	{	108	{
…		…
233	int w, h;	240	int w, h;
234	float s, t;	241	float s, t;
235	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
236	tileid smoothtile;	243	tileid smoothtile;
237	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
238	} maptex;	246	} maptex;
239		247
240	typedef struct {	248	typedef struct {
241	uint32_t player;	249	uint32_t player;
242	tileid tile[3];	250	tileid tile[3];
…		…
816		824
817	IV minpot (UV n)	825	IV minpot (UV n)
818		826
819	IV popcount (UV n)	827	IV popcount (UV n)
820		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
821	void	835	void
822	pango_init ()	836	pango_init ()
823	CODE:	837	CODE:
824	{	838	{
825	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
…		…
916		930
917	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
918	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
919	#include "glfunc.h"	933	#include "glfunc.h"
920	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
921	}	938	}
922	}	939	}
923	OUTPUT:	940	OUTPUT:
924	RETVAL	941	RETVAL
925		942
…		…
1010		1027
1011	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1012	}	1029	}
1013	}	1030	}
1014		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
		1044
1015	int	1045	int
1016	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1017	POSTCALL:	1047	POSTCALL:
1018	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
1019	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
1081	add_font (char *file)	1111	add_font (char *file)
1082	CODE:	1112	CODE:
1083	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1084	OUTPUT:	1114	OUTPUT:
1085	RETVAL	1115	RETVAL
		1116
		1117	void
		1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1086		1119
1087	void	1120	void
1088	load_image_inline (SV *image_)	1121	load_image_inline (SV *image_)
1089	ALIAS:	1122	ALIAS:
1090	load_image_file = 1	1123	load_image_file = 1
…		…
1206	#if DEBUG	1239	#if DEBUG
1207	VALGRIND_DO_LEAK_CHECK;	1240	VALGRIND_DO_LEAK_CHECK;
1208	#endif	1241	#endif
1209	}	1242	}
1210		1243
		1244	int
		1245	SvREFCNT (SV *sv)
		1246	CODE:
		1247	RETVAL = SvREFCNT (sv);
		1248	OUTPUT:
		1249	RETVAL
		1250
1211	MODULE = Deliantra::Client PACKAGE = DC::Font	1251	MODULE = Deliantra::Client PACKAGE = DC::Font
1212		1252
1213	PROTOTYPES: DISABLE	1253	PROTOTYPES: DISABLE
1214		1254
1215	DC::Font	1255	DC::Font
…		…
1644	if (ix)	1684	if (ix)
1645	{	1685	{
1646	glDisable (GL_ALPHA_TEST);	1686	glDisable (GL_ALPHA_TEST);
1647	glDisable (GL_BLEND);	1687	glDisable (GL_BLEND);
1648	}	1688	}
		1689	}
		1690
		1691	void
		1692	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)
		1693	PROTOTYPE: @
		1694	CODE:
		1695	{
		1696	glEnable (GL_BLEND);
		1697	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1698	glEnable (GL_TEXTURE_2D);
		1699	glBindTexture (GL_TEXTURE_2D, name1);
		1700
		1701	glColor3f (intensity, intensity, intensity);
		1702	glPushMatrix ();
		1703	glScalef (1./3, 1./3, 1.);
		1704
		1705	if (blend > 0.f)
		1706	{
		1707	float dx3 = dx * -3.f / w;
		1708	float dy3 = dy * -3.f / h;
		1709	GLfloat env_color[4] = { 0., 0., 0., blend };
		1710
		1711	/* interpolate the two shadow textures */
		1712	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1713	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1714
		1715	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1716	gl.ActiveTexture (GL_TEXTURE1);
		1717	glEnable (GL_TEXTURE_2D);
		1718	glBindTexture (GL_TEXTURE_2D, name2);
		1719	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1720
		1721	/* rgb == rgb(glcolor) */
		1722	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1723	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1724	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1725
		1726	/* alpha = interpolate t0, t1 by env_alpha */
		1727	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1728
		1729	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1730	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1732
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1735
		1736	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1737	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1738
		1739	glBegin (GL_QUADS);
		1740	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1741	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1742	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1743	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1744	glEnd ();
		1745
		1746	glDisable (GL_TEXTURE_2D);
		1747	gl.ActiveTexture (GL_TEXTURE0);
		1748	}
		1749	else
		1750	{
		1751	/* simple blending of one texture, also opengl <1.3 path */
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1753
		1754	glBegin (GL_QUADS);
		1755	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1756	glTexCoord2f (0, t); glVertex2f (0, h);
		1757	glTexCoord2f (s, t); glVertex2f (w, h);
		1758	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1759	glEnd ();
		1760	}
		1761
		1762	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1763	{
		1764	int x, y;
		1765	int dx3 = dx * 3;
		1766	int dy3 = dy * 3;
		1767
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1769	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1770	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1771	glTranslatef (-1., -1., 0);
		1772	glBegin (GL_QUADS);
		1773
		1774	for (y = 1; y < h; y += 3)
		1775	{
		1776	int y1 = y - dy3;
		1777	int y1valid = y1 >= 0 && y1 < h;
		1778
		1779	for (x = 1; x < w; x += 3)
		1780	{
		1781	int x1 = x - dx3;
		1782	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1783	uint8_t h2;
		1784
		1785	if (y1valid && x1 >= 0 && x1 < w)
		1786	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1787	else
		1788	h2 = 1; /* out of range == invisible */
		1789
		1790	if (h1 \|\| h2)
		1791	{
		1792	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1793	glColor4f (1., 1., 1., alpha);
		1794
		1795	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1796	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1797	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1798	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1799	}
		1800	}
		1801	}
		1802	}
		1803
		1804	glEnd ();
		1805
		1806	glPopMatrix ();
		1807
		1808	glDisable (GL_TEXTURE_2D);
		1809	glDisable (GL_BLEND);
1649	}	1810	}
1650		1811
1651	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1812	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1652	CODE:	1813	CODE:
1653	{	1814	{
…		…
1759	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1920	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1760	// use uglier nearest interpolation because linear suffers	1921	// use uglier nearest interpolation because linear suffers
1761	// from transparent color bleeding and ugly wrapping effects.	1922	// from transparent color bleeding and ugly wrapping effects.
1762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1923	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1763	}	1924	}
		1925
		1926	void
		1927	expire_textures (DC::Map self, int texid, int count)
		1928	PPCODE:
		1929	for (; texid < self->texs && count; ++texid, --count)
		1930	{
		1931	maptex *tex = self->tex + texid;
		1932
		1933	if (tex->name)
		1934	{
		1935	if (tex->unused)
		1936	{
		1937	tex->name = 0;
		1938	tex->unused = 0;
		1939	XPUSHs (sv_2mortal (newSViv (texid)));
		1940	}
		1941	else
		1942	tex->unused = 1;
		1943	}
		1944	}
1764		1945
1765	int	1946	int
1766	ox (DC::Map self)	1947	ox (DC::Map self)
1767	ALIAS:	1948	ALIAS:
1768	oy = 1	1949	oy = 1
…		…
1849	{	2030	{
1850	ext = *data++;	2031	ext = *data++;
1851	cmd = ext & 0x7f;	2032	cmd = ext & 0x7f;
1852		2033
1853	if (cmd < 4)	2034	if (cmd < 4)
1854	cell->darkness = 255 - ext * 64 + 1;	2035	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1855	else if (cmd == 5) // health	2036	else if (cmd == 5) // health
1856	{	2037	{
1857	cell->stat_width = 1;	2038	cell->stat_width = 1;
1858	cell->stat_hp = *data++;	2039	cell->stat_hp = *data++;
1859	}	2040	}
…		…
1889	cell->tile [z] = self->face2tile [face];	2070	cell->tile [z] = self->face2tile [face];
1890		2071
1891	if (cell->tile [z])	2072	if (cell->tile [z])
1892	{	2073	{
1893	maptex *tex = self->tex + cell->tile [z];	2074	maptex *tex = self->tex + cell->tile [z];
		2075	tex->unused = 0;
1894	if (!tex->name)	2076	if (!tex->name)
1895	av_push (missing, newSViv (cell->tile [z]));	2077	av_push (missing, newSViv (cell->tile [z]));
1896		2078
1897	if (tex->smoothtile)	2079	if (tex->smoothtile)
1898	{	2080	{
1899	maptex *smooth = self->tex + tex->smoothtile;	2081	maptex *smooth = self->tex + tex->smoothtile;
		2082	smooth->unused = 0;
1900	if (!smooth->name)	2083	if (!smooth->name)
1901	av_push (missing, newSViv (tex->smoothtile));	2084	av_push (missing, newSViv (tex->smoothtile));
1902	}	2085	}
1903	}	2086	}
1904	}	2087	}
…		…
1975	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2158	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1976	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2159	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1977	smooth_key skey;	2160	smooth_key skey;
1978	int pl_x, pl_y;	2161	int pl_x, pl_y;
1979	maptex pl_tex;	2162	maptex pl_tex;
1980	rc_t *rc = rc_alloc ();	2163	rc_t *rc = rc_alloc ();
		2164	rc_t *rc_ov = rc_alloc ();
1981	rc_key_t key;	2165	rc_key_t key;
1982	rc_array_t *arr;	2166	rc_array_t *arr;
1983		2167
1984	pl_tex.name = 0;	2168	pl_tex.name = 0;
1985		2169
1986	// thats current max. sorry.	2170	// that's current max. sorry.
1987	if (sw > 255) sw = 255;	2171	if (sw > 255) sw = 255;
1988	if (sh > 255) sh = 255;	2172	if (sh > 255) sh = 255;
1989		2173
1990	// clear key, in case of extra padding	2174	// clear key, in case of extra padding
1991	memset (&skey, 0, sizeof (skey));	2175	memset (&skey, 0, sizeof (skey));
…		…
1995	key.g = 255;	2179	key.g = 255;
1996	key.b = 255;	2180	key.b = 255;
1997	key.a = 255;	2181	key.a = 255;
1998	key.mode = GL_QUADS;	2182	key.mode = GL_QUADS;
1999	key.format = GL_T2F_V3F;	2183	key.format = GL_T2F_V3F;
2000	key.texname = -1;
2001		2184
2002	mx += self->x;	2185	mx += self->x;
2003	my += self->y;	2186	my += self->y;
2004		2187
2005	// first pass: determine smooth_max	2188	// first pass: determine smooth_max
…		…
2029	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2212	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2030		2213
2031	for (z = 0; z <= 2; z++)	2214	for (z = 0; z <= 2; z++)
2032	{	2215	{
2033	memset (smooth_level, 0, sizeof (smooth_level));	2216	memset (smooth_level, 0, sizeof (smooth_level));
		2217	key.texname = -1;
2034		2218
2035	for (y = 0; y < sh; y++)	2219	for (y = 0; y < sh; y++)
2036	if (0 <= y + my && y + my < self->rows)	2220	if (0 <= y + my && y + my < self->rows)
2037	{	2221	{
2038	maprow *row = self->row + (y + my);	2222	maprow *row = self->row + (y + my);
…		…
2044	tileid tile = cell->tile [z];	2228	tileid tile = cell->tile [z];
2045		2229
2046	if (tile)	2230	if (tile)
2047	{	2231	{
2048	maptex tex = self->tex [tile];	2232	maptex tex = self->tex [tile];
2049	int px = (x + 1) * T - tex.w;	2233	int px, py;
2050	int py = (y + 1) * T - tex.h;
2051		2234
2052	if (key.texname != tex.name)	2235	if (key.texname != tex.name)
2053	{	2236	{
		2237	self->tex [tile].unused = 0;
		2238
2054	if (!tex.name)	2239	if (!tex.name)
2055	tex = self->tex [2]; /* missing, replace by noface */	2240	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2056		2241
2057	key.texname = tex.name;	2242	key.texname = tex.name;
2058	arr = rc_array (rc, &key);	2243	arr = rc_array (rc, &key);
2059	}	2244	}
		2245
		2246	px = (x + 1) * T - tex.w;
		2247	py = (y + 1) * T - tex.h;
2060		2248
2061	if (expect_false (cell->player == player) && expect_false (z == 2))	2249	if (expect_false (cell->player == player) && expect_false (z == 2))
2062	{	2250	{
2063	pl_x = px;	2251	pl_x = px;
2064	pl_y = py;	2252	pl_y = py;
…		…
2069	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2257	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2070	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2258	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2071	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2259	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2072	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2260	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2073		2261
2074	if (expect_false (cell->flags) && expect_false (z == 2))
2075	{
2076	// overlays such as the speech bubble, probably more to come
2077	if (cell->flags & 1)
2078	{
2079	maptex tex = self->tex [1];
2080	int px = x * T + T * 2 / 32;
2081	int py = y * T - T * 6 / 32;
2082
2083	if (tex.name)
2084	{
2085	if (key.texname != tex.name)
2086	{
2087	key.texname = tex.name;
2088	arr = rc_array (rc, &key);
2089	}
2090
2091	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2092	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2093	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2094	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2095	}
2096	}
2097	}
2098
2099	// update smooth hash	2262	// update smooth hash
2100	if (tex.smoothtile)	2263	if (tex.smoothtile)
2101	{	2264	{
2102	skey.tile = tex.smoothtile;	2265	skey.tile = tex.smoothtile;
2103	skey.level = tex.smoothlevel;	2266	skey.level = tex.smoothlevel;
…		…
2131	// corners	2294	// corners
2132	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2295	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2133	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2296	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2134	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2297	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2135	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2298	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2299	}
		2300	}
		2301
		2302	if (expect_false (z == 2) && expect_false (cell->flags))
		2303	{
		2304	// overlays such as the speech bubble, probably more to come
		2305	if (cell->flags & 1)
		2306	{
		2307	rc_key_t key_ov = key;
		2308	maptex tex = self->tex [TEXID_SPEECH];
		2309	rc_array_t *arr;
		2310	int px = x * T + T * 2 / 32;
		2311	int py = y * T - T * 6 / 32;
		2312
		2313	key_ov.texname = tex.name;
		2314	arr = rc_array (rc_ov, &key_ov);
		2315
		2316	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2317	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2318	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2319	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2136	}	2320	}
2137	}	2321	}
2138	}	2322	}
2139	}	2323	}
2140		2324
…		…
2180	{	2364	{
2181	// this time avoiding texture state changes	2365	// this time avoiding texture state changes
2182	// save gobs of state changes.	2366	// save gobs of state changes.
2183	if (key.texname != tex.name)	2367	if (key.texname != tex.name)
2184	{	2368	{
		2369	self->tex [skey->tile].unused = 0;
		2370
2185	glEnd ();	2371	glEnd ();
2186	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2372	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2187	glBegin (GL_QUADS);	2373	glBegin (GL_QUADS);
2188	}	2374	}
2189		2375
…		…
2235	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2421	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236		2422
2237	rc_draw (rc);	2423	rc_draw (rc);
2238	}	2424	}
2239		2425
		2426	rc_draw (rc_ov);
		2427	rc_clear (rc_ov);
		2428
2240	glDisable (GL_BLEND);	2429	glDisable (GL_BLEND);
2241	rc_free (rc);	2430	rc_free (rc);
		2431	rc_free (rc_ov);
2242		2432
2243	// top layer: overlays such as the health bar	2433	// top layer: overlays such as the health bar
2244	for (y = 0; y < sh; y++)	2434	for (y = 0; y < sh; y++)
2245	if (0 <= y + my && y + my < self->rows)	2435	if (0 <= y + my && y + my < self->rows)
2246	{	2436	{
…		…
2251	{	2441	{
2252	mapcell *cell = row->col + (x + mx - row->c0);	2442	mapcell *cell = row->col + (x + mx - row->c0);
2253		2443
2254	int px = x * T;	2444	int px = x * T;
2255	int py = y * T;	2445	int py = y * T;
		2446
		2447	if (expect_false (cell->player == player))
		2448	{
		2449	px += sdx;
		2450	py += sdy;
		2451	}
2256		2452
2257	if (cell->stat_hp)	2453	if (cell->stat_hp)
2258	{	2454	{
2259	int width = cell->stat_width * T;	2455	int width = cell->stat_width * T;
2260	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2456	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2271	}	2467	}
2272	}	2468	}
2273	}	2469	}
2274		2470
2275	void	2471	void
2276	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2472	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2277	CODE:	2473	CODE:
2278	{	2474	{
2279	static float color[16][3] = {	2475	static float color[16][3] = {
2280	{ 0.00F, 0.00F, 0.00F },	2476	{ 0.00f, 0.00f, 0.00f },
2281	{ 1.00F, 1.00F, 1.00F },	2477	{ 1.00f, 1.00f, 1.00f },
2282	{ 0.00F, 0.00F, 0.55F },	2478	{ 0.00f, 0.00f, 0.55f },
2283	{ 1.00F, 0.00F, 0.00F },	2479	{ 1.00f, 0.00f, 0.00f },
2284		2480
2285	{ 1.00F, 0.54F, 0.00F },	2481	{ 1.00f, 0.54f, 0.00f },
2286	{ 0.11F, 0.56F, 1.00F },	2482	{ 0.11f, 0.56f, 1.00f },
2287	{ 0.93F, 0.46F, 0.00F },	2483	{ 0.93f, 0.46f, 0.00f },
2288	{ 0.18F, 0.54F, 0.34F },	2484	{ 0.18f, 0.54f, 0.34f },
2289		2485
2290	{ 0.56F, 0.73F, 0.56F },	2486	{ 0.56f, 0.73f, 0.56f },
2291	{ 0.80F, 0.80F, 0.80F },	2487	{ 0.80f, 0.80f, 0.80f },
2292	{ 0.55F, 0.41F, 0.13F },	2488	{ 0.55f, 0.41f, 0.13f },
2293	{ 0.99F, 0.77F, 0.26F },	2489	{ 0.99f, 0.77f, 0.26f },
2294		2490
2295	{ 0.74F, 0.65F, 0.41F },	2491	{ 0.74f, 0.65f, 0.41f },
2296		2492
2297	{ 0.00F, 1.00F, 1.00F },	2493	{ 0.00f, 1.00f, 1.00f },
2298	{ 1.00F, 0.00F, 1.00F },	2494	{ 1.00f, 0.00f, 1.00f },
2299	{ 1.00F, 1.00F, 0.00F },	2495	{ 1.00f, 1.00f, 0.00f },
2300	};	2496	};
2301		2497
2302	int x, y;	2498	int x, y;
2303		2499
2304	glEnable (GL_TEXTURE_2D);	2500	glEnable (GL_TEXTURE_2D);
		2501	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2502	* but the nvidia driver (185.18.14) mishandles alpha textures
		2503	* and takes the colour from god knows where instead of using
		2504	* Cp. MODULATE results in the same colour, but slightly different
		2505	* alpha, but atcually gives us the correct colour with nvidia.
		2506	*/
2305	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2306	glEnable (GL_BLEND);	2508	glEnable (GL_BLEND);
2307	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2509	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2308	glBegin (GL_QUADS);	2510	glBegin (GL_QUADS);
2309		2511
2310	for (y = 0; y < h; y++)	2512	for (y = 0; y < h; y++)
…		…
2314		2516
2315	if (m)	2517	if (m)
2316	{	2518	{
2317	float *c = color [m & 15];	2519	float *c = color [m & 15];
2318		2520
2319	float tx1 = m & 0x40 ? 0.5 : 0.;	2521	float tx1 = m & 0x40 ? 0.5f : 0.f;
2320	float tx2 = tx1 + 0.5;	2522	float tx2 = tx1 + 0.5f;
2321		2523
2322	glColor4f (c[0], c[1], c[2], 0.75);	2524	glColor4f (c[0], c[1], c[2], 1);
2323	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2525	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2324	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2526	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2325	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2527	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2326	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2528	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2327	}	2529	}
…		…
2335	void	2537	void
2336	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2538	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2337	PPCODE:	2539	PPCODE:
2338	{	2540	{
2339	int x, y;	2541	int x, y;
2340	int sw1 = sw + 2;	2542	int sw1 = sw + 2;
2341	int sh1 = sh + 2;	2543	int sh1 = sh + 2;
2342	int sh3 = sh * 3;	2544	int sh3 = sh * 3;
2343	int sw34 = (sw * 3 + 3) & ~3;	2545	int sw3 = sw * 3;
2344	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2546	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2345	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2547	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2346	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2548	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2347		2549
2348	SvPOK_only (darkness3_sv);	2550	SvPOK_only (darkness3_sv);
2349	SvCUR_set (darkness3_sv, sw34 * sh3);	2551	SvCUR_set (darkness3_sv, sw3 * sh3);
2350		2552
2351	mx += self->x - 1;	2553	mx += self->x - 1;
2352	my += self->y - 1;	2554	my += self->y - 1;
2353
2354	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2355		2555
2356	for (y = 0; y < sh1; y++)	2556	for (y = 0; y < sh1; y++)
2357	if (0 <= y + my && y + my < self->rows)	2557	if (0 <= y + my && y + my < self->rows)
2358	{	2558	{
2359	maprow *row = self->row + (y + my);	2559	maprow *row = self->row + (y + my);
…		…
2362	if (row->c0 <= x + mx && x + mx < row->c1)	2562	if (row->c0 <= x + mx && x + mx < row->c1)
2363	{	2563	{
2364	mapcell *cell = row->col + (x + mx - row->c0);	2564	mapcell *cell = row->col + (x + mx - row->c0);
2365		2565
2366	darkness1 [y * sw1 + x] = cell->darkness	2566	darkness1 [y * sw1 + x] = cell->darkness
2367	? 255 - (cell->darkness - 1)	2567	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2368	: 255 - FOW_DARKNESS;	2568	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2369	}	2569	}
2370	}	2570	}
2371		2571
2372	for (y = 0; y < sh; ++y)	2572	for (y = 0; y < sh; ++y)
2373	for (x = 0; x < sw; ++x)	2573	for (x = 0; x < sw; ++x)
…		…
2392		2592
2393	uint8_t r13 = (d13 + d23 + d12) / 3;	2593	uint8_t r13 = (d13 + d23 + d12) / 3;
2394	uint8_t r23 = d23;	2594	uint8_t r23 = d23;
2395	uint8_t r33 = (d23 + d33 + d32) / 3;	2595	uint8_t r33 = (d23 + d33 + d32) / 3;
2396		2596
2397	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2597	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2398	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2598	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2399	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2599	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2400	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2600	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2401	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2601	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2402	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2602	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2403	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2603	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2404	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2604	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2405	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2605	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2406	}	2606	}
2407		2607
2408	free (darkness1);	2608	free (darkness1);
2409		2609
2410	EXTEND (SP, 3);	2610	EXTEND (SP, 3);
2411	PUSHs (sv_2mortal (newSViv (sw34)));	2611	PUSHs (sv_2mortal (newSViv (sw3)));
2412	PUSHs (sv_2mortal (newSViv (sh3)));	2612	PUSHs (sv_2mortal (newSViv (sh3)));
2413	PUSHs (darkness3_sv);	2613	PUSHs (darkness3_sv);
2414	}	2614	}
2415		2615
2416	SV *	2616	SV *
…		…
2614	if (RETVAL < 0)	2814	if (RETVAL < 0)
2615	{	2815	{
2616	RETVAL = Mix_GroupOldest (-1);	2816	RETVAL = Mix_GroupOldest (-1);
2617		2817
2618	if (RETVAL < 0)	2818	if (RETVAL < 0)
		2819	{
		2820	// happens sometimes, maybe it just stopped playing(?)
		2821	RETVAL = Mix_GroupAvailable (-1);
		2822
		2823	if (RETVAL < 0)
2619	XSRETURN_UNDEF;	2824	XSRETURN_UNDEF;
2620		2825	}
		2826	else
2621	Mix_HaltChannel (RETVAL);	2827	Mix_HaltChannel (RETVAL);
2622	}	2828	}
2623		2829
2624	Mix_UnregisterAllEffects (RETVAL);	2830	Mix_UnregisterAllEffects (RETVAL);
2625	Mix_Volume (RETVAL, 128);	2831	Mix_Volume (RETVAL, 128);
2626	}	2832	}
…		…
2673	void	2879	void
2674	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2880	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2675	CODE:	2881	CODE:
2676	{	2882	{
2677	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2883	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2678	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2884	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2679	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2885	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2680	}	2886	}
2681		2887
2682	void	2888	void
2683	set_reverse_stereo (DC::Channel self, int flip)	2889	set_reverse_stereo (DC::Channel self, int flip)
…		…
2685	Mix_SetReverseStereo (self, flip);	2891	Mix_SetReverseStereo (self, flip);
2686		2892
2687	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2893	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2688		2894
2689	PROTOTYPES: DISABLE	2895	PROTOTYPES: DISABLE
		2896
		2897	void
		2898	decoders ()
		2899	PPCODE:
		2900	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2901	int i, num = Mix_GetNumChunkDecoders ();
		2902	EXTEND (SP, num);
		2903	for (i = 0; i < num; ++i)
		2904	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2905	#else
		2906	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2907	#endif
2690		2908
2691	DC::MixChunk	2909	DC::MixChunk
2692	new (SV *class, DC::RW rwops)	2910	new (SV *class, DC::RW rwops)
2693	CODE:	2911	CODE:
2694	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2727	OUTPUT:	2945	OUTPUT:
2728	RETVAL	2946	RETVAL
2729		2947
2730	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2948	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2731		2949
		2950	void
		2951	decoders ()
		2952	PPCODE:
		2953	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2954	int i, num = Mix_GetNumMusicDecoders ();
		2955	EXTEND (SP, num);
		2956	for (i = 0; i < num; ++i)
		2957	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2958	#else
		2959	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2960	#endif
		2961
2732	int	2962	int
2733	volume (int volume = -1)	2963	volume (int volume = -1)
2734	PROTOTYPE: ;$	2964	PROTOTYPE: ;$
2735	CODE:	2965	CODE:
2736	if (items > 0)	2966	if (items > 0)
…		…
2746		2976
2747	void	2977	void
2748	halt ()	2978	halt ()
2749	CODE:	2979	CODE:
2750	Mix_HaltMusic ();	2980	Mix_HaltMusic ();
		2981
		2982	int
		2983	playing ()
		2984	CODE:
		2985	RETVAL = Mix_PlayingMusic ();
		2986	OUTPUT:
		2987	RETVAL
2751		2988
2752	DC::MixMusic	2989	DC::MixMusic
2753	new (SV *class, DC::RW rwops)	2990	new (SV *class, DC::RW rwops)
2754	CODE:	2991	CODE:
2755	RETVAL = Mix_LoadMUS_RW (rwops);	2992	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2786	} *civ, const_iv[] = {	3023	} *civ, const_iv[] = {
2787	# define const_iv(name) { # name, (IV)name }	3024	# define const_iv(name) { # name, (IV)name }
2788	const_iv (GL_VENDOR),	3025	const_iv (GL_VENDOR),
2789	const_iv (GL_VERSION),	3026	const_iv (GL_VERSION),
2790	const_iv (GL_EXTENSIONS),	3027	const_iv (GL_EXTENSIONS),
		3028	const_iv (GL_MAX_TEXTURE_UNITS),
2791	const_iv (GL_COLOR_MATERIAL),	3029	const_iv (GL_COLOR_MATERIAL),
2792	const_iv (GL_SMOOTH),	3030	const_iv (GL_SMOOTH),
2793	const_iv (GL_FLAT),	3031	const_iv (GL_FLAT),
2794	const_iv (GL_DITHER),	3032	const_iv (GL_DITHER),
2795	const_iv (GL_BLEND),	3033	const_iv (GL_BLEND),
…		…
2807	const_iv (GL_ZERO),	3045	const_iv (GL_ZERO),
2808	const_iv (GL_SRC_ALPHA),	3046	const_iv (GL_SRC_ALPHA),
2809	const_iv (GL_DST_ALPHA),	3047	const_iv (GL_DST_ALPHA),
2810	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3048	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2811	const_iv (GL_ONE_MINUS_DST_ALPHA),	3049	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3050	const_iv (GL_SRC_COLOR),
		3051	const_iv (GL_DST_COLOR),
		3052	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3053	const_iv (GL_ONE_MINUS_DST_COLOR),
2812	const_iv (GL_SRC_ALPHA_SATURATE),	3054	const_iv (GL_SRC_ALPHA_SATURATE),
2813	const_iv (GL_RGB),	3055	const_iv (GL_RGB),
2814	const_iv (GL_RGBA),	3056	const_iv (GL_RGBA),
2815	const_iv (GL_RGBA4),	3057	const_iv (GL_RGBA4),
2816	const_iv (GL_RGBA8),	3058	const_iv (GL_RGBA8),
…		…
2884	const_iv (GL_NICEST),	3126	const_iv (GL_NICEST),
2885	const_iv (GL_V2F),	3127	const_iv (GL_V2F),
2886	const_iv (GL_V3F),	3128	const_iv (GL_V3F),
2887	const_iv (GL_T2F_V3F),	3129	const_iv (GL_T2F_V3F),
2888	const_iv (GL_T2F_N3F_V3F),	3130	const_iv (GL_T2F_N3F_V3F),
		3131	const_iv (GL_FUNC_ADD),
		3132	const_iv (GL_FUNC_SUBTRACT),
		3133	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2889	# undef const_iv	3134	# undef const_iv
2890	};	3135	};
2891		3136
2892	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3137	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2893	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3138	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2900	disable_GL_EXT_blend_func_separate ()	3145	disable_GL_EXT_blend_func_separate ()
2901	CODE:	3146	CODE:
2902	gl.BlendFuncSeparate = 0;	3147	gl.BlendFuncSeparate = 0;
2903	gl.BlendFuncSeparateEXT = 0;	3148	gl.BlendFuncSeparateEXT = 0;
2904		3149
		3150	void
		3151	apple_nvidia_bug (int enable)
		3152
2905	char *	3153	char *
2906	gl_vendor ()	3154	gl_vendor ()
2907	CODE:	3155	CODE:
2908	RETVAL = (char *)glGetString (GL_VENDOR);	3156	RETVAL = (char *)glGetString (GL_VENDOR);
2909	OUTPUT:	3157	OUTPUT:
…		…
2939		3187
2940	int glGetError ()	3188	int glGetError ()
2941		3189
2942	void glFinish ()	3190	void glFinish ()
2943		3191
		3192	void glFlush ()
		3193
2944	void glClear (int mask)	3194	void glClear (int mask)
2945		3195
2946	void glClearColor (float r, float g, float b, float a = 1.0)	3196	void glClearColor (float r, float g, float b, float a = 1.0)
2947	PROTOTYPE: @	3197	PROTOTYPE: @
2948		3198
…		…
2957	void glBlendFunc (int sfactor, int dfactor)	3207	void glBlendFunc (int sfactor, int dfactor)
2958		3208
2959	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3209	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2960	CODE:	3210	CODE:
2961	gl_BlendFuncSeparate (sa, da, saa, daa);	3211	gl_BlendFuncSeparate (sa, da, saa, daa);
		3212
		3213	# void glBlendEquation (int se)
2962		3214
2963	void glDepthMask (int flag)	3215	void glDepthMask (int flag)
2964		3216
2965	void glLogicOp (int opcode)	3217	void glLogicOp (int opcode)
2966		3218
…		…
3116	void glNewList (int list, int mode = GL_COMPILE)	3368	void glNewList (int list, int mode = GL_COMPILE)
3117		3369
3118	void glEndList ()	3370	void glEndList ()
3119		3371
3120	void glCallList (int list)	3372	void glCallList (int list)
		3373
		3374	void c_init ()
		3375	CODE:
		3376	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3377	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3121		3378
3122	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3379	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3123		3380
3124	PROTOTYPES: DISABLE	3381	PROTOTYPES: DISABLE
3125		3382

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.278 by root, Wed Sep 3 10:36:25 2008 UTC vs. Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.278 by root, Wed Sep 3 10:36:25 2008 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC