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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC

…		…
41	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
42		42
43	/* work around os x broken headers */	43	/* work around os x broken headers */
44	#ifdef __MACOSX__	44	#ifdef __MACOSX__
45	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);
46	#endif	48	#endif
47		49
48	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
50		52
51	#include <glib/gmacros.h>	53	#include <glib.h>
52		54
53	#include <pango/pango.h>	55	#include <pango/pango.h>
54		56
55	#ifndef PANGO_VERSION_CHECK	57	#ifndef PANGO_VERSION_CHECK
56	# define PANGO_VERSION_CHECK(a,b,c) 0	58	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
97		99
98	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
99		101
100	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
101	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
102	#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	}
103		123
104	static AV *texture_av;	124	static AV *texture_av;
105		125
106	static struct	126	static struct
107	{	127	{
…		…
164	{	184	{
165	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
166		186
167	while (attrs)	187	while (attrs)
168	{	188	{
169	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
170		190
171	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
172	return 1;	192	return 1;
173		193
174	attrs = attrs->next;	194	attrs = attrs->next;
…		…
192	static void	212	static void
193	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
194	{	214	{
195	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
196	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
197	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
198	#endif	218	#endif
199	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
200	}	220	}
201		221
202	static void	222	static void
…		…
462		482
463	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
464	}	484	}
465		485
466	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
467	minpot (unsigned int n)	493	minpot (unsigned int n)
468	{	494	{
469	if (!n)	495	if (!n)
470	return 0;	496	return 0;
471		497
…		…
551		577
552	return mod;	578	return mod;
553	}	579	}
554		580
555	static void	581	static void
556	deliantra_main ()	582	deliantra_main (SV *real_main)
557	{	583	{
558	char *argv[] = { 0 };	584	dSP;
559	call_argv ("::main", G_DISCARD \| G_VOID, argv);	585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
560	}	588	}
561		589
562	#ifdef __MACOSX__	590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
563	/* to due surprising braindamage on the side of SDL design, we	593	/* to due surprising braindamage on the side of SDL design, we
564	* do some mind-boggling hack here: SDL requires a custom main()	594	* do some mind-boggling hack here: SDL requires a custom main()
565	* 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,
566	* 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,
567	* and which calls our main (== SDL_main) back.	597	* and which calls our main (== SDL_main) back.
568	*/	598	*/
569	extern C_LINKAGE int	599	extern C_LINKAGE int
570	main (int argc, char *argv[])	600	main (int argc, char *argv[])
571	{	601	{
572	deliantra_main ();	602	deliantra_main (real_main);
573	}	603	}
574		604
575	#undef main	605	#undef main
576		606
577	extern C_LINKAGE int main (int argc, char *argv[]);	607	extern C_LINKAGE int main (int argc, char *argv[]);
578		608
579	static void	609	static void
580	SDL_braino (void)	610	SDL_main_hack (SV *real_main_)
581	{	611	{
		612	real_main = real_main_;
		613
582	char *argv[] = { "deliantra client", 0 };	614	char *argv[] = { "deliantra client", 0 };
583	(main) (1, argv);	615	(main) (1, argv);
584	}	616	}
585	#else	617	#else
586	static void	618	static void
587	SDL_braino (void)	619	SDL_main_hack (SV *real_main)
588	{	620	{
589	deliantra_main ();	621	deliantra_main (real_main);
590	}	622	}
591	#endif	623	#endif
592		624
593	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
594		626
…		…
795		827
796	const_iv (FOW_DARKNESS)	828	const_iv (FOW_DARKNESS)
797	# undef const_iv	829	# undef const_iv
798	};	830	};
799		831
800	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--)
801	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
802		834
803	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
804	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
805	}	837	}
806		838
…		…
845	#endif	877	#endif
846	}	878	}
847		879
848	char *SDL_GetError ()	880	char *SDL_GetError ()
849		881
850	void SDL_braino ()	882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
851		884
852	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
853		886
854	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
855		888
856	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
857		890
858	void SDL_Quit ()	891	void SDL_Quit ()
859		892
860	int SDL_GL_SetAttribute (int attr, int value)	893	int SDL_GL_SetAttribute (int attr, int value)
		894	C_ARGS: (SDL_GLattr)attr, value
861		895
862	int SDL_GL_GetAttribute (int attr)	896	int SDL_GL_GetAttribute (int attr)
863	CODE:	897	CODE:
864	if (SDL_GL_GetAttribute (attr, &RETVAL))	898	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
865	XSRETURN_UNDEF;	899	XSRETURN_UNDEF;
866	OUTPUT:	900	OUTPUT:
867	RETVAL	901	RETVAL
868		902
869	void	903	void
…		…
924	);	958	);
925		959
926	if (RETVAL)	960	if (RETVAL)
927	{	961	{
928	av_clear (texture_av);	962	av_clear (texture_av);
929
930	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
931	#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);
932	#include "glfunc.h"	964	#include "glfunc.h"
933	#undef GL_FUNC	965	#undef GL_FUNC
		966	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		967	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
934	}	968	}
935	}	969	}
936	OUTPUT:	970	OUTPUT:
937	RETVAL	971	RETVAL
		972
		973	void
		974	SDL_WM_SetCaption (const char title, const char icon)
938		975
939	void	976	void
940	SDL_GL_SwapBuffers ()	977	SDL_GL_SwapBuffers ()
941		978
942	char *	979	char *
943	SDL_GetKeyName (int sym)	980	SDL_GetKeyName (int sym)
		981	C_ARGS: (SDLKey)sym
944		982
945	int	983	int
946	SDL_GetAppState ()	984	SDL_GetAppState ()
947		985
948	int	986	int
949	SDL_GetModState ()	987	SDL_GetModState ()
950		988
		989	int
		990	SDL_WaitEvent ()
		991	C_ARGS: 0
		992
951	void	993	void
		994	SDL_PumpEvents ()
		995
		996	void
952	poll_events ()	997	peep_events ()
953	PPCODE:	998	PPCODE:
954	{	999	{
955	SDL_Event ev;	1000	SDL_Event ev;
956		1001
957	SDL_PumpEvents ();	1002	SDL_PumpEvents ();
…		…
1023		1068
1024	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))));
1025	}	1070	}
1026	}	1071	}
1027		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
1028	int	1086	int
1029	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)
1030	POSTCALL:	1088	POSTCALL:
1031	Mix_HookMusicFinished (music_finished);	1089	Mix_HookMusicFinished (music_finished);
1032	Mix_ChannelFinished (channel_finished);	1090	Mix_ChannelFinished (channel_finished);
…		…
1094	add_font (char *file)	1152	add_font (char *file)
1095	CODE:	1153	CODE:
1096	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1154	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097	OUTPUT:	1155	OUTPUT:
1098	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)
1099		1164
1100	void	1165	void
1101	load_image_inline (SV *image_)	1166	load_image_inline (SV *image_)
1102	ALIAS:	1167	ALIAS:
1103	load_image_file = 1	1168	load_image_file = 1
…		…
1149		1214
1150	SDL_LockSurface (surface2);	1215	SDL_LockSurface (surface2);
1151	EXTEND (SP, 6);	1216	EXTEND (SP, 6);
1152	PUSHs (sv_2mortal (newSViv (surface2->w)));	1217	PUSHs (sv_2mortal (newSViv (surface2->w)));
1153	PUSHs (sv_2mortal (newSViv (surface2->h)));	1218	PUSHs (sv_2mortal (newSViv (surface2->h)));
1154	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1219	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1155	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)));
1156	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1221	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1157	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1222	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1158	SDL_UnlockSurface (surface2);	1223	SDL_UnlockSurface (surface2);
1159		1224
…		…
1231	MODULE = Deliantra::Client PACKAGE = DC::Font	1296	MODULE = Deliantra::Client PACKAGE = DC::Font
1232		1297
1233	PROTOTYPES: DISABLE	1298	PROTOTYPES: DISABLE
1234		1299
1235	DC::Font	1300	DC::Font
1236	new_from_file (SV class, char path, int id = 0)	1301	new_from_file (SV klass, char path, int id = 0)
1237	CODE:	1302	CODE:
1238	{	1303	{
1239	int count;	1304	int count;
1240	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1305	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1241	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1306	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1270	PROTOTYPE:	1335	PROTOTYPE:
1271	CODE:	1336	CODE:
1272	tc_restore ();	1337	tc_restore ();
1273		1338
1274	DC::Layout	1339	DC::Layout
1275	new (SV *class)	1340	new (SV *klass)
1276	CODE:	1341	CODE:
1277	New (0, RETVAL, 1, struct cf_layout);	1342	New (0, RETVAL, 1, struct cf_layout);
1278		1343
1279	RETVAL->pl = pango_layout_new (opengl_context);	1344	RETVAL->pl = pango_layout_new (opengl_context);
1280	RETVAL->r = 1.;	1345	RETVAL->r = 1.;
…		…
1429		1494
1430	void	1495	void
1431	set_height (DC::Layout self, int base_height)	1496	set_height (DC::Layout self, int base_height)
1432	CODE:	1497	CODE:
1433	if (self->base_height != base_height)	1498	if (self->base_height != base_height)
1434	{	1499	{
1435	self->base_height = base_height;	1500	self->base_height = base_height;
1436	layout_update_font (self);	1501	layout_update_font (self);
1437	}	1502	}
1438		1503
1439	void	1504	void
…		…
1671	void	1736	void
1672	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)	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)
1673	PROTOTYPE: @	1738	PROTOTYPE: @
1674	CODE:	1739	CODE:
1675	{	1740	{
		1741	glEnable (GL_BLEND);
		1742	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1676	glEnable (GL_TEXTURE_2D);	1743	glEnable (GL_TEXTURE_2D);
1677	glEnable (GL_BLEND);
1678	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679	glBindTexture (GL_TEXTURE_2D, name1);	1744	glBindTexture (GL_TEXTURE_2D, name1);
1680		1745
1681	glColor3f (intensity, intensity, intensity);	1746	glColor3f (intensity, intensity, intensity);
1682	glPushMatrix ();	1747	glPushMatrix ();
1683	glScalef (1./3, 1./3, 1.);	1748	glScalef (1./3, 1./3, 1.);
…		…
1698	glBindTexture (GL_TEXTURE_2D, name2);	1763	glBindTexture (GL_TEXTURE_2D, name2);
1699	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1764	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700		1765
1701	/* rgb == rgb(glcolor) */	1766	/* rgb == rgb(glcolor) */
1702	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1767	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1704	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705		1770
1706	/* alpha = interpolate t0, t1 by env_alpha */	1771	/* alpha = interpolate t0, t1 by env_alpha */
1707	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1772	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708		1773
…		…
1803	MODULE = Deliantra::Client PACKAGE = DC::Map	1868	MODULE = Deliantra::Client PACKAGE = DC::Map
1804		1869
1805	PROTOTYPES: DISABLE	1870	PROTOTYPES: DISABLE
1806		1871
1807	DC::Map	1872	DC::Map
1808	new (SV *class)	1873	new (SV *klass)
1809	CODE:	1874	CODE:
1810	New (0, RETVAL, 1, struct map);	1875	New (0, RETVAL, 1, struct map);
1811	RETVAL->x = 0;	1876	RETVAL->x = 0;
1812	RETVAL->y = 0;	1877	RETVAL->y = 0;
1813	RETVAL->w = 0;	1878	RETVAL->w = 0;
…		…
1969	self->y += MAP_EXTEND_Y;	2034	self->y += MAP_EXTEND_Y;
1970	}	2035	}
1971	}	2036	}
1972		2037
1973	SV *	2038	SV *
1974	map1a_update (DC::Map self, SV *data_, int extmap)	2039	map1a_update (DC::Map self, SV *data_)
1975	CODE:	2040	CODE:
1976	{	2041	{
1977	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2042	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1978	uint8_t data_end = (uint8_t )SvEND (data_);	2043	uint8_t data_end = (uint8_t )SvEND (data_);
1979	mapcell *cell;	2044	mapcell *cell;
…		…
2000		2065
2001	//TODO: don't trust server data to be in-range(!)	2066	//TODO: don't trust server data to be in-range(!)
2002		2067
2003	if (flags & 8)	2068	if (flags & 8)
2004	{	2069	{
		2070	uint8_t ext, cmd;
		2071
2005	if (extmap)	2072	do
2006	{	2073	{
2007	uint8_t ext, cmd;	2074	ext = *data++;
		2075	cmd = ext & 0x7f;
2008		2076
2009	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
2010	{	2080	{
2011	ext = *data++;
2012	cmd = ext & 0x7f;
2013
2014	if (cmd < 4)
2015	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2016	else if (cmd == 5) // health
2017	{
2018	cell->stat_width = 1;	2081	cell->stat_width = 1;
2019	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
2020	}
2021	else if (cmd == 6) // monster width
2022	cell->stat_width = *data++ + 1;
2023	else if (cmd == 0x47)
2024	{
2025	if (*data == 1) cell->player = data [1];
2026	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2029
2030	data += *data + 1;
2031	}
2032	else if (cmd == 8) // cell flags
2033	cell->flags = *data++;
2034	else if (ext & 0x40) // unknown, multibyte => skip
2035	data += *data + 1;
2036	else
2037	data++;
2038	}	2083	}
2039	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++;
2040	}	2101	}
2041	else	2102	while (ext & 0x80);
2042	cell->darkness = *data++ + 1;
2043	}	2103	}
2044		2104
2045	for (z = 0; z <= 2; ++z)	2105	for (z = 0; z <= 2; ++z)
2046	if (flags & (4 >> z))	2106	if (flags & (4 >> z))
2047	{	2107	{
…		…
2095	? self->row + y	2155	? self->row + y
2096	: 0;	2156	: 0;
2097		2157
2098	for (x = x0; x < x1; x++)	2158	for (x = x0; x < x1; x++)
2099	{	2159	{
2100	int r = 32, g = 32, b = 32, a = 192;	2160	unsigned int r = 32, g = 32, b = 32, a = 192;
2101		2161
2102	if (row && row->c0 <= x && x < row->c1)	2162	if (row && row->c0 <= x && x < row->c1)
2103	{	2163	{
2104	mapcell *cell = row->col + (x - row->c0);	2164	mapcell *cell = row->col + (x - row->c0);
2105		2165
…		…
2107	{	2167	{
2108	maptex tex = self->tex [cell->tile [z]];	2168	maptex tex = self->tex [cell->tile [z]];
2109	int a0 = 255 - tex.a;	2169	int a0 = 255 - tex.a;
2110	int a1 = tex.a;	2170	int a1 = tex.a;
2111		2171
2112	r = (r * a0 + tex.r * a1) / 255;	2172	r = div255 (r * a0 + tex.r * a1);
2113	g = (g * a0 + tex.g * a1) / 255;	2173	g = div255 (g * a0 + tex.g * a1);
2114	b = (b * a0 + tex.b * a1) / 255;	2174	b = div255 (b * a0 + tex.b * a1);
2115	a = (a * a0 + tex.a * a1) / 255;	2175	a = div255 (a * a0 + tex.a * a1);
2116	}	2176	}
2117	}	2177	}
2118		2178
2119	*map++ = (r )	2179	*map++ = (r )
2120	\| (g << 8)	2180	\| (g << 8)
…		…
2127	}	2187	}
2128	OUTPUT:	2188	OUTPUT:
2129	RETVAL	2189	RETVAL
2130		2190
2131	void	2191	void
2132	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)
2133	CODE:	2193	CODE:
2134	{	2194	{
2135	int x, y, z;	2195	int x, y, z;
2136		2196
2137	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2197	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
…		…
2141	int pl_x, pl_y;	2201	int pl_x, pl_y;
2142	maptex pl_tex;	2202	maptex pl_tex;
2143	rc_t *rc = rc_alloc ();	2203	rc_t *rc = rc_alloc ();
2144	rc_t *rc_ov = rc_alloc ();	2204	rc_t *rc_ov = rc_alloc ();
2145	rc_key_t key;	2205	rc_key_t key;
2146	rc_array_t arr, arr_hidden;	2206	rc_array_t *arr;
2147		2207
2148	pl_tex.name = 0;	2208	pl_tex.name = 0;
2149		2209
2150	// that's current max. sorry.	2210	// that's current max. sorry.
2151	if (sw > 255) sw = 255;	2211	if (sw > 255) sw = 255;
…		…
2188	}	2248	}
2189		2249
2190	glEnable (GL_BLEND);	2250	glEnable (GL_BLEND);
2191	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2192	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2252	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2193
2194	key.texname = self->tex [TEXID_HIDDEN].name;
2195	arr_hidden = rc_array (rc_ov, &key);
2196		2253
2197	for (z = 0; z <= 2; z++)	2254	for (z = 0; z <= 2; z++)
2198	{	2255	{
2199	memset (smooth_level, 0, sizeof (smooth_level));	2256	memset (smooth_level, 0, sizeof (smooth_level));
2200	key.texname = -1;	2257	key.texname = -1;
…		…
2224		2281
2225	key.texname = tex.name;	2282	key.texname = tex.name;
2226	arr = rc_array (rc, &key);	2283	arr = rc_array (rc, &key);
2227	}	2284	}
2228		2285
2229	px = (x + 1) * T - tex.w;	2286	px = (x + 1) * Th - tex.w;
2230	py = (y + 1) * T - tex.h;	2287	py = (y + 1) * Tw - tex.h;
2231		2288
2232	if (expect_false (cell->player == player) && expect_false (z == 2))	2289	if (expect_false (cell->player == player) && expect_false (z == 2))
2233	{	2290	{
2234	pl_x = px;	2291	pl_x = px;
2235	pl_y = py;	2292	pl_y = py;
…		…
2288	if (cell->flags & 1)	2345	if (cell->flags & 1)
2289	{	2346	{
2290	rc_key_t key_ov = key;	2347	rc_key_t key_ov = key;
2291	maptex tex = self->tex [TEXID_SPEECH];	2348	maptex tex = self->tex [TEXID_SPEECH];
2292	rc_array_t *arr;	2349	rc_array_t *arr;
2293	int px = x * T + T * 2 / 32;	2350	int px = x * Tw + Tw * 2 / 32;
2294	int py = y * T - T * 6 / 32;	2351	int py = y * Th - Th * 6 / 32;
2295		2352
2296	key_ov.texname = tex.name;	2353	key_ov.texname = tex.name;
2297	arr = rc_array (rc_ov, &key_ov);	2354	arr = rc_array (rc_ov, &key_ov);
2298		2355
2299	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2356	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2357	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2301	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);
2302	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2359	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2303	}	2360	}
2304	}	2361	}
2305	}	2362	}
2306	}	2363	}
2307		2364
…		…
2334	if (!(bits & 0x1000)	2391	if (!(bits & 0x1000)
2335	&& skey->level == level	2392	&& skey->level == level
2336	&& level > smooth_max [skey->x][skey->y])	2393	&& level > smooth_max [skey->x][skey->y])
2337	{	2394	{
2338	maptex tex = self->tex [skey->tile];	2395	maptex tex = self->tex [skey->tile];
2339	int px = (((int)skey->x) - 1) * T;	2396	int px = (((int)skey->x) - 1) * Tw;
2340	int py = (((int)skey->y) - 1) * T;	2397	int py = (((int)skey->y) - 1) * Th;
2341	int border = bits & 15;	2398	int border = bits & 15;
2342	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2399	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2343	float dx = tex.s * .0625f; // 16 images/row	2400	float dx = tex.s * .0625f; // 16 images/row
2344	float dy = tex.t * .5f ; // 2 images/column	2401	float dy = tex.t * .5f ; // 2 images/column
2345		2402
…		…
2358		2415
2359	if (border)	2416	if (border)
2360	{	2417	{
2361	float ox = border * dx;	2418	float ox = border * dx;
2362		2419
2363	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2420	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2364	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2421	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2365	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2422	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2366	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2423	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2367	}	2424	}
2368		2425
2369	if (corner)	2426	if (corner)
2370	{	2427	{
2371	float ox = corner * dx;	2428	float ox = corner * dx;
2372		2429
2373	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2430	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2374	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2375	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2376	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2377	}	2434	}
2378	}	2435	}
2379	}	2436	}
2380	}	2437	}
2381	}	2438	}
…		…
2422	for (x = 0; x < sw; x++)	2479	for (x = 0; x < sw; x++)
2423	if (row->c0 <= x + mx && x + mx < row->c1)	2480	if (row->c0 <= x + mx && x + mx < row->c1)
2424	{	2481	{
2425	mapcell *cell = row->col + (x + mx - row->c0);	2482	mapcell *cell = row->col + (x + mx - row->c0);
2426		2483
2427	int px = x * T;	2484	int px = x * Tw;
2428	int py = y * T;	2485	int py = y * Th;
2429		2486
2430	if (expect_false (cell->player == player))	2487	if (expect_false (cell->player == player))
2431	{	2488	{
2432	px += sdx;	2489	px += sdx;
2433	py += sdy;	2490	py += sdy;
2434	}	2491	}
2435		2492
2436	if (cell->stat_hp)	2493	if (cell->stat_hp)
2437	{	2494	{
2438	int width = cell->stat_width * T;	2495	int width = cell->stat_width * Tw;
2439	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2496	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2440		2497
2441	glColor3ub (0, 0, 0);	2498	glColor3ub (0, 0, 0);
2442	glRectf (px + 1, py - thick - 2,	2499	glRectf (px + 1, py - thick - 2,
2443	px + width - 1, py);	2500	px + width - 1, py);
2444		2501
…		…
2524	int x, y;	2581	int x, y;
2525	int sw1 = sw + 2;	2582	int sw1 = sw + 2;
2526	int sh1 = sh + 2;	2583	int sh1 = sh + 2;
2527	int sh3 = sh * 3;	2584	int sh3 = sh * 3;
2528	int sw3 = sw * 3;	2585	int sw3 = sw * 3;
2529	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2530	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2586	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2531	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2587	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2588	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2589	memset (darkness1, 0, sw1*sh1);
2532		2590
2533	SvPOK_only (darkness3_sv);	2591	SvPOK_only (darkness3_sv);
2534	SvCUR_set (darkness3_sv, sw3 * sh3);	2592	SvCUR_set (darkness3_sv, sw3 * sh3);
2535		2593
2536	mx += self->x - 1;	2594	mx += self->x - 1;
…		…
2686	STRLEN len;	2744	STRLEN len;
2687	uint8_t data, end;	2745	uint8_t data, end;
2688		2746
2689	len = SvLEN (data_sv);	2747	len = SvLEN (data_sv);
2690	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2748	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691	data = SvPVbyte_nolen (data_sv);	2749	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2692	end = data + len + 8;	2750	end = data + len + 8;
2693		2751
2694	if (len < 5)	2752	if (len < 5)
2695	XSRETURN_EMPTY;	2753	XSRETURN_EMPTY;
2696		2754
…		…
2757	}	2815	}
2758		2816
2759	MODULE = Deliantra::Client PACKAGE = DC::RW	2817	MODULE = Deliantra::Client PACKAGE = DC::RW
2760		2818
2761	DC::RW	2819	DC::RW
2762	new (SV class, SV data_sv)	2820	new (SV klass, SV data_sv)
2763	CODE:	2821	CODE:
2764	{	2822	{
2765	STRLEN datalen;	2823	STRLEN datalen;
2766	char *data = SvPVbyte (data_sv, datalen);	2824	char *data = SvPVbyte (data_sv, datalen);
2767		2825
…		…
2769	}	2827	}
2770	OUTPUT:	2828	OUTPUT:
2771	RETVAL	2829	RETVAL
2772		2830
2773	DC::RW	2831	DC::RW
2774	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")
2775	CODE:	2833	CODE:
2776	RETVAL = SDL_RWFromFile (path, mode);	2834	RETVAL = SDL_RWFromFile (path, mode);
2777	OUTPUT:	2835	OUTPUT:
2778	RETVAL	2836	RETVAL
2779		2837
…		…
2797	if (RETVAL < 0)	2855	if (RETVAL < 0)
2798	{	2856	{
2799	RETVAL = Mix_GroupOldest (-1);	2857	RETVAL = Mix_GroupOldest (-1);
2800		2858
2801	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)
2802	XSRETURN_UNDEF;	2865	XSRETURN_UNDEF;
2803		2866	}
		2867	else
2804	Mix_HaltChannel (RETVAL);	2868	Mix_HaltChannel (RETVAL);
2805	}	2869	}
2806		2870
2807	Mix_UnregisterAllEffects (RETVAL);	2871	Mix_UnregisterAllEffects (RETVAL);
2808	Mix_Volume (RETVAL, 128);	2872	Mix_Volume (RETVAL, 128);
2809	}	2873	}
…		…
2869		2933
2870	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2934	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2871		2935
2872	PROTOTYPES: DISABLE	2936	PROTOTYPES: DISABLE
2873		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
2874	DC::MixChunk	2950	DC::MixChunk
2875	new (SV *class, DC::RW rwops)	2951	new (SV *klass, DC::RW rwops)
2876	CODE:	2952	CODE:
2877	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2953	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2878	OUTPUT:	2954	OUTPUT:
2879	RETVAL	2955	RETVAL
2880		2956
…		…
2910	OUTPUT:	2986	OUTPUT:
2911	RETVAL	2987	RETVAL
2912		2988
2913	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2989	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2914		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
2915	int	3003	int
2916	volume (int volume = -1)	3004	volume (int volume = -1)
2917	PROTOTYPE: ;$	3005	PROTOTYPE: ;$
2918	CODE:	3006	CODE:
2919	if (items > 0)	3007	if (items > 0)
…		…
2930	void	3018	void
2931	halt ()	3019	halt ()
2932	CODE:	3020	CODE:
2933	Mix_HaltMusic ();	3021	Mix_HaltMusic ();
2934		3022
		3023	int
		3024	playing ()
		3025	CODE:
		3026	RETVAL = Mix_PlayingMusic ();
		3027	OUTPUT:
		3028	RETVAL
		3029
2935	DC::MixMusic	3030	DC::MixMusic
2936	new (SV *class, DC::RW rwops)	3031	new (SV *klass, DC::RW rwops)
2937	CODE:	3032	CODE:
2938	RETVAL = Mix_LoadMUS_RW (rwops);	3033	RETVAL = Mix_LoadMUS_RW (rwops);
2939	OUTPUT:	3034	OUTPUT:
2940	RETVAL	3035	RETVAL
2941		3036
…		…
3078	const_iv (GL_FUNC_SUBTRACT),	3173	const_iv (GL_FUNC_SUBTRACT),
3079	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3174	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3080	# undef const_iv	3175	# undef const_iv
3081	};	3176	};
3082		3177
3083	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--)
3084	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3179	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3085		3180
3086	texture_av = newAV ();	3181	texture_av = newAV ();
3087	AvREAL_off (texture_av);	3182	AvREAL_off (texture_av);
3088	}	3183	}
3089		3184
…		…
3094	gl.BlendFuncSeparateEXT = 0;	3189	gl.BlendFuncSeparateEXT = 0;
3095		3190
3096	void	3191	void
3097	apple_nvidia_bug (int enable)	3192	apple_nvidia_bug (int enable)
3098		3193
3099	char *	3194	const char *
3100	gl_vendor ()	3195	gl_vendor ()
3101	CODE:	3196	CODE:
3102	RETVAL = (char *)glGetString (GL_VENDOR);	3197	RETVAL = (const char *)glGetString (GL_VENDOR);
3103	OUTPUT:	3198	OUTPUT:
3104	RETVAL	3199	RETVAL
3105		3200
3106	char *	3201	const char *
3107	gl_version ()	3202	gl_version ()
3108	CODE:	3203	CODE:
3109	RETVAL = (char *)glGetString (GL_VERSION);	3204	RETVAL = (const char *)glGetString (GL_VERSION);
3110	OUTPUT:	3205	OUTPUT:
3111	RETVAL	3206	RETVAL
3112		3207
3113	char *	3208	const char *
3114	gl_extensions ()	3209	gl_extensions ()
3115	CODE:	3210	CODE:
3116	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3211	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3117	OUTPUT:	3212	OUTPUT:
3118	RETVAL	3213	RETVAL
3119		3214
3120	const char *glGetString (GLenum pname)	3215	const char *glGetString (GLenum pname)
		3216	CODE:
		3217	RETVAL = (const char *)glGetString (pname);
		3218	OUTPUT:
		3219	RETVAL
3121		3220
3122	GLint glGetInteger (GLenum pname)	3221	GLint glGetInteger (GLenum pname)
3123	CODE:	3222	CODE:
3124	glGetIntegerv (pname, &RETVAL);	3223	glGetIntegerv (pname, &RETVAL);
3125	OUTPUT:	3224	OUTPUT:
…		…
3132	RETVAL	3231	RETVAL
3133		3232
3134	int glGetError ()	3233	int glGetError ()
3135		3234
3136	void glFinish ()	3235	void glFinish ()
		3236
		3237	void glFlush ()
3137		3238
3138	void glClear (int mask)	3239	void glClear (int mask)
3139		3240
3140	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)
3141	PROTOTYPE: @	3242	PROTOTYPE: @

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.296 by root, Mon Dec 21 23:52:34 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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.320 by root, Sun Nov 18 01:00:10 2018 UTC