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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.179 by root, Wed Apr 11 04:32:51 2007 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 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"
…		…
345	} smooth_key;	378	} smooth_key;
346		379
347	static void	380	static void
348	smooth_or_bits (HV hv, smooth_key key, IV bits)	381	smooth_or_bits (HV hv, smooth_key key, IV bits)
349	{	382	{
350	SV *sv = hv_fetch (hv, (char )key, sizeof (key), 1);	383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
351		384
352	if (SvIOK (*sv))	385	if (SvIOK (*sv))
353	SvIV_set (sv, SvIVX (sv) \| bits);	386	SvIV_set (sv, SvIVX (sv) \| bits);
354	else	387	else
355	sv_setiv (*sv, bits);	388	sv_setiv (*sv, bits);
…		…
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
858		937
859	CFPlus::Font	938	CFPlus::Font
860	new_from_file (SV class, char path, int id = 0)	939	new_from_file (SV class, char path, int id = 0)
861	CODE:	940	CODE:
…		…
1176	flags	1255	flags
1177	);	1256	);
1178		1257
1179	MODULE = CFPlus PACKAGE = CFPlus::Texture	1258	MODULE = CFPlus PACKAGE = CFPlus::Texture
1180		1259
1181	void	1260	int minpot (int n)
1182	pad2pot (SV data_, SV w_, SV *h_)
1183	CODE:
1184	{
1185	int ow = SvIV (w_);
1186	int oh = SvIV (h_);
1187		1261
1188	if (ow && oh)	1262	void
		1263	pad (SV *data_, int ow, int oh, int nw, int nh)
		1264	CODE:
		1265	{
		1266	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1189	{	1267	{
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;	1268	STRLEN datalen;
1198	char *data = SvPVbyte (data_, datalen);	1269	char *data = SvPVbyte (data_, datalen);
1199	int bpp = datalen / (ow * oh);	1270	int bpp = datalen / (ow * oh);
1200	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1271	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1201		1272
1202	SvPOK_only (result_);	1273	SvPOK_only (result_);
1203	SvCUR_set (result_, nw * nh * bpp);	1274	SvCUR_set (result_, nw * nh * bpp);
1204		1275
1205	memset (SvPVX (result_), 0, nw * nh * bpp);	1276	memset (SvPVX (result_), 0, nw * nh * bpp);
1206	while (oh--)	1277	while (oh--)
1207	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1278	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1208		1279
1209	sv_setsv (data_, result_);	1280	sv_setsv (data_, result_);
1210	}
1211
1212	sv_setiv (w_, nw);
1213	sv_setiv (h_, nh);
1214	}
1215	}	1281	}
1216	}	1282	}
1217		1283
1218	void	1284	void
1219	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1285	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1261	{	1327	{
1262	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1263	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1264	}	1330	}
1265	}	1331	}
		1332
		1333	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1334	CODE:
		1335	{
		1336	GLint width;
		1337	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1338	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1339	RETVAL = width > 0;
		1340	}
		1341	OUTPUT:
		1342	RETVAL
1266		1343
1267	MODULE = CFPlus PACKAGE = CFPlus::Map	1344	MODULE = CFPlus PACKAGE = CFPlus::Map
1268		1345
1269	CFPlus::Map	1346	CFPlus::Map
1270	new (SV *class)	1347	new (SV *class)
…		…
1391	CODE:	1468	CODE:
1392	{	1469	{
1393	if (dx > 0)	1470	if (dx > 0)
1394	map_blank (self, self->x, self->y, dx, self->h);	1471	map_blank (self, self->x, self->y, dx, self->h);
1395	else if (dx < 0)	1472	else if (dx < 0)
1396	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1473	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1397		1474
1398	if (dy > 0)	1475	if (dy > 0)
1399	map_blank (self, self->x, self->y, self->w, dy);	1476	map_blank (self, self->x, self->y, self->w, dy);
1400	else if (dy < 0)	1477	else if (dy < 0)
1401	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1478	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1402		1479
1403	self->ox += dx; self->x += dx;	1480	self->ox += dx; self->x += dx;
1404	self->oy += dy; self->y += dy;	1481	self->oy += dy; self->y += dy;
1405		1482
1406	while (self->y < 0)	1483	while (self->y < 0)
…		…
1460	}	1537	}
1461	else if (cmd == 6) // monster width	1538	else if (cmd == 6) // monster width
1462	cell->stat_width = *data++ + 1;	1539	cell->stat_width = *data++ + 1;
1463	else if (cmd == 0x47)	1540	else if (cmd == 0x47)
1464	{	1541	{
1465	if (*data == 8)	1542	if (*data == 4)
1466	; // decode player uuid	1543	; // decode player count
1467		1544
1468	data += *data + 1;	1545	data += *data + 1;
1469	}	1546	}
1470	else if (cmd == 8) // cell flags	1547	else if (cmd == 8) // cell flags
1471	cell->flags = *data++;	1548	cell->flags = *data++;
…		…
1681	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	1758	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
1682		1759
1683	// add bits to current tile and all neighbours. skey.x\|y is	1760	// add bits to current tile and all neighbours. skey.x\|y is
1684	// shifted +1\|+1 so we always stay positive.	1761	// shifted +1\|+1 so we always stay positive.
1685		1762
		1763	// bits is ___n cccc CCCC bbbb
		1764	// n do not draw borders&corners
		1765	// c draw these corners, but...
		1766	// C ... not these
		1767	// b draw these borders
		1768
		1769	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1770	// ┃· ·· ·┃ ━━
		1771
		1772	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1773	// ·· ·· ·┏ ┓·
		1774
1686	// full tile	1775	// full tile
1687	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	1776	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
1688		1777
1689	// borders	1778	// borders
1690	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);	1779	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
1691	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);	1780	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
1692	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	1781	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
1693	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	1782	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
1694		1783
1695	// corners	1784	// corners
1696	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	1785	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
…		…
1700	}	1789	}
1701	}	1790	}
1702	}	1791	}
1703	}	1792	}
1704		1793
1705	// go through all smoothlevels, lowest to highest, then draw	1794	// go through all smoothlevels, lowest to highest, then draw.
1706	// this is basically counting sort	1795	// this is basically counting sort
1707	{	1796	{
1708	int w, b;	1797	int w, b;
1709		1798
1710	for (w = 0; w < 256 / 32; ++w)	1799	for (w = 0; w < 256 / 32; ++w)
…		…
1721	while ((he = hv_iternext (smooth)))	1810	while ((he = hv_iternext (smooth)))
1722	{	1811	{
1723	smooth_key skey = (smooth_key )HeKEY (he);	1812	smooth_key skey = (smooth_key )HeKEY (he);
1724	IV bits = SvIVX (HeVAL (he));	1813	IV bits = SvIVX (HeVAL (he));
1725		1814
1726	// bits is ___n cccc CCCC bbbb
1727	// n do not draw borders&corners
1728	// c draw these corners, but...
1729	// C ... not these
1730	// b draw these borders
1731
1732	if (!(bits & 0x1000)	1815	if (!(bits & 0x1000)
1733	&& skey->level == level	1816	&& skey->level == level
1734	&& level >= smooth_max [skey->x][skey->y])	1817	&& level > smooth_max [skey->x][skey->y])
1735	{	1818	{
1736	maptex tex = self->tex [skey->tile];	1819	maptex tex = self->tex [skey->tile];
1737	int px = (((int)skey->x) - 1) * T;	1820	int px = (((int)skey->x) - 1) * T;
1738	int py = (((int)skey->y) - 1) * T;	1821	int py = (((int)skey->y) - 1) * T;
1739	int border = bits & 15;	1822	int border = bits & 15;
…		…
1881	void	1964	void
1882	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1965	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1883	PPCODE:	1966	PPCODE:
1884	{	1967	{
1885	int x, y;	1968	int x, y;
		1969	int sw1 = sw + 2;
		1970	int sh1 = sh + 2;
		1971	int sh3 = sh * 3;
1886	int sw4 = (sw + 3) & ~3;	1972	int sw34 = (sw * 3 + 3) & ~3;
		1973	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1887	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1974	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1888	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1975	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1889		1976
1890	memset (darkness, 255, sw4 * sh);
1891	SvPOK_only (darkness_sv);	1977	SvPOK_only (darkness3_sv);
1892	SvCUR_set (darkness_sv, sw4 * sh);	1978	SvCUR_set (darkness3_sv, sw34 * sh3);
1893		1979
1894	mx += self->x;	1980	mx += self->x - 1;
1895	my += self->y;	1981	my += self->y - 1;
1896		1982
		1983	memset (darkness1, 255, sw1 * sh1);
		1984
1897	for (y = 0; y < sh; y++)	1985	for (y = 0; y < sh1; y++)
1898	if (0 <= y + my && y + my < self->rows)	1986	if (0 <= y + my && y + my < self->rows)
1899	{	1987	{
1900	maprow *row = self->row + (y + my);	1988	maprow *row = self->row + (y + my);
1901		1989
1902	for (x = 0; x < sw; x++)	1990	for (x = 0; x < sw1; x++)
1903	if (row->c0 <= x + mx && x + mx < row->c1)	1991	if (row->c0 <= x + mx && x + mx < row->c1)
1904	{	1992	{
1905	mapcell *cell = row->col + (x + mx - row->c0);	1993	mapcell *cell = row->col + (x + mx - row->c0);
1906		1994
1907	darkness[y * sw4 + x] = cell->darkness	1995	darkness1 [y * sw1 + x] = cell->darkness
1908	? 255 - (cell->darkness - 1)	1996	? 255 - (cell->darkness - 1)
1909	: 255 - FOW_DARKNESS;	1997	: 255 - FOW_DARKNESS;
1910	}	1998	}
1911	}	1999	}
1912		2000
		2001	for (y = 0; y < sh; ++y)
		2002	for (x = 0; x < sw; ++x)
		2003	{
		2004	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2005	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2006	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2007	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2008	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2009	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2010	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2011	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2012	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2013
		2014	uint8_t r11 = (d11 + d21 + d12) / 3;
		2015	uint8_t r21 = d21;
		2016	uint8_t r31 = (d21 + d31 + d32) / 3;
		2017
		2018	uint8_t r12 = d12;
		2019	uint8_t r22 = d22;
		2020	uint8_t r32 = d32;
		2021
		2022	uint8_t r13 = (d13 + d23 + d12) / 3;
		2023	uint8_t r23 = d23;
		2024	uint8_t r33 = (d23 + d33 + d32) / 3;
		2025
		2026	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2027	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2028	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2029	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2030	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2031	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2032	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2033	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2034	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2035	}
		2036
		2037	free (darkness1);
		2038
1913	EXTEND (SP, 3);	2039	EXTEND (SP, 3);
1914	PUSHs (sv_2mortal (newSViv (sw4)));	2040	PUSHs (sv_2mortal (newSViv (sw34)));
1915	PUSHs (sv_2mortal (newSViv (sh)));	2041	PUSHs (sv_2mortal (newSViv (sh3)));
1916	PUSHs (darkness_sv);	2042	PUSHs (darkness3_sv);
1917	}	2043	}
1918		2044
1919	SV *	2045	SV *
1920	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2046	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1921	CODE:	2047	CODE:
…		…
2090	CODE:	2216	CODE:
2091	RETVAL = Mix_VolumeMusic (volume);	2217	RETVAL = Mix_VolumeMusic (volume);
2092	OUTPUT:	2218	OUTPUT:
2093	RETVAL	2219	RETVAL
2094		2220
		2221	int
		2222	fade_out (int ms)
		2223	CODE:
		2224	RETVAL = Mix_FadeOutMusic (ms);
		2225	OUTPUT:
		2226	RETVAL
		2227
2095	CFPlus::MixMusic	2228	CFPlus::MixMusic
2096	new_from_file (SV class, char path)	2229	new_from_file (SV class, char path)
2097	CODE:	2230	CODE:
2098	RETVAL = Mix_LoadMUS (path);	2231	RETVAL = Mix_LoadMUS (path);
2099	OUTPUT:	2232	OUTPUT:
…		…
2106		2239
2107	int	2240	int
2108	play (CFPlus::MixMusic self, int loops = -1)	2241	play (CFPlus::MixMusic self, int loops = -1)
2109	CODE:	2242	CODE:
2110	RETVAL = Mix_PlayMusic (self, loops);	2243	RETVAL = Mix_PlayMusic (self, loops);
		2244	OUTPUT:
		2245	RETVAL
		2246
		2247	int
		2248	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2249	CODE:
		2250	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2111	OUTPUT:	2251	OUTPUT:
2112	RETVAL	2252	RETVAL
2113		2253
2114	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2254	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2115		2255
…		…
2119	static const struct {	2259	static const struct {
2120	const char *name;	2260	const char *name;
2121	IV iv;	2261	IV iv;
2122	} *civ, const_iv[] = {	2262	} *civ, const_iv[] = {
2123	# define const_iv(name) { # name, (IV)name }	2263	# define const_iv(name) { # name, (IV)name }
		2264	const_iv (GL_VENDOR),
		2265	const_iv (GL_VERSION),
		2266	const_iv (GL_EXTENSIONS),
2124	const_iv (GL_COLOR_MATERIAL),	2267	const_iv (GL_COLOR_MATERIAL),
2125	const_iv (GL_SMOOTH),	2268	const_iv (GL_SMOOTH),
2126	const_iv (GL_FLAT),	2269	const_iv (GL_FLAT),
2127	const_iv (GL_DITHER),	2270	const_iv (GL_DITHER),
2128	const_iv (GL_BLEND),	2271	const_iv (GL_BLEND),
…		…
2155	const_iv (GL_LUMINANCE),	2298	const_iv (GL_LUMINANCE),
2156	const_iv (GL_LUMINANCE_ALPHA),	2299	const_iv (GL_LUMINANCE_ALPHA),
2157	const_iv (GL_FLOAT),	2300	const_iv (GL_FLOAT),
2158	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2301	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2159	const_iv (GL_COMPILE),	2302	const_iv (GL_COMPILE),
		2303	const_iv (GL_PROXY_TEXTURE_1D),
		2304	const_iv (GL_PROXY_TEXTURE_2D),
2160	const_iv (GL_TEXTURE_1D),	2305	const_iv (GL_TEXTURE_1D),
2161	const_iv (GL_TEXTURE_2D),	2306	const_iv (GL_TEXTURE_2D),
2162	const_iv (GL_TEXTURE_ENV),	2307	const_iv (GL_TEXTURE_ENV),
2163	const_iv (GL_TEXTURE_MAG_FILTER),	2308	const_iv (GL_TEXTURE_MAG_FILTER),
2164	const_iv (GL_TEXTURE_MIN_FILTER),	2309	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2204	# undef const_iv	2349	# undef const_iv
2205	};	2350	};
2206		2351
2207	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2352	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2208	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2353	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2354
		2355	texture_av = newAV ();
		2356	AvREAL_off (texture_av);
2209	}	2357	}
2210		2358
2211	char *	2359	char *
2212	gl_vendor ()	2360	gl_vendor ()
2213	CODE:	2361	CODE:
…		…
2224		2372
2225	char *	2373	char *
2226	gl_extensions ()	2374	gl_extensions ()
2227	CODE:	2375	CODE:
2228	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2376	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2377	OUTPUT:
		2378	RETVAL
		2379
		2380	const char *glGetString (GLenum pname)
		2381
		2382	GLint glGetInteger (GLenum pname)
		2383	CODE:
		2384	glGetIntegerv (pname, &RETVAL);
		2385	OUTPUT:
		2386	RETVAL
		2387
		2388	GLdouble glGetDouble (GLenum pname)
		2389	CODE:
		2390	glGetDoublev (pname, &RETVAL);
2229	OUTPUT:	2391	OUTPUT:
2230	RETVAL	2392	RETVAL
2231		2393
2232	int glGetError ()	2394	int glGetError ()
2233		2395
…		…
2358		2520
2359	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2521	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2360		2522
2361	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2523	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2362		2524
		2525	void glPixelZoom (float x, float y)
		2526
2363	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2527	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2364		2528
2365	int glGenTexture ()	2529	int glGenTexture ()
2366	CODE:	2530	CODE:
2367	{	2531	RETVAL = gen_texture ();
2368	GLuint name;
2369	glGenTextures (1, &name);
2370	RETVAL = name;
2371	}
2372	OUTPUT:	2532	OUTPUT:
2373	RETVAL	2533	RETVAL
2374		2534
2375	void glDeleteTexture (int name)	2535	void glDeleteTexture (int name)
2376	CODE:	2536	CODE:
2377	{
2378	GLuint name_ = name;
2379	glDeleteTextures (1, &name_);	2537	del_texture (name);
2380	}	2538
2381
2382	int glGenList ()	2539	int glGenList ()
2383	CODE:	2540	CODE:
2384	RETVAL = glGenLists (1);	2541	RETVAL = glGenLists (1);
2385	OUTPUT:	2542	OUTPUT:
2386	RETVAL	2543	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.179 by root, Wed Apr 11 04:32:51 2007 UTC vs. Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.179 by root, Wed Apr 11 04:32:51 2007 UTC vs.
Revision 1.204 by root, Thu Jul 19 14:54:50 2007 UTC