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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.156 by root, Thu Sep 21 14:47:51 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	# 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>
7	#endif	14	#endif
8		15
9	#include "EXTERN.h"	16	#include "EXTERN.h"
10	#include "perl.h"	17	#include "perl.h"
11	#include "XSUB.h"	18	#include "XSUB.h"
12		19
13	#ifdef _WIN32	20	#ifdef _WIN32
14	# undef pipe	21	# undef pipe
15	#endif	22	#endif
16		23
		24	#include <assert.h>
17	#include <math.h>	25	#include <math.h>
18	#include <string.h>	26	#include <string.h>
19	#include <stdio.h>	27	#include <stdio.h>
20	#include <stdlib.h>	28	#include <stdlib.h>
21		29
36	# include <sys/types.h>	44	# include <sys/types.h>
37	# include <sys/socket.h>	45	# include <sys/socket.h>
38	# include <netinet/in.h>	46	# include <netinet/in.h>
39	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
40	# include <inttypes.h>	48	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	49	#endif
49		50
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		52
52	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
53		54
54	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
60	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
61	#else	62	#else
62	# define PARACHUTE 0	63	# define PARACHUTE 0
63	#endif	64	#endif
64		65
		66	static AV *texture_av;
		67
65	static struct	68	static struct
66	{	69	{
67	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
68	#include "glfunc.h"	71	#include "glfunc.h"
69	#undef GL_FUNC	72	#undef GL_FUNC
70	} gl;	73	} gl;
71		74
		75	static void
72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73	{	77	{
74	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
75	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
76	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78	else	82	else
79	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
80	}	84	}
81		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
82	#include "texcache.c"	110	#include "texcache.c"
83		111
84	#include "pango-font.c"	112	#include "pango-font.c"
85	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
86	#include "pango-render.c"	114	#include "pango-render.c"
…		…
159		187
160	*w = rect.width;	188	*w = rect.width;
161	*h = rect.height;	189	*h = rect.height;
162	}	190	}
163		191
		192	typedef uint16_t tileid;
164	typedef uint16_t mapface;	193	typedef uint16_t faceid;
165		194
166	typedef struct {	195	typedef struct {
167	GLint name;	196	int name;
168	int w, h;	197	int w, h;
169	float s, t;	198	float s, t;
170	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
171	} maptex;	202	} maptex;
172		203
173	typedef struct {	204	typedef struct {
174	uint32_t player;	205	uint32_t player;
175	mapface face[3];	206	tileid tile[3];
176	uint16_t darkness;	207	uint16_t darkness;
177	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
178	} mapcell;	209	} mapcell;
179		210
180	typedef struct {	211	typedef struct {
181	int32_t c0, c1;	212	int32_t c0, c1;
182	mapcell *col;	213	mapcell *col;
183	} maprow;	214	} maprow;
184		215
185	typedef struct map {	216	typedef struct map {
186	int x, y, w, h;	217	int x, y, w, h;
187	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
188	int faces;	219	int faces; tileid *face2tile; // [faceid]
189	mapface *face;	220	int texs; maptex *tex; // [tileid]
190
191	int texs;
192	maptex *tex;
193		221
194	int32_t rows;	222	int32_t rows;
195	maprow *row;	223	maprow *row;
196	} *CFPlus__Map;	224	} *CFPlus__Map;
197		225
…		…
217	return ptr;	245	return ptr;
218	}	246	}
219		247
220	#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))
221	#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	}
222		270
223	static maprow *	271	static maprow *
224	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
225	{	273	{
226	if (0 > y)	274	if (0 > y)
…		…
321	cell->player = 0;	369	cell->player = 0;
322	}	370	}
323	}	371	}
324	}	372	}
325		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
326	static void	390	static void
327	music_finished (void)	391	music_finished (void)
328	{	392	{
329	SDL_UserEvent ev;	393	SDL_UserEvent ev;
330		394
…		…
363	n \|= n >> 8;	427	n \|= n >> 8;
364	n \|= n >> 16;	428	n \|= n >> 16;
365		429
366	return n + 1;	430	return n + 1;
367	}	431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
368		436
369	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
370		438
371	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
372		440
…		…
376	static const struct {	444	static const struct {
377	const char *name;	445	const char *name;
378	IV iv;	446	IV iv;
379	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
380	# 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
381	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
382	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
383	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
384	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
385	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
394	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
395	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
396	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
397	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
398	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
399	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
400	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
401	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
402	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
403	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
458	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
459	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
460	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
461	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
462	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
463	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
464	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
465	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
466	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
467	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
468	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
469	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
470	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
471	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
472	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
473	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
474	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
475	const_iv (KMOD_CTRL),
476	const_iv (KMOD_SHIFT),
477	const_iv (KMOD_ALT),
478	const_iv (KMOD_META)
479	# undef const_iv	556	# undef const_iv
480	};	557	};
481		558
482	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; )
483	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);
484	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
485		571
486	int	572	int
487	in_destruct ()	573	in_destruct ()
488	CODE:	574	CODE:
489	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
560	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
562	);	648	);
563	if (RETVAL)	649	if (RETVAL)
564	{	650	{
		651	av_clear (texture_av);
		652
565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566	# 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);
567	# include "glfunc.h"	655	# include "glfunc.h"
568	# undef GL_FUNC	656	# undef GL_FUNC
		657
569	}	658	}
570	OUTPUT:	659	OUTPUT:
571	RETVAL	660	RETVAL
572		661
573	void	662	void
…		…
592	case SDL_KEYDOWN:	681	case SDL_KEYDOWN:
593	case SDL_KEYUP:	682	case SDL_KEYUP:
594	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	683	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	684	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596	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 */
597	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	687	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598	break;	688	break;
599		689
600	case SDL_ACTIVEEVENT:	690	case SDL_ACTIVEEVENT:
601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	692	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603	break;	693	break;
604		694
605	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
606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	714	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	715	hv_store (hv, "state", 5, newSViv (state), 0);
609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	716	hv_store (hv, "x", 1, newSViv (x), 0);
610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	717	hv_store (hv, "y", 1, newSViv (y), 0);
611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	718	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	719	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		720	}
613	break;	721	break;
614		722
615	case SDL_MOUSEBUTTONDOWN:	723	case SDL_MOUSEBUTTONDOWN:
616	case SDL_MOUSEBUTTONUP:	724	case SDL_MOUSEBUTTONUP:
617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	725	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
646	Mix_AllocateChannels (int numchans = -1)	754	Mix_AllocateChannels (int numchans = -1)
647		755
648	void	756	void
649	lowdelay (int fd, int val = 1)	757	lowdelay (int fd, int val = 1)
650	CODE:	758	CODE:
		759	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		760
		761	void
		762	win32_proxy_info ()
		763	PPCODE:
		764	{
651	#ifndef _WIN32	765	#ifdef _WIN32
652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	766	char buffer[2048];
		767	DWORD buflen;
		768
		769	EXTEND (SP, 3);
		770
		771	buflen = sizeof (buffer);
		772	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		773	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		774	{
		775	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		776
		777	buflen = sizeof (buffer);
		778	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		779	{
		780	PUSHs (newSVpv (buffer, 0));
		781
		782	buflen = sizeof (buffer);
		783	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		784	PUSHs (newSVpv (buffer, 0));
		785	}
		786	}
653	#endif	787	#endif
		788	}
654		789
655	void	790	void
656	add_font (char *file)	791	add_font (char *file)
657	CODE:	792	CODE:
658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	793	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	897	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
763	#endif	898	#endif
764	_exit (1);	899	_exit (1);
765		900
766	void	901	void
767	_exit (int retval)	902	_exit (int retval = 0)
768	CODE:	903	CODE:
		904	#ifdef WIN32
		905	ExitThread (retval); // unclean, please beam me up
		906	#else
769	_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	}
770		918
771	MODULE = CFPlus PACKAGE = CFPlus::Font	919	MODULE = CFPlus PACKAGE = CFPlus::Font
772		920
773	CFPlus::Font	921	CFPlus::Font
774	new_from_file (SV class, char path, int id = 0)	922	new_from_file (SV class, char path, int id = 0)
…		…
1021	xy_to_index (CFPlus::Layout self, int x, int y)	1169	xy_to_index (CFPlus::Layout self, int x, int y)
1022	CODE:	1170	CODE:
1023	{	1171	{
1024	int index, trailing;	1172	int index, trailing;
1025	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);
1026	RETVAL = index;	1174	RETVAL = index + trailing;
1027	}	1175	}
1028	OUTPUT:	1176	OUTPUT:
1029	RETVAL	1177	RETVAL
1030		1178
1031	void	1179	void
…		…
1037		1185
1038	EXTEND (SP, 3);	1186	EXTEND (SP, 3);
1039	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1187	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1188	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041	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	}
1042	}	1229	}
1043		1230
1044	void	1231	void
1045	render (CFPlus::Layout self, float x, float y, int flags = 0)	1232	render (CFPlus::Layout self, float x, float y, int flags = 0)
1046	PPCODE:	1233	PPCODE:
…		…
1140	}	1327	}
1141		1328
1142	MODULE = CFPlus PACKAGE = CFPlus::Map	1329	MODULE = CFPlus PACKAGE = CFPlus::Map
1143		1330
1144	CFPlus::Map	1331	CFPlus::Map
1145	new (SV *class, int map_width, int map_height)	1332	new (SV *class)
1146	CODE:	1333	CODE:
1147	New (0, RETVAL, 1, struct map);	1334	New (0, RETVAL, 1, struct map);
1148	RETVAL->x = 0;	1335	RETVAL->x = 0;
1149	RETVAL->y = 0;	1336	RETVAL->y = 0;
1150	RETVAL->w = map_width;	1337	RETVAL->w = 0;
1151	RETVAL->h = map_height;	1338	RETVAL->h = 0;
1152	RETVAL->ox = 0;	1339	RETVAL->ox = 0;
1153	RETVAL->oy = 0;	1340	RETVAL->oy = 0;
1154	RETVAL->faces = 8192;	1341	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1342	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156	RETVAL->texs = 8192;
1157	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158	RETVAL->rows = 0;	1343	RETVAL->rows = 0;
1159	RETVAL->row = 0;	1344	RETVAL->row = 0;
1160	OUTPUT:	1345	OUTPUT:
1161	RETVAL	1346	RETVAL
1162		1347
1163	void	1348	void
1164	DESTROY (CFPlus::Map self)	1349	DESTROY (CFPlus::Map self)
1165	CODE:	1350	CODE:
1166	{	1351	{
1167	map_clear (self);	1352	map_clear (self);
1168	Safefree (self->face);	1353	Safefree (self->face2tile);
1169	Safefree (self->tex);	1354	Safefree (self->tex);
1170	Safefree (self);	1355	Safefree (self);
1171	}	1356	}
1172		1357
1173	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
1174	clear (CFPlus::Map self)	1365	clear (CFPlus::Map self)
1175	CODE:	1366	CODE:
1176	map_clear (self);	1367	map_clear (self);
1177		1368
1178	void	1369	void
1179	set_face (CFPlus::Map self, int face, int texid)	1370	set_tileid (CFPlus::Map self, int face, int tile)
1180	CODE:	1371	CODE:
1181	{	1372	{
1182	while (self->faces <= face)	1373	need_facenum (self, face); self->face2tile [face] = tile;
1183	{	1374	need_texid (self, tile);
1184	Append (mapface, self->face, self->faces, self->faces);	1375	}
1185	self->faces *= 2;
1186	}
1187		1376
1188	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;
1189	}	1398	}
1190		1399
1191	void	1400	void
1192	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)
1193	CODE:	1402	CODE:
1194	{	1403	{
1195	while (self->texs <= texid)	1404	need_texid (self, texid);
1196	{
1197	Append (maptex, self->tex, self->texs, self->texs);
1198	self->texs *= 2;
1199	}
1200		1405
1201	{	1406	{
1202	maptex *tex = self->tex + texid;	1407	maptex *tex = self->tex + texid;
1203		1408
1204	tex->name = name;	1409	tex->name = name;
…		…
1248	CODE:	1453	CODE:
1249	{	1454	{
1250	if (dx > 0)	1455	if (dx > 0)
1251	map_blank (self, self->x, self->y, dx, self->h);	1456	map_blank (self, self->x, self->y, dx, self->h);
1252	else if (dx < 0)	1457	else if (dx < 0)
1253	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);
1254		1459
1255	if (dy > 0)	1460	if (dy > 0)
1256	map_blank (self, self->x, self->y, self->w, dy);	1461	map_blank (self, self->x, self->y, self->w, dy);
1257	else if (dy < 0)	1462	else if (dy < 0)
1258	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);
1259		1464
1260	self->ox += dx; self->x += dx;	1465	self->ox += dx; self->x += dx;
1261	self->oy += dy; self->y += dy;	1466	self->oy += dy; self->y += dy;
1262		1467
1263	while (self->y < 0)	1468	while (self->y < 0)
…		…
1315	cell->stat_width = 1;	1520	cell->stat_width = 1;
1316	cell->stat_hp = *data++;	1521	cell->stat_hp = *data++;
1317	}	1522	}
1318	else if (cmd == 6) // monster width	1523	else if (cmd == 6) // monster width
1319	cell->stat_width = *data++ + 1;	1524	cell->stat_width = *data++ + 1;
1320	else if (cmd == 0x47) // monster width	1525	else if (cmd == 0x47)
1321	{	1526	{
1322	if (*data == 4)	1527	if (*data == 4)
1323	; // decode player tag	1528	; // decode player count
1324		1529
1325	data += *data + 1;	1530	data += *data + 1;
1326	}	1531	}
1327	else if (cmd == 8) // cell flags	1532	else if (cmd == 8) // cell flags
1328	cell->flags = *data++;	1533	cell->flags = *data++;
…		…
1337	cell->darkness = *data++ + 1;	1542	cell->darkness = *data++ + 1;
1338	}	1543	}
1339		1544
1340	if (flags & 4)	1545	if (flags & 4)
1341	{	1546	{
1342	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];
1343	}	1550	}
1344		1551
1345	if (flags & 2)	1552	if (flags & 2)
1346	{	1553	{
1347	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];
1348	}	1557	}
1349		1558
1350	if (flags & 1)	1559	if (flags & 1)
1351	{	1560	{
1352	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];
1353	}	1564	}
1354	}	1565	}
1355	else	1566	else
1356	cell->darkness = 0;	1567	cell->darkness = 0;
1357	}	1568	}
…		…
1387	{	1598	{
1388	mapcell *cell = row->col + (x - row->c0);	1599	mapcell *cell = row->col + (x - row->c0);
1389		1600
1390	for (z = 0; z <= 0; z++)	1601	for (z = 0; z <= 0; z++)
1391	{	1602	{
1392	mapface face = cell->face [z];
1393
1394	if (face)
1395	{
1396	maptex tex = self->tex [face];	1603	maptex tex = self->tex [cell->tile [z]];
1397	int a0 = 255 - tex.a;	1604	int a0 = 255 - tex.a;
1398	int a1 = tex.a;	1605	int a1 = tex.a;
1399		1606
1400	r = (r * a0 + tex.r * a1) / 255;	1607	r = (r * a0 + tex.r * a1) / 255;
1401	g = (g * a0 + tex.g * a1) / 255;	1608	g = (g * a0 + tex.g * a1) / 255;
1402	b = (b * a0 + tex.b * a1) / 255;	1609	b = (b * a0 + tex.b * a1) / 255;
1403	a = (a * a0 + tex.a * a1) / 255;	1610	a = (a * a0 + tex.a * a1) / 255;
1404	}
1405	}	1611	}
1406	}	1612	}
1407		1613
1408	*map++ = (r )	1614	*map++ = (r )
1409	\| (g << 8)	1615	\| (g << 8)
…		…
1416	}	1622	}
1417	OUTPUT:	1623	OUTPUT:
1418	RETVAL	1624	RETVAL
1419		1625
1420	void	1626	void
1421	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)
1422	CODE:	1628	CODE:
1423	{	1629	{
1424	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;
1425	int x, y, z;	1634	int x, y, z;
1426	int last_name;	1635	int last_name;
1427	mapface face;
1428		1636
1429	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1637	// thats current max. sorry.
1430	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1638	if (sw > 255) sw = 255;
		1639	if (sh > 255) sh = 255;
1431		1640
1432	/*	1641	// clear key, in case of extra padding
1433	int vx = self->vx = self->w >= sw	1642	memset (&skey, 0, sizeof (skey));
1434	? self->x + (self->w - sw) / 2
1435	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1436
1437	int vy = self->vy = self->h >= sh
1438	? self->y + (self->h - sh) / 2
1439	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1440	*/
1441		1643
1442	glColor4ub (255, 255, 255, 255);	1644	glColor4ub (255, 255, 255, 255);
1443		1645
1444	glEnable (GL_BLEND);	1646	glEnable (GL_BLEND);
1445	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1647	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1448		1650
1449	glBegin (GL_QUADS);	1651	glBegin (GL_QUADS);
1450		1652
1451	last_name = 0;	1653	last_name = 0;
1452		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
1453	for (z = 0; z < 3; z++)	1680	for (z = 0; z <= 2; z++)
		1681	{
		1682	memset (smooth_level, 0, sizeof (smooth_level));
		1683
1454	for (y = 0; y < sh; y++)	1684	for (y = 0; y < sh; y++)
1455	if (0 <= y + vy && y + vy < self->rows)	1685	if (0 <= y + my && y + my < self->rows)
1456	{	1686	{
1457	maprow *row = self->row + (y + vy);	1687	maprow *row = self->row + (y + my);
1458		1688
1459	for (x = 0; x < sw; x++)	1689	for (x = 0; x < sw; x++)
1460	if (row->c0 <= x + vx && x + vx < row->c1)	1690	if (row->c0 <= x + mx && x + mx < row->c1)
1461	{	1691	{
1462	mapcell *cell = row->col + (x + vx - row->c0);	1692	mapcell *cell = row->col + (x + mx - row->c0);
1463
1464	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;
1465		1700
1466	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))
1467	{	1790	{
1468	maptex tex = self->tex [face];	1791	int level = (w << 5) \| b;
1469	int px = (x + 1) * 32 - tex.w;	1792	HE *he;
1470	int py = (y + 1) * 32 - tex.h;
1471		1793
1472	if (last_name != tex.name)	1794	hv_iterinit (smooth);
		1795	while ((he = hv_iternext (smooth)))
1473	{	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
1474	glEnd ();	1819	glEnd ();
1475	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1820	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1476	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	}
1477	}	1843	}
1478
1479	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1480	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1481	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1482	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1483	}
1484
1485	if (cell->flags && z == 2)
1486	{
1487	if (cell->flags & 1)
1488	{
1489	maptex tex = self->tex [1];
1490	int px = (x + 1) * 32 - tex.w + 2;
1491	int py = (y + 1) * 32 - tex.h - 6;
1492
1493	glEnd ();
1494	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1495	glBegin (GL_QUADS);
1496
1497	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1498	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1499	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1500	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1501	}	1844	}
1502	}	1845	}
1503	}
1504	}	1846	}
		1847	}
		1848
		1849	hv_clear (smooth);
		1850	}
1505		1851
1506	glEnd ();	1852	glEnd ();
1507		1853
1508	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1509	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
1510		1856
1511	// top layer: overlays such as the health bar	1857	// top layer: overlays such as the health bar
1512	for (y = 0; y < sh; y++)	1858	for (y = 0; y < sh; y++)
1513	if (0 <= y + vy && y + vy < self->rows)	1859	if (0 <= y + my && y + my < self->rows)
1514	{	1860	{
1515	maprow *row = self->row + (y + vy);	1861	maprow *row = self->row + (y + my);
1516		1862
1517	for (x = 0; x < sw; x++)	1863	for (x = 0; x < sw; x++)
1518	if (row->c0 <= x + vx && x + vx < row->c1)	1864	if (row->c0 <= x + mx && x + mx < row->c1)
1519	{	1865	{
1520	mapcell *cell = row->col + (x + vx - row->c0);	1866	mapcell *cell = row->col + (x + mx - row->c0);
1521		1867
1522	int px = x * 32;	1868	int px = x * T;
1523	int py = y * 32;	1869	int py = y * T;
1524		1870
1525	if (cell->stat_hp)	1871	if (cell->stat_hp)
1526	{	1872	{
1527	int width = cell->stat_width * 32;	1873	int width = cell->stat_width * T;
1528	int thick = sh / 28 + 1 + cell->stat_width;	1874	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1529		1875
1530	glColor3ub (0, 0, 0);	1876	glColor3ub (0, 0, 0);
1531	glRectf (px + 1, py - thick - 2,	1877	glRectf (px + 1, py - thick - 2,
1532	px + width - 1, py);	1878	px + width - 1, py);
1533		1879
…		…
1599	glDisable (GL_BLEND);	1945	glDisable (GL_BLEND);
1600	glDisable (GL_TEXTURE_2D);	1946	glDisable (GL_TEXTURE_2D);
1601	}	1947	}
1602		1948
1603	void	1949	void
1604	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)
1605	PPCODE:	1951	PPCODE:
1606	{	1952	{
1607	int vx, vy;
1608	int x, y;	1953	int x, y;
1609	int sw4 = (sw + 3) & ~3;	1954	int sw4 = (sw + 3) & ~3;
1610	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1955	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1611	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1956	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1612		1957
1613	memset (darkness, 255, sw4 * sh);	1958	memset (darkness, 255, sw4 * sh);
1614	SvPOK_only (darkness_sv);	1959	SvPOK_only (darkness_sv);
1615	SvCUR_set (darkness_sv, sw4 * sh);	1960	SvCUR_set (darkness_sv, sw4 * sh);
1616		1961
1617	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1962	mx += self->x;
1618	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1963	my += self->y;
1619		1964
1620	for (y = 0; y < sh; y++)	1965	for (y = 0; y < sh; y++)
1621	if (0 <= y + vy && y + vy < self->rows)	1966	if (0 <= y + my && y + my < self->rows)
1622	{	1967	{
1623	maprow *row = self->row + (y + vy);	1968	maprow *row = self->row + (y + my);
1624		1969
1625	for (x = 0; x < sw; x++)	1970	for (x = 0; x < sw; x++)
1626	if (row->c0 <= x + vx && x + vx < row->c1)	1971	if (row->c0 <= x + mx && x + mx < row->c1)
1627	{	1972	{
1628	mapcell *cell = row->col + (x + vx - row->c0);	1973	mapcell *cell = row->col + (x + mx - row->c0);
1629		1974
1630	darkness[y * sw4 + x] = cell->darkness	1975	darkness[y * sw4 + x] = cell->darkness
1631	? 255 - (cell->darkness - 1)	1976	? 255 - (cell->darkness - 1)
1632	: 255 - FOW_DARKNESS;	1977	: 255 - FOW_DARKNESS;
1633	}	1978	}
…		…
1673	if (row && row->c0 <= x && x < row->c1)	2018	if (row && row->c0 <= x && x < row->c1)
1674	{	2019	{
1675	mapcell *cell = row->col + (x - row->c0);	2020	mapcell *cell = row->col + (x - row->c0);
1676	uint8_t flags = 0;	2021	uint8_t flags = 0;
1677		2022
1678	if (cell->face [0]) flags \|= 1;	2023	if (cell->tile [0]) flags \|= 1;
1679	if (cell->face [1]) flags \|= 2;	2024	if (cell->tile [1]) flags \|= 2;
1680	if (cell->face [2]) flags \|= 4;	2025	if (cell->tile [2]) flags \|= 4;
1681		2026
1682	*data++ = flags;	2027	*data++ = flags;
1683		2028
1684	if (flags & 1)	2029	if (flags & 1)
1685	{	2030	{
		2031	tileid tile = cell->tile [0];
1686	*data++ = cell->face [0] >> 8;	2032	*data++ = tile >> 8;
1687	*data++ = cell->face [0];	2033	*data++ = tile;
1688	}	2034	}
1689		2035
1690	if (flags & 2)	2036	if (flags & 2)
1691	{	2037	{
		2038	tileid tile = cell->tile [1];
1692	*data++ = cell->face [1] >> 8;	2039	*data++ = tile >> 8;
1693	*data++ = cell->face [1];	2040	*data++ = tile;
1694	}	2041	}
1695		2042
1696	if (flags & 4)	2043	if (flags & 4)
1697	{	2044	{
		2045	tileid tile = cell->tile [2];
1698	*data++ = cell->face [2] >> 8;	2046	*data++ = tile >> 8;
1699	*data++ = cell->face [2];	2047	*data++ = tile;
1700	}	2048	}
1701	}	2049	}
1702	else	2050	else
1703	*data++ = 0;	2051	*data++ = 0;
1704	}	2052	}
…		…
1744	{	2092	{
1745	uint8_t flags = *data++;	2093	uint8_t flags = *data++;
1746		2094
1747	if (flags)	2095	if (flags)
1748	{	2096	{
1749	mapface face[3] = { 0, 0, 0 };
1750
1751	mapcell *cell = row_get_cell (row, x);	2097	mapcell *cell = row_get_cell (row, x);
		2098	tileid tile[3] = { 0, 0, 0 };
1752		2099
1753	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2100	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1754	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2101	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1755	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2102	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1756		2103
1757	if (cell->darkness == 0)	2104	if (cell->darkness == 0)
1758	{	2105	{
1759	cell->darkness = 0;	2106	cell->darkness = 0;
1760		2107
1761	for (z = 0; z <= 2; z++)	2108	for (z = 0; z <= 2; z++)
1762	{	2109	{
1763	cell->face[z] = face[z];	2110	tileid t = tile [z];
1764		2111
1765	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2112	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2113	{
1766	XPUSHs (sv_2mortal (newSViv (face[z])));	2114	XPUSHs (sv_2mortal (newSViv (t)));
		2115	need_texid (self, t);
		2116	}
		2117
		2118	cell->tile [z] = t;
1767	}	2119	}
1768	}	2120	}
1769	}	2121	}
1770	}	2122	}
1771	}	2123	}
…		…
1806	CODE:	2158	CODE:
1807	RETVAL = Mix_VolumeMusic (volume);	2159	RETVAL = Mix_VolumeMusic (volume);
1808	OUTPUT:	2160	OUTPUT:
1809	RETVAL	2161	RETVAL
1810		2162
		2163	int
		2164	fade_out (int ms)
		2165	CODE:
		2166	RETVAL = Mix_FadeOutMusic (ms);
		2167	OUTPUT:
		2168	RETVAL
		2169
1811	CFPlus::MixMusic	2170	CFPlus::MixMusic
1812	new_from_file (SV class, char path)	2171	new_from_file (SV class, char path)
1813	CODE:	2172	CODE:
1814	RETVAL = Mix_LoadMUS (path);	2173	RETVAL = Mix_LoadMUS (path);
1815	OUTPUT:	2174	OUTPUT:
…		…
1822		2181
1823	int	2182	int
1824	play (CFPlus::MixMusic self, int loops = -1)	2183	play (CFPlus::MixMusic self, int loops = -1)
1825	CODE:	2184	CODE:
1826	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);
1827	OUTPUT:	2193	OUTPUT:
1828	RETVAL	2194	RETVAL
1829		2195
1830	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2196	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1831		2197
…		…
1920	# undef const_iv	2286	# undef const_iv
1921	};	2287	};
1922		2288
1923	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; )
1924	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);
1925	}	2294	}
1926		2295
1927	char *	2296	char *
1928	gl_vendor ()	2297	gl_vendor ()
1929	CODE:	2298	CODE:
…		…
2078		2447
2079	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)
2080		2449
2081	int glGenTexture ()	2450	int glGenTexture ()
2082	CODE:	2451	CODE:
2083	{	2452	RETVAL = gen_texture ();
2084	GLuint name;
2085	glGenTextures (1, &name);
2086	RETVAL = name;
2087	}
2088	OUTPUT:	2453	OUTPUT:
2089	RETVAL	2454	RETVAL
2090		2455
2091	void glDeleteTexture (int name)	2456	void glDeleteTexture (int name)
2092	CODE:	2457	CODE:
2093	{
2094	GLuint name_ = name;
2095	glDeleteTextures (1, &name_);	2458	del_texture (name);
2096	}	2459
2097
2098	int glGenList ()	2460	int glGenList ()
2099	CODE:	2461	CODE:
2100	RETVAL = glGenLists (1);	2462	RETVAL = glGenLists (1);
2101	OUTPUT:	2463	OUTPUT:
2102	RETVAL	2464	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.156 by root, Thu Sep 21 14:47:51 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.156 by root, Thu Sep 21 14:47:51 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC