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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.293 by root, Thu Dec 17 02:49:38 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
		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
…		…
820	NV ceil (NV x)	855	NV ceil (NV x)
821		856
822	IV minpot (UV n)	857	IV minpot (UV n)
823		858
824	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
825		866
826	void	867	void
827	pango_init ()	868	pango_init ()
828	CODE:	869	CODE:
829	{	870	{
…		…
837	#endif	878	#endif
838	}	879	}
839		880
840	char *SDL_GetError ()	881	char *SDL_GetError ()
841		882
842	void SDL_braino ()	883	void SDL_main_hack (SV *real_main)
		884	PROTOTYPE: &
843		885
844	int SDL_Init (U32 flags)	886	int SDL_Init (U32 flags)
845		887
846	int SDL_InitSubSystem (U32 flags)	888	int SDL_InitSubSystem (U32 flags)
847		889
848	void SDL_QuitSubSystem (U32 flags)	890	void SDL_QuitSubSystem (U32 flags)
849		891
850	void SDL_Quit ()	892	void SDL_Quit ()
851		893
852	int SDL_GL_SetAttribute (int attr, int value)	894	int SDL_GL_SetAttribute (int attr, int value)
		895	C_ARGS: (SDL_GLattr)attr, value
853		896
854	int SDL_GL_GetAttribute (int attr)	897	int SDL_GL_GetAttribute (int attr)
855	CODE:	898	CODE:
856	if (SDL_GL_GetAttribute (attr, &RETVAL))	899	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
857	XSRETURN_UNDEF;	900	XSRETURN_UNDEF;
858	OUTPUT:	901	OUTPUT:
859	RETVAL	902	RETVAL
860		903
861	void	904	void
…		…
916	);	959	);
917		960
918	if (RETVAL)	961	if (RETVAL)
919	{	962	{
920	av_clear (texture_av);	963	av_clear (texture_av);
921
922	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	964	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
924	#include "glfunc.h"	965	#include "glfunc.h"
925	#undef GL_FUNC	966	#undef GL_FUNC
		967	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		968	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926	}	969	}
927	}	970	}
928	OUTPUT:	971	OUTPUT:
929	RETVAL	972	RETVAL
		973
		974	void
		975	SDL_WM_SetCaption (const char title, const char icon)
930		976
931	void	977	void
932	SDL_GL_SwapBuffers ()	978	SDL_GL_SwapBuffers ()
933		979
934	char *	980	char *
935	SDL_GetKeyName (int sym)	981	SDL_GetKeyName (int sym)
		982	C_ARGS: (SDLKey)sym
936		983
937	int	984	int
938	SDL_GetAppState ()	985	SDL_GetAppState ()
939		986
940	int	987	int
941	SDL_GetModState ()	988	SDL_GetModState ()
942		989
		990	int
		991	SDL_WaitEvent ()
		992	C_ARGS: 0
		993
943	void	994	void
		995	SDL_PumpEvents ()
		996
		997	void
944	poll_events ()	998	peep_events ()
945	PPCODE:	999	PPCODE:
946	{	1000	{
947	SDL_Event ev;	1001	SDL_Event ev;
948		1002
949	SDL_PumpEvents ();	1003	SDL_PumpEvents ();
…		…
1015		1069
1016	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))));
1017	}	1071	}
1018	}	1072	}
1019		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
1020	int	1087	int
1021	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)
1022	POSTCALL:	1089	POSTCALL:
1023	Mix_HookMusicFinished (music_finished);	1090	Mix_HookMusicFinished (music_finished);
1024	Mix_ChannelFinished (channel_finished);	1091	Mix_ChannelFinished (channel_finished);
1025		1092
1026	void	1093	void
1027	Mix_QuerySpec ()	1094	Mix_QuerySpec ()
…		…
1086	add_font (char *file)	1153	add_font (char *file)
1087	CODE:	1154	CODE:
1088	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1155	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089	OUTPUT:	1156	OUTPUT:
1090	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)
1091		1165
1092	void	1166	void
1093	load_image_inline (SV *image_)	1167	load_image_inline (SV *image_)
1094	ALIAS:	1168	ALIAS:
1095	load_image_file = 1	1169	load_image_file = 1
…		…
1141		1215
1142	SDL_LockSurface (surface2);	1216	SDL_LockSurface (surface2);
1143	EXTEND (SP, 6);	1217	EXTEND (SP, 6);
1144	PUSHs (sv_2mortal (newSViv (surface2->w)));	1218	PUSHs (sv_2mortal (newSViv (surface2->w)));
1145	PUSHs (sv_2mortal (newSViv (surface2->h)));	1219	PUSHs (sv_2mortal (newSViv (surface2->h)));
1146	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1220	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1147	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1221	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1148	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1222	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1149	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1223	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1150	SDL_UnlockSurface (surface2);	1224	SDL_UnlockSurface (surface2);
1151		1225
…		…
1223	MODULE = Deliantra::Client PACKAGE = DC::Font	1297	MODULE = Deliantra::Client PACKAGE = DC::Font
1224		1298
1225	PROTOTYPES: DISABLE	1299	PROTOTYPES: DISABLE
1226		1300
1227	DC::Font	1301	DC::Font
1228	new_from_file (SV class, char path, int id = 0)	1302	new_from_file (SV klass, char path, int id = 0)
1229	CODE:	1303	CODE:
1230	{	1304	{
1231	int count;	1305	int count;
1232	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1306	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1233	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1307	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1262	PROTOTYPE:	1336	PROTOTYPE:
1263	CODE:	1337	CODE:
1264	tc_restore ();	1338	tc_restore ();
1265		1339
1266	DC::Layout	1340	DC::Layout
1267	new (SV *class)	1341	new (SV *klass)
1268	CODE:	1342	CODE:
1269	New (0, RETVAL, 1, struct cf_layout);	1343	New (0, RETVAL, 1, struct cf_layout);
1270		1344
1271	RETVAL->pl = pango_layout_new (opengl_context);	1345	RETVAL->pl = pango_layout_new (opengl_context);
1272	RETVAL->r = 1.;	1346	RETVAL->r = 1.;
…		…
1421		1495
1422	void	1496	void
1423	set_height (DC::Layout self, int base_height)	1497	set_height (DC::Layout self, int base_height)
1424	CODE:	1498	CODE:
1425	if (self->base_height != base_height)	1499	if (self->base_height != base_height)
1426	{	1500	{
1427	self->base_height = base_height;	1501	self->base_height = base_height;
1428	layout_update_font (self);	1502	layout_update_font (self);
1429	}	1503	}
1430		1504
1431	void	1505	void
…		…
1659	glDisable (GL_BLEND);	1733	glDisable (GL_BLEND);
1660	}	1734	}
1661	}	1735	}
1662		1736
1663	void	1737	void
1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)	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)
1665	PROTOTYPE: @	1739	PROTOTYPE: @
1666	CODE:	1740	CODE:
1667	{	1741	{
		1742	glEnable (GL_BLEND);
		1743	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668	glEnable (GL_TEXTURE_2D);	1744	glEnable (GL_TEXTURE_2D);
1669	glEnable (GL_BLEND);	1745	glBindTexture (GL_TEXTURE_2D, name1);
1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672		1746
1673	glColor4f (intensity, intensity, intensity, 0.9);	1747	glColor3f (intensity, intensity, intensity);
1674	glPushMatrix ();	1748	glPushMatrix ();
1675	glScalef (1./3, 1./3, 1.);	1749	glScalef (1./3, 1./3, 1.);
1676		1750
		1751	if (blend > 0.f)
		1752	{
		1753	float dx3 = dx * -3.f / w;
		1754	float dy3 = dy * -3.f / h;
		1755	GLfloat env_color[4] = { 0., 0., 0., blend };
		1756
		1757	/* interpolate the two shadow textures */
		1758	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1760
		1761	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1762	gl.ActiveTexture (GL_TEXTURE1);
		1763	glEnable (GL_TEXTURE_2D);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1764	glBindTexture (GL_TEXTURE_2D, name2);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678		1766
		1767	/* rgb == rgb(glcolor) */
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1769	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1770	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1771
		1772	/* alpha = interpolate t0, t1 by env_alpha */
		1773	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1774
		1775	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1778
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1781
		1782	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1783	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1784
		1785	glBegin (GL_QUADS);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1787	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1788	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1789	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1790	glEnd ();
		1791
		1792	glDisable (GL_TEXTURE_2D);
		1793	gl.ActiveTexture (GL_TEXTURE0);
		1794	}
		1795	else
		1796	{
		1797	/* simple blending of one texture, also opengl <1.3 path */
		1798	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1799
		1800	glBegin (GL_QUADS);
		1801	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1802	glTexCoord2f (0, t); glVertex2f (0, h);
		1803	glTexCoord2f (s, t); glVertex2f (w, h);
		1804	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1805	glEnd ();
		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);
1679	glBegin (GL_QUADS);	1818	glBegin (GL_QUADS);
1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1819
1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1820	for (y = 1; y < h; y += 3)
1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1821	{
1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	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
1684	glEnd ();	1850	glEnd ();
1685		1851
1686	glPopMatrix ();	1852	glPopMatrix ();
1687		1853
1688	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
…		…
1703	MODULE = Deliantra::Client PACKAGE = DC::Map	1869	MODULE = Deliantra::Client PACKAGE = DC::Map
1704		1870
1705	PROTOTYPES: DISABLE	1871	PROTOTYPES: DISABLE
1706		1872
1707	DC::Map	1873	DC::Map
1708	new (SV *class)	1874	new (SV *klass)
1709	CODE:	1875	CODE:
1710	New (0, RETVAL, 1, struct map);	1876	New (0, RETVAL, 1, struct map);
1711	RETVAL->x = 0;	1877	RETVAL->x = 0;
1712	RETVAL->y = 0;	1878	RETVAL->y = 0;
1713	RETVAL->w = 0;	1879	RETVAL->w = 0;
…		…
1752		1918
1753	void	1919	void
1754	set_smooth (DC::Map self, int face, int smooth, int level)	1920	set_smooth (DC::Map self, int face, int smooth, int level)
1755	CODE:	1921	CODE:
1756	{	1922	{
1757	tileid texid;	1923	tileid texid;
1758	maptex *tex;	1924	maptex *tex;
1759		1925
1760	if (face < 0 \|\| face >= self->faces)	1926	if (face < 0 \|\| face >= self->faces)
1761	return;	1927	return;
1762		1928
1763	if (smooth < 0 \|\| smooth >= self->faces)	1929	if (smooth < 0 \|\| smooth >= self->faces)
1764	return;	1930	return;
1765		1931
1766	texid = self->face2tile [face];	1932	texid = self->face2tile [face];
1767		1933
1768	if (!texid)	1934	if (!texid)
1769	return;	1935	return;
1770		1936
1771	tex = self->tex + texid;	1937	tex = self->tex + texid;
…		…
1804	}	1970	}
1805		1971
1806	void	1972	void
1807	expire_textures (DC::Map self, int texid, int count)	1973	expire_textures (DC::Map self, int texid, int count)
1808	PPCODE:	1974	PPCODE:
1809	for (; texid < self->texs && count; ++texid, --count)	1975	for (; texid < self->texs && count; ++texid, --count)
1810	{	1976	{
1811	maptex *tex = self->tex + texid;	1977	maptex *tex = self->tex + texid;
1812		1978
1813	if (tex->name)	1979	if (tex->name)
1814	{	1980	{
…		…
1869	self->y += MAP_EXTEND_Y;	2035	self->y += MAP_EXTEND_Y;
1870	}	2036	}
1871	}	2037	}
1872		2038
1873	SV *	2039	SV *
1874	map1a_update (DC::Map self, SV *data_, int extmap)	2040	map1a_update (DC::Map self, SV *data_)
1875	CODE:	2041	CODE:
1876	{	2042	{
1877	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2043	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1878	uint8_t data_end = (uint8_t )SvEND (data_);	2044	uint8_t data_end = (uint8_t )SvEND (data_);
1879	mapcell *cell;	2045	mapcell *cell;
…		…
1900		2066
1901	//TODO: don't trust server data to be in-range(!)	2067	//TODO: don't trust server data to be in-range(!)
1902		2068
1903	if (flags & 8)	2069	if (flags & 8)
1904	{	2070	{
		2071	uint8_t ext, cmd;
		2072
1905	if (extmap)	2073	do
1906	{	2074	{
1907	uint8_t ext, cmd;	2075	ext = *data++;
		2076	cmd = ext & 0x7f;
1908		2077
1909	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
1910	{	2081	{
1911	ext = *data++;
1912	cmd = ext & 0x7f;
1913
1914	if (cmd < 4)
1915	cell->darkness = 255 - ext * 64 + 1;
1916	else if (cmd == 5) // health
1917	{
1918	cell->stat_width = 1;	2082	cell->stat_width = 1;
1919	cell->stat_hp = *data++;	2083	cell->stat_hp = *data++;
1920	}
1921	else if (cmd == 6) // monster width
1922	cell->stat_width = *data++ + 1;
1923	else if (cmd == 0x47)
1924	{
1925	if (*data == 1) cell->player = data [1];
1926	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1927	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1928	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1929
1930	data += *data + 1;
1931	}
1932	else if (cmd == 8) // cell flags
1933	cell->flags = *data++;
1934	else if (ext & 0x40) // unknown, multibyte => skip
1935	data += *data + 1;
1936	else
1937	data++;
1938	}	2084	}
1939	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++;
1940	}	2102	}
1941	else	2103	while (ext & 0x80);
1942	cell->darkness = *data++ + 1;
1943	}	2104	}
1944		2105
1945	for (z = 0; z <= 2; ++z)	2106	for (z = 0; z <= 2; ++z)
1946	if (flags & (4 >> z))	2107	if (flags & (4 >> z))
1947	{	2108	{
…		…
1995	? self->row + y	2156	? self->row + y
1996	: 0;	2157	: 0;
1997		2158
1998	for (x = x0; x < x1; x++)	2159	for (x = x0; x < x1; x++)
1999	{	2160	{
2000	int r = 32, g = 32, b = 32, a = 192;	2161	unsigned int r = 32, g = 32, b = 32, a = 192;
2001		2162
2002	if (row && row->c0 <= x && x < row->c1)	2163	if (row && row->c0 <= x && x < row->c1)
2003	{	2164	{
2004	mapcell *cell = row->col + (x - row->c0);	2165	mapcell *cell = row->col + (x - row->c0);
2005		2166
…		…
2007	{	2168	{
2008	maptex tex = self->tex [cell->tile [z]];	2169	maptex tex = self->tex [cell->tile [z]];
2009	int a0 = 255 - tex.a;	2170	int a0 = 255 - tex.a;
2010	int a1 = tex.a;	2171	int a1 = tex.a;
2011		2172
2012	r = (r * a0 + tex.r * a1) / 255;	2173	r = div255 (r * a0 + tex.r * a1);
2013	g = (g * a0 + tex.g * a1) / 255;	2174	g = div255 (g * a0 + tex.g * a1);
2014	b = (b * a0 + tex.b * a1) / 255;	2175	b = div255 (b * a0 + tex.b * a1);
2015	a = (a * a0 + tex.a * a1) / 255;	2176	a = div255 (a * a0 + tex.a * a1);
2016	}	2177	}
2017	}	2178	}
2018		2179
2019	*map++ = (r )	2180	*map++ = (r )
2020	\| (g << 8)	2181	\| (g << 8)
2021	\| (b << 16)	2182	\| (b << 16)
2022	\| (a << 24);	2183	\| (a << 24);
2023	}	2184	}
2024	}	2185	}
2025		2186
2026	RETVAL = map_sv;	2187	RETVAL = map_sv;
2027	}	2188	}
2028	OUTPUT:	2189	OUTPUT:
2029	RETVAL	2190	RETVAL
2030		2191
2031	void	2192	void
2032	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)
2033	CODE:	2194	CODE:
2034	{	2195	{
2035	int x, y, z;	2196	int x, y, z;
2036		2197
2037	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2198	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2038	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
2039	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)
2040	smooth_key skey;	2201	smooth_key skey;
2041	int pl_x, pl_y;	2202	int pl_x, pl_y;
2042	maptex pl_tex;	2203	maptex pl_tex;
2043	rc_t *rc = rc_alloc ();	2204	rc_t *rc = rc_alloc ();
2044	rc_t *rc_ov = rc_alloc ();	2205	rc_t *rc_ov = rc_alloc ();
2045	rc_key_t key;	2206	rc_key_t key;
2046	rc_array_t arr, arr_hidden;	2207	rc_array_t *arr;
2047		2208
2048	pl_tex.name = 0;	2209	pl_tex.name = 0;
2049		2210
2050	// that's current max. sorry.	2211	// that's current max. sorry.
2051	if (sw > 255) sw = 255;	2212	if (sw > 255) sw = 255;
…		…
2088	}	2249	}
2089		2250
2090	glEnable (GL_BLEND);	2251	glEnable (GL_BLEND);
2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2252	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2253	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094	key.texname = self->tex [TEXID_HIDDEN].name;
2095	arr_hidden = rc_array (rc_ov, &key);
2096		2254
2097	for (z = 0; z <= 2; z++)	2255	for (z = 0; z <= 2; z++)
2098	{	2256	{
2099	memset (smooth_level, 0, sizeof (smooth_level));	2257	memset (smooth_level, 0, sizeof (smooth_level));
2100	key.texname = -1;	2258	key.texname = -1;
…		…
2124		2282
2125	key.texname = tex.name;	2283	key.texname = tex.name;
2126	arr = rc_array (rc, &key);	2284	arr = rc_array (rc, &key);
2127	}	2285	}
2128		2286
2129	px = (x + 1) * T - tex.w;	2287	px = (x + 1) * Th - tex.w;
2130	py = (y + 1) * T - tex.h;	2288	py = (y + 1) * Tw - tex.h;
2131		2289
2132	if (expect_false (cell->player == player) && expect_false (z == 2))	2290	if (expect_false (cell->player == player) && expect_false (z == 2))
2133	{	2291	{
2134	pl_x = px;	2292	pl_x = px;
2135	pl_y = py;	2293	pl_y = py;
…		…
2180	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);
2181	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);
2182	}	2340	}
2183	}	2341	}
2184		2342
2185	if (expect_false (z == 2))	2343	if (expect_false (z == 2) && expect_false (cell->flags))
2186	{	2344	{
2187	/* draw question marks on top of hidden spaces */	2345	// overlays such as the speech bubble, probably more to come
2188	if (!cell->darkness)	2346	if (cell->flags & 1)
2189	{	2347	{
2190	maptex tex = self->tex [TEXID_HIDDEN];
2191	int px = (x + 1) * T - tex.w;
2192	int py = (y + 1) * T - tex.h;
2193
2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198	}
2199
2200	if (expect_false (cell->flags))
2201	{
2202	// overlays such as the speech bubble, probably more to come
2203	if (cell->flags & 1)
2204	{
2205	rc_key_t key_ov = key;	2348	rc_key_t key_ov = key;
2206	maptex tex = self->tex [TEXID_SPEECH];	2349	maptex tex = self->tex [TEXID_SPEECH];
2207	rc_array_t *arr;	2350	rc_array_t *arr;
2208	int px = x * T + T * 2 / 32;	2351	int px = x * Tw + Tw * 2 / 32;
2209	int py = y * T - T * 6 / 32;	2352	int py = y * Th - Th * 6 / 32;
2210		2353
2211	key_ov.texname = tex.name;	2354	key_ov.texname = tex.name;
2212	arr = rc_array (rc_ov, &key_ov);	2355	arr = rc_array (rc_ov, &key_ov);
2213		2356
2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2357	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2358	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216	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);
2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2360	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218	}
2219	}	2361	}
2220	}	2362	}
2221	}	2363	}
2222	}	2364	}
2223		2365
…		…
2250	if (!(bits & 0x1000)	2392	if (!(bits & 0x1000)
2251	&& skey->level == level	2393	&& skey->level == level
2252	&& level > smooth_max [skey->x][skey->y])	2394	&& level > smooth_max [skey->x][skey->y])
2253	{	2395	{
2254	maptex tex = self->tex [skey->tile];	2396	maptex tex = self->tex [skey->tile];
2255	int px = (((int)skey->x) - 1) * T;	2397	int px = (((int)skey->x) - 1) * Tw;
2256	int py = (((int)skey->y) - 1) * T;	2398	int py = (((int)skey->y) - 1) * Th;
2257	int border = bits & 15;	2399	int border = bits & 15;
2258	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2400	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259	float dx = tex.s * .0625f; // 16 images/row	2401	float dx = tex.s * .0625f; // 16 images/row
2260	float dy = tex.t * .5f ; // 2 images/column	2402	float dy = tex.t * .5f ; // 2 images/column
2261		2403
…		…
2274		2416
2275	if (border)	2417	if (border)
2276	{	2418	{
2277	float ox = border * dx;	2419	float ox = border * dx;
2278		2420
2279	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2421	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2422	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2423	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2424	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283	}	2425	}
2284		2426
2285	if (corner)	2427	if (corner)
2286	{	2428	{
2287	float ox = corner * dx;	2429	float ox = corner * dx;
2288		2430
2289	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2432	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2433	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293	}	2435	}
2294	}	2436	}
2295	}	2437	}
2296	}	2438	}
2297	}	2439	}
…		…
2338	for (x = 0; x < sw; x++)	2480	for (x = 0; x < sw; x++)
2339	if (row->c0 <= x + mx && x + mx < row->c1)	2481	if (row->c0 <= x + mx && x + mx < row->c1)
2340	{	2482	{
2341	mapcell *cell = row->col + (x + mx - row->c0);	2483	mapcell *cell = row->col + (x + mx - row->c0);
2342		2484
2343	int px = x * T;	2485	int px = x * Tw;
2344	int py = y * T;	2486	int py = y * Th;
2345		2487
2346	if (expect_false (cell->player == player))	2488	if (expect_false (cell->player == player))
2347	{	2489	{
2348	px += sdx;	2490	px += sdx;
2349	py += sdy;	2491	py += sdy;
2350	}	2492	}
2351		2493
2352	if (cell->stat_hp)	2494	if (cell->stat_hp)
2353	{	2495	{
2354	int width = cell->stat_width * T;	2496	int width = cell->stat_width * Tw;
2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2497	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356		2498
2357	glColor3ub (0, 0, 0);	2499	glColor3ub (0, 0, 0);
2358	glRectf (px + 1, py - thick - 2,	2500	glRectf (px + 1, py - thick - 2,
2359	px + width - 1, py);	2501	px + width - 1, py);
2360		2502
…		…
2366	}	2508	}
2367	}	2509	}
2368	}	2510	}
2369		2511
2370	void	2512	void
2371	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)
2372	CODE:	2514	CODE:
2373	{	2515	{
2374	static float color[16][3] = {	2516	static float color[16][3] = {
2375	{ 0.00F, 0.00F, 0.00F },	2517	{ 0.00f, 0.00f, 0.00f },
2376	{ 1.00F, 1.00F, 1.00F },	2518	{ 1.00f, 1.00f, 1.00f },
2377	{ 0.00F, 0.00F, 0.55F },	2519	{ 0.00f, 0.00f, 0.55f },
2378	{ 1.00F, 0.00F, 0.00F },	2520	{ 1.00f, 0.00f, 0.00f },
2379		2521
2380	{ 1.00F, 0.54F, 0.00F },	2522	{ 1.00f, 0.54f, 0.00f },
2381	{ 0.11F, 0.56F, 1.00F },	2523	{ 0.11f, 0.56f, 1.00f },
2382	{ 0.93F, 0.46F, 0.00F },	2524	{ 0.93f, 0.46f, 0.00f },
2383	{ 0.18F, 0.54F, 0.34F },	2525	{ 0.18f, 0.54f, 0.34f },
2384		2526
2385	{ 0.56F, 0.73F, 0.56F },	2527	{ 0.56f, 0.73f, 0.56f },
2386	{ 0.80F, 0.80F, 0.80F },	2528	{ 0.80f, 0.80f, 0.80f },
2387	{ 0.55F, 0.41F, 0.13F },	2529	{ 0.55f, 0.41f, 0.13f },
2388	{ 0.99F, 0.77F, 0.26F },	2530	{ 0.99f, 0.77f, 0.26f },
2389		2531
2390	{ 0.74F, 0.65F, 0.41F },	2532	{ 0.74f, 0.65f, 0.41f },
2391		2533
2392	{ 0.00F, 1.00F, 1.00F },	2534	{ 0.00f, 1.00f, 1.00f },
2393	{ 1.00F, 0.00F, 1.00F },	2535	{ 1.00f, 0.00f, 1.00f },
2394	{ 1.00F, 1.00F, 0.00F },	2536	{ 1.00f, 1.00f, 0.00f },
2395	};	2537	};
2396		2538
2397	int x, y;	2539	int x, y;
2398		2540
2399	glEnable (GL_TEXTURE_2D);	2541	glEnable (GL_TEXTURE_2D);
2400	/* 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,
2401	* but the nvidia driver (185.18.14) mishandles alpha textures	2543	* but the nvidia driver (185.18.14) mishandles alpha textures
2402	* ansd takes the colour from god knows where instead of using	2544	* and takes the colour from god knows where instead of using
2403	* Cp. MODULATE results in the same colour, but slightly different	2545	* Cp. MODULATE results in the same colour, but slightly different
2404	* alpha, but atcually gives us the correct colour with nvidia.	2546	* alpha, but atcually gives us the correct colour with nvidia.
2405	*/	2547	*/
2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2548	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407	glEnable (GL_BLEND);	2549	glEnable (GL_BLEND);
…		…
2415		2557
2416	if (m)	2558	if (m)
2417	{	2559	{
2418	float *c = color [m & 15];	2560	float *c = color [m & 15];
2419		2561
2420	float tx1 = m & 0x40 ? 0.5 : 0.;	2562	float tx1 = m & 0x40 ? 0.5f : 0.f;
2421	float tx2 = tx1 + 0.5;	2563	float tx2 = tx1 + 0.5f;
2422		2564
2423	glColor4f (c[0], c[1], c[2], 1);	2565	glColor4f (c[0], c[1], c[2], 1);
2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2566	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2567	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2568	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
…		…
2436	void	2578	void
2437	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)
2438	PPCODE:	2580	PPCODE:
2439	{	2581	{
2440	int x, y;	2582	int x, y;
2441	int sw1 = sw + 2;	2583	int sw1 = sw + 2;
2442	int sh1 = sh + 2;	2584	int sh1 = sh + 2;
2443	int sh3 = sh * 3;	2585	int sh3 = sh * 3;
2444	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);
2445	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2589	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2446	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2590	memset (darkness1, 0, sw1*sh1);
2447	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2448		2591
2449	SvPOK_only (darkness3_sv);	2592	SvPOK_only (darkness3_sv);
2450	SvCUR_set (darkness3_sv, sw34 * sh3);	2593	SvCUR_set (darkness3_sv, sw3 * sh3);
2451		2594
2452	mx += self->x - 1;	2595	mx += self->x - 1;
2453	my += self->y - 1;	2596	my += self->y - 1;
2454
2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456		2597
2457	for (y = 0; y < sh1; y++)	2598	for (y = 0; y < sh1; y++)
2458	if (0 <= y + my && y + my < self->rows)	2599	if (0 <= y + my && y + my < self->rows)
2459	{	2600	{
2460	maprow *row = self->row + (y + my);	2601	maprow *row = self->row + (y + my);
…		…
2463	if (row->c0 <= x + mx && x + mx < row->c1)	2604	if (row->c0 <= x + mx && x + mx < row->c1)
2464	{	2605	{
2465	mapcell *cell = row->col + (x + mx - row->c0);	2606	mapcell *cell = row->col + (x + mx - row->c0);
2466		2607
2467	darkness1 [y * sw1 + x] = cell->darkness	2608	darkness1 [y * sw1 + x] = cell->darkness
2468	? 255 - (cell->darkness - 1)	2609	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469	: 255 - FOW_DARKNESS;	2610	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470	}	2611	}
2471	}	2612	}
2472		2613
2473	for (y = 0; y < sh; ++y)	2614	for (y = 0; y < sh; ++y)
2474	for (x = 0; x < sw; ++x)	2615	for (x = 0; x < sw; ++x)
…		…
2493		2634
2494	uint8_t r13 = (d13 + d23 + d12) / 3;	2635	uint8_t r13 = (d13 + d23 + d12) / 3;
2495	uint8_t r23 = d23;	2636	uint8_t r23 = d23;
2496	uint8_t r33 = (d23 + d33 + d32) / 3;	2637	uint8_t r33 = (d23 + d33 + d32) / 3;
2497		2638
2498	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2639	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2640	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2642	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502	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 */
2503	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2645	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2646	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507	}	2648	}
2508		2649
2509	free (darkness1);	2650	free (darkness1);
2510		2651
2511	EXTEND (SP, 3);	2652	EXTEND (SP, 3);
2512	PUSHs (sv_2mortal (newSViv (sw34)));	2653	PUSHs (sv_2mortal (newSViv (sw3)));
2513	PUSHs (sv_2mortal (newSViv (sh3)));	2654	PUSHs (sv_2mortal (newSViv (sh3)));
2514	PUSHs (darkness3_sv);	2655	PUSHs (darkness3_sv);
2515	}	2656	}
2516		2657
2517	SV *	2658	SV *
…		…
2580	else	2721	else
2581	*data++ = 0;	2722	*data++ = 0;
2582	}	2723	}
2583	}	2724	}
2584		2725
2585	/* if size is wh + 5 then no data has been found /	2726	/* if size is wh + 5 then no data has been found /
2586	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2727	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2587	{	2728	{
2588	SvPOK_only (data_sv);	2729	SvPOK_only (data_sv);
2589	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2730	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2590	}	2731	}
2591		2732
2592	RETVAL = data_sv;	2733	RETVAL = data_sv;
2593	}	2734	}
2594	OUTPUT:	2735	OUTPUT:
2595	RETVAL	2736	RETVAL
2596		2737
2597	void	2738	void
…		…
2604	STRLEN len;	2745	STRLEN len;
2605	uint8_t data, end;	2746	uint8_t data, end;
2606		2747
2607	len = SvLEN (data_sv);	2748	len = SvLEN (data_sv);
2608	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2749	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2609	data = SvPVbyte_nolen (data_sv);	2750	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2610	end = data + len + 8;	2751	end = data + len + 8;
2611		2752
2612	if (len < 5)	2753	if (len < 5)
2613	XSRETURN_EMPTY;	2754	XSRETURN_EMPTY;
2614		2755
…		…
2675	}	2816	}
2676		2817
2677	MODULE = Deliantra::Client PACKAGE = DC::RW	2818	MODULE = Deliantra::Client PACKAGE = DC::RW
2678		2819
2679	DC::RW	2820	DC::RW
2680	new (SV class, SV data_sv)	2821	new (SV klass, SV data_sv)
2681	CODE:	2822	CODE:
2682	{	2823	{
2683	STRLEN datalen;	2824	STRLEN datalen;
2684	char *data = SvPVbyte (data_sv, datalen);	2825	char *data = SvPVbyte (data_sv, datalen);
2685		2826
…		…
2687	}	2828	}
2688	OUTPUT:	2829	OUTPUT:
2689	RETVAL	2830	RETVAL
2690		2831
2691	DC::RW	2832	DC::RW
2692	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")
2693	CODE:	2834	CODE:
2694	RETVAL = SDL_RWFromFile (path, mode);	2835	RETVAL = SDL_RWFromFile (path, mode);
2695	OUTPUT:	2836	OUTPUT:
2696	RETVAL	2837	RETVAL
2697		2838
…		…
2715	if (RETVAL < 0)	2856	if (RETVAL < 0)
2716	{	2857	{
2717	RETVAL = Mix_GroupOldest (-1);	2858	RETVAL = Mix_GroupOldest (-1);
2718		2859
2719	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)
2720	XSRETURN_UNDEF;	2866	XSRETURN_UNDEF;
2721		2867	}
		2868	else
2722	Mix_HaltChannel (RETVAL);	2869	Mix_HaltChannel (RETVAL);
2723	}	2870	}
2724		2871
2725	Mix_UnregisterAllEffects (RETVAL);	2872	Mix_UnregisterAllEffects (RETVAL);
2726	Mix_Volume (RETVAL, 128);	2873	Mix_Volume (RETVAL, 128);
2727	}	2874	}
…		…
2774	void	2921	void
2775	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)
2776	CODE:	2923	CODE:
2777	{	2924	{
2778	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));
2779	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;
2780	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2927	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781	}	2928	}
2782		2929
2783	void	2930	void
2784	set_reverse_stereo (DC::Channel self, int flip)	2931	set_reverse_stereo (DC::Channel self, int flip)
…		…
2787		2934
2788	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2935	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789		2936
2790	PROTOTYPES: DISABLE	2937	PROTOTYPES: DISABLE
2791		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
2792	DC::MixChunk	2951	DC::MixChunk
2793	new (SV *class, DC::RW rwops)	2952	new (SV *klass, DC::RW rwops)
2794	CODE:	2953	CODE:
2795	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2954	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2796	OUTPUT:	2955	OUTPUT:
2797	RETVAL	2956	RETVAL
2798		2957
…		…
2828	OUTPUT:	2987	OUTPUT:
2829	RETVAL	2988	RETVAL
2830		2989
2831	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2990	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832		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
2833	int	3004	int
2834	volume (int volume = -1)	3005	volume (int volume = -1)
2835	PROTOTYPE: ;$	3006	PROTOTYPE: ;$
2836	CODE:	3007	CODE:
2837	if (items > 0)	3008	if (items > 0)
…		…
2848	void	3019	void
2849	halt ()	3020	halt ()
2850	CODE:	3021	CODE:
2851	Mix_HaltMusic ();	3022	Mix_HaltMusic ();
2852		3023
		3024	int
		3025	playing ()
		3026	CODE:
		3027	RETVAL = Mix_PlayingMusic ();
		3028	OUTPUT:
		3029	RETVAL
		3030
2853	DC::MixMusic	3031	DC::MixMusic
2854	new (SV *class, DC::RW rwops)	3032	new (SV *klass, DC::RW rwops)
2855	CODE:	3033	CODE:
2856	RETVAL = Mix_LoadMUS_RW (rwops);	3034	RETVAL = Mix_LoadMUS_RW (rwops);
2857	OUTPUT:	3035	OUTPUT:
2858	RETVAL	3036	RETVAL
2859		3037
…		…
2996	const_iv (GL_FUNC_SUBTRACT),	3174	const_iv (GL_FUNC_SUBTRACT),
2997	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3175	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998	# undef const_iv	3176	# undef const_iv
2999	};	3177	};
3000		3178
3001	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--)
3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3180	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003		3181
3004	texture_av = newAV ();	3182	texture_av = newAV ();
3005	AvREAL_off (texture_av);	3183	AvREAL_off (texture_av);
3006	}	3184	}
3007		3185
…		…
3012	gl.BlendFuncSeparateEXT = 0;	3190	gl.BlendFuncSeparateEXT = 0;
3013		3191
3014	void	3192	void
3015	apple_nvidia_bug (int enable)	3193	apple_nvidia_bug (int enable)
3016		3194
3017	char *	3195	const char *
3018	gl_vendor ()	3196	gl_vendor ()
3019	CODE:	3197	CODE:
3020	RETVAL = (char *)glGetString (GL_VENDOR);	3198	RETVAL = (const char *)glGetString (GL_VENDOR);
3021	OUTPUT:	3199	OUTPUT:
3022	RETVAL	3200	RETVAL
3023		3201
3024	char *	3202	const char *
3025	gl_version ()	3203	gl_version ()
3026	CODE:	3204	CODE:
3027	RETVAL = (char *)glGetString (GL_VERSION);	3205	RETVAL = (const char *)glGetString (GL_VERSION);
3028	OUTPUT:	3206	OUTPUT:
3029	RETVAL	3207	RETVAL
3030		3208
3031	char *	3209	const char *
3032	gl_extensions ()	3210	gl_extensions ()
3033	CODE:	3211	CODE:
3034	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3212	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3035	OUTPUT:	3213	OUTPUT:
3036	RETVAL	3214	RETVAL
3037		3215
3038	const char *glGetString (GLenum pname)	3216	const char *glGetString (GLenum pname)
		3217	CODE:
		3218	RETVAL = (const char *)glGetString (pname);
		3219	OUTPUT:
		3220	RETVAL
3039		3221
3040	GLint glGetInteger (GLenum pname)	3222	GLint glGetInteger (GLenum pname)
3041	CODE:	3223	CODE:
3042	glGetIntegerv (pname, &RETVAL);	3224	glGetIntegerv (pname, &RETVAL);
3043	OUTPUT:	3225	OUTPUT:
…		…
3050	RETVAL	3232	RETVAL
3051		3233
3052	int glGetError ()	3234	int glGetError ()
3053		3235
3054	void glFinish ()	3236	void glFinish ()
		3237
		3238	void glFlush ()
3055		3239
3056	void glClear (int mask)	3240	void glClear (int mask)
3057		3241
3058	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)
3059	PROTOTYPE: @	3243	PROTOTYPE: @
…		…
3231		3415
3232	void glEndList ()	3416	void glEndList ()
3233		3417
3234	void glCallList (int list)	3418	void glCallList (int list)
3235		3419
		3420	void c_init ()
		3421	CODE:
		3422	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3423	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3424
3236	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3425	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237		3426
3238	PROTOTYPES: DISABLE	3427	PROTOTYPES: DISABLE
3239		3428
3240	void	3429	void
3241	find_widget (SV *self, NV x, NV y)	3430	find_widget (SV *self, NV x, NV y)
3242	PPCODE:	3431	PPCODE:
3243	{	3432	{
3244	if (within_widget (self, x, y))	3433	if (within_widget (self, x, y))
3245	XPUSHs (self);	3434	XPUSHs (self);
3246	}	3435	}
3247		3436
3248	BOOT:	3437	BOOT:
3249	{	3438	{
…		…
3257		3446
3258	void	3447	void
3259	draw (SV *self)	3448	draw (SV *self)
3260	CODE:	3449	CODE:
3261	{	3450	{
3262	HV *hv;	3451	HV *hv;
3263	SV **svp;	3452	SV **svp;
3264	NV x, y, w, h;	3453	NV x, y, w, h;
3265	SV *draw_x_sv = GvSV (draw_x_gv);	3454	SV *draw_x_sv = GvSV (draw_x_gv);
3266	SV *draw_y_sv = GvSV (draw_y_gv);	3455	SV *draw_y_sv = GvSV (draw_y_gv);
3267	SV *draw_w_sv = GvSV (draw_w_gv);	3456	SV *draw_w_sv = GvSV (draw_w_gv);
3268	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.293 by root, Thu Dec 17 02:49:38 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.293 by root, Thu Dec 17 02:49:38 2009 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 UTC