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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 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 16	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	{
…		…
817		824
818	IV minpot (UV n)	825	IV minpot (UV n)
819		826
820	IV popcount (UV n)	827	IV popcount (UV n)
821		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
822	void	835	void
823	pango_init ()	836	pango_init ()
824	CODE:	837	CODE:
825	{	838	{
826	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
…		…
917		930
918	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
919	#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);
920	#include "glfunc.h"	933	#include "glfunc.h"
921	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
922	}	938	}
923	}	939	}
924	OUTPUT:	940	OUTPUT:
925	RETVAL	941	RETVAL
926		942
…		…
1010	}	1026	}
1011		1027
1012	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))));
1013	}	1029	}
1014	}	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
1015		1044
1016	int	1045	int
1017	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)
1018	POSTCALL:	1047	POSTCALL:
1019	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
…		…
1654	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1655	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1656	}	1685	}
1657	}	1686	}
1658		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);
		1807	}
		1808
1659	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)
1660	CODE:	1810	CODE:
1661	{	1811	{
1662	GLint width;	1812	GLint width;
1663	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1813	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1877	{	2027	{
1878	ext = *data++;	2028	ext = *data++;
1879	cmd = ext & 0x7f;	2029	cmd = ext & 0x7f;
1880		2030
1881	if (cmd < 4)	2031	if (cmd < 4)
1882	cell->darkness = 255 - ext * 64 + 1;	2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1883	else if (cmd == 5) // health	2033	else if (cmd == 5) // health
1884	{	2034	{
1885	cell->stat_width = 1;	2035	cell->stat_width = 1;
1886	cell->stat_hp = *data++;	2036	cell->stat_hp = *data++;
1887	}	2037	}
…		…
2005	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
2006	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)
2007	smooth_key skey;	2157	smooth_key skey;
2008	int pl_x, pl_y;	2158	int pl_x, pl_y;
2009	maptex pl_tex;	2159	maptex pl_tex;
2010	rc_t *rc = rc_alloc ();	2160	rc_t *rc = rc_alloc ();
		2161	rc_t *rc_ov = rc_alloc ();
2011	rc_key_t key;	2162	rc_key_t key;
2012	rc_array_t *arr;	2163	rc_array_t *arr;
2013		2164
2014	pl_tex.name = 0;	2165	pl_tex.name = 0;
2015		2166
2016	// thats current max. sorry.	2167	// that's current max. sorry.
2017	if (sw > 255) sw = 255;	2168	if (sw > 255) sw = 255;
2018	if (sh > 255) sh = 255;	2169	if (sh > 255) sh = 255;
2019		2170
2020	// clear key, in case of extra padding	2171	// clear key, in case of extra padding
2021	memset (&skey, 0, sizeof (skey));	2172	memset (&skey, 0, sizeof (skey));
…		…
2074	tileid tile = cell->tile [z];	2225	tileid tile = cell->tile [z];
2075		2226
2076	if (tile)	2227	if (tile)
2077	{	2228	{
2078	maptex tex = self->tex [tile];	2229	maptex tex = self->tex [tile];
2079	int px = (x + 1) * T - tex.w;	2230	int px, py;
2080	int py = (y + 1) * T - tex.h;
2081		2231
2082	if (key.texname != tex.name)	2232	if (key.texname != tex.name)
2083	{	2233	{
2084	self->tex [tile].unused = 0;	2234	self->tex [tile].unused = 0;
2085		2235
2086	if (!tex.name)	2236	if (!tex.name)
2087	tex = self->tex [2]; /* missing, replace by noface */	2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2088		2238
2089	key.texname = tex.name;	2239	key.texname = tex.name;
2090	arr = rc_array (rc, &key);	2240	arr = rc_array (rc, &key);
2091	}	2241	}
		2242
		2243	px = (x + 1) * T - tex.w;
		2244	py = (y + 1) * T - tex.h;
2092		2245
2093	if (expect_false (cell->player == player) && expect_false (z == 2))	2246	if (expect_false (cell->player == player) && expect_false (z == 2))
2094	{	2247	{
2095	pl_x = px;	2248	pl_x = px;
2096	pl_y = py;	2249	pl_y = py;
…		…
2101	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2102	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);
2103	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);
2104	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);
2105		2258
2106	if (expect_false (cell->flags) && expect_false (z == 2))
2107	{
2108	// overlays such as the speech bubble, probably more to come
2109	if (cell->flags & 1)
2110	{
2111	maptex tex = self->tex [1];
2112	int px = x * T + T * 2 / 32;
2113	int py = y * T - T * 6 / 32;
2114
2115	if (tex.name)
2116	{
2117	if (key.texname != tex.name)
2118	{
2119	key.texname = tex.name;
2120	arr = rc_array (rc, &key);
2121	}
2122
2123	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2124	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2125	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2126	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2127	}
2128	}
2129	}
2130
2131	// update smooth hash	2259	// update smooth hash
2132	if (tex.smoothtile)	2260	if (tex.smoothtile)
2133	{	2261	{
2134	skey.tile = tex.smoothtile;	2262	skey.tile = tex.smoothtile;
2135	skey.level = tex.smoothlevel;	2263	skey.level = tex.smoothlevel;
…		…
2163	// corners	2291	// corners
2164	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);
2165	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);
2166	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);
2167	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);
2168	}	2317	}
2169	}	2318	}
2170	}	2319	}
2171	}	2320	}
2172		2321
…		…
2269	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);
2270		2419
2271	rc_draw (rc);	2420	rc_draw (rc);
2272	}	2421	}
2273		2422
		2423	rc_draw (rc_ov);
		2424	rc_clear (rc_ov);
		2425
2274	glDisable (GL_BLEND);	2426	glDisable (GL_BLEND);
2275	rc_free (rc);	2427	rc_free (rc);
		2428	rc_free (rc_ov);
2276		2429
2277	// top layer: overlays such as the health bar	2430	// top layer: overlays such as the health bar
2278	for (y = 0; y < sh; y++)	2431	for (y = 0; y < sh; y++)
2279	if (0 <= y + my && y + my < self->rows)	2432	if (0 <= y + my && y + my < self->rows)
2280	{	2433	{
…		…
2311	}	2464	}
2312	}	2465	}
2313	}	2466	}
2314		2467
2315	void	2468	void
2316	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)
2317	CODE:	2470	CODE:
2318	{	2471	{
2319	static float color[16][3] = {	2472	static float color[16][3] = {
2320	{ 0.00F, 0.00F, 0.00F },	2473	{ 0.00f, 0.00f, 0.00f },
2321	{ 1.00F, 1.00F, 1.00F },	2474	{ 1.00f, 1.00f, 1.00f },
2322	{ 0.00F, 0.00F, 0.55F },	2475	{ 0.00f, 0.00f, 0.55f },
2323	{ 1.00F, 0.00F, 0.00F },	2476	{ 1.00f, 0.00f, 0.00f },
2324		2477
2325	{ 1.00F, 0.54F, 0.00F },	2478	{ 1.00f, 0.54f, 0.00f },
2326	{ 0.11F, 0.56F, 1.00F },	2479	{ 0.11f, 0.56f, 1.00f },
2327	{ 0.93F, 0.46F, 0.00F },	2480	{ 0.93f, 0.46f, 0.00f },
2328	{ 0.18F, 0.54F, 0.34F },	2481	{ 0.18f, 0.54f, 0.34f },
2329		2482
2330	{ 0.56F, 0.73F, 0.56F },	2483	{ 0.56f, 0.73f, 0.56f },
2331	{ 0.80F, 0.80F, 0.80F },	2484	{ 0.80f, 0.80f, 0.80f },
2332	{ 0.55F, 0.41F, 0.13F },	2485	{ 0.55f, 0.41f, 0.13f },
2333	{ 0.99F, 0.77F, 0.26F },	2486	{ 0.99f, 0.77f, 0.26f },
2334		2487
2335	{ 0.74F, 0.65F, 0.41F },	2488	{ 0.74f, 0.65f, 0.41f },
2336		2489
2337	{ 0.00F, 1.00F, 1.00F },	2490	{ 0.00f, 1.00f, 1.00f },
2338	{ 1.00F, 0.00F, 1.00F },	2491	{ 1.00f, 0.00f, 1.00f },
2339	{ 1.00F, 1.00F, 0.00F },	2492	{ 1.00f, 1.00f, 0.00f },
2340	};	2493	};
2341		2494
2342	int x, y;	2495	int x, y;
2343		2496
2344	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	*/
2345	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2504	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2346	glEnable (GL_BLEND);	2505	glEnable (GL_BLEND);
2347	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2506	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2348	glBegin (GL_QUADS);	2507	glBegin (GL_QUADS);
2349		2508
2350	for (y = 0; y < h; y++)	2509	for (y = 0; y < h; y++)
…		…
2354		2513
2355	if (m)	2514	if (m)
2356	{	2515	{
2357	float *c = color [m & 15];	2516	float *c = color [m & 15];
2358		2517
2359	float tx1 = m & 0x40 ? 0.5 : 0.;	2518	float tx1 = m & 0x40 ? 0.5f : 0.f;
2360	float tx2 = tx1 + 0.5;	2519	float tx2 = tx1 + 0.5f;
2361		2520
2362	glColor4f (c[0], c[1], c[2], 0.75);	2521	glColor4f (c[0], c[1], c[2], 1);
2363	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2522	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2364	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2523	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2365	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2524	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2366	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2525	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2367	}	2526	}
…		…
2375	void	2534	void
2376	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)
2377	PPCODE:	2536	PPCODE:
2378	{	2537	{
2379	int x, y;	2538	int x, y;
2380	int sw1 = sw + 2;	2539	int sw1 = sw + 2;
2381	int sh1 = sh + 2;	2540	int sh1 = sh + 2;
2382	int sh3 = sh * 3;	2541	int sh3 = sh * 3;
2383	int sw34 = (sw * 3 + 3) & ~3;	2542	int sw3 = sw * 3;
2384	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2385	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2386	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2545	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2387		2546
2388	SvPOK_only (darkness3_sv);	2547	SvPOK_only (darkness3_sv);
2389	SvCUR_set (darkness3_sv, sw34 * sh3);	2548	SvCUR_set (darkness3_sv, sw3 * sh3);
2390		2549
2391	mx += self->x - 1;	2550	mx += self->x - 1;
2392	my += self->y - 1;	2551	my += self->y - 1;
2393
2394	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2395		2552
2396	for (y = 0; y < sh1; y++)	2553	for (y = 0; y < sh1; y++)
2397	if (0 <= y + my && y + my < self->rows)	2554	if (0 <= y + my && y + my < self->rows)
2398	{	2555	{
2399	maprow *row = self->row + (y + my);	2556	maprow *row = self->row + (y + my);
…		…
2402	if (row->c0 <= x + mx && x + mx < row->c1)	2559	if (row->c0 <= x + mx && x + mx < row->c1)
2403	{	2560	{
2404	mapcell *cell = row->col + (x + mx - row->c0);	2561	mapcell *cell = row->col + (x + mx - row->c0);
2405		2562
2406	darkness1 [y * sw1 + x] = cell->darkness	2563	darkness1 [y * sw1 + x] = cell->darkness
2407	? 255 - (cell->darkness - 1)	2564	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2408	: 255 - FOW_DARKNESS;	2565	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2409	}	2566	}
2410	}	2567	}
2411		2568
2412	for (y = 0; y < sh; ++y)	2569	for (y = 0; y < sh; ++y)
2413	for (x = 0; x < sw; ++x)	2570	for (x = 0; x < sw; ++x)
…		…
2432		2589
2433	uint8_t r13 = (d13 + d23 + d12) / 3;	2590	uint8_t r13 = (d13 + d23 + d12) / 3;
2434	uint8_t r23 = d23;	2591	uint8_t r23 = d23;
2435	uint8_t r33 = (d23 + d33 + d32) / 3;	2592	uint8_t r33 = (d23 + d33 + d32) / 3;
2436		2593
2437	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2594	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2438	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2595	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2439	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2596	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2440	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2597	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2441	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 */
2442	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2599	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2443	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2600	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2444	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2601	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2445	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2602	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2446	}	2603	}
2447		2604
2448	free (darkness1);	2605	free (darkness1);
2449		2606
2450	EXTEND (SP, 3);	2607	EXTEND (SP, 3);
2451	PUSHs (sv_2mortal (newSViv (sw34)));	2608	PUSHs (sv_2mortal (newSViv (sw3)));
2452	PUSHs (sv_2mortal (newSViv (sh3)));	2609	PUSHs (sv_2mortal (newSViv (sh3)));
2453	PUSHs (darkness3_sv);	2610	PUSHs (darkness3_sv);
2454	}	2611	}
2455		2612
2456	SV *	2613	SV *
…		…
2654	if (RETVAL < 0)	2811	if (RETVAL < 0)
2655	{	2812	{
2656	RETVAL = Mix_GroupOldest (-1);	2813	RETVAL = Mix_GroupOldest (-1);
2657		2814
2658	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)
2659	XSRETURN_UNDEF;	2821	XSRETURN_UNDEF;
2660		2822	}
		2823	else
2661	Mix_HaltChannel (RETVAL);	2824	Mix_HaltChannel (RETVAL);
2662	}	2825	}
2663		2826
2664	Mix_UnregisterAllEffects (RETVAL);	2827	Mix_UnregisterAllEffects (RETVAL);
2665	Mix_Volume (RETVAL, 128);	2828	Mix_Volume (RETVAL, 128);
2666	}	2829	}
…		…
2713	void	2876	void
2714	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)
2715	CODE:	2878	CODE:
2716	{	2879	{
2717	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));
2718	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;
2719	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2882	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2720	}	2883	}
2721		2884
2722	void	2885	void
2723	set_reverse_stereo (DC::Channel self, int flip)	2886	set_reverse_stereo (DC::Channel self, int flip)
…		…
2725	Mix_SetReverseStereo (self, flip);	2888	Mix_SetReverseStereo (self, flip);
2726		2889
2727	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2890	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2728		2891
2729	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
2730		2905
2731	DC::MixChunk	2906	DC::MixChunk
2732	new (SV *class, DC::RW rwops)	2907	new (SV *class, DC::RW rwops)
2733	CODE:	2908	CODE:
2734	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2767	OUTPUT:	2942	OUTPUT:
2768	RETVAL	2943	RETVAL
2769		2944
2770	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2945	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2771		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
2772	int	2959	int
2773	volume (int volume = -1)	2960	volume (int volume = -1)
2774	PROTOTYPE: ;$	2961	PROTOTYPE: ;$
2775	CODE:	2962	CODE:
2776	if (items > 0)	2963	if (items > 0)
…		…
2786		2973
2787	void	2974	void
2788	halt ()	2975	halt ()
2789	CODE:	2976	CODE:
2790	Mix_HaltMusic ();	2977	Mix_HaltMusic ();
		2978
		2979	int
		2980	playing ()
		2981	CODE:
		2982	RETVAL = Mix_PlayingMusic ();
		2983	OUTPUT:
		2984	RETVAL
2791		2985
2792	DC::MixMusic	2986	DC::MixMusic
2793	new (SV *class, DC::RW rwops)	2987	new (SV *class, DC::RW rwops)
2794	CODE:	2988	CODE:
2795	RETVAL = Mix_LoadMUS_RW (rwops);	2989	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2826	} *civ, const_iv[] = {	3020	} *civ, const_iv[] = {
2827	# define const_iv(name) { # name, (IV)name }	3021	# define const_iv(name) { # name, (IV)name }
2828	const_iv (GL_VENDOR),	3022	const_iv (GL_VENDOR),
2829	const_iv (GL_VERSION),	3023	const_iv (GL_VERSION),
2830	const_iv (GL_EXTENSIONS),	3024	const_iv (GL_EXTENSIONS),
		3025	const_iv (GL_MAX_TEXTURE_UNITS),
2831	const_iv (GL_COLOR_MATERIAL),	3026	const_iv (GL_COLOR_MATERIAL),
2832	const_iv (GL_SMOOTH),	3027	const_iv (GL_SMOOTH),
2833	const_iv (GL_FLAT),	3028	const_iv (GL_FLAT),
2834	const_iv (GL_DITHER),	3029	const_iv (GL_DITHER),
2835	const_iv (GL_BLEND),	3030	const_iv (GL_BLEND),
…		…
2847	const_iv (GL_ZERO),	3042	const_iv (GL_ZERO),
2848	const_iv (GL_SRC_ALPHA),	3043	const_iv (GL_SRC_ALPHA),
2849	const_iv (GL_DST_ALPHA),	3044	const_iv (GL_DST_ALPHA),
2850	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3045	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2851	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),
2852	const_iv (GL_SRC_ALPHA_SATURATE),	3051	const_iv (GL_SRC_ALPHA_SATURATE),
2853	const_iv (GL_RGB),	3052	const_iv (GL_RGB),
2854	const_iv (GL_RGBA),	3053	const_iv (GL_RGBA),
2855	const_iv (GL_RGBA4),	3054	const_iv (GL_RGBA4),
2856	const_iv (GL_RGBA8),	3055	const_iv (GL_RGBA8),
…		…
2924	const_iv (GL_NICEST),	3123	const_iv (GL_NICEST),
2925	const_iv (GL_V2F),	3124	const_iv (GL_V2F),
2926	const_iv (GL_V3F),	3125	const_iv (GL_V3F),
2927	const_iv (GL_T2F_V3F),	3126	const_iv (GL_T2F_V3F),
2928	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),
2929	# undef const_iv	3131	# undef const_iv
2930	};	3132	};
2931		3133
2932	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; )
2933	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2940	disable_GL_EXT_blend_func_separate ()	3142	disable_GL_EXT_blend_func_separate ()
2941	CODE:	3143	CODE:
2942	gl.BlendFuncSeparate = 0;	3144	gl.BlendFuncSeparate = 0;
2943	gl.BlendFuncSeparateEXT = 0;	3145	gl.BlendFuncSeparateEXT = 0;
2944		3146
		3147	void
		3148	apple_nvidia_bug (int enable)
		3149
2945	char *	3150	char *
2946	gl_vendor ()	3151	gl_vendor ()
2947	CODE:	3152	CODE:
2948	RETVAL = (char *)glGetString (GL_VENDOR);	3153	RETVAL = (char *)glGetString (GL_VENDOR);
2949	OUTPUT:	3154	OUTPUT:
…		…
2979		3184
2980	int glGetError ()	3185	int glGetError ()
2981		3186
2982	void glFinish ()	3187	void glFinish ()
2983		3188
		3189	void glFlush ()
		3190
2984	void glClear (int mask)	3191	void glClear (int mask)
2985		3192
2986	void glClearColor (float r, float g, float b, float a = 1.0)	3193	void glClearColor (float r, float g, float b, float a = 1.0)
2987	PROTOTYPE: @	3194	PROTOTYPE: @
2988		3195
…		…
2997	void glBlendFunc (int sfactor, int dfactor)	3204	void glBlendFunc (int sfactor, int dfactor)
2998		3205
2999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3206	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
3000	CODE:	3207	CODE:
3001	gl_BlendFuncSeparate (sa, da, saa, daa);	3208	gl_BlendFuncSeparate (sa, da, saa, daa);
		3209
		3210	# void glBlendEquation (int se)
3002		3211
3003	void glDepthMask (int flag)	3212	void glDepthMask (int flag)
3004		3213
3005	void glLogicOp (int opcode)	3214	void glLogicOp (int opcode)
3006		3215
…		…
3156	void glNewList (int list, int mode = GL_COMPILE)	3365	void glNewList (int list, int mode = GL_COMPILE)
3157		3366
3158	void glEndList ()	3367	void glEndList ()
3159		3368
3160	void glCallList (int list)	3369	void glCallList (int list)
		3370
		3371	void c_init ()
		3372	CODE:
		3373	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3374	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3161		3375
3162	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3376	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3163		3377
3164	PROTOTYPES: DISABLE	3378	PROTOTYPES: DISABLE
3165		3379

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC vs. Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.283 by root, Thu Dec 11 00:11:58 2008 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC