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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.172 by root, Mon Apr 2 19:29:27 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);
76	}	85	}
77		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);
		109	}
		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
81	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
82	#include "pango-render.c"	115	#include "pango-render.c"
…		…
155		188
156	*w = rect.width;	189	*w = rect.width;
157	*h = rect.height;	190	*h = rect.height;
158	}	191	}
159		192
		193	typedef uint16_t tileid;
160	typedef uint16_t mapface;	194	typedef uint16_t faceid;
161		195
162	typedef struct {	196	typedef struct {
163	GLint name;	197	int name;
164	int w, h;	198	int w, h;
165	float s, t;	199	float s, t;
166	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
167	} maptex;	203	} maptex;
168		204
169	typedef struct {	205	typedef struct {
170	uint32_t player;	206	uint32_t player;
171	mapface face[3];	207	tileid tile[3];
172	uint16_t darkness;	208	uint16_t darkness;
173	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
174	} mapcell;	210	} mapcell;
175		211
176	typedef struct {	212	typedef struct {
177	int32_t c0, c1;	213	int32_t c0, c1;
178	mapcell *col;	214	mapcell *col;
179	} maprow;	215	} maprow;
180		216
181	typedef struct map {	217	typedef struct map {
182	int x, y, w, h;	218	int x, y, w, h;
183	int ox, oy; /* offset to virtual global coordinate system */	219	int ox, oy; /* offset to virtual global coordinate system */
184	int faces;	220	int faces; tileid *face2tile; // [faceid]
185	mapface *face;	221	int texs; maptex *tex; // [tileid]
186
187	int texs;
188	maptex *tex;
189		222
190	int32_t rows;	223	int32_t rows;
191	maprow *row;	224	maprow *row;
192	} *CFPlus__Map;	225	} *CFPlus__Map;
193		226
…		…
213	return ptr;	246	return ptr;
214	}	247	}
215		248
216	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
217	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	250	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		251
		252	static void
		253	need_facenum (struct map *self, faceid face)
		254	{
		255	while (self->faces <= face)
		256	{
		257	Append (tileid, self->face2tile, self->faces, self->faces);
		258	self->faces *= 2;
		259	}
		260	}
		261
		262	static void
		263	need_texid (struct map *self, int texid)
		264	{
		265	while (self->texs <= texid)
		266	{
		267	Append (maptex, self->tex, self->texs, self->texs);
		268	self->texs *= 2;
		269	}
		270	}
218		271
219	static maprow *	272	static maprow *
220	map_get_row (CFPlus__Map self, int y)	273	map_get_row (CFPlus__Map self, int y)
221	{	274	{
222	if (0 > y)	275	if (0 > y)
…		…
317	cell->player = 0;	370	cell->player = 0;
318	}	371	}
319	}	372	}
320	}	373	}
321		374
		375	typedef struct {
		376	tileid tile;
		377	uint8_t x, y, level;
		378	} smooth_key;
		379
		380	static void
		381	smooth_or_bits (HV hv, smooth_key key, IV bits)
		382	{
		383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		384
		385	if (SvIOK (*sv))
		386	SvIV_set (sv, SvIVX (sv) \| bits);
		387	else
		388	sv_setiv (*sv, bits);
		389	}
		390
322	static void	391	static void
323	music_finished (void)	392	music_finished (void)
324	{	393	{
325	SDL_UserEvent ev;	394	SDL_UserEvent ev;
326		395
…		…
363	}	432	}
364		433
365	/* SDL should provide this, really. */	434	/* SDL should provide this, really. */
366	#define SDLK_MODIFIER_MIN 300	435	#define SDLK_MODIFIER_MIN 300
367	#define SDLK_MODIFIER_MAX 314	436	#define SDLK_MODIFIER_MAX 314
		437
		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	}
368		477
369	MODULE = CFPlus PACKAGE = CFPlus	478	MODULE = CFPlus PACKAGE = CFPlus
370		479
371	PROTOTYPES: ENABLE	480	PROTOTYPES: ENABLE
372		481
…		…
519	opengl_fontmap = pango_opengl_font_map_new ();	628	opengl_fontmap = pango_opengl_font_map_new ();
520	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);
521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	630	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
522	}	631	}
523		632
		633	char *
		634	SDL_GetError ()
		635
524	int	636	int
525	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	637	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
526		638
527	void	639	void
528	SDL_Quit ()	640	SDL_Quit ()
529		641
530	void	642	void
531	SDL_ListModes ()	643	SDL_ListModes (int rgb, int alpha)
532	PPCODE:	644	PPCODE:
533	{	645	{
534	SDL_Rect **m;	646	SDL_Rect **m;
535		647
536	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	648	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	649	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	650	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	651	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
540		652
541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	653	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	654	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
543		655
544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	656	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	657	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	658	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	659	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
548		660
549	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	661	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550	#if SDL_VERSION_ATLEAST(1,2,10)	662	#if SDL_VERSION_ATLEAST(1,2,10)
551	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	663	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	664	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553	#endif	665	#endif
554		666
555	SDL_EnableUNICODE (1);
556	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
557
558	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	667	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
559		668
560	if (m && m != (SDL_Rect **)-1)	669	if (m && m != (SDL_Rect **)-1)
561	while (*m)	670	while (*m)
562	{	671	{
		672	if ((m)->w >= 640 && (m)->h >= 480)
		673	{
563	AV *av = newAV ();	674	AV *av = newAV ();
564	av_push (av, newSViv ((*m)->w));	675	av_push (av, newSViv ((*m)->w));
565	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));
566	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	679	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		680	}
567		681
568	++m;	682	++m;
569	}	683	}
570	}	684	}
571		685
572	char *
573	SDL_GetError ()
574
575	int	686	int
576	SDL_SetVideoMode (int w, int h, int fullscreen)	687	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
577	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
578	RETVAL = !!SDL_SetVideoMode (	698	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	699	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	700	);
		701
581	if (RETVAL)	702	if (RETVAL)
582	{	703	{
		704	av_clear (texture_av);
		705
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	706	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# 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);
585	# include "glfunc.h"	708	#include "glfunc.h"
586	# undef GL_FUNC	709	#undef GL_FUNC
587	}	710	}
		711	}
588	OUTPUT:	712	OUTPUT:
589	RETVAL	713	RETVAL
590		714
591	void	715	void
592	SDL_GL_SwapBuffers ()	716	SDL_GL_SwapBuffers ()
593		717
594	char *	718	char *
595	SDL_GetKeyName (int sym)	719	SDL_GetKeyName (int sym)
596		720
		721	int
		722	SDL_GetAppState ()
		723
597	void	724	void
598	SDL_PollEvent ()	725	poll_events ()
599	PPCODE:	726	PPCODE:
600	{	727	{
601	SDL_Event ev;	728	SDL_Event ev;
602		729
603	while (SDL_PollEvent (&ev))	730	SDL_PumpEvents ();
		731	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
604	{	732	{
605	HV *hv = newHV ();	733	HV *hv = newHV ();
606	hv_store (hv, "type", 4, newSViv (ev.type), 0);	734	hv_store (hv, "type", 4, newSViv (ev.type), 0);
607		735
608	switch (ev.type)	736	switch (ev.type)
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	748	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	749	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	750	break;
623		751
624	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
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	771	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	772	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	773	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	774	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	775	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	776	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		777	}
632	break;	778	break;
633		779
634	case SDL_MOUSEBUTTONDOWN:	780	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	781	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	782	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	811	Mix_AllocateChannels (int numchans = -1)
666		812
667	void	813	void
668	lowdelay (int fd, int val = 1)	814	lowdelay (int fd, int val = 1)
669	CODE:	815	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	816	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		817
674	void	818	void
675	win32_proxy_info ()	819	win32_proxy_info ()
676	PPCODE:	820	PPCODE:
677	{	821	{
…		…
818	ExitThread (retval); // unclean, please beam me up	962	ExitThread (retval); // unclean, please beam me up
819	#else	963	#else
820	_exit (retval);	964	_exit (retval);
821	#endif	965	#endif
822		966
		967	void
		968	debug ()
		969	CODE:
		970	{
		971	#if DEBUG
		972	VALGRIND_DO_LEAK_CHECK;
		973	#endif
		974	}
		975
823	MODULE = CFPlus PACKAGE = CFPlus::Font	976	MODULE = CFPlus PACKAGE = CFPlus::Font
		977
		978	PROTOTYPES: DISABLE
824		979
825	CFPlus::Font	980	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	981	new_from_file (SV class, char path, int id = 0)
827	CODE:	982	CODE:
828	{	983	{
…		…
839	CODE:	994	CODE:
840	pango_font_description_free (self);	995	pango_font_description_free (self);
841		996
842	void	997	void
843	make_default (CFPlus::Font self)	998	make_default (CFPlus::Font self)
		999	PROTOTYPE: $
844	CODE:	1000	CODE:
845	default_font = self;	1001	default_font = self;
846		1002
847	MODULE = CFPlus PACKAGE = CFPlus::Layout	1003	MODULE = CFPlus PACKAGE = CFPlus::Layout
848		1004
		1005	PROTOTYPES: DISABLE
		1006
849	void	1007	void
850	reset_glyph_cache ()	1008	reset_glyph_cache ()
		1009	PROTOTYPE:
851	CODE:	1010	CODE:
852	tc_clear ();	1011	tc_clear ();
853		1012
854	CFPlus::Layout	1013	CFPlus::Layout
855	new (SV *class)	1014	new (SV *class)
…		…
1142	flags	1301	flags
1143	);	1302	);
1144		1303
1145	MODULE = CFPlus PACKAGE = CFPlus::Texture	1304	MODULE = CFPlus PACKAGE = CFPlus::Texture
1146		1305
1147	void	1306	PROTOTYPES: ENABLE
1148	pad2pot (SV data_, SV w_, SV *h_)
1149	CODE:
1150	{
1151	int ow = SvIV (w_);
1152	int oh = SvIV (h_);
1153		1307
1154	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_))
1155	{	1315	{
1156	int nw = minpot (ow);
1157	int nh = minpot (oh);
1158
1159	if (nw != ow \|\| nh != oh)
1160	{
1161	if (SvOK (data_))
1162	{
1163	STRLEN datalen;	1316	STRLEN datalen;
1164	char *data = SvPVbyte (data_, datalen);	1317	char *data = SvPVbyte (data_, datalen);
1165	int bpp = datalen / (ow * oh);	1318	int bpp = datalen / (ow * oh);
1166	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1319	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1167		1320
1168	SvPOK_only (result_);	1321	SvPOK_only (result_);
1169	SvCUR_set (result_, nw * nh * bpp);	1322	SvCUR_set (result_, nw * nh * bpp);
1170		1323
1171	memset (SvPVX (result_), 0, nw * nh * bpp);	1324	memset (SvPVX (result_), 0, nw * nh * bpp);
1172	while (oh--)	1325	while (oh--)
1173	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);
1174		1327
1175	sv_setsv (data_, result_);	1328	sv_setsv (data_, result_);
1176	}
1177
1178	sv_setiv (w_, nw);
1179	sv_setiv (h_, nh);
1180	}
1181	}	1329	}
1182	}	1330	}
1183		1331
1184	void	1332	void
1185	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.)
…		…
1228	glDisable (GL_ALPHA_TEST);	1376	glDisable (GL_ALPHA_TEST);
1229	glDisable (GL_BLEND);	1377	glDisable (GL_BLEND);
1230	}	1378	}
1231	}	1379	}
1232		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
1233	MODULE = CFPlus PACKAGE = CFPlus::Map	1392	MODULE = CFPlus PACKAGE = CFPlus::Map
		1393
		1394	PROTOTYPES: DISABLE
1234		1395
1235	CFPlus::Map	1396	CFPlus::Map
1236	new (SV *class)	1397	new (SV *class)
1237	CODE:	1398	CODE:
1238	New (0, RETVAL, 1, struct map);	1399	New (0, RETVAL, 1, struct map);
…		…
1240	RETVAL->y = 0;	1401	RETVAL->y = 0;
1241	RETVAL->w = 0;	1402	RETVAL->w = 0;
1242	RETVAL->h = 0;	1403	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1404	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1405	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1406	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1407	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1247	RETVAL->texs = 8192;
1248	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1249	RETVAL->rows = 0;	1408	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1409	RETVAL->row = 0;
1251	OUTPUT:	1410	OUTPUT:
1252	RETVAL	1411	RETVAL
1253		1412
1254	void	1413	void
1255	DESTROY (CFPlus::Map self)	1414	DESTROY (CFPlus::Map self)
1256	CODE:	1415	CODE:
1257	{	1416	{
1258	map_clear (self);	1417	map_clear (self);
1259	Safefree (self->face);	1418	Safefree (self->face2tile);
1260	Safefree (self->tex);	1419	Safefree (self->tex);
1261	Safefree (self);	1420	Safefree (self);
1262	}	1421	}
1263		1422
1264	void	1423	void
…		…
1271	clear (CFPlus::Map self)	1430	clear (CFPlus::Map self)
1272	CODE:	1431	CODE:
1273	map_clear (self);	1432	map_clear (self);
1274		1433
1275	void	1434	void
1276	set_face (CFPlus::Map self, int face, int texid)	1435	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1436	CODE:
1278	{	1437	{
1279	while (self->faces <= face)	1438	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1439	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1440	}
1282	self->faces *= 2;
1283	}
1284		1441
1285	self->face [face] = texid;	1442	void
		1443	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1444	CODE:
		1445	{
		1446	tileid texid;
		1447	maptex *tex;
		1448
		1449	if (face < 0 \|\| face >= self->faces)
		1450	return;
		1451
		1452	if (smooth < 0 \|\| smooth >= self->faces)
		1453	return;
		1454
		1455	texid = self->face2tile [face];
		1456
		1457	if (!texid)
		1458	return;
		1459
		1460	tex = self->tex + texid;
		1461	tex->smoothtile = self->face2tile [smooth];
		1462	tex->smoothlevel = level;
1286	}	1463	}
1287		1464
1288	void	1465	void
1289	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1466	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1290	CODE:	1467	CODE:
1291	{	1468	{
1292	while (self->texs <= texid)	1469	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1470
1298	{	1471	{
1299	maptex *tex = self->tex + texid;	1472	maptex *tex = self->tex + texid;
1300		1473
1301	tex->name = name;	1474	tex->name = name;
…		…
1345	CODE:	1518	CODE:
1346	{	1519	{
1347	if (dx > 0)	1520	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1521	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1522	else if (dx < 0)
1350	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);
1351		1524
1352	if (dy > 0)	1525	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1526	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1527	else if (dy < 0)
1355	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);
1356		1529
1357	self->ox += dx; self->x += dx;	1530	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1531	self->oy += dy; self->y += dy;
1359		1532
1360	while (self->y < 0)	1533	while (self->y < 0)
…		…
1414	}	1587	}
1415	else if (cmd == 6) // monster width	1588	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1589	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1590	else if (cmd == 0x47)
1418	{	1591	{
1419	if (*data == 8)	1592	if (*data == 4)
1420	; // decode player uuid	1593	; // decode player count
1421		1594
1422	data += *data + 1;	1595	data += *data + 1;
1423	}	1596	}
1424	else if (cmd == 8) // cell flags	1597	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1598	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1607	cell->darkness = *data++ + 1;
1435	}	1608	}
1436		1609
1437	if (flags & 4)	1610	if (flags & 4)
1438	{	1611	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1612	faceid face = (data [0] << 8) + data [1]; data += 2;
		1613	need_facenum (self, face);
		1614	cell->tile [0] = self->face2tile [face];
1440	}	1615	}
1441		1616
1442	if (flags & 2)	1617	if (flags & 2)
1443	{	1618	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1619	faceid face = (data [0] << 8) + data [1]; data += 2;
		1620	need_facenum (self, face);
		1621	cell->tile [1] = self->face2tile [face];
1445	}	1622	}
1446		1623
1447	if (flags & 1)	1624	if (flags & 1)
1448	{	1625	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1626	faceid face = (data [0] << 8) + data [1]; data += 2;
		1627	need_facenum (self, face);
		1628	cell->tile [2] = self->face2tile [face];
1450	}	1629	}
1451	}	1630	}
1452	else	1631	else
1453	cell->darkness = 0;	1632	cell->darkness = 0;
1454	}	1633	}
…		…
1484	{	1663	{
1485	mapcell *cell = row->col + (x - row->c0);	1664	mapcell *cell = row->col + (x - row->c0);
1486		1665
1487	for (z = 0; z <= 0; z++)	1666	for (z = 0; z <= 0; z++)
1488	{	1667	{
1489	mapface face = cell->face [z];
1490
1491	if (face > 0 && face < self->texs)
1492	{
1493	maptex tex = self->tex [face];	1668	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1669	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1670	int a1 = tex.a;
1496		1671
1497	r = (r * a0 + tex.r * a1) / 255;	1672	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1673	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1674	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1675	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1676	}
1503	}	1677	}
1504		1678
1505	*map++ = (r )	1679	*map++ = (r )
1506	\| (g << 8)	1680	\| (g << 8)
…		…
1516		1690
1517	void	1691	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1692	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1693	CODE:
1520	{	1694	{
		1695	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1696	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1697	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1698	smooth_key skey;
1521	int x, y, z;	1699	int x, y, z;
1522	int last_name;	1700	int last_name;
1523	mapface face;	1701
		1702	// thats current max. sorry.
		1703	if (sw > 255) sw = 255;
		1704	if (sh > 255) sh = 255;
		1705
		1706	// clear key, in case of extra padding
		1707	memset (&skey, 0, sizeof (skey));
1524		1708
1525	glColor4ub (255, 255, 255, 255);	1709	glColor4ub (255, 255, 255, 255);
1526		1710
1527	glEnable (GL_BLEND);	1711	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1712	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1718	last_name = 0;
1535		1719
1536	mx += self->x;	1720	mx += self->x;
1537	my += self->y;	1721	my += self->y;
1538		1722
		1723	// first pass: determine smooth_max
		1724	// rather ugly, if you ask me
		1725	// could also be stored inside mapcell and updated on change
		1726	memset (smooth_max, 0, sizeof (smooth_max));
		1727
		1728	for (y = 0; y < sh; y++)
		1729	if (0 <= y + my && y + my < self->rows)
		1730	{
		1731	maprow *row = self->row + (y + my);
		1732
		1733	for (x = 0; x < sw; x++)
		1734	if (row->c0 <= x + mx && x + mx < row->c1)
		1735	{
		1736	mapcell *cell = row->col + (x + mx - row->c0);
		1737
		1738	smooth_max[x + 1][y + 1] =
		1739	MAX (self->tex [cell->tile [0]].smoothlevel,
		1740	MAX (self->tex [cell->tile [1]].smoothlevel,
		1741	self->tex [cell->tile [2]].smoothlevel));
		1742	}
		1743	}
		1744
1539	for (z = 0; z < 3; z++)	1745	for (z = 0; z <= 2; z++)
		1746	{
		1747	memset (smooth_level, 0, sizeof (smooth_level));
		1748
1540	for (y = 0; y < sh; y++)	1749	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1750	if (0 <= y + my && y + my < self->rows)
1542	{	1751	{
1543	maprow *row = self->row + (y + my);	1752	maprow *row = self->row + (y + my);
1544		1753
1545	for (x = 0; x < sw; x++)	1754	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1755	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1756	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1757	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1758	tileid tile = cell->tile [z];
		1759
		1760	if (tile)
		1761	{
		1762	maptex tex = self->tex [tile];
		1763	int px = (x + 1) * T - tex.w;
		1764	int py = (y + 1) * T - tex.h;
1551		1765
1552	if (face > 0 && face < self->texs)	1766	// suppressing texture state switches here
		1767	// is only moderately effective, but worth the extra effort
		1768	if (last_name != tex.name)
		1769	{
		1770	if (!tex.name)
		1771	tex = self->tex [2]; /* missing, replace by noface */
		1772
		1773	glEnd ();
		1774	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1775	glBegin (GL_QUADS);
		1776	}
		1777
		1778	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1779	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1780	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1781	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1782
		1783	if (cell->flags && z == 2)
		1784	{
		1785	if (cell->flags & 1)
		1786	{
		1787	maptex tex = self->tex [1];
		1788	int px = x * T + T * 2 / 32;
		1789	int py = y * T - T * 6 / 32;
		1790
		1791	glEnd ();
		1792	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1793	glBegin (GL_QUADS);
		1794
		1795	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1796	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1797	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1798	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1799	}
		1800	}
		1801
		1802	// update smooth hash
		1803	if (tex.smoothtile)
		1804	{
		1805	skey.tile = tex.smoothtile;
		1806	skey.level = tex.smoothlevel;
		1807
		1808	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1809
		1810	// add bits to current tile and all neighbours. skey.x\|y is
		1811	// shifted +1\|+1 so we always stay positive.
		1812
		1813	// bits is ___n cccc CCCC bbbb
		1814	// n do not draw borders&corners
		1815	// c draw these corners, but...
		1816	// C ... not these
		1817	// b draw these borders
		1818
		1819	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1820	// ┃· ·· ·┃ ━━
		1821
		1822	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1823	// ·· ·· ·┏ ┓·
		1824
		1825	// full tile
		1826	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1827
		1828	// borders
		1829	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1830	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1831	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1832	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1833
		1834	// corners
		1835	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1836	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1837	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1838	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1839	}
		1840	}
		1841	}
		1842	}
		1843
		1844	// go through all smoothlevels, lowest to highest, then draw.
		1845	// this is basically counting sort
		1846	{
		1847	int w, b;
		1848
		1849	for (w = 0; w < 256 / 32; ++w)
		1850	{
		1851	uint32_t smask = smooth_level [w];
		1852	if (smask)
		1853	for (b = 0; b < 32; ++b)
		1854	if (smask & (((uint32_t)1) << b))
1553	{	1855	{
1554	maptex tex = self->tex [face];	1856	int level = (w << 5) \| b;
1555	int px = (x + 1) * T - tex.w;	1857	HE *he;
1556	int py = (y + 1) * T - tex.h;
1557		1858
1558	if (last_name != tex.name)	1859	hv_iterinit (smooth);
		1860	while ((he = hv_iternext (smooth)))
1559	{	1861	{
		1862	smooth_key skey = (smooth_key )HeKEY (he);
		1863	IV bits = SvIVX (HeVAL (he));
		1864
		1865	if (!(bits & 0x1000)
		1866	&& skey->level == level
		1867	&& level > smooth_max [skey->x][skey->y])
		1868	{
		1869	maptex tex = self->tex [skey->tile];
		1870	int px = (((int)skey->x) - 1) * T;
		1871	int py = (((int)skey->y) - 1) * T;
		1872	int border = bits & 15;
		1873	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1874	float dx = tex.s * .0625f; // 16 images/row
		1875	float dy = tex.t * .5f ; // 2 images/column
		1876
		1877	// this time naively avoiding texture state changes
		1878	// save gobs of state changes.
		1879	if (last_name != tex.name)
		1880	{
		1881	if (!tex.name)
		1882	continue; // smoothing not yet available
		1883
1560	glEnd ();	1884	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1885	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1886	glBegin (GL_QUADS);
		1887	}
		1888
		1889	if (border)
		1890	{
		1891	float ox = border * dx;
		1892
		1893	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1894	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1895	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1896	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1897	}
		1898
		1899	if (corner)
		1900	{
		1901	float ox = corner * dx;
		1902
		1903	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1904	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1905	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1906	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1907	}
1563	}	1908	}
1564
1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1567	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1569	}
1570
1571	if (cell->flags && z == 2)
1572	{
1573	if (cell->flags & 1)
1574	{
1575	maptex tex = self->tex [1];
1576	int px = (x + 1) * T - tex.w + 2;
1577	int py = (y + 1) * T - tex.h - 6;
1578
1579	glEnd ();
1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581	glBegin (GL_QUADS);
1582
1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587	}	1909	}
1588	}	1910	}
1589	}
1590	}	1911	}
		1912	}
		1913
		1914	hv_clear (smooth);
		1915	}
1591		1916
1592	glEnd ();	1917	glEnd ();
1593		1918
1594	glDisable (GL_TEXTURE_2D);	1919	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1920	glDisable (GL_BLEND);
…		…
1609	int py = y * T;	1934	int py = y * T;
1610		1935
1611	if (cell->stat_hp)	1936	if (cell->stat_hp)
1612	{	1937	{
1613	int width = cell->stat_width * T;	1938	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1939	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1940
1616	glColor3ub (0, 0, 0);	1941	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1942	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1943	px + width - 1, py);
1619		1944
…		…
1689	void	2014	void
1690	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)
1691	PPCODE:	2016	PPCODE:
1692	{	2017	{
1693	int x, y;	2018	int x, y;
		2019	int sw1 = sw + 2;
		2020	int sh1 = sh + 2;
		2021	int sh3 = sh * 3;
1694	int sw4 = (sw + 3) & ~3;	2022	int sw34 = (sw * 3 + 3) & ~3;
		2023	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1695	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	2024	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1696	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	2025	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1697		2026
1698	memset (darkness, 255, sw4 * sh);
1699	SvPOK_only (darkness_sv);	2027	SvPOK_only (darkness3_sv);
1700	SvCUR_set (darkness_sv, sw4 * sh);	2028	SvCUR_set (darkness3_sv, sw34 * sh3);
1701		2029
1702	mx += self->x;	2030	mx += self->x - 1;
1703	my += self->y;	2031	my += self->y - 1;
1704		2032
		2033	memset (darkness1, 255, sw1 * sh1);
		2034
1705	for (y = 0; y < sh; y++)	2035	for (y = 0; y < sh1; y++)
1706	if (0 <= y + my && y + my < self->rows)	2036	if (0 <= y + my && y + my < self->rows)
1707	{	2037	{
1708	maprow *row = self->row + (y + my);	2038	maprow *row = self->row + (y + my);
1709		2039
1710	for (x = 0; x < sw; x++)	2040	for (x = 0; x < sw1; x++)
1711	if (row->c0 <= x + mx && x + mx < row->c1)	2041	if (row->c0 <= x + mx && x + mx < row->c1)
1712	{	2042	{
1713	mapcell *cell = row->col + (x + mx - row->c0);	2043	mapcell *cell = row->col + (x + mx - row->c0);
1714		2044
1715	darkness[y * sw4 + x] = cell->darkness	2045	darkness1 [y * sw1 + x] = cell->darkness
1716	? 255 - (cell->darkness - 1)	2046	? 255 - (cell->darkness - 1)
1717	: 255 - FOW_DARKNESS;	2047	: 255 - FOW_DARKNESS;
1718	}	2048	}
1719	}	2049	}
1720		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
1721	EXTEND (SP, 3);	2089	EXTEND (SP, 3);
1722	PUSHs (sv_2mortal (newSViv (sw4)));	2090	PUSHs (sv_2mortal (newSViv (sw34)));
1723	PUSHs (sv_2mortal (newSViv (sh)));	2091	PUSHs (sv_2mortal (newSViv (sh3)));
1724	PUSHs (darkness_sv);	2092	PUSHs (darkness3_sv);
1725	}	2093	}
1726		2094
1727	SV *	2095	SV *
1728	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)
1729	CODE:	2097	CODE:
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2126	if (row && row->c0 <= x && x < row->c1)
1759	{	2127	{
1760	mapcell *cell = row->col + (x - row->c0);	2128	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2129	uint8_t flags = 0;
1762		2130
1763	if (cell->face [0]) flags \|= 1;	2131	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2132	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2133	if (cell->tile [2]) flags \|= 4;
1766		2134
1767	*data++ = flags;	2135	*data++ = flags;
1768		2136
1769	if (flags & 1)	2137	if (flags & 1)
1770	{	2138	{
		2139	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2140	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2141	*data++ = tile;
1773	}	2142	}
1774		2143
1775	if (flags & 2)	2144	if (flags & 2)
1776	{	2145	{
		2146	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2147	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2148	*data++ = tile;
1779	}	2149	}
1780		2150
1781	if (flags & 4)	2151	if (flags & 4)
1782	{	2152	{
		2153	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2154	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2155	*data++ = tile;
1785	}	2156	}
1786	}	2157	}
1787	else	2158	else
1788	*data++ = 0;	2159	*data++ = 0;
1789	}	2160	}
…		…
1829	{	2200	{
1830	uint8_t flags = *data++;	2201	uint8_t flags = *data++;
1831		2202
1832	if (flags)	2203	if (flags)
1833	{	2204	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2205	mapcell *cell = row_get_cell (row, x);
		2206	tileid tile[3] = { 0, 0, 0 };
1837		2207
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2208	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2209	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2210	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2211
1842	if (cell->darkness == 0)	2212	if (cell->darkness == 0)
1843	{	2213	{
1844	cell->darkness = 0;	2214	cell->darkness = 0;
1845		2215
1846	for (z = 0; z <= 2; z++)	2216	for (z = 0; z <= 2; z++)
1847	{	2217	{
1848	cell->face[z] = face[z];	2218	tileid t = tile [z];
1849		2219
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2220	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2221	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2222	XPUSHs (sv_2mortal (newSViv (t)));
		2223	need_texid (self, t);
		2224	}
		2225
		2226	cell->tile [z] = t;
1852	}	2227	}
1853	}	2228	}
1854	}	2229	}
1855	}	2230	}
1856	}	2231	}
1857	}	2232	}
1858		2233
1859	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1860		2235
		2236	PROTOTYPES: DISABLE
		2237
1861	CFPlus::MixChunk	2238	CFPlus::MixChunk
1862	new_from_file (SV class, char path)	2239	new_from_file (SV class, char path)
1863	CODE:	2240	CODE:
1864	RETVAL = Mix_LoadWAV (path);	2241	RETVAL = Mix_LoadWAV (path);
1865	OUTPUT:	2242	OUTPUT:
…		…
1886		2263
1887	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1888		2265
1889	int	2266	int
1890	volume (int volume = -1)	2267	volume (int volume = -1)
		2268	PROTOTYPE: ;$
1891	CODE:	2269	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2270	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2271	OUTPUT:
1894	RETVAL	2272	RETVAL
1895		2273
		2274	int
		2275	fade_out (int ms)
		2276	CODE:
		2277	RETVAL = Mix_FadeOutMusic (ms);
		2278	OUTPUT:
		2279	RETVAL
		2280
1896	CFPlus::MixMusic	2281	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2282	new_from_file (SV class, char path)
1898	CODE:	2283	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2284	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2285	OUTPUT:
…		…
1910	CODE:	2295	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2296	RETVAL = Mix_PlayMusic (self, loops);
1912	OUTPUT:	2297	OUTPUT:
1913	RETVAL	2298	RETVAL
1914		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
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2308
		2309	PROTOTYPES: ENABLE
1916		2310
1917	BOOT:	2311	BOOT:
1918	{	2312	{
1919	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2313	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1920	static const struct {	2314	static const struct {
1921	const char *name;	2315	const char *name;
1922	IV iv;	2316	IV iv;
1923	} *civ, const_iv[] = {	2317	} *civ, const_iv[] = {
1924	# 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),
1925	const_iv (GL_COLOR_MATERIAL),	2322	const_iv (GL_COLOR_MATERIAL),
1926	const_iv (GL_SMOOTH),	2323	const_iv (GL_SMOOTH),
1927	const_iv (GL_FLAT),	2324	const_iv (GL_FLAT),
1928	const_iv (GL_DITHER),	2325	const_iv (GL_DITHER),
1929	const_iv (GL_BLEND),	2326	const_iv (GL_BLEND),
…		…
1933	const_iv (GL_ALPHA_TEST),	2330	const_iv (GL_ALPHA_TEST),
1934	const_iv (GL_NORMALIZE),	2331	const_iv (GL_NORMALIZE),
1935	const_iv (GL_RESCALE_NORMAL),	2332	const_iv (GL_RESCALE_NORMAL),
1936	const_iv (GL_FRONT),	2333	const_iv (GL_FRONT),
1937	const_iv (GL_BACK),	2334	const_iv (GL_BACK),
		2335	const_iv (GL_AUX0),
1938	const_iv (GL_AND),	2336	const_iv (GL_AND),
1939	const_iv (GL_ONE),	2337	const_iv (GL_ONE),
1940	const_iv (GL_ZERO),	2338	const_iv (GL_ZERO),
1941	const_iv (GL_SRC_ALPHA),	2339	const_iv (GL_SRC_ALPHA),
1942	const_iv (GL_DST_ALPHA),	2340	const_iv (GL_DST_ALPHA),
…		…
1956	const_iv (GL_LUMINANCE),	2354	const_iv (GL_LUMINANCE),
1957	const_iv (GL_LUMINANCE_ALPHA),	2355	const_iv (GL_LUMINANCE_ALPHA),
1958	const_iv (GL_FLOAT),	2356	const_iv (GL_FLOAT),
1959	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2357	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1960	const_iv (GL_COMPILE),	2358	const_iv (GL_COMPILE),
		2359	const_iv (GL_PROXY_TEXTURE_1D),
		2360	const_iv (GL_PROXY_TEXTURE_2D),
1961	const_iv (GL_TEXTURE_1D),	2361	const_iv (GL_TEXTURE_1D),
1962	const_iv (GL_TEXTURE_2D),	2362	const_iv (GL_TEXTURE_2D),
1963	const_iv (GL_TEXTURE_ENV),	2363	const_iv (GL_TEXTURE_ENV),
1964	const_iv (GL_TEXTURE_MAG_FILTER),	2364	const_iv (GL_TEXTURE_MAG_FILTER),
1965	const_iv (GL_TEXTURE_MIN_FILTER),	2365	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1995	const_iv (GL_QUAD_STRIP),	2395	const_iv (GL_QUAD_STRIP),
1996	const_iv (GL_TRIANGLES),	2396	const_iv (GL_TRIANGLES),
1997	const_iv (GL_TRIANGLE_STRIP),	2397	const_iv (GL_TRIANGLE_STRIP),
1998	const_iv (GL_TRIANGLE_FAN),	2398	const_iv (GL_TRIANGLE_FAN),
1999	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),
2000	const_iv (GL_FASTEST),	2404	const_iv (GL_FASTEST),
		2405	const_iv (GL_DONT_CARE),
		2406	const_iv (GL_NICEST),
2001	const_iv (GL_V2F),	2407	const_iv (GL_V2F),
2002	const_iv (GL_V3F),	2408	const_iv (GL_V3F),
2003	const_iv (GL_T2F_V3F),	2409	const_iv (GL_T2F_V3F),
2004	const_iv (GL_T2F_N3F_V3F),	2410	const_iv (GL_T2F_N3F_V3F),
2005	# undef const_iv	2411	# undef const_iv
2006	};	2412	};
2007		2413
2008	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; )
2009	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);
2010	}	2419	}
2011		2420
2012	char *	2421	char *
2013	gl_vendor ()	2422	gl_vendor ()
2014	CODE:	2423	CODE:
…		…
2025		2434
2026	char *	2435	char *
2027	gl_extensions ()	2436	gl_extensions ()
2028	CODE:	2437	CODE:
2029	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);
2030	OUTPUT:	2453	OUTPUT:
2031	RETVAL	2454	RETVAL
2032		2455
2033	int glGetError ()	2456	int glGetError ()
2034		2457
…		…
2159		2582
2160	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)
2161		2584
2162	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)
2163		2586
		2587	void glPixelZoom (float x, float y)
		2588
2164	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)
2165		2590
2166	int glGenTexture ()	2591	int glGenTexture ()
2167	CODE:	2592	CODE:
2168	{	2593	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2594	OUTPUT:
2174	RETVAL	2595	RETVAL
2175		2596
2176	void glDeleteTexture (int name)	2597	void glDeleteTexture (int name)
2177	CODE:	2598	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2599	del_texture (name);
2181	}	2600
2182
2183	int glGenList ()	2601	int glGenList ()
2184	CODE:	2602	CODE:
2185	RETVAL = glGenLists (1);	2603	RETVAL = glGenLists (1);
2186	OUTPUT:	2604	OUTPUT:
2187	RETVAL	2605	RETVAL
…		…
2194		2612
2195	void glEndList ()	2613	void glEndList ()
2196		2614
2197	void glCallList (int list)	2615	void glCallList (int list)
2198		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.172 by root, Mon Apr 2 19:29:27 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.172 by root, Mon Apr 2 19:29:27 2007 UTC vs.
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC