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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 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>
…		…
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
44	/* work around os x broken headers */	43	/* work around os x broken headers */
45	#ifdef __MACOSX__	44	#ifdef __MACOSX__
46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	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);
47	#endif	48	#endif
48		49
49	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
50	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
51		52
52	#include <glib/gmacros.h>	53	#include <glib.h>
53		54
54	#include <pango/pango.h>	55	#include <pango/pango.h>
55		56
56	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
57	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
81	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
82	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
83		84
84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85		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 */
86	#define FOW_DARKNESS 64	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
97		101
98	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3	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	}
101		123
102	static AV *texture_av;	124	static AV *texture_av;
103		125
104	static struct	126	static struct
105	{	127	{
…		…
162	{	184	{
163	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
164		186
165	while (attrs)	187	while (attrs)
166	{	188	{
167	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
168		190
169	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
170	return 1;	192	return 1;
171		193
172	attrs = attrs->next;	194	attrs = attrs->next;
…		…
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
462	}	484	}
463		485
464	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
465	minpot (unsigned int n)	493	minpot (unsigned int n)
466	{	494	{
467	if (!n)	495	if (!n)
468	return 0;	496	return 0;
469		497
…		…
549		577
550	return mod;	578	return mod;
551	}	579	}
552		580
553	static void	581	static void
554	deliantra_main ()	582	deliantra_main (SV *real_main)
555	{	583	{
556	char *argv[] = { 0 };	584	dSP;
557	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
558	}	588	}
559		589
560	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
561	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
563	* on OS X, so... we provide one and call the original main(), which,	595	* on OS X, so... we provide one and call the original main(), which,
564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
566	*/	598	*/
567	extern C_LINKAGE int	599	extern C_LINKAGE int
568	main (int argc, char *argv[])	600	main (int argc, char *argv[])
569	{	601	{
570	deliantra_main ();	602	deliantra_main (real_main);
571	}	603	}
572		604
573	#undef main	605	#undef main
574		606
575	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
576		608
577	static void	609	static void
578	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
579	{	611	{
		612	real_main = real_main_;
		613
580	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
581	(main) (1, argv);	615	(main) (1, argv);
582	}	616	}
583	#else	617	#else
584	static void	618	static void
585	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
586	{	620	{
587	deliantra_main ();	621	deliantra_main (real_main);
588	}	622	}
589	#endif	623	#endif
590		624
591	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
592		626
…		…
793		827
794	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
795	# undef const_iv	829	# undef const_iv
796	};	830	};
797		831
798	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	832	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		834
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	837	}
804		838
…		…
820	NV ceil (NV x)	854	NV ceil (NV x)
821		855
822	IV minpot (UV n)	856	IV minpot (UV n)
823		857
824	IV popcount (UV n)	858	IV popcount (UV n)
		859
		860	NV distance (NV dx, NV dy)
		861	CODE:
		862	RETVAL = pow (dx * dx + dy * dy, 0.5);
		863	OUTPUT:
		864	RETVAL
825		865
826	void	866	void
827	pango_init ()	867	pango_init ()
828	CODE:	868	CODE:
829	{	869	{
…		…
837	#endif	877	#endif
838	}	878	}
839		879
840	char *SDL_GetError ()	880	char *SDL_GetError ()
841		881
842	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
843		884
844	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
845		886
846	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
847		888
848	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
849		890
850	void SDL_Quit ()	891	void SDL_Quit ()
851		892
852	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
853		895
854	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
855	CODE:	897	CODE:
856	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
858	OUTPUT:	900	OUTPUT:
859	RETVAL	901	RETVAL
860		902
861	void	903	void
…		…
916	);	958	);
917		959
918	if (RETVAL)	960	if (RETVAL)
919	{	961	{
920	av_clear (texture_av);	962	av_clear (texture_av);
921
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	963	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924	#include "glfunc.h"	964	#include "glfunc.h"
925	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	968	}
927	}	969	}
928	OUTPUT:	970	OUTPUT:
929	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
930		975
931	void	976	void
932	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
933		978
934	char *	979	char *
935	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
936		982
937	int	983	int
938	SDL_GetAppState ()	984	SDL_GetAppState ()
939		985
940	int	986	int
941	SDL_GetModState ()	987	SDL_GetModState ()
942		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
943	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
944	poll_events ()	997	peep_events ()
945	PPCODE:	998	PPCODE:
946	{	999	{
947	SDL_Event ev;	1000	SDL_Event ev;
948		1001
949	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1015		1068
1016	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1069	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1017	}	1070	}
1018	}	1071	}
1019		1072
		1073	char *
		1074	SDL_AudioDriverName ()
		1075	CODE:
		1076	{
		1077	char buf [256];
		1078	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1079	XSRETURN_UNDEF;
		1080
		1081	RETVAL = buf;
		1082	}
		1083	OUTPUT:
		1084	RETVAL
		1085
1020	int	1086	int
1021	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1087	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1022	POSTCALL:	1088	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1086	add_font (char *file)	1152	add_font (char *file)
1087	CODE:	1153	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1155	OUTPUT:
1090	RETVAL	1156	RETVAL
		1157
		1158	void
		1159	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1160
		1161	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1162	void
		1163	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1091		1164
1092	void	1165	void
1093	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1094	ALIAS:	1167	ALIAS:
1095	load_image_file = 1	1168	load_image_file = 1
…		…
1141		1214
1142	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1143	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1144	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1145	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1146	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1147	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1220	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1151		1224
…		…
1223	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1224		1297
1225	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1226		1299
1227	DC::Font	1300	DC::Font
1228	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1229	CODE:	1302	CODE:
1230	{	1303	{
1231	int count;	1304	int count;
1232	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1233	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1262	PROTOTYPE:	1335	PROTOTYPE:
1263	CODE:	1336	CODE:
1264	tc_restore ();	1337	tc_restore ();
1265		1338
1266	DC::Layout	1339	DC::Layout
1267	new (SV *class)	1340	new (SV *klass)
1268	CODE:	1341	CODE:
1269	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1270		1343
1271	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1272	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1421		1494
1422	void	1495	void
1423	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1424	CODE:	1497	CODE:
1425	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1426	{	1499	{
1427	self->base_height = base_height;	1500	self->base_height = base_height;
1428	layout_update_font (self);	1501	layout_update_font (self);
1429	}	1502	}
1430		1503
1431	void	1504	void
…		…
1659	glDisable (GL_BLEND);	1732	glDisable (GL_BLEND);
1660	}	1733	}
1661	}	1734	}
1662		1735
1663	void	1736	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	1737	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)
1665	PROTOTYPE: @	1738	PROTOTYPE: @
1666	CODE:	1739	CODE:
1667	{	1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668	glEnable (GL_TEXTURE_2D);	1743	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1744	glBindTexture (GL_TEXTURE_2D, name1);
1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672		1745
1673	glColor4f (intensity, intensity, intensity, 0.9);	1746	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1747	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1748	glScalef (1./3, 1./3, 1.);
1676		1749
		1750	if (blend > 0.f)
		1751	{
		1752	float dx3 = dx * -3.f / w;
		1753	float dy3 = dy * -3.f / h;
		1754	GLfloat env_color[4] = { 0., 0., 0., blend };
		1755
		1756	/* interpolate the two shadow textures */
		1757	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1759
		1760	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1761	gl.ActiveTexture (GL_TEXTURE1);
		1762	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1763	glBindTexture (GL_TEXTURE_2D, name2);
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1765
		1766	/* rgb == rgb(glcolor) */
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1770
		1771	/* alpha = interpolate t0, t1 by env_alpha */
		1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1773
		1774	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1775	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1777
		1778	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1780
		1781	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1782	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1783
		1784	glBegin (GL_QUADS);
		1785	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1787	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1788	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1789	glEnd ();
		1790
		1791	glDisable (GL_TEXTURE_2D);
		1792	gl.ActiveTexture (GL_TEXTURE0);
		1793	}
		1794	else
		1795	{
		1796	/* simple blending of one texture, also opengl <1.3 path */
		1797	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1798
		1799	glBegin (GL_QUADS);
		1800	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1801	glTexCoord2f (0, t); glVertex2f (0, h);
		1802	glTexCoord2f (s, t); glVertex2f (w, h);
		1803	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1804	glEnd ();
		1805	}
		1806
		1807	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1808	{
		1809	int x, y;
		1810	int dx3 = dx * 3;
		1811	int dy3 = dy * 3;
		1812
		1813	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1814	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1815	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1816	glTranslatef (-1., -1., 0);
1679	glBegin (GL_QUADS);	1817	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1818
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1819	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1820	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1821	int y1 = y - dy3;
		1822	int y1valid = y1 >= 0 && y1 < h;
		1823
		1824	for (x = 1; x < w; x += 3)
		1825	{
		1826	int x1 = x - dx3;
		1827	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1828	uint8_t h2;
		1829
		1830	if (y1valid && x1 >= 0 && x1 < w)
		1831	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1832	else
		1833	h2 = 1; /* out of range == invisible */
		1834
		1835	if (h1 \|\| h2)
		1836	{
		1837	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1838	glColor4f (1., 1., 1., alpha);
		1839
		1840	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1841	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1842	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1843	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1844	}
		1845	}
		1846	}
		1847	}
		1848
1684	glEnd ();	1849	glEnd ();
1685		1850
1686	glPopMatrix ();	1851	glPopMatrix ();
1687		1852
1688	glDisable (GL_TEXTURE_2D);	1853	glDisable (GL_TEXTURE_2D);
…		…
1703	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1704		1869
1705	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1706		1871
1707	DC::Map	1872	DC::Map
1708	new (SV *class)	1873	new (SV *klass)
1709	CODE:	1874	CODE:
1710	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1711	RETVAL->x = 0;	1876	RETVAL->x = 0;
1712	RETVAL->y = 0;	1877	RETVAL->y = 0;
1713	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1869	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1870	}	2035	}
1871	}	2036	}
1872		2037
1873	SV *	2038	SV *
1874	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1875	CODE:	2040	CODE:
1876	{	2041	{
1877	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1878	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1879	mapcell *cell;	2044	mapcell *cell;
…		…
1900		2065
1901	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
1902		2067
1903	if (flags & 8)	2068	if (flags & 8)
1904	{	2069	{
		2070	uint8_t ext, cmd;
		2071
1905	if (extmap)	2072	do
1906	{	2073	{
1907	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
1908		2076
1909	do	2077	if (cmd < 4)
		2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2079	else if (cmd == 5) // health
1910	{	2080	{
1911	ext = *data++;
1912	cmd = ext & 0x7f;
1913
1914	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;
1916	else if (cmd == 5) // health
1917	{
1918	cell->stat_width = 1;	2081	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1920	}
1921	else if (cmd == 6) // monster width
1922	cell->stat_width = *data++ + 1;
1923	else if (cmd == 0x47)
1924	{
1925	if (*data == 1) cell->player = data [1];
1926	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930	data += *data + 1;
1931	}
1932	else if (cmd == 8) // cell flags
1933	cell->flags = *data++;
1934	else if (ext & 0x40) // unknown, multibyte => skip
1935	data += *data + 1;
1936	else
1937	data++;
1938	}	2083	}
1939	while (ext & 0x80);	2084	else if (cmd == 6) // monster width
		2085	cell->stat_width = *data++ + 1;
		2086	else if (cmd == 0x47)
		2087	{
		2088	if (*data == 1) cell->player = data [1];
		2089	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2090	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2091	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2092
		2093	data += *data + 1;
		2094	}
		2095	else if (cmd == 8) // cell flags
		2096	cell->flags = *data++;
		2097	else if (ext & 0x40) // unknown, multibyte => skip
		2098	data += *data + 1;
		2099	else
		2100	data++;
1940	}	2101	}
1941	else	2102	while (ext & 0x80);
1942	cell->darkness = *data++ + 1;
1943	}	2103	}
1944		2104
1945	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
1946	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
1947	{	2107	{
…		…
1995	? self->row + y	2155	? self->row + y
1996	: 0;	2156	: 0;
1997		2157
1998	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
1999	{	2159	{
2000	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2001		2161
2002	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2003	{	2163	{
2004	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2005		2165
…		…
2007	{	2167	{
2008	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2009	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2010	int a1 = tex.a;	2170	int a1 = tex.a;
2011		2171
2012	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2013	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2014	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2015	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2016	}	2176	}
2017	}	2177	}
2018		2178
2019	*map++ = (r )	2179	*map++ = (r )
2020	\| (g << 8)	2180	\| (g << 8)
…		…
2027	}	2187	}
2028	OUTPUT:	2188	OUTPUT:
2029	RETVAL	2189	RETVAL
2030		2190
2031	void	2191	void
2032	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2192	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)
2033	CODE:	2193	CODE:
2034	{	2194	{
2035	int x, y, z;	2195	int x, y, z;
2036		2196
2037	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2041	int pl_x, pl_y;	2201	int pl_x, pl_y;
2042	maptex pl_tex;	2202	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2204	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2205	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2206	rc_array_t *arr;
2047		2207
2048	pl_tex.name = 0;	2208	pl_tex.name = 0;
2049		2209
2050	// that's current max. sorry.	2210	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
…		…
2088	}	2248	}
2089		2249
2090	glEnable (GL_BLEND);	2250	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094	key.texname = self->tex [TEXID_HIDDEN].name;
2095	arr_hidden = rc_array (rc_ov, &key);
2096		2253
2097	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
2098	{	2255	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2257	key.texname = -1;
…		…
2124		2281
2125	key.texname = tex.name;	2282	key.texname = tex.name;
2126	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2127	}	2284	}
2128		2285
2129	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2130	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2131		2288
2132	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2133	{	2290	{
2134	pl_x = px;	2291	pl_x = px;
2135	pl_y = py;	2292	pl_y = py;
…		…
2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2337	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2181	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2338	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2182	}	2339	}
2183	}	2340	}
2184		2341
2185	if (expect_false (z == 2))	2342	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2343	{
2187	/* draw question marks on top of hidden spaces */	2344	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2345	if (cell->flags & 1)
2189	{	2346	{
2190	maptex tex = self->tex [TEXID_HIDDEN];
2191	int px = (x + 1) * T - tex.w;
2192	int py = (y + 1) * T - tex.h;
2193
2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198	}
2199
2200	if (expect_false (cell->flags))
2201	{
2202	// overlays such as the speech bubble, probably more to come
2203	if (cell->flags & 1)
2204	{
2205	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2349	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2210		2352
2211	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2213		2355
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2358	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218	}
2219	}	2360	}
2220	}	2361	}
2221	}	2362	}
2222	}	2363	}
2223		2364
…		…
2250	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2251	&& skey->level == level	2392	&& skey->level == level
2252	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2253	{	2394	{
2254	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2255	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2256	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2257	int border = bits & 15;	2398	int border = bits & 15;
2258	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2260	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2261		2402
…		…
2274		2415
2275	if (border)	2416	if (border)
2276	{	2417	{
2277	float ox = border * dx;	2418	float ox = border * dx;
2278		2419
2279	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283	}	2424	}
2284		2425
2285	if (corner)	2426	if (corner)
2286	{	2427	{
2287	float ox = corner * dx;	2428	float ox = corner * dx;
2288		2429
2289	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293	}	2434	}
2294	}	2435	}
2295	}	2436	}
2296	}	2437	}
2297	}	2438	}
…		…
2338	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2339	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2340	{	2481	{
2341	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2342		2483
2343	int px = x * T;	2484	int px = x * Tw;
2344	int py = y * T;	2485	int py = y * Th;
2345		2486
2346	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2347	{	2488	{
2348	px += sdx;	2489	px += sdx;
2349	py += sdy;	2490	py += sdy;
2350	}	2491	}
2351		2492
2352	if (cell->stat_hp)	2493	if (cell->stat_hp)
2353	{	2494	{
2354	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356		2497
2357	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2358	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2359	px + width - 1, py);	2500	px + width - 1, py);
2360		2501
…		…
2366	}	2507	}
2367	}	2508	}
2368	}	2509	}
2369		2510
2370	void	2511	void
2371	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2512	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2372	CODE:	2513	CODE:
2373	{	2514	{
2374	static float color[16][3] = {	2515	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2516	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2517	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2518	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2519	{ 1.00f, 0.00f, 0.00f },
2379		2520
2380	{ 1.00F, 0.54F, 0.00F },	2521	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2522	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2523	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2524	{ 0.18f, 0.54f, 0.34f },
2384		2525
2385	{ 0.56F, 0.73F, 0.56F },	2526	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2527	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2528	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2529	{ 0.99f, 0.77f, 0.26f },
2389		2530
2390	{ 0.74F, 0.65F, 0.41F },	2531	{ 0.74f, 0.65f, 0.41f },
2391		2532
2392	{ 0.00F, 1.00F, 1.00F },	2533	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2534	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2535	{ 1.00f, 1.00f, 0.00f },
2395	};	2536	};
2396		2537
2397	int x, y;	2538	int x, y;
2398		2539
2399	glEnable (GL_TEXTURE_2D);	2540	glEnable (GL_TEXTURE_2D);
2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2541	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2542	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2543	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2544	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2545	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2546	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2547	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2548	glEnable (GL_BLEND);
…		…
2415		2556
2416	if (m)	2557	if (m)
2417	{	2558	{
2418	float *c = color [m & 15];	2559	float *c = color [m & 15];
2419		2560
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2561	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2562	float tx2 = tx1 + 0.5f;
2422		2563
2423	glColor4f (c[0], c[1], c[2], 1);	2564	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2565	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2566	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2567	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2577	void
2437	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2578	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2438	PPCODE:	2579	PPCODE:
2439	{	2580	{
2440	int x, y;	2581	int x, y;
2441	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2444	int sw34 = (sw * 3 + 3) & ~3;	2585	int sw3 = sw * 3;
		2586	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2587	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2589	memset (darkness1, 0, sw1*sh1);
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2590
2449	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2593
2452	mx += self->x - 1;	2594	mx += self->x - 1;
2453	my += self->y - 1;	2595	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2596
2457	for (y = 0; y < sh1; y++)	2597	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2598	if (0 <= y + my && y + my < self->rows)
2459	{	2599	{
2460	maprow *row = self->row + (y + my);	2600	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2603	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2604	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2605	mapcell *cell = row->col + (x + mx - row->c0);
2466		2606
2467	darkness1 [y * sw1 + x] = cell->darkness	2607	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2608	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2609	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2610	}
2471	}	2611	}
2472		2612
2473	for (y = 0; y < sh; ++y)	2613	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2614	for (x = 0; x < sw; ++x)
…		…
2493		2633
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2634	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2635	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2636	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2637
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2503	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2647	}
2508		2648
2509	free (darkness1);	2649	free (darkness1);
2510		2650
2511	EXTEND (SP, 3);	2651	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2652	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2653	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2654	PUSHs (darkness3_sv);
2515	}	2655	}
2516		2656
2517	SV *	2657	SV *
…		…
2604	STRLEN len;	2744	STRLEN len;
2605	uint8_t data, end;	2745	uint8_t data, end;
2606		2746
2607	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2608	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610	end = data + len + 8;	2750	end = data + len + 8;
2611		2751
2612	if (len < 5)	2752	if (len < 5)
2613	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2614		2754
…		…
2675	}	2815	}
2676		2816
2677	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2678		2818
2679	DC::RW	2819	DC::RW
2680	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2681	CODE:	2821	CODE:
2682	{	2822	{
2683	STRLEN datalen;	2823	STRLEN datalen;
2684	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2685		2825
…		…
2687	}	2827	}
2688	OUTPUT:	2828	OUTPUT:
2689	RETVAL	2829	RETVAL
2690		2830
2691	DC::RW	2831	DC::RW
2692	new_from_file (SV class, const char path, const char *mode = "rb")	2832	new_from_file (SV klass, const char path, const char *mode = "rb")
2693	CODE:	2833	CODE:
2694	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2695	OUTPUT:	2835	OUTPUT:
2696	RETVAL	2836	RETVAL
2697		2837
…		…
2715	if (RETVAL < 0)	2855	if (RETVAL < 0)
2716	{	2856	{
2717	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2718		2858
2719	if (RETVAL < 0)	2859	if (RETVAL < 0)
		2860	{
		2861	// happens sometimes, maybe it just stopped playing(?)
		2862	RETVAL = Mix_GroupAvailable (-1);
		2863
		2864	if (RETVAL < 0)
2720	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2721		2866	}
		2867	else
2722	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2723	}	2869	}
2724		2870
2725	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2726	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2727	}	2873	}
…		…
2774	void	2920	void
2775	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2921	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776	CODE:	2922	CODE:
2777	{	2923	{
2778	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2924	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2779	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2925	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2926	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2927	}
2782		2928
2783	void	2929	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2930	set_reverse_stereo (DC::Channel self, int flip)
…		…
2787		2933
2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789		2935
2790	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2791		2937
		2938	void
		2939	decoders ()
		2940	PPCODE:
		2941	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2942	int i, num = Mix_GetNumChunkDecoders ();
		2943	EXTEND (SP, num);
		2944	for (i = 0; i < num; ++i)
		2945	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2946	#else
		2947	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2948	#endif
		2949
2792	DC::MixChunk	2950	DC::MixChunk
2793	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2794	CODE:	2952	CODE:
2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796	OUTPUT:	2954	OUTPUT:
2797	RETVAL	2955	RETVAL
2798		2956
…		…
2828	OUTPUT:	2986	OUTPUT:
2829	RETVAL	2987	RETVAL
2830		2988
2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832		2990
		2991	void
		2992	decoders ()
		2993	PPCODE:
		2994	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2995	int i, num = Mix_GetNumMusicDecoders ();
		2996	EXTEND (SP, num);
		2997	for (i = 0; i < num; ++i)
		2998	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2999	#else
		3000	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3001	#endif
		3002
2833	int	3003	int
2834	volume (int volume = -1)	3004	volume (int volume = -1)
2835	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2836	CODE:	3006	CODE:
2837	if (items > 0)	3007	if (items > 0)
…		…
2848	void	3018	void
2849	halt ()	3019	halt ()
2850	CODE:	3020	CODE:
2851	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2852		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2853	DC::MixMusic	3030	DC::MixMusic
2854	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2855	CODE:	3032	CODE:
2856	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2857	OUTPUT:	3034	OUTPUT:
2858	RETVAL	3035	RETVAL
2859		3036
…		…
2996	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
2997	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998	# undef const_iv	3175	# undef const_iv
2999	};	3176	};
3000		3177
3001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3178	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003		3180
3004	texture_av = newAV ();	3181	texture_av = newAV ();
3005	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3006	}	3183	}
3007		3184
…		…
3012	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3013		3190
3014	void	3191	void
3015	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3016		3193
3017	char *	3194	const char *
3018	gl_vendor ()	3195	gl_vendor ()
3019	CODE:	3196	CODE:
3020	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3021	OUTPUT:	3198	OUTPUT:
3022	RETVAL	3199	RETVAL
3023		3200
3024	char *	3201	const char *
3025	gl_version ()	3202	gl_version ()
3026	CODE:	3203	CODE:
3027	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3028	OUTPUT:	3205	OUTPUT:
3029	RETVAL	3206	RETVAL
3030		3207
3031	char *	3208	const char *
3032	gl_extensions ()	3209	gl_extensions ()
3033	CODE:	3210	CODE:
3034	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035	OUTPUT:	3212	OUTPUT:
3036	RETVAL	3213	RETVAL
3037		3214
3038	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3039		3220
3040	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3041	CODE:	3222	CODE:
3042	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3043	OUTPUT:	3224	OUTPUT:
…		…
3050	RETVAL	3231	RETVAL
3051		3232
3052	int glGetError ()	3233	int glGetError ()
3053		3234
3054	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3055		3238
3056	void glClear (int mask)	3239	void glClear (int mask)
3057		3240
3058	void glClearColor (float r, float g, float b, float a = 1.0)	3241	void glClearColor (float r, float g, float b, float a = 1.0)
3059	PROTOTYPE: @	3242	PROTOTYPE: @
…		…
3230	void glNewList (int list, int mode = GL_COMPILE)	3413	void glNewList (int list, int mode = GL_COMPILE)
3231		3414
3232	void glEndList ()	3415	void glEndList ()
3233		3416
3234	void glCallList (int list)	3417	void glCallList (int list)
		3418
		3419	void c_init ()
		3420	CODE:
		3421	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3422	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3235		3423
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3424	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3425
3238	PROTOTYPES: DISABLE	3426	PROTOTYPES: DISABLE
3239		3427

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs. Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.319 by root, Sun Nov 18 00:52:22 2018 UTC