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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 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;
…		…
190	static void	212	static void
191	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
192	{	214	{
193	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
194	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
195	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196	#endif	218	#endif
197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198	}	220	}
199		221
200	static void	222	static void
…		…
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
…		…
1658	glDisable (GL_ALPHA_TEST);	1731	glDisable (GL_ALPHA_TEST);
1659	glDisable (GL_BLEND);	1732	glDisable (GL_BLEND);
1660	}	1733	}
1661	}	1734	}
1662		1735
		1736	void
		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)
		1738	PROTOTYPE: @
		1739	CODE:
		1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1743	glEnable (GL_TEXTURE_2D);
		1744	glBindTexture (GL_TEXTURE_2D, name1);
		1745
		1746	glColor3f (intensity, intensity, intensity);
		1747	glPushMatrix ();
		1748	glScalef (1./3, 1./3, 1.);
		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);
		1763	glBindTexture (GL_TEXTURE_2D, name2);
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		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);
		1817	glBegin (GL_QUADS);
		1818
		1819	for (y = 1; y < h; y += 3)
		1820	{
		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
		1849	glEnd ();
		1850
		1851	glPopMatrix ();
		1852
		1853	glDisable (GL_TEXTURE_2D);
		1854	glDisable (GL_BLEND);
		1855	}
		1856
1663	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1857	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1664	CODE:	1858	CODE:
1665	{	1859	{
1666	GLint width;	1860	GLint width;
1667	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1861	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1674	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1675		1869
1676	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1677		1871
1678	DC::Map	1872	DC::Map
1679	new (SV *class)	1873	new (SV *klass)
1680	CODE:	1874	CODE:
1681	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1682	RETVAL->x = 0;	1876	RETVAL->x = 0;
1683	RETVAL->y = 0;	1877	RETVAL->y = 0;
1684	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1840	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1841	}	2035	}
1842	}	2036	}
1843		2037
1844	SV *	2038	SV *
1845	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1846	CODE:	2040	CODE:
1847	{	2041	{
1848	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1849	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1850	mapcell *cell;	2044	mapcell *cell;
…		…
1871		2065
1872	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
1873		2067
1874	if (flags & 8)	2068	if (flags & 8)
1875	{	2069	{
		2070	uint8_t ext, cmd;
		2071
1876	if (extmap)	2072	do
1877	{	2073	{
1878	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
1879		2076
1880	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
1881	{	2080	{
1882	ext = *data++;
1883	cmd = ext & 0x7f;
1884
1885	if (cmd < 4)
1886	cell->darkness = 255 - ext * 64 + 1;
1887	else if (cmd == 5) // health
1888	{
1889	cell->stat_width = 1;	2081	cell->stat_width = 1;
1890	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1891	}
1892	else if (cmd == 6) // monster width
1893	cell->stat_width = *data++ + 1;
1894	else if (cmd == 0x47)
1895	{
1896	if (*data == 1) cell->player = data [1];
1897	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1900
1901	data += *data + 1;
1902	}
1903	else if (cmd == 8) // cell flags
1904	cell->flags = *data++;
1905	else if (ext & 0x40) // unknown, multibyte => skip
1906	data += *data + 1;
1907	else
1908	data++;
1909	}	2083	}
1910	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++;
1911	}	2101	}
1912	else	2102	while (ext & 0x80);
1913	cell->darkness = *data++ + 1;
1914	}	2103	}
1915		2104
1916	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
1917	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
1918	{	2107	{
…		…
1966	? self->row + y	2155	? self->row + y
1967	: 0;	2156	: 0;
1968		2157
1969	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
1970	{	2159	{
1971	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
1972		2161
1973	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
1974	{	2163	{
1975	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
1976		2165
…		…
1978	{	2167	{
1979	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
1980	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
1981	int a1 = tex.a;	2170	int a1 = tex.a;
1982		2171
1983	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
1984	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
1985	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
1986	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
1987	}	2176	}
1988	}	2177	}
1989		2178
1990	*map++ = (r )	2179	*map++ = (r )
1991	\| (g << 8)	2180	\| (g << 8)
…		…
1998	}	2187	}
1999	OUTPUT:	2188	OUTPUT:
2000	RETVAL	2189	RETVAL
2001		2190
2002	void	2191	void
2003	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)
2004	CODE:	2193	CODE:
2005	{	2194	{
2006	int x, y, z;	2195	int x, y, z;
2007		2196
2008	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2012	int pl_x, pl_y;	2201	int pl_x, pl_y;
2013	maptex pl_tex;	2202	maptex pl_tex;
2014	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
2015	rc_t *rc_ov = rc_alloc ();	2204	rc_t *rc_ov = rc_alloc ();
2016	rc_key_t key;	2205	rc_key_t key;
2017	rc_array_t arr, arr_hidden;	2206	rc_array_t *arr;
2018		2207
2019	pl_tex.name = 0;	2208	pl_tex.name = 0;
2020		2209
2021	// that's current max. sorry.	2210	// that's current max. sorry.
2022	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
…		…
2059	}	2248	}
2060		2249
2061	glEnable (GL_BLEND);	2250	glEnable (GL_BLEND);
2062	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2063	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2064
2065	key.texname = self->tex [TEXID_HIDDEN].name;
2066	arr_hidden = rc_array (rc_ov, &key);
2067		2253
2068	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
2069	{	2255	{
2070	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
2071	key.texname = -1;	2257	key.texname = -1;
…		…
2095		2281
2096	key.texname = tex.name;	2282	key.texname = tex.name;
2097	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2098	}	2284	}
2099		2285
2100	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2101	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2102		2288
2103	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2104	{	2290	{
2105	pl_x = px;	2291	pl_x = px;
2106	pl_y = py;	2292	pl_y = py;
…		…
2151	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);
2152	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);
2153	}	2339	}
2154	}	2340	}
2155		2341
2156	if (expect_false (z == 2))	2342	if (expect_false (z == 2) && expect_false (cell->flags))
2157	{	2343	{
2158	/* draw question marks on top of hidden spaces */	2344	// overlays such as the speech bubble, probably more to come
2159	if (!cell->darkness)	2345	if (cell->flags & 1)
2160	{	2346	{
2161	maptex tex = self->tex [TEXID_HIDDEN];
2162	int px = (x + 1) * T - tex.w;
2163	int py = (y + 1) * T - tex.h;
2164
2165	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169	}
2170
2171	if (expect_false (cell->flags))
2172	{
2173	// overlays such as the speech bubble, probably more to come
2174	if (cell->flags & 1)
2175	{
2176	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2177	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2178	rc_array_t *arr;	2349	rc_array_t *arr;
2179	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2180	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2181		2352
2182	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2183	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2184		2355
2185	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2187	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);
2188	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2189	}
2190	}	2360	}
2191	}	2361	}
2192	}	2362	}
2193	}	2363	}
2194		2364
…		…
2221	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2222	&& skey->level == level	2392	&& skey->level == level
2223	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2224	{	2394	{
2225	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2226	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2227	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2228	int border = bits & 15;	2398	int border = bits & 15;
2229	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2230	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2231	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2232		2402
…		…
2245		2415
2246	if (border)	2416	if (border)
2247	{	2417	{
2248	float ox = border * dx;	2418	float ox = border * dx;
2249		2419
2250	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2251	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2252	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2253	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2254	}	2424	}
2255		2425
2256	if (corner)	2426	if (corner)
2257	{	2427	{
2258	float ox = corner * dx;	2428	float ox = corner * dx;
2259		2429
2260	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2261	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2262	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2263	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2264	}	2434	}
2265	}	2435	}
2266	}	2436	}
2267	}	2437	}
2268	}	2438	}
…		…
2309	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2310	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2311	{	2481	{
2312	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2313		2483
2314	int px = x * T;	2484	int px = x * Tw;
2315	int py = y * T;	2485	int py = y * Th;
2316		2486
2317	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2318	{	2488	{
2319	px += sdx;	2489	px += sdx;
2320	py += sdy;	2490	py += sdy;
2321	}	2491	}
2322		2492
2323	if (cell->stat_hp)	2493	if (cell->stat_hp)
2324	{	2494	{
2325	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2326	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2327		2497
2328	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2329	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2330	px + width - 1, py);	2500	px + width - 1, py);
2331		2501
…		…
2337	}	2507	}
2338	}	2508	}
2339	}	2509	}
2340		2510
2341	void	2511	void
2342	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)
2343	CODE:	2513	CODE:
2344	{	2514	{
2345	static float color[16][3] = {	2515	static float color[16][3] = {
2346	{ 0.00F, 0.00F, 0.00F },	2516	{ 0.00f, 0.00f, 0.00f },
2347	{ 1.00F, 1.00F, 1.00F },	2517	{ 1.00f, 1.00f, 1.00f },
2348	{ 0.00F, 0.00F, 0.55F },	2518	{ 0.00f, 0.00f, 0.55f },
2349	{ 1.00F, 0.00F, 0.00F },	2519	{ 1.00f, 0.00f, 0.00f },
2350		2520
2351	{ 1.00F, 0.54F, 0.00F },	2521	{ 1.00f, 0.54f, 0.00f },
2352	{ 0.11F, 0.56F, 1.00F },	2522	{ 0.11f, 0.56f, 1.00f },
2353	{ 0.93F, 0.46F, 0.00F },	2523	{ 0.93f, 0.46f, 0.00f },
2354	{ 0.18F, 0.54F, 0.34F },	2524	{ 0.18f, 0.54f, 0.34f },
2355		2525
2356	{ 0.56F, 0.73F, 0.56F },	2526	{ 0.56f, 0.73f, 0.56f },
2357	{ 0.80F, 0.80F, 0.80F },	2527	{ 0.80f, 0.80f, 0.80f },
2358	{ 0.55F, 0.41F, 0.13F },	2528	{ 0.55f, 0.41f, 0.13f },
2359	{ 0.99F, 0.77F, 0.26F },	2529	{ 0.99f, 0.77f, 0.26f },
2360		2530
2361	{ 0.74F, 0.65F, 0.41F },	2531	{ 0.74f, 0.65f, 0.41f },
2362		2532
2363	{ 0.00F, 1.00F, 1.00F },	2533	{ 0.00f, 1.00f, 1.00f },
2364	{ 1.00F, 0.00F, 1.00F },	2534	{ 1.00f, 0.00f, 1.00f },
2365	{ 1.00F, 1.00F, 0.00F },	2535	{ 1.00f, 1.00f, 0.00f },
2366	};	2536	};
2367		2537
2368	int x, y;	2538	int x, y;
2369		2539
2370	glEnable (GL_TEXTURE_2D);	2540	glEnable (GL_TEXTURE_2D);
2371	/* 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,
2372	* but the nvidia driver (185.18.14) mishandles alpha textures	2542	* but the nvidia driver (185.18.14) mishandles alpha textures
2373	* ansd takes the colour from god knows where instead of using	2543	* and takes the colour from god knows where instead of using
2374	* Cp. MODULATE results in the same colour, but slightly different	2544	* Cp. MODULATE results in the same colour, but slightly different
2375	* alpha, but atcually gives us the correct colour with nvidia.	2545	* alpha, but atcually gives us the correct colour with nvidia.
2376	*/	2546	*/
2377	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2547	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2378	glEnable (GL_BLEND);	2548	glEnable (GL_BLEND);
…		…
2386		2556
2387	if (m)	2557	if (m)
2388	{	2558	{
2389	float *c = color [m & 15];	2559	float *c = color [m & 15];
2390		2560
2391	float tx1 = m & 0x40 ? 0.5 : 0.;	2561	float tx1 = m & 0x40 ? 0.5f : 0.f;
2392	float tx2 = tx1 + 0.5;	2562	float tx2 = tx1 + 0.5f;
2393		2563
2394	glColor4f (c[0], c[1], c[2], 1);	2564	glColor4f (c[0], c[1], c[2], 1);
2395	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2565	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2396	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2566	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2397	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2567	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2407	void	2577	void
2408	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)
2409	PPCODE:	2579	PPCODE:
2410	{	2580	{
2411	int x, y;	2581	int x, y;
2412	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2413	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2414	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2415	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);
2416	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2417	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2589	memset (darkness1, 0, sw1*sh1);
2418	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2419		2590
2420	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2421	SvCUR_set (darkness3_sv, sw34 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2422		2593
2423	mx += self->x - 1;	2594	mx += self->x - 1;
2424	my += self->y - 1;	2595	my += self->y - 1;
2425
2426	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2427		2596
2428	for (y = 0; y < sh1; y++)	2597	for (y = 0; y < sh1; y++)
2429	if (0 <= y + my && y + my < self->rows)	2598	if (0 <= y + my && y + my < self->rows)
2430	{	2599	{
2431	maprow *row = self->row + (y + my);	2600	maprow *row = self->row + (y + my);
…		…
2434	if (row->c0 <= x + mx && x + mx < row->c1)	2603	if (row->c0 <= x + mx && x + mx < row->c1)
2435	{	2604	{
2436	mapcell *cell = row->col + (x + mx - row->c0);	2605	mapcell *cell = row->col + (x + mx - row->c0);
2437		2606
2438	darkness1 [y * sw1 + x] = cell->darkness	2607	darkness1 [y * sw1 + x] = cell->darkness
2439	? 255 - (cell->darkness - 1)	2608	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2440	: 255 - FOW_DARKNESS;	2609	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2441	}	2610	}
2442	}	2611	}
2443		2612
2444	for (y = 0; y < sh; ++y)	2613	for (y = 0; y < sh; ++y)
2445	for (x = 0; x < sw; ++x)	2614	for (x = 0; x < sw; ++x)
…		…
2464		2633
2465	uint8_t r13 = (d13 + d23 + d12) / 3;	2634	uint8_t r13 = (d13 + d23 + d12) / 3;
2466	uint8_t r23 = d23;	2635	uint8_t r23 = d23;
2467	uint8_t r33 = (d23 + d33 + d32) / 3;	2636	uint8_t r33 = (d23 + d33 + d32) / 3;
2468		2637
2469	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2470	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2471	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2472	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2473	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 */
2474	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2475	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2476	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2477	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2478	}	2647	}
2479		2648
2480	free (darkness1);	2649	free (darkness1);
2481		2650
2482	EXTEND (SP, 3);	2651	EXTEND (SP, 3);
2483	PUSHs (sv_2mortal (newSViv (sw34)));	2652	PUSHs (sv_2mortal (newSViv (sw3)));
2484	PUSHs (sv_2mortal (newSViv (sh3)));	2653	PUSHs (sv_2mortal (newSViv (sh3)));
2485	PUSHs (darkness3_sv);	2654	PUSHs (darkness3_sv);
2486	}	2655	}
2487		2656
2488	SV *	2657	SV *
…		…
2575	STRLEN len;	2744	STRLEN len;
2576	uint8_t data, end;	2745	uint8_t data, end;
2577		2746
2578	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2579	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2580	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2581	end = data + len + 8;	2750	end = data + len + 8;
2582		2751
2583	if (len < 5)	2752	if (len < 5)
2584	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2585		2754
…		…
2646	}	2815	}
2647		2816
2648	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2649		2818
2650	DC::RW	2819	DC::RW
2651	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2652	CODE:	2821	CODE:
2653	{	2822	{
2654	STRLEN datalen;	2823	STRLEN datalen;
2655	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2656		2825
…		…
2658	}	2827	}
2659	OUTPUT:	2828	OUTPUT:
2660	RETVAL	2829	RETVAL
2661		2830
2662	DC::RW	2831	DC::RW
2663	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")
2664	CODE:	2833	CODE:
2665	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2666	OUTPUT:	2835	OUTPUT:
2667	RETVAL	2836	RETVAL
2668		2837
…		…
2686	if (RETVAL < 0)	2855	if (RETVAL < 0)
2687	{	2856	{
2688	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2689		2858
2690	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)
2691	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2692		2866	}
		2867	else
2693	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2694	}	2869	}
2695		2870
2696	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2697	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2698	}	2873	}
…		…
2745	void	2920	void
2746	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)
2747	CODE:	2922	CODE:
2748	{	2923	{
2749	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));
2750	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;
2751	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2926	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2752	}	2927	}
2753		2928
2754	void	2929	void
2755	set_reverse_stereo (DC::Channel self, int flip)	2930	set_reverse_stereo (DC::Channel self, int flip)
…		…
2758		2933
2759	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2760		2935
2761	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2762		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
2763	DC::MixChunk	2950	DC::MixChunk
2764	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2765	CODE:	2952	CODE:
2766	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2767	OUTPUT:	2954	OUTPUT:
2768	RETVAL	2955	RETVAL
2769		2956
…		…
2799	OUTPUT:	2986	OUTPUT:
2800	RETVAL	2987	RETVAL
2801		2988
2802	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2803		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
2804	int	3003	int
2805	volume (int volume = -1)	3004	volume (int volume = -1)
2806	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2807	CODE:	3006	CODE:
2808	if (items > 0)	3007	if (items > 0)
…		…
2819	void	3018	void
2820	halt ()	3019	halt ()
2821	CODE:	3020	CODE:
2822	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2823		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2824	DC::MixMusic	3030	DC::MixMusic
2825	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2826	CODE:	3032	CODE:
2827	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2828	OUTPUT:	3034	OUTPUT:
2829	RETVAL	3035	RETVAL
2830		3036
…		…
2858	} *civ, const_iv[] = {	3064	} *civ, const_iv[] = {
2859	# define const_iv(name) { # name, (IV)name }	3065	# define const_iv(name) { # name, (IV)name }
2860	const_iv (GL_VENDOR),	3066	const_iv (GL_VENDOR),
2861	const_iv (GL_VERSION),	3067	const_iv (GL_VERSION),
2862	const_iv (GL_EXTENSIONS),	3068	const_iv (GL_EXTENSIONS),
		3069	const_iv (GL_MAX_TEXTURE_UNITS),
2863	const_iv (GL_COLOR_MATERIAL),	3070	const_iv (GL_COLOR_MATERIAL),
2864	const_iv (GL_SMOOTH),	3071	const_iv (GL_SMOOTH),
2865	const_iv (GL_FLAT),	3072	const_iv (GL_FLAT),
2866	const_iv (GL_DITHER),	3073	const_iv (GL_DITHER),
2867	const_iv (GL_BLEND),	3074	const_iv (GL_BLEND),
…		…
2879	const_iv (GL_ZERO),	3086	const_iv (GL_ZERO),
2880	const_iv (GL_SRC_ALPHA),	3087	const_iv (GL_SRC_ALPHA),
2881	const_iv (GL_DST_ALPHA),	3088	const_iv (GL_DST_ALPHA),
2882	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3089	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2883	const_iv (GL_ONE_MINUS_DST_ALPHA),	3090	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3091	const_iv (GL_SRC_COLOR),
		3092	const_iv (GL_DST_COLOR),
		3093	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3094	const_iv (GL_ONE_MINUS_DST_COLOR),
2884	const_iv (GL_SRC_ALPHA_SATURATE),	3095	const_iv (GL_SRC_ALPHA_SATURATE),
2885	const_iv (GL_RGB),	3096	const_iv (GL_RGB),
2886	const_iv (GL_RGBA),	3097	const_iv (GL_RGBA),
2887	const_iv (GL_RGBA4),	3098	const_iv (GL_RGBA4),
2888	const_iv (GL_RGBA8),	3099	const_iv (GL_RGBA8),
…		…
2962	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
2963	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2964	# undef const_iv	3175	# undef const_iv
2965	};	3176	};
2966		3177
2967	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--)
2968	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2969		3180
2970	texture_av = newAV ();	3181	texture_av = newAV ();
2971	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
2972	}	3183	}
2973		3184
…		…
2978	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
2979		3190
2980	void	3191	void
2981	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
2982		3193
2983	char *	3194	const char *
2984	gl_vendor ()	3195	gl_vendor ()
2985	CODE:	3196	CODE:
2986	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
2987	OUTPUT:	3198	OUTPUT:
2988	RETVAL	3199	RETVAL
2989		3200
2990	char *	3201	const char *
2991	gl_version ()	3202	gl_version ()
2992	CODE:	3203	CODE:
2993	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
2994	OUTPUT:	3205	OUTPUT:
2995	RETVAL	3206	RETVAL
2996		3207
2997	char *	3208	const char *
2998	gl_extensions ()	3209	gl_extensions ()
2999	CODE:	3210	CODE:
3000	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3001	OUTPUT:	3212	OUTPUT:
3002	RETVAL	3213	RETVAL
3003		3214
3004	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3005		3220
3006	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3007	CODE:	3222	CODE:
3008	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3009	OUTPUT:	3224	OUTPUT:
…		…
3016	RETVAL	3231	RETVAL
3017		3232
3018	int glGetError ()	3233	int glGetError ()
3019		3234
3020	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3021		3238
3022	void glClear (int mask)	3239	void glClear (int mask)
3023		3240
3024	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)
3025	PROTOTYPE: @	3242	PROTOTYPE: @
…		…
3196	void glNewList (int list, int mode = GL_COMPILE)	3413	void glNewList (int list, int mode = GL_COMPILE)
3197		3414
3198	void glEndList ()	3415	void glEndList ()
3199		3416
3200	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);
3201		3423
3202	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3424	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3203		3425
3204	PROTOTYPES: DISABLE	3426	PROTOTYPES: DISABLE
3205		3427

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs. Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC