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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 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 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
…		…
1015		1027
1016	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))));
1017	}	1029	}
1018	}	1030	}
1019		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
1020	int	1045	int
1021	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)
1022	POSTCALL:	1047	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1111	add_font (char *file)
1087	CODE:	1112	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1114	OUTPUT:
1090	RETVAL	1115	RETVAL
		1116
		1117	void
		1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1091		1119
1092	void	1120	void
1093	load_image_inline (SV *image_)	1121	load_image_inline (SV *image_)
1094	ALIAS:	1122	ALIAS:
1095	load_image_file = 1	1123	load_image_file = 1
…		…
1658	glDisable (GL_ALPHA_TEST);	1686	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1687	glDisable (GL_BLEND);
1660	}	1688	}
1661	}	1689	}
1662		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);
		1810	}
		1811
1663	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)
1664	CODE:	1813	CODE:
1665	{	1814	{
1666	GLint width;	1815	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1816	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1881	{	2030	{
1882	ext = *data++;	2031	ext = *data++;
1883	cmd = ext & 0x7f;	2032	cmd = ext & 0x7f;
1884		2033
1885	if (cmd < 4)	2034	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;	2035	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1887	else if (cmd == 5) // health	2036	else if (cmd == 5) // health
1888	{	2037	{
1889	cell->stat_width = 1;	2038	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2039	cell->stat_hp = *data++;
1891	}	2040	}
…		…
2012	int pl_x, pl_y;	2161	int pl_x, pl_y;
2013	maptex pl_tex;	2162	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2163	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2164	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2165	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2166	rc_array_t *arr;
2018		2167
2019	pl_tex.name = 0;	2168	pl_tex.name = 0;
2020		2169
2021	// that's current max. sorry.	2170	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2171	if (sw > 255) sw = 255;
…		…
2059	}	2208	}
2060		2209
2061	glEnable (GL_BLEND);	2210	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2211	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2212	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065	key.texname = self->tex [TEXID_HIDDEN].name;
2066	arr_hidden = rc_array (rc_ov, &key);
2067		2213
2068	for (z = 0; z <= 2; z++)	2214	for (z = 0; z <= 2; z++)
2069	{	2215	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2216	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2217	key.texname = -1;
…		…
2151	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);
2152	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);
2153	}	2299	}
2154	}	2300	}
2155		2301
2156	if (expect_false (z == 2))	2302	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2303	{
2158	/* draw question marks on top of hidden spaces */	2304	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2305	if (cell->flags & 1)
2160	{	2306	{
2161	maptex tex = self->tex [TEXID_HIDDEN];
2162	int px = (x + 1) * T - tex.w;
2163	int py = (y + 1) * T - tex.h;
2164
2165	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169	}
2170
2171	if (expect_false (cell->flags))
2172	{
2173	// overlays such as the speech bubble, probably more to come
2174	if (cell->flags & 1)
2175	{
2176	rc_key_t key_ov = key;	2307	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2308	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2309	rc_array_t *arr;
2179	int px = x * T + T * 2 / 32;	2310	int px = x * T + T * 2 / 32;
2180	int py = y * T - T * 6 / 32;	2311	int py = y * T - T * 6 / 32;
2181		2312
2182	key_ov.texname = tex.name;	2313	key_ov.texname = tex.name;
2183	arr = rc_array (rc_ov, &key_ov);	2314	arr = rc_array (rc_ov, &key_ov);
2184		2315
2185	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2316	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2317	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2318	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2319	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189	}
2190	}	2320	}
2191	}	2321	}
2192	}	2322	}
2193	}	2323	}
2194		2324
…		…
2337	}	2467	}
2338	}	2468	}
2339	}	2469	}
2340		2470
2341	void	2471	void
2342	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)
2343	CODE:	2473	CODE:
2344	{	2474	{
2345	static float color[16][3] = {	2475	static float color[16][3] = {
2346	{ 0.00F, 0.00F, 0.00F },	2476	{ 0.00f, 0.00f, 0.00f },
2347	{ 1.00F, 1.00F, 1.00F },	2477	{ 1.00f, 1.00f, 1.00f },
2348	{ 0.00F, 0.00F, 0.55F },	2478	{ 0.00f, 0.00f, 0.55f },
2349	{ 1.00F, 0.00F, 0.00F },	2479	{ 1.00f, 0.00f, 0.00f },
2350		2480
2351	{ 1.00F, 0.54F, 0.00F },	2481	{ 1.00f, 0.54f, 0.00f },
2352	{ 0.11F, 0.56F, 1.00F },	2482	{ 0.11f, 0.56f, 1.00f },
2353	{ 0.93F, 0.46F, 0.00F },	2483	{ 0.93f, 0.46f, 0.00f },
2354	{ 0.18F, 0.54F, 0.34F },	2484	{ 0.18f, 0.54f, 0.34f },
2355		2485
2356	{ 0.56F, 0.73F, 0.56F },	2486	{ 0.56f, 0.73f, 0.56f },
2357	{ 0.80F, 0.80F, 0.80F },	2487	{ 0.80f, 0.80f, 0.80f },
2358	{ 0.55F, 0.41F, 0.13F },	2488	{ 0.55f, 0.41f, 0.13f },
2359	{ 0.99F, 0.77F, 0.26F },	2489	{ 0.99f, 0.77f, 0.26f },
2360		2490
2361	{ 0.74F, 0.65F, 0.41F },	2491	{ 0.74f, 0.65f, 0.41f },
2362		2492
2363	{ 0.00F, 1.00F, 1.00F },	2493	{ 0.00f, 1.00f, 1.00f },
2364	{ 1.00F, 0.00F, 1.00F },	2494	{ 1.00f, 0.00f, 1.00f },
2365	{ 1.00F, 1.00F, 0.00F },	2495	{ 1.00f, 1.00f, 0.00f },
2366	};	2496	};
2367		2497
2368	int x, y;	2498	int x, y;
2369		2499
2370	glEnable (GL_TEXTURE_2D);	2500	glEnable (GL_TEXTURE_2D);
2371	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2501	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372	* but the nvidia driver (185.18.14) mishandles alpha textures	2502	* but the nvidia driver (185.18.14) mishandles alpha textures
2373	* ansd takes the colour from god knows where instead of using	2503	* and takes the colour from god knows where instead of using
2374	* Cp. MODULATE results in the same colour, but slightly different	2504	* Cp. MODULATE results in the same colour, but slightly different
2375	* alpha, but atcually gives us the correct colour with nvidia.	2505	* alpha, but atcually gives us the correct colour with nvidia.
2376	*/	2506	*/
2377	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378	glEnable (GL_BLEND);	2508	glEnable (GL_BLEND);
…		…
2386		2516
2387	if (m)	2517	if (m)
2388	{	2518	{
2389	float *c = color [m & 15];	2519	float *c = color [m & 15];
2390		2520
2391	float tx1 = m & 0x40 ? 0.5 : 0.;	2521	float tx1 = m & 0x40 ? 0.5f : 0.f;
2392	float tx2 = tx1 + 0.5;	2522	float tx2 = tx1 + 0.5f;
2393		2523
2394	glColor4f (c[0], c[1], c[2], 1);	2524	glColor4f (c[0], c[1], c[2], 1);
2395	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2525	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2526	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2527	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2407	void	2537	void
2408	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)
2409	PPCODE:	2539	PPCODE:
2410	{	2540	{
2411	int x, y;	2541	int x, y;
2412	int sw1 = sw + 2;	2542	int sw1 = sw + 2;
2413	int sh1 = sh + 2;	2543	int sh1 = sh + 2;
2414	int sh3 = sh * 3;	2544	int sh3 = sh * 3;
2415	int sw34 = (sw * 3 + 3) & ~3;	2545	int sw3 = sw * 3;
2416	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2546	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2417	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2547	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2418	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2548	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2419		2549
2420	SvPOK_only (darkness3_sv);	2550	SvPOK_only (darkness3_sv);
2421	SvCUR_set (darkness3_sv, sw34 * sh3);	2551	SvCUR_set (darkness3_sv, sw3 * sh3);
2422		2552
2423	mx += self->x - 1;	2553	mx += self->x - 1;
2424	my += self->y - 1;	2554	my += self->y - 1;
2425
2426	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427		2555
2428	for (y = 0; y < sh1; y++)	2556	for (y = 0; y < sh1; y++)
2429	if (0 <= y + my && y + my < self->rows)	2557	if (0 <= y + my && y + my < self->rows)
2430	{	2558	{
2431	maprow *row = self->row + (y + my);	2559	maprow *row = self->row + (y + my);
…		…
2434	if (row->c0 <= x + mx && x + mx < row->c1)	2562	if (row->c0 <= x + mx && x + mx < row->c1)
2435	{	2563	{
2436	mapcell *cell = row->col + (x + mx - row->c0);	2564	mapcell *cell = row->col + (x + mx - row->c0);
2437		2565
2438	darkness1 [y * sw1 + x] = cell->darkness	2566	darkness1 [y * sw1 + x] = cell->darkness
2439	? 255 - (cell->darkness - 1)	2567	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440	: 255 - FOW_DARKNESS;	2568	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441	}	2569	}
2442	}	2570	}
2443		2571
2444	for (y = 0; y < sh; ++y)	2572	for (y = 0; y < sh; ++y)
2445	for (x = 0; x < sw; ++x)	2573	for (x = 0; x < sw; ++x)
…		…
2464		2592
2465	uint8_t r13 = (d13 + d23 + d12) / 3;	2593	uint8_t r13 = (d13 + d23 + d12) / 3;
2466	uint8_t r23 = d23;	2594	uint8_t r23 = d23;
2467	uint8_t r33 = (d23 + d33 + d32) / 3;	2595	uint8_t r33 = (d23 + d33 + d32) / 3;
2468		2596
2469	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2597	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2598	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2599	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2600	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473	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 */
2474	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2602	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2603	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2604	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2605	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478	}	2606	}
2479		2607
2480	free (darkness1);	2608	free (darkness1);
2481		2609
2482	EXTEND (SP, 3);	2610	EXTEND (SP, 3);
2483	PUSHs (sv_2mortal (newSViv (sw34)));	2611	PUSHs (sv_2mortal (newSViv (sw3)));
2484	PUSHs (sv_2mortal (newSViv (sh3)));	2612	PUSHs (sv_2mortal (newSViv (sh3)));
2485	PUSHs (darkness3_sv);	2613	PUSHs (darkness3_sv);
2486	}	2614	}
2487		2615
2488	SV *	2616	SV *
…		…
2686	if (RETVAL < 0)	2814	if (RETVAL < 0)
2687	{	2815	{
2688	RETVAL = Mix_GroupOldest (-1);	2816	RETVAL = Mix_GroupOldest (-1);
2689		2817
2690	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)
2691	XSRETURN_UNDEF;	2824	XSRETURN_UNDEF;
2692		2825	}
		2826	else
2693	Mix_HaltChannel (RETVAL);	2827	Mix_HaltChannel (RETVAL);
2694	}	2828	}
2695		2829
2696	Mix_UnregisterAllEffects (RETVAL);	2830	Mix_UnregisterAllEffects (RETVAL);
2697	Mix_Volume (RETVAL, 128);	2831	Mix_Volume (RETVAL, 128);
2698	}	2832	}
…		…
2745	void	2879	void
2746	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)
2747	CODE:	2881	CODE:
2748	{	2882	{
2749	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));
2750	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;
2751	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2885	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752	}	2886	}
2753		2887
2754	void	2888	void
2755	set_reverse_stereo (DC::Channel self, int flip)	2889	set_reverse_stereo (DC::Channel self, int flip)
…		…
2757	Mix_SetReverseStereo (self, flip);	2891	Mix_SetReverseStereo (self, flip);
2758		2892
2759	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2893	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760		2894
2761	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
2762		2908
2763	DC::MixChunk	2909	DC::MixChunk
2764	new (SV *class, DC::RW rwops)	2910	new (SV *class, DC::RW rwops)
2765	CODE:	2911	CODE:
2766	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2799	OUTPUT:	2945	OUTPUT:
2800	RETVAL	2946	RETVAL
2801		2947
2802	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2948	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803		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
2804	int	2962	int
2805	volume (int volume = -1)	2963	volume (int volume = -1)
2806	PROTOTYPE: ;$	2964	PROTOTYPE: ;$
2807	CODE:	2965	CODE:
2808	if (items > 0)	2966	if (items > 0)
…		…
2818		2976
2819	void	2977	void
2820	halt ()	2978	halt ()
2821	CODE:	2979	CODE:
2822	Mix_HaltMusic ();	2980	Mix_HaltMusic ();
		2981
		2982	int
		2983	playing ()
		2984	CODE:
		2985	RETVAL = Mix_PlayingMusic ();
		2986	OUTPUT:
		2987	RETVAL
2823		2988
2824	DC::MixMusic	2989	DC::MixMusic
2825	new (SV *class, DC::RW rwops)	2990	new (SV *class, DC::RW rwops)
2826	CODE:	2991	CODE:
2827	RETVAL = Mix_LoadMUS_RW (rwops);	2992	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2858	} *civ, const_iv[] = {	3023	} *civ, const_iv[] = {
2859	# define const_iv(name) { # name, (IV)name }	3024	# define const_iv(name) { # name, (IV)name }
2860	const_iv (GL_VENDOR),	3025	const_iv (GL_VENDOR),
2861	const_iv (GL_VERSION),	3026	const_iv (GL_VERSION),
2862	const_iv (GL_EXTENSIONS),	3027	const_iv (GL_EXTENSIONS),
		3028	const_iv (GL_MAX_TEXTURE_UNITS),
2863	const_iv (GL_COLOR_MATERIAL),	3029	const_iv (GL_COLOR_MATERIAL),
2864	const_iv (GL_SMOOTH),	3030	const_iv (GL_SMOOTH),
2865	const_iv (GL_FLAT),	3031	const_iv (GL_FLAT),
2866	const_iv (GL_DITHER),	3032	const_iv (GL_DITHER),
2867	const_iv (GL_BLEND),	3033	const_iv (GL_BLEND),
…		…
2879	const_iv (GL_ZERO),	3045	const_iv (GL_ZERO),
2880	const_iv (GL_SRC_ALPHA),	3046	const_iv (GL_SRC_ALPHA),
2881	const_iv (GL_DST_ALPHA),	3047	const_iv (GL_DST_ALPHA),
2882	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3048	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883	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),
2884	const_iv (GL_SRC_ALPHA_SATURATE),	3054	const_iv (GL_SRC_ALPHA_SATURATE),
2885	const_iv (GL_RGB),	3055	const_iv (GL_RGB),
2886	const_iv (GL_RGBA),	3056	const_iv (GL_RGBA),
2887	const_iv (GL_RGBA4),	3057	const_iv (GL_RGBA4),
2888	const_iv (GL_RGBA8),	3058	const_iv (GL_RGBA8),
…		…
3017		3187
3018	int glGetError ()	3188	int glGetError ()
3019		3189
3020	void glFinish ()	3190	void glFinish ()
3021		3191
		3192	void glFlush ()
		3193
3022	void glClear (int mask)	3194	void glClear (int mask)
3023		3195
3024	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)
3025	PROTOTYPE: @	3197	PROTOTYPE: @
3026		3198
…		…
3196	void glNewList (int list, int mode = GL_COMPILE)	3368	void glNewList (int list, int mode = GL_COMPILE)
3197		3369
3198	void glEndList ()	3370	void glEndList ()
3199		3371
3200	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);
3201		3378
3202	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3379	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203		3380
3204	PROTOTYPES: DISABLE	3381	PROTOTYPES: DISABLE
3205		3382

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.292 by root, Fri Dec 4 15:04:56 2009 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.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC