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.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib.h>
48		54
49	#include <pango/pango.h>	55	#include <pango/pango.h>
50		56
51	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
52	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
76	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
77	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
78		84
79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
81	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
82		91
83	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
84	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
85		94
86	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
87		96
88	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
89	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)	98	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
		99
		100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
		104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
90		123
91	static AV *texture_av;	124	static AV *texture_av;
92		125
93	static struct	126	static struct
94	{	127	{
…		…
151	{	184	{
152	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
153		186
154	while (attrs)	187	while (attrs)
155	{	188	{
156	PangoAttribute *attr = attrs->data;	189	PangoAttribute *attr = (PangoAttribute *)attrs->data;
157		190
158	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
159	return 1;	192	return 1;
160		193
161	attrs = attrs->next;	194	attrs = attrs->next;
…		…
179	static void	212	static void
180	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
181	{	214	{
182	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
183	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
184	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
185	#endif	218	#endif
186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
187	}	220	}
188		221
189	static void	222	static void
…		…
226	int w, h;	259	int w, h;
227	float s, t;	260	float s, t;
228	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
229	tileid smoothtile;	262	tileid smoothtile;
230	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
231	} maptex;	265	} maptex;
232		266
233	typedef struct {	267	typedef struct {
234	uint32_t player;	268	uint32_t player;
235	tileid tile[3];	269	tileid tile[3];
…		…
447	ev.data2 = 0;	481	ev.data2 = 0;
448		482
449	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
450	}	484	}
451		485
		486	// approximately divide by 255
		487	static unsigned int
		488	div255 (unsigned int n)
		489	{
		490	return (n + (n >> 8)) >> 8;
		491	}
		492
452	static unsigned int	493	static unsigned int
453	minpot (unsigned int n)	494	minpot (unsigned int n)
454	{	495	{
455	if (!n)	496	if (!n)
456	return 0;	497	return 0;
…		…
521	if (!svp || !SvTRUE (*svp))	562	if (!svp || !SvTRUE (*svp))
522	return 0;	563	return 0;
523		564
524	return 1;	565	return 1;
525	}	566	}
		567
		568	/******************************************************************************/
		569
		570	/* process keyboard modifiers */
		571	static int
		572	mod_munge (int mod)
		573	{
		574	mod &= MOD_MASK;
		575
		576	if (mod & (KMOD_META | KMOD_ALT))
		577	mod |= KMOD_LRAM;
		578
		579	return mod;
		580	}
		581
		582	static void
		583	deliantra_main (SV *real_main)
		584	{
		585	dSP;
		586
		587	PUSHMARK (SP);
		588	call_sv (real_main, G_DISCARD | G_VOID);
		589	}
		590
		591	#ifdef __MACOSX__
		592	static SV *real_main;
		593
		594	/* to due surprising braindamage on the side of SDL design, we
		595	* do some mind-boggling hack here: SDL requires a custom main()
		596	* on OS X, so... we provide one and call the original main(), which,
		597	* due to shared library magic, calls -lSDLmain's main, not perl's main,
		598	* and which calls our main (== SDL_main) back.
		599	*/
		600	extern C_LINKAGE int
		601	main (int argc, char *argv[])
		602	{
		603	deliantra_main (real_main);
		604	}
		605
		606	#undef main
		607
		608	extern C_LINKAGE int main (int argc, char *argv[]);
		609
		610	static void
		611	SDL_main_hack (SV *real_main_)
		612	{
		613	real_main = real_main_;
		614
		615	char *argv[] = { "deliantra client", 0 };
		616	(main) (1, argv);
		617	}
		618	#else
		619	static void
		620	SDL_main_hack (SV *real_main)
		621	{
		622	deliantra_main (real_main);
		623	}
		624	#endif
526		625
527	MODULE = Deliantra::Client PACKAGE = DC	626	MODULE = Deliantra::Client PACKAGE = DC
528		627
529	PROTOTYPES: ENABLE	628	PROTOTYPES: ENABLE
530		629
…		…
559	const_iv (SDL_USEREVENT),	658	const_iv (SDL_USEREVENT),
560		659
561	const_iv (SDL_APPINPUTFOCUS),	660	const_iv (SDL_APPINPUTFOCUS),
562	const_iv (SDL_APPMOUSEFOCUS),	661	const_iv (SDL_APPMOUSEFOCUS),
563	const_iv (SDL_APPACTIVE),	662	const_iv (SDL_APPACTIVE),
		663
		664
		665	const_iv (SDLK_UNKNOWN),
		666	const_iv (SDLK_FIRST),
		667	const_iv (SDLK_BACKSPACE),
		668	const_iv (SDLK_TAB),
		669	const_iv (SDLK_CLEAR),
		670	const_iv (SDLK_RETURN),
		671	const_iv (SDLK_PAUSE),
		672	const_iv (SDLK_ESCAPE),
		673	const_iv (SDLK_SPACE),
		674	const_iv (SDLK_EXCLAIM),
		675	const_iv (SDLK_QUOTEDBL),
		676	const_iv (SDLK_HASH),
		677	const_iv (SDLK_DOLLAR),
		678	const_iv (SDLK_AMPERSAND),
		679	const_iv (SDLK_QUOTE),
		680	const_iv (SDLK_LEFTPAREN),
		681	const_iv (SDLK_RIGHTPAREN),
		682	const_iv (SDLK_ASTERISK),
		683	const_iv (SDLK_PLUS),
		684	const_iv (SDLK_COMMA),
		685	const_iv (SDLK_MINUS),
		686	const_iv (SDLK_PERIOD),
		687	const_iv (SDLK_SLASH),
		688	const_iv (SDLK_0),
		689	const_iv (SDLK_1),
		690	const_iv (SDLK_2),
		691	const_iv (SDLK_3),
		692	const_iv (SDLK_4),
		693	const_iv (SDLK_5),
		694	const_iv (SDLK_6),
		695	const_iv (SDLK_7),
		696	const_iv (SDLK_8),
		697	const_iv (SDLK_9),
		698	const_iv (SDLK_COLON),
		699	const_iv (SDLK_SEMICOLON),
		700	const_iv (SDLK_LESS),
		701	const_iv (SDLK_EQUALS),
		702	const_iv (SDLK_GREATER),
		703	const_iv (SDLK_QUESTION),
		704	const_iv (SDLK_AT),
		705
		706	const_iv (SDLK_LEFTBRACKET),
		707	const_iv (SDLK_BACKSLASH),
		708	const_iv (SDLK_RIGHTBRACKET),
		709	const_iv (SDLK_CARET),
		710	const_iv (SDLK_UNDERSCORE),
		711	const_iv (SDLK_BACKQUOTE),
		712	const_iv (SDLK_DELETE),
564		713
565	const_iv (SDLK_FIRST),	714	const_iv (SDLK_FIRST),
566	const_iv (SDLK_LAST),	715	const_iv (SDLK_LAST),
567	const_iv (SDLK_KP0),	716	const_iv (SDLK_KP0),
568	const_iv (SDLK_KP1),	717	const_iv (SDLK_KP1),
…		…
644	const_iv (KMOD_RMETA),	793	const_iv (KMOD_RMETA),
645	const_iv (KMOD_NUM),	794	const_iv (KMOD_NUM),
646	const_iv (KMOD_CAPS),	795	const_iv (KMOD_CAPS),
647	const_iv (KMOD_MODE),	796	const_iv (KMOD_MODE),
648		797
		798	const_iv (KMOD_LRAM),
		799
649	const_iv (MIX_DEFAULT_FORMAT),	800	const_iv (MIX_DEFAULT_FORMAT),
650		801
651	const_iv (SDL_INIT_TIMER),	802	const_iv (SDL_INIT_TIMER),
652	const_iv (SDL_INIT_AUDIO),	803	const_iv (SDL_INIT_AUDIO),
653	const_iv (SDL_INIT_VIDEO),	804	const_iv (SDL_INIT_VIDEO),
…		…
677		828
678	const_iv (FOW_DARKNESS)	829	const_iv (FOW_DARKNESS)
679	# undef const_iv	830	# undef const_iv
680	};	831	};
681		832
682	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	833	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
683	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
684		835
685	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	836	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
686	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	837	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
687	}	838	}
688		839
…		…
701		852
702	NV floor (NV x)	853	NV floor (NV x)
703		854
704	NV ceil (NV x)	855	NV ceil (NV x)
705		856
706	NV ceilabs (NV x)	857	IV minpot (UV n)
		858
		859	IV popcount (UV n)
		860
		861	NV distance (NV dx, NV dy)
707	CODE:	862	CODE:
708	RETVAL = x < 0. ? - ceil (-x) : ceil (x);	863	RETVAL = pow (dx * dx + dy * dy, 0.5);
709	OUTPUT:	864	OUTPUT:
710	RETVAL	865	RETVAL
711
712	IV minpot (UV n)
713
714	IV popcount (UV n)
715		866
716	void	867	void
717	pango_init ()	868	pango_init ()
718	CODE:	869	CODE:
719	{	870	{
…		…
727	#endif	878	#endif
728	}	879	}
729		880
730	char *SDL_GetError ()	881	char *SDL_GetError ()
731		882
		883	void SDL_main_hack (SV *real_main)
		884	PROTOTYPE: &
		885
732	int SDL_Init (U32 flags)	886	int SDL_Init (U32 flags)
733		887
734	int SDL_InitSubSystem (U32 flags)	888	int SDL_InitSubSystem (U32 flags)
735		889
736	void SDL_QuitSubSystem (U32 flags)	890	void SDL_QuitSubSystem (U32 flags)
737		891
738	void SDL_Quit ()	892	void SDL_Quit ()
739		893
740	int SDL_GL_SetAttribute (int attr, int value)	894	int SDL_GL_SetAttribute (int attr, int value)
		895	C_ARGS: (SDL_GLattr)attr, value
741		896
742	int SDL_GL_GetAttribute (int attr)	897	int SDL_GL_GetAttribute (int attr)
743	CODE:	898	CODE:
744	if (SDL_GL_GetAttribute (attr, &RETVAL))	899	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
745	XSRETURN_UNDEF;	900	XSRETURN_UNDEF;
746	OUTPUT:	901	OUTPUT:
747	RETVAL	902	RETVAL
748		903
749	void	904	void
…		…
804	);	959	);
805		960
806	if (RETVAL)	961	if (RETVAL)
807	{	962	{
808	av_clear (texture_av);	963	av_clear (texture_av);
809
810	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	964	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
812	#include "glfunc.h"	965	#include "glfunc.h"
813	#undef GL_FUNC	966	#undef GL_FUNC
		967	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		968	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814	}	969	}
815	}	970	}
816	OUTPUT:	971	OUTPUT:
817	RETVAL	972	RETVAL
		973
		974	void
		975	SDL_WM_SetCaption (const char *title, const char *icon)
818		976
819	void	977	void
820	SDL_GL_SwapBuffers ()	978	SDL_GL_SwapBuffers ()
821		979
822	char *	980	char *
823	SDL_GetKeyName (int sym)	981	SDL_GetKeyName (int sym)
		982	C_ARGS: (SDLKey)sym
824		983
825	int	984	int
826	SDL_GetAppState ()	985	SDL_GetAppState ()
827		986
828	int	987	int
829	SDL_GetModState ()	988	SDL_GetModState ()
830		989
		990	int
		991	SDL_WaitEvent ()
		992	C_ARGS: 0
		993
831	void	994	void
		995	SDL_PumpEvents ()
		996
		997	void
832	poll_events ()	998	peep_events ()
833	PPCODE:	999	PPCODE:
834	{	1000	{
835	SDL_Event ev;	1001	SDL_Event ev;
836		1002
837	SDL_PumpEvents ();	1003	SDL_PumpEvents ();
…		…
844	{	1010	{
845	case SDL_KEYDOWN:	1011	case SDL_KEYDOWN:
846	case SDL_KEYUP:	1012	case SDL_KEYUP:
847	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	1013	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	1014	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	1015	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
850	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	1016	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
851	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1017	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852	break;	1018	break;
853		1019
854	case SDL_ACTIVEEVENT:	1020	case SDL_ACTIVEEVENT:
855	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1021	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
873	x = ev.motion.x;	1039	x = ev.motion.x;
874	y = ev.motion.y;	1040	y = ev.motion.y;
875	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1041	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876	}	1042	}
877		1043
878	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1044	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879	hv_store (hv, "state", 5, newSViv (state), 0);	1045	hv_store (hv, "state", 5, newSViv (state), 0);
880	hv_store (hv, "x", 1, newSViv (x), 0);	1046	hv_store (hv, "x", 1, newSViv (x), 0);
881	hv_store (hv, "y", 1, newSViv (y), 0);	1047	hv_store (hv, "y", 1, newSViv (y), 0);
882	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1048	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1049	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
903		1069
904	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1070	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
905	}	1071	}
906	}	1072	}
907		1073
		1074	char *
		1075	SDL_AudioDriverName ()
		1076	CODE:
		1077	{
		1078	char buf [256];
		1079	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1080	XSRETURN_UNDEF;
		1081
		1082	RETVAL = buf;
		1083	}
		1084	OUTPUT:
		1085	RETVAL
		1086
908	int	1087	int
909	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1088	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
910	POSTCALL:	1089	POSTCALL:
911	Mix_HookMusicFinished (music_finished);	1090	Mix_HookMusicFinished (music_finished);
912	Mix_ChannelFinished (channel_finished);	1091	Mix_ChannelFinished (channel_finished);
913		1092
914	void	1093	void
915	Mix_QuerySpec ()	1094	Mix_QuerySpec ()
…		…
974	add_font (char *file)	1153	add_font (char *file)
975	CODE:	1154	CODE:
976	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1155	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977	OUTPUT:	1156	OUTPUT:
978	RETVAL	1157	RETVAL
		1158
		1159	void
		1160	IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
		1161
		1162	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1163	void
		1164	Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
979		1165
980	void	1166	void
981	load_image_inline (SV *image_)	1167	load_image_inline (SV *image_)
982	ALIAS:	1168	ALIAS:
983	load_image_file = 1	1169	load_image_file = 1
…		…
1029		1215
1030	SDL_LockSurface (surface2);	1216	SDL_LockSurface (surface2);
1031	EXTEND (SP, 6);	1217	EXTEND (SP, 6);
1032	PUSHs (sv_2mortal (newSViv (surface2->w)));	1218	PUSHs (sv_2mortal (newSViv (surface2->w)));
1033	PUSHs (sv_2mortal (newSViv (surface2->h)));	1219	PUSHs (sv_2mortal (newSViv (surface2->h)));
1034	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1220	PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1035	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1221	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1036	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1222	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1037	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1223	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1038	SDL_UnlockSurface (surface2);	1224	SDL_UnlockSurface (surface2);
1039		1225
…		…
1099	#if DEBUG	1285	#if DEBUG
1100	VALGRIND_DO_LEAK_CHECK;	1286	VALGRIND_DO_LEAK_CHECK;
1101	#endif	1287	#endif
1102	}	1288	}
1103		1289
		1290	int
		1291	SvREFCNT (SV *sv)
		1292	CODE:
		1293	RETVAL = SvREFCNT (sv);
		1294	OUTPUT:
		1295	RETVAL
		1296
1104	MODULE = Deliantra::Client PACKAGE = DC::Font	1297	MODULE = Deliantra::Client PACKAGE = DC::Font
1105		1298
1106	PROTOTYPES: DISABLE	1299	PROTOTYPES: DISABLE
1107		1300
1108	DC::Font	1301	DC::Font
1109	new_from_file (SV *class, char *path, int id = 0)	1302	new_from_file (SV *klass, char *path, int id = 0)
1110	CODE:	1303	CODE:
1111	{	1304	{
1112	int count;	1305	int count;
1113	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1306	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1114	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1307	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1143	PROTOTYPE:	1336	PROTOTYPE:
1144	CODE:	1337	CODE:
1145	tc_restore ();	1338	tc_restore ();
1146		1339
1147	DC::Layout	1340	DC::Layout
1148	new (SV *class)	1341	new (SV *klass)
1149	CODE:	1342	CODE:
1150	New (0, RETVAL, 1, struct cf_layout);	1343	New (0, RETVAL, 1, struct cf_layout);
1151		1344
1152	RETVAL->pl = pango_layout_new (opengl_context);	1345	RETVAL->pl = pango_layout_new (opengl_context);
1153	RETVAL->r = 1.;	1346	RETVAL->r = 1.;
…		…
1302		1495
1303	void	1496	void
1304	set_height (DC::Layout self, int base_height)	1497	set_height (DC::Layout self, int base_height)
1305	CODE:	1498	CODE:
1306	if (self->base_height != base_height)	1499	if (self->base_height != base_height)
1307	{	1500	{
1308	self->base_height = base_height;	1501	self->base_height = base_height;
1309	layout_update_font (self);	1502	layout_update_font (self);
1310	}	1503	}
1311		1504
1312	void	1505	void
…		…
1539	glDisable (GL_ALPHA_TEST);	1732	glDisable (GL_ALPHA_TEST);
1540	glDisable (GL_BLEND);	1733	glDisable (GL_BLEND);
1541	}	1734	}
1542	}	1735	}
1543		1736
		1737	void
		1738	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)
		1739	PROTOTYPE: @
		1740	CODE:
		1741	{
		1742	glEnable (GL_BLEND);
		1743	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1744	glEnable (GL_TEXTURE_2D);
		1745	glBindTexture (GL_TEXTURE_2D, name1);
		1746
		1747	glColor3f (intensity, intensity, intensity);
		1748	glPushMatrix ();
		1749	glScalef (1./3, 1./3, 1.);
		1750
		1751	if (blend > 0.f)
		1752	{
		1753	float dx3 = dx * -3.f / w;
		1754	float dy3 = dy * -3.f / h;
		1755	GLfloat env_color[4] = { 0., 0., 0., blend };
		1756
		1757	/* interpolate the two shadow textures */
		1758	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1760
		1761	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1762	gl.ActiveTexture (GL_TEXTURE1);
		1763	glEnable (GL_TEXTURE_2D);
		1764	glBindTexture (GL_TEXTURE_2D, name2);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1766
		1767	/* rgb == rgb(glcolor) */
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1771
		1772	/* alpha = interpolate t0, t1 by env_alpha */
		1773	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1774
		1775	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1778
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1781
		1782	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1783	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1784
		1785	glBegin (GL_QUADS);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1787	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1788	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1789	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1790	glEnd ();
		1791
		1792	glDisable (GL_TEXTURE_2D);
		1793	gl.ActiveTexture (GL_TEXTURE0);
		1794	}
		1795	else
		1796	{
		1797	/* simple blending of one texture, also opengl <1.3 path */
		1798	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1799
		1800	glBegin (GL_QUADS);
		1801	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1802	glTexCoord2f (0, t); glVertex2f (0, h);
		1803	glTexCoord2f (s, t); glVertex2f (w, h);
		1804	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1805	glEnd ();
		1806	}
		1807
		1808	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1809	{
		1810	int x, y;
		1811	int dx3 = dx * 3;
		1812	int dy3 = dy * 3;
		1813
		1814	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1815	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1816	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1817	glTranslatef (-1., -1., 0);
		1818	glBegin (GL_QUADS);
		1819
		1820	for (y = 1; y < h; y += 3)
		1821	{
		1822	int y1 = y - dy3;
		1823	int y1valid = y1 >= 0 && y1 < h;
		1824
		1825	for (x = 1; x < w; x += 3)
		1826	{
		1827	int x1 = x - dx3;
		1828	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1829	uint8_t h2;
		1830
		1831	if (y1valid && x1 >= 0 && x1 < w)
		1832	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1833	else
		1834	h2 = 1; /* out of range == invisible */
		1835
		1836	if (h1 || h2)
		1837	{
		1838	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1839	glColor4f (1., 1., 1., alpha);
		1840
		1841	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1842	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1843	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1844	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1845	}
		1846	}
		1847	}
		1848	}
		1849
		1850	glEnd ();
		1851
		1852	glPopMatrix ();
		1853
		1854	glDisable (GL_TEXTURE_2D);
		1855	glDisable (GL_BLEND);
		1856	}
		1857
1544	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1858	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545	CODE:	1859	CODE:
1546	{	1860	{
1547	GLint width;	1861	GLint width;
1548	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1862	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1555	MODULE = Deliantra::Client PACKAGE = DC::Map	1869	MODULE = Deliantra::Client PACKAGE = DC::Map
1556		1870
1557	PROTOTYPES: DISABLE	1871	PROTOTYPES: DISABLE
1558		1872
1559	DC::Map	1873	DC::Map
1560	new (SV *class)	1874	new (SV *klass)
1561	CODE:	1875	CODE:
1562	New (0, RETVAL, 1, struct map);	1876	New (0, RETVAL, 1, struct map);
1563	RETVAL->x = 0;	1877	RETVAL->x = 0;
1564	RETVAL->y = 0;	1878	RETVAL->y = 0;
1565	RETVAL->w = 0;	1879	RETVAL->w = 0;
…		…
1604		1918
1605	void	1919	void
1606	set_smooth (DC::Map self, int face, int smooth, int level)	1920	set_smooth (DC::Map self, int face, int smooth, int level)
1607	CODE:	1921	CODE:
1608	{	1922	{
1609	tileid texid;	1923	tileid texid;
1610	maptex *tex;	1924	maptex *tex;
1611		1925
1612	if (face < 0 || face >= self->faces)	1926	if (face < 0 || face >= self->faces)
1613	return;	1927	return;
1614		1928
1615	if (smooth < 0 || smooth >= self->faces)	1929	if (smooth < 0 || smooth >= self->faces)
1616	return;	1930	return;
1617		1931
1618	texid = self->face2tile [face];	1932	texid = self->face2tile [face];
1619		1933
1620	if (!texid)	1934	if (!texid)
1621	return;	1935	return;
1622		1936
1623	tex = self->tex + texid;	1937	tex = self->tex + texid;
…		…
1652	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1966	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653	// use uglier nearest interpolation because linear suffers	1967	// use uglier nearest interpolation because linear suffers
1654	// from transparent color bleeding and ugly wrapping effects.	1968	// from transparent color bleeding and ugly wrapping effects.
1655	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1969	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656	}	1970	}
		1971
		1972	void
		1973	expire_textures (DC::Map self, int texid, int count)
		1974	PPCODE:
		1975	for (; texid < self->texs && count; ++texid, --count)
		1976	{
		1977	maptex *tex = self->tex + texid;
		1978
		1979	if (tex->name)
		1980	{
		1981	if (tex->unused)
		1982	{
		1983	tex->name = 0;
		1984	tex->unused = 0;
		1985	XPUSHs (sv_2mortal (newSViv (texid)));
		1986	}
		1987	else
		1988	tex->unused = 1;
		1989	}
		1990	}
1657		1991
1658	int	1992	int
1659	ox (DC::Map self)	1993	ox (DC::Map self)
1660	ALIAS:	1994	ALIAS:
1661	oy = 1	1995	oy = 1
…		…
1701	self->y += MAP_EXTEND_Y;	2035	self->y += MAP_EXTEND_Y;
1702	}	2036	}
1703	}	2037	}
1704		2038
1705	SV *	2039	SV *
1706	map1a_update (DC::Map self, SV *data_, int extmap)	2040	map1a_update (DC::Map self, SV *data_)
1707	CODE:	2041	CODE:
1708	{	2042	{
1709	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	2043	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1710	uint8_t *data_end = (uint8_t *)SvEND (data_);	2044	uint8_t *data_end = (uint8_t *)SvEND (data_);
1711	mapcell *cell;	2045	mapcell *cell;
…		…
1732		2066
1733	//TODO: don't trust server data to be in-range(!)	2067	//TODO: don't trust server data to be in-range(!)
1734		2068
1735	if (flags & 8)	2069	if (flags & 8)
1736	{	2070	{
		2071	uint8_t ext, cmd;
		2072
1737	if (extmap)	2073	do
1738	{	2074	{
1739	uint8_t ext, cmd;	2075	ext = *data++;
		2076	cmd = ext & 0x7f;
1740		2077
1741	do	2078	if (cmd < 4)
		2079	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2080	else if (cmd == 5) // health
1742	{	2081	{
1743	ext = *data++;
1744	cmd = ext & 0x7f;
1745
1746	if (cmd < 4)
1747	cell->darkness = 255 - ext * 64 + 1;
1748	else if (cmd == 5) // health
1749	{
1750	cell->stat_width = 1;	2082	cell->stat_width = 1;
1751	cell->stat_hp = *data++;	2083	cell->stat_hp = *data++;
1752	}
1753	else if (cmd == 6) // monster width
1754	cell->stat_width = *data++ + 1;
1755	else if (cmd == 0x47)
1756	{
1757	if (*data == 1) cell->player = data [1];
1758	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1761
1762	data += *data + 1;
1763	}
1764	else if (cmd == 8) // cell flags
1765	cell->flags = *data++;
1766	else if (ext & 0x40) // unknown, multibyte => skip
1767	data += *data + 1;
1768	else
1769	data++;
1770	}	2084	}
1771	while (ext & 0x80);	2085	else if (cmd == 6) // monster width
		2086	cell->stat_width = *data++ + 1;
		2087	else if (cmd == 0x47)
		2088	{
		2089	if (*data == 1) cell->player = data [1];
		2090	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2091	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2092	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2093
		2094	data += *data + 1;
		2095	}
		2096	else if (cmd == 8) // cell flags
		2097	cell->flags = *data++;
		2098	else if (ext & 0x40) // unknown, multibyte => skip
		2099	data += *data + 1;
		2100	else
		2101	data++;
1772	}	2102	}
1773	else	2103	while (ext & 0x80);
1774	cell->darkness = *data++ + 1;
1775	}	2104	}
1776		2105
1777	for (z = 0; z <= 2; ++z)	2106	for (z = 0; z <= 2; ++z)
1778	if (flags & (4 >> z))	2107	if (flags & (4 >> z))
1779	{	2108	{
…		…
1782	cell->tile [z] = self->face2tile [face];	2111	cell->tile [z] = self->face2tile [face];
1783		2112
1784	if (cell->tile [z])	2113	if (cell->tile [z])
1785	{	2114	{
1786	maptex *tex = self->tex + cell->tile [z];	2115	maptex *tex = self->tex + cell->tile [z];
		2116	tex->unused = 0;
1787	if (!tex->name)	2117	if (!tex->name)
1788	av_push (missing, newSViv (cell->tile [z]));	2118	av_push (missing, newSViv (cell->tile [z]));
1789		2119
1790	if (tex->smoothtile)	2120	if (tex->smoothtile)
1791	{	2121	{
1792	maptex *smooth = self->tex + tex->smoothtile;	2122	maptex *smooth = self->tex + tex->smoothtile;
		2123	smooth->unused = 0;
1793	if (!smooth->name)	2124	if (!smooth->name)
1794	av_push (missing, newSViv (tex->smoothtile));	2125	av_push (missing, newSViv (tex->smoothtile));
1795	}	2126	}
1796	}	2127	}
1797	}	2128	}
…		…
1825	? self->row + y	2156	? self->row + y
1826	: 0;	2157	: 0;
1827		2158
1828	for (x = x0; x < x1; x++)	2159	for (x = x0; x < x1; x++)
1829	{	2160	{
1830	int r = 32, g = 32, b = 32, a = 192;	2161	unsigned int r = 32, g = 32, b = 32, a = 192;
1831		2162
1832	if (row && row->c0 <= x && x < row->c1)	2163	if (row && row->c0 <= x && x < row->c1)
1833	{	2164	{
1834	mapcell *cell = row->col + (x - row->c0);	2165	mapcell *cell = row->col + (x - row->c0);
1835		2166
…		…
1837	{	2168	{
1838	maptex tex = self->tex [cell->tile [z]];	2169	maptex tex = self->tex [cell->tile [z]];
1839	int a0 = 255 - tex.a;	2170	int a0 = 255 - tex.a;
1840	int a1 = tex.a;	2171	int a1 = tex.a;
1841		2172
1842	r = (r * a0 + tex.r * a1) / 255;	2173	r = div255 (r * a0 + tex.r * a1);
1843	g = (g * a0 + tex.g * a1) / 255;	2174	g = div255 (g * a0 + tex.g * a1);
1844	b = (b * a0 + tex.b * a1) / 255;	2175	b = div255 (b * a0 + tex.b * a1);
1845	a = (a * a0 + tex.a * a1) / 255;	2176	a = div255 (a * a0 + tex.a * a1);
1846	}	2177	}
1847	}	2178	}
1848		2179
1849	*map++ = (r )	2180	*map++ = (r )
1850	| (g << 8)	2181	| (g << 8)
1851	| (b << 16)	2182	| (b << 16)
1852	| (a << 24);	2183	| (a << 24);
1853	}	2184	}
1854	}	2185	}
1855		2186
1856	RETVAL = map_sv;	2187	RETVAL = map_sv;
1857	}	2188	}
1858	OUTPUT:	2189	OUTPUT:
1859	RETVAL	2190	RETVAL
1860		2191
1861	void	2192	void
1862	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2193	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)
1863	CODE:	2194	CODE:
1864	{	2195	{
1865	int x, y, z;	2196	int x, y, z;
1866		2197
1867	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2198	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1868	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2199	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2200	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1870	smooth_key skey;	2201	smooth_key skey;
1871	int pl_x, pl_y;	2202	int pl_x, pl_y;
1872	maptex pl_tex;	2203	maptex pl_tex;
1873	rc_t *rc = rc_alloc ();	2204	rc_t *rc = rc_alloc ();
		2205	rc_t *rc_ov = rc_alloc ();
1874	rc_key_t key;	2206	rc_key_t key;
1875	rc_array_t *arr;	2207	rc_array_t *arr;
1876		2208
1877	pl_tex.name = 0;	2209	pl_tex.name = 0;
1878		2210
1879	// thats current max. sorry.	2211	// that's current max. sorry.
1880	if (sw > 255) sw = 255;	2212	if (sw > 255) sw = 255;
1881	if (sh > 255) sh = 255;	2213	if (sh > 255) sh = 255;
1882		2214
1883	// clear key, in case of extra padding	2215	// clear key, in case of extra padding
1884	memset (&skey, 0, sizeof (skey));	2216	memset (&skey, 0, sizeof (skey));
…		…
1888	key.g = 255;	2220	key.g = 255;
1889	key.b = 255;	2221	key.b = 255;
1890	key.a = 255;	2222	key.a = 255;
1891	key.mode = GL_QUADS;	2223	key.mode = GL_QUADS;
1892	key.format = GL_T2F_V3F;	2224	key.format = GL_T2F_V3F;
1893	key.texname = -1;
1894		2225
1895	mx += self->x;	2226	mx += self->x;
1896	my += self->y;	2227	my += self->y;
1897		2228
1898	// first pass: determine smooth_max	2229	// first pass: determine smooth_max
…		…
1922	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2253	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923		2254
1924	for (z = 0; z <= 2; z++)	2255	for (z = 0; z <= 2; z++)
1925	{	2256	{
1926	memset (smooth_level, 0, sizeof (smooth_level));	2257	memset (smooth_level, 0, sizeof (smooth_level));
		2258	key.texname = -1;
1927		2259
1928	for (y = 0; y < sh; y++)	2260	for (y = 0; y < sh; y++)
1929	if (0 <= y + my && y + my < self->rows)	2261	if (0 <= y + my && y + my < self->rows)
1930	{	2262	{
1931	maprow *row = self->row + (y + my);	2263	maprow *row = self->row + (y + my);
…		…
1937	tileid tile = cell->tile [z];	2269	tileid tile = cell->tile [z];
1938		2270
1939	if (tile)	2271	if (tile)
1940	{	2272	{
1941	maptex tex = self->tex [tile];	2273	maptex tex = self->tex [tile];
1942	int px = (x + 1) * T - tex.w;	2274	int px, py;
1943	int py = (y + 1) * T - tex.h;
1944		2275
1945	if (key.texname != tex.name)	2276	if (key.texname != tex.name)
1946	{	2277	{
		2278	self->tex [tile].unused = 0;
		2279
1947	if (!tex.name)	2280	if (!tex.name)
1948	tex = self->tex [2]; /* missing, replace by noface */	2281	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949		2282
1950	key.texname = tex.name;	2283	key.texname = tex.name;
1951	arr = rc_array (rc, &key);	2284	arr = rc_array (rc, &key);
1952	}	2285	}
		2286
		2287	px = (x + 1) * Th - tex.w;
		2288	py = (y + 1) * Tw - tex.h;
1953		2289
1954	if (expect_false (cell->player == player) && expect_false (z == 2))	2290	if (expect_false (cell->player == player) && expect_false (z == 2))
1955	{	2291	{
1956	pl_x = px;	2292	pl_x = px;
1957	pl_y = py;	2293	pl_y = py;
…		…
1962	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2298	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2299	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2300	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2301	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966		2302
1967	if (expect_false (cell->flags) && expect_false (z == 2))
1968	{
1969	// overlays such as the speech bubble, probably more to come
1970	if (cell->flags & 1)
1971	{
1972	maptex tex = self->tex [1];
1973	int px = x * T + T * 2 / 32;
1974	int py = y * T - T * 6 / 32;
1975
1976	if (tex.name)
1977	{
1978	if (key.texname != tex.name)
1979	{
1980	key.texname = tex.name;
1981	arr = rc_array (rc, &key);
1982	}
1983
1984	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988	}
1989	}
1990	}
1991
1992	// update smooth hash	2303	// update smooth hash
1993	if (tex.smoothtile)	2304	if (tex.smoothtile)
1994	{	2305	{
1995	skey.tile = tex.smoothtile;	2306	skey.tile = tex.smoothtile;
1996	skey.level = tex.smoothlevel;	2307	skey.level = tex.smoothlevel;
…		…
2024	// corners	2335	// corners
2025	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2336	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2026	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2337	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2027	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2338	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2028	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2339	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2340	}
		2341	}
		2342
		2343	if (expect_false (z == 2) && expect_false (cell->flags))
		2344	{
		2345	// overlays such as the speech bubble, probably more to come
		2346	if (cell->flags & 1)
		2347	{
		2348	rc_key_t key_ov = key;
		2349	maptex tex = self->tex [TEXID_SPEECH];
		2350	rc_array_t *arr;
		2351	int px = x * Tw + Tw * 2 / 32;
		2352	int py = y * Th - Th * 6 / 32;
		2353
		2354	key_ov.texname = tex.name;
		2355	arr = rc_array (rc_ov, &key_ov);
		2356
		2357	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2358	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2359	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2360	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2029	}	2361	}
2030	}	2362	}
2031	}	2363	}
2032	}	2364	}
2033		2365
…		…
2060	if (!(bits & 0x1000)	2392	if (!(bits & 0x1000)
2061	&& skey->level == level	2393	&& skey->level == level
2062	&& level > smooth_max [skey->x][skey->y])	2394	&& level > smooth_max [skey->x][skey->y])
2063	{	2395	{
2064	maptex tex = self->tex [skey->tile];	2396	maptex tex = self->tex [skey->tile];
2065	int px = (((int)skey->x) - 1) * T;	2397	int px = (((int)skey->x) - 1) * Tw;
2066	int py = (((int)skey->y) - 1) * T;	2398	int py = (((int)skey->y) - 1) * Th;
2067	int border = bits & 15;	2399	int border = bits & 15;
2068	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2400	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069	float dx = tex.s * .0625f; // 16 images/row	2401	float dx = tex.s * .0625f; // 16 images/row
2070	float dy = tex.t * .5f ; // 2 images/column	2402	float dy = tex.t * .5f ; // 2 images/column
2071		2403
…		…
2073	{	2405	{
2074	// this time avoiding texture state changes	2406	// this time avoiding texture state changes
2075	// save gobs of state changes.	2407	// save gobs of state changes.
2076	if (key.texname != tex.name)	2408	if (key.texname != tex.name)
2077	{	2409	{
		2410	self->tex [skey->tile].unused = 0;
		2411
2078	glEnd ();	2412	glEnd ();
2079	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2413	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080	glBegin (GL_QUADS);	2414	glBegin (GL_QUADS);
2081	}	2415	}
2082		2416
2083	if (border)	2417	if (border)
2084	{	2418	{
2085	float ox = border * dx;	2419	float ox = border * dx;
2086		2420
2087	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2421	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2422	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2423	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2424	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091	}	2425	}
2092		2426
2093	if (corner)	2427	if (corner)
2094	{	2428	{
2095	float ox = corner * dx;	2429	float ox = corner * dx;
2096		2430
2097	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2432	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2433	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101	}	2435	}
2102	}	2436	}
2103	}	2437	}
2104	}	2438	}
2105	}	2439	}
…		…
2128	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2462	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129		2463
2130	rc_draw (rc);	2464	rc_draw (rc);
2131	}	2465	}
2132		2466
		2467	rc_draw (rc_ov);
		2468	rc_clear (rc_ov);
		2469
2133	glDisable (GL_BLEND);	2470	glDisable (GL_BLEND);
2134	rc_free (rc);	2471	rc_free (rc);
		2472	rc_free (rc_ov);
2135		2473
2136	// top layer: overlays such as the health bar	2474	// top layer: overlays such as the health bar
2137	for (y = 0; y < sh; y++)	2475	for (y = 0; y < sh; y++)
2138	if (0 <= y + my && y + my < self->rows)	2476	if (0 <= y + my && y + my < self->rows)
2139	{	2477	{
…		…
2142	for (x = 0; x < sw; x++)	2480	for (x = 0; x < sw; x++)
2143	if (row->c0 <= x + mx && x + mx < row->c1)	2481	if (row->c0 <= x + mx && x + mx < row->c1)
2144	{	2482	{
2145	mapcell *cell = row->col + (x + mx - row->c0);	2483	mapcell *cell = row->col + (x + mx - row->c0);
2146		2484
2147	int px = x * T;	2485	int px = x * Tw;
2148	int py = y * T;	2486	int py = y * Th;
		2487
		2488	if (expect_false (cell->player == player))
		2489	{
		2490	px += sdx;
		2491	py += sdy;
		2492	}
2149		2493
2150	if (cell->stat_hp)	2494	if (cell->stat_hp)
2151	{	2495	{
2152	int width = cell->stat_width * T;	2496	int width = cell->stat_width * Tw;
2153	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2497	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154		2498
2155	glColor3ub (0, 0, 0);	2499	glColor3ub (0, 0, 0);
2156	glRectf (px + 1, py - thick - 2,	2500	glRectf (px + 1, py - thick - 2,
2157	px + width - 1, py);	2501	px + width - 1, py);
2158		2502
…		…
2164	}	2508	}
2165	}	2509	}
2166	}	2510	}
2167		2511
2168	void	2512	void
2169	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2513	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170	CODE:	2514	CODE:
2171	{	2515	{
2172	static float color[16][3] = {	2516	static float color[16][3] = {
2173	{ 0.00F, 0.00F, 0.00F },	2517	{ 0.00f, 0.00f, 0.00f },
2174	{ 1.00F, 1.00F, 1.00F },	2518	{ 1.00f, 1.00f, 1.00f },
2175	{ 0.00F, 0.00F, 0.55F },	2519	{ 0.00f, 0.00f, 0.55f },
2176	{ 1.00F, 0.00F, 0.00F },	2520	{ 1.00f, 0.00f, 0.00f },
2177		2521
2178	{ 1.00F, 0.54F, 0.00F },	2522	{ 1.00f, 0.54f, 0.00f },
2179	{ 0.11F, 0.56F, 1.00F },	2523	{ 0.11f, 0.56f, 1.00f },
2180	{ 0.93F, 0.46F, 0.00F },	2524	{ 0.93f, 0.46f, 0.00f },
2181	{ 0.18F, 0.54F, 0.34F },	2525	{ 0.18f, 0.54f, 0.34f },
2182		2526
2183	{ 0.56F, 0.73F, 0.56F },	2527	{ 0.56f, 0.73f, 0.56f },
2184	{ 0.80F, 0.80F, 0.80F },	2528	{ 0.80f, 0.80f, 0.80f },
2185	{ 0.55F, 0.41F, 0.13F },	2529	{ 0.55f, 0.41f, 0.13f },
2186	{ 0.99F, 0.77F, 0.26F },	2530	{ 0.99f, 0.77f, 0.26f },
2187		2531
2188	{ 0.74F, 0.65F, 0.41F },	2532	{ 0.74f, 0.65f, 0.41f },
2189		2533
2190	{ 0.00F, 1.00F, 1.00F },	2534	{ 0.00f, 1.00f, 1.00f },
2191	{ 1.00F, 0.00F, 1.00F },	2535	{ 1.00f, 0.00f, 1.00f },
2192	{ 1.00F, 1.00F, 0.00F },	2536	{ 1.00f, 1.00f, 0.00f },
2193	};	2537	};
2194		2538
2195	int x, y;	2539	int x, y;
2196		2540
2197	glEnable (GL_TEXTURE_2D);	2541	glEnable (GL_TEXTURE_2D);
		2542	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2543	* but the nvidia driver (185.18.14) mishandles alpha textures
		2544	* and takes the colour from god knows where instead of using
		2545	* Cp. MODULATE results in the same colour, but slightly different
		2546	* alpha, but atcually gives us the correct colour with nvidia.
		2547	*/
2198	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2548	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199	glEnable (GL_BLEND);	2549	glEnable (GL_BLEND);
2200	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2550	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201	glBegin (GL_QUADS);	2551	glBegin (GL_QUADS);
2202		2552
2203	for (y = 0; y < h; y++)	2553	for (y = 0; y < h; y++)
…		…
2207		2557
2208	if (m)	2558	if (m)
2209	{	2559	{
2210	float *c = color [m & 15];	2560	float *c = color [m & 15];
2211		2561
2212	float tx1 = m & 0x40 ? 0.5 : 0.;	2562	float tx1 = m & 0x40 ? 0.5f : 0.f;
2213	float tx2 = tx1 + 0.5;	2563	float tx2 = tx1 + 0.5f;
2214		2564
2215	glColor4f (c[0], c[1], c[2], 0.75);	2565	glColor4f (c[0], c[1], c[2], 1);
2216	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2566	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2567	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2568	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2569	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220	}	2570	}
…		…
2228	void	2578	void
2229	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2579	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230	PPCODE:	2580	PPCODE:
2231	{	2581	{
2232	int x, y;	2582	int x, y;
2233	int sw1 = sw + 2;	2583	int sw1 = sw + 2;
2234	int sh1 = sh + 2;	2584	int sh1 = sh + 2;
2235	int sh3 = sh * 3;	2585	int sh3 = sh * 3;
2236	int sw34 = (sw * 3 + 3) & ~3;	2586	int sw3 = sw * 3;
		2587	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
		2588	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2237	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2589	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2238	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2590	memset (darkness1, 0, sw1*sh1);
2239	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2240		2591
2241	SvPOK_only (darkness3_sv);	2592	SvPOK_only (darkness3_sv);
2242	SvCUR_set (darkness3_sv, sw34 * sh3);	2593	SvCUR_set (darkness3_sv, sw3 * sh3);
2243		2594
2244	mx += self->x - 1;	2595	mx += self->x - 1;
2245	my += self->y - 1;	2596	my += self->y - 1;
2246
2247	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248		2597
2249	for (y = 0; y < sh1; y++)	2598	for (y = 0; y < sh1; y++)
2250	if (0 <= y + my && y + my < self->rows)	2599	if (0 <= y + my && y + my < self->rows)
2251	{	2600	{
2252	maprow *row = self->row + (y + my);	2601	maprow *row = self->row + (y + my);
…		…
2255	if (row->c0 <= x + mx && x + mx < row->c1)	2604	if (row->c0 <= x + mx && x + mx < row->c1)
2256	{	2605	{
2257	mapcell *cell = row->col + (x + mx - row->c0);	2606	mapcell *cell = row->col + (x + mx - row->c0);
2258		2607
2259	darkness1 [y * sw1 + x] = cell->darkness	2608	darkness1 [y * sw1 + x] = cell->darkness
2260	? 255 - (cell->darkness - 1)	2609	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261	: 255 - FOW_DARKNESS;	2610	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262	}	2611	}
2263	}	2612	}
2264		2613
2265	for (y = 0; y < sh; ++y)	2614	for (y = 0; y < sh; ++y)
2266	for (x = 0; x < sw; ++x)	2615	for (x = 0; x < sw; ++x)
…		…
2285		2634
2286	uint8_t r13 = (d13 + d23 + d12) / 3;	2635	uint8_t r13 = (d13 + d23 + d12) / 3;
2287	uint8_t r23 = d23;	2636	uint8_t r23 = d23;
2288	uint8_t r33 = (d23 + d33 + d32) / 3;	2637	uint8_t r33 = (d23 + d33 + d32) / 3;
2289		2638
2290	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299	}	2648	}
2300		2649
2301	free (darkness1);	2650	free (darkness1);
2302		2651
2303	EXTEND (SP, 3);	2652	EXTEND (SP, 3);
2304	PUSHs (sv_2mortal (newSViv (sw34)));	2653	PUSHs (sv_2mortal (newSViv (sw3)));
2305	PUSHs (sv_2mortal (newSViv (sh3)));	2654	PUSHs (sv_2mortal (newSViv (sh3)));
2306	PUSHs (darkness3_sv);	2655	PUSHs (darkness3_sv);
2307	}	2656	}
2308		2657
2309	SV *	2658	SV *
…		…
2372	else	2721	else
2373	*data++ = 0;	2722	*data++ = 0;
2374	}	2723	}
2375	}	2724	}
2376		2725
2377	/* if size is w*h + 5 then no data has been found */	2726	/* if size is w*h + 5 then no data has been found */
2378	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)	2727	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379	{	2728	{
2380	SvPOK_only (data_sv);	2729	SvPOK_only (data_sv);
2381	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2730	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382	}	2731	}
2383		2732
2384	RETVAL = data_sv;	2733	RETVAL = data_sv;
2385	}	2734	}
2386	OUTPUT:	2735	OUTPUT:
2387	RETVAL	2736	RETVAL
2388		2737
2389	void	2738	void
…		…
2396	STRLEN len;	2745	STRLEN len;
2397	uint8_t *data, *end;	2746	uint8_t *data, *end;
2398		2747
2399	len = SvLEN (data_sv);	2748	len = SvLEN (data_sv);
2400	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2749	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401	data = SvPVbyte_nolen (data_sv);	2750	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2402	end = data + len + 8;	2751	end = data + len + 8;
2403		2752
2404	if (len < 5)	2753	if (len < 5)
2405	XSRETURN_EMPTY;	2754	XSRETURN_EMPTY;
2406		2755
…		…
2467	}	2816	}
2468		2817
2469	MODULE = Deliantra::Client PACKAGE = DC::RW	2818	MODULE = Deliantra::Client PACKAGE = DC::RW
2470		2819
2471	DC::RW	2820	DC::RW
2472	new (SV *class, SV *data_sv)	2821	new (SV *klass, SV *data_sv)
2473	CODE:	2822	CODE:
2474	{	2823	{
2475	STRLEN datalen;	2824	STRLEN datalen;
2476	char *data = SvPVbyte (data_sv, datalen);	2825	char *data = SvPVbyte (data_sv, datalen);
2477		2826
…		…
2479	}	2828	}
2480	OUTPUT:	2829	OUTPUT:
2481	RETVAL	2830	RETVAL
2482		2831
2483	DC::RW	2832	DC::RW
2484	new_from_file (SV *class, const char *path, const char *mode = "rb")	2833	new_from_file (SV *klass, const char *path, const char *mode = "rb")
2485	CODE:	2834	CODE:
2486	RETVAL = SDL_RWFromFile (path, mode);	2835	RETVAL = SDL_RWFromFile (path, mode);
2487	OUTPUT:	2836	OUTPUT:
2488	RETVAL	2837	RETVAL
2489		2838
…		…
2507	if (RETVAL < 0)	2856	if (RETVAL < 0)
2508	{	2857	{
2509	RETVAL = Mix_GroupOldest (-1);	2858	RETVAL = Mix_GroupOldest (-1);
2510		2859
2511	if (RETVAL < 0)	2860	if (RETVAL < 0)
		2861	{
		2862	// happens sometimes, maybe it just stopped playing(?)
		2863	RETVAL = Mix_GroupAvailable (-1);
		2864
		2865	if (RETVAL < 0)
2512	XSRETURN_UNDEF;	2866	XSRETURN_UNDEF;
2513		2867	}
		2868	else
2514	Mix_HaltChannel (RETVAL);	2869	Mix_HaltChannel (RETVAL);
2515	}	2870	}
2516		2871
2517	Mix_UnregisterAllEffects (RETVAL);	2872	Mix_UnregisterAllEffects (RETVAL);
2518	Mix_Volume (RETVAL, 128);	2873	Mix_Volume (RETVAL, 128);
2519	}	2874	}
…		…
2566	void	2921	void
2567	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2922	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568	CODE:	2923	CODE:
2569	{	2924	{
2570	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2925	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2926	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2927	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573	}	2928	}
2574		2929
2575	void	2930	void
2576	set_reverse_stereo (DC::Channel self, int flip)	2931	set_reverse_stereo (DC::Channel self, int flip)
…		…
2579		2934
2580	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2935	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581		2936
2582	PROTOTYPES: DISABLE	2937	PROTOTYPES: DISABLE
2583		2938
		2939	void
		2940	decoders ()
		2941	PPCODE:
		2942	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2943	int i, num = Mix_GetNumChunkDecoders ();
		2944	EXTEND (SP, num);
		2945	for (i = 0; i < num; ++i)
		2946	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2947	#else
		2948	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2949	#endif
		2950
2584	DC::MixChunk	2951	DC::MixChunk
2585	new (SV *class, DC::RW rwops)	2952	new (SV *klass, DC::RW rwops)
2586	CODE:	2953	CODE:
2587	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2954	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2588	OUTPUT:	2955	OUTPUT:
2589	RETVAL	2956	RETVAL
2590		2957
…		…
2620	OUTPUT:	2987	OUTPUT:
2621	RETVAL	2988	RETVAL
2622		2989
2623	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2990	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624		2991
		2992	void
		2993	decoders ()
		2994	PPCODE:
		2995	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2996	int i, num = Mix_GetNumMusicDecoders ();
		2997	EXTEND (SP, num);
		2998	for (i = 0; i < num; ++i)
		2999	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3000	#else
		3001	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3002	#endif
		3003
2625	int	3004	int
2626	volume (int volume = -1)	3005	volume (int volume = -1)
2627	PROTOTYPE: ;$	3006	PROTOTYPE: ;$
2628	CODE:	3007	CODE:
2629	if (items > 0)	3008	if (items > 0)
…		…
2640	void	3019	void
2641	halt ()	3020	halt ()
2642	CODE:	3021	CODE:
2643	Mix_HaltMusic ();	3022	Mix_HaltMusic ();
2644		3023
		3024	int
		3025	playing ()
		3026	CODE:
		3027	RETVAL = Mix_PlayingMusic ();
		3028	OUTPUT:
		3029	RETVAL
		3030
2645	DC::MixMusic	3031	DC::MixMusic
2646	new (SV *class, DC::RW rwops)	3032	new (SV *klass, DC::RW rwops)
2647	CODE:	3033	CODE:
2648	RETVAL = Mix_LoadMUS_RW (rwops);	3034	RETVAL = Mix_LoadMUS_RW (rwops);
2649	OUTPUT:	3035	OUTPUT:
2650	RETVAL	3036	RETVAL
2651		3037
…		…
2679	} *civ, const_iv[] = {	3065	} *civ, const_iv[] = {
2680	# define const_iv(name) { # name, (IV)name }	3066	# define const_iv(name) { # name, (IV)name }
2681	const_iv (GL_VENDOR),	3067	const_iv (GL_VENDOR),
2682	const_iv (GL_VERSION),	3068	const_iv (GL_VERSION),
2683	const_iv (GL_EXTENSIONS),	3069	const_iv (GL_EXTENSIONS),
		3070	const_iv (GL_MAX_TEXTURE_UNITS),
2684	const_iv (GL_COLOR_MATERIAL),	3071	const_iv (GL_COLOR_MATERIAL),
2685	const_iv (GL_SMOOTH),	3072	const_iv (GL_SMOOTH),
2686	const_iv (GL_FLAT),	3073	const_iv (GL_FLAT),
2687	const_iv (GL_DITHER),	3074	const_iv (GL_DITHER),
2688	const_iv (GL_BLEND),	3075	const_iv (GL_BLEND),
…		…
2700	const_iv (GL_ZERO),	3087	const_iv (GL_ZERO),
2701	const_iv (GL_SRC_ALPHA),	3088	const_iv (GL_SRC_ALPHA),
2702	const_iv (GL_DST_ALPHA),	3089	const_iv (GL_DST_ALPHA),
2703	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3090	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704	const_iv (GL_ONE_MINUS_DST_ALPHA),	3091	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3092	const_iv (GL_SRC_COLOR),
		3093	const_iv (GL_DST_COLOR),
		3094	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3095	const_iv (GL_ONE_MINUS_DST_COLOR),
2705	const_iv (GL_SRC_ALPHA_SATURATE),	3096	const_iv (GL_SRC_ALPHA_SATURATE),
2706	const_iv (GL_RGB),	3097	const_iv (GL_RGB),
2707	const_iv (GL_RGBA),	3098	const_iv (GL_RGBA),
2708	const_iv (GL_RGBA4),	3099	const_iv (GL_RGBA4),
2709	const_iv (GL_RGBA8),	3100	const_iv (GL_RGBA8),
…		…
2777	const_iv (GL_NICEST),	3168	const_iv (GL_NICEST),
2778	const_iv (GL_V2F),	3169	const_iv (GL_V2F),
2779	const_iv (GL_V3F),	3170	const_iv (GL_V3F),
2780	const_iv (GL_T2F_V3F),	3171	const_iv (GL_T2F_V3F),
2781	const_iv (GL_T2F_N3F_V3F),	3172	const_iv (GL_T2F_N3F_V3F),
		3173	const_iv (GL_FUNC_ADD),
		3174	const_iv (GL_FUNC_SUBTRACT),
		3175	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782	# undef const_iv	3176	# undef const_iv
2783	};	3177	};
2784		3178
2785	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3179	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2786	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3180	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2787		3181
2788	texture_av = newAV ();	3182	texture_av = newAV ();
2789	AvREAL_off (texture_av);	3183	AvREAL_off (texture_av);
2790	}	3184	}
2791		3185
…		…
2793	disable_GL_EXT_blend_func_separate ()	3187	disable_GL_EXT_blend_func_separate ()
2794	CODE:	3188	CODE:
2795	gl.BlendFuncSeparate = 0;	3189	gl.BlendFuncSeparate = 0;
2796	gl.BlendFuncSeparateEXT = 0;	3190	gl.BlendFuncSeparateEXT = 0;
2797		3191
2798	char *	3192	void
		3193	apple_nvidia_bug (int enable)
		3194
		3195	const char *
2799	gl_vendor ()	3196	gl_vendor ()
2800	CODE:	3197	CODE:
2801	RETVAL = (char *)glGetString (GL_VENDOR);	3198	RETVAL = (const char *)glGetString (GL_VENDOR);
2802	OUTPUT:	3199	OUTPUT:
2803	RETVAL	3200	RETVAL
2804		3201
2805	char *	3202	const char *
2806	gl_version ()	3203	gl_version ()
2807	CODE:	3204	CODE:
2808	RETVAL = (char *)glGetString (GL_VERSION);	3205	RETVAL = (const char *)glGetString (GL_VERSION);
2809	OUTPUT:	3206	OUTPUT:
2810	RETVAL	3207	RETVAL
2811		3208
2812	char *	3209	const char *
2813	gl_extensions ()	3210	gl_extensions ()
2814	CODE:	3211	CODE:
2815	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3212	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
2816	OUTPUT:	3213	OUTPUT:
2817	RETVAL	3214	RETVAL
2818		3215
2819	const char *glGetString (GLenum pname)	3216	const char *glGetString (GLenum pname)
		3217	CODE:
		3218	RETVAL = (const char *)glGetString (pname);
		3219	OUTPUT:
		3220	RETVAL
2820		3221
2821	GLint glGetInteger (GLenum pname)	3222	GLint glGetInteger (GLenum pname)
2822	CODE:	3223	CODE:
2823	glGetIntegerv (pname, &RETVAL);	3224	glGetIntegerv (pname, &RETVAL);
2824	OUTPUT:	3225	OUTPUT:
…		…
2832		3233
2833	int glGetError ()	3234	int glGetError ()
2834		3235
2835	void glFinish ()	3236	void glFinish ()
2836		3237
		3238	void glFlush ()
		3239
2837	void glClear (int mask)	3240	void glClear (int mask)
2838		3241
2839	void glClearColor (float r, float g, float b, float a = 1.0)	3242	void glClearColor (float r, float g, float b, float a = 1.0)
2840	PROTOTYPE: @	3243	PROTOTYPE: @
2841		3244
…		…
2850	void glBlendFunc (int sfactor, int dfactor)	3253	void glBlendFunc (int sfactor, int dfactor)
2851		3254
2852	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3255	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853	CODE:	3256	CODE:
2854	gl_BlendFuncSeparate (sa, da, saa, daa);	3257	gl_BlendFuncSeparate (sa, da, saa, daa);
		3258
		3259	# void glBlendEquation (int se)
2855		3260
2856	void glDepthMask (int flag)	3261	void glDepthMask (int flag)
2857		3262
2858	void glLogicOp (int opcode)	3263	void glLogicOp (int opcode)
2859		3264
…		…
2894	void glRotate (float angle, float x, float y, float z)	3299	void glRotate (float angle, float x, float y, float z)
2895	CODE:	3300	CODE:
2896	glRotatef (angle, x, y, z);	3301	glRotatef (angle, x, y, z);
2897		3302
2898	void glColor (float r, float g, float b, float a = 1.0)	3303	void glColor (float r, float g, float b, float a = 1.0)
		3304	PROTOTYPE: @
2899	ALIAS:	3305	ALIAS:
2900	glColor_premultiply = 1	3306	glColor_premultiply = 1
2901	CODE:	3307	CODE:
2902	if (ix)	3308	if (ix)
2903	{	3309	{
…		…
3009		3415
3010	void glEndList ()	3416	void glEndList ()
3011		3417
3012	void glCallList (int list)	3418	void glCallList (int list)
3013		3419
		3420	void c_init ()
		3421	CODE:
		3422	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3423	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3424
3014	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3425	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015		3426
3016	PROTOTYPES: DISABLE	3427	PROTOTYPES: DISABLE
3017		3428
3018	void	3429	void
3019	find_widget (SV *self, NV x, NV y)	3430	find_widget (SV *self, NV x, NV y)
3020	PPCODE:	3431	PPCODE:
3021	{	3432	{
3022	if (within_widget (self, x, y))	3433	if (within_widget (self, x, y))
3023	XPUSHs (self);	3434	XPUSHs (self);
3024	}	3435	}
3025		3436
3026	BOOT:	3437	BOOT:
3027	{	3438	{
…		…
3035		3446
3036	void	3447	void
3037	draw (SV *self)	3448	draw (SV *self)
3038	CODE:	3449	CODE:
3039	{	3450	{
3040	HV *hv;	3451	HV *hv;
3041	SV **svp;	3452	SV **svp;
3042	NV x, y, w, h;	3453	NV x, y, w, h;
3043	SV *draw_x_sv = GvSV (draw_x_gv);	3454	SV *draw_x_sv = GvSV (draw_x_gv);
3044	SV *draw_y_sv = GvSV (draw_y_gv);	3455	SV *draw_y_sv = GvSV (draw_y_gv);
3045	SV *draw_w_sv = GvSV (draw_w_gv);	3456	SV *draw_w_sv = GvSV (draw_w_gv);
3046	SV *draw_h_sv = GvSV (draw_h_gv);	3457	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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