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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
		84	}
		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
76	}	108	}
77		109
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
…		…
345	} smooth_key;	377	} smooth_key;
346		378
347	static void	379	static void
348	smooth_or_bits (HV hv, smooth_key key, IV bits)	380	smooth_or_bits (HV hv, smooth_key key, IV bits)
349	{	381	{
350	SV *sv = hv_fetch (hv, (char )key, sizeof (key), 1);	382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
351		383
352	if (SvIOK (*sv))	384	if (SvIOK (*sv))
353	SvIV_set (sv, SvIVX (sv) \| bits);	385	SvIV_set (sv, SvIVX (sv) \| bits);
354	else	386	else
355	sv_setiv (*sv, bits);	387	sv_setiv (*sv, bits);
…		…
614	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
615	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
616	);	648	);
617	if (RETVAL)	649	if (RETVAL)
618	{	650	{
		651	av_clear (texture_av);
		652
619	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621	# include "glfunc.h"	655	# include "glfunc.h"
622	# undef GL_FUNC	656	# undef GL_FUNC
		657
623	}	658	}
624	OUTPUT:	659	OUTPUT:
625	RETVAL	660	RETVAL
626		661
627	void	662	void
628	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
629		664
630	char *	665	char *
631	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
632		667
		668	int
		669	SDL_GetAppState ()
		670
633	void	671	void
634	SDL_PollEvent ()	672	poll_events ()
635	PPCODE:	673	PPCODE:
636	{	674	{
637	SDL_Event ev;	675	SDL_Event ev;
638		676
639	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640	{	679	{
641	HV *hv = newHV ();	680	HV *hv = newHV ();
642	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
643		682
644	switch (ev.type)	683	switch (ev.type)
…		…
656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658	break;	697	break;
659		698
660	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
661	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
664	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
665	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
666	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
668	break;	725	break;
669		726
670	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
671	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
672	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
701	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
702		759
703	void	760	void
704	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
705	CODE:	762	CODE:
706	#ifndef _WIN32
707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708	#endif
709		764
710	void	765	void
711	win32_proxy_info ()	766	win32_proxy_info ()
712	PPCODE:	767	PPCODE:
713	{	768	{
…		…
854	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
855	#else	910	#else
856	_exit (retval);	911	_exit (retval);
857	#endif	912	#endif
858		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
859	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
860		924
861	CFPlus::Font	925	CFPlus::Font
862	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
863	CODE:	927	CODE:
…		…
1393	CODE:	1457	CODE:
1394	{	1458	{
1395	if (dx > 0)	1459	if (dx > 0)
1396	map_blank (self, self->x, self->y, dx, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1397	else if (dx < 0)	1461	else if (dx < 0)
1398	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399		1463
1400	if (dy > 0)	1464	if (dy > 0)
1401	map_blank (self, self->x, self->y, self->w, dy);	1465	map_blank (self, self->x, self->y, self->w, dy);
1402	else if (dy < 0)	1466	else if (dy < 0)
1403	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404		1468
1405	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1406	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1407		1471
1408	while (self->y < 0)	1472	while (self->y < 0)
…		…
1462	}	1526	}
1463	else if (cmd == 6) // monster width	1527	else if (cmd == 6) // monster width
1464	cell->stat_width = *data++ + 1;	1528	cell->stat_width = *data++ + 1;
1465	else if (cmd == 0x47)	1529	else if (cmd == 0x47)
1466	{	1530	{
1467	if (*data == 8)	1531	if (*data == 4)
1468	; // decode player uuid	1532	; // decode player count
1469		1533
1470	data += *data + 1;	1534	data += *data + 1;
1471	}	1535	}
1472	else if (cmd == 8) // cell flags	1536	else if (cmd == 8) // cell flags
1473	cell->flags = *data++;	1537	cell->flags = *data++;
…		…
1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568	CODE:	1632	CODE:
1569	{	1633	{
1570	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1634	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1571	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572	uint8_t smooth_max[256][256];	1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573	smooth_key skey;	1637	smooth_key skey;
1574	int x, y, z;	1638	int x, y, z;
1575	int last_name;	1639	int last_name;
1576		1640
1577	// thats current max. sorry.	1641	// thats current max. sorry.
…		…
1608	for (x = 0; x < sw; x++)	1672	for (x = 0; x < sw; x++)
1609	if (row->c0 <= x + mx && x + mx < row->c1)	1673	if (row->c0 <= x + mx && x + mx < row->c1)
1610	{	1674	{
1611	mapcell *cell = row->col + (x + mx - row->c0);	1675	mapcell *cell = row->col + (x + mx - row->c0);
1612		1676
1613	for (z = 0; z <= 2; z++)
1614	{
1615	uint8_t level = self->tex [cell->tile [z]].smoothlevel;
1616	if (level > smooth_max [x + 1][y + 1])
1617	smooth_max [x + 1][y + 1] = level;	1677	smooth_max[x + 1][y + 1] =
1618	}	1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
1619	}	1681	}
1620	}	1682	}
1621		1683
1622	for (z = 0; z <= 2; z++)	1684	for (z = 0; z <= 2; z++)
1623	{	1685	{
…		…
1685	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	1747	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
1686		1748
1687	// add bits to current tile and all neighbours. skey.x\|y is	1749	// add bits to current tile and all neighbours. skey.x\|y is
1688	// shifted +1\|+1 so we always stay positive.	1750	// shifted +1\|+1 so we always stay positive.
1689		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
1690	// full tile	1764	// full tile
1691	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692		1766
1693	// borders	1767	// borders
1694	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);	1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1695	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);	1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1696	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1697	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698		1772
1699	// corners	1773	// corners
1700	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
…		…
1704	}	1778	}
1705	}	1779	}
1706	}	1780	}
1707	}	1781	}
1708		1782
1709	// go through all smoothlevels, lowest to highest, then draw	1783	// go through all smoothlevels, lowest to highest, then draw.
1710	// this is basically counting sort	1784	// this is basically counting sort
1711	{	1785	{
1712	int w, b;	1786	int w, b;
1713		1787
1714	for (w = 0; w < 256 / 32; ++w)	1788	for (w = 0; w < 256 / 32; ++w)
…		…
1725	while ((he = hv_iternext (smooth)))	1799	while ((he = hv_iternext (smooth)))
1726	{	1800	{
1727	smooth_key skey = (smooth_key )HeKEY (he);	1801	smooth_key skey = (smooth_key )HeKEY (he);
1728	IV bits = SvIVX (HeVAL (he));	1802	IV bits = SvIVX (HeVAL (he));
1729		1803
1730	// bits is ___n cccc CCCC bbbb
1731	// n do not draw borders&corners
1732	// c draw these corners, but...
1733	// C ... not these
1734	// b draw these borders
1735
1736	if (!(bits & 0x1000)	1804	if (!(bits & 0x1000)
1737	&& skey->level == level	1805	&& skey->level == level
1738	&& level >= smooth_max [skey->x][skey->y])	1806	&& level > smooth_max [skey->x][skey->y])
1739	{	1807	{
1740	maptex tex = self->tex [skey->tile];	1808	maptex tex = self->tex [skey->tile];
1741	int px = (((int)skey->x) - 1) * T;	1809	int px = (((int)skey->x) - 1) * T;
1742	int py = (((int)skey->y) - 1) * T;	1810	int py = (((int)skey->y) - 1) * T;
1743	int border = bits & 15;	1811	int border = bits & 15;
…		…
2094	CODE:	2162	CODE:
2095	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
2096	OUTPUT:	2164	OUTPUT:
2097	RETVAL	2165	RETVAL
2098		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
2099	CFPlus::MixMusic	2174	CFPlus::MixMusic
2100	new_from_file (SV class, char path)	2175	new_from_file (SV class, char path)
2101	CODE:	2176	CODE:
2102	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
2103	OUTPUT:	2178	OUTPUT:
…		…
2110		2185
2111	int	2186	int
2112	play (CFPlus::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
2113	CODE:	2188	CODE:
2114	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
		2190	OUTPUT:
		2191	RETVAL
		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2115	OUTPUT:	2197	OUTPUT:
2116	RETVAL	2198	RETVAL
2117		2199
2118	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2119		2201
…		…
2208	# undef const_iv	2290	# undef const_iv
2209	};	2291	};
2210		2292
2211	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2212	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
2213	}	2298	}
2214		2299
2215	char *	2300	char *
2216	gl_vendor ()	2301	gl_vendor ()
2217	CODE:	2302	CODE:
…		…
2366		2451
2367	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2368		2453
2369	int glGenTexture ()	2454	int glGenTexture ()
2370	CODE:	2455	CODE:
2371	{	2456	RETVAL = gen_texture ();
2372	GLuint name;
2373	glGenTextures (1, &name);
2374	RETVAL = name;
2375	}
2376	OUTPUT:	2457	OUTPUT:
2377	RETVAL	2458	RETVAL
2378		2459
2379	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
2380	CODE:	2461	CODE:
2381	{
2382	GLuint name_ = name;
2383	glDeleteTextures (1, &name_);	2462	del_texture (name);
2384	}	2463
2385
2386	int glGenList ()	2464	int glGenList ()
2387	CODE:	2465	CODE:
2388	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
2389	OUTPUT:	2467	OUTPUT:
2390	RETVAL	2468	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC vs. Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC