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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
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
16	# undef pipe	21	# undef pipe
17	#endif	22	#endif
18		23
		24	#include <assert.h>
19	#include <math.h>	25	#include <math.h>
20	#include <string.h>	26	#include <string.h>
21	#include <stdio.h>	27	#include <stdio.h>
22	#include <stdlib.h>	28	#include <stdlib.h>
23		29
24	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
25	#include <SDL_endian.h>	32	#include <SDL_endian.h>
26	#include <SDL_image.h>	33	#include <SDL_image.h>
27	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
28	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
29		36
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	63	#else
57	# define PARACHUTE 0	64	# define PARACHUTE 0
58	#endif	65	#endif
59		66
		67	static AV *texture_av;
		68
60	static struct	69	static struct
61	{	70	{
62	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	72	#include "glfunc.h"
64	#undef GL_FUNC	73	#undef GL_FUNC
65	} gl;	74	} gl;
66		75
		76	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	78	{
69	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	83	else
74	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
75	}	85	}
76		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
77	#include "texcache.c"	111	#include "texcache.c"
78		112
79	#include "pango-font.c"	113	#include "pango-font.c"
80	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
81	#include "pango-render.c"	115	#include "pango-render.c"
…		…
154		188
155	*w = rect.width;	189	*w = rect.width;
156	*h = rect.height;	190	*h = rect.height;
157	}	191	}
158		192
		193	typedef uint16_t tileid;
159	typedef uint16_t mapface;	194	typedef uint16_t faceid;
160		195
161	typedef struct {	196	typedef struct {
162	GLint name;	197	int name;
163	int w, h;	198	int w, h;
164	float s, t;	199	float s, t;
165	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
166	} maptex;	203	} maptex;
167		204
168	typedef struct {	205	typedef struct {
169	uint32_t player;	206	uint32_t player;
170	mapface face[3];	207	tileid tile[3];
171	uint16_t darkness;	208	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	210	} mapcell;
174		211
175	typedef struct {	212	typedef struct {
176	int32_t c0, c1;	213	int32_t c0, c1;
177	mapcell *col;	214	mapcell *col;
178	} maprow;	215	} maprow;
179		216
180	typedef struct map {	217	typedef struct map {
181	int x, y, w, h;	218	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	219	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	220	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	221	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		222
189	int32_t rows;	223	int32_t rows;
190	maprow *row;	224	maprow *row;
191	} *CFPlus__Map;	225	} *CFPlus__Map;
192		226
…		…
212	return ptr;	246	return ptr;
213	}	247	}
214		248
215	#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))
216	#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	}
217		271
218	static maprow *	272	static maprow *
219	map_get_row (CFPlus__Map self, int y)	273	map_get_row (CFPlus__Map self, int y)
220	{	274	{
221	if (0 > y)	275	if (0 > y)
…		…
314	cell->stat_hp = 0;	368	cell->stat_hp = 0;
315	cell->flags = 0;	369	cell->flags = 0;
316	cell->player = 0;	370	cell->player = 0;
317	}	371	}
318	}	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);
319	}	389	}
320		390
321	static void	391	static void
322	music_finished (void)	392	music_finished (void)
323	{	393	{
…		…
492		562
493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	563	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	564	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495	}	565	}
496		566
		567	void
		568	weaken (SV *rv)
		569	PROTOTYPE: $
		570	CODE:
		571	sv_rvweaken (rv);
		572
497	int	573	int
498	in_destruct ()	574	in_destruct ()
499	CODE:	575	CODE:
500	RETVAL = PL_main_cv == Nullcv;	576	RETVAL = PL_main_cv == Nullcv;
501	OUTPUT:	577	OUTPUT:
…		…
512	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
513	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);
514	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
515	}	591	}
516		592
		593	char *
		594	SDL_GetError ()
		595
517	int	596	int
518	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
519		598
520	void	599	void
521	SDL_Quit ()	600	SDL_Quit ()
522		601
523	void	602	void
524	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
525	PPCODE:	604	PPCODE:
526	{	605	{
527	SDL_Rect **m;	606	SDL_Rect **m;
528		607
529	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
533		612
534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
536		615
537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
541		620
542	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
544	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546	#endif	625	#endif
547		626
548	SDL_EnableUNICODE (1);
549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
550
551	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
552		628
553	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
554	while (*m)	630	while (*m)
555	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
556	AV *av = newAV ();	634	AV *av = newAV ();
557	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
558	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));
559	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
560		641
561	++m;	642	++m;
562	}	643	}
563	}	644	}
564		645
565	char *
566	SDL_GetError ()
567
568	int	646	int
569	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
570	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
571	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
573	);	660	);
		661
574	if (RETVAL)	662	if (RETVAL)
575	{	663	{
		664	av_clear (texture_av);
		665
576	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577	# 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);
578	# include "glfunc.h"	668	#include "glfunc.h"
579	# undef GL_FUNC	669	#undef GL_FUNC
580	}	670	}
		671	}
581	OUTPUT:	672	OUTPUT:
582	RETVAL	673	RETVAL
583		674
584	void	675	void
585	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
586		677
587	char *	678	char *
588	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
589		680
		681	int
		682	SDL_GetAppState ()
		683
590	void	684	void
591	SDL_PollEvent ()	685	poll_events ()
592	PPCODE:	686	PPCODE:
593	{	687	{
594	SDL_Event ev;	688	SDL_Event ev;
595		689
596	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597	{	692	{
598	HV *hv = newHV ();	693	HV *hv = newHV ();
599	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
600		695
601	switch (ev.type)	696	switch (ev.type)
…		…
613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615	break;	710	break;
616		711
617	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
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
625	break;	738	break;
626		739
627	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
628	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
658	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
659		772
660	void	773	void
661	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
662	CODE:	775	CODE:
663	#ifndef _WIN32
664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665	#endif
666		777
667	void	778	void
668	win32_proxy_info ()	779	win32_proxy_info ()
669	PPCODE:	780	PPCODE:
670	{	781	{
…		…
811	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
812	#else	923	#else
813	_exit (retval);	924	_exit (retval);
814	#endif	925	#endif
815		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
816	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
		937
		938	PROTOTYPES: DISABLE
817		939
818	CFPlus::Font	940	CFPlus::Font
819	new_from_file (SV class, char path, int id = 0)	941	new_from_file (SV class, char path, int id = 0)
820	CODE:	942	CODE:
821	{	943	{
…		…
832	CODE:	954	CODE:
833	pango_font_description_free (self);	955	pango_font_description_free (self);
834		956
835	void	957	void
836	make_default (CFPlus::Font self)	958	make_default (CFPlus::Font self)
		959	PROTOTYPE: $
837	CODE:	960	CODE:
838	default_font = self;	961	default_font = self;
839		962
840	MODULE = CFPlus PACKAGE = CFPlus::Layout	963	MODULE = CFPlus PACKAGE = CFPlus::Layout
841		964
		965	PROTOTYPES: DISABLE
		966
842	void	967	void
843	reset_glyph_cache ()	968	reset_glyph_cache ()
		969	PROTOTYPE:
844	CODE:	970	CODE:
845	tc_clear ();	971	tc_clear ();
846		972
847	CFPlus::Layout	973	CFPlus::Layout
848	new (SV *class)	974	new (SV *class)
…		…
1135	flags	1261	flags
1136	);	1262	);
1137		1263
1138	MODULE = CFPlus PACKAGE = CFPlus::Texture	1264	MODULE = CFPlus PACKAGE = CFPlus::Texture
1139		1265
1140	void	1266	PROTOTYPES: ENABLE
1141	pad2pot (SV data_, SV w_, SV *h_)
1142	CODE:
1143	{
1144	int ow = SvIV (w_);
1145	int oh = SvIV (h_);
1146		1267
1147	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_))
1148	{	1275	{
1149	int nw = minpot (ow);
1150	int nh = minpot (oh);
1151
1152	if (nw != ow \|\| nh != oh)
1153	{
1154	if (SvOK (data_))
1155	{
1156	STRLEN datalen;	1276	STRLEN datalen;
1157	char *data = SvPVbyte (data_, datalen);	1277	char *data = SvPVbyte (data_, datalen);
1158	int bpp = datalen / (ow * oh);	1278	int bpp = datalen / (ow * oh);
1159	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1279	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1160		1280
1161	SvPOK_only (result_);	1281	SvPOK_only (result_);
1162	SvCUR_set (result_, nw * nh * bpp);	1282	SvCUR_set (result_, nw * nh * bpp);
1163		1283
1164	memset (SvPVX (result_), 0, nw * nh * bpp);	1284	memset (SvPVX (result_), 0, nw * nh * bpp);
1165	while (oh--)	1285	while (oh--)
1166	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);
1167		1287
1168	sv_setsv (data_, result_);	1288	sv_setsv (data_, result_);
1169	}
1170
1171	sv_setiv (w_, nw);
1172	sv_setiv (h_, nh);
1173	}
1174	}	1289	}
1175	}	1290	}
1176		1291
1177	void	1292	void
1178	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.)
…		…
1221	glDisable (GL_ALPHA_TEST);	1336	glDisable (GL_ALPHA_TEST);
1222	glDisable (GL_BLEND);	1337	glDisable (GL_BLEND);
1223	}	1338	}
1224	}	1339	}
1225		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
1226	MODULE = CFPlus PACKAGE = CFPlus::Map	1352	MODULE = CFPlus PACKAGE = CFPlus::Map
		1353
		1354	PROTOTYPES: DISABLE
1227		1355
1228	CFPlus::Map	1356	CFPlus::Map
1229	new (SV *class)	1357	new (SV *class)
1230	CODE:	1358	CODE:
1231	New (0, RETVAL, 1, struct map);	1359	New (0, RETVAL, 1, struct map);
…		…
1233	RETVAL->y = 0;	1361	RETVAL->y = 0;
1234	RETVAL->w = 0;	1362	RETVAL->w = 0;
1235	RETVAL->h = 0;	1363	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1364	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1365	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1366	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1367	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240	RETVAL->texs = 8192;
1241	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242	RETVAL->rows = 0;	1368	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1369	RETVAL->row = 0;
1244	OUTPUT:	1370	OUTPUT:
1245	RETVAL	1371	RETVAL
1246		1372
1247	void	1373	void
1248	DESTROY (CFPlus::Map self)	1374	DESTROY (CFPlus::Map self)
1249	CODE:	1375	CODE:
1250	{	1376	{
1251	map_clear (self);	1377	map_clear (self);
1252	Safefree (self->face);	1378	Safefree (self->face2tile);
1253	Safefree (self->tex);	1379	Safefree (self->tex);
1254	Safefree (self);	1380	Safefree (self);
1255	}	1381	}
1256		1382
1257	void	1383	void
…		…
1264	clear (CFPlus::Map self)	1390	clear (CFPlus::Map self)
1265	CODE:	1391	CODE:
1266	map_clear (self);	1392	map_clear (self);
1267		1393
1268	void	1394	void
1269	set_face (CFPlus::Map self, int face, int texid)	1395	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1396	CODE:
1271	{	1397	{
1272	while (self->faces <= face)	1398	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1399	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1400	}
1275	self->faces *= 2;
1276	}
1277		1401
1278	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;
1279	}	1423	}
1280		1424
1281	void	1425	void
1282	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)
1283	CODE:	1427	CODE:
1284	{	1428	{
1285	while (self->texs <= texid)	1429	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1430
1291	{	1431	{
1292	maptex *tex = self->tex + texid;	1432	maptex *tex = self->tex + texid;
1293		1433
1294	tex->name = name;	1434	tex->name = name;
…		…
1338	CODE:	1478	CODE:
1339	{	1479	{
1340	if (dx > 0)	1480	if (dx > 0)
1341	map_blank (self, self->x, self->y, dx, self->h);	1481	map_blank (self, self->x, self->y, dx, self->h);
1342	else if (dx < 0)	1482	else if (dx < 0)
1343	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);
1344		1484
1345	if (dy > 0)	1485	if (dy > 0)
1346	map_blank (self, self->x, self->y, self->w, dy);	1486	map_blank (self, self->x, self->y, self->w, dy);
1347	else if (dy < 0)	1487	else if (dy < 0)
1348	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);
1349		1489
1350	self->ox += dx; self->x += dx;	1490	self->ox += dx; self->x += dx;
1351	self->oy += dy; self->y += dy;	1491	self->oy += dy; self->y += dy;
1352		1492
1353	while (self->y < 0)	1493	while (self->y < 0)
…		…
1405	cell->stat_width = 1;	1545	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1546	cell->stat_hp = *data++;
1407	}	1547	}
1408	else if (cmd == 6) // monster width	1548	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1549	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1550	else if (cmd == 0x47)
1411	{	1551	{
1412	if (*data == 4)	1552	if (*data == 4)
1413	; // decode player tag	1553	; // decode player count
1414		1554
1415	data += *data + 1;	1555	data += *data + 1;
1416	}	1556	}
1417	else if (cmd == 8) // cell flags	1557	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1558	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1567	cell->darkness = *data++ + 1;
1428	}	1568	}
1429		1569
1430	if (flags & 4)	1570	if (flags & 4)
1431	{	1571	{
1432	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];
1433	}	1575	}
1434		1576
1435	if (flags & 2)	1577	if (flags & 2)
1436	{	1578	{
1437	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];
1438	}	1582	}
1439		1583
1440	if (flags & 1)	1584	if (flags & 1)
1441	{	1585	{
1442	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];
1443	}	1589	}
1444	}	1590	}
1445	else	1591	else
1446	cell->darkness = 0;	1592	cell->darkness = 0;
1447	}	1593	}
…		…
1477	{	1623	{
1478	mapcell *cell = row->col + (x - row->c0);	1624	mapcell *cell = row->col + (x - row->c0);
1479		1625
1480	for (z = 0; z <= 0; z++)	1626	for (z = 0; z <= 0; z++)
1481	{	1627	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1628	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1629	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1630	int a1 = tex.a;
1489		1631
1490	r = (r * a0 + tex.r * a1) / 255;	1632	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1633	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1634	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1635	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1636	}
1496	}	1637	}
1497		1638
1498	*map++ = (r )	1639	*map++ = (r )
1499	\| (g << 8)	1640	\| (g << 8)
…		…
1506	}	1647	}
1507	OUTPUT:	1648	OUTPUT:
1508	RETVAL	1649	RETVAL
1509		1650
1510	void	1651	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1652	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1653	CODE:
1513	{	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;
1514	int x, y, z;	1659	int x, y, z;
1515	int last_name;	1660	int last_name;
1516	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));
1517		1668
1518	glColor4ub (255, 255, 255, 255);	1669	glColor4ub (255, 255, 255, 255);
1519		1670
1520	glEnable (GL_BLEND);	1671	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1672	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1678	last_name = 0;
1528		1679
1529	mx += self->x;	1680	mx += self->x;
1530	my += self->y;	1681	my += self->y;
1531		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
1532	for (z = 0; z < 3; z++)	1705	for (z = 0; z <= 2; z++)
		1706	{
		1707	memset (smooth_level, 0, sizeof (smooth_level));
		1708
1533	for (y = 0; y < sh; y++)	1709	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1710	if (0 <= y + my && y + my < self->rows)
1535	{	1711	{
1536	maprow *row = self->row + (y + my);	1712	maprow *row = self->row + (y + my);
1537		1713
1538	for (x = 0; x < sw; x++)	1714	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1715	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1716	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1717	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	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;
1544		1725
1545	if (face && 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))
1546	{	1815	{
1547	maptex tex = self->tex [face];	1816	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1817	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1818
1551	if (last_name != tex.name)	1819	hv_iterinit (smooth);
		1820	while ((he = hv_iternext (smooth)))
1552	{	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
1553	glEnd ();	1844	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1845	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	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	}
1556	}	1868	}
1557
1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562	}
1563
1564	if (cell->flags && z == 2)
1565	{
1566	if (cell->flags & 1)
1567	{
1568	maptex tex = self->tex [1];
1569	int px = (x + 1) * 32 - tex.w + 2;
1570	int py = (y + 1) * 32 - tex.h - 6;
1571
1572	glEnd ();
1573	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574	glBegin (GL_QUADS);
1575
1576	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580	}	1869	}
1581	}	1870	}
1582	}
1583	}	1871	}
		1872	}
		1873
		1874	hv_clear (smooth);
		1875	}
1584		1876
1585	glEnd ();	1877	glEnd ();
1586		1878
1587	glDisable (GL_TEXTURE_2D);	1879	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1880	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1888	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1889	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1890	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1891	mapcell *cell = row->col + (x + mx - row->c0);
1600		1892
1601	int px = x * 32;	1893	int px = x * T;
1602	int py = y * 32;	1894	int py = y * T;
1603		1895
1604	if (cell->stat_hp)	1896	if (cell->stat_hp)
1605	{	1897	{
1606	int width = cell->stat_width * 32;	1898	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1899	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1900
1609	glColor3ub (0, 0, 0);	1901	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1902	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1903	px + width - 1, py);
1612		1904
…		…
1682	void	1974	void
1683	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)
1684	PPCODE:	1976	PPCODE:
1685	{	1977	{
1686	int x, y;	1978	int x, y;
		1979	int sw1 = sw + 2;
		1980	int sh1 = sh + 2;
		1981	int sh3 = sh * 3;
1687	int sw4 = (sw + 3) & ~3;	1982	int sw34 = (sw * 3 + 3) & ~3;
		1983	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
1688	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));
1689	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1985	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
1690		1986
1691	memset (darkness, 255, sw4 * sh);
1692	SvPOK_only (darkness_sv);	1987	SvPOK_only (darkness3_sv);
1693	SvCUR_set (darkness_sv, sw4 * sh);	1988	SvCUR_set (darkness3_sv, sw34 * sh3);
1694		1989
1695	mx += self->x;	1990	mx += self->x - 1;
1696	my += self->y;	1991	my += self->y - 1;
1697		1992
		1993	memset (darkness1, 255, sw1 * sh1);
		1994
1698	for (y = 0; y < sh; y++)	1995	for (y = 0; y < sh1; y++)
1699	if (0 <= y + my && y + my < self->rows)	1996	if (0 <= y + my && y + my < self->rows)
1700	{	1997	{
1701	maprow *row = self->row + (y + my);	1998	maprow *row = self->row + (y + my);
1702		1999
1703	for (x = 0; x < sw; x++)	2000	for (x = 0; x < sw1; x++)
1704	if (row->c0 <= x + mx && x + mx < row->c1)	2001	if (row->c0 <= x + mx && x + mx < row->c1)
1705	{	2002	{
1706	mapcell *cell = row->col + (x + mx - row->c0);	2003	mapcell *cell = row->col + (x + mx - row->c0);
1707		2004
1708	darkness[y * sw4 + x] = cell->darkness	2005	darkness1 [y * sw1 + x] = cell->darkness
1709	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1710	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1711	}	2008	}
1712	}	2009	}
1713		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
1714	EXTEND (SP, 3);	2049	EXTEND (SP, 3);
1715	PUSHs (sv_2mortal (newSViv (sw4)));	2050	PUSHs (sv_2mortal (newSViv (sw34)));
1716	PUSHs (sv_2mortal (newSViv (sh)));	2051	PUSHs (sv_2mortal (newSViv (sh3)));
1717	PUSHs (darkness_sv);	2052	PUSHs (darkness3_sv);
1718	}	2053	}
1719		2054
1720	SV *	2055	SV *
1721	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)
1722	CODE:	2057	CODE:
…		…
1751	if (row && row->c0 <= x && x < row->c1)	2086	if (row && row->c0 <= x && x < row->c1)
1752	{	2087	{
1753	mapcell *cell = row->col + (x - row->c0);	2088	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	2089	uint8_t flags = 0;
1755		2090
1756	if (cell->face [0]) flags \|= 1;	2091	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	2092	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	2093	if (cell->tile [2]) flags \|= 4;
1759		2094
1760	*data++ = flags;	2095	*data++ = flags;
1761		2096
1762	if (flags & 1)	2097	if (flags & 1)
1763	{	2098	{
		2099	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	2100	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	2101	*data++ = tile;
1766	}	2102	}
1767		2103
1768	if (flags & 2)	2104	if (flags & 2)
1769	{	2105	{
		2106	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	2107	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	2108	*data++ = tile;
1772	}	2109	}
1773		2110
1774	if (flags & 4)	2111	if (flags & 4)
1775	{	2112	{
		2113	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	2114	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	2115	*data++ = tile;
1778	}	2116	}
1779	}	2117	}
1780	else	2118	else
1781	*data++ = 0;	2119	*data++ = 0;
1782	}	2120	}
…		…
1822	{	2160	{
1823	uint8_t flags = *data++;	2161	uint8_t flags = *data++;
1824		2162
1825	if (flags)	2163	if (flags)
1826	{	2164	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2165	mapcell *cell = row_get_cell (row, x);
		2166	tileid tile[3] = { 0, 0, 0 };
1830		2167
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2168	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2169	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2170	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2171
1835	if (cell->darkness == 0)	2172	if (cell->darkness == 0)
1836	{	2173	{
1837	cell->darkness = 0;	2174	cell->darkness = 0;
1838		2175
1839	for (z = 0; z <= 2; z++)	2176	for (z = 0; z <= 2; z++)
1840	{	2177	{
1841	cell->face[z] = face[z];	2178	tileid t = tile [z];
1842		2179
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2180	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2181	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2182	XPUSHs (sv_2mortal (newSViv (t)));
		2183	need_texid (self, t);
		2184	}
		2185
		2186	cell->tile [z] = t;
1845	}	2187	}
1846	}	2188	}
1847	}	2189	}
1848	}	2190	}
1849	}	2191	}
1850	}	2192	}
1851		2193
1852	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2194	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1853		2195
		2196	PROTOTYPES: DISABLE
		2197
1854	CFPlus::MixChunk	2198	CFPlus::MixChunk
1855	new_from_file (SV class, char path)	2199	new_from_file (SV class, char path)
1856	CODE:	2200	CODE:
1857	RETVAL = Mix_LoadWAV (path);	2201	RETVAL = Mix_LoadWAV (path);
1858	OUTPUT:	2202	OUTPUT:
…		…
1879		2223
1880	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2224	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1881		2225
1882	int	2226	int
1883	volume (int volume = -1)	2227	volume (int volume = -1)
		2228	PROTOTYPE: ;$
1884	CODE:	2229	CODE:
1885	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);
1886	OUTPUT:	2238	OUTPUT:
1887	RETVAL	2239	RETVAL
1888		2240
1889	CFPlus::MixMusic	2241	CFPlus::MixMusic
1890	new_from_file (SV class, char path)	2242	new_from_file (SV class, char path)
…		…
1903	CODE:	2255	CODE:
1904	RETVAL = Mix_PlayMusic (self, loops);	2256	RETVAL = Mix_PlayMusic (self, loops);
1905	OUTPUT:	2257	OUTPUT:
1906	RETVAL	2258	RETVAL
1907		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
1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2267	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2268
		2269	PROTOTYPES: ENABLE
1909		2270
1910	BOOT:	2271	BOOT:
1911	{	2272	{
1912	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2273	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1913	static const struct {	2274	static const struct {
1914	const char *name;	2275	const char *name;
1915	IV iv;	2276	IV iv;
1916	} *civ, const_iv[] = {	2277	} *civ, const_iv[] = {
1917	# 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),
1918	const_iv (GL_COLOR_MATERIAL),	2282	const_iv (GL_COLOR_MATERIAL),
1919	const_iv (GL_SMOOTH),	2283	const_iv (GL_SMOOTH),
1920	const_iv (GL_FLAT),	2284	const_iv (GL_FLAT),
1921	const_iv (GL_DITHER),	2285	const_iv (GL_DITHER),
1922	const_iv (GL_BLEND),	2286	const_iv (GL_BLEND),
…		…
1926	const_iv (GL_ALPHA_TEST),	2290	const_iv (GL_ALPHA_TEST),
1927	const_iv (GL_NORMALIZE),	2291	const_iv (GL_NORMALIZE),
1928	const_iv (GL_RESCALE_NORMAL),	2292	const_iv (GL_RESCALE_NORMAL),
1929	const_iv (GL_FRONT),	2293	const_iv (GL_FRONT),
1930	const_iv (GL_BACK),	2294	const_iv (GL_BACK),
		2295	const_iv (GL_AUX0),
1931	const_iv (GL_AND),	2296	const_iv (GL_AND),
1932	const_iv (GL_ONE),	2297	const_iv (GL_ONE),
1933	const_iv (GL_ZERO),	2298	const_iv (GL_ZERO),
1934	const_iv (GL_SRC_ALPHA),	2299	const_iv (GL_SRC_ALPHA),
1935	const_iv (GL_DST_ALPHA),	2300	const_iv (GL_DST_ALPHA),
…		…
1949	const_iv (GL_LUMINANCE),	2314	const_iv (GL_LUMINANCE),
1950	const_iv (GL_LUMINANCE_ALPHA),	2315	const_iv (GL_LUMINANCE_ALPHA),
1951	const_iv (GL_FLOAT),	2316	const_iv (GL_FLOAT),
1952	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2317	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1953	const_iv (GL_COMPILE),	2318	const_iv (GL_COMPILE),
		2319	const_iv (GL_PROXY_TEXTURE_1D),
		2320	const_iv (GL_PROXY_TEXTURE_2D),
1954	const_iv (GL_TEXTURE_1D),	2321	const_iv (GL_TEXTURE_1D),
1955	const_iv (GL_TEXTURE_2D),	2322	const_iv (GL_TEXTURE_2D),
1956	const_iv (GL_TEXTURE_ENV),	2323	const_iv (GL_TEXTURE_ENV),
1957	const_iv (GL_TEXTURE_MAG_FILTER),	2324	const_iv (GL_TEXTURE_MAG_FILTER),
1958	const_iv (GL_TEXTURE_MIN_FILTER),	2325	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1988	const_iv (GL_QUAD_STRIP),	2355	const_iv (GL_QUAD_STRIP),
1989	const_iv (GL_TRIANGLES),	2356	const_iv (GL_TRIANGLES),
1990	const_iv (GL_TRIANGLE_STRIP),	2357	const_iv (GL_TRIANGLE_STRIP),
1991	const_iv (GL_TRIANGLE_FAN),	2358	const_iv (GL_TRIANGLE_FAN),
1992	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),
1993	const_iv (GL_FASTEST),	2364	const_iv (GL_FASTEST),
		2365	const_iv (GL_DONT_CARE),
		2366	const_iv (GL_NICEST),
1994	const_iv (GL_V2F),	2367	const_iv (GL_V2F),
1995	const_iv (GL_V3F),	2368	const_iv (GL_V3F),
1996	const_iv (GL_T2F_V3F),	2369	const_iv (GL_T2F_V3F),
1997	const_iv (GL_T2F_N3F_V3F),	2370	const_iv (GL_T2F_N3F_V3F),
1998	# undef const_iv	2371	# undef const_iv
1999	};	2372	};
2000		2373
2001	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; )
2002	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);
2003	}	2379	}
2004		2380
2005	char *	2381	char *
2006	gl_vendor ()	2382	gl_vendor ()
2007	CODE:	2383	CODE:
…		…
2018		2394
2019	char *	2395	char *
2020	gl_extensions ()	2396	gl_extensions ()
2021	CODE:	2397	CODE:
2022	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);
2023	OUTPUT:	2413	OUTPUT:
2024	RETVAL	2414	RETVAL
2025		2415
2026	int glGetError ()	2416	int glGetError ()
2027		2417
…		…
2152		2542
2153	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)
2154		2544
2155	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)
2156		2546
		2547	void glPixelZoom (float x, float y)
		2548
2157	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)
2158		2550
2159	int glGenTexture ()	2551	int glGenTexture ()
2160	CODE:	2552	CODE:
2161	{	2553	RETVAL = gen_texture ();
2162	GLuint name;
2163	glGenTextures (1, &name);
2164	RETVAL = name;
2165	}
2166	OUTPUT:	2554	OUTPUT:
2167	RETVAL	2555	RETVAL
2168		2556
2169	void glDeleteTexture (int name)	2557	void glDeleteTexture (int name)
2170	CODE:	2558	CODE:
2171	{
2172	GLuint name_ = name;
2173	glDeleteTextures (1, &name_);	2559	del_texture (name);
2174	}	2560
2175
2176	int glGenList ()	2561	int glGenList ()
2177	CODE:	2562	CODE:
2178	RETVAL = glGenLists (1);	2563	RETVAL = glGenLists (1);
2179	OUTPUT:	2564	OUTPUT:
2180	RETVAL	2565	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.167 by root, Sat Dec 9 02:21:25 2006 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.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.206 by root, Thu Jul 19 23:29:16 2007 UTC