[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.321 by root, Sun Nov 18 01:15:04 2018 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
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
…		…
460	ev.data2 = 0;	481	ev.data2 = 0;
461		482
462	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
463	}	484	}
464		485
		486	// approximately divide by 255
		487	static unsigned int
		488	div255 (unsigned int n)
		489	{
		490	return (n + (n >> 8)) >> 8;
		491	}
		492
465	static unsigned int	493	static unsigned int
466	minpot (unsigned int n)	494	minpot (unsigned int n)
467	{	495	{
468	if (!n)	496	if (!n)
469	return 0;	497	return 0;
…		…
550		578
551	return mod;	579	return mod;
552	}	580	}
553		581
554	static void	582	static void
555	deliantra_main ()	583	deliantra_main (SV *real_main)
556	{	584	{
557	char *argv[] = { 0 };	585	dSP;
558	call_argv ("::main", G_DISCARD \| G_VOID, argv);	586
		587	PUSHMARK (SP);
		588	call_sv (real_main, G_DISCARD \| G_VOID);
559	}	589	}
560		590
561	#ifdef __MACOSX__	591	#ifdef __MACOSX__
		592	static SV *real_main;
		593
562	/* to due surprising braindamage on the side of SDL design, we	594	/* to due surprising braindamage on the side of SDL design, we
563	* do some mind-boggling hack here: SDL requires a custom main()	595	* 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,	596	* 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,	597	* due to shared library magic, calls -lSDLmain's main, not perl's main,
566	* and which calls our main (== SDL_main) back.	598	* and which calls our main (== SDL_main) back.
567	*/	599	*/
568	extern C_LINKAGE int	600	extern C_LINKAGE int
569	main (int argc, char *argv[])	601	main (int argc, char *argv[])
570	{	602	{
571	deliantra_main ();	603	deliantra_main (real_main);
572	}	604	}
573		605
574	#undef main	606	#undef main
575		607
576	extern C_LINKAGE int main (int argc, char *argv[]);	608	extern C_LINKAGE int main (int argc, char *argv[]);
577		609
578	static void	610	static void
579	SDL_braino (void)	611	SDL_main_hack (SV *real_main_)
580	{	612	{
		613	real_main = real_main_;
		614
581	char *argv[] = { "deliantra client", 0 };	615	char *argv[] = { "deliantra client", 0 };
582	(main) (1, argv);	616	(main) (1, argv);
583	}	617	}
584	#else	618	#else
585	static void	619	static void
586	SDL_braino (void)	620	SDL_main_hack (SV *real_main)
587	{	621	{
588	deliantra_main ();	622	deliantra_main (real_main);
589	}	623	}
590	#endif	624	#endif
591		625
592	MODULE = Deliantra::Client PACKAGE = DC	626	MODULE = Deliantra::Client PACKAGE = DC
593		627
…		…
794		828
795	const_iv (FOW_DARKNESS)	829	const_iv (FOW_DARKNESS)
796	# undef const_iv	830	# undef const_iv
797	};	831	};
798		832
799	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	833	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801		835
802	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	836	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	837	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804	}	838	}
805		839
…		…
821	NV ceil (NV x)	855	NV ceil (NV x)
822		856
823	IV minpot (UV n)	857	IV minpot (UV n)
824		858
825	IV popcount (UV n)	859	IV popcount (UV n)
		860
		861	NV distance (NV dx, NV dy)
		862	CODE:
		863	RETVAL = pow (dx * dx + dy * dy, 0.5);
		864	OUTPUT:
		865	RETVAL
826		866
827	void	867	void
828	pango_init ()	868	pango_init ()
829	CODE:	869	CODE:
830	{	870	{
…		…
838	#endif	878	#endif
839	}	879	}
840		880
841	char *SDL_GetError ()	881	char *SDL_GetError ()
842		882
843	void SDL_braino ()	883	void SDL_main_hack (SV *real_main)
		884	PROTOTYPE: &
844		885
845	int SDL_Init (U32 flags)	886	int SDL_Init (U32 flags)
846		887
847	int SDL_InitSubSystem (U32 flags)	888	int SDL_InitSubSystem (U32 flags)
848		889
849	void SDL_QuitSubSystem (U32 flags)	890	void SDL_QuitSubSystem (U32 flags)
850		891
851	void SDL_Quit ()	892	void SDL_Quit ()
852		893
853	int SDL_GL_SetAttribute (int attr, int value)	894	int SDL_GL_SetAttribute (int attr, int value)
		895	C_ARGS: (SDL_GLattr)attr, value
854		896
855	int SDL_GL_GetAttribute (int attr)	897	int SDL_GL_GetAttribute (int attr)
856	CODE:	898	CODE:
857	if (SDL_GL_GetAttribute (attr, &RETVAL))	899	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
858	XSRETURN_UNDEF;	900	XSRETURN_UNDEF;
859	OUTPUT:	901	OUTPUT:
860	RETVAL	902	RETVAL
861		903
862	void	904	void
…		…
917	);	959	);
918		960
919	if (RETVAL)	961	if (RETVAL)
920	{	962	{
921	av_clear (texture_av);	963	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);	964	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
925	#include "glfunc.h"	965	#include "glfunc.h"
926	#undef GL_FUNC	966	#undef GL_FUNC
		967	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		968	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927	}	969	}
928	}	970	}
929	OUTPUT:	971	OUTPUT:
930	RETVAL	972	RETVAL
		973
		974	void
		975	SDL_WM_SetCaption (const char title, const char icon)
931		976
932	void	977	void
933	SDL_GL_SwapBuffers ()	978	SDL_GL_SwapBuffers ()
934		979
935	char *	980	char *
936	SDL_GetKeyName (int sym)	981	SDL_GetKeyName (int sym)
		982	C_ARGS: (SDLKey)sym
937		983
938	int	984	int
939	SDL_GetAppState ()	985	SDL_GetAppState ()
940		986
941	int	987	int
942	SDL_GetModState ()	988	SDL_GetModState ()
943		989
		990	int
		991	SDL_WaitEvent ()
		992	C_ARGS: 0
		993
944	void	994	void
		995	SDL_PumpEvents ()
		996
		997	void
945	poll_events ()	998	peep_events ()
946	PPCODE:	999	PPCODE:
947	{	1000	{
948	SDL_Event ev;	1001	SDL_Event ev;
949		1002
950	SDL_PumpEvents ();	1003	SDL_PumpEvents ();
…		…
1016		1069
1017	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1070	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1018	}	1071	}
1019	}	1072	}
1020		1073
		1074	char *
		1075	SDL_AudioDriverName ()
		1076	CODE:
		1077	{
		1078	char buf [256];
		1079	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1080	XSRETURN_UNDEF;
		1081
		1082	RETVAL = buf;
		1083	}
		1084	OUTPUT:
		1085	RETVAL
		1086
1021	int	1087	int
1022	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1088	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023	POSTCALL:	1089	POSTCALL:
1024	Mix_HookMusicFinished (music_finished);	1090	Mix_HookMusicFinished (music_finished);
1025	Mix_ChannelFinished (channel_finished);	1091	Mix_ChannelFinished (channel_finished);
1026		1092
1027	void	1093	void
1028	Mix_QuerySpec ()	1094	Mix_QuerySpec ()
…		…
1087	add_font (char *file)	1153	add_font (char *file)
1088	CODE:	1154	CODE:
1089	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1155	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090	OUTPUT:	1156	OUTPUT:
1091	RETVAL	1157	RETVAL
		1158
		1159	void
		1160	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1161
		1162	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1163	void
		1164	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1092		1165
1093	void	1166	void
1094	load_image_inline (SV *image_)	1167	load_image_inline (SV *image_)
1095	ALIAS:	1168	ALIAS:
1096	load_image_file = 1	1169	load_image_file = 1
…		…
1142		1215
1143	SDL_LockSurface (surface2);	1216	SDL_LockSurface (surface2);
1144	EXTEND (SP, 6);	1217	EXTEND (SP, 6);
1145	PUSHs (sv_2mortal (newSViv (surface2->w)));	1218	PUSHs (sv_2mortal (newSViv (surface2->w)));
1146	PUSHs (sv_2mortal (newSViv (surface2->h)));	1219	PUSHs (sv_2mortal (newSViv (surface2->h)));
1147	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1220	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)));	1221	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1149	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1222	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1150	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1223	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1151	SDL_UnlockSurface (surface2);	1224	SDL_UnlockSurface (surface2);
1152		1225
…		…
1224	MODULE = Deliantra::Client PACKAGE = DC::Font	1297	MODULE = Deliantra::Client PACKAGE = DC::Font
1225		1298
1226	PROTOTYPES: DISABLE	1299	PROTOTYPES: DISABLE
1227		1300
1228	DC::Font	1301	DC::Font
1229	new_from_file (SV class, char path, int id = 0)	1302	new_from_file (SV klass, char path, int id = 0)
1230	CODE:	1303	CODE:
1231	{	1304	{
1232	int count;	1305	int count;
1233	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1306	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1234	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1307	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1263	PROTOTYPE:	1336	PROTOTYPE:
1264	CODE:	1337	CODE:
1265	tc_restore ();	1338	tc_restore ();
1266		1339
1267	DC::Layout	1340	DC::Layout
1268	new (SV *class)	1341	new (SV *klass)
1269	CODE:	1342	CODE:
1270	New (0, RETVAL, 1, struct cf_layout);	1343	New (0, RETVAL, 1, struct cf_layout);
1271		1344
1272	RETVAL->pl = pango_layout_new (opengl_context);	1345	RETVAL->pl = pango_layout_new (opengl_context);
1273	RETVAL->r = 1.;	1346	RETVAL->r = 1.;
…		…
1422		1495
1423	void	1496	void
1424	set_height (DC::Layout self, int base_height)	1497	set_height (DC::Layout self, int base_height)
1425	CODE:	1498	CODE:
1426	if (self->base_height != base_height)	1499	if (self->base_height != base_height)
1427	{	1500	{
1428	self->base_height = base_height;	1501	self->base_height = base_height;
1429	layout_update_font (self);	1502	layout_update_font (self);
1430	}	1503	}
1431		1504
1432	void	1505	void
…		…
1660	glDisable (GL_BLEND);	1733	glDisable (GL_BLEND);
1661	}	1734	}
1662	}	1735	}
1663		1736
1664	void	1737	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)	1738	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
1666	PROTOTYPE: @	1739	PROTOTYPE: @
1667	CODE:	1740	CODE:
1668	{	1741	{
		1742	glEnable (GL_BLEND);
		1743	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669	glEnable (GL_TEXTURE_2D);	1744	glEnable (GL_TEXTURE_2D);
1670	glEnable (GL_BLEND);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672	glBindTexture (GL_TEXTURE_2D, name1);	1745	glBindTexture (GL_TEXTURE_2D, name1);
1673		1746
1674	glColor3f (intensity, intensity, intensity);	1747	glColor3f (intensity, intensity, intensity);
1675	glPushMatrix ();	1748	glPushMatrix ();
1676	glScalef (1./3, 1./3, 1.);	1749	glScalef (1./3, 1./3, 1.);
1677		1750
1678	if (blend > 0.f)	1751	if (blend > 0.f)
1679	{	1752	{
1680	float S2, T2; /* 0. 0. for texture 2 */	1753	float dx3 = dx * -3.f / w;
1681	float w = w1 > w2 ? w1 : w2;	1754	float dy3 = dy * -3.f / h;
1682	float h = h1 > h2 ? h1 : h2;
1683	GLfloat env_color[4] = { 0., 0., 0., blend };	1755	GLfloat env_color[4] = { 0., 0., 0., blend };
1684		1756
1685	/* interpolate the two shadow textures */	1757	/* interpolate the two shadow textures */
1686	/* stage 0 == rgb(glcolor) + alpha(t0) */	1758	/* stage 0 == rgb(glcolor) + alpha(t0) */
1687	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1759	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1692	glBindTexture (GL_TEXTURE_2D, name2);	1764	glBindTexture (GL_TEXTURE_2D, name2);
1693	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694		1766
1695	/* rgb == rgb(glcolor) */	1767	/* rgb == rgb(glcolor) */
1696	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699		1771
1700	/* alpha = interpolate t0, t1 by env_alpha */	1772	/* alpha = interpolate t0, t1 by env_alpha */
1701	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1773	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702		1774
…		…
1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709		1781
1710	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1782	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1783	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712		1784
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);	1785	glBegin (GL_QUADS);
1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1786	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);	1787	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);	1788	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);	1789	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729	glEnd ();	1790	glEnd ();
1730		1791
1731	glDisable (GL_TEXTURE_2D);	1792	glDisable (GL_TEXTURE_2D);
1732	gl.ActiveTexture (GL_TEXTURE0);	1793	gl.ActiveTexture (GL_TEXTURE0);
1733	}	1794	}
…		…
1735	{	1796	{
1736	/* simple blending of one texture, also opengl <1.3 path */	1797	/* simple blending of one texture, also opengl <1.3 path */
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1798	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738		1799
1739	glBegin (GL_QUADS);	1800	glBegin (GL_QUADS);
1740	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1801	glTexCoord2f (0, 0); glVertex2f (0, 0);
1741	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1802	glTexCoord2f (0, t); glVertex2f (0, h);
1742	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1803	glTexCoord2f (s, t); glVertex2f (w, h);
1743	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1804	glTexCoord2f (s, 0); glVertex2f (w, 0);
1744	glEnd ();	1805	glEnd ();
1745	}	1806	}
		1807
		1808	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1809	{
		1810	int x, y;
		1811	int dx3 = dx * 3;
		1812	int dy3 = dy * 3;
		1813
		1814	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1815	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1816	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1817	glTranslatef (-1., -1., 0);
		1818	glBegin (GL_QUADS);
		1819
		1820	for (y = 1; y < h; y += 3)
		1821	{
		1822	int y1 = y - dy3;
		1823	int y1valid = y1 >= 0 && y1 < h;
		1824
		1825	for (x = 1; x < w; x += 3)
		1826	{
		1827	int x1 = x - dx3;
		1828	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1829	uint8_t h2;
		1830
		1831	if (y1valid && x1 >= 0 && x1 < w)
		1832	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1833	else
		1834	h2 = 1; /* out of range == invisible */
		1835
		1836	if (h1 \|\| h2)
		1837	{
		1838	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1839	glColor4f (1., 1., 1., alpha);
		1840
		1841	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1842	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1843	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1844	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1845	}
		1846	}
		1847	}
		1848	}
		1849
		1850	glEnd ();
1746		1851
1747	glPopMatrix ();	1852	glPopMatrix ();
1748		1853
1749	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1750	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
…		…
1764	MODULE = Deliantra::Client PACKAGE = DC::Map	1869	MODULE = Deliantra::Client PACKAGE = DC::Map
1765		1870
1766	PROTOTYPES: DISABLE	1871	PROTOTYPES: DISABLE
1767		1872
1768	DC::Map	1873	DC::Map
1769	new (SV *class)	1874	new (SV *klass)
1770	CODE:	1875	CODE:
1771	New (0, RETVAL, 1, struct map);	1876	New (0, RETVAL, 1, struct map);
1772	RETVAL->x = 0;	1877	RETVAL->x = 0;
1773	RETVAL->y = 0;	1878	RETVAL->y = 0;
1774	RETVAL->w = 0;	1879	RETVAL->w = 0;
…		…
1813		1918
1814	void	1919	void
1815	set_smooth (DC::Map self, int face, int smooth, int level)	1920	set_smooth (DC::Map self, int face, int smooth, int level)
1816	CODE:	1921	CODE:
1817	{	1922	{
1818	tileid texid;	1923	tileid texid;
1819	maptex *tex;	1924	maptex *tex;
1820		1925
1821	if (face < 0 \|\| face >= self->faces)	1926	if (face < 0 \|\| face >= self->faces)
1822	return;	1927	return;
1823		1928
1824	if (smooth < 0 \|\| smooth >= self->faces)	1929	if (smooth < 0 \|\| smooth >= self->faces)
1825	return;	1930	return;
1826		1931
1827	texid = self->face2tile [face];	1932	texid = self->face2tile [face];
1828		1933
1829	if (!texid)	1934	if (!texid)
1830	return;	1935	return;
1831		1936
1832	tex = self->tex + texid;	1937	tex = self->tex + texid;
…		…
1865	}	1970	}
1866		1971
1867	void	1972	void
1868	expire_textures (DC::Map self, int texid, int count)	1973	expire_textures (DC::Map self, int texid, int count)
1869	PPCODE:	1974	PPCODE:
1870	for (; texid < self->texs && count; ++texid, --count)	1975	for (; texid < self->texs && count; ++texid, --count)
1871	{	1976	{
1872	maptex *tex = self->tex + texid;	1977	maptex *tex = self->tex + texid;
1873		1978
1874	if (tex->name)	1979	if (tex->name)
1875	{	1980	{
…		…
1930	self->y += MAP_EXTEND_Y;	2035	self->y += MAP_EXTEND_Y;
1931	}	2036	}
1932	}	2037	}
1933		2038
1934	SV *	2039	SV *
1935	map1a_update (DC::Map self, SV *data_, int extmap)	2040	map1a_update (DC::Map self, SV *data_)
1936	CODE:	2041	CODE:
1937	{	2042	{
1938	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2043	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1939	uint8_t data_end = (uint8_t )SvEND (data_);	2044	uint8_t data_end = (uint8_t )SvEND (data_);
1940	mapcell *cell;	2045	mapcell *cell;
…		…
1961		2066
1962	//TODO: don't trust server data to be in-range(!)	2067	//TODO: don't trust server data to be in-range(!)
1963		2068
1964	if (flags & 8)	2069	if (flags & 8)
1965	{	2070	{
		2071	uint8_t ext, cmd;
		2072
1966	if (extmap)	2073	do
1967	{	2074	{
1968	uint8_t ext, cmd;	2075	ext = *data++;
		2076	cmd = ext & 0x7f;
1969		2077
1970	do	2078	if (cmd < 4)
		2079	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2080	else if (cmd == 5) // health
1971	{	2081	{
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;	2082	cell->stat_width = 1;
1980	cell->stat_hp = *data++;	2083	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	}	2084	}
2000	while (ext & 0x80);	2085	else if (cmd == 6) // monster width
		2086	cell->stat_width = *data++ + 1;
		2087	else if (cmd == 0x47)
		2088	{
		2089	if (*data == 1) cell->player = data [1];
		2090	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2091	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2092	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2093
		2094	data += *data + 1;
		2095	}
		2096	else if (cmd == 8) // cell flags
		2097	cell->flags = *data++;
		2098	else if (ext & 0x40) // unknown, multibyte => skip
		2099	data += *data + 1;
		2100	else
		2101	data++;
2001	}	2102	}
2002	else	2103	while (ext & 0x80);
2003	cell->darkness = *data++ + 1;
2004	}	2104	}
2005		2105
2006	for (z = 0; z <= 2; ++z)	2106	for (z = 0; z <= 2; ++z)
2007	if (flags & (4 >> z))	2107	if (flags & (4 >> z))
2008	{	2108	{
…		…
2056	? self->row + y	2156	? self->row + y
2057	: 0;	2157	: 0;
2058		2158
2059	for (x = x0; x < x1; x++)	2159	for (x = x0; x < x1; x++)
2060	{	2160	{
2061	int r = 32, g = 32, b = 32, a = 192;	2161	unsigned int r = 32, g = 32, b = 32, a = 192;
2062		2162
2063	if (row && row->c0 <= x && x < row->c1)	2163	if (row && row->c0 <= x && x < row->c1)
2064	{	2164	{
2065	mapcell *cell = row->col + (x - row->c0);	2165	mapcell *cell = row->col + (x - row->c0);
2066		2166
…		…
2068	{	2168	{
2069	maptex tex = self->tex [cell->tile [z]];	2169	maptex tex = self->tex [cell->tile [z]];
2070	int a0 = 255 - tex.a;	2170	int a0 = 255 - tex.a;
2071	int a1 = tex.a;	2171	int a1 = tex.a;
2072		2172
2073	r = (r * a0 + tex.r * a1) / 255;	2173	r = div255 (r * a0 + tex.r * a1);
2074	g = (g * a0 + tex.g * a1) / 255;	2174	g = div255 (g * a0 + tex.g * a1);
2075	b = (b * a0 + tex.b * a1) / 255;	2175	b = div255 (b * a0 + tex.b * a1);
2076	a = (a * a0 + tex.a * a1) / 255;	2176	a = div255 (a * a0 + tex.a * a1);
2077	}	2177	}
2078	}	2178	}
2079		2179
2080	*map++ = (r )	2180	*map++ = (r )
2081	\| (g << 8)	2181	\| (g << 8)
2082	\| (b << 16)	2182	\| (b << 16)
2083	\| (a << 24);	2183	\| (a << 24);
2084	}	2184	}
2085	}	2185	}
2086		2186
2087	RETVAL = map_sv;	2187	RETVAL = map_sv;
2088	}	2188	}
2089	OUTPUT:	2189	OUTPUT:
2090	RETVAL	2190	RETVAL
2091		2191
2092	void	2192	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)	2193	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2094	CODE:	2194	CODE:
2095	{	2195	{
2096	int x, y, z;	2196	int x, y, z;
2097		2197
2098	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2198	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2099	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2199	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2100	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2200	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2101	smooth_key skey;	2201	smooth_key skey;
2102	int pl_x, pl_y;	2202	int pl_x, pl_y;
2103	maptex pl_tex;	2203	maptex pl_tex;
2104	rc_t *rc = rc_alloc ();	2204	rc_t *rc = rc_alloc ();
2105	rc_t *rc_ov = rc_alloc ();	2205	rc_t *rc_ov = rc_alloc ();
2106	rc_key_t key;	2206	rc_key_t key;
2107	rc_array_t arr, arr_hidden;	2207	rc_array_t *arr;
2108		2208
2109	pl_tex.name = 0;	2209	pl_tex.name = 0;
2110		2210
2111	// that's current max. sorry.	2211	// that's current max. sorry.
2112	if (sw > 255) sw = 255;	2212	if (sw > 255) sw = 255;
…		…
2149	}	2249	}
2150		2250
2151	glEnable (GL_BLEND);	2251	glEnable (GL_BLEND);
2152	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2252	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2253	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		2254
2158	for (z = 0; z <= 2; z++)	2255	for (z = 0; z <= 2; z++)
2159	{	2256	{
2160	memset (smooth_level, 0, sizeof (smooth_level));	2257	memset (smooth_level, 0, sizeof (smooth_level));
2161	key.texname = -1;	2258	key.texname = -1;
…		…
2185		2282
2186	key.texname = tex.name;	2283	key.texname = tex.name;
2187	arr = rc_array (rc, &key);	2284	arr = rc_array (rc, &key);
2188	}	2285	}
2189		2286
2190	px = (x + 1) * T - tex.w;	2287	px = (x + 1) * Th - tex.w;
2191	py = (y + 1) * T - tex.h;	2288	py = (y + 1) * Tw - tex.h;
2192		2289
2193	if (expect_false (cell->player == player) && expect_false (z == 2))	2290	if (expect_false (cell->player == player) && expect_false (z == 2))
2194	{	2291	{
2195	pl_x = px;	2292	pl_x = px;
2196	pl_y = py;	2293	pl_y = py;
…		…
2241	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2338	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2242	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2339	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243	}	2340	}
2244	}	2341	}
2245		2342
2246	if (expect_false (z == 2))	2343	if (expect_false (z == 2) && expect_false (cell->flags))
2247	{	2344	{
2248	/* draw question marks on top of hidden spaces */	2345	// overlays such as the speech bubble, probably more to come
2249	if (!cell->darkness)	2346	if (cell->flags & 1)
2250	{	2347	{
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;	2348	rc_key_t key_ov = key;
2267	maptex tex = self->tex [TEXID_SPEECH];	2349	maptex tex = self->tex [TEXID_SPEECH];
2268	rc_array_t *arr;	2350	rc_array_t *arr;
2269	int px = x * T + T * 2 / 32;	2351	int px = x * Tw + Tw * 2 / 32;
2270	int py = y * T - T * 6 / 32;	2352	int py = y * Th - Th * 6 / 32;
2271		2353
2272	key_ov.texname = tex.name;	2354	key_ov.texname = tex.name;
2273	arr = rc_array (rc_ov, &key_ov);	2355	arr = rc_array (rc_ov, &key_ov);
2274		2356
2275	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2357	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2358	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);	2359	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);	2360	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279	}
2280	}	2361	}
2281	}	2362	}
2282	}	2363	}
2283	}	2364	}
2284		2365
…		…
2311	if (!(bits & 0x1000)	2392	if (!(bits & 0x1000)
2312	&& skey->level == level	2393	&& skey->level == level
2313	&& level > smooth_max [skey->x][skey->y])	2394	&& level > smooth_max [skey->x][skey->y])
2314	{	2395	{
2315	maptex tex = self->tex [skey->tile];	2396	maptex tex = self->tex [skey->tile];
2316	int px = (((int)skey->x) - 1) * T;	2397	int px = (((int)skey->x) - 1) * Tw;
2317	int py = (((int)skey->y) - 1) * T;	2398	int py = (((int)skey->y) - 1) * Th;
2318	int border = bits & 15;	2399	int border = bits & 15;
2319	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2400	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320	float dx = tex.s * .0625f; // 16 images/row	2401	float dx = tex.s * .0625f; // 16 images/row
2321	float dy = tex.t * .5f ; // 2 images/column	2402	float dy = tex.t * .5f ; // 2 images/column
2322		2403
…		…
2335		2416
2336	if (border)	2417	if (border)
2337	{	2418	{
2338	float ox = border * dx;	2419	float ox = border * dx;
2339		2420
2340	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2421	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2422	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2423	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2424	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344	}	2425	}
2345		2426
2346	if (corner)	2427	if (corner)
2347	{	2428	{
2348	float ox = corner * dx;	2429	float ox = corner * dx;
2349		2430
2350	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2432	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2433	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354	}	2435	}
2355	}	2436	}
2356	}	2437	}
2357	}	2438	}
2358	}	2439	}
…		…
2399	for (x = 0; x < sw; x++)	2480	for (x = 0; x < sw; x++)
2400	if (row->c0 <= x + mx && x + mx < row->c1)	2481	if (row->c0 <= x + mx && x + mx < row->c1)
2401	{	2482	{
2402	mapcell *cell = row->col + (x + mx - row->c0);	2483	mapcell *cell = row->col + (x + mx - row->c0);
2403		2484
2404	int px = x * T;	2485	int px = x * Tw;
2405	int py = y * T;	2486	int py = y * Th;
2406		2487
2407	if (expect_false (cell->player == player))	2488	if (expect_false (cell->player == player))
2408	{	2489	{
2409	px += sdx;	2490	px += sdx;
2410	py += sdy;	2491	py += sdy;
2411	}	2492	}
2412		2493
2413	if (cell->stat_hp)	2494	if (cell->stat_hp)
2414	{	2495	{
2415	int width = cell->stat_width * T;	2496	int width = cell->stat_width * Tw;
2416	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2497	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417		2498
2418	glColor3ub (0, 0, 0);	2499	glColor3ub (0, 0, 0);
2419	glRectf (px + 1, py - thick - 2,	2500	glRectf (px + 1, py - thick - 2,
2420	px + width - 1, py);	2501	px + width - 1, py);
2421		2502
…		…
2427	}	2508	}
2428	}	2509	}
2429	}	2510	}
2430		2511
2431	void	2512	void
2432	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2513	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433	CODE:	2514	CODE:
2434	{	2515	{
2435	static float color[16][3] = {	2516	static float color[16][3] = {
2436	{ 0.00F, 0.00F, 0.00F },	2517	{ 0.00f, 0.00f, 0.00f },
2437	{ 1.00F, 1.00F, 1.00F },	2518	{ 1.00f, 1.00f, 1.00f },
2438	{ 0.00F, 0.00F, 0.55F },	2519	{ 0.00f, 0.00f, 0.55f },
2439	{ 1.00F, 0.00F, 0.00F },	2520	{ 1.00f, 0.00f, 0.00f },
2440		2521
2441	{ 1.00F, 0.54F, 0.00F },	2522	{ 1.00f, 0.54f, 0.00f },
2442	{ 0.11F, 0.56F, 1.00F },	2523	{ 0.11f, 0.56f, 1.00f },
2443	{ 0.93F, 0.46F, 0.00F },	2524	{ 0.93f, 0.46f, 0.00f },
2444	{ 0.18F, 0.54F, 0.34F },	2525	{ 0.18f, 0.54f, 0.34f },
2445		2526
2446	{ 0.56F, 0.73F, 0.56F },	2527	{ 0.56f, 0.73f, 0.56f },
2447	{ 0.80F, 0.80F, 0.80F },	2528	{ 0.80f, 0.80f, 0.80f },
2448	{ 0.55F, 0.41F, 0.13F },	2529	{ 0.55f, 0.41f, 0.13f },
2449	{ 0.99F, 0.77F, 0.26F },	2530	{ 0.99f, 0.77f, 0.26f },
2450		2531
2451	{ 0.74F, 0.65F, 0.41F },	2532	{ 0.74f, 0.65f, 0.41f },
2452		2533
2453	{ 0.00F, 1.00F, 1.00F },	2534	{ 0.00f, 1.00f, 1.00f },
2454	{ 1.00F, 0.00F, 1.00F },	2535	{ 1.00f, 0.00f, 1.00f },
2455	{ 1.00F, 1.00F, 0.00F },	2536	{ 1.00f, 1.00f, 0.00f },
2456	};	2537	};
2457		2538
2458	int x, y;	2539	int x, y;
2459		2540
2460	glEnable (GL_TEXTURE_2D);	2541	glEnable (GL_TEXTURE_2D);
2461	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2542	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462	* but the nvidia driver (185.18.14) mishandles alpha textures	2543	* but the nvidia driver (185.18.14) mishandles alpha textures
2463	* ansd takes the colour from god knows where instead of using	2544	* and takes the colour from god knows where instead of using
2464	* Cp. MODULATE results in the same colour, but slightly different	2545	* Cp. MODULATE results in the same colour, but slightly different
2465	* alpha, but atcually gives us the correct colour with nvidia.	2546	* alpha, but atcually gives us the correct colour with nvidia.
2466	*/	2547	*/
2467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2548	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468	glEnable (GL_BLEND);	2549	glEnable (GL_BLEND);
…		…
2476		2557
2477	if (m)	2558	if (m)
2478	{	2559	{
2479	float *c = color [m & 15];	2560	float *c = color [m & 15];
2480		2561
2481	float tx1 = m & 0x40 ? 0.5 : 0.;	2562	float tx1 = m & 0x40 ? 0.5f : 0.f;
2482	float tx2 = tx1 + 0.5;	2563	float tx2 = tx1 + 0.5f;
2483		2564
2484	glColor4f (c[0], c[1], c[2], 1);	2565	glColor4f (c[0], c[1], c[2], 1);
2485	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2566	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2567	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2568	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2497	void	2578	void
2498	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2579	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499	PPCODE:	2580	PPCODE:
2500	{	2581	{
2501	int x, y;	2582	int x, y;
2502	int sw1 = sw + 2;	2583	int sw1 = sw + 2;
2503	int sh1 = sh + 2;	2584	int sh1 = sh + 2;
2504	int sh3 = sh * 3;	2585	int sh3 = sh * 3;
2505	int sw34 = (sw * 3 + 3) & ~3;	2586	int sw3 = sw * 3;
		2587	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2588	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2506	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2589	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2507	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2590	memset (darkness1, 0, sw1*sh1);
2508	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2509		2591
2510	SvPOK_only (darkness3_sv);	2592	SvPOK_only (darkness3_sv);
2511	SvCUR_set (darkness3_sv, sw34 * sh3);	2593	SvCUR_set (darkness3_sv, sw3 * sh3);
2512		2594
2513	mx += self->x - 1;	2595	mx += self->x - 1;
2514	my += self->y - 1;	2596	my += self->y - 1;
2515
2516	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517		2597
2518	for (y = 0; y < sh1; y++)	2598	for (y = 0; y < sh1; y++)
2519	if (0 <= y + my && y + my < self->rows)	2599	if (0 <= y + my && y + my < self->rows)
2520	{	2600	{
2521	maprow *row = self->row + (y + my);	2601	maprow *row = self->row + (y + my);
…		…
2554		2634
2555	uint8_t r13 = (d13 + d23 + d12) / 3;	2635	uint8_t r13 = (d13 + d23 + d12) / 3;
2556	uint8_t r23 = d23;	2636	uint8_t r23 = d23;
2557	uint8_t r33 = (d23 + d33 + d32) / 3;	2637	uint8_t r33 = (d23 + d33 + d32) / 3;
2558		2638
2559	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2643	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2564	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568	}	2648	}
2569		2649
2570	free (darkness1);	2650	free (darkness1);
2571		2651
2572	EXTEND (SP, 3);	2652	EXTEND (SP, 3);
2573	PUSHs (sv_2mortal (newSViv (sw34)));	2653	PUSHs (sv_2mortal (newSViv (sw3)));
2574	PUSHs (sv_2mortal (newSViv (sh3)));	2654	PUSHs (sv_2mortal (newSViv (sh3)));
2575	PUSHs (darkness3_sv);	2655	PUSHs (darkness3_sv);
2576	}	2656	}
2577		2657
2578	SV *	2658	SV *
…		…
2641	else	2721	else
2642	*data++ = 0;	2722	*data++ = 0;
2643	}	2723	}
2644	}	2724	}
2645		2725
2646	/* if size is wh + 5 then no data has been found /	2726	/* if size is wh + 5 then no data has been found /
2647	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2727	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2648	{	2728	{
2649	SvPOK_only (data_sv);	2729	SvPOK_only (data_sv);
2650	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2730	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2651	}	2731	}
2652		2732
2653	RETVAL = data_sv;	2733	RETVAL = data_sv;
2654	}	2734	}
2655	OUTPUT:	2735	OUTPUT:
2656	RETVAL	2736	RETVAL
2657		2737
2658	void	2738	void
…		…
2665	STRLEN len;	2745	STRLEN len;
2666	uint8_t data, end;	2746	uint8_t data, end;
2667		2747
2668	len = SvLEN (data_sv);	2748	len = SvLEN (data_sv);
2669	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2749	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2670	data = SvPVbyte_nolen (data_sv);	2750	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2671	end = data + len + 8;	2751	end = data + len + 8;
2672		2752
2673	if (len < 5)	2753	if (len < 5)
2674	XSRETURN_EMPTY;	2754	XSRETURN_EMPTY;
2675		2755
…		…
2736	}	2816	}
2737		2817
2738	MODULE = Deliantra::Client PACKAGE = DC::RW	2818	MODULE = Deliantra::Client PACKAGE = DC::RW
2739		2819
2740	DC::RW	2820	DC::RW
2741	new (SV class, SV data_sv)	2821	new (SV klass, SV data_sv)
2742	CODE:	2822	CODE:
2743	{	2823	{
2744	STRLEN datalen;	2824	STRLEN datalen;
2745	char *data = SvPVbyte (data_sv, datalen);	2825	char *data = SvPVbyte (data_sv, datalen);
2746		2826
…		…
2748	}	2828	}
2749	OUTPUT:	2829	OUTPUT:
2750	RETVAL	2830	RETVAL
2751		2831
2752	DC::RW	2832	DC::RW
2753	new_from_file (SV class, const char path, const char *mode = "rb")	2833	new_from_file (SV klass, const char path, const char *mode = "rb")
2754	CODE:	2834	CODE:
2755	RETVAL = SDL_RWFromFile (path, mode);	2835	RETVAL = SDL_RWFromFile (path, mode);
2756	OUTPUT:	2836	OUTPUT:
2757	RETVAL	2837	RETVAL
2758		2838
…		…
2776	if (RETVAL < 0)	2856	if (RETVAL < 0)
2777	{	2857	{
2778	RETVAL = Mix_GroupOldest (-1);	2858	RETVAL = Mix_GroupOldest (-1);
2779		2859
2780	if (RETVAL < 0)	2860	if (RETVAL < 0)
		2861	{
		2862	// happens sometimes, maybe it just stopped playing(?)
		2863	RETVAL = Mix_GroupAvailable (-1);
		2864
		2865	if (RETVAL < 0)
2781	XSRETURN_UNDEF;	2866	XSRETURN_UNDEF;
2782		2867	}
		2868	else
2783	Mix_HaltChannel (RETVAL);	2869	Mix_HaltChannel (RETVAL);
2784	}	2870	}
2785		2871
2786	Mix_UnregisterAllEffects (RETVAL);	2872	Mix_UnregisterAllEffects (RETVAL);
2787	Mix_Volume (RETVAL, 128);	2873	Mix_Volume (RETVAL, 128);
2788	}	2874	}
…		…
2835	void	2921	void
2836	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2922	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837	CODE:	2923	CODE:
2838	{	2924	{
2839	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2925	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2926	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2927	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842	}	2928	}
2843		2929
2844	void	2930	void
2845	set_reverse_stereo (DC::Channel self, int flip)	2931	set_reverse_stereo (DC::Channel self, int flip)
…		…
2848		2934
2849	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2935	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850		2936
2851	PROTOTYPES: DISABLE	2937	PROTOTYPES: DISABLE
2852		2938
		2939	void
		2940	decoders ()
		2941	PPCODE:
		2942	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2943	int i, num = Mix_GetNumChunkDecoders ();
		2944	EXTEND (SP, num);
		2945	for (i = 0; i < num; ++i)
		2946	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2947	#else
		2948	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2949	#endif
		2950
2853	DC::MixChunk	2951	DC::MixChunk
2854	new (SV *class, DC::RW rwops)	2952	new (SV *klass, DC::RW rwops)
2855	CODE:	2953	CODE:
2856	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2954	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2857	OUTPUT:	2955	OUTPUT:
2858	RETVAL	2956	RETVAL
2859		2957
…		…
2889	OUTPUT:	2987	OUTPUT:
2890	RETVAL	2988	RETVAL
2891		2989
2892	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2990	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893		2991
		2992	void
		2993	decoders ()
		2994	PPCODE:
		2995	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2996	int i, num = Mix_GetNumMusicDecoders ();
		2997	EXTEND (SP, num);
		2998	for (i = 0; i < num; ++i)
		2999	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3000	#else
		3001	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3002	#endif
		3003
2894	int	3004	int
2895	volume (int volume = -1)	3005	volume (int volume = -1)
2896	PROTOTYPE: ;$	3006	PROTOTYPE: ;$
2897	CODE:	3007	CODE:
2898	if (items > 0)	3008	if (items > 0)
…		…
2909	void	3019	void
2910	halt ()	3020	halt ()
2911	CODE:	3021	CODE:
2912	Mix_HaltMusic ();	3022	Mix_HaltMusic ();
2913		3023
		3024	int
		3025	playing ()
		3026	CODE:
		3027	RETVAL = Mix_PlayingMusic ();
		3028	OUTPUT:
		3029	RETVAL
		3030
2914	DC::MixMusic	3031	DC::MixMusic
2915	new (SV *class, DC::RW rwops)	3032	new (SV *klass, DC::RW rwops)
2916	CODE:	3033	CODE:
2917	RETVAL = Mix_LoadMUS_RW (rwops);	3034	RETVAL = Mix_LoadMUS_RW (rwops);
2918	OUTPUT:	3035	OUTPUT:
2919	RETVAL	3036	RETVAL
2920		3037
…		…
3057	const_iv (GL_FUNC_SUBTRACT),	3174	const_iv (GL_FUNC_SUBTRACT),
3058	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3175	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059	# undef const_iv	3176	# undef const_iv
3060	};	3177	};
3061		3178
3062	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3179	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3180	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064		3181
3065	texture_av = newAV ();	3182	texture_av = newAV ();
3066	AvREAL_off (texture_av);	3183	AvREAL_off (texture_av);
3067	}	3184	}
3068		3185
…		…
3073	gl.BlendFuncSeparateEXT = 0;	3190	gl.BlendFuncSeparateEXT = 0;
3074		3191
3075	void	3192	void
3076	apple_nvidia_bug (int enable)	3193	apple_nvidia_bug (int enable)
3077		3194
3078	char *	3195	const char *
3079	gl_vendor ()	3196	gl_vendor ()
3080	CODE:	3197	CODE:
3081	RETVAL = (char *)glGetString (GL_VENDOR);	3198	RETVAL = (const char *)glGetString (GL_VENDOR);
3082	OUTPUT:	3199	OUTPUT:
3083	RETVAL	3200	RETVAL
3084		3201
3085	char *	3202	const char *
3086	gl_version ()	3203	gl_version ()
3087	CODE:	3204	CODE:
3088	RETVAL = (char *)glGetString (GL_VERSION);	3205	RETVAL = (const char *)glGetString (GL_VERSION);
3089	OUTPUT:	3206	OUTPUT:
3090	RETVAL	3207	RETVAL
3091		3208
3092	char *	3209	const char *
3093	gl_extensions ()	3210	gl_extensions ()
3094	CODE:	3211	CODE:
3095	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3212	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3096	OUTPUT:	3213	OUTPUT:
3097	RETVAL	3214	RETVAL
3098		3215
3099	const char *glGetString (GLenum pname)	3216	const char *glGetString (GLenum pname)
		3217	CODE:
		3218	RETVAL = (const char *)glGetString (pname);
		3219	OUTPUT:
		3220	RETVAL
3100		3221
3101	GLint glGetInteger (GLenum pname)	3222	GLint glGetInteger (GLenum pname)
3102	CODE:	3223	CODE:
3103	glGetIntegerv (pname, &RETVAL);	3224	glGetIntegerv (pname, &RETVAL);
3104	OUTPUT:	3225	OUTPUT:
…		…
3111	RETVAL	3232	RETVAL
3112		3233
3113	int glGetError ()	3234	int glGetError ()
3114		3235
3115	void glFinish ()	3236	void glFinish ()
		3237
		3238	void glFlush ()
3116		3239
3117	void glClear (int mask)	3240	void glClear (int mask)
3118		3241
3119	void glClearColor (float r, float g, float b, float a = 1.0)	3242	void glClearColor (float r, float g, float b, float a = 1.0)
3120	PROTOTYPE: @	3243	PROTOTYPE: @
…		…
3292		3415
3293	void glEndList ()	3416	void glEndList ()
3294		3417
3295	void glCallList (int list)	3418	void glCallList (int list)
3296		3419
		3420	void c_init ()
		3421	CODE:
		3422	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3423	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3424
3297	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3425	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298		3426
3299	PROTOTYPES: DISABLE	3427	PROTOTYPES: DISABLE
3300		3428
3301	void	3429	void
3302	find_widget (SV *self, NV x, NV y)	3430	find_widget (SV *self, NV x, NV y)
3303	PPCODE:	3431	PPCODE:
3304	{	3432	{
3305	if (within_widget (self, x, y))	3433	if (within_widget (self, x, y))
3306	XPUSHs (self);	3434	XPUSHs (self);
3307	}	3435	}
3308		3436
3309	BOOT:	3437	BOOT:
3310	{	3438	{
…		…
3318		3446
3319	void	3447	void
3320	draw (SV *self)	3448	draw (SV *self)
3321	CODE:	3449	CODE:
3322	{	3450	{
3323	HV *hv;	3451	HV *hv;
3324	SV **svp;	3452	SV **svp;
3325	NV x, y, w, h;	3453	NV x, y, w, h;
3326	SV *draw_x_sv = GvSV (draw_x_gv);	3454	SV *draw_x_sv = GvSV (draw_x_gv);
3327	SV *draw_y_sv = GvSV (draw_y_gv);	3455	SV *draw_y_sv = GvSV (draw_y_gv);
3328	SV *draw_w_sv = GvSV (draw_w_gv);	3456	SV *draw_w_sv = GvSV (draw_w_gv);
3329	SV *draw_h_sv = GvSV (draw_h_gv);	3457	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

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