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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.181 by root, Mon Apr 16 21:06:36 2007 UTC vs.
Revision 1.205 by root, Thu Jul 19 22:38:52 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
…		…
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
25	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
26	#include <SDL_endian.h>	32	#include <SDL_endian.h>
27	#include <SDL_image.h>	33	#include <SDL_image.h>
28	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
30		36
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	63	#else
58	# define PARACHUTE 0	64	# define PARACHUTE 0
59	#endif	65	#endif
60		66
		67	static AV *texture_av;
		68
61	static struct	69	static struct
62	{	70	{
63	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	72	#include "glfunc.h"
65	#undef GL_FUNC	73	#undef GL_FUNC
66	} gl;	74	} gl;
67		75
		76	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	78	{
70	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	83	else
75	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
		85	}
		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
76	}	109	}
77		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
…		…
555	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
556	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	589	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);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
558	}	591	}
559		592
		593	char *
		594	SDL_GetError ()
		595
560	int	596	int
561	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
562		598
563	void	599	void
564	SDL_Quit ()	600	SDL_Quit ()
565		601
566	void	602	void
567	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
568	PPCODE:	604	PPCODE:
569	{	605	{
570	SDL_Rect **m;	606	SDL_Rect **m;
571		607
572	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
573	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
574	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
575	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
576		612
577	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
578	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
579		615
580	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
581	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
582	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
583	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
584		620
585	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
586	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
587	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
588	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
589	#endif	625	#endif
590		626
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);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
595		628
596	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
597	while (*m)	630	while (*m)
598	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
599	AV *av = newAV ();	634	AV *av = newAV ();
600	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
601	av_push (av, newSViv ((*m)->h));	636	av_push (av, newSViv ((*m)->h));
		637	av_push (av, newSViv (rgb));
		638	av_push (av, newSViv (alpha));
602	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
603		641
604	++m;	642	++m;
605	}	643	}
606	}	644	}
607		645
608	char *
609	SDL_GetError ()
610
611	int	646	int
612	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
613	CODE:	648	CODE:
		649	{
		650	SDL_EnableUNICODE (1);
		651	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		652
		653	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		654	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		655	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		656	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		657
614	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
615	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
616	);	660	);
		661
617	if (RETVAL)	662	if (RETVAL)
618	{	663	{
		664	av_clear (texture_av);
		665
619	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
620	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	667	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
621	# include "glfunc.h"	668	#include "glfunc.h"
622	# undef GL_FUNC	669	#undef GL_FUNC
623	}	670	}
		671	}
624	OUTPUT:	672	OUTPUT:
625	RETVAL	673	RETVAL
626		674
627	void	675	void
628	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
629		677
630	char *	678	char *
631	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
632		680
		681	int
		682	SDL_GetAppState ()
		683
633	void	684	void
634	SDL_PollEvent ()	685	poll_events ()
635	PPCODE:	686	PPCODE:
636	{	687	{
637	SDL_Event ev;	688	SDL_Event ev;
638		689
639	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
640	{	692	{
641	HV *hv = newHV ();	693	HV *hv = newHV ();
642	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
643		695
644	switch (ev.type)	696	switch (ev.type)
…		…
656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
657	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
658	break;	710	break;
659		711
660	case SDL_MOUSEMOTION:	712	case SDL_MOUSEMOTION:
		713	{
		714	int state = ev.motion.state;
		715	int x = ev.motion.x;
		716	int y = ev.motion.y;
		717	int xrel = ev.motion.xrel;
		718	int yrel = ev.motion.yrel;
		719
		720	/* do simplistic event compression */
		721	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		722	&& state == ev.motion.state)
		723	{
		724	xrel += ev.motion.xrel;
		725	yrel += ev.motion.yrel;
		726	x = ev.motion.x;
		727	y = ev.motion.y;
		728	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		729	}
		730
661	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
662
663	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
664	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
665	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
666	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
667	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
668	break;	738	break;
669		739
670	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
671	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
672	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
852	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
853	#else	923	#else
854	_exit (retval);	924	_exit (retval);
855	#endif	925	#endif
856		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
857	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
		937
		938	PROTOTYPES: DISABLE
858		939
859	CFPlus::Font	940	CFPlus::Font
860	new_from_file (SV class, char path, int id = 0)	941	new_from_file (SV class, char path, int id = 0)
861	CODE:	942	CODE:
862	{	943	{
…		…
873	CODE:	954	CODE:
874	pango_font_description_free (self);	955	pango_font_description_free (self);
875		956
876	void	957	void
877	make_default (CFPlus::Font self)	958	make_default (CFPlus::Font self)
		959	PROTOTYPE: $
878	CODE:	960	CODE:
879	default_font = self;	961	default_font = self;
880		962
881	MODULE = CFPlus PACKAGE = CFPlus::Layout	963	MODULE = CFPlus PACKAGE = CFPlus::Layout
882		964
		965	PROTOTYPES: DISABLE
		966
883	void	967	void
884	reset_glyph_cache ()	968	reset_glyph_cache ()
		969	PROTOTYPE:
885	CODE:	970	CODE:
886	tc_clear ();	971	tc_clear ();
887		972
888	CFPlus::Layout	973	CFPlus::Layout
889	new (SV *class)	974	new (SV *class)
…		…
1176	flags	1261	flags
1177	);	1262	);
1178		1263
1179	MODULE = CFPlus PACKAGE = CFPlus::Texture	1264	MODULE = CFPlus PACKAGE = CFPlus::Texture
1180		1265
1181	void	1266	PROTOTYPES: ENABLE
1182	pad2pot (SV data_, SV w_, SV *h_)
1183	CODE:
1184	{
1185	int ow = SvIV (w_);
1186	int oh = SvIV (h_);
1187		1267
1188	if (ow && oh)	1268	int minpot (int n)
		1269
		1270	void
		1271	pad (SV *data_, int ow, int oh, int nw, int nh)
		1272	CODE:
		1273	{
		1274	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1189	{	1275	{
1190	int nw = minpot (ow);
1191	int nh = minpot (oh);
1192
1193	if (nw != ow \|\| nh != oh)
1194	{
1195	if (SvOK (data_))
1196	{
1197	STRLEN datalen;	1276	STRLEN datalen;
1198	char *data = SvPVbyte (data_, datalen);	1277	char *data = SvPVbyte (data_, datalen);
1199	int bpp = datalen / (ow * oh);	1278	int bpp = datalen / (ow * oh);
1200	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1279	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1201		1280
1202	SvPOK_only (result_);	1281	SvPOK_only (result_);
1203	SvCUR_set (result_, nw * nh * bpp);	1282	SvCUR_set (result_, nw * nh * bpp);
1204		1283
1205	memset (SvPVX (result_), 0, nw * nh * bpp);	1284	memset (SvPVX (result_), 0, nw * nh * bpp);
1206	while (oh--)	1285	while (oh--)
1207	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1286	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1208		1287
1209	sv_setsv (data_, result_);	1288	sv_setsv (data_, result_);
1210	}
1211
1212	sv_setiv (w_, nw);
1213	sv_setiv (h_, nh);
1214	}
1215	}	1289	}
1216	}	1290	}
1217		1291
1218	void	1292	void
1219	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1293	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1262	glDisable (GL_ALPHA_TEST);	1336	glDisable (GL_ALPHA_TEST);
1263	glDisable (GL_BLEND);	1337	glDisable (GL_BLEND);
1264	}	1338	}
1265	}	1339	}
1266		1340
		1341	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1342	CODE:
		1343	{
		1344	GLint width;
		1345	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1346	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1347	RETVAL = width > 0;
		1348	}
		1349	OUTPUT:
		1350	RETVAL
		1351
1267	MODULE = CFPlus PACKAGE = CFPlus::Map	1352	MODULE = CFPlus PACKAGE = CFPlus::Map
		1353
		1354	PROTOTYPES: DISABLE
1268		1355
1269	CFPlus::Map	1356	CFPlus::Map
1270	new (SV *class)	1357	new (SV *class)
1271	CODE:	1358	CODE:
1272	New (0, RETVAL, 1, struct map);	1359	New (0, RETVAL, 1, struct map);
…		…
1391	CODE:	1478	CODE:
1392	{	1479	{
1393	if (dx > 0)	1480	if (dx > 0)
1394	map_blank (self, self->x, self->y, dx, self->h);	1481	map_blank (self, self->x, self->y, dx, self->h);
1395	else if (dx < 0)	1482	else if (dx < 0)
1396	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1483	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397		1484
1398	if (dy > 0)	1485	if (dy > 0)
1399	map_blank (self, self->x, self->y, self->w, dy);	1486	map_blank (self, self->x, self->y, self->w, dy);
1400	else if (dy < 0)	1487	else if (dy < 0)
1401	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1488	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402		1489
1403	self->ox += dx; self->x += dx;	1490	self->ox += dx; self->x += dx;
1404	self->oy += dy; self->y += dy;	1491	self->oy += dy; self->y += dy;
1405		1492
1406	while (self->y < 0)	1493	while (self->y < 0)
…		…
1460	}	1547	}
1461	else if (cmd == 6) // monster width	1548	else if (cmd == 6) // monster width
1462	cell->stat_width = *data++ + 1;	1549	cell->stat_width = *data++ + 1;
1463	else if (cmd == 0x47)	1550	else if (cmd == 0x47)
1464	{	1551	{
1465	if (*data == 8)	1552	if (*data == 4)
1466	; // decode player uuid	1553	; // decode player count
1467		1554
1468	data += *data + 1;	1555	data += *data + 1;
1469	}	1556	}
1470	else if (cmd == 8) // cell flags	1557	else if (cmd == 8) // cell flags
1471	cell->flags = *data++;	1558	cell->flags = *data++;
…		…
1735	smooth_key skey = (smooth_key )HeKEY (he);	1822	smooth_key skey = (smooth_key )HeKEY (he);
1736	IV bits = SvIVX (HeVAL (he));	1823	IV bits = SvIVX (HeVAL (he));
1737		1824
1738	if (!(bits & 0x1000)	1825	if (!(bits & 0x1000)
1739	&& skey->level == level	1826	&& skey->level == level
1740	&& level >= smooth_max [skey->x][skey->y])	1827	&& level > smooth_max [skey->x][skey->y])
1741	{	1828	{
1742	maptex tex = self->tex [skey->tile];	1829	maptex tex = self->tex [skey->tile];
1743	int px = (((int)skey->x) - 1) * T;	1830	int px = (((int)skey->x) - 1) * T;
1744	int py = (((int)skey->y) - 1) * T;	1831	int py = (((int)skey->y) - 1) * T;
1745	int border = bits & 15;	1832	int border = bits & 15;
…		…
1887	void	1974	void
1888	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1975	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1889	PPCODE:	1976	PPCODE:
1890	{	1977	{
1891	int x, y;	1978	int x, y;
		1979	int sw1 = sw + 2;
		1980	int sh1 = sh + 2;
		1981	int sh3 = sh * 3;
1892	int sw4 = (sw + 3) & ~3;	1982	int sw34 = (sw * 3 + 3) & ~3;
		1983	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1893	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1894	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1985	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1895		1986
1896	memset (darkness, 255, sw4 * sh);
1897	SvPOK_only (darkness_sv);	1987	SvPOK_only (darkness3_sv);
1898	SvCUR_set (darkness_sv, sw4 * sh);	1988	SvCUR_set (darkness3_sv, sw34 * sh3);
1899		1989
1900	mx += self->x;	1990	mx += self->x - 1;
1901	my += self->y;	1991	my += self->y - 1;
1902		1992
		1993	memset (darkness1, 255, sw1 * sh1);
		1994
1903	for (y = 0; y < sh; y++)	1995	for (y = 0; y < sh1; y++)
1904	if (0 <= y + my && y + my < self->rows)	1996	if (0 <= y + my && y + my < self->rows)
1905	{	1997	{
1906	maprow *row = self->row + (y + my);	1998	maprow *row = self->row + (y + my);
1907		1999
1908	for (x = 0; x < sw; x++)	2000	for (x = 0; x < sw1; x++)
1909	if (row->c0 <= x + mx && x + mx < row->c1)	2001	if (row->c0 <= x + mx && x + mx < row->c1)
1910	{	2002	{
1911	mapcell *cell = row->col + (x + mx - row->c0);	2003	mapcell *cell = row->col + (x + mx - row->c0);
1912		2004
1913	darkness[y * sw4 + x] = cell->darkness	2005	darkness1 [y * sw1 + x] = cell->darkness
1914	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1915	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1916	}	2008	}
1917	}	2009	}
1918		2010
		2011	for (y = 0; y < sh; ++y)
		2012	for (x = 0; x < sw; ++x)
		2013	{
		2014	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2015	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2016	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2017	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2018	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2019	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2020	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2021	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2022	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2023
		2024	uint8_t r11 = (d11 + d21 + d12) / 3;
		2025	uint8_t r21 = d21;
		2026	uint8_t r31 = (d21 + d31 + d32) / 3;
		2027
		2028	uint8_t r12 = d12;
		2029	uint8_t r22 = d22;
		2030	uint8_t r32 = d32;
		2031
		2032	uint8_t r13 = (d13 + d23 + d12) / 3;
		2033	uint8_t r23 = d23;
		2034	uint8_t r33 = (d23 + d33 + d32) / 3;
		2035
		2036	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2037	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2038	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2039	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2040	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2041	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2042	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2043	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2044	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2045	}
		2046
		2047	free (darkness1);
		2048
1919	EXTEND (SP, 3);	2049	EXTEND (SP, 3);
1920	PUSHs (sv_2mortal (newSViv (sw4)));	2050	PUSHs (sv_2mortal (newSViv (sw34)));
1921	PUSHs (sv_2mortal (newSViv (sh)));	2051	PUSHs (sv_2mortal (newSViv (sh3)));
1922	PUSHs (darkness_sv);	2052	PUSHs (darkness3_sv);
1923	}	2053	}
1924		2054
1925	SV *	2055	SV *
1926	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2056	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1927	CODE:	2057	CODE:
…		…
2061	}	2191	}
2062	}	2192	}
2063		2193
2064	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2194	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2065		2195
		2196	PROTOTYPES: DISABLE
		2197
2066	CFPlus::MixChunk	2198	CFPlus::MixChunk
2067	new_from_file (SV class, char path)	2199	new_from_file (SV class, char path)
2068	CODE:	2200	CODE:
2069	RETVAL = Mix_LoadWAV (path);	2201	RETVAL = Mix_LoadWAV (path);
2070	OUTPUT:	2202	OUTPUT:
…		…
2091		2223
2092	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2224	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2093		2225
2094	int	2226	int
2095	volume (int volume = -1)	2227	volume (int volume = -1)
		2228	PROTOTYPE: ;$
2096	CODE:	2229	CODE:
2097	RETVAL = Mix_VolumeMusic (volume);	2230	RETVAL = Mix_VolumeMusic (volume);
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	fade_out (int ms)
		2236	CODE:
		2237	RETVAL = Mix_FadeOutMusic (ms);
2098	OUTPUT:	2238	OUTPUT:
2099	RETVAL	2239	RETVAL
2100		2240
2101	CFPlus::MixMusic	2241	CFPlus::MixMusic
2102	new_from_file (SV class, char path)	2242	new_from_file (SV class, char path)
…		…
2115	CODE:	2255	CODE:
2116	RETVAL = Mix_PlayMusic (self, loops);	2256	RETVAL = Mix_PlayMusic (self, loops);
2117	OUTPUT:	2257	OUTPUT:
2118	RETVAL	2258	RETVAL
2119		2259
		2260	int
		2261	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2262	CODE:
		2263	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2264	OUTPUT:
		2265	RETVAL
		2266
2120	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2267	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2268
		2269	PROTOTYPES: ENABLE
2121		2270
2122	BOOT:	2271	BOOT:
2123	{	2272	{
2124	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2273	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2125	static const struct {	2274	static const struct {
2126	const char *name;	2275	const char *name;
2127	IV iv;	2276	IV iv;
2128	} *civ, const_iv[] = {	2277	} *civ, const_iv[] = {
2129	# define const_iv(name) { # name, (IV)name }	2278	# define const_iv(name) { # name, (IV)name }
		2279	const_iv (GL_VENDOR),
		2280	const_iv (GL_VERSION),
		2281	const_iv (GL_EXTENSIONS),
2130	const_iv (GL_COLOR_MATERIAL),	2282	const_iv (GL_COLOR_MATERIAL),
2131	const_iv (GL_SMOOTH),	2283	const_iv (GL_SMOOTH),
2132	const_iv (GL_FLAT),	2284	const_iv (GL_FLAT),
2133	const_iv (GL_DITHER),	2285	const_iv (GL_DITHER),
2134	const_iv (GL_BLEND),	2286	const_iv (GL_BLEND),
…		…
2161	const_iv (GL_LUMINANCE),	2313	const_iv (GL_LUMINANCE),
2162	const_iv (GL_LUMINANCE_ALPHA),	2314	const_iv (GL_LUMINANCE_ALPHA),
2163	const_iv (GL_FLOAT),	2315	const_iv (GL_FLOAT),
2164	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2316	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2165	const_iv (GL_COMPILE),	2317	const_iv (GL_COMPILE),
		2318	const_iv (GL_PROXY_TEXTURE_1D),
		2319	const_iv (GL_PROXY_TEXTURE_2D),
2166	const_iv (GL_TEXTURE_1D),	2320	const_iv (GL_TEXTURE_1D),
2167	const_iv (GL_TEXTURE_2D),	2321	const_iv (GL_TEXTURE_2D),
2168	const_iv (GL_TEXTURE_ENV),	2322	const_iv (GL_TEXTURE_ENV),
2169	const_iv (GL_TEXTURE_MAG_FILTER),	2323	const_iv (GL_TEXTURE_MAG_FILTER),
2170	const_iv (GL_TEXTURE_MIN_FILTER),	2324	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2210	# undef const_iv	2364	# undef const_iv
2211	};	2365	};
2212		2366
2213	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2367	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2214	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2368	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2369
		2370	texture_av = newAV ();
		2371	AvREAL_off (texture_av);
2215	}	2372	}
2216		2373
2217	char *	2374	char *
2218	gl_vendor ()	2375	gl_vendor ()
2219	CODE:	2376	CODE:
…		…
2230		2387
2231	char *	2388	char *
2232	gl_extensions ()	2389	gl_extensions ()
2233	CODE:	2390	CODE:
2234	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2391	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2392	OUTPUT:
		2393	RETVAL
		2394
		2395	const char *glGetString (GLenum pname)
		2396
		2397	GLint glGetInteger (GLenum pname)
		2398	CODE:
		2399	glGetIntegerv (pname, &RETVAL);
		2400	OUTPUT:
		2401	RETVAL
		2402
		2403	GLdouble glGetDouble (GLenum pname)
		2404	CODE:
		2405	glGetDoublev (pname, &RETVAL);
2235	OUTPUT:	2406	OUTPUT:
2236	RETVAL	2407	RETVAL
2237		2408
2238	int glGetError ()	2409	int glGetError ()
2239		2410
…		…
2364		2535
2365	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2536	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2366		2537
2367	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2538	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2368		2539
		2540	void glPixelZoom (float x, float y)
		2541
2369	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2542	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2370		2543
2371	int glGenTexture ()	2544	int glGenTexture ()
2372	CODE:	2545	CODE:
2373	{	2546	RETVAL = gen_texture ();
2374	GLuint name;
2375	glGenTextures (1, &name);
2376	RETVAL = name;
2377	}
2378	OUTPUT:	2547	OUTPUT:
2379	RETVAL	2548	RETVAL
2380		2549
2381	void glDeleteTexture (int name)	2550	void glDeleteTexture (int name)
2382	CODE:	2551	CODE:
2383	{
2384	GLuint name_ = name;
2385	glDeleteTextures (1, &name_);	2552	del_texture (name);
2386	}	2553
2387
2388	int glGenList ()	2554	int glGenList ()
2389	CODE:	2555	CODE:
2390	RETVAL = glGenLists (1);	2556	RETVAL = glGenLists (1);
2391	OUTPUT:	2557	OUTPUT:
2392	RETVAL	2558	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.181 by root, Mon Apr 16 21:06:36 2007 UTC vs. Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.181 by root, Mon Apr 16 21:06:36 2007 UTC vs.
Revision 1.205 by root, Thu Jul 19 22:38:52 2007 UTC