[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.201 by root, Tue Jul 17 17:39:06 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);
…		…
555	opengl_fontmap = pango_opengl_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
556	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
557	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
558	}	590	}
559		591
		592	char *
		593	SDL_GetError ()
		594
560	int	595	int
561	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
562		597
563	void	598	void
564	SDL_Quit ()	599	SDL_Quit ()
565		600
566	void	601	void
567	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
568	PPCODE:	603	PPCODE:
569	{	604	{
570	SDL_Rect **m;	605	SDL_Rect **m;
571		606
572	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576		611
577	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579		614
580	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584		619
585	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586	#if SDL_VERSION_ATLEAST(1,2,10)	621	#if SDL_VERSION_ATLEAST(1,2,10)
587	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589	#endif	624	#endif
590		625
591	SDL_EnableUNICODE (1);
592	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
593
594	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
595		627
596	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
597	while (*m)	629	while (*m)
598	{	630	{
		631	if ((m)->w >= 640 && (m)->h >= 480)
		632	{
599	AV *av = newAV ();	633	AV *av = newAV ();
600	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
601	av_push (av, newSViv ((*m)->h));	635	av_push (av, newSViv ((*m)->h));
		636	av_push (av, newSViv (rgb));
		637	av_push (av, newSViv (alpha));
602	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
603		640
604	++m;	641	++m;
605	}	642	}
606	}	643	}
607		644
608	char *
609	SDL_GetError ()
610
611	int	645	int
612	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613	CODE:	647	CODE:
		648	{
		649	SDL_EnableUNICODE (1);
		650	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		651
		652	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		653	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		654	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		655	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		656
614	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
615	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
616	);	659	);
		660
617	if (RETVAL)	661	if (RETVAL)
618	{	662	{
		663	av_clear (texture_av);
		664
619	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	666	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621	# include "glfunc.h"	667	#include "glfunc.h"
622	# undef GL_FUNC	668	#undef GL_FUNC
623	}	669	}
		670	}
624	OUTPUT:	671	OUTPUT:
625	RETVAL	672	RETVAL
626		673
627	void	674	void
628	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
629		676
630	char *	677	char *
631	SDL_GetKeyName (int sym)	678	SDL_GetKeyName (int sym)
632		679
		680	int
		681	SDL_GetAppState ()
		682
633	void	683	void
634	SDL_PollEvent ()	684	poll_events ()
635	PPCODE:	685	PPCODE:
636	{	686	{
637	SDL_Event ev;	687	SDL_Event ev;
638		688
639	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640	{	691	{
641	HV *hv = newHV ();	692	HV *hv = newHV ();
642	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
643		694
644	switch (ev.type)	695	switch (ev.type)
…		…
656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658	break;	709	break;
659		710
660	case SDL_MOUSEMOTION:	711	case SDL_MOUSEMOTION:
		712	{
		713	int state = ev.motion.state;
		714	int x = ev.motion.x;
		715	int y = ev.motion.y;
		716	int xrel = ev.motion.xrel;
		717	int yrel = ev.motion.yrel;
		718
		719	/* do simplistic event compression */
		720	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		721	&& state == ev.motion.state)
		722	{
		723	xrel += ev.motion.xrel;
		724	yrel += ev.motion.yrel;
		725	x = ev.motion.x;
		726	y = ev.motion.y;
		727	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		728	}
		729
661	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
664	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
665	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
666	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
668	break;	737	break;
669		738
670	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
671	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
672	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
701	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
702		771
703	void	772	void
704	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
705	CODE:	774	CODE:
706	#ifndef _WIN32
707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
708	#endif
709		776
710	void	777	void
711	win32_proxy_info ()	778	win32_proxy_info ()
712	PPCODE:	779	PPCODE:
713	{	780	{
…		…
854	ExitThread (retval); // unclean, please beam me up	921	ExitThread (retval); // unclean, please beam me up
855	#else	922	#else
856	_exit (retval);	923	_exit (retval);
857	#endif	924	#endif
858		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
859	MODULE = CFPlus PACKAGE = CFPlus::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
860		936
861	CFPlus::Font	937	CFPlus::Font
862	new_from_file (SV class, char path, int id = 0)	938	new_from_file (SV class, char path, int id = 0)
863	CODE:	939	CODE:
…		…
1178	flags	1254	flags
1179	);	1255	);
1180		1256
1181	MODULE = CFPlus PACKAGE = CFPlus::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
1182		1258
		1259	int minpot (int n)
		1260
1183	void	1261	void
1184	pad2pot (SV data_, SV w_, SV *h_)	1262	pad2pot (SV data_, SV w_, SV *h_)
1185	CODE:	1263	CODE:
1186	{	1264	{
1187	int ow = SvIV (w_);	1265	int ow = SvIV (w_);
…		…
1263	{	1341	{
1264	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
1265	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
1266	}	1344	}
1267	}	1345	}
		1346
		1347	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1348	CODE:
		1349	{
		1350	GLint width;
		1351	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1352	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1353	RETVAL = width > 0;
		1354	}
		1355	OUTPUT:
		1356	RETVAL
1268		1357
1269	MODULE = CFPlus PACKAGE = CFPlus::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1270		1359
1271	CFPlus::Map	1360	CFPlus::Map
1272	new (SV *class)	1361	new (SV *class)
…		…
1393	CODE:	1482	CODE:
1394	{	1483	{
1395	if (dx > 0)	1484	if (dx > 0)
1396	map_blank (self, self->x, self->y, dx, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1397	else if (dx < 0)	1486	else if (dx < 0)
1398	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1487	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1399		1488
1400	if (dy > 0)	1489	if (dy > 0)
1401	map_blank (self, self->x, self->y, self->w, dy);	1490	map_blank (self, self->x, self->y, self->w, dy);
1402	else if (dy < 0)	1491	else if (dy < 0)
1403	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1492	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1404		1493
1405	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1406	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1407		1496
1408	while (self->y < 0)	1497	while (self->y < 0)
…		…
1462	}	1551	}
1463	else if (cmd == 6) // monster width	1552	else if (cmd == 6) // monster width
1464	cell->stat_width = *data++ + 1;	1553	cell->stat_width = *data++ + 1;
1465	else if (cmd == 0x47)	1554	else if (cmd == 0x47)
1466	{	1555	{
1467	if (*data == 8)	1556	if (*data == 4)
1468	; // decode player uuid	1557	; // decode player count
1469		1558
1470	data += *data + 1;	1559	data += *data + 1;
1471	}	1560	}
1472	else if (cmd == 8) // cell flags	1561	else if (cmd == 8) // cell flags
1473	cell->flags = *data++;	1562	cell->flags = *data++;
…		…
1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1656	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1568	CODE:	1657	CODE:
1569	{	1658	{
1570	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1659	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1571	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1660	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1572	uint8_t smooth_max[256][256];	1661	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1573	smooth_key skey;	1662	smooth_key skey;
1574	int x, y, z;	1663	int x, y, z;
1575	int last_name;	1664	int last_name;
1576		1665
1577	// thats current max. sorry.	1666	// thats current max. sorry.
…		…
1608	for (x = 0; x < sw; x++)	1697	for (x = 0; x < sw; x++)
1609	if (row->c0 <= x + mx && x + mx < row->c1)	1698	if (row->c0 <= x + mx && x + mx < row->c1)
1610	{	1699	{
1611	mapcell *cell = row->col + (x + mx - row->c0);	1700	mapcell *cell = row->col + (x + mx - row->c0);
1612		1701
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;	1702	smooth_max[x + 1][y + 1] =
1618	}	1703	MAX (self->tex [cell->tile [0]].smoothlevel,
		1704	MAX (self->tex [cell->tile [1]].smoothlevel,
		1705	self->tex [cell->tile [2]].smoothlevel));
1619	}	1706	}
1620	}	1707	}
1621		1708
1622	for (z = 0; z <= 2; z++)	1709	for (z = 0; z <= 2; z++)
1623	{	1710	{
…		…
1685	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	1772	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
1686		1773
1687	// add bits to current tile and all neighbours. skey.x\|y is	1774	// add bits to current tile and all neighbours. skey.x\|y is
1688	// shifted +1\|+1 so we always stay positive.	1775	// shifted +1\|+1 so we always stay positive.
1689		1776
		1777	// bits is ___n cccc CCCC bbbb
		1778	// n do not draw borders&corners
		1779	// c draw these corners, but...
		1780	// C ... not these
		1781	// b draw these borders
		1782
		1783	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1784	// ┃· ·· ·┃ ━━
		1785
		1786	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1787	// ·· ·· ·┏ ┓·
		1788
1690	// full tile	1789	// full tile
1691	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	1790	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1692		1791
1693	// borders	1792	// borders
1694	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);	1793	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);	1794	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);	1795	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);	1796	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1698		1797
1699	// corners	1798	// corners
1700	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	1799	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
…		…
1704	}	1803	}
1705	}	1804	}
1706	}	1805	}
1707	}	1806	}
1708		1807
1709	// go through all smoothlevels, lowest to highest, then draw	1808	// go through all smoothlevels, lowest to highest, then draw.
1710	// this is basically counting sort	1809	// this is basically counting sort
1711	{	1810	{
1712	int w, b;	1811	int w, b;
1713		1812
1714	for (w = 0; w < 256 / 32; ++w)	1813	for (w = 0; w < 256 / 32; ++w)
…		…
1725	while ((he = hv_iternext (smooth)))	1824	while ((he = hv_iternext (smooth)))
1726	{	1825	{
1727	smooth_key skey = (smooth_key )HeKEY (he);	1826	smooth_key skey = (smooth_key )HeKEY (he);
1728	IV bits = SvIVX (HeVAL (he));	1827	IV bits = SvIVX (HeVAL (he));
1729		1828
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)	1829	if (!(bits & 0x1000)
1737	&& skey->level == level	1830	&& skey->level == level
1738	&& level >= smooth_max [skey->x][skey->y])	1831	&& level > smooth_max [skey->x][skey->y])
1739	{	1832	{
1740	maptex tex = self->tex [skey->tile];	1833	maptex tex = self->tex [skey->tile];
1741	int px = (((int)skey->x) - 1) * T;	1834	int px = (((int)skey->x) - 1) * T;
1742	int py = (((int)skey->y) - 1) * T;	1835	int py = (((int)skey->y) - 1) * T;
1743	int border = bits & 15;	1836	int border = bits & 15;
…		…
1881	glDisable (GL_BLEND);	1974	glDisable (GL_BLEND);
1882	glDisable (GL_TEXTURE_2D);	1975	glDisable (GL_TEXTURE_2D);
1883	}	1976	}
1884		1977
1885	void	1978	void
1886	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1979	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1887	PPCODE:	1980	PPCODE:
1888	{	1981	{
1889	int x, y;	1982	int x, y;
1890	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1891	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1911	darkness[y * sw4 + x] = cell->darkness	2004	darkness[y * sw4 + x] = cell->darkness
1912	? 255 - (cell->darkness - 1)	2005	? 255 - (cell->darkness - 1)
1913	: 255 - FOW_DARKNESS;	2006	: 255 - FOW_DARKNESS;
1914	}	2007	}
1915	}	2008	}
		2009
		2010	if (smoothing)
		2011	{
		2012	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		2013	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2014
		2015	SvPOK_only (darkness2_sv);
		2016	SvCUR_set (darkness2_sv, sw4 * sh);
		2017
		2018	for (y = 0; y < sh; ++y)
		2019	for (x = 0; x < sw4; ++x)
		2020	{
		2021	float f = (float )matrix;
		2022	int dx, dy;
		2023	float sum = 0.f;
		2024
		2025	for (dy = -1; dy <= 1; ++dy)
		2026	for (dx = -1; dx <= 1; ++dx)
		2027	{
		2028	unsigned int x2 = x + dx;
		2029	unsigned int y2 = y + dy;
		2030
		2031	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2032	}
		2033
		2034	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2035	}
		2036
		2037	darkness_sv = darkness2_sv;
		2038	}
1916		2039
1917	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1918	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1919	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1920	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
…		…
2094	CODE:	2217	CODE:
2095	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
2096	OUTPUT:	2219	OUTPUT:
2097	RETVAL	2220	RETVAL
2098		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
2099	CFPlus::MixMusic	2229	CFPlus::MixMusic
2100	new_from_file (SV class, char path)	2230	new_from_file (SV class, char path)
2101	CODE:	2231	CODE:
2102	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
2103	OUTPUT:	2233	OUTPUT:
…		…
2110		2240
2111	int	2241	int
2112	play (CFPlus::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
2113	CODE:	2243	CODE:
2114	RETVAL = Mix_PlayMusic (self, loops);	2244	RETVAL = Mix_PlayMusic (self, loops);
		2245	OUTPUT:
		2246	RETVAL
		2247
		2248	int
		2249	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2250	CODE:
		2251	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2115	OUTPUT:	2252	OUTPUT:
2116	RETVAL	2253	RETVAL
2117		2254
2118	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2119		2256
…		…
2123	static const struct {	2260	static const struct {
2124	const char *name;	2261	const char *name;
2125	IV iv;	2262	IV iv;
2126	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
2127	# define const_iv(name) { # name, (IV)name }	2264	# define const_iv(name) { # name, (IV)name }
		2265	const_iv (GL_VENDOR),
		2266	const_iv (GL_VERSION),
		2267	const_iv (GL_EXTENSIONS),
2128	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
2129	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
2130	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
2131	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
2132	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
…		…
2159	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
2160	const_iv (GL_LUMINANCE_ALPHA),	2300	const_iv (GL_LUMINANCE_ALPHA),
2161	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
2162	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2163	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
2164	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
2165	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
2166	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
2167	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
2168	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2208	# undef const_iv	2350	# undef const_iv
2209	};	2351	};
2210		2352
2211	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2212	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2355
		2356	texture_av = newAV ();
		2357	AvREAL_off (texture_av);
2213	}	2358	}
2214		2359
2215	char *	2360	char *
2216	gl_vendor ()	2361	gl_vendor ()
2217	CODE:	2362	CODE:
…		…
2228		2373
2229	char *	2374	char *
2230	gl_extensions ()	2375	gl_extensions ()
2231	CODE:	2376	CODE:
2232	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2377	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2378	OUTPUT:
		2379	RETVAL
		2380
		2381	const char *glGetString (GLenum pname)
		2382
		2383	GLint glGetInteger (GLenum pname)
		2384	CODE:
		2385	glGetIntegerv (pname, &RETVAL);
		2386	OUTPUT:
		2387	RETVAL
		2388
		2389	GLdouble glGetDouble (GLenum pname)
		2390	CODE:
		2391	glGetDoublev (pname, &RETVAL);
2233	OUTPUT:	2392	OUTPUT:
2234	RETVAL	2393	RETVAL
2235		2394
2236	int glGetError ()	2395	int glGetError ()
2237		2396
…		…
2362		2521
2363	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2522	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2364		2523
2365	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2524	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2366		2525
		2526	void glPixelZoom (float x, float y)
		2527
2367	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2528	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2368		2529
2369	int glGenTexture ()	2530	int glGenTexture ()
2370	CODE:	2531	CODE:
2371	{	2532	RETVAL = gen_texture ();
2372	GLuint name;
2373	glGenTextures (1, &name);
2374	RETVAL = name;
2375	}
2376	OUTPUT:	2533	OUTPUT:
2377	RETVAL	2534	RETVAL
2378		2535
2379	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
2380	CODE:	2537	CODE:
2381	{
2382	GLuint name_ = name;
2383	glDeleteTextures (1, &name_);	2538	del_texture (name);
2384	}	2539
2385
2386	int glGenList ()	2540	int glGenList ()
2387	CODE:	2541	CODE:
2388	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
2389	OUTPUT:	2543	OUTPUT:
2390	RETVAL	2544	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.201 by root, Tue Jul 17 17:39:06 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.201 by root, Tue Jul 17 17:39:06 2007 UTC