[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.306 by root, Thu Oct 14 00:02:39 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	104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
101		123
102	static AV *texture_av;	124	static AV *texture_av;
103		125
104	static struct	126	static struct
105	{	127	{
…		…
457	ev.code = 1;	479	ev.code = 1;
458	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
459	ev.data2 = 0;	481	ev.data2 = 0;
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
462	}	490	}
463		491
464	static unsigned int	492	static unsigned int
465	minpot (unsigned int n)	493	minpot (unsigned int n)
466	{	494	{
…		…
821		849
822	IV minpot (UV n)	850	IV minpot (UV n)
823		851
824	IV popcount (UV n)	852	IV popcount (UV n)
825		853
		854	NV distance (NV dx, NV dy)
		855	CODE:
		856	RETVAL = pow (dx * dx + dy * dy, 0.5);
		857	OUTPUT:
		858	RETVAL
		859
826	void	860	void
827	pango_init ()	861	pango_init ()
828	CODE:	862	CODE:
829	{	863	{
830	opengl_fontmap = pango_opengl_font_map_new ();	864	opengl_fontmap = pango_opengl_font_map_new ();
…		…
921		955
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924	#include "glfunc.h"	958	#include "glfunc.h"
925	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	963	}
927	}	964	}
928	OUTPUT:	965	OUTPUT:
929	RETVAL	966	RETVAL
930		967
…		…
1015		1052
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1054	}
1018	}	1055	}
1019		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
1020	int	1070	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1072	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1136	add_font (char *file)
1087	CODE:	1137	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1139	OUTPUT:
1090	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1091		1144
1092	void	1145	void
1093	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
1094	ALIAS:	1147	ALIAS:
1095	load_image_file = 1	1148	load_image_file = 1
…		…
1659	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1660	}	1713	}
1661	}	1714	}
1662		1715
1663	void	1716	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	1717	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: @	1718	PROTOTYPE: @
1666	CODE:	1719	CODE:
1667	{	1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668	glEnable (GL_TEXTURE_2D);	1723	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1724	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		1725
1673	glColor4f (intensity, intensity, intensity, 0.9);	1726	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1727	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1728	glScalef (1./3, 1./3, 1.);
1676		1729
		1730	if (blend > 0.f)
		1731	{
		1732	float dx3 = dx * -3.f / w;
		1733	float dy3 = dy * -3.f / h;
		1734	GLfloat env_color[4] = { 0., 0., 0., blend };
		1735
		1736	/* interpolate the two shadow textures */
		1737	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1738	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1739
		1740	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1741	gl.ActiveTexture (GL_TEXTURE1);
		1742	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1743	glBindTexture (GL_TEXTURE_2D, name2);
		1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1745
		1746	/* rgb == rgb(glcolor) */
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1750
		1751	/* alpha = interpolate t0, t1 by env_alpha */
		1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1753
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1757
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glBegin (GL_QUADS);
		1765	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1766	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1767	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1769	glEnd ();
		1770
		1771	glDisable (GL_TEXTURE_2D);
		1772	gl.ActiveTexture (GL_TEXTURE0);
		1773	}
		1774	else
		1775	{
		1776	/* simple blending of one texture, also opengl <1.3 path */
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1778
		1779	glBegin (GL_QUADS);
		1780	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1781	glTexCoord2f (0, t); glVertex2f (0, h);
		1782	glTexCoord2f (s, t); glVertex2f (w, h);
		1783	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1784	glEnd ();
		1785	}
		1786
		1787	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1788	{
		1789	int x, y;
		1790	int dx3 = dx * 3;
		1791	int dy3 = dy * 3;
		1792
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1794	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1795	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1796	glTranslatef (-1., -1., 0);
1679	glBegin (GL_QUADS);	1797	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1798
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1799	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1800	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1801	int y1 = y - dy3;
		1802	int y1valid = y1 >= 0 && y1 < h;
		1803
		1804	for (x = 1; x < w; x += 3)
		1805	{
		1806	int x1 = x - dx3;
		1807	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1808	uint8_t h2;
		1809
		1810	if (y1valid && x1 >= 0 && x1 < w)
		1811	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1812	else
		1813	h2 = 1; /* out of range == invisible */
		1814
		1815	if (h1 \|\| h2)
		1816	{
		1817	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1818	glColor4f (1., 1., 1., alpha);
		1819
		1820	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1821	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1822	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1823	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1824	}
		1825	}
		1826	}
		1827	}
		1828
1684	glEnd ();	1829	glEnd ();
1685		1830
1686	glPopMatrix ();	1831	glPopMatrix ();
1687		1832
1688	glDisable (GL_TEXTURE_2D);	1833	glDisable (GL_TEXTURE_2D);
…		…
1910	{	2055	{
1911	ext = *data++;	2056	ext = *data++;
1912	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1913		2058
1914	if (cmd < 4)	2059	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1917	{	2062	{
1918	cell->stat_width = 1;	2063	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1920	}	2065	}
…		…
1995	? self->row + y	2140	? self->row + y
1996	: 0;	2141	: 0;
1997		2142
1998	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1999	{	2144	{
2000	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
2001		2146
2002	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
2003	{	2148	{
2004	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
2005		2150
…		…
2007	{	2152	{
2008	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
2009	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
2010	int a1 = tex.a;	2155	int a1 = tex.a;
2011		2156
2012	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
2013	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
2014	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
2015	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
2016	}	2161	}
2017	}	2162	}
2018		2163
2019	*map++ = (r )	2164	*map++ = (r )
2020	\| (g << 8)	2165	\| (g << 8)
…		…
2027	}	2172	}
2028	OUTPUT:	2173	OUTPUT:
2029	RETVAL	2174	RETVAL
2030		2175
2031	void	2176	void
2032	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2177	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2033	CODE:	2178	CODE:
2034	{	2179	{
2035	int x, y, z;	2180	int x, y, z;
2036		2181
2037	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2041	int pl_x, pl_y;	2186	int pl_x, pl_y;
2042	maptex pl_tex;	2187	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2189	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2190	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2191	rc_array_t *arr;
2047		2192
2048	pl_tex.name = 0;	2193	pl_tex.name = 0;
2049		2194
2050	// that's current max. sorry.	2195	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
…		…
2088	}	2233	}
2089		2234
2090	glEnable (GL_BLEND);	2235	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2236	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	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		2238
2097	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
2098	{	2240	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2242	key.texname = -1;
…		…
2124		2266
2125	key.texname = tex.name;	2267	key.texname = tex.name;
2126	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
2127	}	2269	}
2128		2270
2129	px = (x + 1) * T - tex.w;	2271	px = (x + 1) * Th - tex.w;
2130	py = (y + 1) * T - tex.h;	2272	py = (y + 1) * Tw - tex.h;
2131		2273
2132	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
2133	{	2275	{
2134	pl_x = px;	2276	pl_x = px;
2135	pl_y = py;	2277	pl_y = py;
…		…
2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2322	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);	2323	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182	}	2324	}
2183	}	2325	}
2184		2326
2185	if (expect_false (z == 2))	2327	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2328	{
2187	/* draw question marks on top of hidden spaces */	2329	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2330	if (cell->flags & 1)
2189	{	2331	{
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;	2332	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2333	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2334	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2335	int px = x * Tw + Tw * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2336	int py = y * Th - Th * 6 / 32;
2210		2337
2211	key_ov.texname = tex.name;	2338	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2339	arr = rc_array (rc_ov, &key_ov);
2213		2340
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2342	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2343	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218	}
2219	}	2345	}
2220	}	2346	}
2221	}	2347	}
2222	}	2348	}
2223		2349
…		…
2250	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2251	&& skey->level == level	2377	&& skey->level == level
2252	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2253	{	2379	{
2254	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2255	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2256	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2257	int border = bits & 15;	2383	int border = bits & 15;
2258	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2260	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2261		2387
…		…
2274		2400
2275	if (border)	2401	if (border)
2276	{	2402	{
2277	float ox = border * dx;	2403	float ox = border * dx;
2278		2404
2279	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283	}	2409	}
2284		2410
2285	if (corner)	2411	if (corner)
2286	{	2412	{
2287	float ox = corner * dx;	2413	float ox = corner * dx;
2288		2414
2289	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293	}	2419	}
2294	}	2420	}
2295	}	2421	}
2296	}	2422	}
2297	}	2423	}
…		…
2338	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2339	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2340	{	2466	{
2341	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2342		2468
2343	int px = x * T;	2469	int px = x * Tw;
2344	int py = y * T;	2470	int py = y * Th;
2345		2471
2346	if (expect_false (cell->player == player))	2472	if (expect_false (cell->player == player))
2347	{	2473	{
2348	px += sdx;	2474	px += sdx;
2349	py += sdy;	2475	py += sdy;
2350	}	2476	}
2351		2477
2352	if (cell->stat_hp)	2478	if (cell->stat_hp)
2353	{	2479	{
2354	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356		2482
2357	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2358	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2359	px + width - 1, py);	2485	px + width - 1, py);
2360		2486
…		…
2366	}	2492	}
2367	}	2493	}
2368	}	2494	}
2369		2495
2370	void	2496	void
2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2497	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372	CODE:	2498	CODE:
2373	{	2499	{
2374	static float color[16][3] = {	2500	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2379		2505
2380	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2384		2510
2385	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2389		2515
2390	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2391		2517
2392	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2395	};	2521	};
2396		2522
2397	int x, y;	2523	int x, y;
2398		2524
2399	glEnable (GL_TEXTURE_2D);	2525	glEnable (GL_TEXTURE_2D);
2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2526	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2527	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2528	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2529	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2530	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2531	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
…		…
2415		2541
2416	if (m)	2542	if (m)
2417	{	2543	{
2418	float *c = color [m & 15];	2544	float *c = color [m & 15];
2419		2545
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2422		2548
2423	glColor4f (c[0], c[1], c[2], 1);	2549	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2562	void
2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2563	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438	PPCODE:	2564	PPCODE:
2439	{	2565	{
2440	int x, y;	2566	int x, y;
2441	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2444	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2571	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2572	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2573	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2574
2449	SvPOK_only (darkness3_sv);	2575	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2576	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2577
2452	mx += self->x - 1;	2578	mx += self->x - 1;
2453	my += self->y - 1;	2579	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2580
2457	for (y = 0; y < sh1; y++)	2581	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2582	if (0 <= y + my && y + my < self->rows)
2459	{	2583	{
2460	maprow *row = self->row + (y + my);	2584	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2587	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2588	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2589	mapcell *cell = row->col + (x + mx - row->c0);
2466		2590
2467	darkness1 [y * sw1 + x] = cell->darkness	2591	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2592	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2593	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2594	}
2471	}	2595	}
2472		2596
2473	for (y = 0; y < sh; ++y)	2597	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2598	for (x = 0; x < sw; ++x)
…		…
2493		2617
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2618	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2619	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2620	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2621
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2622	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2625	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2626	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);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2628	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2631	}
2508		2632
2509	free (darkness1);	2633	free (darkness1);
2510		2634
2511	EXTEND (SP, 3);	2635	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2636	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2637	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2638	PUSHs (darkness3_sv);
2515	}	2639	}
2516		2640
2517	SV *	2641	SV *
…		…
2715	if (RETVAL < 0)	2839	if (RETVAL < 0)
2716	{	2840	{
2717	RETVAL = Mix_GroupOldest (-1);	2841	RETVAL = Mix_GroupOldest (-1);
2718		2842
2719	if (RETVAL < 0)	2843	if (RETVAL < 0)
		2844	{
		2845	// happens sometimes, maybe it just stopped playing(?)
		2846	RETVAL = Mix_GroupAvailable (-1);
		2847
		2848	if (RETVAL < 0)
2720	XSRETURN_UNDEF;	2849	XSRETURN_UNDEF;
2721		2850	}
		2851	else
2722	Mix_HaltChannel (RETVAL);	2852	Mix_HaltChannel (RETVAL);
2723	}	2853	}
2724		2854
2725	Mix_UnregisterAllEffects (RETVAL);	2855	Mix_UnregisterAllEffects (RETVAL);
2726	Mix_Volume (RETVAL, 128);	2856	Mix_Volume (RETVAL, 128);
2727	}	2857	}
…		…
2774	void	2904	void
2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2905	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776	CODE:	2906	CODE:
2777	{	2907	{
2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2908	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);	2909	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2910	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2911	}
2782		2912
2783	void	2913	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2914	set_reverse_stereo (DC::Channel self, int flip)
…		…
2786	Mix_SetReverseStereo (self, flip);	2916	Mix_SetReverseStereo (self, flip);
2787		2917
2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2918	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789		2919
2790	PROTOTYPES: DISABLE	2920	PROTOTYPES: DISABLE
		2921
		2922	void
		2923	decoders ()
		2924	PPCODE:
		2925	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2926	int i, num = Mix_GetNumChunkDecoders ();
		2927	EXTEND (SP, num);
		2928	for (i = 0; i < num; ++i)
		2929	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2930	#else
		2931	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2932	#endif
2791		2933
2792	DC::MixChunk	2934	DC::MixChunk
2793	new (SV *class, DC::RW rwops)	2935	new (SV *class, DC::RW rwops)
2794	CODE:	2936	CODE:
2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2937	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2828	OUTPUT:	2970	OUTPUT:
2829	RETVAL	2971	RETVAL
2830		2972
2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2973	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832		2974
		2975	void
		2976	decoders ()
		2977	PPCODE:
		2978	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2979	int i, num = Mix_GetNumMusicDecoders ();
		2980	EXTEND (SP, num);
		2981	for (i = 0; i < num; ++i)
		2982	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2983	#else
		2984	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2985	#endif
		2986
2833	int	2987	int
2834	volume (int volume = -1)	2988	volume (int volume = -1)
2835	PROTOTYPE: ;$	2989	PROTOTYPE: ;$
2836	CODE:	2990	CODE:
2837	if (items > 0)	2991	if (items > 0)
…		…
2847		3001
2848	void	3002	void
2849	halt ()	3003	halt ()
2850	CODE:	3004	CODE:
2851	Mix_HaltMusic ();	3005	Mix_HaltMusic ();
		3006
		3007	int
		3008	playing ()
		3009	CODE:
		3010	RETVAL = Mix_PlayingMusic ();
		3011	OUTPUT:
		3012	RETVAL
2852		3013
2853	DC::MixMusic	3014	DC::MixMusic
2854	new (SV *class, DC::RW rwops)	3015	new (SV *class, DC::RW rwops)
2855	CODE:	3016	CODE:
2856	RETVAL = Mix_LoadMUS_RW (rwops);	3017	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
3051		3212
3052	int glGetError ()	3213	int glGetError ()
3053		3214
3054	void glFinish ()	3215	void glFinish ()
3055		3216
		3217	void glFlush ()
		3218
3056	void glClear (int mask)	3219	void glClear (int mask)
3057		3220
3058	void glClearColor (float r, float g, float b, float a = 1.0)	3221	void glClearColor (float r, float g, float b, float a = 1.0)
3059	PROTOTYPE: @	3222	PROTOTYPE: @
3060		3223
…		…
3230	void glNewList (int list, int mode = GL_COMPILE)	3393	void glNewList (int list, int mode = GL_COMPILE)
3231		3394
3232	void glEndList ()	3395	void glEndList ()
3233		3396
3234	void glCallList (int list)	3397	void glCallList (int list)
		3398
		3399	void c_init ()
		3400	CODE:
		3401	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3402	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3235		3403
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3404	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3405
3238	PROTOTYPES: DISABLE	3406	PROTOTYPES: DISABLE
3239		3407

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.306 by root, Thu Oct 14 00:02:39 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.306 by root, Thu Oct 14 00:02:39 2010 UTC