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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 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"
…		…
400		433
401	/* SDL should provide this, really. */	434	/* SDL should provide this, really. */
402	#define SDLK_MODIFIER_MIN 300	435	#define SDLK_MODIFIER_MIN 300
403	#define SDLK_MODIFIER_MAX 314	436	#define SDLK_MODIFIER_MAX 314
404		437
405	static AV *texture_av;	438	/******************************************************************************/
		439
		440	static int
		441	within_widget (SV *widget, NV x, NV y)
		442	{
		443	HV *self;
		444	SV **svp;
		445	NV wx, ww, wy, wh;
		446
		447	if (!SvROK (widget))
		448	return 0;
		449
		450	self = (HV *)SvRV (widget);
		451
		452	if (SvTYPE (self) != SVt_PVHV)
		453	return 0;
		454
		455	svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
		456	if (y < wy)
		457	return 0;
		458
		459	svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
		460	if (y >= wy + wh)
		461	return 0;
		462
		463	svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
		464	if (x < wx)
		465	return 0;
		466
		467	svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
		468	if (x >= wx + ww)
		469	return 0;
		470
		471	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
		472	if (!svp \|\| !SvTRUE (*svp))
		473	return 0;
		474
		475	return 1;
		476	}
406		477
407	MODULE = CFPlus PACKAGE = CFPlus	478	MODULE = CFPlus PACKAGE = CFPlus
408		479
409	PROTOTYPES: ENABLE	480	PROTOTYPES: ENABLE
410		481
411	BOOT:	482	BOOT:
412	{	483	{
413	texture_av = newAV ();
414	AvREAL_off (texture_av);
415
416	HV *stash = gv_stashpv ("CFPlus", 1);	484	HV *stash = gv_stashpv ("CFPlus", 1);
417	static const struct {	485	static const struct {
418	const char *name;	486	const char *name;
419	IV iv;	487	IV iv;
420	} *civ, const_iv[] = {	488	} *civ, const_iv[] = {
…		…
560	opengl_fontmap = pango_opengl_font_map_new ();	628	opengl_fontmap = pango_opengl_font_map_new ();
561	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	629	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
562	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	630	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
563	}	631	}
564		632
		633	char *
		634	SDL_GetError ()
		635
565	int	636	int
566	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	637	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
567		638
568	void	639	void
569	SDL_Quit ()	640	SDL_Quit ()
570		641
571	void	642	void
572	SDL_ListModes ()	643	SDL_ListModes (int rgb, int alpha)
573	PPCODE:	644	PPCODE:
574	{	645	{
575	SDL_Rect **m;	646	SDL_Rect **m;
576		647
577	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	648	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
578	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	649	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
579	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	650	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
580	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	651	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
581		652
582	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	653	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
583	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	654	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
584		655
585	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	656	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
586	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	657	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
587	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	658	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
588	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	659	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
589		660
590	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	661	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
591	#if SDL_VERSION_ATLEAST(1,2,10)	662	#if SDL_VERSION_ATLEAST(1,2,10)
592	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	663	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
593	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	664	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
594	#endif	665	#endif
595		666
596	SDL_EnableUNICODE (1);
597	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
598
599	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	667	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
600		668
601	if (m && m != (SDL_Rect **)-1)	669	if (m && m != (SDL_Rect **)-1)
602	while (*m)	670	while (*m)
603	{	671	{
		672	if ((m)->w >= 640 && (m)->h >= 480)
		673	{
604	AV *av = newAV ();	674	AV *av = newAV ();
605	av_push (av, newSViv ((*m)->w));	675	av_push (av, newSViv ((*m)->w));
606	av_push (av, newSViv ((*m)->h));	676	av_push (av, newSViv ((*m)->h));
		677	av_push (av, newSViv (rgb));
		678	av_push (av, newSViv (alpha));
607	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	679	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		680	}
608		681
609	++m;	682	++m;
610	}	683	}
611	}	684	}
612		685
613	char *
614	SDL_GetError ()
615
616	int	686	int
617	SDL_SetVideoMode (int w, int h, int fullscreen)	687	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
618	CODE:	688	CODE:
		689	{
		690	SDL_EnableUNICODE (1);
		691	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		692
		693	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		694	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		695	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		696	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		697
619	RETVAL = !!SDL_SetVideoMode (	698	RETVAL = !!SDL_SetVideoMode (
620	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	699	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
621	);	700	);
		701
622	if (RETVAL)	702	if (RETVAL)
623	{	703	{
		704	av_clear (texture_av);
		705
624	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	706	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	707	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626	# include "glfunc.h"	708	#include "glfunc.h"
627	# undef GL_FUNC	709	#undef GL_FUNC
628	}	710	}
		711	}
629	OUTPUT:	712	OUTPUT:
630	RETVAL	713	RETVAL
631		714
632	void	715	void
633	SDL_GL_SwapBuffers ()	716	SDL_GL_SwapBuffers ()
634		717
635	char *	718	char *
636	SDL_GetKeyName (int sym)	719	SDL_GetKeyName (int sym)
637		720
		721	int
		722	SDL_GetAppState ()
		723
638	void	724	void
639	SDL_PollEvent ()	725	poll_events ()
640	PPCODE:	726	PPCODE:
641	{	727	{
642	SDL_Event ev;	728	SDL_Event ev;
643		729
644	while (SDL_PollEvent (&ev))	730	SDL_PumpEvents ();
		731	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645	{	732	{
646	HV *hv = newHV ();	733	HV *hv = newHV ();
647	hv_store (hv, "type", 4, newSViv (ev.type), 0);	734	hv_store (hv, "type", 4, newSViv (ev.type), 0);
648		735
649	switch (ev.type)	736	switch (ev.type)
…		…
661	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	748	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	749	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663	break;	750	break;
664		751
665	case SDL_MOUSEMOTION:	752	case SDL_MOUSEMOTION:
		753	{
		754	int state = ev.motion.state;
		755	int x = ev.motion.x;
		756	int y = ev.motion.y;
		757	int xrel = ev.motion.xrel;
		758	int yrel = ev.motion.yrel;
		759
		760	/* do simplistic event compression */
		761	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		762	&& state == ev.motion.state)
		763	{
		764	xrel += ev.motion.xrel;
		765	yrel += ev.motion.yrel;
		766	x = ev.motion.x;
		767	y = ev.motion.y;
		768	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		769	}
		770
666	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	771	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
667
668	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	772	hv_store (hv, "state", 5, newSViv (state), 0);
669	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	773	hv_store (hv, "x", 1, newSViv (x), 0);
670	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	774	hv_store (hv, "y", 1, newSViv (y), 0);
671	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	775	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	776	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		777	}
673	break;	778	break;
674		779
675	case SDL_MOUSEBUTTONDOWN:	780	case SDL_MOUSEBUTTONDOWN:
676	case SDL_MOUSEBUTTONUP:	781	case SDL_MOUSEBUTTONUP:
677	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	782	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
857	ExitThread (retval); // unclean, please beam me up	962	ExitThread (retval); // unclean, please beam me up
858	#else	963	#else
859	_exit (retval);	964	_exit (retval);
860	#endif	965	#endif
861		966
		967	void
		968	debug ()
		969	CODE:
		970	{
		971	#if DEBUG
		972	VALGRIND_DO_LEAK_CHECK;
		973	#endif
		974	}
		975
862	MODULE = CFPlus PACKAGE = CFPlus::Font	976	MODULE = CFPlus PACKAGE = CFPlus::Font
		977
		978	PROTOTYPES: DISABLE
863		979
864	CFPlus::Font	980	CFPlus::Font
865	new_from_file (SV class, char path, int id = 0)	981	new_from_file (SV class, char path, int id = 0)
866	CODE:	982	CODE:
867	{	983	{
…		…
878	CODE:	994	CODE:
879	pango_font_description_free (self);	995	pango_font_description_free (self);
880		996
881	void	997	void
882	make_default (CFPlus::Font self)	998	make_default (CFPlus::Font self)
		999	PROTOTYPE: $
883	CODE:	1000	CODE:
884	default_font = self;	1001	default_font = self;
885		1002
886	MODULE = CFPlus PACKAGE = CFPlus::Layout	1003	MODULE = CFPlus PACKAGE = CFPlus::Layout
887		1004
		1005	PROTOTYPES: DISABLE
		1006
888	void	1007	void
889	reset_glyph_cache ()	1008	reset_glyph_cache ()
		1009	PROTOTYPE:
890	CODE:	1010	CODE:
891	tc_clear ();	1011	tc_clear ();
892		1012
893	CFPlus::Layout	1013	CFPlus::Layout
894	new (SV *class)	1014	new (SV *class)
…		…
1181	flags	1301	flags
1182	);	1302	);
1183		1303
1184	MODULE = CFPlus PACKAGE = CFPlus::Texture	1304	MODULE = CFPlus PACKAGE = CFPlus::Texture
1185		1305
1186	void	1306	PROTOTYPES: ENABLE
1187	pad2pot (SV data_, SV w_, SV *h_)
1188	CODE:
1189	{
1190	int ow = SvIV (w_);
1191	int oh = SvIV (h_);
1192		1307
1193	if (ow && oh)	1308	int minpot (int n)
		1309
		1310	void
		1311	pad (SV *data_, int ow, int oh, int nw, int nh)
		1312	CODE:
		1313	{
		1314	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1194	{	1315	{
1195	int nw = minpot (ow);
1196	int nh = minpot (oh);
1197
1198	if (nw != ow \|\| nh != oh)
1199	{
1200	if (SvOK (data_))
1201	{
1202	STRLEN datalen;	1316	STRLEN datalen;
1203	char *data = SvPVbyte (data_, datalen);	1317	char *data = SvPVbyte (data_, datalen);
1204	int bpp = datalen / (ow * oh);	1318	int bpp = datalen / (ow * oh);
1205	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1319	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1206		1320
1207	SvPOK_only (result_);	1321	SvPOK_only (result_);
1208	SvCUR_set (result_, nw * nh * bpp);	1322	SvCUR_set (result_, nw * nh * bpp);
1209		1323
1210	memset (SvPVX (result_), 0, nw * nh * bpp);	1324	memset (SvPVX (result_), 0, nw * nh * bpp);
1211	while (oh--)	1325	while (oh--)
1212	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1326	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1213		1327
1214	sv_setsv (data_, result_);	1328	sv_setsv (data_, result_);
1215	}
1216
1217	sv_setiv (w_, nw);
1218	sv_setiv (h_, nh);
1219	}
1220	}	1329	}
1221	}	1330	}
1222		1331
1223	void	1332	void
1224	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1333	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1267	glDisable (GL_ALPHA_TEST);	1376	glDisable (GL_ALPHA_TEST);
1268	glDisable (GL_BLEND);	1377	glDisable (GL_BLEND);
1269	}	1378	}
1270	}	1379	}
1271		1380
		1381	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1382	CODE:
		1383	{
		1384	GLint width;
		1385	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1386	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1387	RETVAL = width > 0;
		1388	}
		1389	OUTPUT:
		1390	RETVAL
		1391
1272	MODULE = CFPlus PACKAGE = CFPlus::Map	1392	MODULE = CFPlus PACKAGE = CFPlus::Map
		1393
		1394	PROTOTYPES: DISABLE
1273		1395
1274	CFPlus::Map	1396	CFPlus::Map
1275	new (SV *class)	1397	new (SV *class)
1276	CODE:	1398	CODE:
1277	New (0, RETVAL, 1, struct map);	1399	New (0, RETVAL, 1, struct map);
…		…
1396	CODE:	1518	CODE:
1397	{	1519	{
1398	if (dx > 0)	1520	if (dx > 0)
1399	map_blank (self, self->x, self->y, dx, self->h);	1521	map_blank (self, self->x, self->y, dx, self->h);
1400	else if (dx < 0)	1522	else if (dx < 0)
1401	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1523	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402		1524
1403	if (dy > 0)	1525	if (dy > 0)
1404	map_blank (self, self->x, self->y, self->w, dy);	1526	map_blank (self, self->x, self->y, self->w, dy);
1405	else if (dy < 0)	1527	else if (dy < 0)
1406	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1528	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407		1529
1408	self->ox += dx; self->x += dx;	1530	self->ox += dx; self->x += dx;
1409	self->oy += dy; self->y += dy;	1531	self->oy += dy; self->y += dy;
1410		1532
1411	while (self->y < 0)	1533	while (self->y < 0)
…		…
1740	smooth_key skey = (smooth_key )HeKEY (he);	1862	smooth_key skey = (smooth_key )HeKEY (he);
1741	IV bits = SvIVX (HeVAL (he));	1863	IV bits = SvIVX (HeVAL (he));
1742		1864
1743	if (!(bits & 0x1000)	1865	if (!(bits & 0x1000)
1744	&& skey->level == level	1866	&& skey->level == level
1745	&& level >= smooth_max [skey->x][skey->y])	1867	&& level > smooth_max [skey->x][skey->y])
1746	{	1868	{
1747	maptex tex = self->tex [skey->tile];	1869	maptex tex = self->tex [skey->tile];
1748	int px = (((int)skey->x) - 1) * T;	1870	int px = (((int)skey->x) - 1) * T;
1749	int py = (((int)skey->y) - 1) * T;	1871	int py = (((int)skey->y) - 1) * T;
1750	int border = bits & 15;	1872	int border = bits & 15;
…		…
1892	void	2014	void
1893	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2015	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1894	PPCODE:	2016	PPCODE:
1895	{	2017	{
1896	int x, y;	2018	int x, y;
		2019	int sw1 = sw + 2;
		2020	int sh1 = sh + 2;
		2021	int sh3 = sh * 3;
1897	int sw4 = (sw + 3) & ~3;	2022	int sw34 = (sw * 3 + 3) & ~3;
		2023	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1898	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	2024	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1899	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	2025	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1900		2026
1901	memset (darkness, 255, sw4 * sh);
1902	SvPOK_only (darkness_sv);	2027	SvPOK_only (darkness3_sv);
1903	SvCUR_set (darkness_sv, sw4 * sh);	2028	SvCUR_set (darkness3_sv, sw34 * sh3);
1904		2029
1905	mx += self->x;	2030	mx += self->x - 1;
1906	my += self->y;	2031	my += self->y - 1;
1907		2032
		2033	memset (darkness1, 255, sw1 * sh1);
		2034
1908	for (y = 0; y < sh; y++)	2035	for (y = 0; y < sh1; y++)
1909	if (0 <= y + my && y + my < self->rows)	2036	if (0 <= y + my && y + my < self->rows)
1910	{	2037	{
1911	maprow *row = self->row + (y + my);	2038	maprow *row = self->row + (y + my);
1912		2039
1913	for (x = 0; x < sw; x++)	2040	for (x = 0; x < sw1; x++)
1914	if (row->c0 <= x + mx && x + mx < row->c1)	2041	if (row->c0 <= x + mx && x + mx < row->c1)
1915	{	2042	{
1916	mapcell *cell = row->col + (x + mx - row->c0);	2043	mapcell *cell = row->col + (x + mx - row->c0);
1917		2044
1918	darkness[y * sw4 + x] = cell->darkness	2045	darkness1 [y * sw1 + x] = cell->darkness
1919	? 255 - (cell->darkness - 1)	2046	? 255 - (cell->darkness - 1)
1920	: 255 - FOW_DARKNESS;	2047	: 255 - FOW_DARKNESS;
1921	}	2048	}
1922	}	2049	}
1923		2050
		2051	for (y = 0; y < sh; ++y)
		2052	for (x = 0; x < sw; ++x)
		2053	{
		2054	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2055	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2056	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2057	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2058	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2059	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2060	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2061	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2062	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2063
		2064	uint8_t r11 = (d11 + d21 + d12) / 3;
		2065	uint8_t r21 = d21;
		2066	uint8_t r31 = (d21 + d31 + d32) / 3;
		2067
		2068	uint8_t r12 = d12;
		2069	uint8_t r22 = d22;
		2070	uint8_t r32 = d32;
		2071
		2072	uint8_t r13 = (d13 + d23 + d12) / 3;
		2073	uint8_t r23 = d23;
		2074	uint8_t r33 = (d23 + d33 + d32) / 3;
		2075
		2076	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2077	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2078	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2079	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2080	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2081	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2082	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2083	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2084	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2085	}
		2086
		2087	free (darkness1);
		2088
1924	EXTEND (SP, 3);	2089	EXTEND (SP, 3);
1925	PUSHs (sv_2mortal (newSViv (sw4)));	2090	PUSHs (sv_2mortal (newSViv (sw34)));
1926	PUSHs (sv_2mortal (newSViv (sh)));	2091	PUSHs (sv_2mortal (newSViv (sh3)));
1927	PUSHs (darkness_sv);	2092	PUSHs (darkness3_sv);
1928	}	2093	}
1929		2094
1930	SV *	2095	SV *
1931	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2096	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1932	CODE:	2097	CODE:
…		…
2066	}	2231	}
2067	}	2232	}
2068		2233
2069	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2070		2235
		2236	PROTOTYPES: DISABLE
		2237
2071	CFPlus::MixChunk	2238	CFPlus::MixChunk
2072	new_from_file (SV class, char path)	2239	new_from_file (SV class, char path)
2073	CODE:	2240	CODE:
2074	RETVAL = Mix_LoadWAV (path);	2241	RETVAL = Mix_LoadWAV (path);
2075	OUTPUT:	2242	OUTPUT:
…		…
2096		2263
2097	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2098		2265
2099	int	2266	int
2100	volume (int volume = -1)	2267	volume (int volume = -1)
		2268	PROTOTYPE: ;$
2101	CODE:	2269	CODE:
2102	RETVAL = Mix_VolumeMusic (volume);	2270	RETVAL = Mix_VolumeMusic (volume);
2103	OUTPUT:	2271	OUTPUT:
2104	RETVAL	2272	RETVAL
2105		2273
		2274	int
		2275	fade_out (int ms)
		2276	CODE:
		2277	RETVAL = Mix_FadeOutMusic (ms);
		2278	OUTPUT:
		2279	RETVAL
		2280
2106	CFPlus::MixMusic	2281	CFPlus::MixMusic
2107	new_from_file (SV class, char path)	2282	new_from_file (SV class, char path)
2108	CODE:	2283	CODE:
2109	RETVAL = Mix_LoadMUS (path);	2284	RETVAL = Mix_LoadMUS (path);
2110	OUTPUT:	2285	OUTPUT:
…		…
2120	CODE:	2295	CODE:
2121	RETVAL = Mix_PlayMusic (self, loops);	2296	RETVAL = Mix_PlayMusic (self, loops);
2122	OUTPUT:	2297	OUTPUT:
2123	RETVAL	2298	RETVAL
2124		2299
		2300	int
		2301	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2302	CODE:
		2303	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2304	OUTPUT:
		2305	RETVAL
		2306
2125	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2308
		2309	PROTOTYPES: ENABLE
2126		2310
2127	BOOT:	2311	BOOT:
2128	{	2312	{
2129	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2313	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
2130	static const struct {	2314	static const struct {
2131	const char *name;	2315	const char *name;
2132	IV iv;	2316	IV iv;
2133	} *civ, const_iv[] = {	2317	} *civ, const_iv[] = {
2134	# define const_iv(name) { # name, (IV)name }	2318	# define const_iv(name) { # name, (IV)name }
		2319	const_iv (GL_VENDOR),
		2320	const_iv (GL_VERSION),
		2321	const_iv (GL_EXTENSIONS),
2135	const_iv (GL_COLOR_MATERIAL),	2322	const_iv (GL_COLOR_MATERIAL),
2136	const_iv (GL_SMOOTH),	2323	const_iv (GL_SMOOTH),
2137	const_iv (GL_FLAT),	2324	const_iv (GL_FLAT),
2138	const_iv (GL_DITHER),	2325	const_iv (GL_DITHER),
2139	const_iv (GL_BLEND),	2326	const_iv (GL_BLEND),
…		…
2143	const_iv (GL_ALPHA_TEST),	2330	const_iv (GL_ALPHA_TEST),
2144	const_iv (GL_NORMALIZE),	2331	const_iv (GL_NORMALIZE),
2145	const_iv (GL_RESCALE_NORMAL),	2332	const_iv (GL_RESCALE_NORMAL),
2146	const_iv (GL_FRONT),	2333	const_iv (GL_FRONT),
2147	const_iv (GL_BACK),	2334	const_iv (GL_BACK),
		2335	const_iv (GL_AUX0),
2148	const_iv (GL_AND),	2336	const_iv (GL_AND),
2149	const_iv (GL_ONE),	2337	const_iv (GL_ONE),
2150	const_iv (GL_ZERO),	2338	const_iv (GL_ZERO),
2151	const_iv (GL_SRC_ALPHA),	2339	const_iv (GL_SRC_ALPHA),
2152	const_iv (GL_DST_ALPHA),	2340	const_iv (GL_DST_ALPHA),
…		…
2166	const_iv (GL_LUMINANCE),	2354	const_iv (GL_LUMINANCE),
2167	const_iv (GL_LUMINANCE_ALPHA),	2355	const_iv (GL_LUMINANCE_ALPHA),
2168	const_iv (GL_FLOAT),	2356	const_iv (GL_FLOAT),
2169	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2357	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2170	const_iv (GL_COMPILE),	2358	const_iv (GL_COMPILE),
		2359	const_iv (GL_PROXY_TEXTURE_1D),
		2360	const_iv (GL_PROXY_TEXTURE_2D),
2171	const_iv (GL_TEXTURE_1D),	2361	const_iv (GL_TEXTURE_1D),
2172	const_iv (GL_TEXTURE_2D),	2362	const_iv (GL_TEXTURE_2D),
2173	const_iv (GL_TEXTURE_ENV),	2363	const_iv (GL_TEXTURE_ENV),
2174	const_iv (GL_TEXTURE_MAG_FILTER),	2364	const_iv (GL_TEXTURE_MAG_FILTER),
2175	const_iv (GL_TEXTURE_MIN_FILTER),	2365	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2205	const_iv (GL_QUAD_STRIP),	2395	const_iv (GL_QUAD_STRIP),
2206	const_iv (GL_TRIANGLES),	2396	const_iv (GL_TRIANGLES),
2207	const_iv (GL_TRIANGLE_STRIP),	2397	const_iv (GL_TRIANGLE_STRIP),
2208	const_iv (GL_TRIANGLE_FAN),	2398	const_iv (GL_TRIANGLE_FAN),
2209	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2400	const_iv (GL_POINT_SMOOTH_HINT),
		2401	const_iv (GL_LINE_SMOOTH_HINT),
		2402	const_iv (GL_POLYGON_SMOOTH_HINT),
		2403	const_iv (GL_GENERATE_MIPMAP_HINT),
2210	const_iv (GL_FASTEST),	2404	const_iv (GL_FASTEST),
		2405	const_iv (GL_DONT_CARE),
		2406	const_iv (GL_NICEST),
2211	const_iv (GL_V2F),	2407	const_iv (GL_V2F),
2212	const_iv (GL_V3F),	2408	const_iv (GL_V3F),
2213	const_iv (GL_T2F_V3F),	2409	const_iv (GL_T2F_V3F),
2214	const_iv (GL_T2F_N3F_V3F),	2410	const_iv (GL_T2F_N3F_V3F),
2215	# undef const_iv	2411	# undef const_iv
2216	};	2412	};
2217		2413
2218	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2219	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2416
		2417	texture_av = newAV ();
		2418	AvREAL_off (texture_av);
2220	}	2419	}
2221		2420
2222	char *	2421	char *
2223	gl_vendor ()	2422	gl_vendor ()
2224	CODE:	2423	CODE:
…		…
2235		2434
2236	char *	2435	char *
2237	gl_extensions ()	2436	gl_extensions ()
2238	CODE:	2437	CODE:
2239	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2438	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2439	OUTPUT:
		2440	RETVAL
		2441
		2442	const char *glGetString (GLenum pname)
		2443
		2444	GLint glGetInteger (GLenum pname)
		2445	CODE:
		2446	glGetIntegerv (pname, &RETVAL);
		2447	OUTPUT:
		2448	RETVAL
		2449
		2450	GLdouble glGetDouble (GLenum pname)
		2451	CODE:
		2452	glGetDoublev (pname, &RETVAL);
2240	OUTPUT:	2453	OUTPUT:
2241	RETVAL	2454	RETVAL
2242		2455
2243	int glGetError ()	2456	int glGetError ()
2244		2457
…		…
2369		2582
2370	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2583	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2371		2584
2372	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2585	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2373		2586
		2587	void glPixelZoom (float x, float y)
		2588
2374	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2589	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2375		2590
2376	int glGenTexture ()	2591	int glGenTexture ()
2377	CODE:	2592	CODE:
2378	{	2593	RETVAL = gen_texture ();
2379	GLuint name;
2380	if (AvFILL (texture_av) >= 0)
2381	name = (GLuint)av_pop (texture_av);
2382	else
2383	glGenTextures (1, &name);
2384	RETVAL = name;
2385	}
2386	OUTPUT:	2594	OUTPUT:
2387	RETVAL	2595	RETVAL
2388		2596
2389	void glDeleteTexture (int name)	2597	void glDeleteTexture (int name)
2390	CODE:	2598	CODE:
2391	{	2599	del_texture (name);
2392	glBindTexture (GL_TEXTURE_2D, name);	2600
2393	glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2394	av_push (texture_av, (SV *)name);
2395	/glDeleteTextures (1, &name_);/
2396	}
2397
2398	int glGenList ()	2601	int glGenList ()
2399	CODE:	2602	CODE:
2400	RETVAL = glGenLists (1);	2603	RETVAL = glGenLists (1);
2401	OUTPUT:	2604	OUTPUT:
2402	RETVAL	2605	RETVAL
…		…
2409		2612
2410	void glEndList ()	2613	void glEndList ()
2411		2614
2412	void glCallList (int list)	2615	void glCallList (int list)
2413		2616
		2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2618
		2619	PROTOTYPES: DISABLE
		2620
		2621	void
		2622	find_widget (SV *widget, NV x, NV y)
		2623	PPCODE:
		2624	{
		2625	if (within_widget (widget, x, y))
		2626	XPUSHs (widget);
		2627	}
		2628

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs. Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC