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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 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 64	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
97		101
98	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3
101		104
102	static AV *texture_av;	105	static AV *texture_av;
103		106
104	static struct	107	static struct
105	{	108	{
…		…
821		824
822	IV minpot (UV n)	825	IV minpot (UV n)
823		826
824	IV popcount (UV n)	827	IV popcount (UV n)
825		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
826	void	835	void
827	pango_init ()	836	pango_init ()
828	CODE:	837	CODE:
829	{	838	{
830	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
…		…
921		930
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#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);
924	#include "glfunc.h"	933	#include "glfunc.h"
925	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	938	}
927	}	939	}
928	OUTPUT:	940	OUTPUT:
929	RETVAL	941	RETVAL
930		942
…		…
1659	glDisable (GL_BLEND);	1671	glDisable (GL_BLEND);
1660	}	1672	}
1661	}	1673	}
1662		1674
1663	void	1675	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	1676	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)
1665	PROTOTYPE: @	1677	PROTOTYPE: @
1666	CODE:	1678	CODE:
1667	{	1679	{
		1680	glEnable (GL_BLEND);
		1681	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668	glEnable (GL_TEXTURE_2D);	1682	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1683	glBindTexture (GL_TEXTURE_2D, name1);
1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672		1684
1673	glColor4f (intensity, intensity, intensity, 0.9);	1685	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1686	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1687	glScalef (1./3, 1./3, 1.);
1676		1688
		1689	if (blend > 0.f)
		1690	{
		1691	float dx3 = dx * -3.f / w;
		1692	float dy3 = dy * -3.f / h;
		1693	GLfloat env_color[4] = { 0., 0., 0., blend };
		1694
		1695	/* interpolate the two shadow textures */
		1696	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1697	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1698
		1699	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1700	gl.ActiveTexture (GL_TEXTURE1);
		1701	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1702	glBindTexture (GL_TEXTURE_2D, name2);
		1703	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1704
		1705	/* rgb == rgb(glcolor) */
		1706	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1707	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1709
		1710	/* alpha = interpolate t0, t1 by env_alpha */
		1711	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1712
		1713	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1714	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1715	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1716
		1717	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1718	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1719
		1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1722
		1723	glBegin (GL_QUADS);
		1724	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1726	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1727	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1728	glEnd ();
		1729
		1730	glDisable (GL_TEXTURE_2D);
		1731	gl.ActiveTexture (GL_TEXTURE0);
		1732	}
		1733	else
		1734	{
		1735	/* simple blending of one texture, also opengl <1.3 path */
		1736	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1737
		1738	glBegin (GL_QUADS);
		1739	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1740	glTexCoord2f (0, t); glVertex2f (0, h);
		1741	glTexCoord2f (s, t); glVertex2f (w, h);
		1742	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1743	glEnd ();
		1744	}
		1745
		1746	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1747	{
		1748	int x, y;
		1749	int dx3 = dx * 3;
		1750	int dy3 = dy * 3;
		1751
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1753	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1754	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1755	glTranslatef (-1., -1., 0);
1679	glBegin (GL_QUADS);	1756	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1757
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1758	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1759	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1760	int y1 = y - dy3;
		1761	int y1valid = y1 >= 0 && y1 < h;
		1762
		1763	for (x = 1; x < w; x += 3)
		1764	{
		1765	int x1 = x - dx3;
		1766	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1767	uint8_t h2;
		1768
		1769	if (y1valid && x1 >= 0 && x1 < w)
		1770	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1771	else
		1772	h2 = 1; /* out of range == invisible */
		1773
		1774	if (h1 \|\| h2)
		1775	{
		1776	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1777	glColor4f (1., 1., 1., alpha);
		1778
		1779	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1780	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1781	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1782	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1783	}
		1784	}
		1785	}
		1786	}
		1787
1684	glEnd ();	1788	glEnd ();
1685		1789
1686	glPopMatrix ();	1790	glPopMatrix ();
1687		1791
1688	glDisable (GL_TEXTURE_2D);	1792	glDisable (GL_TEXTURE_2D);
…		…
1910	{	2014	{
1911	ext = *data++;	2015	ext = *data++;
1912	cmd = ext & 0x7f;	2016	cmd = ext & 0x7f;
1913		2017
1914	if (cmd < 4)	2018	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;	2019	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916	else if (cmd == 5) // health	2020	else if (cmd == 5) // health
1917	{	2021	{
1918	cell->stat_width = 1;	2022	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2023	cell->stat_hp = *data++;
1920	}	2024	}
…		…
2041	int pl_x, pl_y;	2145	int pl_x, pl_y;
2042	maptex pl_tex;	2146	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2147	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2148	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2149	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2150	rc_array_t *arr;
2047		2151
2048	pl_tex.name = 0;	2152	pl_tex.name = 0;
2049		2153
2050	// that's current max. sorry.	2154	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2155	if (sw > 255) sw = 255;
…		…
2088	}	2192	}
2089		2193
2090	glEnable (GL_BLEND);	2194	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2195	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2196	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094	key.texname = self->tex [TEXID_HIDDEN].name;
2095	arr_hidden = rc_array (rc_ov, &key);
2096		2197
2097	for (z = 0; z <= 2; z++)	2198	for (z = 0; z <= 2; z++)
2098	{	2199	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2200	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2201	key.texname = -1;
…		…
2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2281	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2181	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2282	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182	}	2283	}
2183	}	2284	}
2184		2285
2185	if (expect_false (z == 2))	2286	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2287	{
2187	/* draw question marks on top of hidden spaces */	2288	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2289	if (cell->flags & 1)
2189	{	2290	{
2190	maptex tex = self->tex [TEXID_HIDDEN];
2191	int px = (x + 1) * T - tex.w;
2192	int py = (y + 1) * T - tex.h;
2193
2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198	}
2199
2200	if (expect_false (cell->flags))
2201	{
2202	// overlays such as the speech bubble, probably more to come
2203	if (cell->flags & 1)
2204	{
2205	rc_key_t key_ov = key;	2291	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2292	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2293	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2294	int px = x * T + T * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2295	int py = y * T - T * 6 / 32;
2210		2296
2211	key_ov.texname = tex.name;	2297	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2298	arr = rc_array (rc_ov, &key_ov);
2213		2299
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2302	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2303	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2218	}
2219	}	2304	}
2220	}	2305	}
2221	}	2306	}
2222	}	2307	}
2223		2308
…		…
2366	}	2451	}
2367	}	2452	}
2368	}	2453	}
2369		2454
2370	void	2455	void
2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2456	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372	CODE:	2457	CODE:
2373	{	2458	{
2374	static float color[16][3] = {	2459	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2460	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2461	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2462	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2463	{ 1.00f, 0.00f, 0.00f },
2379		2464
2380	{ 1.00F, 0.54F, 0.00F },	2465	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2466	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2467	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2468	{ 0.18f, 0.54f, 0.34f },
2384		2469
2385	{ 0.56F, 0.73F, 0.56F },	2470	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2471	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2472	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2473	{ 0.99f, 0.77f, 0.26f },
2389		2474
2390	{ 0.74F, 0.65F, 0.41F },	2475	{ 0.74f, 0.65f, 0.41f },
2391		2476
2392	{ 0.00F, 1.00F, 1.00F },	2477	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2478	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2479	{ 1.00f, 1.00f, 0.00f },
2395	};	2480	};
2396		2481
2397	int x, y;	2482	int x, y;
2398		2483
2399	glEnable (GL_TEXTURE_2D);	2484	glEnable (GL_TEXTURE_2D);
2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2485	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2486	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2487	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2488	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2489	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2490	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2491	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2492	glEnable (GL_BLEND);
…		…
2415		2500
2416	if (m)	2501	if (m)
2417	{	2502	{
2418	float *c = color [m & 15];	2503	float *c = color [m & 15];
2419		2504
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2505	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2506	float tx2 = tx1 + 0.5f;
2422		2507
2423	glColor4f (c[0], c[1], c[2], 1);	2508	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2509	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2510	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2511	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2521	void
2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2522	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438	PPCODE:	2523	PPCODE:
2439	{	2524	{
2440	int x, y;	2525	int x, y;
2441	int sw1 = sw + 2;	2526	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2527	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2528	int sh3 = sh * 3;
2444	int sw34 = (sw * 3 + 3) & ~3;	2529	int sw3 = sw * 3;
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2530	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2531	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2532	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2533
2449	SvPOK_only (darkness3_sv);	2534	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2535	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2536
2452	mx += self->x - 1;	2537	mx += self->x - 1;
2453	my += self->y - 1;	2538	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2539
2457	for (y = 0; y < sh1; y++)	2540	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2541	if (0 <= y + my && y + my < self->rows)
2459	{	2542	{
2460	maprow *row = self->row + (y + my);	2543	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2546	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2547	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2548	mapcell *cell = row->col + (x + mx - row->c0);
2466		2549
2467	darkness1 [y * sw1 + x] = cell->darkness	2550	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2551	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2552	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2553	}
2471	}	2554	}
2472		2555
2473	for (y = 0; y < sh; ++y)	2556	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2557	for (x = 0; x < sw; ++x)
…		…
2493		2576
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2577	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2578	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2579	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2580
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2581	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2582	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2583	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2584	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2585	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2503	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2586	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2587	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2588	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2589	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2590	}
2508		2591
2509	free (darkness1);	2592	free (darkness1);
2510		2593
2511	EXTEND (SP, 3);	2594	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2595	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2596	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2597	PUSHs (darkness3_sv);
2515	}	2598	}
2516		2599
2517	SV *	2600	SV *
…		…
2774	void	2857	void
2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2858	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776	CODE:	2859	CODE:
2777	{	2860	{
2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2861	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2862	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2863	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2864	}
2782		2865
2783	void	2866	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2867	set_reverse_stereo (DC::Channel self, int flip)
…		…
2786	Mix_SetReverseStereo (self, flip);	2869	Mix_SetReverseStereo (self, flip);
2787		2870
2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2871	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789		2872
2790	PROTOTYPES: DISABLE	2873	PROTOTYPES: DISABLE
		2874
		2875	void
		2876	decoders ()
		2877	PPCODE:
		2878	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2879	int i, num = Mix_GetNumChunkDecoders ();
		2880	EXTEND (SP, num);
		2881	for (i = 0; i < num; ++i)
		2882	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2883	#else
		2884	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2885	#endif
2791		2886
2792	DC::MixChunk	2887	DC::MixChunk
2793	new (SV *class, DC::RW rwops)	2888	new (SV *class, DC::RW rwops)
2794	CODE:	2889	CODE:
2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2890	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2828	OUTPUT:	2923	OUTPUT:
2829	RETVAL	2924	RETVAL
2830		2925
2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2926	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832		2927
		2928	void
		2929	decoders ()
		2930	PPCODE:
		2931	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2932	int i, num = Mix_GetNumMusicDecoders ();
		2933	EXTEND (SP, num);
		2934	for (i = 0; i < num; ++i)
		2935	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2936	#else
		2937	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2938	#endif
		2939
2833	int	2940	int
2834	volume (int volume = -1)	2941	volume (int volume = -1)
2835	PROTOTYPE: ;$	2942	PROTOTYPE: ;$
2836	CODE:	2943	CODE:
2837	if (items > 0)	2944	if (items > 0)
…		…
2847		2954
2848	void	2955	void
2849	halt ()	2956	halt ()
2850	CODE:	2957	CODE:
2851	Mix_HaltMusic ();	2958	Mix_HaltMusic ();
		2959
		2960	int
		2961	playing ()
		2962	CODE:
		2963	RETVAL = Mix_PlayingMusic ();
		2964	OUTPUT:
		2965	RETVAL
2852		2966
2853	DC::MixMusic	2967	DC::MixMusic
2854	new (SV *class, DC::RW rwops)	2968	new (SV *class, DC::RW rwops)
2855	CODE:	2969	CODE:
2856	RETVAL = Mix_LoadMUS_RW (rwops);	2970	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3231		3345
3232	void glEndList ()	3346	void glEndList ()
3233		3347
3234	void glCallList (int list)	3348	void glCallList (int list)
3235		3349
		3350	void c_init ()
		3351	CODE:
		3352	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3353	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3354
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3355	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3356
3238	PROTOTYPES: DISABLE	3357	PROTOTYPES: DISABLE
3239		3358
3240	void	3359	void

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs. Revision 1.301 by root, Thu Feb 4 20:01:08 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.301 by root, Thu Feb 4 20:01:08 2010 UTC