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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs. Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.276 by root, Sat Aug 30 08:04:01 2008 UTC vs.
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 UTC