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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.294 by root, Sat Dec 19 05:06: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
87	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	90	#define DARKNESS_ADJUST(n) (n)
88		91
89	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
90	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
91		94
92	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
96		99
97	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
98		101
99	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
100	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
101	#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	}
102		123
103	static AV *texture_av;	124	static AV *texture_av;
104		125
105	static struct	126	static struct
106	{	127	{
…		…
163	{	184	{
164	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
165		186
166	while (attrs)	187	while (attrs)
167	{	188	{
168	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
169		190
170	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
171	return 1;	192	return 1;
172		193
173	attrs = attrs->next;	194	attrs = attrs->next;
…		…
191	static void	212	static void
192	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
193	{	214	{
194	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
195	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
196	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197	#endif	218	#endif
198	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199	}	220	}
200		221
201	static void	222	static void
…		…
461		482
462	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
463	}	484	}
464		485
465	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
466	minpot (unsigned int n)	493	minpot (unsigned int n)
467	{	494	{
468	if (!n)	495	if (!n)
469	return 0;	496	return 0;
470		497
…		…
550		577
551	return mod;	578	return mod;
552	}	579	}
553		580
554	static void	581	static void
555	deliantra_main ()	582	deliantra_main (SV *real_main)
556	{	583	{
557	char *argv[] = { 0 };	584	dSP;
558	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
559	}	588	}
560		589
561	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
562	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
563	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
564	* 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,
565	* 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,
566	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
567	*/	598	*/
568	extern C_LINKAGE int	599	extern C_LINKAGE int
569	main (int argc, char *argv[])	600	main (int argc, char *argv[])
570	{	601	{
571	deliantra_main ();	602	deliantra_main (real_main);
572	}	603	}
573		604
574	#undef main	605	#undef main
575		606
576	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
577		608
578	static void	609	static void
579	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
580	{	611	{
		612	real_main = real_main_;
		613
581	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
582	(main) (1, argv);	615	(main) (1, argv);
583	}	616	}
584	#else	617	#else
585	static void	618	static void
586	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
587	{	620	{
588	deliantra_main ();	621	deliantra_main (real_main);
589	}	622	}
590	#endif	623	#endif
591		624
592	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
593		626
…		…
794		827
795	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
796	# undef const_iv	829	# undef const_iv
797	};	830	};
798		831
799	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--)
800	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801		834
802	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804	}	837	}
805		838
…		…
821	NV ceil (NV x)	854	NV ceil (NV x)
822		855
823	IV minpot (UV n)	856	IV minpot (UV n)
824		857
825	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
826		865
827	void	866	void
828	pango_init ()	867	pango_init ()
829	CODE:	868	CODE:
830	{	869	{
…		…
838	#endif	877	#endif
839	}	878	}
840		879
841	char *SDL_GetError ()	880	char *SDL_GetError ()
842		881
843	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
844		884
845	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
846		886
847	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
848		888
849	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
850		890
851	void SDL_Quit ()	891	void SDL_Quit ()
852		892
853	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
854		895
855	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
856	CODE:	897	CODE:
857	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
858	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
859	OUTPUT:	900	OUTPUT:
860	RETVAL	901	RETVAL
861		902
862	void	903	void
…		…
917	);	958	);
918		959
919	if (RETVAL)	960	if (RETVAL)
920	{	961	{
921	av_clear (texture_av);	962	av_clear (texture_av);
922
923	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924	#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);
925	#include "glfunc.h"	964	#include "glfunc.h"
926	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927	}	968	}
928	}	969	}
929	OUTPUT:	970	OUTPUT:
930	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
931		975
932	void	976	void
933	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
934		978
935	char *	979	char *
936	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
937		982
938	int	983	int
939	SDL_GetAppState ()	984	SDL_GetAppState ()
940		985
941	int	986	int
942	SDL_GetModState ()	987	SDL_GetModState ()
943		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
944	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
945	poll_events ()	997	peep_events ()
946	PPCODE:	998	PPCODE:
947	{	999	{
948	SDL_Event ev;	1000	SDL_Event ev;
949		1001
950	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1016		1068
1017	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))));
1018	}	1070	}
1019	}	1071	}
1020		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
1021	int	1086	int
1022	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)
1023	POSTCALL:	1088	POSTCALL:
1024	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1025	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1087	add_font (char *file)	1152	add_font (char *file)
1088	CODE:	1153	CODE:
1089	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090	OUTPUT:	1155	OUTPUT:
1091	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)
1092		1164
1093	void	1165	void
1094	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1095	ALIAS:	1167	ALIAS:
1096	load_image_file = 1	1168	load_image_file = 1
…		…
1142		1214
1143	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1144	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1145	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1146	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1147	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1148	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)));
1149	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1150	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1151	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1152		1224
…		…
1224	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1225		1297
1226	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1227		1299
1228	DC::Font	1300	DC::Font
1229	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1230	CODE:	1302	CODE:
1231	{	1303	{
1232	int count;	1304	int count;
1233	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1234	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1263	PROTOTYPE:	1335	PROTOTYPE:
1264	CODE:	1336	CODE:
1265	tc_restore ();	1337	tc_restore ();
1266		1338
1267	DC::Layout	1339	DC::Layout
1268	new (SV *class)	1340	new (SV *klass)
1269	CODE:	1341	CODE:
1270	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1271		1343
1272	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1273	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1422		1494
1423	void	1495	void
1424	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1425	CODE:	1497	CODE:
1426	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1427	{	1499	{
1428	self->base_height = base_height;	1500	self->base_height = base_height;
1429	layout_update_font (self);	1501	layout_update_font (self);
1430	}	1502	}
1431		1503
1432	void	1504	void
…		…
1660	glDisable (GL_BLEND);	1732	glDisable (GL_BLEND);
1661	}	1733	}
1662	}	1734	}
1663		1735
1664	void	1736	void
1665	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)	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)
1666	PROTOTYPE: @	1738	PROTOTYPE: @
1667	CODE:	1739	CODE:
1668	{	1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669	glEnable (GL_TEXTURE_2D);	1743	glEnable (GL_TEXTURE_2D);
1670	glEnable (GL_BLEND);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672	glBindTexture (GL_TEXTURE_2D, name1);	1744	glBindTexture (GL_TEXTURE_2D, name1);
1673		1745
1674	glColor3f (intensity, intensity, intensity);	1746	glColor3f (intensity, intensity, intensity);
1675	glPushMatrix ();	1747	glPushMatrix ();
1676	glScalef (1./3, 1./3, 1.);	1748	glScalef (1./3, 1./3, 1.);
1677		1749
1678	if (blend > 0.f)	1750	if (blend > 0.f)
1679	{	1751	{
1680	float S2, T2; /* 0. 0. for texture 2 */	1752	float dx3 = dx * -3.f / w;
1681	float w = w1 > w2 ? w1 : w2;	1753	float dy3 = dy * -3.f / h;
1682	float h = h1 > h2 ? h1 : h2;
1683	GLfloat env_color[4] = { 0., 0., 0., blend };	1754	GLfloat env_color[4] = { 0., 0., 0., blend };
1684		1755
1685	/* interpolate the two shadow textures */	1756	/* interpolate the two shadow textures */
1686	/* stage 0 == rgb(glcolor) + alpha(t0) */	1757	/* stage 0 == rgb(glcolor) + alpha(t0) */
1687	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1758	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1692	glBindTexture (GL_TEXTURE_2D, name2);	1763	glBindTexture (GL_TEXTURE_2D, name2);
1693	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694		1765
1695	/* rgb == rgb(glcolor) */	1766	/* rgb == rgb(glcolor) */
1696	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699		1770
1700	/* alpha = interpolate t0, t1 by env_alpha */	1771	/* alpha = interpolate t0, t1 by env_alpha */
1701	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702		1773
…		…
1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1779	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709		1780
1710	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1781	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1782	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712		1783
1713	s1 *= w / w1;
1714	t1 *= h / h1;
1715
1716	dx *= -3.f / w2;
1717	dy *= -3.f / h2;
1718	dx *= w / w2;
1719	dy *= h / h2;
1720
1721	s2 *= w / w2;
1722	t2 *= h / h2;
1723
1724	glBegin (GL_QUADS);	1784	glBegin (GL_QUADS);
1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1785	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);	1786	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);	1787	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);	1788	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729	glEnd ();	1789	glEnd ();
1730		1790
1731	glDisable (GL_TEXTURE_2D);	1791	glDisable (GL_TEXTURE_2D);
1732	gl.ActiveTexture (GL_TEXTURE0);	1792	gl.ActiveTexture (GL_TEXTURE0);
1733	}	1793	}
…		…
1735	{	1795	{
1736	/* simple blending of one texture, also opengl <1.3 path */	1796	/* simple blending of one texture, also opengl <1.3 path */
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1797	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738		1798
1739	glBegin (GL_QUADS);	1799	glBegin (GL_QUADS);
1740	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1800	glTexCoord2f (0, 0); glVertex2f (0, 0);
1741	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1801	glTexCoord2f (0, t); glVertex2f (0, h);
1742	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1802	glTexCoord2f (s, t); glVertex2f (w, h);
1743	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1803	glTexCoord2f (s, 0); glVertex2f (w, 0);
1744	glEnd ();	1804	glEnd ();
1745	}	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 ();
1746		1850
1747	glPopMatrix ();	1851	glPopMatrix ();
1748		1852
1749	glDisable (GL_TEXTURE_2D);	1853	glDisable (GL_TEXTURE_2D);
1750	glDisable (GL_BLEND);	1854	glDisable (GL_BLEND);
…		…
1764	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1765		1869
1766	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1767		1871
1768	DC::Map	1872	DC::Map
1769	new (SV *class)	1873	new (SV *klass)
1770	CODE:	1874	CODE:
1771	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1772	RETVAL->x = 0;	1876	RETVAL->x = 0;
1773	RETVAL->y = 0;	1877	RETVAL->y = 0;
1774	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1930	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1931	}	2035	}
1932	}	2036	}
1933		2037
1934	SV *	2038	SV *
1935	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1936	CODE:	2040	CODE:
1937	{	2041	{
1938	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1939	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1940	mapcell *cell;	2044	mapcell *cell;
…		…
1961		2065
1962	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
1963		2067
1964	if (flags & 8)	2068	if (flags & 8)
1965	{	2069	{
		2070	uint8_t ext, cmd;
		2071
1966	if (extmap)	2072	do
1967	{	2073	{
1968	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
1969		2076
1970	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
1971	{	2080	{
1972	ext = *data++;
1973	cmd = ext & 0x7f;
1974
1975	if (cmd < 4)
1976	cell->darkness = 255 - ext * 64 + 1;
1977	else if (cmd == 5) // health
1978	{
1979	cell->stat_width = 1;	2081	cell->stat_width = 1;
1980	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1981	}
1982	else if (cmd == 6) // monster width
1983	cell->stat_width = *data++ + 1;
1984	else if (cmd == 0x47)
1985	{
1986	if (*data == 1) cell->player = data [1];
1987	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1988	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1989	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1990
1991	data += *data + 1;
1992	}
1993	else if (cmd == 8) // cell flags
1994	cell->flags = *data++;
1995	else if (ext & 0x40) // unknown, multibyte => skip
1996	data += *data + 1;
1997	else
1998	data++;
1999	}	2083	}
2000	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++;
2001	}	2101	}
2002	else	2102	while (ext & 0x80);
2003	cell->darkness = *data++ + 1;
2004	}	2103	}
2005		2104
2006	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2007	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2008	{	2107	{
…		…
2056	? self->row + y	2155	? self->row + y
2057	: 0;	2156	: 0;
2058		2157
2059	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
2060	{	2159	{
2061	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2062		2161
2063	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2064	{	2163	{
2065	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2066		2165
…		…
2068	{	2167	{
2069	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2070	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2071	int a1 = tex.a;	2170	int a1 = tex.a;
2072		2171
2073	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2074	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2075	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2076	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2077	}	2176	}
2078	}	2177	}
2079		2178
2080	*map++ = (r )	2179	*map++ = (r )
2081	\| (g << 8)	2180	\| (g << 8)
…		…
2088	}	2187	}
2089	OUTPUT:	2188	OUTPUT:
2090	RETVAL	2189	RETVAL
2091		2190
2092	void	2191	void
2093	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)
2094	CODE:	2193	CODE:
2095	{	2194	{
2096	int x, y, z;	2195	int x, y, z;
2097		2196
2098	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2102	int pl_x, pl_y;	2201	int pl_x, pl_y;
2103	maptex pl_tex;	2202	maptex pl_tex;
2104	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
2105	rc_t *rc_ov = rc_alloc ();	2204	rc_t *rc_ov = rc_alloc ();
2106	rc_key_t key;	2205	rc_key_t key;
2107	rc_array_t arr, arr_hidden;	2206	rc_array_t *arr;
2108		2207
2109	pl_tex.name = 0;	2208	pl_tex.name = 0;
2110		2209
2111	// that's current max. sorry.	2210	// that's current max. sorry.
2112	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
…		…
2149	}	2248	}
2150		2249
2151	glEnable (GL_BLEND);	2250	glEnable (GL_BLEND);
2152	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155	key.texname = self->tex [TEXID_HIDDEN].name;
2156	arr_hidden = rc_array (rc_ov, &key);
2157		2253
2158	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
2159	{	2255	{
2160	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
2161	key.texname = -1;	2257	key.texname = -1;
…		…
2185		2281
2186	key.texname = tex.name;	2282	key.texname = tex.name;
2187	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2188	}	2284	}
2189		2285
2190	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2191	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2192		2288
2193	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2194	{	2290	{
2195	pl_x = px;	2291	pl_x = px;
2196	pl_y = py;	2292	pl_y = py;
…		…
2241	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);
2242	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);
2243	}	2339	}
2244	}	2340	}
2245		2341
2246	if (expect_false (z == 2))	2342	if (expect_false (z == 2) && expect_false (cell->flags))
2247	{	2343	{
2248	/* draw question marks on top of hidden spaces */	2344	// overlays such as the speech bubble, probably more to come
2249	if (!cell->darkness)	2345	if (cell->flags & 1)
2250	{	2346	{
2251	maptex tex = self->tex [TEXID_HIDDEN];
2252	int px = (x + 1) * T - tex.w;
2253	int py = (y + 1) * T - tex.h;
2254
2255	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259	}
2260
2261	if (expect_false (cell->flags))
2262	{
2263	// overlays such as the speech bubble, probably more to come
2264	if (cell->flags & 1)
2265	{
2266	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2267	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2268	rc_array_t *arr;	2349	rc_array_t *arr;
2269	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2270	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2271		2352
2272	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2273	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2274		2355
2275	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2277	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);
2278	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279	}
2280	}	2360	}
2281	}	2361	}
2282	}	2362	}
2283	}	2363	}
2284		2364
…		…
2311	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2312	&& skey->level == level	2392	&& skey->level == level
2313	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2314	{	2394	{
2315	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2316	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2317	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2318	int border = bits & 15;	2398	int border = bits & 15;
2319	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2321	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2322		2402
…		…
2335		2415
2336	if (border)	2416	if (border)
2337	{	2417	{
2338	float ox = border * dx;	2418	float ox = border * dx;
2339		2419
2340	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344	}	2424	}
2345		2425
2346	if (corner)	2426	if (corner)
2347	{	2427	{
2348	float ox = corner * dx;	2428	float ox = corner * dx;
2349		2429
2350	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354	}	2434	}
2355	}	2435	}
2356	}	2436	}
2357	}	2437	}
2358	}	2438	}
…		…
2399	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2400	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2401	{	2481	{
2402	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2403		2483
2404	int px = x * T;	2484	int px = x * Tw;
2405	int py = y * T;	2485	int py = y * Th;
2406		2486
2407	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2408	{	2488	{
2409	px += sdx;	2489	px += sdx;
2410	py += sdy;	2490	py += sdy;
2411	}	2491	}
2412		2492
2413	if (cell->stat_hp)	2493	if (cell->stat_hp)
2414	{	2494	{
2415	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2416	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417		2497
2418	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2419	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2420	px + width - 1, py);	2500	px + width - 1, py);
2421		2501
…		…
2427	}	2507	}
2428	}	2508	}
2429	}	2509	}
2430		2510
2431	void	2511	void
2432	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)
2433	CODE:	2513	CODE:
2434	{	2514	{
2435	static float color[16][3] = {	2515	static float color[16][3] = {
2436	{ 0.00F, 0.00F, 0.00F },	2516	{ 0.00f, 0.00f, 0.00f },
2437	{ 1.00F, 1.00F, 1.00F },	2517	{ 1.00f, 1.00f, 1.00f },
2438	{ 0.00F, 0.00F, 0.55F },	2518	{ 0.00f, 0.00f, 0.55f },
2439	{ 1.00F, 0.00F, 0.00F },	2519	{ 1.00f, 0.00f, 0.00f },
2440		2520
2441	{ 1.00F, 0.54F, 0.00F },	2521	{ 1.00f, 0.54f, 0.00f },
2442	{ 0.11F, 0.56F, 1.00F },	2522	{ 0.11f, 0.56f, 1.00f },
2443	{ 0.93F, 0.46F, 0.00F },	2523	{ 0.93f, 0.46f, 0.00f },
2444	{ 0.18F, 0.54F, 0.34F },	2524	{ 0.18f, 0.54f, 0.34f },
2445		2525
2446	{ 0.56F, 0.73F, 0.56F },	2526	{ 0.56f, 0.73f, 0.56f },
2447	{ 0.80F, 0.80F, 0.80F },	2527	{ 0.80f, 0.80f, 0.80f },
2448	{ 0.55F, 0.41F, 0.13F },	2528	{ 0.55f, 0.41f, 0.13f },
2449	{ 0.99F, 0.77F, 0.26F },	2529	{ 0.99f, 0.77f, 0.26f },
2450		2530
2451	{ 0.74F, 0.65F, 0.41F },	2531	{ 0.74f, 0.65f, 0.41f },
2452		2532
2453	{ 0.00F, 1.00F, 1.00F },	2533	{ 0.00f, 1.00f, 1.00f },
2454	{ 1.00F, 0.00F, 1.00F },	2534	{ 1.00f, 0.00f, 1.00f },
2455	{ 1.00F, 1.00F, 0.00F },	2535	{ 1.00f, 1.00f, 0.00f },
2456	};	2536	};
2457		2537
2458	int x, y;	2538	int x, y;
2459		2539
2460	glEnable (GL_TEXTURE_2D);	2540	glEnable (GL_TEXTURE_2D);
2461	/* 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,
2462	* but the nvidia driver (185.18.14) mishandles alpha textures	2542	* but the nvidia driver (185.18.14) mishandles alpha textures
2463	* ansd takes the colour from god knows where instead of using	2543	* and takes the colour from god knows where instead of using
2464	* Cp. MODULATE results in the same colour, but slightly different	2544	* Cp. MODULATE results in the same colour, but slightly different
2465	* alpha, but atcually gives us the correct colour with nvidia.	2545	* alpha, but atcually gives us the correct colour with nvidia.
2466	*/	2546	*/
2467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2547	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468	glEnable (GL_BLEND);	2548	glEnable (GL_BLEND);
…		…
2476		2556
2477	if (m)	2557	if (m)
2478	{	2558	{
2479	float *c = color [m & 15];	2559	float *c = color [m & 15];
2480		2560
2481	float tx1 = m & 0x40 ? 0.5 : 0.;	2561	float tx1 = m & 0x40 ? 0.5f : 0.f;
2482	float tx2 = tx1 + 0.5;	2562	float tx2 = tx1 + 0.5f;
2483		2563
2484	glColor4f (c[0], c[1], c[2], 1);	2564	glColor4f (c[0], c[1], c[2], 1);
2485	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2565	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2566	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2567	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2497	void	2577	void
2498	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)
2499	PPCODE:	2579	PPCODE:
2500	{	2580	{
2501	int x, y;	2581	int x, y;
2502	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2503	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2504	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2505	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);
2506	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2507	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2589	memset (darkness1, 0, sw1*sh1);
2508	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2509		2590
2510	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2511	SvCUR_set (darkness3_sv, sw34 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2512		2593
2513	mx += self->x - 1;	2594	mx += self->x - 1;
2514	my += self->y - 1;	2595	my += self->y - 1;
2515
2516	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517		2596
2518	for (y = 0; y < sh1; y++)	2597	for (y = 0; y < sh1; y++)
2519	if (0 <= y + my && y + my < self->rows)	2598	if (0 <= y + my && y + my < self->rows)
2520	{	2599	{
2521	maprow *row = self->row + (y + my);	2600	maprow *row = self->row + (y + my);
…		…
2554		2633
2555	uint8_t r13 = (d13 + d23 + d12) / 3;	2634	uint8_t r13 = (d13 + d23 + d12) / 3;
2556	uint8_t r23 = d23;	2635	uint8_t r23 = d23;
2557	uint8_t r33 = (d23 + d33 + d32) / 3;	2636	uint8_t r33 = (d23 + d33 + d32) / 3;
2558		2637
2559	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2638	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2641	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563	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 */
2564	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2644	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568	}	2647	}
2569		2648
2570	free (darkness1);	2649	free (darkness1);
2571		2650
2572	EXTEND (SP, 3);	2651	EXTEND (SP, 3);
2573	PUSHs (sv_2mortal (newSViv (sw34)));	2652	PUSHs (sv_2mortal (newSViv (sw3)));
2574	PUSHs (sv_2mortal (newSViv (sh3)));	2653	PUSHs (sv_2mortal (newSViv (sh3)));
2575	PUSHs (darkness3_sv);	2654	PUSHs (darkness3_sv);
2576	}	2655	}
2577		2656
2578	SV *	2657	SV *
…		…
2665	STRLEN len;	2744	STRLEN len;
2666	uint8_t data, end;	2745	uint8_t data, end;
2667		2746
2668	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2669	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2671	end = data + len + 8;	2750	end = data + len + 8;
2672		2751
2673	if (len < 5)	2752	if (len < 5)
2674	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2675		2754
…		…
2736	}	2815	}
2737		2816
2738	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2739		2818
2740	DC::RW	2819	DC::RW
2741	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2742	CODE:	2821	CODE:
2743	{	2822	{
2744	STRLEN datalen;	2823	STRLEN datalen;
2745	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2746		2825
…		…
2748	}	2827	}
2749	OUTPUT:	2828	OUTPUT:
2750	RETVAL	2829	RETVAL
2751		2830
2752	DC::RW	2831	DC::RW
2753	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")
2754	CODE:	2833	CODE:
2755	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2756	OUTPUT:	2835	OUTPUT:
2757	RETVAL	2836	RETVAL
2758		2837
…		…
2776	if (RETVAL < 0)	2855	if (RETVAL < 0)
2777	{	2856	{
2778	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2779		2858
2780	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)
2781	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2782		2866	}
		2867	else
2783	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2784	}	2869	}
2785		2870
2786	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2787	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2788	}	2873	}
…		…
2835	void	2920	void
2836	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)
2837	CODE:	2922	CODE:
2838	{	2923	{
2839	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));
2840	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;
2841	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2926	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842	}	2927	}
2843		2928
2844	void	2929	void
2845	set_reverse_stereo (DC::Channel self, int flip)	2930	set_reverse_stereo (DC::Channel self, int flip)
…		…
2848		2933
2849	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850		2935
2851	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2852		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
2853	DC::MixChunk	2950	DC::MixChunk
2854	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2855	CODE:	2952	CODE:
2856	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857	OUTPUT:	2954	OUTPUT:
2858	RETVAL	2955	RETVAL
2859		2956
…		…
2889	OUTPUT:	2986	OUTPUT:
2890	RETVAL	2987	RETVAL
2891		2988
2892	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893		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
2894	int	3003	int
2895	volume (int volume = -1)	3004	volume (int volume = -1)
2896	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2897	CODE:	3006	CODE:
2898	if (items > 0)	3007	if (items > 0)
…		…
2909	void	3018	void
2910	halt ()	3019	halt ()
2911	CODE:	3020	CODE:
2912	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2913		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2914	DC::MixMusic	3030	DC::MixMusic
2915	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2916	CODE:	3032	CODE:
2917	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2918	OUTPUT:	3034	OUTPUT:
2919	RETVAL	3035	RETVAL
2920		3036
…		…
3057	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
3058	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059	# undef const_iv	3175	# undef const_iv
3060	};	3176	};
3061		3177
3062	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--)
3063	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064		3180
3065	texture_av = newAV ();	3181	texture_av = newAV ();
3066	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3067	}	3183	}
3068		3184
…		…
3073	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3074		3190
3075	void	3191	void
3076	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3077		3193
3078	char *	3194	const char *
3079	gl_vendor ()	3195	gl_vendor ()
3080	CODE:	3196	CODE:
3081	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3082	OUTPUT:	3198	OUTPUT:
3083	RETVAL	3199	RETVAL
3084		3200
3085	char *	3201	const char *
3086	gl_version ()	3202	gl_version ()
3087	CODE:	3203	CODE:
3088	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3089	OUTPUT:	3205	OUTPUT:
3090	RETVAL	3206	RETVAL
3091		3207
3092	char *	3208	const char *
3093	gl_extensions ()	3209	gl_extensions ()
3094	CODE:	3210	CODE:
3095	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3096	OUTPUT:	3212	OUTPUT:
3097	RETVAL	3213	RETVAL
3098		3214
3099	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3100		3220
3101	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3102	CODE:	3222	CODE:
3103	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3104	OUTPUT:	3224	OUTPUT:
…		…
3111	RETVAL	3231	RETVAL
3112		3232
3113	int glGetError ()	3233	int glGetError ()
3114		3234
3115	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3116		3238
3117	void glClear (int mask)	3239	void glClear (int mask)
3118		3240
3119	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)
3120	PROTOTYPE: @	3242	PROTOTYPE: @
…		…
3291	void glNewList (int list, int mode = GL_COMPILE)	3413	void glNewList (int list, int mode = GL_COMPILE)
3292		3414
3293	void glEndList ()	3415	void glEndList ()
3294		3416
3295	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);
3296		3423
3297	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3424	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298		3425
3299	PROTOTYPES: DISABLE	3426	PROTOTYPES: DISABLE
3300		3427

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.294 by root, Sat Dec 19 05:06: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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC