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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 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
…		…
80	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
81	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
82		84
83	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84		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 */
85	#define FOW_DARKNESS 64	89	#define FOW_DARKNESS 50
86	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	90	#define DARKNESS_ADJUST(n) (n)
87		91
88	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
90		94
91	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
…		…
95		99
96	#define KMOD_LRAM 0x10000 // our extension	100	#define KMOD_LRAM 0x10000 // our extension
97		101
98	#define TEXID_SPEECH 1	102	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	103	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3	104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
101		123
102	static AV *texture_av;	124	static AV *texture_av;
103		125
104	static struct	126	static struct
105	{	127	{
…		…
162	{	184	{
163	GSList *attrs = run->item->analysis.extra_attrs;	185	GSList *attrs = run->item->analysis.extra_attrs;
164		186
165	while (attrs)	187	while (attrs)
166	{	188	{
167	PangoAttribute *attr = attrs->data;	189	PangoAttribute attr = (PangoAttribute )attrs->data;
168		190
169	if (attr->klass->type == PANGO_ATTR_SHAPE)	191	if (attr->klass->type == PANGO_ATTR_SHAPE)
170	return 1;	192	return 1;
171		193
172	attrs = attrs->next;	194	attrs = attrs->next;
…		…
190	static void	212	static void
191	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
192	{	214	{
193	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
194	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
195	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196	#endif	218	#endif
197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198	}	220	}
199		221
200	static void	222	static void
…		…
459	ev.data2 = 0;	481	ev.data2 = 0;
460		482
461	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
462	}	484	}
463		485
		486	// approximately divide by 255
		487	static unsigned int
		488	div255 (unsigned int n)
		489	{
		490	return (n + (n >> 8)) >> 8;
		491	}
		492
464	static unsigned int	493	static unsigned int
465	minpot (unsigned int n)	494	minpot (unsigned int n)
466	{	495	{
467	if (!n)	496	if (!n)
468	return 0;	497	return 0;
…		…
549		578
550	return mod;	579	return mod;
551	}	580	}
552		581
553	static void	582	static void
554	deliantra_main ()	583	deliantra_main (SV *real_main)
555	{	584	{
556	char *argv[] = { 0 };	585	dSP;
557	call_argv ("::main", G_DISCARD \| G_VOID, argv);	586
		587	PUSHMARK (SP);
		588	call_sv (real_main, G_DISCARD \| G_VOID);
558	}	589	}
559		590
560	#ifdef __MACOSX__	591	#ifdef __MACOSX__
		592	static SV *real_main;
		593
561	/* to due surprising braindamage on the side of SDL design, we	594	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	595	* do some mind-boggling hack here: SDL requires a custom main()
563	* on OS X, so... we provide one and call the original main(), which,	596	* on OS X, so... we provide one and call the original main(), which,
564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	597	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	598	* and which calls our main (== SDL_main) back.
566	*/	599	*/
567	extern C_LINKAGE int	600	extern C_LINKAGE int
568	main (int argc, char *argv[])	601	main (int argc, char *argv[])
569	{	602	{
570	deliantra_main ();	603	deliantra_main (real_main);
571	}	604	}
572		605
573	#undef main	606	#undef main
574		607
575	extern C_LINKAGE int main (int argc, char *argv[]);	608	extern C_LINKAGE int main (int argc, char *argv[]);
576		609
577	static void	610	static void
578	SDL_braino (void)	611	SDL_main_hack (SV *real_main_)
579	{	612	{
		613	real_main = real_main_;
		614
580	char *argv[] = { "deliantra client", 0 };	615	char *argv[] = { "deliantra client", 0 };
581	(main) (1, argv);	616	(main) (1, argv);
582	}	617	}
583	#else	618	#else
584	static void	619	static void
585	SDL_braino (void)	620	SDL_main_hack (SV *real_main)
586	{	621	{
587	deliantra_main ();	622	deliantra_main (real_main);
588	}	623	}
589	#endif	624	#endif
590		625
591	MODULE = Deliantra::Client PACKAGE = DC	626	MODULE = Deliantra::Client PACKAGE = DC
592		627
…		…
793		828
794	const_iv (FOW_DARKNESS)	829	const_iv (FOW_DARKNESS)
795	# undef const_iv	830	# undef const_iv
796	};	831	};
797		832
798	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--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	834	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		835
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	836	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	837	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	838	}
804		839
…		…
843	#endif	878	#endif
844	}	879	}
845		880
846	char *SDL_GetError ()	881	char *SDL_GetError ()
847		882
848	void SDL_braino ()	883	void SDL_main_hack (SV *real_main)
		884	PROTOTYPE: &
849		885
850	int SDL_Init (U32 flags)	886	int SDL_Init (U32 flags)
851		887
852	int SDL_InitSubSystem (U32 flags)	888	int SDL_InitSubSystem (U32 flags)
853		889
854	void SDL_QuitSubSystem (U32 flags)	890	void SDL_QuitSubSystem (U32 flags)
855		891
856	void SDL_Quit ()	892	void SDL_Quit ()
857		893
858	int SDL_GL_SetAttribute (int attr, int value)	894	int SDL_GL_SetAttribute (int attr, int value)
		895	C_ARGS: (SDL_GLattr)attr, value
859		896
860	int SDL_GL_GetAttribute (int attr)	897	int SDL_GL_GetAttribute (int attr)
861	CODE:	898	CODE:
862	if (SDL_GL_GetAttribute (attr, &RETVAL))	899	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863	XSRETURN_UNDEF;	900	XSRETURN_UNDEF;
864	OUTPUT:	901	OUTPUT:
865	RETVAL	902	RETVAL
866		903
867	void	904	void
…		…
922	);	959	);
923		960
924	if (RETVAL)	961	if (RETVAL)
925	{	962	{
926	av_clear (texture_av);	963	av_clear (texture_av);
927
928	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929	#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);
930	#include "glfunc.h"	965	#include "glfunc.h"
931	#undef GL_FUNC	966	#undef GL_FUNC
		967	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		968	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932	}	969	}
933	}	970	}
934	OUTPUT:	971	OUTPUT:
935	RETVAL	972	RETVAL
		973
		974	void
		975	SDL_WM_SetCaption (const char title, const char icon)
936		976
937	void	977	void
938	SDL_GL_SwapBuffers ()	978	SDL_GL_SwapBuffers ()
939		979
940	char *	980	char *
941	SDL_GetKeyName (int sym)	981	SDL_GetKeyName (int sym)
		982	C_ARGS: (SDLKey)sym
942		983
943	int	984	int
944	SDL_GetAppState ()	985	SDL_GetAppState ()
945		986
946	int	987	int
947	SDL_GetModState ()	988	SDL_GetModState ()
948		989
		990	int
		991	SDL_WaitEvent ()
		992	C_ARGS: 0
		993
949	void	994	void
		995	SDL_PumpEvents ()
		996
		997	void
950	poll_events ()	998	peep_events ()
951	PPCODE:	999	PPCODE:
952	{	1000	{
953	SDL_Event ev;	1001	SDL_Event ev;
954		1002
955	SDL_PumpEvents ();	1003	SDL_PumpEvents ();
…		…
1021		1069
1022	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))));
1023	}	1071	}
1024	}	1072	}
1025		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
1026	int	1087	int
1027	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)
1028	POSTCALL:	1089	POSTCALL:
1029	Mix_HookMusicFinished (music_finished);	1090	Mix_HookMusicFinished (music_finished);
1030	Mix_ChannelFinished (channel_finished);	1091	Mix_ChannelFinished (channel_finished);
1031		1092
1032	void	1093	void
1033	Mix_QuerySpec ()	1094	Mix_QuerySpec ()
…		…
1092	add_font (char *file)	1153	add_font (char *file)
1093	CODE:	1154	CODE:
1094	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1155	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095	OUTPUT:	1156	OUTPUT:
1096	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)
1097		1165
1098	void	1166	void
1099	load_image_inline (SV *image_)	1167	load_image_inline (SV *image_)
1100	ALIAS:	1168	ALIAS:
1101	load_image_file = 1	1169	load_image_file = 1
…		…
1147		1215
1148	SDL_LockSurface (surface2);	1216	SDL_LockSurface (surface2);
1149	EXTEND (SP, 6);	1217	EXTEND (SP, 6);
1150	PUSHs (sv_2mortal (newSViv (surface2->w)));	1218	PUSHs (sv_2mortal (newSViv (surface2->w)));
1151	PUSHs (sv_2mortal (newSViv (surface2->h)));	1219	PUSHs (sv_2mortal (newSViv (surface2->h)));
1152	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1220	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1153	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)));
1154	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1222	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1223	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156	SDL_UnlockSurface (surface2);	1224	SDL_UnlockSurface (surface2);
1157		1225
…		…
1229	MODULE = Deliantra::Client PACKAGE = DC::Font	1297	MODULE = Deliantra::Client PACKAGE = DC::Font
1230		1298
1231	PROTOTYPES: DISABLE	1299	PROTOTYPES: DISABLE
1232		1300
1233	DC::Font	1301	DC::Font
1234	new_from_file (SV class, char path, int id = 0)	1302	new_from_file (SV klass, char path, int id = 0)
1235	CODE:	1303	CODE:
1236	{	1304	{
1237	int count;	1305	int count;
1238	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1306	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1239	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1307	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1268	PROTOTYPE:	1336	PROTOTYPE:
1269	CODE:	1337	CODE:
1270	tc_restore ();	1338	tc_restore ();
1271		1339
1272	DC::Layout	1340	DC::Layout
1273	new (SV *class)	1341	new (SV *klass)
1274	CODE:	1342	CODE:
1275	New (0, RETVAL, 1, struct cf_layout);	1343	New (0, RETVAL, 1, struct cf_layout);
1276		1344
1277	RETVAL->pl = pango_layout_new (opengl_context);	1345	RETVAL->pl = pango_layout_new (opengl_context);
1278	RETVAL->r = 1.;	1346	RETVAL->r = 1.;
…		…
1427		1495
1428	void	1496	void
1429	set_height (DC::Layout self, int base_height)	1497	set_height (DC::Layout self, int base_height)
1430	CODE:	1498	CODE:
1431	if (self->base_height != base_height)	1499	if (self->base_height != base_height)
1432	{	1500	{
1433	self->base_height = base_height;	1501	self->base_height = base_height;
1434	layout_update_font (self);	1502	layout_update_font (self);
1435	}	1503	}
1436		1504
1437	void	1505	void
…		…
1665	glDisable (GL_BLEND);	1733	glDisable (GL_BLEND);
1666	}	1734	}
1667	}	1735	}
1668		1736
1669	void	1737	void
1670	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)
1671	PROTOTYPE: @	1739	PROTOTYPE: @
1672	CODE:	1740	CODE:
1673	{	1741	{
		1742	glEnable (GL_BLEND);
		1743	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674	glEnable (GL_TEXTURE_2D);	1744	glEnable (GL_TEXTURE_2D);
1675	glEnable (GL_BLEND);
1676	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1745	glBindTexture (GL_TEXTURE_2D, name1);
1678		1746
1679	glColor3f (intensity, intensity, intensity);	1747	glColor3f (intensity, intensity, intensity);
1680	glPushMatrix ();	1748	glPushMatrix ();
1681	glScalef (1./3, 1./3, 1.);	1749	glScalef (1./3, 1./3, 1.);
1682		1750
1683	if (blend > 0.f)	1751	if (blend > 0.f)
1684	{	1752	{
1685	float S2, T2; /* 0. 0. for texture 2 */	1753	float dx3 = dx * -3.f / w;
1686	float w = w1 > w2 ? w1 : w2;	1754	float dy3 = dy * -3.f / h;
1687	float h = h1 > h2 ? h1 : h2;
1688	GLfloat env_color[4] = { 0., 0., 0., blend };	1755	GLfloat env_color[4] = { 0., 0., 0., blend };
1689		1756
1690	/* interpolate the two shadow textures */	1757	/* interpolate the two shadow textures */
1691	/* stage 0 == rgb(glcolor) + alpha(t0) */	1758	/* stage 0 == rgb(glcolor) + alpha(t0) */
1692	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1759	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1764	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1766
1700	/* rgb == rgb(glcolor) */	1767	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1768	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1771
1705	/* alpha = interpolate t0, t1 by env_alpha */	1772	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1773	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1774
…		…
1713	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714		1781
1715	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1782	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1783	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717		1784
1718	s1 *= w / w1;
1719	t1 *= h / h1;
1720
1721	dx *= -3.f / w2;
1722	dy *= -3.f / h2;
1723	dx *= w / w2;
1724	dy *= h / h2;
1725
1726	s2 *= w / w2;
1727	t2 *= h / h2;
1728
1729	glBegin (GL_QUADS);	1785	glBegin (GL_QUADS);
1730	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);
1731	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);
1732	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);
1733	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);
1734	glEnd ();	1790	glEnd ();
1735		1791
1736	glDisable (GL_TEXTURE_2D);	1792	glDisable (GL_TEXTURE_2D);
1737	gl.ActiveTexture (GL_TEXTURE0);	1793	gl.ActiveTexture (GL_TEXTURE0);
1738	}	1794	}
…		…
1740	{	1796	{
1741	/* simple blending of one texture, also opengl <1.3 path */	1797	/* simple blending of one texture, also opengl <1.3 path */
1742	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1798	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743		1799
1744	glBegin (GL_QUADS);	1800	glBegin (GL_QUADS);
1745	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1801	glTexCoord2f (0, 0); glVertex2f (0, 0);
1746	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1802	glTexCoord2f (0, t); glVertex2f (0, h);
1747	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1803	glTexCoord2f (s, t); glVertex2f (w, h);
1748	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1804	glTexCoord2f (s, 0); glVertex2f (w, 0);
1749	glEnd ();	1805	glEnd ();
1750	}	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 ();
1751		1851
1752	glPopMatrix ();	1852	glPopMatrix ();
1753		1853
1754	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1755	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
…		…
1769	MODULE = Deliantra::Client PACKAGE = DC::Map	1869	MODULE = Deliantra::Client PACKAGE = DC::Map
1770		1870
1771	PROTOTYPES: DISABLE	1871	PROTOTYPES: DISABLE
1772		1872
1773	DC::Map	1873	DC::Map
1774	new (SV *class)	1874	new (SV *klass)
1775	CODE:	1875	CODE:
1776	New (0, RETVAL, 1, struct map);	1876	New (0, RETVAL, 1, struct map);
1777	RETVAL->x = 0;	1877	RETVAL->x = 0;
1778	RETVAL->y = 0;	1878	RETVAL->y = 0;
1779	RETVAL->w = 0;	1879	RETVAL->w = 0;
…		…
1818		1918
1819	void	1919	void
1820	set_smooth (DC::Map self, int face, int smooth, int level)	1920	set_smooth (DC::Map self, int face, int smooth, int level)
1821	CODE:	1921	CODE:
1822	{	1922	{
1823	tileid texid;	1923	tileid texid;
1824	maptex *tex;	1924	maptex *tex;
1825		1925
1826	if (face < 0 \|\| face >= self->faces)	1926	if (face < 0 \|\| face >= self->faces)
1827	return;	1927	return;
1828		1928
1829	if (smooth < 0 \|\| smooth >= self->faces)	1929	if (smooth < 0 \|\| smooth >= self->faces)
1830	return;	1930	return;
1831		1931
1832	texid = self->face2tile [face];	1932	texid = self->face2tile [face];
1833		1933
1834	if (!texid)	1934	if (!texid)
1835	return;	1935	return;
1836		1936
1837	tex = self->tex + texid;	1937	tex = self->tex + texid;
…		…
1870	}	1970	}
1871		1971
1872	void	1972	void
1873	expire_textures (DC::Map self, int texid, int count)	1973	expire_textures (DC::Map self, int texid, int count)
1874	PPCODE:	1974	PPCODE:
1875	for (; texid < self->texs && count; ++texid, --count)	1975	for (; texid < self->texs && count; ++texid, --count)
1876	{	1976	{
1877	maptex *tex = self->tex + texid;	1977	maptex *tex = self->tex + texid;
1878		1978
1879	if (tex->name)	1979	if (tex->name)
1880	{	1980	{
…		…
1935	self->y += MAP_EXTEND_Y;	2035	self->y += MAP_EXTEND_Y;
1936	}	2036	}
1937	}	2037	}
1938		2038
1939	SV *	2039	SV *
1940	map1a_update (DC::Map self, SV *data_, int extmap)	2040	map1a_update (DC::Map self, SV *data_)
1941	CODE:	2041	CODE:
1942	{	2042	{
1943	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2043	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1944	uint8_t data_end = (uint8_t )SvEND (data_);	2044	uint8_t data_end = (uint8_t )SvEND (data_);
1945	mapcell *cell;	2045	mapcell *cell;
…		…
1966		2066
1967	//TODO: don't trust server data to be in-range(!)	2067	//TODO: don't trust server data to be in-range(!)
1968		2068
1969	if (flags & 8)	2069	if (flags & 8)
1970	{	2070	{
		2071	uint8_t ext, cmd;
		2072
1971	if (extmap)	2073	do
1972	{	2074	{
1973	uint8_t ext, cmd;	2075	ext = *data++;
		2076	cmd = ext & 0x7f;
1974		2077
1975	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
1976	{	2081	{
1977	ext = *data++;
1978	cmd = ext & 0x7f;
1979
1980	if (cmd < 4)
1981	cell->darkness = 255 - ext * 64 + 1;
1982	else if (cmd == 5) // health
1983	{
1984	cell->stat_width = 1;	2082	cell->stat_width = 1;
1985	cell->stat_hp = *data++;	2083	cell->stat_hp = *data++;
1986	}
1987	else if (cmd == 6) // monster width
1988	cell->stat_width = *data++ + 1;
1989	else if (cmd == 0x47)
1990	{
1991	if (*data == 1) cell->player = data [1];
1992	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996	data += *data + 1;
1997	}
1998	else if (cmd == 8) // cell flags
1999	cell->flags = *data++;
2000	else if (ext & 0x40) // unknown, multibyte => skip
2001	data += *data + 1;
2002	else
2003	data++;
2004	}	2084	}
2005	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++;
2006	}	2102	}
2007	else	2103	while (ext & 0x80);
2008	cell->darkness = *data++ + 1;
2009	}	2104	}
2010		2105
2011	for (z = 0; z <= 2; ++z)	2106	for (z = 0; z <= 2; ++z)
2012	if (flags & (4 >> z))	2107	if (flags & (4 >> z))
2013	{	2108	{
…		…
2061	? self->row + y	2156	? self->row + y
2062	: 0;	2157	: 0;
2063		2158
2064	for (x = x0; x < x1; x++)	2159	for (x = x0; x < x1; x++)
2065	{	2160	{
2066	int r = 32, g = 32, b = 32, a = 192;	2161	unsigned int r = 32, g = 32, b = 32, a = 192;
2067		2162
2068	if (row && row->c0 <= x && x < row->c1)	2163	if (row && row->c0 <= x && x < row->c1)
2069	{	2164	{
2070	mapcell *cell = row->col + (x - row->c0);	2165	mapcell *cell = row->col + (x - row->c0);
2071		2166
…		…
2073	{	2168	{
2074	maptex tex = self->tex [cell->tile [z]];	2169	maptex tex = self->tex [cell->tile [z]];
2075	int a0 = 255 - tex.a;	2170	int a0 = 255 - tex.a;
2076	int a1 = tex.a;	2171	int a1 = tex.a;
2077		2172
2078	r = (r * a0 + tex.r * a1) / 255;	2173	r = div255 (r * a0 + tex.r * a1);
2079	g = (g * a0 + tex.g * a1) / 255;	2174	g = div255 (g * a0 + tex.g * a1);
2080	b = (b * a0 + tex.b * a1) / 255;	2175	b = div255 (b * a0 + tex.b * a1);
2081	a = (a * a0 + tex.a * a1) / 255;	2176	a = div255 (a * a0 + tex.a * a1);
2082	}	2177	}
2083	}	2178	}
2084		2179
2085	*map++ = (r )	2180	*map++ = (r )
2086	\| (g << 8)	2181	\| (g << 8)
2087	\| (b << 16)	2182	\| (b << 16)
2088	\| (a << 24);	2183	\| (a << 24);
2089	}	2184	}
2090	}	2185	}
2091		2186
2092	RETVAL = map_sv;	2187	RETVAL = map_sv;
2093	}	2188	}
2094	OUTPUT:	2189	OUTPUT:
2095	RETVAL	2190	RETVAL
2096		2191
2097	void	2192	void
2098	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)
2099	CODE:	2194	CODE:
2100	{	2195	{
2101	int x, y, z;	2196	int x, y, z;
2102		2197
2103	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2198	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2104	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
2105	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)
2106	smooth_key skey;	2201	smooth_key skey;
2107	int pl_x, pl_y;	2202	int pl_x, pl_y;
2108	maptex pl_tex;	2203	maptex pl_tex;
2109	rc_t *rc = rc_alloc ();	2204	rc_t *rc = rc_alloc ();
2110	rc_t *rc_ov = rc_alloc ();	2205	rc_t *rc_ov = rc_alloc ();
2111	rc_key_t key;	2206	rc_key_t key;
2112	rc_array_t arr, arr_hidden;	2207	rc_array_t *arr;
2113		2208
2114	pl_tex.name = 0;	2209	pl_tex.name = 0;
2115		2210
2116	// that's current max. sorry.	2211	// that's current max. sorry.
2117	if (sw > 255) sw = 255;	2212	if (sw > 255) sw = 255;
…		…
2154	}	2249	}
2155		2250
2156	glEnable (GL_BLEND);	2251	glEnable (GL_BLEND);
2157	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2252	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2253	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160	key.texname = self->tex [TEXID_HIDDEN].name;
2161	arr_hidden = rc_array (rc_ov, &key);
2162		2254
2163	for (z = 0; z <= 2; z++)	2255	for (z = 0; z <= 2; z++)
2164	{	2256	{
2165	memset (smooth_level, 0, sizeof (smooth_level));	2257	memset (smooth_level, 0, sizeof (smooth_level));
2166	key.texname = -1;	2258	key.texname = -1;
…		…
2190		2282
2191	key.texname = tex.name;	2283	key.texname = tex.name;
2192	arr = rc_array (rc, &key);	2284	arr = rc_array (rc, &key);
2193	}	2285	}
2194		2286
2195	px = (x + 1) * T - tex.w;	2287	px = (x + 1) * Th - tex.w;
2196	py = (y + 1) * T - tex.h;	2288	py = (y + 1) * Tw - tex.h;
2197		2289
2198	if (expect_false (cell->player == player) && expect_false (z == 2))	2290	if (expect_false (cell->player == player) && expect_false (z == 2))
2199	{	2291	{
2200	pl_x = px;	2292	pl_x = px;
2201	pl_y = py;	2293	pl_y = py;
…		…
2246	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);
2247	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);
2248	}	2340	}
2249	}	2341	}
2250		2342
2251	if (expect_false (z == 2))	2343	if (expect_false (z == 2) && expect_false (cell->flags))
2252	{	2344	{
2253	/* draw question marks on top of hidden spaces */	2345	// overlays such as the speech bubble, probably more to come
2254	if (!cell->darkness)	2346	if (cell->flags & 1)
2255	{	2347	{
2256	maptex tex = self->tex [TEXID_HIDDEN];
2257	int px = (x + 1) * T - tex.w;
2258	int py = (y + 1) * T - tex.h;
2259
2260	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264	}
2265
2266	if (expect_false (cell->flags))
2267	{
2268	// overlays such as the speech bubble, probably more to come
2269	if (cell->flags & 1)
2270	{
2271	rc_key_t key_ov = key;	2348	rc_key_t key_ov = key;
2272	maptex tex = self->tex [TEXID_SPEECH];	2349	maptex tex = self->tex [TEXID_SPEECH];
2273	rc_array_t *arr;	2350	rc_array_t *arr;
2274	int px = x * T + T * 2 / 32;	2351	int px = x * Tw + Tw * 2 / 32;
2275	int py = y * T - T * 6 / 32;	2352	int py = y * Th - Th * 6 / 32;
2276		2353
2277	key_ov.texname = tex.name;	2354	key_ov.texname = tex.name;
2278	arr = rc_array (rc_ov, &key_ov);	2355	arr = rc_array (rc_ov, &key_ov);
2279		2356
2280	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2357	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2358	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282	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);
2283	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2360	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284	}
2285	}	2361	}
2286	}	2362	}
2287	}	2363	}
2288	}	2364	}
2289		2365
…		…
2316	if (!(bits & 0x1000)	2392	if (!(bits & 0x1000)
2317	&& skey->level == level	2393	&& skey->level == level
2318	&& level > smooth_max [skey->x][skey->y])	2394	&& level > smooth_max [skey->x][skey->y])
2319	{	2395	{
2320	maptex tex = self->tex [skey->tile];	2396	maptex tex = self->tex [skey->tile];
2321	int px = (((int)skey->x) - 1) * T;	2397	int px = (((int)skey->x) - 1) * Tw;
2322	int py = (((int)skey->y) - 1) * T;	2398	int py = (((int)skey->y) - 1) * Th;
2323	int border = bits & 15;	2399	int border = bits & 15;
2324	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2400	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325	float dx = tex.s * .0625f; // 16 images/row	2401	float dx = tex.s * .0625f; // 16 images/row
2326	float dy = tex.t * .5f ; // 2 images/column	2402	float dy = tex.t * .5f ; // 2 images/column
2327		2403
…		…
2340		2416
2341	if (border)	2417	if (border)
2342	{	2418	{
2343	float ox = border * dx;	2419	float ox = border * dx;
2344		2420
2345	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2421	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2422	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2423	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2424	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349	}	2425	}
2350		2426
2351	if (corner)	2427	if (corner)
2352	{	2428	{
2353	float ox = corner * dx;	2429	float ox = corner * dx;
2354		2430
2355	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2432	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2433	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359	}	2435	}
2360	}	2436	}
2361	}	2437	}
2362	}	2438	}
2363	}	2439	}
…		…
2404	for (x = 0; x < sw; x++)	2480	for (x = 0; x < sw; x++)
2405	if (row->c0 <= x + mx && x + mx < row->c1)	2481	if (row->c0 <= x + mx && x + mx < row->c1)
2406	{	2482	{
2407	mapcell *cell = row->col + (x + mx - row->c0);	2483	mapcell *cell = row->col + (x + mx - row->c0);
2408		2484
2409	int px = x * T;	2485	int px = x * Tw;
2410	int py = y * T;	2486	int py = y * Th;
2411		2487
2412	if (expect_false (cell->player == player))	2488	if (expect_false (cell->player == player))
2413	{	2489	{
2414	px += sdx;	2490	px += sdx;
2415	py += sdy;	2491	py += sdy;
2416	}	2492	}
2417		2493
2418	if (cell->stat_hp)	2494	if (cell->stat_hp)
2419	{	2495	{
2420	int width = cell->stat_width * T;	2496	int width = cell->stat_width * Tw;
2421	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2497	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422		2498
2423	glColor3ub (0, 0, 0);	2499	glColor3ub (0, 0, 0);
2424	glRectf (px + 1, py - thick - 2,	2500	glRectf (px + 1, py - thick - 2,
2425	px + width - 1, py);	2501	px + width - 1, py);
2426		2502
…		…
2463	int x, y;	2539	int x, y;
2464		2540
2465	glEnable (GL_TEXTURE_2D);	2541	glEnable (GL_TEXTURE_2D);
2466	/* 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,
2467	* but the nvidia driver (185.18.14) mishandles alpha textures	2543	* but the nvidia driver (185.18.14) mishandles alpha textures
2468	* ansd takes the colour from god knows where instead of using	2544	* and takes the colour from god knows where instead of using
2469	* Cp. MODULATE results in the same colour, but slightly different	2545	* Cp. MODULATE results in the same colour, but slightly different
2470	* alpha, but atcually gives us the correct colour with nvidia.	2546	* alpha, but atcually gives us the correct colour with nvidia.
2471	*/	2547	*/
2472	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2548	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473	glEnable (GL_BLEND);	2549	glEnable (GL_BLEND);
…		…
2502	void	2578	void
2503	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)
2504	PPCODE:	2580	PPCODE:
2505	{	2581	{
2506	int x, y;	2582	int x, y;
2507	int sw1 = sw + 2;	2583	int sw1 = sw + 2;
2508	int sh1 = sh + 2;	2584	int sh1 = sh + 2;
2509	int sh3 = sh * 3;	2585	int sh3 = sh * 3;
2510	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);
2511	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2589	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2512	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2590	memset (darkness1, 0, sw1*sh1);
2513	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2514		2591
2515	SvPOK_only (darkness3_sv);	2592	SvPOK_only (darkness3_sv);
2516	SvCUR_set (darkness3_sv, sw34 * sh3);	2593	SvCUR_set (darkness3_sv, sw3 * sh3);
2517		2594
2518	mx += self->x - 1;	2595	mx += self->x - 1;
2519	my += self->y - 1;	2596	my += self->y - 1;
2520
2521	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522		2597
2523	for (y = 0; y < sh1; y++)	2598	for (y = 0; y < sh1; y++)
2524	if (0 <= y + my && y + my < self->rows)	2599	if (0 <= y + my && y + my < self->rows)
2525	{	2600	{
2526	maprow *row = self->row + (y + my);	2601	maprow *row = self->row + (y + my);
…		…
2559		2634
2560	uint8_t r13 = (d13 + d23 + d12) / 3;	2635	uint8_t r13 = (d13 + d23 + d12) / 3;
2561	uint8_t r23 = d23;	2636	uint8_t r23 = d23;
2562	uint8_t r33 = (d23 + d33 + d32) / 3;	2637	uint8_t r33 = (d23 + d33 + d32) / 3;
2563		2638
2564	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568	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 */
2569	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573	}	2648	}
2574		2649
2575	free (darkness1);	2650	free (darkness1);
2576		2651
2577	EXTEND (SP, 3);	2652	EXTEND (SP, 3);
2578	PUSHs (sv_2mortal (newSViv (sw34)));	2653	PUSHs (sv_2mortal (newSViv (sw3)));
2579	PUSHs (sv_2mortal (newSViv (sh3)));	2654	PUSHs (sv_2mortal (newSViv (sh3)));
2580	PUSHs (darkness3_sv);	2655	PUSHs (darkness3_sv);
2581	}	2656	}
2582		2657
2583	SV *	2658	SV *
…		…
2646	else	2721	else
2647	*data++ = 0;	2722	*data++ = 0;
2648	}	2723	}
2649	}	2724	}
2650		2725
2651	/* if size is wh + 5 then no data has been found /	2726	/* if size is wh + 5 then no data has been found /
2652	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2727	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2653	{	2728	{
2654	SvPOK_only (data_sv);	2729	SvPOK_only (data_sv);
2655	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2730	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656	}	2731	}
2657		2732
2658	RETVAL = data_sv;	2733	RETVAL = data_sv;
2659	}	2734	}
2660	OUTPUT:	2735	OUTPUT:
2661	RETVAL	2736	RETVAL
2662		2737
2663	void	2738	void
…		…
2670	STRLEN len;	2745	STRLEN len;
2671	uint8_t data, end;	2746	uint8_t data, end;
2672		2747
2673	len = SvLEN (data_sv);	2748	len = SvLEN (data_sv);
2674	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2749	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675	data = SvPVbyte_nolen (data_sv);	2750	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676	end = data + len + 8;	2751	end = data + len + 8;
2677		2752
2678	if (len < 5)	2753	if (len < 5)
2679	XSRETURN_EMPTY;	2754	XSRETURN_EMPTY;
2680		2755
…		…
2741	}	2816	}
2742		2817
2743	MODULE = Deliantra::Client PACKAGE = DC::RW	2818	MODULE = Deliantra::Client PACKAGE = DC::RW
2744		2819
2745	DC::RW	2820	DC::RW
2746	new (SV class, SV data_sv)	2821	new (SV klass, SV data_sv)
2747	CODE:	2822	CODE:
2748	{	2823	{
2749	STRLEN datalen;	2824	STRLEN datalen;
2750	char *data = SvPVbyte (data_sv, datalen);	2825	char *data = SvPVbyte (data_sv, datalen);
2751		2826
…		…
2753	}	2828	}
2754	OUTPUT:	2829	OUTPUT:
2755	RETVAL	2830	RETVAL
2756		2831
2757	DC::RW	2832	DC::RW
2758	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")
2759	CODE:	2834	CODE:
2760	RETVAL = SDL_RWFromFile (path, mode);	2835	RETVAL = SDL_RWFromFile (path, mode);
2761	OUTPUT:	2836	OUTPUT:
2762	RETVAL	2837	RETVAL
2763		2838
…		…
2781	if (RETVAL < 0)	2856	if (RETVAL < 0)
2782	{	2857	{
2783	RETVAL = Mix_GroupOldest (-1);	2858	RETVAL = Mix_GroupOldest (-1);
2784		2859
2785	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)
2786	XSRETURN_UNDEF;	2866	XSRETURN_UNDEF;
2787		2867	}
		2868	else
2788	Mix_HaltChannel (RETVAL);	2869	Mix_HaltChannel (RETVAL);
2789	}	2870	}
2790		2871
2791	Mix_UnregisterAllEffects (RETVAL);	2872	Mix_UnregisterAllEffects (RETVAL);
2792	Mix_Volume (RETVAL, 128);	2873	Mix_Volume (RETVAL, 128);
2793	}	2874	}
…		…
2853		2934
2854	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2935	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855		2936
2856	PROTOTYPES: DISABLE	2937	PROTOTYPES: DISABLE
2857		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
2858	DC::MixChunk	2951	DC::MixChunk
2859	new (SV *class, DC::RW rwops)	2952	new (SV *klass, DC::RW rwops)
2860	CODE:	2953	CODE:
2861	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2954	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862	OUTPUT:	2955	OUTPUT:
2863	RETVAL	2956	RETVAL
2864		2957
…		…
2894	OUTPUT:	2987	OUTPUT:
2895	RETVAL	2988	RETVAL
2896		2989
2897	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2990	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898		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
2899	int	3004	int
2900	volume (int volume = -1)	3005	volume (int volume = -1)
2901	PROTOTYPE: ;$	3006	PROTOTYPE: ;$
2902	CODE:	3007	CODE:
2903	if (items > 0)	3008	if (items > 0)
…		…
2914	void	3019	void
2915	halt ()	3020	halt ()
2916	CODE:	3021	CODE:
2917	Mix_HaltMusic ();	3022	Mix_HaltMusic ();
2918		3023
		3024	int
		3025	playing ()
		3026	CODE:
		3027	RETVAL = Mix_PlayingMusic ();
		3028	OUTPUT:
		3029	RETVAL
		3030
2919	DC::MixMusic	3031	DC::MixMusic
2920	new (SV *class, DC::RW rwops)	3032	new (SV *klass, DC::RW rwops)
2921	CODE:	3033	CODE:
2922	RETVAL = Mix_LoadMUS_RW (rwops);	3034	RETVAL = Mix_LoadMUS_RW (rwops);
2923	OUTPUT:	3035	OUTPUT:
2924	RETVAL	3036	RETVAL
2925		3037
…		…
3062	const_iv (GL_FUNC_SUBTRACT),	3174	const_iv (GL_FUNC_SUBTRACT),
3063	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3175	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064	# undef const_iv	3176	# undef const_iv
3065	};	3177	};
3066		3178
3067	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--)
3068	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3180	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069		3181
3070	texture_av = newAV ();	3182	texture_av = newAV ();
3071	AvREAL_off (texture_av);	3183	AvREAL_off (texture_av);
3072	}	3184	}
3073		3185
…		…
3078	gl.BlendFuncSeparateEXT = 0;	3190	gl.BlendFuncSeparateEXT = 0;
3079		3191
3080	void	3192	void
3081	apple_nvidia_bug (int enable)	3193	apple_nvidia_bug (int enable)
3082		3194
3083	char *	3195	const char *
3084	gl_vendor ()	3196	gl_vendor ()
3085	CODE:	3197	CODE:
3086	RETVAL = (char *)glGetString (GL_VENDOR);	3198	RETVAL = (const char *)glGetString (GL_VENDOR);
3087	OUTPUT:	3199	OUTPUT:
3088	RETVAL	3200	RETVAL
3089		3201
3090	char *	3202	const char *
3091	gl_version ()	3203	gl_version ()
3092	CODE:	3204	CODE:
3093	RETVAL = (char *)glGetString (GL_VERSION);	3205	RETVAL = (const char *)glGetString (GL_VERSION);
3094	OUTPUT:	3206	OUTPUT:
3095	RETVAL	3207	RETVAL
3096		3208
3097	char *	3209	const char *
3098	gl_extensions ()	3210	gl_extensions ()
3099	CODE:	3211	CODE:
3100	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3212	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101	OUTPUT:	3213	OUTPUT:
3102	RETVAL	3214	RETVAL
3103		3215
3104	const char *glGetString (GLenum pname)	3216	const char *glGetString (GLenum pname)
		3217	CODE:
		3218	RETVAL = (const char *)glGetString (pname);
		3219	OUTPUT:
		3220	RETVAL
3105		3221
3106	GLint glGetInteger (GLenum pname)	3222	GLint glGetInteger (GLenum pname)
3107	CODE:	3223	CODE:
3108	glGetIntegerv (pname, &RETVAL);	3224	glGetIntegerv (pname, &RETVAL);
3109	OUTPUT:	3225	OUTPUT:
…		…
3116	RETVAL	3232	RETVAL
3117		3233
3118	int glGetError ()	3234	int glGetError ()
3119		3235
3120	void glFinish ()	3236	void glFinish ()
		3237
		3238	void glFlush ()
3121		3239
3122	void glClear (int mask)	3240	void glClear (int mask)
3123		3241
3124	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)
3125	PROTOTYPE: @	3243	PROTOTYPE: @
…		…
3297		3415
3298	void glEndList ()	3416	void glEndList ()
3299		3417
3300	void glCallList (int list)	3418	void glCallList (int list)
3301		3419
		3420	void c_init ()
		3421	CODE:
		3422	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3423	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3424
3302	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3425	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303		3426
3304	PROTOTYPES: DISABLE	3427	PROTOTYPES: DISABLE
3305		3428
3306	void	3429	void
3307	find_widget (SV *self, NV x, NV y)	3430	find_widget (SV *self, NV x, NV y)
3308	PPCODE:	3431	PPCODE:
3309	{	3432	{
3310	if (within_widget (self, x, y))	3433	if (within_widget (self, x, y))
3311	XPUSHs (self);	3434	XPUSHs (self);
3312	}	3435	}
3313		3436
3314	BOOT:	3437	BOOT:
3315	{	3438	{
…		…
3323		3446
3324	void	3447	void
3325	draw (SV *self)	3448	draw (SV *self)
3326	CODE:	3449	CODE:
3327	{	3450	{
3328	HV *hv;	3451	HV *hv;
3329	SV **svp;	3452	SV **svp;
3330	NV x, y, w, h;	3453	NV x, y, w, h;
3331	SV *draw_x_sv = GvSV (draw_x_gv);	3454	SV *draw_x_sv = GvSV (draw_x_gv);
3332	SV *draw_y_sv = GvSV (draw_y_gv);	3455	SV *draw_y_sv = GvSV (draw_y_gv);
3333	SV *draw_w_sv = GvSV (draw_w_gv);	3456	SV *draw_w_sv = GvSV (draw_w_gv);
3334	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.295 by root, Mon Dec 21 03:30:22 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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC