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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 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)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
8	#endif	14	#endif
9		15
10	#include "EXTERN.h"	16	#include "EXTERN.h"
11	#include "perl.h"	17	#include "perl.h"
12	#include "XSUB.h"	18	#include "XSUB.h"
13		19
14	#ifdef _WIN32	20	#ifdef _WIN32
15	# undef pipe	21	# undef pipe
16	#endif	22	#endif
17		23
		24	#include <assert.h>
18	#include <math.h>	25	#include <math.h>
19	#include <string.h>	26	#include <string.h>
20	#include <stdio.h>	27	#include <stdio.h>
21	#include <stdlib.h>	28	#include <stdlib.h>
22		29
37	# include <sys/types.h>	44	# include <sys/types.h>
38	# include <sys/socket.h>	45	# include <sys/socket.h>
39	# include <netinet/in.h>	46	# include <netinet/in.h>
40	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
41	# include <inttypes.h>	48	# include <inttypes.h>
42	#else
43	typedef unsigned char uint8_t;
44	typedef unsigned short uint16_t;
45	typedef unsigned int uint32_t;
46	typedef signed char int8_t;
47	typedef signed short int16_t;
48	typedef signed int int32_t;
49	#endif	49	#endif
50		50
51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52		52
53	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
54		54
55	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
56	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
61	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
62	#else	62	#else
63	# define PARACHUTE 0	63	# define PARACHUTE 0
64	#endif	64	#endif
65		65
		66	static AV *texture_av;
		67
66	static struct	68	static struct
67	{	69	{
68	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
69	#include "glfunc.h"	71	#include "glfunc.h"
70	#undef GL_FUNC	72	#undef GL_FUNC
71	} gl;	73	} gl;
72		74
		75	static void
73	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74	{	77	{
75	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
76	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
77	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79	else	82	else
80	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
81	}	84	}
82		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
83	#include "texcache.c"	110	#include "texcache.c"
84		111
85	#include "pango-font.c"	112	#include "pango-font.c"
86	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
87	#include "pango-render.c"	114	#include "pango-render.c"
…		…
160		187
161	*w = rect.width;	188	*w = rect.width;
162	*h = rect.height;	189	*h = rect.height;
163	}	190	}
164		191
		192	typedef uint16_t tileid;
165	typedef uint16_t mapface;	193	typedef uint16_t faceid;
166		194
167	typedef struct {	195	typedef struct {
168	GLint name;	196	int name;
169	int w, h;	197	int w, h;
170	float s, t;	198	float s, t;
171	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
172	} maptex;	202	} maptex;
173		203
174	typedef struct {	204	typedef struct {
175	uint32_t player;	205	uint32_t player;
176	mapface face[3];	206	tileid tile[3];
177	uint16_t darkness;	207	uint16_t darkness;
178	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
179	} mapcell;	209	} mapcell;
180		210
181	typedef struct {	211	typedef struct {
182	int32_t c0, c1;	212	int32_t c0, c1;
183	mapcell *col;	213	mapcell *col;
184	} maprow;	214	} maprow;
185		215
186	typedef struct map {	216	typedef struct map {
187	int x, y, w, h;	217	int x, y, w, h;
188	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
189	int faces;	219	int faces; tileid *face2tile; // [faceid]
190	mapface *face;	220	int texs; maptex *tex; // [tileid]
191
192	int texs;
193	maptex *tex;
194		221
195	int32_t rows;	222	int32_t rows;
196	maprow *row;	223	maprow *row;
197	} *CFPlus__Map;	224	} *CFPlus__Map;
198		225
…		…
218	return ptr;	245	return ptr;
219	}	246	}
220		247
221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
223		270
224	static maprow *	271	static maprow *
225	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
226	{	273	{
227	if (0 > y)	274	if (0 > y)
…		…
322	cell->player = 0;	369	cell->player = 0;
323	}	370	}
324	}	371	}
325	}	372	}
326		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
		388	}
		389
327	static void	390	static void
328	music_finished (void)	391	music_finished (void)
329	{	392	{
330	SDL_UserEvent ev;	393	SDL_UserEvent ev;
331		394
…		…
364	n \|= n >> 8;	427	n \|= n >> 8;
365	n \|= n >> 16;	428	n \|= n >> 16;
366		429
367	return n + 1;	430	return n + 1;
368	}	431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
369		436
370	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
371		438
372	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
373		440
…		…
377	static const struct {	444	static const struct {
378	const char *name;	445	const char *name;
379	IV iv;	446	IV iv;
380	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
381	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
382	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
383	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
384	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
385	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
386	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
395	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
396	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
397	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
398	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
399	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
400	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
401	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
402	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
403	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
404	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
459	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
460	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
461	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
462	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
463	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
464	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
465	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
466	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
467	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
468	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
469	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
470	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
471	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
472	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
473	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
474	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
475	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
476	const_iv (KMOD_CTRL),
477	const_iv (KMOD_SHIFT),
478	const_iv (KMOD_ALT),
479	const_iv (KMOD_META)
480	# undef const_iv	556	# undef const_iv
481	};	557	};
482		558
483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
486		571
487	int	572	int
488	in_destruct ()	573	in_destruct ()
489	CODE:	574	CODE:
490	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
561	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
562	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
563	);	648	);
564	if (RETVAL)	649	if (RETVAL)
565	{	650	{
		651	av_clear (texture_av);
		652
566	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
568	# include "glfunc.h"	655	# include "glfunc.h"
569	# undef GL_FUNC	656	# undef GL_FUNC
		657
570	}	658	}
571	OUTPUT:	659	OUTPUT:
572	RETVAL	660	RETVAL
573		661
574	void	662	void
…		…
593	case SDL_KEYDOWN:	681	case SDL_KEYDOWN:
594	case SDL_KEYUP:	682	case SDL_KEYUP:
595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	683	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	684	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	685	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		686	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	687	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599	break;	688	break;
600		689
601	case SDL_ACTIVEEVENT:	690	case SDL_ACTIVEEVENT:
602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	692	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604	break;	693	break;
605		694
606	case SDL_MOUSEMOTION:	695	case SDL_MOUSEMOTION:
		696	{
		697	int state = ev.motion.state;
		698	int x = ev.motion.x;
		699	int y = ev.motion.y;
		700	int xrel = ev.motion.xrel;
		701	int yrel = ev.motion.yrel;
		702
		703	/* do simplistic event compression */
		704	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		705	&& state == ev.motion.state)
		706	{
		707	xrel += ev.motion.xrel;
		708	yrel += ev.motion.yrel;
		709	x = ev.motion.x;
		710	y = ev.motion.y;
		711	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		712	}
		713
607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	714	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	715	hv_store (hv, "state", 5, newSViv (state), 0);
610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	716	hv_store (hv, "x", 1, newSViv (x), 0);
611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	717	hv_store (hv, "y", 1, newSViv (y), 0);
612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	718	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	719	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		720	}
614	break;	721	break;
615		722
616	case SDL_MOUSEBUTTONDOWN:	723	case SDL_MOUSEBUTTONDOWN:
617	case SDL_MOUSEBUTTONUP:	724	case SDL_MOUSEBUTTONUP:
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	725	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
647	Mix_AllocateChannels (int numchans = -1)	754	Mix_AllocateChannels (int numchans = -1)
648		755
649	void	756	void
650	lowdelay (int fd, int val = 1)	757	lowdelay (int fd, int val = 1)
651	CODE:	758	CODE:
652	#ifndef _WIN32
653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	759	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654	#endif
655		760
656	void	761	void
657	win32_proxy_info ()	762	win32_proxy_info ()
658	PPCODE:	763	PPCODE:
659	{	764	{
660	#ifdef _WIN32	765	#ifdef _WIN32
661	INTERNET_PROXY_INFO proxyinfo;
662	char buffer[2048];	766	char buffer[2048];
663	DWORD buflen;	767	DWORD buflen;
664		768
665	EXTEND (SP, 3);	769	EXTEND (SP, 3);
666		770
…		…
795	_exit (1);	899	_exit (1);
796		900
797	void	901	void
798	_exit (int retval = 0)	902	_exit (int retval = 0)
799	CODE:	903	CODE:
		904	#ifdef WIN32
		905	ExitThread (retval); // unclean, please beam me up
		906	#else
800	_exit (retval);	907	_exit (retval);
		908	#endif
		909
		910	void
		911	debug ()
		912	CODE:
		913	{
		914	#if DEBUG
		915	VALGRIND_DO_LEAK_CHECK;
		916	#endif
		917	}
801		918
802	MODULE = CFPlus PACKAGE = CFPlus::Font	919	MODULE = CFPlus PACKAGE = CFPlus::Font
803		920
804	CFPlus::Font	921	CFPlus::Font
805	new_from_file (SV class, char path, int id = 0)	922	new_from_file (SV class, char path, int id = 0)
…		…
1052	xy_to_index (CFPlus::Layout self, int x, int y)	1169	xy_to_index (CFPlus::Layout self, int x, int y)
1053	CODE:	1170	CODE:
1054	{	1171	{
1055	int index, trailing;	1172	int index, trailing;
1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1173	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1057	RETVAL = index;	1174	RETVAL = index + trailing;
1058	}	1175	}
1059	OUTPUT:	1176	OUTPUT:
1060	RETVAL	1177	RETVAL
1061		1178
1062	void	1179	void
…		…
1068		1185
1069	EXTEND (SP, 3);	1186	EXTEND (SP, 3);
1070	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1187	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1188	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1189	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1190	}
		1191
		1192	void
		1193	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1194	PPCODE:
		1195	{
		1196	int line, x;
		1197
		1198	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1199	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1200
		1201	EXTEND (SP, 2);
		1202	PUSHs (sv_2mortal (newSViv (line - 1)));
		1203	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1204	}
		1205
		1206	void
		1207	line_x_to_index (CFPlus::Layout self, int line, int x)
		1208	PPCODE:
		1209	{
		1210	PangoLayoutLine *lp;
		1211	int index, trailing;
		1212
		1213	if (line < 0)
		1214	XSRETURN_EMPTY;
		1215
		1216	if (!(lp = pango_layout_get_line (self->pl, line)))
		1217	XSRETURN_EMPTY; /* do better */
		1218
		1219	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1220
		1221	EXTEND (SP, 2);
		1222	if (GIMME_V == G_SCALAR)
		1223	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1224	else
		1225	{
		1226	PUSHs (sv_2mortal (newSViv (index)));
		1227	PUSHs (sv_2mortal (newSViv (trailing)));
		1228	}
1073	}	1229	}
1074		1230
1075	void	1231	void
1076	render (CFPlus::Layout self, float x, float y, int flags = 0)	1232	render (CFPlus::Layout self, float x, float y, int flags = 0)
1077	PPCODE:	1233	PPCODE:
…		…
1171	}	1327	}
1172		1328
1173	MODULE = CFPlus PACKAGE = CFPlus::Map	1329	MODULE = CFPlus PACKAGE = CFPlus::Map
1174		1330
1175	CFPlus::Map	1331	CFPlus::Map
1176	new (SV *class, int map_width, int map_height)	1332	new (SV *class)
1177	CODE:	1333	CODE:
1178	New (0, RETVAL, 1, struct map);	1334	New (0, RETVAL, 1, struct map);
1179	RETVAL->x = 0;	1335	RETVAL->x = 0;
1180	RETVAL->y = 0;	1336	RETVAL->y = 0;
1181	RETVAL->w = map_width;	1337	RETVAL->w = 0;
1182	RETVAL->h = map_height;	1338	RETVAL->h = 0;
1183	RETVAL->ox = 0;	1339	RETVAL->ox = 0;
1184	RETVAL->oy = 0;	1340	RETVAL->oy = 0;
1185	RETVAL->faces = 8192;	1341	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1186	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1342	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1187	RETVAL->texs = 8192;
1188	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1189	RETVAL->rows = 0;	1343	RETVAL->rows = 0;
1190	RETVAL->row = 0;	1344	RETVAL->row = 0;
1191	OUTPUT:	1345	OUTPUT:
1192	RETVAL	1346	RETVAL
1193		1347
1194	void	1348	void
1195	DESTROY (CFPlus::Map self)	1349	DESTROY (CFPlus::Map self)
1196	CODE:	1350	CODE:
1197	{	1351	{
1198	map_clear (self);	1352	map_clear (self);
1199	Safefree (self->face);	1353	Safefree (self->face2tile);
1200	Safefree (self->tex);	1354	Safefree (self->tex);
1201	Safefree (self);	1355	Safefree (self);
1202	}	1356	}
1203		1357
1204	void	1358	void
		1359	resize (CFPlus::Map self, int map_width, int map_height)
		1360	CODE:
		1361	self->w = map_width;
		1362	self->h = map_height;
		1363
		1364	void
1205	clear (CFPlus::Map self)	1365	clear (CFPlus::Map self)
1206	CODE:	1366	CODE:
1207	map_clear (self);	1367	map_clear (self);
1208		1368
1209	void	1369	void
1210	set_face (CFPlus::Map self, int face, int texid)	1370	set_tileid (CFPlus::Map self, int face, int tile)
1211	CODE:	1371	CODE:
1212	{	1372	{
1213	while (self->faces <= face)	1373	need_facenum (self, face); self->face2tile [face] = tile;
1214	{	1374	need_texid (self, tile);
1215	Append (mapface, self->face, self->faces, self->faces);	1375	}
1216	self->faces *= 2;
1217	}
1218		1376
1219	self->face [face] = texid;	1377	void
		1378	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1379	CODE:
		1380	{
		1381	tileid texid;
		1382	maptex *tex;
		1383
		1384	if (face < 0 \|\| face >= self->faces)
		1385	return;
		1386
		1387	if (smooth < 0 \|\| smooth >= self->faces)
		1388	return;
		1389
		1390	texid = self->face2tile [face];
		1391
		1392	if (!texid)
		1393	return;
		1394
		1395	tex = self->tex + texid;
		1396	tex->smoothtile = self->face2tile [smooth];
		1397	tex->smoothlevel = level;
1220	}	1398	}
1221		1399
1222	void	1400	void
1223	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)	1401	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)
1224	CODE:	1402	CODE:
1225	{	1403	{
1226	while (self->texs <= texid)	1404	need_texid (self, texid);
1227	{
1228	Append (maptex, self->tex, self->texs, self->texs);
1229	self->texs *= 2;
1230	}
1231		1405
1232	{	1406	{
1233	maptex *tex = self->tex + texid;	1407	maptex *tex = self->tex + texid;
1234		1408
1235	tex->name = name;	1409	tex->name = name;
…		…
1279	CODE:	1453	CODE:
1280	{	1454	{
1281	if (dx > 0)	1455	if (dx > 0)
1282	map_blank (self, self->x, self->y, dx, self->h);	1456	map_blank (self, self->x, self->y, dx, self->h);
1283	else if (dx < 0)	1457	else if (dx < 0)
1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1458	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1285		1459
1286	if (dy > 0)	1460	if (dy > 0)
1287	map_blank (self, self->x, self->y, self->w, dy);	1461	map_blank (self, self->x, self->y, self->w, dy);
1288	else if (dy < 0)	1462	else if (dy < 0)
1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1463	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1290		1464
1291	self->ox += dx; self->x += dx;	1465	self->ox += dx; self->x += dx;
1292	self->oy += dy; self->y += dy;	1466	self->oy += dy; self->y += dy;
1293		1467
1294	while (self->y < 0)	1468	while (self->y < 0)
…		…
1346	cell->stat_width = 1;	1520	cell->stat_width = 1;
1347	cell->stat_hp = *data++;	1521	cell->stat_hp = *data++;
1348	}	1522	}
1349	else if (cmd == 6) // monster width	1523	else if (cmd == 6) // monster width
1350	cell->stat_width = *data++ + 1;	1524	cell->stat_width = *data++ + 1;
1351	else if (cmd == 0x47) // monster width	1525	else if (cmd == 0x47)
1352	{	1526	{
1353	if (*data == 4)	1527	if (*data == 4)
1354	; // decode player tag	1528	; // decode player count
1355		1529
1356	data += *data + 1;	1530	data += *data + 1;
1357	}	1531	}
1358	else if (cmd == 8) // cell flags	1532	else if (cmd == 8) // cell flags
1359	cell->flags = *data++;	1533	cell->flags = *data++;
…		…
1368	cell->darkness = *data++ + 1;	1542	cell->darkness = *data++ + 1;
1369	}	1543	}
1370		1544
1371	if (flags & 4)	1545	if (flags & 4)
1372	{	1546	{
1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1547	faceid face = (data [0] << 8) + data [1]; data += 2;
		1548	need_facenum (self, face);
		1549	cell->tile [0] = self->face2tile [face];
1374	}	1550	}
1375		1551
1376	if (flags & 2)	1552	if (flags & 2)
1377	{	1553	{
1378	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1554	faceid face = (data [0] << 8) + data [1]; data += 2;
		1555	need_facenum (self, face);
		1556	cell->tile [1] = self->face2tile [face];
1379	}	1557	}
1380		1558
1381	if (flags & 1)	1559	if (flags & 1)
1382	{	1560	{
1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1561	faceid face = (data [0] << 8) + data [1]; data += 2;
		1562	need_facenum (self, face);
		1563	cell->tile [2] = self->face2tile [face];
1384	}	1564	}
1385	}	1565	}
1386	else	1566	else
1387	cell->darkness = 0;	1567	cell->darkness = 0;
1388	}	1568	}
…		…
1418	{	1598	{
1419	mapcell *cell = row->col + (x - row->c0);	1599	mapcell *cell = row->col + (x - row->c0);
1420		1600
1421	for (z = 0; z <= 0; z++)	1601	for (z = 0; z <= 0; z++)
1422	{	1602	{
1423	mapface face = cell->face [z];
1424
1425	if (face)
1426	{
1427	maptex tex = self->tex [face];	1603	maptex tex = self->tex [cell->tile [z]];
1428	int a0 = 255 - tex.a;	1604	int a0 = 255 - tex.a;
1429	int a1 = tex.a;	1605	int a1 = tex.a;
1430		1606
1431	r = (r * a0 + tex.r * a1) / 255;	1607	r = (r * a0 + tex.r * a1) / 255;
1432	g = (g * a0 + tex.g * a1) / 255;	1608	g = (g * a0 + tex.g * a1) / 255;
1433	b = (b * a0 + tex.b * a1) / 255;	1609	b = (b * a0 + tex.b * a1) / 255;
1434	a = (a * a0 + tex.a * a1) / 255;	1610	a = (a * a0 + tex.a * a1) / 255;
1435	}
1436	}	1611	}
1437	}	1612	}
1438		1613
1439	*map++ = (r )	1614	*map++ = (r )
1440	\| (g << 8)	1615	\| (g << 8)
…		…
1447	}	1622	}
1448	OUTPUT:	1623	OUTPUT:
1449	RETVAL	1624	RETVAL
1450		1625
1451	void	1626	void
1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1627	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1453	CODE:	1628	CODE:
1454	{	1629	{
1455	int vx, vy;	1630	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1631	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1632	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1633	smooth_key skey;
1456	int x, y, z;	1634	int x, y, z;
1457	int last_name;	1635	int last_name;
1458	mapface face;
1459		1636
1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1637	// thats current max. sorry.
1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1638	if (sw > 255) sw = 255;
		1639	if (sh > 255) sh = 255;
1462		1640
1463	/*	1641	// clear key, in case of extra padding
1464	int vx = self->vx = self->w >= sw	1642	memset (&skey, 0, sizeof (skey));
1465	? self->x + (self->w - sw) / 2
1466	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1467
1468	int vy = self->vy = self->h >= sh
1469	? self->y + (self->h - sh) / 2
1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1471	*/
1472		1643
1473	glColor4ub (255, 255, 255, 255);	1644	glColor4ub (255, 255, 255, 255);
1474		1645
1475	glEnable (GL_BLEND);	1646	glEnable (GL_BLEND);
1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1647	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1479		1650
1480	glBegin (GL_QUADS);	1651	glBegin (GL_QUADS);
1481		1652
1482	last_name = 0;	1653	last_name = 0;
1483		1654
		1655	mx += self->x;
		1656	my += self->y;
		1657
		1658	// first pass: determine smooth_max
		1659	// rather ugly, if you ask me
		1660	// could also be stored inside mapcell and updated on change
		1661	memset (smooth_max, 0, sizeof (smooth_max));
		1662
		1663	for (y = 0; y < sh; y++)
		1664	if (0 <= y + my && y + my < self->rows)
		1665	{
		1666	maprow *row = self->row + (y + my);
		1667
		1668	for (x = 0; x < sw; x++)
		1669	if (row->c0 <= x + mx && x + mx < row->c1)
		1670	{
		1671	mapcell *cell = row->col + (x + mx - row->c0);
		1672
		1673	smooth_max[x + 1][y + 1] =
		1674	MAX (self->tex [cell->tile [0]].smoothlevel,
		1675	MAX (self->tex [cell->tile [1]].smoothlevel,
		1676	self->tex [cell->tile [2]].smoothlevel));
		1677	}
		1678	}
		1679
1484	for (z = 0; z < 3; z++)	1680	for (z = 0; z <= 2; z++)
		1681	{
		1682	memset (smooth_level, 0, sizeof (smooth_level));
		1683
1485	for (y = 0; y < sh; y++)	1684	for (y = 0; y < sh; y++)
1486	if (0 <= y + vy && y + vy < self->rows)	1685	if (0 <= y + my && y + my < self->rows)
1487	{	1686	{
1488	maprow *row = self->row + (y + vy);	1687	maprow *row = self->row + (y + my);
1489		1688
1490	for (x = 0; x < sw; x++)	1689	for (x = 0; x < sw; x++)
1491	if (row->c0 <= x + vx && x + vx < row->c1)	1690	if (row->c0 <= x + mx && x + mx < row->c1)
1492	{	1691	{
1493	mapcell *cell = row->col + (x + vx - row->c0);	1692	mapcell *cell = row->col + (x + mx - row->c0);
1494
1495	face = cell->face [z];	1693	tileid tile = cell->tile [z];
		1694
		1695	if (tile)
		1696	{
		1697	maptex tex = self->tex [tile];
		1698	int px = (x + 1) * T - tex.w;
		1699	int py = (y + 1) * T - tex.h;
1496		1700
1497	if (face && face < self->texs)	1701	// suppressing texture state switches here
		1702	// is only moderately effective, but worth the extra effort
		1703	if (last_name != tex.name)
		1704	{
		1705	if (!tex.name)
		1706	tex = self->tex [2]; /* missing, replace by noface */
		1707
		1708	glEnd ();
		1709	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1710	glBegin (GL_QUADS);
		1711	}
		1712
		1713	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1714	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1715	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1716	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1717
		1718	if (cell->flags && z == 2)
		1719	{
		1720	if (cell->flags & 1)
		1721	{
		1722	maptex tex = self->tex [1];
		1723	int px = x * T + T * 2 / 32;
		1724	int py = y * T - T * 6 / 32;
		1725
		1726	glEnd ();
		1727	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1728	glBegin (GL_QUADS);
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1734	}
		1735	}
		1736
		1737	// update smooth hash
		1738	if (tex.smoothtile)
		1739	{
		1740	skey.tile = tex.smoothtile;
		1741	skey.level = tex.smoothlevel;
		1742
		1743	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1744
		1745	// add bits to current tile and all neighbours. skey.x\|y is
		1746	// shifted +1\|+1 so we always stay positive.
		1747
		1748	// bits is ___n cccc CCCC bbbb
		1749	// n do not draw borders&corners
		1750	// c draw these corners, but...
		1751	// C ... not these
		1752	// b draw these borders
		1753
		1754	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1755	// ┃· ·· ·┃ ━━
		1756
		1757	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1758	// ·· ·· ·┏ ┓·
		1759
		1760	// full tile
		1761	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1762
		1763	// borders
		1764	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1765	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1766	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1767	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1768
		1769	// corners
		1770	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1771	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1772	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1773	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1774	}
		1775	}
		1776	}
		1777	}
		1778
		1779	// go through all smoothlevels, lowest to highest, then draw.
		1780	// this is basically counting sort
		1781	{
		1782	int w, b;
		1783
		1784	for (w = 0; w < 256 / 32; ++w)
		1785	{
		1786	uint32_t smask = smooth_level [w];
		1787	if (smask)
		1788	for (b = 0; b < 32; ++b)
		1789	if (smask & (((uint32_t)1) << b))
1498	{	1790	{
1499	maptex tex = self->tex [face];	1791	int level = (w << 5) \| b;
1500	int px = (x + 1) * 32 - tex.w;	1792	HE *he;
1501	int py = (y + 1) * 32 - tex.h;
1502		1793
1503	if (last_name != tex.name)	1794	hv_iterinit (smooth);
		1795	while ((he = hv_iternext (smooth)))
1504	{	1796	{
		1797	smooth_key skey = (smooth_key )HeKEY (he);
		1798	IV bits = SvIVX (HeVAL (he));
		1799
		1800	if (!(bits & 0x1000)
		1801	&& skey->level == level
		1802	&& level > smooth_max [skey->x][skey->y])
		1803	{
		1804	maptex tex = self->tex [skey->tile];
		1805	int px = (((int)skey->x) - 1) * T;
		1806	int py = (((int)skey->y) - 1) * T;
		1807	int border = bits & 15;
		1808	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1809	float dx = tex.s * .0625f; // 16 images/row
		1810	float dy = tex.t * .5f ; // 2 images/column
		1811
		1812	// this time naively avoiding texture state changes
		1813	// save gobs of state changes.
		1814	if (last_name != tex.name)
		1815	{
		1816	if (!tex.name)
		1817	continue; // smoothing not yet available
		1818
1505	glEnd ();	1819	glEnd ();
1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1820	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1507	glBegin (GL_QUADS);	1821	glBegin (GL_QUADS);
		1822	}
		1823
		1824	if (border)
		1825	{
		1826	float ox = border * dx;
		1827
		1828	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1829	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1830	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1831	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1832	}
		1833
		1834	if (corner)
		1835	{
		1836	float ox = corner * dx;
		1837
		1838	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1839	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1840	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1841	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1842	}
1508	}	1843	}
1509
1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1514	}
1515
1516	if (cell->flags && z == 2)
1517	{
1518	if (cell->flags & 1)
1519	{
1520	maptex tex = self->tex [1];
1521	int px = (x + 1) * 32 - tex.w + 2;
1522	int py = (y + 1) * 32 - tex.h - 6;
1523
1524	glEnd ();
1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1526	glBegin (GL_QUADS);
1527
1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1532	}	1844	}
1533	}	1845	}
1534	}
1535	}	1846	}
		1847	}
		1848
		1849	hv_clear (smooth);
		1850	}
1536		1851
1537	glEnd ();	1852	glEnd ();
1538		1853
1539	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1540	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
1541		1856
1542	// top layer: overlays such as the health bar	1857	// top layer: overlays such as the health bar
1543	for (y = 0; y < sh; y++)	1858	for (y = 0; y < sh; y++)
1544	if (0 <= y + vy && y + vy < self->rows)	1859	if (0 <= y + my && y + my < self->rows)
1545	{	1860	{
1546	maprow *row = self->row + (y + vy);	1861	maprow *row = self->row + (y + my);
1547		1862
1548	for (x = 0; x < sw; x++)	1863	for (x = 0; x < sw; x++)
1549	if (row->c0 <= x + vx && x + vx < row->c1)	1864	if (row->c0 <= x + mx && x + mx < row->c1)
1550	{	1865	{
1551	mapcell *cell = row->col + (x + vx - row->c0);	1866	mapcell *cell = row->col + (x + mx - row->c0);
1552		1867
1553	int px = x * 32;	1868	int px = x * T;
1554	int py = y * 32;	1869	int py = y * T;
1555		1870
1556	if (cell->stat_hp)	1871	if (cell->stat_hp)
1557	{	1872	{
1558	int width = cell->stat_width * 32;	1873	int width = cell->stat_width * T;
1559	int thick = sh / 28 + 1 + cell->stat_width;	1874	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1560		1875
1561	glColor3ub (0, 0, 0);	1876	glColor3ub (0, 0, 0);
1562	glRectf (px + 1, py - thick - 2,	1877	glRectf (px + 1, py - thick - 2,
1563	px + width - 1, py);	1878	px + width - 1, py);
1564		1879
…		…
1630	glDisable (GL_BLEND);	1945	glDisable (GL_BLEND);
1631	glDisable (GL_TEXTURE_2D);	1946	glDisable (GL_TEXTURE_2D);
1632	}	1947	}
1633		1948
1634	void	1949	void
1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1950	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1636	PPCODE:	1951	PPCODE:
1637	{	1952	{
1638	int vx, vy;
1639	int x, y;	1953	int x, y;
1640	int sw4 = (sw + 3) & ~3;	1954	int sw4 = (sw + 3) & ~3;
1641	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1955	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1642	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1956	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1643		1957
1644	memset (darkness, 255, sw4 * sh);	1958	memset (darkness, 255, sw4 * sh);
1645	SvPOK_only (darkness_sv);	1959	SvPOK_only (darkness_sv);
1646	SvCUR_set (darkness_sv, sw4 * sh);	1960	SvCUR_set (darkness_sv, sw4 * sh);
1647		1961
1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1962	mx += self->x;
1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1963	my += self->y;
1650		1964
1651	for (y = 0; y < sh; y++)	1965	for (y = 0; y < sh; y++)
1652	if (0 <= y + vy && y + vy < self->rows)	1966	if (0 <= y + my && y + my < self->rows)
1653	{	1967	{
1654	maprow *row = self->row + (y + vy);	1968	maprow *row = self->row + (y + my);
1655		1969
1656	for (x = 0; x < sw; x++)	1970	for (x = 0; x < sw; x++)
1657	if (row->c0 <= x + vx && x + vx < row->c1)	1971	if (row->c0 <= x + mx && x + mx < row->c1)
1658	{	1972	{
1659	mapcell *cell = row->col + (x + vx - row->c0);	1973	mapcell *cell = row->col + (x + mx - row->c0);
1660		1974
1661	darkness[y * sw4 + x] = cell->darkness	1975	darkness[y * sw4 + x] = cell->darkness
1662	? 255 - (cell->darkness - 1)	1976	? 255 - (cell->darkness - 1)
1663	: 255 - FOW_DARKNESS;	1977	: 255 - FOW_DARKNESS;
1664	}	1978	}
…		…
1704	if (row && row->c0 <= x && x < row->c1)	2018	if (row && row->c0 <= x && x < row->c1)
1705	{	2019	{
1706	mapcell *cell = row->col + (x - row->c0);	2020	mapcell *cell = row->col + (x - row->c0);
1707	uint8_t flags = 0;	2021	uint8_t flags = 0;
1708		2022
1709	if (cell->face [0]) flags \|= 1;	2023	if (cell->tile [0]) flags \|= 1;
1710	if (cell->face [1]) flags \|= 2;	2024	if (cell->tile [1]) flags \|= 2;
1711	if (cell->face [2]) flags \|= 4;	2025	if (cell->tile [2]) flags \|= 4;
1712		2026
1713	*data++ = flags;	2027	*data++ = flags;
1714		2028
1715	if (flags & 1)	2029	if (flags & 1)
1716	{	2030	{
		2031	tileid tile = cell->tile [0];
1717	*data++ = cell->face [0] >> 8;	2032	*data++ = tile >> 8;
1718	*data++ = cell->face [0];	2033	*data++ = tile;
1719	}	2034	}
1720		2035
1721	if (flags & 2)	2036	if (flags & 2)
1722	{	2037	{
		2038	tileid tile = cell->tile [1];
1723	*data++ = cell->face [1] >> 8;	2039	*data++ = tile >> 8;
1724	*data++ = cell->face [1];	2040	*data++ = tile;
1725	}	2041	}
1726		2042
1727	if (flags & 4)	2043	if (flags & 4)
1728	{	2044	{
		2045	tileid tile = cell->tile [2];
1729	*data++ = cell->face [2] >> 8;	2046	*data++ = tile >> 8;
1730	*data++ = cell->face [2];	2047	*data++ = tile;
1731	}	2048	}
1732	}	2049	}
1733	else	2050	else
1734	*data++ = 0;	2051	*data++ = 0;
1735	}	2052	}
…		…
1775	{	2092	{
1776	uint8_t flags = *data++;	2093	uint8_t flags = *data++;
1777		2094
1778	if (flags)	2095	if (flags)
1779	{	2096	{
1780	mapface face[3] = { 0, 0, 0 };
1781
1782	mapcell *cell = row_get_cell (row, x);	2097	mapcell *cell = row_get_cell (row, x);
		2098	tileid tile[3] = { 0, 0, 0 };
1783		2099
1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2100	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2101	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2102	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1787		2103
1788	if (cell->darkness == 0)	2104	if (cell->darkness == 0)
1789	{	2105	{
1790	cell->darkness = 0;	2106	cell->darkness = 0;
1791		2107
1792	for (z = 0; z <= 2; z++)	2108	for (z = 0; z <= 2; z++)
1793	{	2109	{
1794	cell->face[z] = face[z];	2110	tileid t = tile [z];
1795		2111
1796	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2112	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2113	{
1797	XPUSHs (sv_2mortal (newSViv (face[z])));	2114	XPUSHs (sv_2mortal (newSViv (t)));
		2115	need_texid (self, t);
		2116	}
		2117
		2118	cell->tile [z] = t;
1798	}	2119	}
1799	}	2120	}
1800	}	2121	}
1801	}	2122	}
1802	}	2123	}
…		…
1837	CODE:	2158	CODE:
1838	RETVAL = Mix_VolumeMusic (volume);	2159	RETVAL = Mix_VolumeMusic (volume);
1839	OUTPUT:	2160	OUTPUT:
1840	RETVAL	2161	RETVAL
1841		2162
		2163	int
		2164	fade_out (int ms)
		2165	CODE:
		2166	RETVAL = Mix_FadeOutMusic (ms);
		2167	OUTPUT:
		2168	RETVAL
		2169
1842	CFPlus::MixMusic	2170	CFPlus::MixMusic
1843	new_from_file (SV class, char path)	2171	new_from_file (SV class, char path)
1844	CODE:	2172	CODE:
1845	RETVAL = Mix_LoadMUS (path);	2173	RETVAL = Mix_LoadMUS (path);
1846	OUTPUT:	2174	OUTPUT:
…		…
1853		2181
1854	int	2182	int
1855	play (CFPlus::MixMusic self, int loops = -1)	2183	play (CFPlus::MixMusic self, int loops = -1)
1856	CODE:	2184	CODE:
1857	RETVAL = Mix_PlayMusic (self, loops);	2185	RETVAL = Mix_PlayMusic (self, loops);
		2186	OUTPUT:
		2187	RETVAL
		2188
		2189	int
		2190	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2191	CODE:
		2192	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1858	OUTPUT:	2193	OUTPUT:
1859	RETVAL	2194	RETVAL
1860		2195
1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2196	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1862		2197
…		…
1951	# undef const_iv	2286	# undef const_iv
1952	};	2287	};
1953		2288
1954	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2289	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1955	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2290	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2291
		2292	texture_av = newAV ();
		2293	AvREAL_off (texture_av);
1956	}	2294	}
1957		2295
1958	char *	2296	char *
1959	gl_vendor ()	2297	gl_vendor ()
1960	CODE:	2298	CODE:
…		…
2109		2447
2110	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2448	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2111		2449
2112	int glGenTexture ()	2450	int glGenTexture ()
2113	CODE:	2451	CODE:
2114	{	2452	RETVAL = gen_texture ();
2115	GLuint name;
2116	glGenTextures (1, &name);
2117	RETVAL = name;
2118	}
2119	OUTPUT:	2453	OUTPUT:
2120	RETVAL	2454	RETVAL
2121		2455
2122	void glDeleteTexture (int name)	2456	void glDeleteTexture (int name)
2123	CODE:	2457	CODE:
2124	{
2125	GLuint name_ = name;
2126	glDeleteTextures (1, &name_);	2458	del_texture (name);
2127	}	2459
2128
2129	int glGenList ()	2460	int glGenList ()
2130	CODE:	2461	CODE:
2131	RETVAL = glGenLists (1);	2462	RETVAL = glGenLists (1);
2132	OUTPUT:	2463	OUTPUT:
2133	RETVAL	2464	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC vs. Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC