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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 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
…		…
576		664
577	char *	665	char *
578	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
579		667
580	void	668	void
581	SDL_PollEvent ()	669	poll_events ()
582	PPCODE:	670	PPCODE:
583	{	671	{
584	SDL_Event ev;	672	SDL_Event ev;
585		673
586	while (SDL_PollEvent (&ev))	674	SDL_PumpEvents ();
		675	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587	{	676	{
588	HV *hv = newHV ();	677	HV *hv = newHV ();
589	hv_store (hv, "type", 4, newSViv (ev.type), 0);	678	hv_store (hv, "type", 4, newSViv (ev.type), 0);
590		679
591	switch (ev.type)	680	switch (ev.type)
…		…
593	case SDL_KEYDOWN:	682	case SDL_KEYDOWN:
594	case SDL_KEYUP:	683	case SDL_KEYUP:
595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	684	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	685	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	686	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		687	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	688	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599	break;	689	break;
600		690
601	case SDL_ACTIVEEVENT:	691	case SDL_ACTIVEEVENT:
602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	692	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	693	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604	break;	694	break;
605		695
606	case SDL_MOUSEMOTION:	696	case SDL_MOUSEMOTION:
		697	{
		698	int state = ev.motion.state;
		699	int x = ev.motion.x;
		700	int y = ev.motion.y;
		701	int xrel = ev.motion.xrel;
		702	int yrel = ev.motion.yrel;
		703
		704	/* do simplistic event compression */
		705	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		706	&& state == ev.motion.state)
		707	{
		708	xrel += ev.motion.xrel;
		709	yrel += ev.motion.yrel;
		710	x = ev.motion.x;
		711	y = ev.motion.y;
		712	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		713	}
		714
607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	715	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	716	hv_store (hv, "state", 5, newSViv (state), 0);
610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	717	hv_store (hv, "x", 1, newSViv (x), 0);
611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	718	hv_store (hv, "y", 1, newSViv (y), 0);
612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	719	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	720	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		721	}
614	break;	722	break;
615		723
616	case SDL_MOUSEBUTTONDOWN:	724	case SDL_MOUSEBUTTONDOWN:
617	case SDL_MOUSEBUTTONUP:	725	case SDL_MOUSEBUTTONUP:
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	726	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
647	Mix_AllocateChannels (int numchans = -1)	755	Mix_AllocateChannels (int numchans = -1)
648		756
649	void	757	void
650	lowdelay (int fd, int val = 1)	758	lowdelay (int fd, int val = 1)
651	CODE:	759	CODE:
652	#ifndef _WIN32
653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	760	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654	#endif
655		761
656	void	762	void
657	win32_proxy_info ()	763	win32_proxy_info ()
658	PPCODE:	764	PPCODE:
659	{	765	{
…		…
800	ExitThread (retval); // unclean, please beam me up	906	ExitThread (retval); // unclean, please beam me up
801	#else	907	#else
802	_exit (retval);	908	_exit (retval);
803	#endif	909	#endif
804		910
		911	void
		912	debug ()
		913	CODE:
		914	{
		915	#if DEBUG
		916	VALGRIND_DO_LEAK_CHECK;
		917	#endif
		918	}
		919
805	MODULE = CFPlus PACKAGE = CFPlus::Font	920	MODULE = CFPlus PACKAGE = CFPlus::Font
806		921
807	CFPlus::Font	922	CFPlus::Font
808	new_from_file (SV class, char path, int id = 0)	923	new_from_file (SV class, char path, int id = 0)
809	CODE:	924	CODE:
…		…
1055	xy_to_index (CFPlus::Layout self, int x, int y)	1170	xy_to_index (CFPlus::Layout self, int x, int y)
1056	CODE:	1171	CODE:
1057	{	1172	{
1058	int index, trailing;	1173	int index, trailing;
1059	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1174	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1060	RETVAL = index;	1175	RETVAL = index + trailing;
1061	}	1176	}
1062	OUTPUT:	1177	OUTPUT:
1063	RETVAL	1178	RETVAL
1064		1179
1065	void	1180	void
…		…
1071		1186
1072	EXTEND (SP, 3);	1187	EXTEND (SP, 3);
1073	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1188	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1189	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1190	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1191	}
		1192
		1193	void
		1194	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1195	PPCODE:
		1196	{
		1197	int line, x;
		1198
		1199	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1200	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1201
		1202	EXTEND (SP, 2);
		1203	PUSHs (sv_2mortal (newSViv (line - 1)));
		1204	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1205	}
		1206
		1207	void
		1208	line_x_to_index (CFPlus::Layout self, int line, int x)
		1209	PPCODE:
		1210	{
		1211	PangoLayoutLine *lp;
		1212	int index, trailing;
		1213
		1214	if (line < 0)
		1215	XSRETURN_EMPTY;
		1216
		1217	if (!(lp = pango_layout_get_line (self->pl, line)))
		1218	XSRETURN_EMPTY; /* do better */
		1219
		1220	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1221
		1222	EXTEND (SP, 2);
		1223	if (GIMME_V == G_SCALAR)
		1224	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1225	else
		1226	{
		1227	PUSHs (sv_2mortal (newSViv (index)));
		1228	PUSHs (sv_2mortal (newSViv (trailing)));
		1229	}
1076	}	1230	}
1077		1231
1078	void	1232	void
1079	render (CFPlus::Layout self, float x, float y, int flags = 0)	1233	render (CFPlus::Layout self, float x, float y, int flags = 0)
1080	PPCODE:	1234	PPCODE:
…		…
1174	}	1328	}
1175		1329
1176	MODULE = CFPlus PACKAGE = CFPlus::Map	1330	MODULE = CFPlus PACKAGE = CFPlus::Map
1177		1331
1178	CFPlus::Map	1332	CFPlus::Map
1179	new (SV *class, int map_width, int map_height)	1333	new (SV *class)
1180	CODE:	1334	CODE:
1181	New (0, RETVAL, 1, struct map);	1335	New (0, RETVAL, 1, struct map);
1182	RETVAL->x = 0;	1336	RETVAL->x = 0;
1183	RETVAL->y = 0;	1337	RETVAL->y = 0;
1184	RETVAL->w = map_width;	1338	RETVAL->w = 0;
1185	RETVAL->h = map_height;	1339	RETVAL->h = 0;
1186	RETVAL->ox = 0;	1340	RETVAL->ox = 0;
1187	RETVAL->oy = 0;	1341	RETVAL->oy = 0;
1188	RETVAL->faces = 8192;	1342	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1189	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1343	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1190	RETVAL->texs = 8192;
1191	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1192	RETVAL->rows = 0;	1344	RETVAL->rows = 0;
1193	RETVAL->row = 0;	1345	RETVAL->row = 0;
1194	OUTPUT:	1346	OUTPUT:
1195	RETVAL	1347	RETVAL
1196		1348
1197	void	1349	void
1198	DESTROY (CFPlus::Map self)	1350	DESTROY (CFPlus::Map self)
1199	CODE:	1351	CODE:
1200	{	1352	{
1201	map_clear (self);	1353	map_clear (self);
1202	Safefree (self->face);	1354	Safefree (self->face2tile);
1203	Safefree (self->tex);	1355	Safefree (self->tex);
1204	Safefree (self);	1356	Safefree (self);
1205	}	1357	}
1206		1358
1207	void	1359	void
		1360	resize (CFPlus::Map self, int map_width, int map_height)
		1361	CODE:
		1362	self->w = map_width;
		1363	self->h = map_height;
		1364
		1365	void
1208	clear (CFPlus::Map self)	1366	clear (CFPlus::Map self)
1209	CODE:	1367	CODE:
1210	map_clear (self);	1368	map_clear (self);
1211		1369
1212	void	1370	void
1213	set_face (CFPlus::Map self, int face, int texid)	1371	set_tileid (CFPlus::Map self, int face, int tile)
1214	CODE:	1372	CODE:
1215	{	1373	{
1216	while (self->faces <= face)	1374	need_facenum (self, face); self->face2tile [face] = tile;
1217	{	1375	need_texid (self, tile);
1218	Append (mapface, self->face, self->faces, self->faces);	1376	}
1219	self->faces *= 2;
1220	}
1221		1377
1222	self->face [face] = texid;	1378	void
		1379	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1380	CODE:
		1381	{
		1382	tileid texid;
		1383	maptex *tex;
		1384
		1385	if (face < 0 \|\| face >= self->faces)
		1386	return;
		1387
		1388	if (smooth < 0 \|\| smooth >= self->faces)
		1389	return;
		1390
		1391	texid = self->face2tile [face];
		1392
		1393	if (!texid)
		1394	return;
		1395
		1396	tex = self->tex + texid;
		1397	tex->smoothtile = self->face2tile [smooth];
		1398	tex->smoothlevel = level;
1223	}	1399	}
1224		1400
1225	void	1401	void
1226	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)	1402	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)
1227	CODE:	1403	CODE:
1228	{	1404	{
1229	while (self->texs <= texid)	1405	need_texid (self, texid);
1230	{
1231	Append (maptex, self->tex, self->texs, self->texs);
1232	self->texs *= 2;
1233	}
1234		1406
1235	{	1407	{
1236	maptex *tex = self->tex + texid;	1408	maptex *tex = self->tex + texid;
1237		1409
1238	tex->name = name;	1410	tex->name = name;
…		…
1282	CODE:	1454	CODE:
1283	{	1455	{
1284	if (dx > 0)	1456	if (dx > 0)
1285	map_blank (self, self->x, self->y, dx, self->h);	1457	map_blank (self, self->x, self->y, dx, self->h);
1286	else if (dx < 0)	1458	else if (dx < 0)
1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1459	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1288		1460
1289	if (dy > 0)	1461	if (dy > 0)
1290	map_blank (self, self->x, self->y, self->w, dy);	1462	map_blank (self, self->x, self->y, self->w, dy);
1291	else if (dy < 0)	1463	else if (dy < 0)
1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1464	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1293		1465
1294	self->ox += dx; self->x += dx;	1466	self->ox += dx; self->x += dx;
1295	self->oy += dy; self->y += dy;	1467	self->oy += dy; self->y += dy;
1296		1468
1297	while (self->y < 0)	1469	while (self->y < 0)
…		…
1349	cell->stat_width = 1;	1521	cell->stat_width = 1;
1350	cell->stat_hp = *data++;	1522	cell->stat_hp = *data++;
1351	}	1523	}
1352	else if (cmd == 6) // monster width	1524	else if (cmd == 6) // monster width
1353	cell->stat_width = *data++ + 1;	1525	cell->stat_width = *data++ + 1;
1354	else if (cmd == 0x47) // monster width	1526	else if (cmd == 0x47)
1355	{	1527	{
1356	if (*data == 4)	1528	if (*data == 4)
1357	; // decode player tag	1529	; // decode player count
1358		1530
1359	data += *data + 1;	1531	data += *data + 1;
1360	}	1532	}
1361	else if (cmd == 8) // cell flags	1533	else if (cmd == 8) // cell flags
1362	cell->flags = *data++;	1534	cell->flags = *data++;
…		…
1371	cell->darkness = *data++ + 1;	1543	cell->darkness = *data++ + 1;
1372	}	1544	}
1373		1545
1374	if (flags & 4)	1546	if (flags & 4)
1375	{	1547	{
1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1548	faceid face = (data [0] << 8) + data [1]; data += 2;
		1549	need_facenum (self, face);
		1550	cell->tile [0] = self->face2tile [face];
1377	}	1551	}
1378		1552
1379	if (flags & 2)	1553	if (flags & 2)
1380	{	1554	{
1381	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1555	faceid face = (data [0] << 8) + data [1]; data += 2;
		1556	need_facenum (self, face);
		1557	cell->tile [1] = self->face2tile [face];
1382	}	1558	}
1383		1559
1384	if (flags & 1)	1560	if (flags & 1)
1385	{	1561	{
1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1562	faceid face = (data [0] << 8) + data [1]; data += 2;
		1563	need_facenum (self, face);
		1564	cell->tile [2] = self->face2tile [face];
1387	}	1565	}
1388	}	1566	}
1389	else	1567	else
1390	cell->darkness = 0;	1568	cell->darkness = 0;
1391	}	1569	}
…		…
1421	{	1599	{
1422	mapcell *cell = row->col + (x - row->c0);	1600	mapcell *cell = row->col + (x - row->c0);
1423		1601
1424	for (z = 0; z <= 0; z++)	1602	for (z = 0; z <= 0; z++)
1425	{	1603	{
1426	mapface face = cell->face [z];
1427
1428	if (face)
1429	{
1430	maptex tex = self->tex [face];	1604	maptex tex = self->tex [cell->tile [z]];
1431	int a0 = 255 - tex.a;	1605	int a0 = 255 - tex.a;
1432	int a1 = tex.a;	1606	int a1 = tex.a;
1433		1607
1434	r = (r * a0 + tex.r * a1) / 255;	1608	r = (r * a0 + tex.r * a1) / 255;
1435	g = (g * a0 + tex.g * a1) / 255;	1609	g = (g * a0 + tex.g * a1) / 255;
1436	b = (b * a0 + tex.b * a1) / 255;	1610	b = (b * a0 + tex.b * a1) / 255;
1437	a = (a * a0 + tex.a * a1) / 255;	1611	a = (a * a0 + tex.a * a1) / 255;
1438	}
1439	}	1612	}
1440	}	1613	}
1441		1614
1442	*map++ = (r )	1615	*map++ = (r )
1443	\| (g << 8)	1616	\| (g << 8)
…		…
1450	}	1623	}
1451	OUTPUT:	1624	OUTPUT:
1452	RETVAL	1625	RETVAL
1453		1626
1454	void	1627	void
1455	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1628	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1456	CODE:	1629	CODE:
1457	{	1630	{
1458	int vx, vy;	1631	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1632	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1633	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1634	smooth_key skey;
1459	int x, y, z;	1635	int x, y, z;
1460	int last_name;	1636	int last_name;
1461	mapface face;
1462		1637
1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1638	// thats current max. sorry.
1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1639	if (sw > 255) sw = 255;
		1640	if (sh > 255) sh = 255;
1465		1641
1466	/*	1642	// clear key, in case of extra padding
1467	int vx = self->vx = self->w >= sw	1643	memset (&skey, 0, sizeof (skey));
1468	? self->x + (self->w - sw) / 2
1469	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1470
1471	int vy = self->vy = self->h >= sh
1472	? self->y + (self->h - sh) / 2
1473	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1474	*/
1475		1644
1476	glColor4ub (255, 255, 255, 255);	1645	glColor4ub (255, 255, 255, 255);
1477		1646
1478	glEnable (GL_BLEND);	1647	glEnable (GL_BLEND);
1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1648	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1482		1651
1483	glBegin (GL_QUADS);	1652	glBegin (GL_QUADS);
1484		1653
1485	last_name = 0;	1654	last_name = 0;
1486		1655
		1656	mx += self->x;
		1657	my += self->y;
		1658
		1659	// first pass: determine smooth_max
		1660	// rather ugly, if you ask me
		1661	// could also be stored inside mapcell and updated on change
		1662	memset (smooth_max, 0, sizeof (smooth_max));
		1663
		1664	for (y = 0; y < sh; y++)
		1665	if (0 <= y + my && y + my < self->rows)
		1666	{
		1667	maprow *row = self->row + (y + my);
		1668
		1669	for (x = 0; x < sw; x++)
		1670	if (row->c0 <= x + mx && x + mx < row->c1)
		1671	{
		1672	mapcell *cell = row->col + (x + mx - row->c0);
		1673
		1674	smooth_max[x + 1][y + 1] =
		1675	MAX (self->tex [cell->tile [0]].smoothlevel,
		1676	MAX (self->tex [cell->tile [1]].smoothlevel,
		1677	self->tex [cell->tile [2]].smoothlevel));
		1678	}
		1679	}
		1680
1487	for (z = 0; z < 3; z++)	1681	for (z = 0; z <= 2; z++)
		1682	{
		1683	memset (smooth_level, 0, sizeof (smooth_level));
		1684
1488	for (y = 0; y < sh; y++)	1685	for (y = 0; y < sh; y++)
1489	if (0 <= y + vy && y + vy < self->rows)	1686	if (0 <= y + my && y + my < self->rows)
1490	{	1687	{
1491	maprow *row = self->row + (y + vy);	1688	maprow *row = self->row + (y + my);
1492		1689
1493	for (x = 0; x < sw; x++)	1690	for (x = 0; x < sw; x++)
1494	if (row->c0 <= x + vx && x + vx < row->c1)	1691	if (row->c0 <= x + mx && x + mx < row->c1)
1495	{	1692	{
1496	mapcell *cell = row->col + (x + vx - row->c0);	1693	mapcell *cell = row->col + (x + mx - row->c0);
1497
1498	face = cell->face [z];	1694	tileid tile = cell->tile [z];
		1695
		1696	if (tile)
		1697	{
		1698	maptex tex = self->tex [tile];
		1699	int px = (x + 1) * T - tex.w;
		1700	int py = (y + 1) * T - tex.h;
1499		1701
1500	if (face && face < self->texs)	1702	// suppressing texture state switches here
		1703	// is only moderately effective, but worth the extra effort
		1704	if (last_name != tex.name)
		1705	{
		1706	if (!tex.name)
		1707	tex = self->tex [2]; /* missing, replace by noface */
		1708
		1709	glEnd ();
		1710	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1711	glBegin (GL_QUADS);
		1712	}
		1713
		1714	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1715	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1716	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1717	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1718
		1719	if (cell->flags && z == 2)
		1720	{
		1721	if (cell->flags & 1)
		1722	{
		1723	maptex tex = self->tex [1];
		1724	int px = x * T + T * 2 / 32;
		1725	int py = y * T - T * 6 / 32;
		1726
		1727	glEnd ();
		1728	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1729	glBegin (GL_QUADS);
		1730
		1731	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1732	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1733	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1734	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1735	}
		1736	}
		1737
		1738	// update smooth hash
		1739	if (tex.smoothtile)
		1740	{
		1741	skey.tile = tex.smoothtile;
		1742	skey.level = tex.smoothlevel;
		1743
		1744	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1745
		1746	// add bits to current tile and all neighbours. skey.x\|y is
		1747	// shifted +1\|+1 so we always stay positive.
		1748
		1749	// bits is ___n cccc CCCC bbbb
		1750	// n do not draw borders&corners
		1751	// c draw these corners, but...
		1752	// C ... not these
		1753	// b draw these borders
		1754
		1755	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1756	// ┃· ·· ·┃ ━━
		1757
		1758	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1759	// ·· ·· ·┏ ┓·
		1760
		1761	// full tile
		1762	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1763
		1764	// borders
		1765	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1766	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1767	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1768	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1769
		1770	// corners
		1771	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1772	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1773	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1774	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1775	}
		1776	}
		1777	}
		1778	}
		1779
		1780	// go through all smoothlevels, lowest to highest, then draw.
		1781	// this is basically counting sort
		1782	{
		1783	int w, b;
		1784
		1785	for (w = 0; w < 256 / 32; ++w)
		1786	{
		1787	uint32_t smask = smooth_level [w];
		1788	if (smask)
		1789	for (b = 0; b < 32; ++b)
		1790	if (smask & (((uint32_t)1) << b))
1501	{	1791	{
1502	maptex tex = self->tex [face];	1792	int level = (w << 5) \| b;
1503	int px = (x + 1) * 32 - tex.w;	1793	HE *he;
1504	int py = (y + 1) * 32 - tex.h;
1505		1794
1506	if (last_name != tex.name)	1795	hv_iterinit (smooth);
		1796	while ((he = hv_iternext (smooth)))
1507	{	1797	{
		1798	smooth_key skey = (smooth_key )HeKEY (he);
		1799	IV bits = SvIVX (HeVAL (he));
		1800
		1801	if (!(bits & 0x1000)
		1802	&& skey->level == level
		1803	&& level > smooth_max [skey->x][skey->y])
		1804	{
		1805	maptex tex = self->tex [skey->tile];
		1806	int px = (((int)skey->x) - 1) * T;
		1807	int py = (((int)skey->y) - 1) * T;
		1808	int border = bits & 15;
		1809	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1810	float dx = tex.s * .0625f; // 16 images/row
		1811	float dy = tex.t * .5f ; // 2 images/column
		1812
		1813	// this time naively avoiding texture state changes
		1814	// save gobs of state changes.
		1815	if (last_name != tex.name)
		1816	{
		1817	if (!tex.name)
		1818	continue; // smoothing not yet available
		1819
1508	glEnd ();	1820	glEnd ();
1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1821	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1510	glBegin (GL_QUADS);	1822	glBegin (GL_QUADS);
		1823	}
		1824
		1825	if (border)
		1826	{
		1827	float ox = border * dx;
		1828
		1829	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1830	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1831	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1832	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1833	}
		1834
		1835	if (corner)
		1836	{
		1837	float ox = corner * dx;
		1838
		1839	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1840	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1841	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1842	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1843	}
1511	}	1844	}
1512
1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1515	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1517	}
1518
1519	if (cell->flags && z == 2)
1520	{
1521	if (cell->flags & 1)
1522	{
1523	maptex tex = self->tex [1];
1524	int px = (x + 1) * 32 - tex.w + 2;
1525	int py = (y + 1) * 32 - tex.h - 6;
1526
1527	glEnd ();
1528	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1529	glBegin (GL_QUADS);
1530
1531	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1532	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1533	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1534	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1535	}	1845	}
1536	}	1846	}
1537	}
1538	}	1847	}
		1848	}
		1849
		1850	hv_clear (smooth);
		1851	}
1539		1852
1540	glEnd ();	1853	glEnd ();
1541		1854
1542	glDisable (GL_TEXTURE_2D);	1855	glDisable (GL_TEXTURE_2D);
1543	glDisable (GL_BLEND);	1856	glDisable (GL_BLEND);
1544		1857
1545	// top layer: overlays such as the health bar	1858	// top layer: overlays such as the health bar
1546	for (y = 0; y < sh; y++)	1859	for (y = 0; y < sh; y++)
1547	if (0 <= y + vy && y + vy < self->rows)	1860	if (0 <= y + my && y + my < self->rows)
1548	{	1861	{
1549	maprow *row = self->row + (y + vy);	1862	maprow *row = self->row + (y + my);
1550		1863
1551	for (x = 0; x < sw; x++)	1864	for (x = 0; x < sw; x++)
1552	if (row->c0 <= x + vx && x + vx < row->c1)	1865	if (row->c0 <= x + mx && x + mx < row->c1)
1553	{	1866	{
1554	mapcell *cell = row->col + (x + vx - row->c0);	1867	mapcell *cell = row->col + (x + mx - row->c0);
1555		1868
1556	int px = x * 32;	1869	int px = x * T;
1557	int py = y * 32;	1870	int py = y * T;
1558		1871
1559	if (cell->stat_hp)	1872	if (cell->stat_hp)
1560	{	1873	{
1561	int width = cell->stat_width * 32;	1874	int width = cell->stat_width * T;
1562	int thick = sh / 28 + 1 + cell->stat_width;	1875	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1563		1876
1564	glColor3ub (0, 0, 0);	1877	glColor3ub (0, 0, 0);
1565	glRectf (px + 1, py - thick - 2,	1878	glRectf (px + 1, py - thick - 2,
1566	px + width - 1, py);	1879	px + width - 1, py);
1567		1880
…		…
1633	glDisable (GL_BLEND);	1946	glDisable (GL_BLEND);
1634	glDisable (GL_TEXTURE_2D);	1947	glDisable (GL_TEXTURE_2D);
1635	}	1948	}
1636		1949
1637	void	1950	void
1638	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1951	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1639	PPCODE:	1952	PPCODE:
1640	{	1953	{
1641	int vx, vy;
1642	int x, y;	1954	int x, y;
1643	int sw4 = (sw + 3) & ~3;	1955	int sw4 = (sw + 3) & ~3;
1644	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1956	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1645	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1957	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1646		1958
1647	memset (darkness, 255, sw4 * sh);	1959	memset (darkness, 255, sw4 * sh);
1648	SvPOK_only (darkness_sv);	1960	SvPOK_only (darkness_sv);
1649	SvCUR_set (darkness_sv, sw4 * sh);	1961	SvCUR_set (darkness_sv, sw4 * sh);
1650		1962
1651	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1963	mx += self->x;
1652	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1964	my += self->y;
1653		1965
1654	for (y = 0; y < sh; y++)	1966	for (y = 0; y < sh; y++)
1655	if (0 <= y + vy && y + vy < self->rows)	1967	if (0 <= y + my && y + my < self->rows)
1656	{	1968	{
1657	maprow *row = self->row + (y + vy);	1969	maprow *row = self->row + (y + my);
1658		1970
1659	for (x = 0; x < sw; x++)	1971	for (x = 0; x < sw; x++)
1660	if (row->c0 <= x + vx && x + vx < row->c1)	1972	if (row->c0 <= x + mx && x + mx < row->c1)
1661	{	1973	{
1662	mapcell *cell = row->col + (x + vx - row->c0);	1974	mapcell *cell = row->col + (x + mx - row->c0);
1663		1975
1664	darkness[y * sw4 + x] = cell->darkness	1976	darkness[y * sw4 + x] = cell->darkness
1665	? 255 - (cell->darkness - 1)	1977	? 255 - (cell->darkness - 1)
1666	: 255 - FOW_DARKNESS;	1978	: 255 - FOW_DARKNESS;
1667	}	1979	}
…		…
1707	if (row && row->c0 <= x && x < row->c1)	2019	if (row && row->c0 <= x && x < row->c1)
1708	{	2020	{
1709	mapcell *cell = row->col + (x - row->c0);	2021	mapcell *cell = row->col + (x - row->c0);
1710	uint8_t flags = 0;	2022	uint8_t flags = 0;
1711		2023
1712	if (cell->face [0]) flags \|= 1;	2024	if (cell->tile [0]) flags \|= 1;
1713	if (cell->face [1]) flags \|= 2;	2025	if (cell->tile [1]) flags \|= 2;
1714	if (cell->face [2]) flags \|= 4;	2026	if (cell->tile [2]) flags \|= 4;
1715		2027
1716	*data++ = flags;	2028	*data++ = flags;
1717		2029
1718	if (flags & 1)	2030	if (flags & 1)
1719	{	2031	{
		2032	tileid tile = cell->tile [0];
1720	*data++ = cell->face [0] >> 8;	2033	*data++ = tile >> 8;
1721	*data++ = cell->face [0];	2034	*data++ = tile;
1722	}	2035	}
1723		2036
1724	if (flags & 2)	2037	if (flags & 2)
1725	{	2038	{
		2039	tileid tile = cell->tile [1];
1726	*data++ = cell->face [1] >> 8;	2040	*data++ = tile >> 8;
1727	*data++ = cell->face [1];	2041	*data++ = tile;
1728	}	2042	}
1729		2043
1730	if (flags & 4)	2044	if (flags & 4)
1731	{	2045	{
		2046	tileid tile = cell->tile [2];
1732	*data++ = cell->face [2] >> 8;	2047	*data++ = tile >> 8;
1733	*data++ = cell->face [2];	2048	*data++ = tile;
1734	}	2049	}
1735	}	2050	}
1736	else	2051	else
1737	*data++ = 0;	2052	*data++ = 0;
1738	}	2053	}
…		…
1778	{	2093	{
1779	uint8_t flags = *data++;	2094	uint8_t flags = *data++;
1780		2095
1781	if (flags)	2096	if (flags)
1782	{	2097	{
1783	mapface face[3] = { 0, 0, 0 };
1784
1785	mapcell *cell = row_get_cell (row, x);	2098	mapcell *cell = row_get_cell (row, x);
		2099	tileid tile[3] = { 0, 0, 0 };
1786		2100
1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2101	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2102	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2103	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1790		2104
1791	if (cell->darkness == 0)	2105	if (cell->darkness == 0)
1792	{	2106	{
1793	cell->darkness = 0;	2107	cell->darkness = 0;
1794		2108
1795	for (z = 0; z <= 2; z++)	2109	for (z = 0; z <= 2; z++)
1796	{	2110	{
1797	cell->face[z] = face[z];	2111	tileid t = tile [z];
1798		2112
1799	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2113	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2114	{
1800	XPUSHs (sv_2mortal (newSViv (face[z])));	2115	XPUSHs (sv_2mortal (newSViv (t)));
		2116	need_texid (self, t);
		2117	}
		2118
		2119	cell->tile [z] = t;
1801	}	2120	}
1802	}	2121	}
1803	}	2122	}
1804	}	2123	}
1805	}	2124	}
…		…
1840	CODE:	2159	CODE:
1841	RETVAL = Mix_VolumeMusic (volume);	2160	RETVAL = Mix_VolumeMusic (volume);
1842	OUTPUT:	2161	OUTPUT:
1843	RETVAL	2162	RETVAL
1844		2163
		2164	int
		2165	fade_out (int ms)
		2166	CODE:
		2167	RETVAL = Mix_FadeOutMusic (ms);
		2168	OUTPUT:
		2169	RETVAL
		2170
1845	CFPlus::MixMusic	2171	CFPlus::MixMusic
1846	new_from_file (SV class, char path)	2172	new_from_file (SV class, char path)
1847	CODE:	2173	CODE:
1848	RETVAL = Mix_LoadMUS (path);	2174	RETVAL = Mix_LoadMUS (path);
1849	OUTPUT:	2175	OUTPUT:
…		…
1856		2182
1857	int	2183	int
1858	play (CFPlus::MixMusic self, int loops = -1)	2184	play (CFPlus::MixMusic self, int loops = -1)
1859	CODE:	2185	CODE:
1860	RETVAL = Mix_PlayMusic (self, loops);	2186	RETVAL = Mix_PlayMusic (self, loops);
		2187	OUTPUT:
		2188	RETVAL
		2189
		2190	int
		2191	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2192	CODE:
		2193	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1861	OUTPUT:	2194	OUTPUT:
1862	RETVAL	2195	RETVAL
1863		2196
1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2197	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1865		2198
…		…
1954	# undef const_iv	2287	# undef const_iv
1955	};	2288	};
1956		2289
1957	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2290	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1958	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2291	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2292
		2293	texture_av = newAV ();
		2294	AvREAL_off (texture_av);
1959	}	2295	}
1960		2296
1961	char *	2297	char *
1962	gl_vendor ()	2298	gl_vendor ()
1963	CODE:	2299	CODE:
…		…
2112		2448
2113	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2449	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2114		2450
2115	int glGenTexture ()	2451	int glGenTexture ()
2116	CODE:	2452	CODE:
2117	{	2453	RETVAL = gen_texture ();
2118	GLuint name;
2119	glGenTextures (1, &name);
2120	RETVAL = name;
2121	}
2122	OUTPUT:	2454	OUTPUT:
2123	RETVAL	2455	RETVAL
2124		2456
2125	void glDeleteTexture (int name)	2457	void glDeleteTexture (int name)
2126	CODE:	2458	CODE:
2127	{
2128	GLuint name_ = name;
2129	glDeleteTextures (1, &name_);	2459	del_texture (name);
2130	}	2460
2131
2132	int glGenList ()	2461	int glGenList ()
2133	CODE:	2462	CODE:
2134	RETVAL = glGenLists (1);	2463	RETVAL = glGenLists (1);
2135	OUTPUT:	2464	OUTPUT:
2136	RETVAL	2465	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC vs. Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC