[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.206 by root, Thu Jul 19 23:29:16 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)
…		…
315	cell->stat_hp = 0;	368	cell->stat_hp = 0;
316	cell->flags = 0;	369	cell->flags = 0;
317	cell->player = 0;	370	cell->player = 0;
318	}	371	}
319	}	372	}
		373	}
		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);
320	}	389	}
321		390
322	static void	391	static void
323	music_finished (void)	392	music_finished (void)
324	{	393	{
…		…
519	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
520	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);
521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
522	}	591	}
523		592
		593	char *
		594	SDL_GetError ()
		595
524	int	596	int
525	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
526		598
527	void	599	void
528	SDL_Quit ()	600	SDL_Quit ()
529		601
530	void	602	void
531	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
532	PPCODE:	604	PPCODE:
533	{	605	{
534	SDL_Rect **m;	606	SDL_Rect **m;
535		607
536	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
540		612
541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
543		615
544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
548		620
549	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
551	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553	#endif	625	#endif
554		626
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);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
559		628
560	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
561	while (*m)	630	while (*m)
562	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
563	AV *av = newAV ();	634	AV *av = newAV ();
564	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
565	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));
566	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
567		641
568	++m;	642	++m;
569	}	643	}
570	}	644	}
571		645
572	char *
573	SDL_GetError ()
574
575	int	646	int
576	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
577	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
578	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	660	);
		661
581	if (RETVAL)	662	if (RETVAL)
582	{	663	{
		664	av_clear (texture_av);
		665
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# 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);
585	# include "glfunc.h"	668	#include "glfunc.h"
586	# undef GL_FUNC	669	#undef GL_FUNC
587	}	670	}
		671	}
588	OUTPUT:	672	OUTPUT:
589	RETVAL	673	RETVAL
590		674
591	void	675	void
592	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
593		677
594	char *	678	char *
595	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
596		680
		681	int
		682	SDL_GetAppState ()
		683
597	void	684	void
598	SDL_PollEvent ()	685	poll_events ()
599	PPCODE:	686	PPCODE:
600	{	687	{
601	SDL_Event ev;	688	SDL_Event ev;
602		689
603	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
604	{	692	{
605	HV *hv = newHV ();	693	HV *hv = newHV ();
606	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
607		695
608	switch (ev.type)	696	switch (ev.type)
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	710	break;
623		711
624	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
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
632	break;	738	break;
633		739
634	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
666		772
667	void	773	void
668	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
669	CODE:	775	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		777
674	void	778	void
675	win32_proxy_info ()	779	win32_proxy_info ()
676	PPCODE:	780	PPCODE:
677	{	781	{
…		…
818	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
819	#else	923	#else
820	_exit (retval);	924	_exit (retval);
821	#endif	925	#endif
822		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
823	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
		937
		938	PROTOTYPES: DISABLE
824		939
825	CFPlus::Font	940	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	941	new_from_file (SV class, char path, int id = 0)
827	CODE:	942	CODE:
828	{	943	{
…		…
839	CODE:	954	CODE:
840	pango_font_description_free (self);	955	pango_font_description_free (self);
841		956
842	void	957	void
843	make_default (CFPlus::Font self)	958	make_default (CFPlus::Font self)
		959	PROTOTYPE: $
844	CODE:	960	CODE:
845	default_font = self;	961	default_font = self;
846		962
847	MODULE = CFPlus PACKAGE = CFPlus::Layout	963	MODULE = CFPlus PACKAGE = CFPlus::Layout
848		964
		965	PROTOTYPES: DISABLE
		966
849	void	967	void
850	reset_glyph_cache ()	968	reset_glyph_cache ()
		969	PROTOTYPE:
851	CODE:	970	CODE:
852	tc_clear ();	971	tc_clear ();
853		972
854	CFPlus::Layout	973	CFPlus::Layout
855	new (SV *class)	974	new (SV *class)
…		…
1142	flags	1261	flags
1143	);	1262	);
1144		1263
1145	MODULE = CFPlus PACKAGE = CFPlus::Texture	1264	MODULE = CFPlus PACKAGE = CFPlus::Texture
1146		1265
1147	void	1266	PROTOTYPES: ENABLE
1148	pad2pot (SV data_, SV w_, SV *h_)
1149	CODE:
1150	{
1151	int ow = SvIV (w_);
1152	int oh = SvIV (h_);
1153		1267
1154	if (ow && oh)	1268	int minpot (int n)
		1269
		1270	void
		1271	pad (SV *data_, int ow, int oh, int nw, int nh)
		1272	CODE:
		1273	{
		1274	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1155	{	1275	{
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;	1276	STRLEN datalen;
1164	char *data = SvPVbyte (data_, datalen);	1277	char *data = SvPVbyte (data_, datalen);
1165	int bpp = datalen / (ow * oh);	1278	int bpp = datalen / (ow * oh);
1166	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1279	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1167		1280
1168	SvPOK_only (result_);	1281	SvPOK_only (result_);
1169	SvCUR_set (result_, nw * nh * bpp);	1282	SvCUR_set (result_, nw * nh * bpp);
1170		1283
1171	memset (SvPVX (result_), 0, nw * nh * bpp);	1284	memset (SvPVX (result_), 0, nw * nh * bpp);
1172	while (oh--)	1285	while (oh--)
1173	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1286	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1174		1287
1175	sv_setsv (data_, result_);	1288	sv_setsv (data_, result_);
1176	}
1177
1178	sv_setiv (w_, nw);
1179	sv_setiv (h_, nh);
1180	}
1181	}	1289	}
1182	}	1290	}
1183		1291
1184	void	1292	void
1185	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1293	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1228	glDisable (GL_ALPHA_TEST);	1336	glDisable (GL_ALPHA_TEST);
1229	glDisable (GL_BLEND);	1337	glDisable (GL_BLEND);
1230	}	1338	}
1231	}	1339	}
1232		1340
		1341	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1342	CODE:
		1343	{
		1344	GLint width;
		1345	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1346	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1347	RETVAL = width > 0;
		1348	}
		1349	OUTPUT:
		1350	RETVAL
		1351
1233	MODULE = CFPlus PACKAGE = CFPlus::Map	1352	MODULE = CFPlus PACKAGE = CFPlus::Map
		1353
		1354	PROTOTYPES: DISABLE
1234		1355
1235	CFPlus::Map	1356	CFPlus::Map
1236	new (SV *class)	1357	new (SV *class)
1237	CODE:	1358	CODE:
1238	New (0, RETVAL, 1, struct map);	1359	New (0, RETVAL, 1, struct map);
…		…
1240	RETVAL->y = 0;	1361	RETVAL->y = 0;
1241	RETVAL->w = 0;	1362	RETVAL->w = 0;
1242	RETVAL->h = 0;	1363	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1364	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1365	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1366	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1367	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;	1368	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1369	RETVAL->row = 0;
1251	OUTPUT:	1370	OUTPUT:
1252	RETVAL	1371	RETVAL
1253		1372
1254	void	1373	void
1255	DESTROY (CFPlus::Map self)	1374	DESTROY (CFPlus::Map self)
1256	CODE:	1375	CODE:
1257	{	1376	{
1258	map_clear (self);	1377	map_clear (self);
1259	Safefree (self->face);	1378	Safefree (self->face2tile);
1260	Safefree (self->tex);	1379	Safefree (self->tex);
1261	Safefree (self);	1380	Safefree (self);
1262	}	1381	}
1263		1382
1264	void	1383	void
…		…
1271	clear (CFPlus::Map self)	1390	clear (CFPlus::Map self)
1272	CODE:	1391	CODE:
1273	map_clear (self);	1392	map_clear (self);
1274		1393
1275	void	1394	void
1276	set_face (CFPlus::Map self, int face, int texid)	1395	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1396	CODE:
1278	{	1397	{
1279	while (self->faces <= face)	1398	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1399	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1400	}
1282	self->faces *= 2;
1283	}
1284		1401
1285	self->face [face] = texid;	1402	void
		1403	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1404	CODE:
		1405	{
		1406	tileid texid;
		1407	maptex *tex;
		1408
		1409	if (face < 0 \|\| face >= self->faces)
		1410	return;
		1411
		1412	if (smooth < 0 \|\| smooth >= self->faces)
		1413	return;
		1414
		1415	texid = self->face2tile [face];
		1416
		1417	if (!texid)
		1418	return;
		1419
		1420	tex = self->tex + texid;
		1421	tex->smoothtile = self->face2tile [smooth];
		1422	tex->smoothlevel = level;
1286	}	1423	}
1287		1424
1288	void	1425	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)	1426	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:	1427	CODE:
1291	{	1428	{
1292	while (self->texs <= texid)	1429	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1430
1298	{	1431	{
1299	maptex *tex = self->tex + texid;	1432	maptex *tex = self->tex + texid;
1300		1433
1301	tex->name = name;	1434	tex->name = name;
…		…
1345	CODE:	1478	CODE:
1346	{	1479	{
1347	if (dx > 0)	1480	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1481	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1482	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1483	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1484
1352	if (dy > 0)	1485	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1486	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1487	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1488	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1489
1357	self->ox += dx; self->x += dx;	1490	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1491	self->oy += dy; self->y += dy;
1359		1492
1360	while (self->y < 0)	1493	while (self->y < 0)
…		…
1414	}	1547	}
1415	else if (cmd == 6) // monster width	1548	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1549	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1550	else if (cmd == 0x47)
1418	{	1551	{
1419	if (*data == 8)	1552	if (*data == 4)
1420	; // decode player uuid	1553	; // decode player count
1421		1554
1422	data += *data + 1;	1555	data += *data + 1;
1423	}	1556	}
1424	else if (cmd == 8) // cell flags	1557	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1558	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1567	cell->darkness = *data++ + 1;
1435	}	1568	}
1436		1569
1437	if (flags & 4)	1570	if (flags & 4)
1438	{	1571	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1572	faceid face = (data [0] << 8) + data [1]; data += 2;
		1573	need_facenum (self, face);
		1574	cell->tile [0] = self->face2tile [face];
1440	}	1575	}
1441		1576
1442	if (flags & 2)	1577	if (flags & 2)
1443	{	1578	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1579	faceid face = (data [0] << 8) + data [1]; data += 2;
		1580	need_facenum (self, face);
		1581	cell->tile [1] = self->face2tile [face];
1445	}	1582	}
1446		1583
1447	if (flags & 1)	1584	if (flags & 1)
1448	{	1585	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1586	faceid face = (data [0] << 8) + data [1]; data += 2;
		1587	need_facenum (self, face);
		1588	cell->tile [2] = self->face2tile [face];
1450	}	1589	}
1451	}	1590	}
1452	else	1591	else
1453	cell->darkness = 0;	1592	cell->darkness = 0;
1454	}	1593	}
…		…
1484	{	1623	{
1485	mapcell *cell = row->col + (x - row->c0);	1624	mapcell *cell = row->col + (x - row->c0);
1486		1625
1487	for (z = 0; z <= 0; z++)	1626	for (z = 0; z <= 0; z++)
1488	{	1627	{
1489	mapface face = cell->face [z];
1490
1491	if (face > 0 && face < self->texs)
1492	{
1493	maptex tex = self->tex [face];	1628	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1629	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1630	int a1 = tex.a;
1496		1631
1497	r = (r * a0 + tex.r * a1) / 255;	1632	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1633	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1634	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1635	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1636	}
1503	}	1637	}
1504		1638
1505	*map++ = (r )	1639	*map++ = (r )
1506	\| (g << 8)	1640	\| (g << 8)
…		…
1516		1650
1517	void	1651	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1652	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1653	CODE:
1520	{	1654	{
		1655	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1656	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1657	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1658	smooth_key skey;
1521	int x, y, z;	1659	int x, y, z;
1522	int last_name;	1660	int last_name;
1523	mapface face;	1661
		1662	// thats current max. sorry.
		1663	if (sw > 255) sw = 255;
		1664	if (sh > 255) sh = 255;
		1665
		1666	// clear key, in case of extra padding
		1667	memset (&skey, 0, sizeof (skey));
1524		1668
1525	glColor4ub (255, 255, 255, 255);	1669	glColor4ub (255, 255, 255, 255);
1526		1670
1527	glEnable (GL_BLEND);	1671	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1672	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1678	last_name = 0;
1535		1679
1536	mx += self->x;	1680	mx += self->x;
1537	my += self->y;	1681	my += self->y;
1538		1682
		1683	// first pass: determine smooth_max
		1684	// rather ugly, if you ask me
		1685	// could also be stored inside mapcell and updated on change
		1686	memset (smooth_max, 0, sizeof (smooth_max));
		1687
		1688	for (y = 0; y < sh; y++)
		1689	if (0 <= y + my && y + my < self->rows)
		1690	{
		1691	maprow *row = self->row + (y + my);
		1692
		1693	for (x = 0; x < sw; x++)
		1694	if (row->c0 <= x + mx && x + mx < row->c1)
		1695	{
		1696	mapcell *cell = row->col + (x + mx - row->c0);
		1697
		1698	smooth_max[x + 1][y + 1] =
		1699	MAX (self->tex [cell->tile [0]].smoothlevel,
		1700	MAX (self->tex [cell->tile [1]].smoothlevel,
		1701	self->tex [cell->tile [2]].smoothlevel));
		1702	}
		1703	}
		1704
1539	for (z = 0; z < 3; z++)	1705	for (z = 0; z <= 2; z++)
		1706	{
		1707	memset (smooth_level, 0, sizeof (smooth_level));
		1708
1540	for (y = 0; y < sh; y++)	1709	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1710	if (0 <= y + my && y + my < self->rows)
1542	{	1711	{
1543	maprow *row = self->row + (y + my);	1712	maprow *row = self->row + (y + my);
1544		1713
1545	for (x = 0; x < sw; x++)	1714	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1715	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1716	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1717	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1718	tileid tile = cell->tile [z];
		1719
		1720	if (tile)
		1721	{
		1722	maptex tex = self->tex [tile];
		1723	int px = (x + 1) * T - tex.w;
		1724	int py = (y + 1) * T - tex.h;
1551		1725
1552	if (face > 0 && face < self->texs)	1726	// suppressing texture state switches here
		1727	// is only moderately effective, but worth the extra effort
		1728	if (last_name != tex.name)
		1729	{
		1730	if (!tex.name)
		1731	tex = self->tex [2]; /* missing, replace by noface */
		1732
		1733	glEnd ();
		1734	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1735	glBegin (GL_QUADS);
		1736	}
		1737
		1738	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1739	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1740	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1741	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1742
		1743	if (cell->flags && z == 2)
		1744	{
		1745	if (cell->flags & 1)
		1746	{
		1747	maptex tex = self->tex [1];
		1748	int px = x * T + T * 2 / 32;
		1749	int py = y * T - T * 6 / 32;
		1750
		1751	glEnd ();
		1752	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1753	glBegin (GL_QUADS);
		1754
		1755	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1756	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1757	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1758	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1759	}
		1760	}
		1761
		1762	// update smooth hash
		1763	if (tex.smoothtile)
		1764	{
		1765	skey.tile = tex.smoothtile;
		1766	skey.level = tex.smoothlevel;
		1767
		1768	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1769
		1770	// add bits to current tile and all neighbours. skey.x\|y is
		1771	// shifted +1\|+1 so we always stay positive.
		1772
		1773	// bits is ___n cccc CCCC bbbb
		1774	// n do not draw borders&corners
		1775	// c draw these corners, but...
		1776	// C ... not these
		1777	// b draw these borders
		1778
		1779	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1780	// ┃· ·· ·┃ ━━
		1781
		1782	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1783	// ·· ·· ·┏ ┓·
		1784
		1785	// full tile
		1786	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1787
		1788	// borders
		1789	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1790	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1791	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1792	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1793
		1794	// corners
		1795	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1796	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1797	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1798	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1799	}
		1800	}
		1801	}
		1802	}
		1803
		1804	// go through all smoothlevels, lowest to highest, then draw.
		1805	// this is basically counting sort
		1806	{
		1807	int w, b;
		1808
		1809	for (w = 0; w < 256 / 32; ++w)
		1810	{
		1811	uint32_t smask = smooth_level [w];
		1812	if (smask)
		1813	for (b = 0; b < 32; ++b)
		1814	if (smask & (((uint32_t)1) << b))
1553	{	1815	{
1554	maptex tex = self->tex [face];	1816	int level = (w << 5) \| b;
1555	int px = (x + 1) * T - tex.w;	1817	HE *he;
1556	int py = (y + 1) * T - tex.h;
1557		1818
1558	if (last_name != tex.name)	1819	hv_iterinit (smooth);
		1820	while ((he = hv_iternext (smooth)))
1559	{	1821	{
		1822	smooth_key skey = (smooth_key )HeKEY (he);
		1823	IV bits = SvIVX (HeVAL (he));
		1824
		1825	if (!(bits & 0x1000)
		1826	&& skey->level == level
		1827	&& level > smooth_max [skey->x][skey->y])
		1828	{
		1829	maptex tex = self->tex [skey->tile];
		1830	int px = (((int)skey->x) - 1) * T;
		1831	int py = (((int)skey->y) - 1) * T;
		1832	int border = bits & 15;
		1833	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1834	float dx = tex.s * .0625f; // 16 images/row
		1835	float dy = tex.t * .5f ; // 2 images/column
		1836
		1837	// this time naively avoiding texture state changes
		1838	// save gobs of state changes.
		1839	if (last_name != tex.name)
		1840	{
		1841	if (!tex.name)
		1842	continue; // smoothing not yet available
		1843
1560	glEnd ();	1844	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1845	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1846	glBegin (GL_QUADS);
		1847	}
		1848
		1849	if (border)
		1850	{
		1851	float ox = border * dx;
		1852
		1853	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1854	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1855	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1856	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1857	}
		1858
		1859	if (corner)
		1860	{
		1861	float ox = corner * dx;
		1862
		1863	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1864	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1865	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1866	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1867	}
1563	}	1868	}
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	}	1869	}
1588	}	1870	}
1589	}
1590	}	1871	}
		1872	}
		1873
		1874	hv_clear (smooth);
		1875	}
1591		1876
1592	glEnd ();	1877	glEnd ();
1593		1878
1594	glDisable (GL_TEXTURE_2D);	1879	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1880	glDisable (GL_BLEND);
…		…
1609	int py = y * T;	1894	int py = y * T;
1610		1895
1611	if (cell->stat_hp)	1896	if (cell->stat_hp)
1612	{	1897	{
1613	int width = cell->stat_width * T;	1898	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1899	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1900
1616	glColor3ub (0, 0, 0);	1901	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1902	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1903	px + width - 1, py);
1619		1904
…		…
1689	void	1974	void
1690	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1975	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1691	PPCODE:	1976	PPCODE:
1692	{	1977	{
1693	int x, y;	1978	int x, y;
		1979	int sw1 = sw + 2;
		1980	int sh1 = sh + 2;
		1981	int sh3 = sh * 3;
1694	int sw4 = (sw + 3) & ~3;	1982	int sw34 = (sw * 3 + 3) & ~3;
		1983	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1695	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1696	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1985	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1697		1986
1698	memset (darkness, 255, sw4 * sh);
1699	SvPOK_only (darkness_sv);	1987	SvPOK_only (darkness3_sv);
1700	SvCUR_set (darkness_sv, sw4 * sh);	1988	SvCUR_set (darkness3_sv, sw34 * sh3);
1701		1989
1702	mx += self->x;	1990	mx += self->x - 1;
1703	my += self->y;	1991	my += self->y - 1;
1704		1992
		1993	memset (darkness1, 255, sw1 * sh1);
		1994
1705	for (y = 0; y < sh; y++)	1995	for (y = 0; y < sh1; y++)
1706	if (0 <= y + my && y + my < self->rows)	1996	if (0 <= y + my && y + my < self->rows)
1707	{	1997	{
1708	maprow *row = self->row + (y + my);	1998	maprow *row = self->row + (y + my);
1709		1999
1710	for (x = 0; x < sw; x++)	2000	for (x = 0; x < sw1; x++)
1711	if (row->c0 <= x + mx && x + mx < row->c1)	2001	if (row->c0 <= x + mx && x + mx < row->c1)
1712	{	2002	{
1713	mapcell *cell = row->col + (x + mx - row->c0);	2003	mapcell *cell = row->col + (x + mx - row->c0);
1714		2004
1715	darkness[y * sw4 + x] = cell->darkness	2005	darkness1 [y * sw1 + x] = cell->darkness
1716	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1717	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1718	}	2008	}
1719	}	2009	}
1720		2010
		2011	for (y = 0; y < sh; ++y)
		2012	for (x = 0; x < sw; ++x)
		2013	{
		2014	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2015	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2016	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2017	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2018	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2019	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2020	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2021	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2022	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2023
		2024	uint8_t r11 = (d11 + d21 + d12) / 3;
		2025	uint8_t r21 = d21;
		2026	uint8_t r31 = (d21 + d31 + d32) / 3;
		2027
		2028	uint8_t r12 = d12;
		2029	uint8_t r22 = d22;
		2030	uint8_t r32 = d32;
		2031
		2032	uint8_t r13 = (d13 + d23 + d12) / 3;
		2033	uint8_t r23 = d23;
		2034	uint8_t r33 = (d23 + d33 + d32) / 3;
		2035
		2036	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2037	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2038	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2039	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2040	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2041	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2042	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2043	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2044	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2045	}
		2046
		2047	free (darkness1);
		2048
1721	EXTEND (SP, 3);	2049	EXTEND (SP, 3);
1722	PUSHs (sv_2mortal (newSViv (sw4)));	2050	PUSHs (sv_2mortal (newSViv (sw34)));
1723	PUSHs (sv_2mortal (newSViv (sh)));	2051	PUSHs (sv_2mortal (newSViv (sh3)));
1724	PUSHs (darkness_sv);	2052	PUSHs (darkness3_sv);
1725	}	2053	}
1726		2054
1727	SV *	2055	SV *
1728	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2056	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1729	CODE:	2057	CODE:
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2086	if (row && row->c0 <= x && x < row->c1)
1759	{	2087	{
1760	mapcell *cell = row->col + (x - row->c0);	2088	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2089	uint8_t flags = 0;
1762		2090
1763	if (cell->face [0]) flags \|= 1;	2091	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2092	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2093	if (cell->tile [2]) flags \|= 4;
1766		2094
1767	*data++ = flags;	2095	*data++ = flags;
1768		2096
1769	if (flags & 1)	2097	if (flags & 1)
1770	{	2098	{
		2099	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2100	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2101	*data++ = tile;
1773	}	2102	}
1774		2103
1775	if (flags & 2)	2104	if (flags & 2)
1776	{	2105	{
		2106	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2107	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2108	*data++ = tile;
1779	}	2109	}
1780		2110
1781	if (flags & 4)	2111	if (flags & 4)
1782	{	2112	{
		2113	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2114	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2115	*data++ = tile;
1785	}	2116	}
1786	}	2117	}
1787	else	2118	else
1788	*data++ = 0;	2119	*data++ = 0;
1789	}	2120	}
…		…
1829	{	2160	{
1830	uint8_t flags = *data++;	2161	uint8_t flags = *data++;
1831		2162
1832	if (flags)	2163	if (flags)
1833	{	2164	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2165	mapcell *cell = row_get_cell (row, x);
		2166	tileid tile[3] = { 0, 0, 0 };
1837		2167
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2168	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2169	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2170	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2171
1842	if (cell->darkness == 0)	2172	if (cell->darkness == 0)
1843	{	2173	{
1844	cell->darkness = 0;	2174	cell->darkness = 0;
1845		2175
1846	for (z = 0; z <= 2; z++)	2176	for (z = 0; z <= 2; z++)
1847	{	2177	{
1848	cell->face[z] = face[z];	2178	tileid t = tile [z];
1849		2179
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2180	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2181	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2182	XPUSHs (sv_2mortal (newSViv (t)));
		2183	need_texid (self, t);
		2184	}
		2185
		2186	cell->tile [z] = t;
1852	}	2187	}
1853	}	2188	}
1854	}	2189	}
1855	}	2190	}
1856	}	2191	}
1857	}	2192	}
1858		2193
1859	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2194	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1860		2195
		2196	PROTOTYPES: DISABLE
		2197
1861	CFPlus::MixChunk	2198	CFPlus::MixChunk
1862	new_from_file (SV class, char path)	2199	new_from_file (SV class, char path)
1863	CODE:	2200	CODE:
1864	RETVAL = Mix_LoadWAV (path);	2201	RETVAL = Mix_LoadWAV (path);
1865	OUTPUT:	2202	OUTPUT:
…		…
1886		2223
1887	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2224	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1888		2225
1889	int	2226	int
1890	volume (int volume = -1)	2227	volume (int volume = -1)
		2228	PROTOTYPE: ;$
1891	CODE:	2229	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2230	RETVAL = Mix_VolumeMusic (volume);
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	fade_out (int ms)
		2236	CODE:
		2237	RETVAL = Mix_FadeOutMusic (ms);
1893	OUTPUT:	2238	OUTPUT:
1894	RETVAL	2239	RETVAL
1895		2240
1896	CFPlus::MixMusic	2241	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2242	new_from_file (SV class, char path)
…		…
1910	CODE:	2255	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2256	RETVAL = Mix_PlayMusic (self, loops);
1912	OUTPUT:	2257	OUTPUT:
1913	RETVAL	2258	RETVAL
1914		2259
		2260	int
		2261	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2262	CODE:
		2263	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2264	OUTPUT:
		2265	RETVAL
		2266
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2267	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2268
		2269	PROTOTYPES: ENABLE
1916		2270
1917	BOOT:	2271	BOOT:
1918	{	2272	{
1919	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2273	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1920	static const struct {	2274	static const struct {
1921	const char *name;	2275	const char *name;
1922	IV iv;	2276	IV iv;
1923	} *civ, const_iv[] = {	2277	} *civ, const_iv[] = {
1924	# define const_iv(name) { # name, (IV)name }	2278	# define const_iv(name) { # name, (IV)name }
		2279	const_iv (GL_VENDOR),
		2280	const_iv (GL_VERSION),
		2281	const_iv (GL_EXTENSIONS),
1925	const_iv (GL_COLOR_MATERIAL),	2282	const_iv (GL_COLOR_MATERIAL),
1926	const_iv (GL_SMOOTH),	2283	const_iv (GL_SMOOTH),
1927	const_iv (GL_FLAT),	2284	const_iv (GL_FLAT),
1928	const_iv (GL_DITHER),	2285	const_iv (GL_DITHER),
1929	const_iv (GL_BLEND),	2286	const_iv (GL_BLEND),
…		…
1933	const_iv (GL_ALPHA_TEST),	2290	const_iv (GL_ALPHA_TEST),
1934	const_iv (GL_NORMALIZE),	2291	const_iv (GL_NORMALIZE),
1935	const_iv (GL_RESCALE_NORMAL),	2292	const_iv (GL_RESCALE_NORMAL),
1936	const_iv (GL_FRONT),	2293	const_iv (GL_FRONT),
1937	const_iv (GL_BACK),	2294	const_iv (GL_BACK),
		2295	const_iv (GL_AUX0),
1938	const_iv (GL_AND),	2296	const_iv (GL_AND),
1939	const_iv (GL_ONE),	2297	const_iv (GL_ONE),
1940	const_iv (GL_ZERO),	2298	const_iv (GL_ZERO),
1941	const_iv (GL_SRC_ALPHA),	2299	const_iv (GL_SRC_ALPHA),
1942	const_iv (GL_DST_ALPHA),	2300	const_iv (GL_DST_ALPHA),
…		…
1956	const_iv (GL_LUMINANCE),	2314	const_iv (GL_LUMINANCE),
1957	const_iv (GL_LUMINANCE_ALPHA),	2315	const_iv (GL_LUMINANCE_ALPHA),
1958	const_iv (GL_FLOAT),	2316	const_iv (GL_FLOAT),
1959	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2317	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1960	const_iv (GL_COMPILE),	2318	const_iv (GL_COMPILE),
		2319	const_iv (GL_PROXY_TEXTURE_1D),
		2320	const_iv (GL_PROXY_TEXTURE_2D),
1961	const_iv (GL_TEXTURE_1D),	2321	const_iv (GL_TEXTURE_1D),
1962	const_iv (GL_TEXTURE_2D),	2322	const_iv (GL_TEXTURE_2D),
1963	const_iv (GL_TEXTURE_ENV),	2323	const_iv (GL_TEXTURE_ENV),
1964	const_iv (GL_TEXTURE_MAG_FILTER),	2324	const_iv (GL_TEXTURE_MAG_FILTER),
1965	const_iv (GL_TEXTURE_MIN_FILTER),	2325	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1995	const_iv (GL_QUAD_STRIP),	2355	const_iv (GL_QUAD_STRIP),
1996	const_iv (GL_TRIANGLES),	2356	const_iv (GL_TRIANGLES),
1997	const_iv (GL_TRIANGLE_STRIP),	2357	const_iv (GL_TRIANGLE_STRIP),
1998	const_iv (GL_TRIANGLE_FAN),	2358	const_iv (GL_TRIANGLE_FAN),
1999	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2359	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2360	const_iv (GL_POINT_SMOOTH_HINT),
		2361	const_iv (GL_LINE_SMOOTH_HINT),
		2362	const_iv (GL_POLYGON_SMOOTH_HINT),
		2363	const_iv (GL_GENERATE_MIPMAP_HINT),
2000	const_iv (GL_FASTEST),	2364	const_iv (GL_FASTEST),
		2365	const_iv (GL_DONT_CARE),
		2366	const_iv (GL_NICEST),
2001	const_iv (GL_V2F),	2367	const_iv (GL_V2F),
2002	const_iv (GL_V3F),	2368	const_iv (GL_V3F),
2003	const_iv (GL_T2F_V3F),	2369	const_iv (GL_T2F_V3F),
2004	const_iv (GL_T2F_N3F_V3F),	2370	const_iv (GL_T2F_N3F_V3F),
2005	# undef const_iv	2371	# undef const_iv
2006	};	2372	};
2007		2373
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2374	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2375	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2376
		2377	texture_av = newAV ();
		2378	AvREAL_off (texture_av);
2010	}	2379	}
2011		2380
2012	char *	2381	char *
2013	gl_vendor ()	2382	gl_vendor ()
2014	CODE:	2383	CODE:
…		…
2025		2394
2026	char *	2395	char *
2027	gl_extensions ()	2396	gl_extensions ()
2028	CODE:	2397	CODE:
2029	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2398	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2399	OUTPUT:
		2400	RETVAL
		2401
		2402	const char *glGetString (GLenum pname)
		2403
		2404	GLint glGetInteger (GLenum pname)
		2405	CODE:
		2406	glGetIntegerv (pname, &RETVAL);
		2407	OUTPUT:
		2408	RETVAL
		2409
		2410	GLdouble glGetDouble (GLenum pname)
		2411	CODE:
		2412	glGetDoublev (pname, &RETVAL);
2030	OUTPUT:	2413	OUTPUT:
2031	RETVAL	2414	RETVAL
2032		2415
2033	int glGetError ()	2416	int glGetError ()
2034		2417
…		…
2159		2542
2160	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2543	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2161		2544
2162	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2545	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2163		2546
		2547	void glPixelZoom (float x, float y)
		2548
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2549	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2550
2166	int glGenTexture ()	2551	int glGenTexture ()
2167	CODE:	2552	CODE:
2168	{	2553	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2554	OUTPUT:
2174	RETVAL	2555	RETVAL
2175		2556
2176	void glDeleteTexture (int name)	2557	void glDeleteTexture (int name)
2177	CODE:	2558	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2559	del_texture (name);
2181	}	2560
2182
2183	int glGenList ()	2561	int glGenList ()
2184	CODE:	2562	CODE:
2185	RETVAL = glGenLists (1);	2563	RETVAL = glGenLists (1);
2186	OUTPUT:	2564	OUTPUT:
2187	RETVAL	2565	RETVAL

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.206 by root, Thu Jul 19 23:29:16 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.206 by root, Thu Jul 19 23:29:16 2007 UTC