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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

…		…
41	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
42		42
43	/* work around os x broken headers */	43	/* work around os x broken headers */
44	#ifdef __MACOSX__	44	#ifdef __MACOSX__
45	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);
46	#endif	48	#endif
47		49
48	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
50		52
…		…
80	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
81	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
82		84
83	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84		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 */
85	#define FOW_DARKNESS 64	89	#define FOW_DARKNESS 50
86	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	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	{
…		…
927		930
928	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929	#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);
930	#include "glfunc.h"	933	#include "glfunc.h"
931	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932	}	938	}
933	}	939	}
934	OUTPUT:	940	OUTPUT:
935	RETVAL	941	RETVAL
936		942
…		…
1020	}	1026	}
1021		1027
1022	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))));
1023	}	1029	}
1024	}	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
1025		1044
1026	int	1045	int
1027	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)
1028	POSTCALL:	1047	POSTCALL:
1029	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
…		…
1665	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1666	}	1685	}
1667	}	1686	}
1668		1687
1669	void	1688	void
1670	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)	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)
1671	PROTOTYPE: @	1690	PROTOTYPE: @
1672	CODE:	1691	CODE:
1673	{	1692	{
		1693	glEnable (GL_BLEND);
		1694	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674	glEnable (GL_TEXTURE_2D);	1695	glEnable (GL_TEXTURE_2D);
1675	glEnable (GL_BLEND);
1676	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1696	glBindTexture (GL_TEXTURE_2D, name1);
1678		1697
1679	glColor3f (intensity, intensity, intensity);	1698	glColor3f (intensity, intensity, intensity);
1680	glPushMatrix ();	1699	glPushMatrix ();
1681	glScalef (1./3, 1./3, 1.);	1700	glScalef (1./3, 1./3, 1.);
1682		1701
1683	if (blend > 0.f)	1702	if (blend > 0.f)
1684	{	1703	{
1685	float S2, T2; /* 0. 0. for texture 2 */	1704	float dx3 = dx * -3.f / w;
1686	float w = w1 > w2 ? w1 : w2;	1705	float dy3 = dy * -3.f / h;
1687	float h = h1 > h2 ? h1 : h2;
1688	GLfloat env_color[4] = { 0., 0., 0., blend };	1706	GLfloat env_color[4] = { 0., 0., 0., blend };
1689		1707
1690	/* interpolate the two shadow textures */	1708	/* interpolate the two shadow textures */
1691	/* stage 0 == rgb(glcolor) + alpha(t0) */	1709	/* stage 0 == rgb(glcolor) + alpha(t0) */
1692	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1710	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1715	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1716	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1717
1700	/* rgb == rgb(glcolor) */	1718	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1719	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1722
1705	/* alpha = interpolate t0, t1 by env_alpha */	1723	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1724	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1725
…		…
1713	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714		1732
1715	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717		1735
1718	s1 *= w / w1;
1719	t1 *= h / h1;
1720
1721	dx *= -3.f / w2;
1722	dy *= -3.f / h2;
1723	dx *= w / w2;
1724	dy *= h / h2;
1725
1726	s2 *= w / w2;
1727	t2 *= h / h2;
1728
1729	glBegin (GL_QUADS);	1736	glBegin (GL_QUADS);
1730	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1737	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);	1738	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);	1739	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);	1740	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734	glEnd ();	1741	glEnd ();
1735		1742
1736	glDisable (GL_TEXTURE_2D);	1743	glDisable (GL_TEXTURE_2D);
1737	gl.ActiveTexture (GL_TEXTURE0);	1744	gl.ActiveTexture (GL_TEXTURE0);
1738	}	1745	}
…		…
1740	{	1747	{
1741	/* simple blending of one texture, also opengl <1.3 path */	1748	/* simple blending of one texture, also opengl <1.3 path */
1742	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743		1750
1744	glBegin (GL_QUADS);	1751	glBegin (GL_QUADS);
1745	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1752	glTexCoord2f (0, 0); glVertex2f (0, 0);
1746	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1753	glTexCoord2f (0, t); glVertex2f (0, h);
1747	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1754	glTexCoord2f (s, t); glVertex2f (w, h);
1748	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1755	glTexCoord2f (s, 0); glVertex2f (w, 0);
1749	glEnd ();	1756	glEnd ();
1750	}	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 ();
1751		1802
1752	glPopMatrix ();	1803	glPopMatrix ();
1753		1804
1754	glDisable (GL_TEXTURE_2D);	1805	glDisable (GL_TEXTURE_2D);
1755	glDisable (GL_BLEND);	1806	glDisable (GL_BLEND);
…		…
1976	{	2027	{
1977	ext = *data++;	2028	ext = *data++;
1978	cmd = ext & 0x7f;	2029	cmd = ext & 0x7f;
1979		2030
1980	if (cmd < 4)	2031	if (cmd < 4)
1981	cell->darkness = 255 - ext * 64 + 1;	2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1982	else if (cmd == 5) // health	2033	else if (cmd == 5) // health
1983	{	2034	{
1984	cell->stat_width = 1;	2035	cell->stat_width = 1;
1985	cell->stat_hp = *data++;	2036	cell->stat_hp = *data++;
1986	}	2037	}
…		…
2107	int pl_x, pl_y;	2158	int pl_x, pl_y;
2108	maptex pl_tex;	2159	maptex pl_tex;
2109	rc_t *rc = rc_alloc ();	2160	rc_t *rc = rc_alloc ();
2110	rc_t *rc_ov = rc_alloc ();	2161	rc_t *rc_ov = rc_alloc ();
2111	rc_key_t key;	2162	rc_key_t key;
2112	rc_array_t arr, arr_hidden;	2163	rc_array_t *arr;
2113		2164
2114	pl_tex.name = 0;	2165	pl_tex.name = 0;
2115		2166
2116	// that's current max. sorry.	2167	// that's current max. sorry.
2117	if (sw > 255) sw = 255;	2168	if (sw > 255) sw = 255;
…		…
2154	}	2205	}
2155		2206
2156	glEnable (GL_BLEND);	2207	glEnable (GL_BLEND);
2157	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160	key.texname = self->tex [TEXID_HIDDEN].name;
2161	arr_hidden = rc_array (rc_ov, &key);
2162		2210
2163	for (z = 0; z <= 2; z++)	2211	for (z = 0; z <= 2; z++)
2164	{	2212	{
2165	memset (smooth_level, 0, sizeof (smooth_level));	2213	memset (smooth_level, 0, sizeof (smooth_level));
2166	key.texname = -1;	2214	key.texname = -1;
…		…
2246	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);
2247	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);
2248	}	2296	}
2249	}	2297	}
2250		2298
2251	if (expect_false (z == 2))	2299	if (expect_false (z == 2) && expect_false (cell->flags))
2252	{	2300	{
2253	/* draw question marks on top of hidden spaces */	2301	// overlays such as the speech bubble, probably more to come
2254	if (!cell->darkness)	2302	if (cell->flags & 1)
2255	{	2303	{
2256	maptex tex = self->tex [TEXID_HIDDEN];
2257	int px = (x + 1) * T - tex.w;
2258	int py = (y + 1) * T - tex.h;
2259
2260	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264	}
2265
2266	if (expect_false (cell->flags))
2267	{
2268	// overlays such as the speech bubble, probably more to come
2269	if (cell->flags & 1)
2270	{
2271	rc_key_t key_ov = key;	2304	rc_key_t key_ov = key;
2272	maptex tex = self->tex [TEXID_SPEECH];	2305	maptex tex = self->tex [TEXID_SPEECH];
2273	rc_array_t *arr;	2306	rc_array_t *arr;
2274	int px = x * T + T * 2 / 32;	2307	int px = x * T + T * 2 / 32;
2275	int py = y * T - T * 6 / 32;	2308	int py = y * T - T * 6 / 32;
2276		2309
2277	key_ov.texname = tex.name;	2310	key_ov.texname = tex.name;
2278	arr = rc_array (rc_ov, &key_ov);	2311	arr = rc_array (rc_ov, &key_ov);
2279		2312
2280	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2282	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2315	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2283	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2284	}
2285	}	2317	}
2286	}	2318	}
2287	}	2319	}
2288	}	2320	}
2289		2321
…		…
2463	int x, y;	2495	int x, y;
2464		2496
2465	glEnable (GL_TEXTURE_2D);	2497	glEnable (GL_TEXTURE_2D);
2466	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2498	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467	* but the nvidia driver (185.18.14) mishandles alpha textures	2499	* but the nvidia driver (185.18.14) mishandles alpha textures
2468	* ansd takes the colour from god knows where instead of using	2500	* and takes the colour from god knows where instead of using
2469	* Cp. MODULATE results in the same colour, but slightly different	2501	* Cp. MODULATE results in the same colour, but slightly different
2470	* alpha, but atcually gives us the correct colour with nvidia.	2502	* alpha, but atcually gives us the correct colour with nvidia.
2471	*/	2503	*/
2472	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2504	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473	glEnable (GL_BLEND);	2505	glEnable (GL_BLEND);
…		…
2502	void	2534	void
2503	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)
2504	PPCODE:	2536	PPCODE:
2505	{	2537	{
2506	int x, y;	2538	int x, y;
2507	int sw1 = sw + 2;	2539	int sw1 = sw + 2;
2508	int sh1 = sh + 2;	2540	int sh1 = sh + 2;
2509	int sh3 = sh * 3;	2541	int sh3 = sh * 3;
2510	int sw34 = (sw * 3 + 3) & ~3;	2542	int sw3 = sw * 3;
2511	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2512	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2513	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2545	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2514		2546
2515	SvPOK_only (darkness3_sv);	2547	SvPOK_only (darkness3_sv);
2516	SvCUR_set (darkness3_sv, sw34 * sh3);	2548	SvCUR_set (darkness3_sv, sw3 * sh3);
2517		2549
2518	mx += self->x - 1;	2550	mx += self->x - 1;
2519	my += self->y - 1;	2551	my += self->y - 1;
2520
2521	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522		2552
2523	for (y = 0; y < sh1; y++)	2553	for (y = 0; y < sh1; y++)
2524	if (0 <= y + my && y + my < self->rows)	2554	if (0 <= y + my && y + my < self->rows)
2525	{	2555	{
2526	maprow *row = self->row + (y + my);	2556	maprow *row = self->row + (y + my);
…		…
2559		2589
2560	uint8_t r13 = (d13 + d23 + d12) / 3;	2590	uint8_t r13 = (d13 + d23 + d12) / 3;
2561	uint8_t r23 = d23;	2591	uint8_t r23 = d23;
2562	uint8_t r33 = (d23 + d33 + d32) / 3;	2592	uint8_t r33 = (d23 + d33 + d32) / 3;
2563		2593
2564	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2594	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2595	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2596	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2597	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568	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 */
2569	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2599	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2600	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2601	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2602	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573	}	2603	}
2574		2604
2575	free (darkness1);	2605	free (darkness1);
2576		2606
2577	EXTEND (SP, 3);	2607	EXTEND (SP, 3);
2578	PUSHs (sv_2mortal (newSViv (sw34)));	2608	PUSHs (sv_2mortal (newSViv (sw3)));
2579	PUSHs (sv_2mortal (newSViv (sh3)));	2609	PUSHs (sv_2mortal (newSViv (sh3)));
2580	PUSHs (darkness3_sv);	2610	PUSHs (darkness3_sv);
2581	}	2611	}
2582		2612
2583	SV *	2613	SV *
…		…
2781	if (RETVAL < 0)	2811	if (RETVAL < 0)
2782	{	2812	{
2783	RETVAL = Mix_GroupOldest (-1);	2813	RETVAL = Mix_GroupOldest (-1);
2784		2814
2785	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)
2786	XSRETURN_UNDEF;	2821	XSRETURN_UNDEF;
2787		2822	}
		2823	else
2788	Mix_HaltChannel (RETVAL);	2824	Mix_HaltChannel (RETVAL);
2789	}	2825	}
2790		2826
2791	Mix_UnregisterAllEffects (RETVAL);	2827	Mix_UnregisterAllEffects (RETVAL);
2792	Mix_Volume (RETVAL, 128);	2828	Mix_Volume (RETVAL, 128);
2793	}	2829	}
…		…
2852	Mix_SetReverseStereo (self, flip);	2888	Mix_SetReverseStereo (self, flip);
2853		2889
2854	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2890	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855		2891
2856	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
2857		2905
2858	DC::MixChunk	2906	DC::MixChunk
2859	new (SV *class, DC::RW rwops)	2907	new (SV *class, DC::RW rwops)
2860	CODE:	2908	CODE:
2861	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2894	OUTPUT:	2942	OUTPUT:
2895	RETVAL	2943	RETVAL
2896		2944
2897	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2945	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898		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
2899	int	2959	int
2900	volume (int volume = -1)	2960	volume (int volume = -1)
2901	PROTOTYPE: ;$	2961	PROTOTYPE: ;$
2902	CODE:	2962	CODE:
2903	if (items > 0)	2963	if (items > 0)
…		…
2913		2973
2914	void	2974	void
2915	halt ()	2975	halt ()
2916	CODE:	2976	CODE:
2917	Mix_HaltMusic ();	2977	Mix_HaltMusic ();
		2978
		2979	int
		2980	playing ()
		2981	CODE:
		2982	RETVAL = Mix_PlayingMusic ();
		2983	OUTPUT:
		2984	RETVAL
2918		2985
2919	DC::MixMusic	2986	DC::MixMusic
2920	new (SV *class, DC::RW rwops)	2987	new (SV *class, DC::RW rwops)
2921	CODE:	2988	CODE:
2922	RETVAL = Mix_LoadMUS_RW (rwops);	2989	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3117		3184
3118	int glGetError ()	3185	int glGetError ()
3119		3186
3120	void glFinish ()	3187	void glFinish ()
3121		3188
		3189	void glFlush ()
		3190
3122	void glClear (int mask)	3191	void glClear (int mask)
3123		3192
3124	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)
3125	PROTOTYPE: @	3194	PROTOTYPE: @
3126		3195
…		…
3296	void glNewList (int list, int mode = GL_COMPILE)	3365	void glNewList (int list, int mode = GL_COMPILE)
3297		3366
3298	void glEndList ()	3367	void glEndList ()
3299		3368
3300	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);
3301		3375
3302	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3376	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303		3377
3304	PROTOTYPES: DISABLE	3378	PROTOTYPES: DISABLE
3305		3379

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.295 by root, Mon Dec 21 03:30:22 2009 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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC