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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.294 by root, Sat Dec 19 05:06: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
87	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	90	#define DARKNESS_ADJUST(n) (n)
88		91
89	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
90	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
91		94
92	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
96		99
97	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
98		101
99	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
100	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
101	#define TEXID_HIDDEN 3
102		104
103	static AV *texture_av;	105	static AV *texture_av;
104		106
105	static struct	107	static struct
106	{	108	{
…		…
822		824
823	IV minpot (UV n)	825	IV minpot (UV n)
824		826
825	IV popcount (UV n)	827	IV popcount (UV n)
826		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
827	void	835	void
828	pango_init ()	836	pango_init ()
829	CODE:	837	CODE:
830	{	838	{
831	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
…		…
922		930
923	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924	#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);
925	#include "glfunc.h"	933	#include "glfunc.h"
926	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927	}	938	}
928	}	939	}
929	OUTPUT:	940	OUTPUT:
930	RETVAL	941	RETVAL
931		942
…		…
1016		1027
1017	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))));
1018	}	1029	}
1019	}	1030	}
1020		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
1021	int	1045	int
1022	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)
1023	POSTCALL:	1047	POSTCALL:
1024	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
1025	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
1087	add_font (char *file)	1111	add_font (char *file)
1088	CODE:	1112	CODE:
1089	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090	OUTPUT:	1114	OUTPUT:
1091	RETVAL	1115	RETVAL
		1116
		1117	void
		1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1092		1119
1093	void	1120	void
1094	load_image_inline (SV *image_)	1121	load_image_inline (SV *image_)
1095	ALIAS:	1122	ALIAS:
1096	load_image_file = 1	1123	load_image_file = 1
…		…
1660	glDisable (GL_BLEND);	1687	glDisable (GL_BLEND);
1661	}	1688	}
1662	}	1689	}
1663		1690
1664	void	1691	void
1665	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)	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)
1666	PROTOTYPE: @	1693	PROTOTYPE: @
1667	CODE:	1694	CODE:
1668	{	1695	{
		1696	glEnable (GL_BLEND);
		1697	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669	glEnable (GL_TEXTURE_2D);	1698	glEnable (GL_TEXTURE_2D);
1670	glEnable (GL_BLEND);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672	glBindTexture (GL_TEXTURE_2D, name1);	1699	glBindTexture (GL_TEXTURE_2D, name1);
1673		1700
1674	glColor3f (intensity, intensity, intensity);	1701	glColor3f (intensity, intensity, intensity);
1675	glPushMatrix ();	1702	glPushMatrix ();
1676	glScalef (1./3, 1./3, 1.);	1703	glScalef (1./3, 1./3, 1.);
1677		1704
1678	if (blend > 0.f)	1705	if (blend > 0.f)
1679	{	1706	{
1680	float S2, T2; /* 0. 0. for texture 2 */	1707	float dx3 = dx * -3.f / w;
1681	float w = w1 > w2 ? w1 : w2;	1708	float dy3 = dy * -3.f / h;
1682	float h = h1 > h2 ? h1 : h2;
1683	GLfloat env_color[4] = { 0., 0., 0., blend };	1709	GLfloat env_color[4] = { 0., 0., 0., blend };
1684		1710
1685	/* interpolate the two shadow textures */	1711	/* interpolate the two shadow textures */
1686	/* stage 0 == rgb(glcolor) + alpha(t0) */	1712	/* stage 0 == rgb(glcolor) + alpha(t0) */
1687	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1713	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1692	glBindTexture (GL_TEXTURE_2D, name2);	1718	glBindTexture (GL_TEXTURE_2D, name2);
1693	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1719	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694		1720
1695	/* rgb == rgb(glcolor) */	1721	/* rgb == rgb(glcolor) */
1696	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1722	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1723	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1724	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699		1725
1700	/* alpha = interpolate t0, t1 by env_alpha */	1726	/* alpha = interpolate t0, t1 by env_alpha */
1701	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1727	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702		1728
…		…
1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709		1735
1710	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1736	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1737	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712		1738
1713	s1 *= w / w1;
1714	t1 *= h / h1;
1715
1716	dx *= -3.f / w2;
1717	dy *= -3.f / h2;
1718	dx *= w / w2;
1719	dy *= h / h2;
1720
1721	s2 *= w / w2;
1722	t2 *= h / h2;
1723
1724	glBegin (GL_QUADS);	1739	glBegin (GL_QUADS);
1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1740	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);	1741	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);	1742	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);	1743	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729	glEnd ();	1744	glEnd ();
1730		1745
1731	glDisable (GL_TEXTURE_2D);	1746	glDisable (GL_TEXTURE_2D);
1732	gl.ActiveTexture (GL_TEXTURE0);	1747	gl.ActiveTexture (GL_TEXTURE0);
1733	}	1748	}
…		…
1735	{	1750	{
1736	/* simple blending of one texture, also opengl <1.3 path */	1751	/* simple blending of one texture, also opengl <1.3 path */
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1752	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738		1753
1739	glBegin (GL_QUADS);	1754	glBegin (GL_QUADS);
1740	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1755	glTexCoord2f (0, 0); glVertex2f (0, 0);
1741	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1756	glTexCoord2f (0, t); glVertex2f (0, h);
1742	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1757	glTexCoord2f (s, t); glVertex2f (w, h);
1743	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1758	glTexCoord2f (s, 0); glVertex2f (w, 0);
1744	glEnd ();	1759	glEnd ();
1745	}	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 ();
1746		1805
1747	glPopMatrix ();	1806	glPopMatrix ();
1748		1807
1749	glDisable (GL_TEXTURE_2D);	1808	glDisable (GL_TEXTURE_2D);
1750	glDisable (GL_BLEND);	1809	glDisable (GL_BLEND);
…		…
1971	{	2030	{
1972	ext = *data++;	2031	ext = *data++;
1973	cmd = ext & 0x7f;	2032	cmd = ext & 0x7f;
1974		2033
1975	if (cmd < 4)	2034	if (cmd < 4)
1976	cell->darkness = 255 - ext * 64 + 1;	2035	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1977	else if (cmd == 5) // health	2036	else if (cmd == 5) // health
1978	{	2037	{
1979	cell->stat_width = 1;	2038	cell->stat_width = 1;
1980	cell->stat_hp = *data++;	2039	cell->stat_hp = *data++;
1981	}	2040	}
…		…
2102	int pl_x, pl_y;	2161	int pl_x, pl_y;
2103	maptex pl_tex;	2162	maptex pl_tex;
2104	rc_t *rc = rc_alloc ();	2163	rc_t *rc = rc_alloc ();
2105	rc_t *rc_ov = rc_alloc ();	2164	rc_t *rc_ov = rc_alloc ();
2106	rc_key_t key;	2165	rc_key_t key;
2107	rc_array_t arr, arr_hidden;	2166	rc_array_t *arr;
2108		2167
2109	pl_tex.name = 0;	2168	pl_tex.name = 0;
2110		2169
2111	// that's current max. sorry.	2170	// that's current max. sorry.
2112	if (sw > 255) sw = 255;	2171	if (sw > 255) sw = 255;
…		…
2149	}	2208	}
2150		2209
2151	glEnable (GL_BLEND);	2210	glEnable (GL_BLEND);
2152	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2211	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2212	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155	key.texname = self->tex [TEXID_HIDDEN].name;
2156	arr_hidden = rc_array (rc_ov, &key);
2157		2213
2158	for (z = 0; z <= 2; z++)	2214	for (z = 0; z <= 2; z++)
2159	{	2215	{
2160	memset (smooth_level, 0, sizeof (smooth_level));	2216	memset (smooth_level, 0, sizeof (smooth_level));
2161	key.texname = -1;	2217	key.texname = -1;
…		…
2241	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);
2242	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);
2243	}	2299	}
2244	}	2300	}
2245		2301
2246	if (expect_false (z == 2))	2302	if (expect_false (z == 2) && expect_false (cell->flags))
2247	{	2303	{
2248	/* draw question marks on top of hidden spaces */	2304	// overlays such as the speech bubble, probably more to come
2249	if (!cell->darkness)	2305	if (cell->flags & 1)
2250	{	2306	{
2251	maptex tex = self->tex [TEXID_HIDDEN];
2252	int px = (x + 1) * T - tex.w;
2253	int py = (y + 1) * T - tex.h;
2254
2255	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259	}
2260
2261	if (expect_false (cell->flags))
2262	{
2263	// overlays such as the speech bubble, probably more to come
2264	if (cell->flags & 1)
2265	{
2266	rc_key_t key_ov = key;	2307	rc_key_t key_ov = key;
2267	maptex tex = self->tex [TEXID_SPEECH];	2308	maptex tex = self->tex [TEXID_SPEECH];
2268	rc_array_t *arr;	2309	rc_array_t *arr;
2269	int px = x * T + T * 2 / 32;	2310	int px = x * T + T * 2 / 32;
2270	int py = y * T - T * 6 / 32;	2311	int py = y * T - T * 6 / 32;
2271		2312
2272	key_ov.texname = tex.name;	2313	key_ov.texname = tex.name;
2273	arr = rc_array (rc_ov, &key_ov);	2314	arr = rc_array (rc_ov, &key_ov);
2274		2315
2275	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2316	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2317	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2277	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);
2278	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2319	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2279	}
2280	}	2320	}
2281	}	2321	}
2282	}	2322	}
2283	}	2323	}
2284		2324
…		…
2427	}	2467	}
2428	}	2468	}
2429	}	2469	}
2430		2470
2431	void	2471	void
2432	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)
2433	CODE:	2473	CODE:
2434	{	2474	{
2435	static float color[16][3] = {	2475	static float color[16][3] = {
2436	{ 0.00F, 0.00F, 0.00F },	2476	{ 0.00f, 0.00f, 0.00f },
2437	{ 1.00F, 1.00F, 1.00F },	2477	{ 1.00f, 1.00f, 1.00f },
2438	{ 0.00F, 0.00F, 0.55F },	2478	{ 0.00f, 0.00f, 0.55f },
2439	{ 1.00F, 0.00F, 0.00F },	2479	{ 1.00f, 0.00f, 0.00f },
2440		2480
2441	{ 1.00F, 0.54F, 0.00F },	2481	{ 1.00f, 0.54f, 0.00f },
2442	{ 0.11F, 0.56F, 1.00F },	2482	{ 0.11f, 0.56f, 1.00f },
2443	{ 0.93F, 0.46F, 0.00F },	2483	{ 0.93f, 0.46f, 0.00f },
2444	{ 0.18F, 0.54F, 0.34F },	2484	{ 0.18f, 0.54f, 0.34f },
2445		2485
2446	{ 0.56F, 0.73F, 0.56F },	2486	{ 0.56f, 0.73f, 0.56f },
2447	{ 0.80F, 0.80F, 0.80F },	2487	{ 0.80f, 0.80f, 0.80f },
2448	{ 0.55F, 0.41F, 0.13F },	2488	{ 0.55f, 0.41f, 0.13f },
2449	{ 0.99F, 0.77F, 0.26F },	2489	{ 0.99f, 0.77f, 0.26f },
2450		2490
2451	{ 0.74F, 0.65F, 0.41F },	2491	{ 0.74f, 0.65f, 0.41f },
2452		2492
2453	{ 0.00F, 1.00F, 1.00F },	2493	{ 0.00f, 1.00f, 1.00f },
2454	{ 1.00F, 0.00F, 1.00F },	2494	{ 1.00f, 0.00f, 1.00f },
2455	{ 1.00F, 1.00F, 0.00F },	2495	{ 1.00f, 1.00f, 0.00f },
2456	};	2496	};
2457		2497
2458	int x, y;	2498	int x, y;
2459		2499
2460	glEnable (GL_TEXTURE_2D);	2500	glEnable (GL_TEXTURE_2D);
2461	/* 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,
2462	* but the nvidia driver (185.18.14) mishandles alpha textures	2502	* but the nvidia driver (185.18.14) mishandles alpha textures
2463	* ansd takes the colour from god knows where instead of using	2503	* and takes the colour from god knows where instead of using
2464	* Cp. MODULATE results in the same colour, but slightly different	2504	* Cp. MODULATE results in the same colour, but slightly different
2465	* alpha, but atcually gives us the correct colour with nvidia.	2505	* alpha, but atcually gives us the correct colour with nvidia.
2466	*/	2506	*/
2467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468	glEnable (GL_BLEND);	2508	glEnable (GL_BLEND);
…		…
2476		2516
2477	if (m)	2517	if (m)
2478	{	2518	{
2479	float *c = color [m & 15];	2519	float *c = color [m & 15];
2480		2520
2481	float tx1 = m & 0x40 ? 0.5 : 0.;	2521	float tx1 = m & 0x40 ? 0.5f : 0.f;
2482	float tx2 = tx1 + 0.5;	2522	float tx2 = tx1 + 0.5f;
2483		2523
2484	glColor4f (c[0], c[1], c[2], 1);	2524	glColor4f (c[0], c[1], c[2], 1);
2485	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2525	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2526	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2527	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2497	void	2537	void
2498	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)
2499	PPCODE:	2539	PPCODE:
2500	{	2540	{
2501	int x, y;	2541	int x, y;
2502	int sw1 = sw + 2;	2542	int sw1 = sw + 2;
2503	int sh1 = sh + 2;	2543	int sh1 = sh + 2;
2504	int sh3 = sh * 3;	2544	int sh3 = sh * 3;
2505	int sw34 = (sw * 3 + 3) & ~3;	2545	int sw3 = sw * 3;
2506	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2546	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2507	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2547	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2508	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2548	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2509		2549
2510	SvPOK_only (darkness3_sv);	2550	SvPOK_only (darkness3_sv);
2511	SvCUR_set (darkness3_sv, sw34 * sh3);	2551	SvCUR_set (darkness3_sv, sw3 * sh3);
2512		2552
2513	mx += self->x - 1;	2553	mx += self->x - 1;
2514	my += self->y - 1;	2554	my += self->y - 1;
2515
2516	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517		2555
2518	for (y = 0; y < sh1; y++)	2556	for (y = 0; y < sh1; y++)
2519	if (0 <= y + my && y + my < self->rows)	2557	if (0 <= y + my && y + my < self->rows)
2520	{	2558	{
2521	maprow *row = self->row + (y + my);	2559	maprow *row = self->row + (y + my);
…		…
2554		2592
2555	uint8_t r13 = (d13 + d23 + d12) / 3;	2593	uint8_t r13 = (d13 + d23 + d12) / 3;
2556	uint8_t r23 = d23;	2594	uint8_t r23 = d23;
2557	uint8_t r33 = (d23 + d33 + d32) / 3;	2595	uint8_t r33 = (d23 + d33 + d32) / 3;
2558		2596
2559	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2597	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2598	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2599	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2600	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563	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 */
2564	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2602	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2603	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2604	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2605	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568	}	2606	}
2569		2607
2570	free (darkness1);	2608	free (darkness1);
2571		2609
2572	EXTEND (SP, 3);	2610	EXTEND (SP, 3);
2573	PUSHs (sv_2mortal (newSViv (sw34)));	2611	PUSHs (sv_2mortal (newSViv (sw3)));
2574	PUSHs (sv_2mortal (newSViv (sh3)));	2612	PUSHs (sv_2mortal (newSViv (sh3)));
2575	PUSHs (darkness3_sv);	2613	PUSHs (darkness3_sv);
2576	}	2614	}
2577		2615
2578	SV *	2616	SV *
…		…
2776	if (RETVAL < 0)	2814	if (RETVAL < 0)
2777	{	2815	{
2778	RETVAL = Mix_GroupOldest (-1);	2816	RETVAL = Mix_GroupOldest (-1);
2779		2817
2780	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)
2781	XSRETURN_UNDEF;	2824	XSRETURN_UNDEF;
2782		2825	}
		2826	else
2783	Mix_HaltChannel (RETVAL);	2827	Mix_HaltChannel (RETVAL);
2784	}	2828	}
2785		2829
2786	Mix_UnregisterAllEffects (RETVAL);	2830	Mix_UnregisterAllEffects (RETVAL);
2787	Mix_Volume (RETVAL, 128);	2831	Mix_Volume (RETVAL, 128);
2788	}	2832	}
…		…
2835	void	2879	void
2836	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)
2837	CODE:	2881	CODE:
2838	{	2882	{
2839	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));
2840	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;
2841	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2885	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842	}	2886	}
2843		2887
2844	void	2888	void
2845	set_reverse_stereo (DC::Channel self, int flip)	2889	set_reverse_stereo (DC::Channel self, int flip)
…		…
2847	Mix_SetReverseStereo (self, flip);	2891	Mix_SetReverseStereo (self, flip);
2848		2892
2849	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2893	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850		2894
2851	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
2852		2908
2853	DC::MixChunk	2909	DC::MixChunk
2854	new (SV *class, DC::RW rwops)	2910	new (SV *class, DC::RW rwops)
2855	CODE:	2911	CODE:
2856	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2889	OUTPUT:	2945	OUTPUT:
2890	RETVAL	2946	RETVAL
2891		2947
2892	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2948	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893		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
2894	int	2962	int
2895	volume (int volume = -1)	2963	volume (int volume = -1)
2896	PROTOTYPE: ;$	2964	PROTOTYPE: ;$
2897	CODE:	2965	CODE:
2898	if (items > 0)	2966	if (items > 0)
…		…
2908		2976
2909	void	2977	void
2910	halt ()	2978	halt ()
2911	CODE:	2979	CODE:
2912	Mix_HaltMusic ();	2980	Mix_HaltMusic ();
		2981
		2982	int
		2983	playing ()
		2984	CODE:
		2985	RETVAL = Mix_PlayingMusic ();
		2986	OUTPUT:
		2987	RETVAL
2913		2988
2914	DC::MixMusic	2989	DC::MixMusic
2915	new (SV *class, DC::RW rwops)	2990	new (SV *class, DC::RW rwops)
2916	CODE:	2991	CODE:
2917	RETVAL = Mix_LoadMUS_RW (rwops);	2992	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3112		3187
3113	int glGetError ()	3188	int glGetError ()
3114		3189
3115	void glFinish ()	3190	void glFinish ()
3116		3191
		3192	void glFlush ()
		3193
3117	void glClear (int mask)	3194	void glClear (int mask)
3118		3195
3119	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)
3120	PROTOTYPE: @	3197	PROTOTYPE: @
3121		3198
…		…
3291	void glNewList (int list, int mode = GL_COMPILE)	3368	void glNewList (int list, int mode = GL_COMPILE)
3292		3369
3293	void glEndList ()	3370	void glEndList ()
3294		3371
3295	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);
3296		3378
3297	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3379	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298		3380
3299	PROTOTYPES: DISABLE	3381	PROTOTYPES: DISABLE
3300		3382

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.294 by root, Sat Dec 19 05:06: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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC