ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC vs.
Revision 1.322 by root, Sun Nov 18 01:43:12 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
27	#endif	28	#endif
28		29
29	#include <assert.h>	30	#include <cassert>
30	#include <math.h>	31	#include <cmath>
31	#include <string.h>	32	#include <cstring>
32	#include <stdio.h>	33	#include <cstdio>
33	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
34		37
35	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	38	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
36		39
37	#include <SDL.h>	40	#include <SDL.h>
38	#include <SDL_thread.h>	41	#include <SDL_thread.h>
…		…
42	#include <SDL_opengl.h>	45	#include <SDL_opengl.h>
43		46
44	/* work around os x broken headers */	47	/* work around os x broken headers */
45	#ifdef __MACOSX__	48	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	49	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		50	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		51	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47	#endif	52	#endif
48		53
49	#define PANGO_ENABLE_BACKEND	54	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	55	#define G_DISABLE_CAST_CHECKS
51		56
52	#include <glib/gmacros.h>	57	#include <glib.h>
53		58
54	#include <pango/pango.h>	59	#include <pango/pango.h>
55		60
56	#ifndef PANGO_VERSION_CHECK	61	#ifndef PANGO_VERSION_CHECK
57	# define PANGO_VERSION_CHECK(a,b,c) 0	62	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	86	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	87	#define expect_true(expr) expect ((expr) != 0, 1)
83		88
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	89	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		90
		91	/* this is used as fow flag as well, so has to have a different value */
		92	/* then anything that is computed by incoming darkness */
86	#define FOW_DARKNESS 32	93	#define FOW_DARKNESS 50
		94	#define DARKNESS_ADJUST(n) (n)
87		95
88	#define MAP_EXTEND_X 32	96	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	97	#define MAP_EXTEND_Y 512
90		98
91	#define MIN_FONT_HEIGHT 10	99	#define MIN_FONT_HEIGHT 10
92		100
93	/* mask out modifiers we are not interested in */	101	/* mask out modifiers we are not interested in */
94	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)	102	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
		103
		104	#define KMOD_LRAM 0x10000 // our extension
		105
		106	#define TEXID_SPEECH 1
		107	#define TEXID_NOFACE 2
		108
		109	static char *
		110	fast_sv_grow (SV *sv, STRLEN need)
		111	{
		112	STRLEN len = SvLEN (sv);
		113	STRLEN want = SvCUR (sv) + need;
		114
		115	if (expect_false (len < want))
		116	{
		117	do
		118	len *= 2;
		119	while (len < want);
		120
		121	sv_grow (sv, len);
		122	}
		123
		124	SvCUR_set (sv, want);
		125	return SvEND (sv) - need;
		126	}
95		127
96	static AV *texture_av;	128	static AV *texture_av;
97		129
98	static struct	130	static struct
99	{	131	{
…		…
156	{	188	{
157	GSList *attrs = run->item->analysis.extra_attrs;	189	GSList *attrs = run->item->analysis.extra_attrs;
158		190
159	while (attrs)	191	while (attrs)
160	{	192	{
161	PangoAttribute *attr = attrs->data;	193	PangoAttribute *attr = (PangoAttribute *)attrs->data;
162		194
163	if (attr->klass->type == PANGO_ATTR_SHAPE)	195	if (attr->klass->type == PANGO_ATTR_SHAPE)
164	return 1;	196	return 1;
165		197
166	attrs = attrs->next;	198	attrs = attrs->next;
…		…
184	static void	216	static void
185	substitute_func (FcPattern *pattern, gpointer data)	217	substitute_func (FcPattern *pattern, gpointer data)
186	{	218	{
187	FcPatternAddBool (pattern, FC_HINTING, 1);	219	FcPatternAddBool (pattern, FC_HINTING, 1);
188	#ifdef FC_HINT_STYLE	220	#ifdef FC_HINT_STYLE
189	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	221	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
190	#endif	222	#endif
191	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	223	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
192	}	224	}
193		225
194	static void	226	static void
…		…
231	int w, h;	263	int w, h;
232	float s, t;	264	float s, t;
233	uint8_t r, g, b, a;	265	uint8_t r, g, b, a;
234	tileid smoothtile;	266	tileid smoothtile;
235	uint8_t smoothlevel;	267	uint8_t smoothlevel;
		268	uint8_t unused; /* set to zero on use */
236	} maptex;	269	} maptex;
237		270
238	typedef struct {	271	typedef struct {
239	uint32_t player;	272	uint32_t player;
240	tileid tile[3];	273	tileid tile[3];
…		…
410	CELL_CLEAR (cell);	443	CELL_CLEAR (cell);
411	}	444	}
412	}	445	}
413	}	446	}
414		447
415	typedef struct {	448	struct smooth_key
		449	{
416	tileid tile;	450	tileid tile;
417	uint8_t x, y, level;	451	uint8_t x, y, level;
418	} smooth_key;	452
		453	bool operator == (const smooth_key &o) const
		454	{
		455	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		456	}
		457	};
		458
		459	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		460
		461	namespace std {
		462	template <>
		463	struct hash<smooth_key>
		464	{
		465	size_t operator () (const smooth_key &v) const
		466	{
		467	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		468	}
		469	};
		470	}
419		471
420	static void	472	static void
421	smooth_or_bits (HV *hv, smooth_key *key, IV bits)	473	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
422	{	474	{
423	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);	475	auto &&it = h.find (key);
424		476
425	if (SvIOK (*sv))	477	if (it == h.end ())
426	SvIV_set (*sv, SvIVX (*sv) | bits);	478	h.insert (std::make_pair (key, bits));
427	else	479	else
428	sv_setiv (*sv, bits);	480	it->second |= bits;
429	}	481	}
430		482
431	static void	483	static void
432	music_finished (void)	484	music_finished (void)
433	{	485	{
…		…
450	ev.code = 1;	502	ev.code = 1;
451	ev.data1 = (void *)(long)channel;	503	ev.data1 = (void *)(long)channel;
452	ev.data2 = 0;	504	ev.data2 = 0;
453		505
454	SDL_PushEvent ((SDL_Event *)&ev);	506	SDL_PushEvent ((SDL_Event *)&ev);
		507	}
		508
		509	// approximately divide by 255
		510	static unsigned int
		511	div255 (unsigned int n)
		512	{
		513	return (n + (n >> 8)) >> 8;
455	}	514	}
456		515
457	static unsigned int	516	static unsigned int
458	minpot (unsigned int n)	517	minpot (unsigned int n)
459	{	518	{
…		…
527	return 0;	586	return 0;
528		587
529	return 1;	588	return 1;
530	}	589	}
531		590
		591	/******************************************************************************/
		592
		593	/* process keyboard modifiers */
		594	static int
		595	mod_munge (int mod)
		596	{
		597	mod &= MOD_MASK;
		598
		599	if (mod & (KMOD_META | KMOD_ALT))
		600	mod |= KMOD_LRAM;
		601
		602	return mod;
		603	}
		604
532	static void	605	static void
533	deliantra_main ()	606	deliantra_main (SV *real_main)
534	{	607	{
535	char *argv[] = { 0 };	608	dSP;
536	call_argv ("::main", G_DISCARD | G_VOID, argv);	609
		610	PUSHMARK (SP);
		611	call_sv (real_main, G_DISCARD | G_VOID);
537	}	612	}
538		613
539	#ifdef __MACOSX__	614	#ifdef __MACOSX__
		615	static SV *real_main;
		616
540	/* to due surprising braindamage on the side of SDL design, we	617	/* to due surprising braindamage on the side of SDL design, we
541	* do some mind-boggling hack here: SDL requires a custom main()	618	* do some mind-boggling hack here: SDL requires a custom main()
542	* on OS X, so... we provide one and call the original main(), which,	619	* on OS X, so... we provide one and call the original main(), which,
543	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	620	* due to shared library magic, calls -lSDLmain's main, not perl's main,
544	* and which calls our main (== SDL_main) back.	621	* and which calls our main (== SDL_main) back.
545	*/	622	*/
546	extern C_LINKAGE int	623	extern C_LINKAGE int
547	main (int argc, char *argv[])	624	main (int argc, char *argv[])
548	{	625	{
549	deliantra_main ();	626	deliantra_main (real_main);
550	}	627	}
551		628
552	#undef main	629	#undef main
553		630
554	extern C_LINKAGE int main (int argc, char *argv[]);	631	extern C_LINKAGE int main (int argc, char *argv[]);
555		632
556	static void	633	static void
557	SDL_braino (void)	634	SDL_main_hack (SV *real_main_)
558	{	635	{
		636	real_main = real_main_;
		637
559	char *argv[] = { "deliantra client", 0 };	638	char *argv[] = { "deliantra client", 0 };
560	(main) (1, argv);	639	(main) (1, argv);
561	}	640	}
562	#else	641	#else
563	static void	642	static void
564	SDL_braino (void)	643	SDL_main_hack (SV *real_main)
565	{	644	{
566	deliantra_main ();	645	deliantra_main (real_main);
567	}	646	}
568	#endif	647	#endif
569		648
570	MODULE = Deliantra::Client PACKAGE = DC	649	MODULE = Deliantra::Client PACKAGE = DC
571		650
…		…
737	const_iv (KMOD_RMETA),	816	const_iv (KMOD_RMETA),
738	const_iv (KMOD_NUM),	817	const_iv (KMOD_NUM),
739	const_iv (KMOD_CAPS),	818	const_iv (KMOD_CAPS),
740	const_iv (KMOD_MODE),	819	const_iv (KMOD_MODE),
741		820
		821	const_iv (KMOD_LRAM),
		822
742	const_iv (MIX_DEFAULT_FORMAT),	823	const_iv (MIX_DEFAULT_FORMAT),
743		824
744	const_iv (SDL_INIT_TIMER),	825	const_iv (SDL_INIT_TIMER),
745	const_iv (SDL_INIT_AUDIO),	826	const_iv (SDL_INIT_AUDIO),
746	const_iv (SDL_INIT_VIDEO),	827	const_iv (SDL_INIT_VIDEO),
…		…
770		851
771	const_iv (FOW_DARKNESS)	852	const_iv (FOW_DARKNESS)
772	# undef const_iv	853	# undef const_iv
773	};	854	};
774		855
775	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	856	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
776	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	857	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
777		858
778	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	859	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
779	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	860	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
780	}	861	}
781		862
…		…
797	NV ceil (NV x)	878	NV ceil (NV x)
798		879
799	IV minpot (UV n)	880	IV minpot (UV n)
800		881
801	IV popcount (UV n)	882	IV popcount (UV n)
		883
		884	NV distance (NV dx, NV dy)
		885	CODE:
		886	RETVAL = pow (dx * dx + dy * dy, 0.5);
		887	OUTPUT:
		888	RETVAL
802		889
803	void	890	void
804	pango_init ()	891	pango_init ()
805	CODE:	892	CODE:
806	{	893	{
…		…
814	#endif	901	#endif
815	}	902	}
816		903
817	char *SDL_GetError ()	904	char *SDL_GetError ()
818		905
819	void SDL_braino ()	906	void SDL_main_hack (SV *real_main)
		907	PROTOTYPE: &
820		908
821	int SDL_Init (U32 flags)	909	int SDL_Init (U32 flags)
822		910
823	int SDL_InitSubSystem (U32 flags)	911	int SDL_InitSubSystem (U32 flags)
824		912
825	void SDL_QuitSubSystem (U32 flags)	913	void SDL_QuitSubSystem (U32 flags)
826		914
827	void SDL_Quit ()	915	void SDL_Quit ()
828		916
829	int SDL_GL_SetAttribute (int attr, int value)	917	int SDL_GL_SetAttribute (int attr, int value)
		918	C_ARGS: (SDL_GLattr)attr, value
830		919
831	int SDL_GL_GetAttribute (int attr)	920	int SDL_GL_GetAttribute (int attr)
832	CODE:	921	CODE:
833	if (SDL_GL_GetAttribute (attr, &RETVAL))	922	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
834	XSRETURN_UNDEF;	923	XSRETURN_UNDEF;
835	OUTPUT:	924	OUTPUT:
836	RETVAL	925	RETVAL
837		926
838	void	927	void
…		…
893	);	982	);
894		983
895	if (RETVAL)	984	if (RETVAL)
896	{	985	{
897	av_clear (texture_av);	986	av_clear (texture_av);
898
899	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
900	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	987	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
901	#include "glfunc.h"	988	#include "glfunc.h"
902	#undef GL_FUNC	989	#undef GL_FUNC
		990	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		991	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
903	}	992	}
904	}	993	}
905	OUTPUT:	994	OUTPUT:
906	RETVAL	995	RETVAL
		996
		997	void
		998	SDL_WM_SetCaption (const char *title, const char *icon)
907		999
908	void	1000	void
909	SDL_GL_SwapBuffers ()	1001	SDL_GL_SwapBuffers ()
910		1002
911	char *	1003	char *
912	SDL_GetKeyName (int sym)	1004	SDL_GetKeyName (int sym)
		1005	C_ARGS: (SDLKey)sym
913		1006
914	int	1007	int
915	SDL_GetAppState ()	1008	SDL_GetAppState ()
916		1009
917	int	1010	int
918	SDL_GetModState ()	1011	SDL_GetModState ()
919		1012
		1013	int
		1014	SDL_WaitEvent ()
		1015	C_ARGS: 0
		1016
920	void	1017	void
		1018	SDL_PumpEvents ()
		1019
		1020	void
921	poll_events ()	1021	peep_events ()
922	PPCODE:	1022	PPCODE:
923	{	1023	{
924	SDL_Event ev;	1024	SDL_Event ev;
925		1025
926	SDL_PumpEvents ();	1026	SDL_PumpEvents ();
…		…
933	{	1033	{
934	case SDL_KEYDOWN:	1034	case SDL_KEYDOWN:
935	case SDL_KEYUP:	1035	case SDL_KEYUP:
936	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	1036	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
937	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	1037	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
938	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	1038	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
939	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	1039	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
940	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1040	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
941	break;	1041	break;
942		1042
943	case SDL_ACTIVEEVENT:	1043	case SDL_ACTIVEEVENT:
944	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1044	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
962	x = ev.motion.x;	1062	x = ev.motion.x;
963	y = ev.motion.y;	1063	y = ev.motion.y;
964	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1064	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
965	}	1065	}
966		1066
967	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1067	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
968	hv_store (hv, "state", 5, newSViv (state), 0);	1068	hv_store (hv, "state", 5, newSViv (state), 0);
969	hv_store (hv, "x", 1, newSViv (x), 0);	1069	hv_store (hv, "x", 1, newSViv (x), 0);
970	hv_store (hv, "y", 1, newSViv (y), 0);	1070	hv_store (hv, "y", 1, newSViv (y), 0);
971	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1071	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
972	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1072	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
992		1092
993	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1093	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
994	}	1094	}
995	}	1095	}
996		1096
		1097	char *
		1098	SDL_AudioDriverName ()
		1099	CODE:
		1100	{
		1101	char buf [256];
		1102	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1103	XSRETURN_UNDEF;
		1104
		1105	RETVAL = buf;
		1106	}
		1107	OUTPUT:
		1108	RETVAL
		1109
997	int	1110	int
998	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1111	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
999	POSTCALL:	1112	POSTCALL:
1000	Mix_HookMusicFinished (music_finished);	1113	Mix_HookMusicFinished (music_finished);
1001	Mix_ChannelFinished (channel_finished);	1114	Mix_ChannelFinished (channel_finished);
1002		1115
1003	void	1116	void
1004	Mix_QuerySpec ()	1117	Mix_QuerySpec ()
…		…
1063	add_font (char *file)	1176	add_font (char *file)
1064	CODE:	1177	CODE:
1065	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1178	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1066	OUTPUT:	1179	OUTPUT:
1067	RETVAL	1180	RETVAL
		1181
		1182	void
		1183	IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
		1184
		1185	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1186	void
		1187	Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1068		1188
1069	void	1189	void
1070	load_image_inline (SV *image_)	1190	load_image_inline (SV *image_)
1071	ALIAS:	1191	ALIAS:
1072	load_image_file = 1	1192	load_image_file = 1
…		…
1118		1238
1119	SDL_LockSurface (surface2);	1239	SDL_LockSurface (surface2);
1120	EXTEND (SP, 6);	1240	EXTEND (SP, 6);
1121	PUSHs (sv_2mortal (newSViv (surface2->w)));	1241	PUSHs (sv_2mortal (newSViv (surface2->w)));
1122	PUSHs (sv_2mortal (newSViv (surface2->h)));	1242	PUSHs (sv_2mortal (newSViv (surface2->h)));
1123	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1243	PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1124	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1244	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1125	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1245	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1126	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1246	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1127	SDL_UnlockSurface (surface2);	1247	SDL_UnlockSurface (surface2);
1128		1248
…		…
1188	#if DEBUG	1308	#if DEBUG
1189	VALGRIND_DO_LEAK_CHECK;	1309	VALGRIND_DO_LEAK_CHECK;
1190	#endif	1310	#endif
1191	}	1311	}
1192		1312
		1313	int
		1314	SvREFCNT (SV *sv)
		1315	CODE:
		1316	RETVAL = SvREFCNT (sv);
		1317	OUTPUT:
		1318	RETVAL
		1319
1193	MODULE = Deliantra::Client PACKAGE = DC::Font	1320	MODULE = Deliantra::Client PACKAGE = DC::Font
1194		1321
1195	PROTOTYPES: DISABLE	1322	PROTOTYPES: DISABLE
1196		1323
1197	DC::Font	1324	DC::Font
1198	new_from_file (SV *class, char *path, int id = 0)	1325	new_from_file (SV *klass, char *path, int id = 0)
1199	CODE:	1326	CODE:
1200	{	1327	{
1201	int count;	1328	int count;
1202	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1329	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1203	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1330	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1232	PROTOTYPE:	1359	PROTOTYPE:
1233	CODE:	1360	CODE:
1234	tc_restore ();	1361	tc_restore ();
1235		1362
1236	DC::Layout	1363	DC::Layout
1237	new (SV *class)	1364	new (SV *klass)
1238	CODE:	1365	CODE:
1239	New (0, RETVAL, 1, struct cf_layout);	1366	New (0, RETVAL, 1, struct cf_layout);
1240		1367
1241	RETVAL->pl = pango_layout_new (opengl_context);	1368	RETVAL->pl = pango_layout_new (opengl_context);
1242	RETVAL->r = 1.;	1369	RETVAL->r = 1.;
…		…
1391		1518
1392	void	1519	void
1393	set_height (DC::Layout self, int base_height)	1520	set_height (DC::Layout self, int base_height)
1394	CODE:	1521	CODE:
1395	if (self->base_height != base_height)	1522	if (self->base_height != base_height)
1396	{	1523	{
1397	self->base_height = base_height;	1524	self->base_height = base_height;
1398	layout_update_font (self);	1525	layout_update_font (self);
1399	}	1526	}
1400		1527
1401	void	1528	void
…		…
1628	glDisable (GL_ALPHA_TEST);	1755	glDisable (GL_ALPHA_TEST);
1629	glDisable (GL_BLEND);	1756	glDisable (GL_BLEND);
1630	}	1757	}
1631	}	1758	}
1632		1759
		1760	void
		1761	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
		1762	PROTOTYPE: @
		1763	CODE:
		1764	{
		1765	glEnable (GL_BLEND);
		1766	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1767	glEnable (GL_TEXTURE_2D);
		1768	glBindTexture (GL_TEXTURE_2D, name1);
		1769
		1770	glColor3f (intensity, intensity, intensity);
		1771	glPushMatrix ();
		1772	glScalef (1./3, 1./3, 1.);
		1773
		1774	if (blend > 0.f)
		1775	{
		1776	float dx3 = dx * -3.f / w;
		1777	float dy3 = dy * -3.f / h;
		1778	GLfloat env_color[4] = { 0., 0., 0., blend };
		1779
		1780	/* interpolate the two shadow textures */
		1781	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1782	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1783
		1784	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1785	gl.ActiveTexture (GL_TEXTURE1);
		1786	glEnable (GL_TEXTURE_2D);
		1787	glBindTexture (GL_TEXTURE_2D, name2);
		1788	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1789
		1790	/* rgb == rgb(glcolor) */
		1791	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1792	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1794
		1795	/* alpha = interpolate t0, t1 by env_alpha */
		1796	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1797
		1798	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1799	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1800	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1801
		1802	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1803	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1804
		1805	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1806	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1807
		1808	glBegin (GL_QUADS);
		1809	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1810	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1811	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1812	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1813	glEnd ();
		1814
		1815	glDisable (GL_TEXTURE_2D);
		1816	gl.ActiveTexture (GL_TEXTURE0);
		1817	}
		1818	else
		1819	{
		1820	/* simple blending of one texture, also opengl <1.3 path */
		1821	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1822
		1823	glBegin (GL_QUADS);
		1824	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1825	glTexCoord2f (0, t); glVertex2f (0, h);
		1826	glTexCoord2f (s, t); glVertex2f (w, h);
		1827	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1828	glEnd ();
		1829	}
		1830
		1831	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1832	{
		1833	int x, y;
		1834	int dx3 = dx * 3;
		1835	int dy3 = dy * 3;
		1836
		1837	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1838	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1839	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1840	glTranslatef (-1., -1., 0);
		1841	glBegin (GL_QUADS);
		1842
		1843	for (y = 1; y < h; y += 3)
		1844	{
		1845	int y1 = y - dy3;
		1846	int y1valid = y1 >= 0 && y1 < h;
		1847
		1848	for (x = 1; x < w; x += 3)
		1849	{
		1850	int x1 = x - dx3;
		1851	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1852	uint8_t h2;
		1853
		1854	if (y1valid && x1 >= 0 && x1 < w)
		1855	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1856	else
		1857	h2 = 1; /* out of range == invisible */
		1858
		1859	if (h1 || h2)
		1860	{
		1861	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1862	glColor4f (1., 1., 1., alpha);
		1863
		1864	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1865	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1866	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1867	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1868	}
		1869	}
		1870	}
		1871	}
		1872
		1873	glEnd ();
		1874
		1875	glPopMatrix ();
		1876
		1877	glDisable (GL_TEXTURE_2D);
		1878	glDisable (GL_BLEND);
		1879	}
		1880
1633	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1881	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1634	CODE:	1882	CODE:
1635	{	1883	{
1636	GLint width;	1884	GLint width;
1637	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1885	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1644	MODULE = Deliantra::Client PACKAGE = DC::Map	1892	MODULE = Deliantra::Client PACKAGE = DC::Map
1645		1893
1646	PROTOTYPES: DISABLE	1894	PROTOTYPES: DISABLE
1647		1895
1648	DC::Map	1896	DC::Map
1649	new (SV *class)	1897	new (SV *klass)
1650	CODE:	1898	CODE:
1651	New (0, RETVAL, 1, struct map);	1899	New (0, RETVAL, 1, struct map);
1652	RETVAL->x = 0;	1900	RETVAL->x = 0;
1653	RETVAL->y = 0;	1901	RETVAL->y = 0;
1654	RETVAL->w = 0;	1902	RETVAL->w = 0;
…		…
1693		1941
1694	void	1942	void
1695	set_smooth (DC::Map self, int face, int smooth, int level)	1943	set_smooth (DC::Map self, int face, int smooth, int level)
1696	CODE:	1944	CODE:
1697	{	1945	{
1698	tileid texid;	1946	tileid texid;
1699	maptex *tex;	1947	maptex *tex;
1700		1948
1701	if (face < 0 || face >= self->faces)	1949	if (face < 0 || face >= self->faces)
1702	return;	1950	return;
1703		1951
1704	if (smooth < 0 || smooth >= self->faces)	1952	if (smooth < 0 || smooth >= self->faces)
1705	return;	1953	return;
1706		1954
1707	texid = self->face2tile [face];	1955	texid = self->face2tile [face];
1708		1956
1709	if (!texid)	1957	if (!texid)
1710	return;	1958	return;
1711		1959
1712	tex = self->tex + texid;	1960	tex = self->tex + texid;
…		…
1741	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1989	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1742	// use uglier nearest interpolation because linear suffers	1990	// use uglier nearest interpolation because linear suffers
1743	// from transparent color bleeding and ugly wrapping effects.	1991	// from transparent color bleeding and ugly wrapping effects.
1744	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1992	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1745	}	1993	}
		1994
		1995	void
		1996	expire_textures (DC::Map self, int texid, int count)
		1997	PPCODE:
		1998	for (; texid < self->texs && count; ++texid, --count)
		1999	{
		2000	maptex *tex = self->tex + texid;
		2001
		2002	if (tex->name)
		2003	{
		2004	if (tex->unused)
		2005	{
		2006	tex->name = 0;
		2007	tex->unused = 0;
		2008	XPUSHs (sv_2mortal (newSViv (texid)));
		2009	}
		2010	else
		2011	tex->unused = 1;
		2012	}
		2013	}
1746		2014
1747	int	2015	int
1748	ox (DC::Map self)	2016	ox (DC::Map self)
1749	ALIAS:	2017	ALIAS:
1750	oy = 1	2018	oy = 1
…		…
1790	self->y += MAP_EXTEND_Y;	2058	self->y += MAP_EXTEND_Y;
1791	}	2059	}
1792	}	2060	}
1793		2061
1794	SV *	2062	SV *
1795	map1a_update (DC::Map self, SV *data_, int extmap)	2063	map1a_update (DC::Map self, SV *data_)
1796	CODE:	2064	CODE:
1797	{	2065	{
1798	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	2066	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1799	uint8_t *data_end = (uint8_t *)SvEND (data_);	2067	uint8_t *data_end = (uint8_t *)SvEND (data_);
1800	mapcell *cell;	2068	mapcell *cell;
…		…
1821		2089
1822	//TODO: don't trust server data to be in-range(!)	2090	//TODO: don't trust server data to be in-range(!)
1823		2091
1824	if (flags & 8)	2092	if (flags & 8)
1825	{	2093	{
		2094	uint8_t ext, cmd;
		2095
1826	if (extmap)	2096	do
1827	{	2097	{
1828	uint8_t ext, cmd;	2098	ext = *data++;
		2099	cmd = ext & 0x7f;
1829		2100
1830	do	2101	if (cmd < 4)
		2102	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2103	else if (cmd == 5) // health
1831	{	2104	{
1832	ext = *data++;
1833	cmd = ext & 0x7f;
1834
1835	if (cmd < 4)
1836	cell->darkness = 255 - ext * 64 + 1;
1837	else if (cmd == 5) // health
1838	{
1839	cell->stat_width = 1;	2105	cell->stat_width = 1;
1840	cell->stat_hp = *data++;	2106	cell->stat_hp = *data++;
1841	}
1842	else if (cmd == 6) // monster width
1843	cell->stat_width = *data++ + 1;
1844	else if (cmd == 0x47)
1845	{
1846	if (*data == 1) cell->player = data [1];
1847	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1850
1851	data += *data + 1;
1852	}
1853	else if (cmd == 8) // cell flags
1854	cell->flags = *data++;
1855	else if (ext & 0x40) // unknown, multibyte => skip
1856	data += *data + 1;
1857	else
1858	data++;
1859	}	2107	}
1860	while (ext & 0x80);	2108	else if (cmd == 6) // monster width
		2109	cell->stat_width = *data++ + 1;
		2110	else if (cmd == 0x47)
		2111	{
		2112	if (*data == 1) cell->player = data [1];
		2113	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2114	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2115	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2116
		2117	data += *data + 1;
		2118	}
		2119	else if (cmd == 8) // cell flags
		2120	cell->flags = *data++;
		2121	else if (ext & 0x40) // unknown, multibyte => skip
		2122	data += *data + 1;
		2123	else
		2124	data++;
1861	}	2125	}
1862	else	2126	while (ext & 0x80);
1863	cell->darkness = *data++ + 1;
1864	}	2127	}
1865		2128
1866	for (z = 0; z <= 2; ++z)	2129	for (z = 0; z <= 2; ++z)
1867	if (flags & (4 >> z))	2130	if (flags & (4 >> z))
1868	{	2131	{
…		…
1871	cell->tile [z] = self->face2tile [face];	2134	cell->tile [z] = self->face2tile [face];
1872		2135
1873	if (cell->tile [z])	2136	if (cell->tile [z])
1874	{	2137	{
1875	maptex *tex = self->tex + cell->tile [z];	2138	maptex *tex = self->tex + cell->tile [z];
		2139	tex->unused = 0;
1876	if (!tex->name)	2140	if (!tex->name)
1877	av_push (missing, newSViv (cell->tile [z]));	2141	av_push (missing, newSViv (cell->tile [z]));
1878		2142
1879	if (tex->smoothtile)	2143	if (tex->smoothtile)
1880	{	2144	{
1881	maptex *smooth = self->tex + tex->smoothtile;	2145	maptex *smooth = self->tex + tex->smoothtile;
		2146	smooth->unused = 0;
1882	if (!smooth->name)	2147	if (!smooth->name)
1883	av_push (missing, newSViv (tex->smoothtile));	2148	av_push (missing, newSViv (tex->smoothtile));
1884	}	2149	}
1885	}	2150	}
1886	}	2151	}
…		…
1914	? self->row + y	2179	? self->row + y
1915	: 0;	2180	: 0;
1916		2181
1917	for (x = x0; x < x1; x++)	2182	for (x = x0; x < x1; x++)
1918	{	2183	{
1919	int r = 32, g = 32, b = 32, a = 192;	2184	unsigned int r = 32, g = 32, b = 32, a = 192;
1920		2185
1921	if (row && row->c0 <= x && x < row->c1)	2186	if (row && row->c0 <= x && x < row->c1)
1922	{	2187	{
1923	mapcell *cell = row->col + (x - row->c0);	2188	mapcell *cell = row->col + (x - row->c0);
1924		2189
…		…
1926	{	2191	{
1927	maptex tex = self->tex [cell->tile [z]];	2192	maptex tex = self->tex [cell->tile [z]];
1928	int a0 = 255 - tex.a;	2193	int a0 = 255 - tex.a;
1929	int a1 = tex.a;	2194	int a1 = tex.a;
1930		2195
1931	r = (r * a0 + tex.r * a1) / 255;	2196	r = div255 (r * a0 + tex.r * a1);
1932	g = (g * a0 + tex.g * a1) / 255;	2197	g = div255 (g * a0 + tex.g * a1);
1933	b = (b * a0 + tex.b * a1) / 255;	2198	b = div255 (b * a0 + tex.b * a1);
1934	a = (a * a0 + tex.a * a1) / 255;	2199	a = div255 (a * a0 + tex.a * a1);
1935	}	2200	}
1936	}	2201	}
1937		2202
1938	*map++ = (r )	2203	*map++ = (r )
1939	| (g << 8)	2204	| (g << 8)
1940	| (b << 16)	2205	| (b << 16)
1941	| (a << 24);	2206	| (a << 24);
1942	}	2207	}
1943	}	2208	}
1944		2209
1945	RETVAL = map_sv;	2210	RETVAL = map_sv;
1946	}	2211	}
1947	OUTPUT:	2212	OUTPUT:
1948	RETVAL	2213	RETVAL
1949		2214
1950	void	2215	void
1951	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2216	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1952	CODE:	2217	CODE:
1953	{	2218	{
1954	int x, y, z;	2219	int x, y, z;
1955		2220
1956	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1957	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2221	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1958	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2222	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1959	smooth_key skey;	2223	smooth_key skey;
1960	int pl_x, pl_y;	2224	int pl_x, pl_y;
1961	maptex pl_tex;	2225	maptex pl_tex;
1962	rc_t *rc = rc_alloc ();	2226	rc_t *rc = rc_alloc ();
		2227	rc_t *rc_ov = rc_alloc ();
1963	rc_key_t key;	2228	rc_key_t key;
1964	rc_array_t *arr;	2229	rc_array_t *arr;
1965		2230
1966	pl_tex.name = 0;	2231	pl_tex.name = 0;
1967		2232
1968	// thats current max. sorry.	2233	// that's current max. sorry.
1969	if (sw > 255) sw = 255;	2234	if (sw > 255) sw = 255;
1970	if (sh > 255) sh = 255;	2235	if (sh > 255) sh = 255;
1971		2236
1972	// clear key, in case of extra padding	2237	// clear key, in case of extra padding
1973	memset (&skey, 0, sizeof (skey));	2238	memset (&skey, 0, sizeof (skey));
…		…
1977	key.g = 255;	2242	key.g = 255;
1978	key.b = 255;	2243	key.b = 255;
1979	key.a = 255;	2244	key.a = 255;
1980	key.mode = GL_QUADS;	2245	key.mode = GL_QUADS;
1981	key.format = GL_T2F_V3F;	2246	key.format = GL_T2F_V3F;
1982	key.texname = -1;
1983		2247
1984	mx += self->x;	2248	mx += self->x;
1985	my += self->y;	2249	my += self->y;
1986		2250
1987	// first pass: determine smooth_max	2251	// first pass: determine smooth_max
…		…
2010	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2274	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2011	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2275	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2012		2276
2013	for (z = 0; z <= 2; z++)	2277	for (z = 0; z <= 2; z++)
2014	{	2278	{
		2279	smooth_hash smooth;
2015	memset (smooth_level, 0, sizeof (smooth_level));	2280	memset (smooth_level, 0, sizeof (smooth_level));
		2281	key.texname = -1;
2016		2282
2017	for (y = 0; y < sh; y++)	2283	for (y = 0; y < sh; y++)
2018	if (0 <= y + my && y + my < self->rows)	2284	if (0 <= y + my && y + my < self->rows)
2019	{	2285	{
2020	maprow *row = self->row + (y + my);	2286	maprow *row = self->row + (y + my);
…		…
2026	tileid tile = cell->tile [z];	2292	tileid tile = cell->tile [z];
2027		2293
2028	if (tile)	2294	if (tile)
2029	{	2295	{
2030	maptex tex = self->tex [tile];	2296	maptex tex = self->tex [tile];
2031	int px = (x + 1) * T - tex.w;	2297	int px, py;
2032	int py = (y + 1) * T - tex.h;
2033		2298
2034	if (key.texname != tex.name)	2299	if (key.texname != tex.name)
2035	{	2300	{
		2301	self->tex [tile].unused = 0;
		2302
2036	if (!tex.name)	2303	if (!tex.name)
2037	tex = self->tex [2]; /* missing, replace by noface */	2304	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2038		2305
2039	key.texname = tex.name;	2306	key.texname = tex.name;
2040	arr = rc_array (rc, &key);	2307	arr = rc_array (rc, &key);
2041	}	2308	}
		2309
		2310	px = (x + 1) * Th - tex.w;
		2311	py = (y + 1) * Tw - tex.h;
2042		2312
2043	if (expect_false (cell->player == player) && expect_false (z == 2))	2313	if (expect_false (cell->player == player) && expect_false (z == 2))
2044	{	2314	{
2045	pl_x = px;	2315	pl_x = px;
2046	pl_y = py;	2316	pl_y = py;
…		…
2051	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2321	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2052	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2322	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2053	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2323	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2054	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2324	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2055		2325
2056	if (expect_false (cell->flags) && expect_false (z == 2))
2057	{
2058	// overlays such as the speech bubble, probably more to come
2059	if (cell->flags & 1)
2060	{
2061	maptex tex = self->tex [1];
2062	int px = x * T + T * 2 / 32;
2063	int py = y * T - T * 6 / 32;
2064
2065	if (tex.name)
2066	{
2067	if (key.texname != tex.name)
2068	{
2069	key.texname = tex.name;
2070	arr = rc_array (rc, &key);
2071	}
2072
2073	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2074	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2075	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2076	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2077	}
2078	}
2079	}
2080
2081	// update smooth hash	2326	// update smooth hash
2082	if (tex.smoothtile)	2327	if (tex.smoothtile)
2083	{	2328	{
2084	skey.tile = tex.smoothtile;	2329	skey.tile = tex.smoothtile;
2085	skey.level = tex.smoothlevel;	2330	skey.level = tex.smoothlevel;
…		…
2100		2345
2101	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2346	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2102	// ·· ·· ·┏ ┓·	2347	// ·· ·· ·┏ ┓·
2103		2348
2104	// full tile	2349	// full tile
2105	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2350	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2106		2351
2107	// borders	2352	// borders
2108	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2353	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2109	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2354	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2110	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2355	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2111	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2356	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2112		2357
2113	// corners	2358	// corners
2114	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2359	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2115	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2360	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2116	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2361	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2117	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2362	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
		2363	}
		2364	}
		2365
		2366	if (expect_false (z == 2) && expect_false (cell->flags))
		2367	{
		2368	// overlays such as the speech bubble, probably more to come
		2369	if (cell->flags & 1)
		2370	{
		2371	rc_key_t key_ov = key;
		2372	maptex tex = self->tex [TEXID_SPEECH];
		2373	rc_array_t *arr;
		2374	int px = x * Tw + Tw * 2 / 32;
		2375	int py = y * Th - Th * 6 / 32;
		2376
		2377	key_ov.texname = tex.name;
		2378	arr = rc_array (rc_ov, &key_ov);
		2379
		2380	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2381	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2382	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2383	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2118	}	2384	}
2119	}	2385	}
2120	}	2386	}
2121	}	2387	}
2122		2388
…		…
2138	if (smask & (((uint32_t)1) << b))	2404	if (smask & (((uint32_t)1) << b))
2139	{	2405	{
2140	int level = (w << 5) | b;	2406	int level = (w << 5) | b;
2141	HE *he;	2407	HE *he;
2142		2408
2143	hv_iterinit (smooth);	2409	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2144	while ((he = hv_iternext (smooth)))
2145	{	2410	{
2146	smooth_key *skey = (smooth_key *)HeKEY (he);	2411	smooth_key &skey = it->first;
2147	IV bits = SvIVX (HeVAL (he));	2412	IV bits = it->second;
2148		2413
2149	if (!(bits & 0x1000)	2414	if (!(bits & 0x1000)
2150	&& skey->level == level	2415	&& skey.level == level
2151	&& level > smooth_max [skey->x][skey->y])	2416	&& level > smooth_max [skey.x][skey.y])
2152	{	2417	{
2153	maptex tex = self->tex [skey->tile];	2418	maptex tex = self->tex [skey.tile];
2154	int px = (((int)skey->x) - 1) * T;	2419	int px = (((int)skey.x) - 1) * Tw;
2155	int py = (((int)skey->y) - 1) * T;	2420	int py = (((int)skey.y) - 1) * Th;
2156	int border = bits & 15;	2421	int border = bits & 15;
2157	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2422	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2158	float dx = tex.s * .0625f; // 16 images/row	2423	float dx = tex.s * .0625f; // 16 images/row
2159	float dy = tex.t * .5f ; // 2 images/column	2424	float dy = tex.t * .5f ; // 2 images/column
2160		2425
…		…
2162	{	2427	{
2163	// this time avoiding texture state changes	2428	// this time avoiding texture state changes
2164	// save gobs of state changes.	2429	// save gobs of state changes.
2165	if (key.texname != tex.name)	2430	if (key.texname != tex.name)
2166	{	2431	{
		2432	self->tex [skey.tile].unused = 0;
		2433
2167	glEnd ();	2434	glEnd ();
2168	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2435	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2169	glBegin (GL_QUADS);	2436	glBegin (GL_QUADS);
2170	}	2437	}
2171		2438
2172	if (border)	2439	if (border)
2173	{	2440	{
2174	float ox = border * dx;	2441	float ox = border * dx;
2175		2442
2176	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2443	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2177	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2444	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2178	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2445	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2179	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2446	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2180	}	2447	}
2181		2448
2182	if (corner)	2449	if (corner)
2183	{	2450	{
2184	float ox = corner * dx;	2451	float ox = corner * dx;
2185		2452
2186	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2453	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2187	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2454	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2188	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2455	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2189	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2456	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2190	}	2457	}
2191	}	2458	}
2192	}	2459	}
2193	}	2460	}
2194	}	2461	}
…		…
2196		2463
2197	glEnd ();	2464	glEnd ();
2198	glDisable (GL_TEXTURE_2D);	2465	glDisable (GL_TEXTURE_2D);
2199	key.texname = -1;	2466	key.texname = -1;
2200	}	2467	}
2201
2202	hv_clear (smooth);
2203	}	2468	}
2204		2469
2205	if (pl_tex.name)	2470	if (pl_tex.name)
2206	{	2471	{
2207	maptex tex = pl_tex;	2472	maptex tex = pl_tex;
…		…
2217	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2482	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218		2483
2219	rc_draw (rc);	2484	rc_draw (rc);
2220	}	2485	}
2221		2486
		2487	rc_draw (rc_ov);
		2488	rc_clear (rc_ov);
		2489
2222	glDisable (GL_BLEND);	2490	glDisable (GL_BLEND);
2223	rc_free (rc);	2491	rc_free (rc);
		2492	rc_free (rc_ov);
2224		2493
2225	// top layer: overlays such as the health bar	2494	// top layer: overlays such as the health bar
2226	for (y = 0; y < sh; y++)	2495	for (y = 0; y < sh; y++)
2227	if (0 <= y + my && y + my < self->rows)	2496	if (0 <= y + my && y + my < self->rows)
2228	{	2497	{
…		…
2231	for (x = 0; x < sw; x++)	2500	for (x = 0; x < sw; x++)
2232	if (row->c0 <= x + mx && x + mx < row->c1)	2501	if (row->c0 <= x + mx && x + mx < row->c1)
2233	{	2502	{
2234	mapcell *cell = row->col + (x + mx - row->c0);	2503	mapcell *cell = row->col + (x + mx - row->c0);
2235		2504
2236	int px = x * T;	2505	int px = x * Tw;
2237	int py = y * T;	2506	int py = y * Th;
		2507
		2508	if (expect_false (cell->player == player))
		2509	{
		2510	px += sdx;
		2511	py += sdy;
		2512	}
2238		2513
2239	if (cell->stat_hp)	2514	if (cell->stat_hp)
2240	{	2515	{
2241	int width = cell->stat_width * T;	2516	int width = cell->stat_width * Tw;
2242	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2517	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2243		2518
2244	glColor3ub (0, 0, 0);	2519	glColor3ub (0, 0, 0);
2245	glRectf (px + 1, py - thick - 2,	2520	glRectf (px + 1, py - thick - 2,
2246	px + width - 1, py);	2521	px + width - 1, py);
2247		2522
…		…
2253	}	2528	}
2254	}	2529	}
2255	}	2530	}
2256		2531
2257	void	2532	void
2258	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2533	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2259	CODE:	2534	CODE:
2260	{	2535	{
2261	static float color[16][3] = {	2536	static float color[16][3] = {
2262	{ 0.00F, 0.00F, 0.00F },	2537	{ 0.00f, 0.00f, 0.00f },
2263	{ 1.00F, 1.00F, 1.00F },	2538	{ 1.00f, 1.00f, 1.00f },
2264	{ 0.00F, 0.00F, 0.55F },	2539	{ 0.00f, 0.00f, 0.55f },
2265	{ 1.00F, 0.00F, 0.00F },	2540	{ 1.00f, 0.00f, 0.00f },
2266		2541
2267	{ 1.00F, 0.54F, 0.00F },	2542	{ 1.00f, 0.54f, 0.00f },
2268	{ 0.11F, 0.56F, 1.00F },	2543	{ 0.11f, 0.56f, 1.00f },
2269	{ 0.93F, 0.46F, 0.00F },	2544	{ 0.93f, 0.46f, 0.00f },
2270	{ 0.18F, 0.54F, 0.34F },	2545	{ 0.18f, 0.54f, 0.34f },
2271		2546
2272	{ 0.56F, 0.73F, 0.56F },	2547	{ 0.56f, 0.73f, 0.56f },
2273	{ 0.80F, 0.80F, 0.80F },	2548	{ 0.80f, 0.80f, 0.80f },
2274	{ 0.55F, 0.41F, 0.13F },	2549	{ 0.55f, 0.41f, 0.13f },
2275	{ 0.99F, 0.77F, 0.26F },	2550	{ 0.99f, 0.77f, 0.26f },
2276		2551
2277	{ 0.74F, 0.65F, 0.41F },	2552	{ 0.74f, 0.65f, 0.41f },
2278		2553
2279	{ 0.00F, 1.00F, 1.00F },	2554	{ 0.00f, 1.00f, 1.00f },
2280	{ 1.00F, 0.00F, 1.00F },	2555	{ 1.00f, 0.00f, 1.00f },
2281	{ 1.00F, 1.00F, 0.00F },	2556	{ 1.00f, 1.00f, 0.00f },
2282	};	2557	};
2283		2558
2284	int x, y;	2559	int x, y;
2285		2560
2286	glEnable (GL_TEXTURE_2D);	2561	glEnable (GL_TEXTURE_2D);
		2562	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2563	* but the nvidia driver (185.18.14) mishandles alpha textures
		2564	* and takes the colour from god knows where instead of using
		2565	* Cp. MODULATE results in the same colour, but slightly different
		2566	* alpha, but atcually gives us the correct colour with nvidia.
		2567	*/
2287	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2568	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2288	glEnable (GL_BLEND);	2569	glEnable (GL_BLEND);
2289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2570	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2290	glBegin (GL_QUADS);	2571	glBegin (GL_QUADS);
2291		2572
2292	for (y = 0; y < h; y++)	2573	for (y = 0; y < h; y++)
…		…
2296		2577
2297	if (m)	2578	if (m)
2298	{	2579	{
2299	float *c = color [m & 15];	2580	float *c = color [m & 15];
2300		2581
2301	float tx1 = m & 0x40 ? 0.5 : 0.;	2582	float tx1 = m & 0x40 ? 0.5f : 0.f;
2302	float tx2 = tx1 + 0.5;	2583	float tx2 = tx1 + 0.5f;
2303		2584
2304	glColor4f (c[0], c[1], c[2], 0.75);	2585	glColor4f (c[0], c[1], c[2], 1);
2305	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2586	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2306	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2587	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2307	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2588	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2308	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2589	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2309	}	2590	}
…		…
2317	void	2598	void
2318	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2599	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2319	PPCODE:	2600	PPCODE:
2320	{	2601	{
2321	int x, y;	2602	int x, y;
2322	int sw1 = sw + 2;	2603	int sw1 = sw + 2;
2323	int sh1 = sh + 2;	2604	int sh1 = sh + 2;
2324	int sh3 = sh * 3;	2605	int sh3 = sh * 3;
2325	int sw34 = (sw * 3 + 3) & ~3;	2606	int sw3 = sw * 3;
		2607	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
		2608	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2326	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2609	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2327	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2610	memset (darkness1, 0, sw1*sh1);
2328	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2329		2611
2330	SvPOK_only (darkness3_sv);	2612	SvPOK_only (darkness3_sv);
2331	SvCUR_set (darkness3_sv, sw34 * sh3);	2613	SvCUR_set (darkness3_sv, sw3 * sh3);
2332		2614
2333	mx += self->x - 1;	2615	mx += self->x - 1;
2334	my += self->y - 1;	2616	my += self->y - 1;
2335
2336	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2337		2617
2338	for (y = 0; y < sh1; y++)	2618	for (y = 0; y < sh1; y++)
2339	if (0 <= y + my && y + my < self->rows)	2619	if (0 <= y + my && y + my < self->rows)
2340	{	2620	{
2341	maprow *row = self->row + (y + my);	2621	maprow *row = self->row + (y + my);
…		…
2344	if (row->c0 <= x + mx && x + mx < row->c1)	2624	if (row->c0 <= x + mx && x + mx < row->c1)
2345	{	2625	{
2346	mapcell *cell = row->col + (x + mx - row->c0);	2626	mapcell *cell = row->col + (x + mx - row->c0);
2347		2627
2348	darkness1 [y * sw1 + x] = cell->darkness	2628	darkness1 [y * sw1 + x] = cell->darkness
2349	? 255 - (cell->darkness - 1)	2629	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2350	: 255 - FOW_DARKNESS;	2630	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2351	}	2631	}
2352	}	2632	}
2353		2633
2354	for (y = 0; y < sh; ++y)	2634	for (y = 0; y < sh; ++y)
2355	for (x = 0; x < sw; ++x)	2635	for (x = 0; x < sw; ++x)
…		…
2374		2654
2375	uint8_t r13 = (d13 + d23 + d12) / 3;	2655	uint8_t r13 = (d13 + d23 + d12) / 3;
2376	uint8_t r23 = d23;	2656	uint8_t r23 = d23;
2377	uint8_t r33 = (d23 + d33 + d32) / 3;	2657	uint8_t r33 = (d23 + d33 + d32) / 3;
2378		2658
2379	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2659	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2380	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2660	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2381	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2661	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2382	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2662	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2383	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2663	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2384	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2664	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2385	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2665	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2386	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2666	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2387	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2667	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2388	}	2668	}
2389		2669
2390	free (darkness1);	2670	free (darkness1);
2391		2671
2392	EXTEND (SP, 3);	2672	EXTEND (SP, 3);
2393	PUSHs (sv_2mortal (newSViv (sw34)));	2673	PUSHs (sv_2mortal (newSViv (sw3)));
2394	PUSHs (sv_2mortal (newSViv (sh3)));	2674	PUSHs (sv_2mortal (newSViv (sh3)));
2395	PUSHs (darkness3_sv);	2675	PUSHs (darkness3_sv);
2396	}	2676	}
2397		2677
2398	SV *	2678	SV *
…		…
2461	else	2741	else
2462	*data++ = 0;	2742	*data++ = 0;
2463	}	2743	}
2464	}	2744	}
2465		2745
2466	/* if size is w*h + 5 then no data has been found */	2746	/* if size is w*h + 5 then no data has been found */
2467	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)	2747	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2468	{	2748	{
2469	SvPOK_only (data_sv);	2749	SvPOK_only (data_sv);
2470	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2750	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2471	}	2751	}
2472		2752
2473	RETVAL = data_sv;	2753	RETVAL = data_sv;
2474	}	2754	}
2475	OUTPUT:	2755	OUTPUT:
2476	RETVAL	2756	RETVAL
2477		2757
2478	void	2758	void
…		…
2485	STRLEN len;	2765	STRLEN len;
2486	uint8_t *data, *end;	2766	uint8_t *data, *end;
2487		2767
2488	len = SvLEN (data_sv);	2768	len = SvLEN (data_sv);
2489	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2769	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2490	data = SvPVbyte_nolen (data_sv);	2770	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2491	end = data + len + 8;	2771	end = data + len + 8;
2492		2772
2493	if (len < 5)	2773	if (len < 5)
2494	XSRETURN_EMPTY;	2774	XSRETURN_EMPTY;
2495		2775
…		…
2556	}	2836	}
2557		2837
2558	MODULE = Deliantra::Client PACKAGE = DC::RW	2838	MODULE = Deliantra::Client PACKAGE = DC::RW
2559		2839
2560	DC::RW	2840	DC::RW
2561	new (SV *class, SV *data_sv)	2841	new (SV *klass, SV *data_sv)
2562	CODE:	2842	CODE:
2563	{	2843	{
2564	STRLEN datalen;	2844	STRLEN datalen;
2565	char *data = SvPVbyte (data_sv, datalen);	2845	char *data = SvPVbyte (data_sv, datalen);
2566		2846
…		…
2568	}	2848	}
2569	OUTPUT:	2849	OUTPUT:
2570	RETVAL	2850	RETVAL
2571		2851
2572	DC::RW	2852	DC::RW
2573	new_from_file (SV *class, const char *path, const char *mode = "rb")	2853	new_from_file (SV *klass, const char *path, const char *mode = "rb")
2574	CODE:	2854	CODE:
2575	RETVAL = SDL_RWFromFile (path, mode);	2855	RETVAL = SDL_RWFromFile (path, mode);
2576	OUTPUT:	2856	OUTPUT:
2577	RETVAL	2857	RETVAL
2578		2858
…		…
2596	if (RETVAL < 0)	2876	if (RETVAL < 0)
2597	{	2877	{
2598	RETVAL = Mix_GroupOldest (-1);	2878	RETVAL = Mix_GroupOldest (-1);
2599		2879
2600	if (RETVAL < 0)	2880	if (RETVAL < 0)
		2881	{
		2882	// happens sometimes, maybe it just stopped playing(?)
		2883	RETVAL = Mix_GroupAvailable (-1);
		2884
		2885	if (RETVAL < 0)
2601	XSRETURN_UNDEF;	2886	XSRETURN_UNDEF;
2602		2887	}
		2888	else
2603	Mix_HaltChannel (RETVAL);	2889	Mix_HaltChannel (RETVAL);
2604	}	2890	}
2605		2891
2606	Mix_UnregisterAllEffects (RETVAL);	2892	Mix_UnregisterAllEffects (RETVAL);
2607	Mix_Volume (RETVAL, 128);	2893	Mix_Volume (RETVAL, 128);
2608	}	2894	}
…		…
2655	void	2941	void
2656	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2942	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2657	CODE:	2943	CODE:
2658	{	2944	{
2659	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2945	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2660	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2946	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2661	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2947	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2662	}	2948	}
2663		2949
2664	void	2950	void
2665	set_reverse_stereo (DC::Channel self, int flip)	2951	set_reverse_stereo (DC::Channel self, int flip)
…		…
2668		2954
2669	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2955	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2670		2956
2671	PROTOTYPES: DISABLE	2957	PROTOTYPES: DISABLE
2672		2958
		2959	void
		2960	decoders ()
		2961	PPCODE:
		2962	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2963	int i, num = Mix_GetNumChunkDecoders ();
		2964	EXTEND (SP, num);
		2965	for (i = 0; i < num; ++i)
		2966	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2967	#else
		2968	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2969	#endif
		2970
2673	DC::MixChunk	2971	DC::MixChunk
2674	new (SV *class, DC::RW rwops)	2972	new (SV *klass, DC::RW rwops)
2675	CODE:	2973	CODE:
2676	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2974	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2677	OUTPUT:	2975	OUTPUT:
2678	RETVAL	2976	RETVAL
2679		2977
…		…
2709	OUTPUT:	3007	OUTPUT:
2710	RETVAL	3008	RETVAL
2711		3009
2712	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	3010	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2713		3011
		3012	void
		3013	decoders ()
		3014	PPCODE:
		3015	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		3016	int i, num = Mix_GetNumMusicDecoders ();
		3017	EXTEND (SP, num);
		3018	for (i = 0; i < num; ++i)
		3019	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3020	#else
		3021	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3022	#endif
		3023
2714	int	3024	int
2715	volume (int volume = -1)	3025	volume (int volume = -1)
2716	PROTOTYPE: ;$	3026	PROTOTYPE: ;$
2717	CODE:	3027	CODE:
2718	if (items > 0)	3028	if (items > 0)
…		…
2729	void	3039	void
2730	halt ()	3040	halt ()
2731	CODE:	3041	CODE:
2732	Mix_HaltMusic ();	3042	Mix_HaltMusic ();
2733		3043
		3044	int
		3045	playing ()
		3046	CODE:
		3047	RETVAL = Mix_PlayingMusic ();
		3048	OUTPUT:
		3049	RETVAL
		3050
2734	DC::MixMusic	3051	DC::MixMusic
2735	new (SV *class, DC::RW rwops)	3052	new (SV *klass, DC::RW rwops)
2736	CODE:	3053	CODE:
2737	RETVAL = Mix_LoadMUS_RW (rwops);	3054	RETVAL = Mix_LoadMUS_RW (rwops);
2738	OUTPUT:	3055	OUTPUT:
2739	RETVAL	3056	RETVAL
2740		3057
…		…
2768	} *civ, const_iv[] = {	3085	} *civ, const_iv[] = {
2769	# define const_iv(name) { # name, (IV)name }	3086	# define const_iv(name) { # name, (IV)name }
2770	const_iv (GL_VENDOR),	3087	const_iv (GL_VENDOR),
2771	const_iv (GL_VERSION),	3088	const_iv (GL_VERSION),
2772	const_iv (GL_EXTENSIONS),	3089	const_iv (GL_EXTENSIONS),
		3090	const_iv (GL_MAX_TEXTURE_UNITS),
2773	const_iv (GL_COLOR_MATERIAL),	3091	const_iv (GL_COLOR_MATERIAL),
2774	const_iv (GL_SMOOTH),	3092	const_iv (GL_SMOOTH),
2775	const_iv (GL_FLAT),	3093	const_iv (GL_FLAT),
2776	const_iv (GL_DITHER),	3094	const_iv (GL_DITHER),
2777	const_iv (GL_BLEND),	3095	const_iv (GL_BLEND),
…		…
2789	const_iv (GL_ZERO),	3107	const_iv (GL_ZERO),
2790	const_iv (GL_SRC_ALPHA),	3108	const_iv (GL_SRC_ALPHA),
2791	const_iv (GL_DST_ALPHA),	3109	const_iv (GL_DST_ALPHA),
2792	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3110	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2793	const_iv (GL_ONE_MINUS_DST_ALPHA),	3111	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3112	const_iv (GL_SRC_COLOR),
		3113	const_iv (GL_DST_COLOR),
		3114	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3115	const_iv (GL_ONE_MINUS_DST_COLOR),
2794	const_iv (GL_SRC_ALPHA_SATURATE),	3116	const_iv (GL_SRC_ALPHA_SATURATE),
2795	const_iv (GL_RGB),	3117	const_iv (GL_RGB),
2796	const_iv (GL_RGBA),	3118	const_iv (GL_RGBA),
2797	const_iv (GL_RGBA4),	3119	const_iv (GL_RGBA4),
2798	const_iv (GL_RGBA8),	3120	const_iv (GL_RGBA8),
…		…
2866	const_iv (GL_NICEST),	3188	const_iv (GL_NICEST),
2867	const_iv (GL_V2F),	3189	const_iv (GL_V2F),
2868	const_iv (GL_V3F),	3190	const_iv (GL_V3F),
2869	const_iv (GL_T2F_V3F),	3191	const_iv (GL_T2F_V3F),
2870	const_iv (GL_T2F_N3F_V3F),	3192	const_iv (GL_T2F_N3F_V3F),
		3193	const_iv (GL_FUNC_ADD),
		3194	const_iv (GL_FUNC_SUBTRACT),
		3195	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2871	# undef const_iv	3196	# undef const_iv
2872	};	3197	};
2873		3198
2874	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3199	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2875	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3200	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2876		3201
2877	texture_av = newAV ();	3202	texture_av = newAV ();
2878	AvREAL_off (texture_av);	3203	AvREAL_off (texture_av);
2879	}	3204	}
2880		3205
…		…
2882	disable_GL_EXT_blend_func_separate ()	3207	disable_GL_EXT_blend_func_separate ()
2883	CODE:	3208	CODE:
2884	gl.BlendFuncSeparate = 0;	3209	gl.BlendFuncSeparate = 0;
2885	gl.BlendFuncSeparateEXT = 0;	3210	gl.BlendFuncSeparateEXT = 0;
2886		3211
2887	char *	3212	void
		3213	apple_nvidia_bug (int enable)
		3214
		3215	const char *
2888	gl_vendor ()	3216	gl_vendor ()
2889	CODE:	3217	CODE:
2890	RETVAL = (char *)glGetString (GL_VENDOR);	3218	RETVAL = (const char *)glGetString (GL_VENDOR);
2891	OUTPUT:	3219	OUTPUT:
2892	RETVAL	3220	RETVAL
2893		3221
2894	char *	3222	const char *
2895	gl_version ()	3223	gl_version ()
2896	CODE:	3224	CODE:
2897	RETVAL = (char *)glGetString (GL_VERSION);	3225	RETVAL = (const char *)glGetString (GL_VERSION);
2898	OUTPUT:	3226	OUTPUT:
2899	RETVAL	3227	RETVAL
2900		3228
2901	char *	3229	const char *
2902	gl_extensions ()	3230	gl_extensions ()
2903	CODE:	3231	CODE:
2904	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3232	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2905	OUTPUT:	3233	OUTPUT:
2906	RETVAL	3234	RETVAL
2907		3235
2908	const char *glGetString (GLenum pname)	3236	const char *glGetString (GLenum pname)
		3237	CODE:
		3238	RETVAL = (const char *)glGetString (pname);
		3239	OUTPUT:
		3240	RETVAL
2909		3241
2910	GLint glGetInteger (GLenum pname)	3242	GLint glGetInteger (GLenum pname)
2911	CODE:	3243	CODE:
2912	glGetIntegerv (pname, &RETVAL);	3244	glGetIntegerv (pname, &RETVAL);
2913	OUTPUT:	3245	OUTPUT:
…		…
2921		3253
2922	int glGetError ()	3254	int glGetError ()
2923		3255
2924	void glFinish ()	3256	void glFinish ()
2925		3257
		3258	void glFlush ()
		3259
2926	void glClear (int mask)	3260	void glClear (int mask)
2927		3261
2928	void glClearColor (float r, float g, float b, float a = 1.0)	3262	void glClearColor (float r, float g, float b, float a = 1.0)
2929	PROTOTYPE: @	3263	PROTOTYPE: @
2930		3264
…		…
2939	void glBlendFunc (int sfactor, int dfactor)	3273	void glBlendFunc (int sfactor, int dfactor)
2940		3274
2941	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3275	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2942	CODE:	3276	CODE:
2943	gl_BlendFuncSeparate (sa, da, saa, daa);	3277	gl_BlendFuncSeparate (sa, da, saa, daa);
		3278
		3279	# void glBlendEquation (int se)
2944		3280
2945	void glDepthMask (int flag)	3281	void glDepthMask (int flag)
2946		3282
2947	void glLogicOp (int opcode)	3283	void glLogicOp (int opcode)
2948		3284
…		…
2983	void glRotate (float angle, float x, float y, float z)	3319	void glRotate (float angle, float x, float y, float z)
2984	CODE:	3320	CODE:
2985	glRotatef (angle, x, y, z);	3321	glRotatef (angle, x, y, z);
2986		3322
2987	void glColor (float r, float g, float b, float a = 1.0)	3323	void glColor (float r, float g, float b, float a = 1.0)
		3324	PROTOTYPE: @
2988	ALIAS:	3325	ALIAS:
2989	glColor_premultiply = 1	3326	glColor_premultiply = 1
2990	CODE:	3327	CODE:
2991	if (ix)	3328	if (ix)
2992	{	3329	{
…		…
3098		3435
3099	void glEndList ()	3436	void glEndList ()
3100		3437
3101	void glCallList (int list)	3438	void glCallList (int list)
3102		3439
		3440	void c_init ()
		3441	CODE:
		3442	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3443	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3444
3103	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3445	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3104		3446
3105	PROTOTYPES: DISABLE	3447	PROTOTYPES: DISABLE
3106		3448
3107	void	3449	void
3108	find_widget (SV *self, NV x, NV y)	3450	find_widget (SV *self, NV x, NV y)
3109	PPCODE:	3451	PPCODE:
3110	{	3452	{
3111	if (within_widget (self, x, y))	3453	if (within_widget (self, x, y))
3112	XPUSHs (self);	3454	XPUSHs (self);
3113	}	3455	}
3114		3456
3115	BOOT:	3457	BOOT:
3116	{	3458	{
…		…
3124		3466
3125	void	3467	void
3126	draw (SV *self)	3468	draw (SV *self)
3127	CODE:	3469	CODE:
3128	{	3470	{
3129	HV *hv;	3471	HV *hv;
3130	SV **svp;	3472	SV **svp;
3131	NV x, y, w, h;	3473	NV x, y, w, h;
3132	SV *draw_x_sv = GvSV (draw_x_gv);	3474	SV *draw_x_sv = GvSV (draw_x_gv);
3133	SV *draw_y_sv = GvSV (draw_y_gv);	3475	SV *draw_y_sv = GvSV (draw_y_gv);
3134	SV *draw_w_sv = GvSV (draw_w_gv);	3476	SV *draw_w_sv = GvSV (draw_w_gv);
3135	SV *draw_h_sv = GvSV (draw_h_gv);	3477	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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