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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 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
…		…
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 32	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
92		96
93	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		99
		100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
		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	}
95		123
96	static AV *texture_av;	124	static AV *texture_av;
97		125
98	static struct	126	static struct
99	{	127	{
…		…
231	int w, h;	259	int w, h;
232	float s, t;	260	float s, t;
233	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
234	tileid smoothtile;	262	tileid smoothtile;
235	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
236	} maptex;	265	} maptex;
237		266
238	typedef struct {	267	typedef struct {
239	uint32_t player;	268	uint32_t player;
240	tileid tile[3];	269	tileid tile[3];
…		…
453		482
454	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
455	}	484	}
456		485
457	static unsigned int	486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
		490	}
		491
		492	static unsigned int
458	minpot (unsigned int n)	493	minpot (unsigned int n)
459	{	494	{
460	if (!n)	495	if (!n)
461	return 0;	496	return 0;
462		497
…		…
525	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);	560	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
526	if (!svp \|\| !SvTRUE (*svp))	561	if (!svp \|\| !SvTRUE (*svp))
527	return 0;	562	return 0;
528		563
529	return 1;	564	return 1;
		565	}
		566
		567	/******************************************************************************/
		568
		569	/* process keyboard modifiers */
		570	static int
		571	mod_munge (int mod)
		572	{
		573	mod &= MOD_MASK;
		574
		575	if (mod & (KMOD_META \| KMOD_ALT))
		576	mod \|= KMOD_LRAM;
		577
		578	return mod;
530	}	579	}
531		580
532	static void	581	static void
533	deliantra_main ()	582	deliantra_main ()
534	{	583	{
…		…
602	const_iv (SDL_USEREVENT),	651	const_iv (SDL_USEREVENT),
603		652
604	const_iv (SDL_APPINPUTFOCUS),	653	const_iv (SDL_APPINPUTFOCUS),
605	const_iv (SDL_APPMOUSEFOCUS),	654	const_iv (SDL_APPMOUSEFOCUS),
606	const_iv (SDL_APPACTIVE),	655	const_iv (SDL_APPACTIVE),
		656
		657
		658	const_iv (SDLK_UNKNOWN),
		659	const_iv (SDLK_FIRST),
		660	const_iv (SDLK_BACKSPACE),
		661	const_iv (SDLK_TAB),
		662	const_iv (SDLK_CLEAR),
		663	const_iv (SDLK_RETURN),
		664	const_iv (SDLK_PAUSE),
		665	const_iv (SDLK_ESCAPE),
		666	const_iv (SDLK_SPACE),
		667	const_iv (SDLK_EXCLAIM),
		668	const_iv (SDLK_QUOTEDBL),
		669	const_iv (SDLK_HASH),
		670	const_iv (SDLK_DOLLAR),
		671	const_iv (SDLK_AMPERSAND),
		672	const_iv (SDLK_QUOTE),
		673	const_iv (SDLK_LEFTPAREN),
		674	const_iv (SDLK_RIGHTPAREN),
		675	const_iv (SDLK_ASTERISK),
		676	const_iv (SDLK_PLUS),
		677	const_iv (SDLK_COMMA),
		678	const_iv (SDLK_MINUS),
		679	const_iv (SDLK_PERIOD),
		680	const_iv (SDLK_SLASH),
		681	const_iv (SDLK_0),
		682	const_iv (SDLK_1),
		683	const_iv (SDLK_2),
		684	const_iv (SDLK_3),
		685	const_iv (SDLK_4),
		686	const_iv (SDLK_5),
		687	const_iv (SDLK_6),
		688	const_iv (SDLK_7),
		689	const_iv (SDLK_8),
		690	const_iv (SDLK_9),
		691	const_iv (SDLK_COLON),
		692	const_iv (SDLK_SEMICOLON),
		693	const_iv (SDLK_LESS),
		694	const_iv (SDLK_EQUALS),
		695	const_iv (SDLK_GREATER),
		696	const_iv (SDLK_QUESTION),
		697	const_iv (SDLK_AT),
		698
		699	const_iv (SDLK_LEFTBRACKET),
		700	const_iv (SDLK_BACKSLASH),
		701	const_iv (SDLK_RIGHTBRACKET),
		702	const_iv (SDLK_CARET),
		703	const_iv (SDLK_UNDERSCORE),
		704	const_iv (SDLK_BACKQUOTE),
		705	const_iv (SDLK_DELETE),
607		706
608	const_iv (SDLK_FIRST),	707	const_iv (SDLK_FIRST),
609	const_iv (SDLK_LAST),	708	const_iv (SDLK_LAST),
610	const_iv (SDLK_KP0),	709	const_iv (SDLK_KP0),
611	const_iv (SDLK_KP1),	710	const_iv (SDLK_KP1),
…		…
687	const_iv (KMOD_RMETA),	786	const_iv (KMOD_RMETA),
688	const_iv (KMOD_NUM),	787	const_iv (KMOD_NUM),
689	const_iv (KMOD_CAPS),	788	const_iv (KMOD_CAPS),
690	const_iv (KMOD_MODE),	789	const_iv (KMOD_MODE),
691		790
		791	const_iv (KMOD_LRAM),
		792
692	const_iv (MIX_DEFAULT_FORMAT),	793	const_iv (MIX_DEFAULT_FORMAT),
693		794
694	const_iv (SDL_INIT_TIMER),	795	const_iv (SDL_INIT_TIMER),
695	const_iv (SDL_INIT_AUDIO),	796	const_iv (SDL_INIT_AUDIO),
696	const_iv (SDL_INIT_VIDEO),	797	const_iv (SDL_INIT_VIDEO),
…		…
720		821
721	const_iv (FOW_DARKNESS)	822	const_iv (FOW_DARKNESS)
722	# undef const_iv	823	# undef const_iv
723	};	824	};
724		825
725	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	826	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
726	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	827	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
727		828
728	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	829	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
729	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	830	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
730	}	831	}
731		832
…		…
747	NV ceil (NV x)	848	NV ceil (NV x)
748		849
749	IV minpot (UV n)	850	IV minpot (UV n)
750		851
751	IV popcount (UV n)	852	IV popcount (UV n)
		853
		854	NV distance (NV dx, NV dy)
		855	CODE:
		856	RETVAL = pow (dx * dx + dy * dy, 0.5);
		857	OUTPUT:
		858	RETVAL
752		859
753	void	860	void
754	pango_init ()	861	pango_init ()
755	CODE:	862	CODE:
756	{	863	{
…		…
848		955
849	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
850	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
851	#include "glfunc.h"	958	#include "glfunc.h"
852	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
853	}	963	}
854	}	964	}
855	OUTPUT:	965	OUTPUT:
856	RETVAL	966	RETVAL
857		967
…		…
883	{	993	{
884	case SDL_KEYDOWN:	994	case SDL_KEYDOWN:
885	case SDL_KEYUP:	995	case SDL_KEYUP:
886	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	996	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
887	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	997	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
888	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	998	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
889	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	999	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
890	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1000	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
891	break;	1001	break;
892		1002
893	case SDL_ACTIVEEVENT:	1003	case SDL_ACTIVEEVENT:
894	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1004	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
912	x = ev.motion.x;	1022	x = ev.motion.x;
913	y = ev.motion.y;	1023	y = ev.motion.y;
914	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1024	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
915	}	1025	}
916		1026
917	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1027	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
918	hv_store (hv, "state", 5, newSViv (state), 0);	1028	hv_store (hv, "state", 5, newSViv (state), 0);
919	hv_store (hv, "x", 1, newSViv (x), 0);	1029	hv_store (hv, "x", 1, newSViv (x), 0);
920	hv_store (hv, "y", 1, newSViv (y), 0);	1030	hv_store (hv, "y", 1, newSViv (y), 0);
921	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1031	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
922	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1032	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
942		1052
943	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1053	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
944	}	1054	}
945	}	1055	}
946		1056
		1057	char *
		1058	SDL_AudioDriverName ()
		1059	CODE:
		1060	{
		1061	char buf [256];
		1062	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1063	XSRETURN_UNDEF;
		1064
		1065	RETVAL = buf;
		1066	}
		1067	OUTPUT:
		1068	RETVAL
		1069
947	int	1070	int
948	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
949	POSTCALL:	1072	POSTCALL:
950	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
951	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
1013	add_font (char *file)	1136	add_font (char *file)
1014	CODE:	1137	CODE:
1015	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1016	OUTPUT:	1139	OUTPUT:
1017	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1144
		1145	void
		1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)
1018		1147
1019	void	1148	void
1020	load_image_inline (SV *image_)	1149	load_image_inline (SV *image_)
1021	ALIAS:	1150	ALIAS:
1022	load_image_file = 1	1151	load_image_file = 1
…		…
1138	#if DEBUG	1267	#if DEBUG
1139	VALGRIND_DO_LEAK_CHECK;	1268	VALGRIND_DO_LEAK_CHECK;
1140	#endif	1269	#endif
1141	}	1270	}
1142		1271
		1272	int
		1273	SvREFCNT (SV *sv)
		1274	CODE:
		1275	RETVAL = SvREFCNT (sv);
		1276	OUTPUT:
		1277	RETVAL
		1278
1143	MODULE = Deliantra::Client PACKAGE = DC::Font	1279	MODULE = Deliantra::Client PACKAGE = DC::Font
1144		1280
1145	PROTOTYPES: DISABLE	1281	PROTOTYPES: DISABLE
1146		1282
1147	DC::Font	1283	DC::Font
…		…
1576	if (ix)	1712	if (ix)
1577	{	1713	{
1578	glDisable (GL_ALPHA_TEST);	1714	glDisable (GL_ALPHA_TEST);
1579	glDisable (GL_BLEND);	1715	glDisable (GL_BLEND);
1580	}	1716	}
		1717	}
		1718
		1719	void
		1720	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)
		1721	PROTOTYPE: @
		1722	CODE:
		1723	{
		1724	glEnable (GL_BLEND);
		1725	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1726	glEnable (GL_TEXTURE_2D);
		1727	glBindTexture (GL_TEXTURE_2D, name1);
		1728
		1729	glColor3f (intensity, intensity, intensity);
		1730	glPushMatrix ();
		1731	glScalef (1./3, 1./3, 1.);
		1732
		1733	if (blend > 0.f)
		1734	{
		1735	float dx3 = dx * -3.f / w;
		1736	float dy3 = dy * -3.f / h;
		1737	GLfloat env_color[4] = { 0., 0., 0., blend };
		1738
		1739	/* interpolate the two shadow textures */
		1740	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1741	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1742
		1743	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1744	gl.ActiveTexture (GL_TEXTURE1);
		1745	glEnable (GL_TEXTURE_2D);
		1746	glBindTexture (GL_TEXTURE_2D, name2);
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1748
		1749	/* rgb == rgb(glcolor) */
		1750	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1751	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1753
		1754	/* alpha = interpolate t0, t1 by env_alpha */
		1755	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1756
		1757	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1766
		1767	glBegin (GL_QUADS);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1769	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1770	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1771	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1772	glEnd ();
		1773
		1774	glDisable (GL_TEXTURE_2D);
		1775	gl.ActiveTexture (GL_TEXTURE0);
		1776	}
		1777	else
		1778	{
		1779	/* simple blending of one texture, also opengl <1.3 path */
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1781
		1782	glBegin (GL_QUADS);
		1783	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1784	glTexCoord2f (0, t); glVertex2f (0, h);
		1785	glTexCoord2f (s, t); glVertex2f (w, h);
		1786	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1787	glEnd ();
		1788	}
		1789
		1790	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1791	{
		1792	int x, y;
		1793	int dx3 = dx * 3;
		1794	int dy3 = dy * 3;
		1795
		1796	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1797	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1798	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1799	glTranslatef (-1., -1., 0);
		1800	glBegin (GL_QUADS);
		1801
		1802	for (y = 1; y < h; y += 3)
		1803	{
		1804	int y1 = y - dy3;
		1805	int y1valid = y1 >= 0 && y1 < h;
		1806
		1807	for (x = 1; x < w; x += 3)
		1808	{
		1809	int x1 = x - dx3;
		1810	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1811	uint8_t h2;
		1812
		1813	if (y1valid && x1 >= 0 && x1 < w)
		1814	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1815	else
		1816	h2 = 1; /* out of range == invisible */
		1817
		1818	if (h1 \|\| h2)
		1819	{
		1820	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1821	glColor4f (1., 1., 1., alpha);
		1822
		1823	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1824	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1825	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1826	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1827	}
		1828	}
		1829	}
		1830	}
		1831
		1832	glEnd ();
		1833
		1834	glPopMatrix ();
		1835
		1836	glDisable (GL_TEXTURE_2D);
		1837	glDisable (GL_BLEND);
1581	}	1838	}
1582		1839
1583	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1840	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1584	CODE:	1841	CODE:
1585	{	1842	{
…		…
1691	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1948	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1692	// use uglier nearest interpolation because linear suffers	1949	// use uglier nearest interpolation because linear suffers
1693	// from transparent color bleeding and ugly wrapping effects.	1950	// from transparent color bleeding and ugly wrapping effects.
1694	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1695	}	1952	}
		1953
		1954	void
		1955	expire_textures (DC::Map self, int texid, int count)
		1956	PPCODE:
		1957	for (; texid < self->texs && count; ++texid, --count)
		1958	{
		1959	maptex *tex = self->tex + texid;
		1960
		1961	if (tex->name)
		1962	{
		1963	if (tex->unused)
		1964	{
		1965	tex->name = 0;
		1966	tex->unused = 0;
		1967	XPUSHs (sv_2mortal (newSViv (texid)));
		1968	}
		1969	else
		1970	tex->unused = 1;
		1971	}
		1972	}
1696		1973
1697	int	1974	int
1698	ox (DC::Map self)	1975	ox (DC::Map self)
1699	ALIAS:	1976	ALIAS:
1700	oy = 1	1977	oy = 1
…		…
1781	{	2058	{
1782	ext = *data++;	2059	ext = *data++;
1783	cmd = ext & 0x7f;	2060	cmd = ext & 0x7f;
1784		2061
1785	if (cmd < 4)	2062	if (cmd < 4)
1786	cell->darkness = 255 - ext * 64 + 1;	2063	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1787	else if (cmd == 5) // health	2064	else if (cmd == 5) // health
1788	{	2065	{
1789	cell->stat_width = 1;	2066	cell->stat_width = 1;
1790	cell->stat_hp = *data++;	2067	cell->stat_hp = *data++;
1791	}	2068	}
…		…
1821	cell->tile [z] = self->face2tile [face];	2098	cell->tile [z] = self->face2tile [face];
1822		2099
1823	if (cell->tile [z])	2100	if (cell->tile [z])
1824	{	2101	{
1825	maptex *tex = self->tex + cell->tile [z];	2102	maptex *tex = self->tex + cell->tile [z];
		2103	tex->unused = 0;
1826	if (!tex->name)	2104	if (!tex->name)
1827	av_push (missing, newSViv (cell->tile [z]));	2105	av_push (missing, newSViv (cell->tile [z]));
1828		2106
1829	if (tex->smoothtile)	2107	if (tex->smoothtile)
1830	{	2108	{
1831	maptex *smooth = self->tex + tex->smoothtile;	2109	maptex *smooth = self->tex + tex->smoothtile;
		2110	smooth->unused = 0;
1832	if (!smooth->name)	2111	if (!smooth->name)
1833	av_push (missing, newSViv (tex->smoothtile));	2112	av_push (missing, newSViv (tex->smoothtile));
1834	}	2113	}
1835	}	2114	}
1836	}	2115	}
…		…
1864	? self->row + y	2143	? self->row + y
1865	: 0;	2144	: 0;
1866		2145
1867	for (x = x0; x < x1; x++)	2146	for (x = x0; x < x1; x++)
1868	{	2147	{
1869	int r = 32, g = 32, b = 32, a = 192;	2148	unsigned int r = 32, g = 32, b = 32, a = 192;
1870		2149
1871	if (row && row->c0 <= x && x < row->c1)	2150	if (row && row->c0 <= x && x < row->c1)
1872	{	2151	{
1873	mapcell *cell = row->col + (x - row->c0);	2152	mapcell *cell = row->col + (x - row->c0);
1874		2153
…		…
1876	{	2155	{
1877	maptex tex = self->tex [cell->tile [z]];	2156	maptex tex = self->tex [cell->tile [z]];
1878	int a0 = 255 - tex.a;	2157	int a0 = 255 - tex.a;
1879	int a1 = tex.a;	2158	int a1 = tex.a;
1880		2159
1881	r = (r * a0 + tex.r * a1) / 255;	2160	r = div255 (r * a0 + tex.r * a1);
1882	g = (g * a0 + tex.g * a1) / 255;	2161	g = div255 (g * a0 + tex.g * a1);
1883	b = (b * a0 + tex.b * a1) / 255;	2162	b = div255 (b * a0 + tex.b * a1);
1884	a = (a * a0 + tex.a * a1) / 255;	2163	a = div255 (a * a0 + tex.a * a1);
1885	}	2164	}
1886	}	2165	}
1887		2166
1888	*map++ = (r )	2167	*map++ = (r )
1889	\| (g << 8)	2168	\| (g << 8)
…		…
1896	}	2175	}
1897	OUTPUT:	2176	OUTPUT:
1898	RETVAL	2177	RETVAL
1899		2178
1900	void	2179	void
1901	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2180	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)
1902	CODE:	2181	CODE:
1903	{	2182	{
1904	int x, y, z;	2183	int x, y, z;
1905		2184
1906	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2185	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1907	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2186	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1908	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2187	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1909	smooth_key skey;	2188	smooth_key skey;
1910	int pl_x, pl_y;	2189	int pl_x, pl_y;
1911	maptex pl_tex;	2190	maptex pl_tex;
1912	rc_t *rc = rc_alloc ();	2191	rc_t *rc = rc_alloc ();
		2192	rc_t *rc_ov = rc_alloc ();
1913	rc_key_t key;	2193	rc_key_t key;
1914	rc_array_t *arr;	2194	rc_array_t *arr;
1915		2195
1916	pl_tex.name = 0;	2196	pl_tex.name = 0;
1917		2197
1918	// thats current max. sorry.	2198	// that's current max. sorry.
1919	if (sw > 255) sw = 255;	2199	if (sw > 255) sw = 255;
1920	if (sh > 255) sh = 255;	2200	if (sh > 255) sh = 255;
1921		2201
1922	// clear key, in case of extra padding	2202	// clear key, in case of extra padding
1923	memset (&skey, 0, sizeof (skey));	2203	memset (&skey, 0, sizeof (skey));
…		…
1927	key.g = 255;	2207	key.g = 255;
1928	key.b = 255;	2208	key.b = 255;
1929	key.a = 255;	2209	key.a = 255;
1930	key.mode = GL_QUADS;	2210	key.mode = GL_QUADS;
1931	key.format = GL_T2F_V3F;	2211	key.format = GL_T2F_V3F;
1932	key.texname = -1;
1933		2212
1934	mx += self->x;	2213	mx += self->x;
1935	my += self->y;	2214	my += self->y;
1936		2215
1937	// first pass: determine smooth_max	2216	// first pass: determine smooth_max
…		…
1961	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2240	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1962		2241
1963	for (z = 0; z <= 2; z++)	2242	for (z = 0; z <= 2; z++)
1964	{	2243	{
1965	memset (smooth_level, 0, sizeof (smooth_level));	2244	memset (smooth_level, 0, sizeof (smooth_level));
		2245	key.texname = -1;
1966		2246
1967	for (y = 0; y < sh; y++)	2247	for (y = 0; y < sh; y++)
1968	if (0 <= y + my && y + my < self->rows)	2248	if (0 <= y + my && y + my < self->rows)
1969	{	2249	{
1970	maprow *row = self->row + (y + my);	2250	maprow *row = self->row + (y + my);
…		…
1976	tileid tile = cell->tile [z];	2256	tileid tile = cell->tile [z];
1977		2257
1978	if (tile)	2258	if (tile)
1979	{	2259	{
1980	maptex tex = self->tex [tile];	2260	maptex tex = self->tex [tile];
1981	int px = (x + 1) * T - tex.w;	2261	int px, py;
1982	int py = (y + 1) * T - tex.h;
1983		2262
1984	if (key.texname != tex.name)	2263	if (key.texname != tex.name)
1985	{	2264	{
		2265	self->tex [tile].unused = 0;
		2266
1986	if (!tex.name)	2267	if (!tex.name)
1987	tex = self->tex [2]; /* missing, replace by noface */	2268	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1988		2269
1989	key.texname = tex.name;	2270	key.texname = tex.name;
1990	arr = rc_array (rc, &key);	2271	arr = rc_array (rc, &key);
1991	}	2272	}
		2273
		2274	px = (x + 1) * Th - tex.w;
		2275	py = (y + 1) * Tw - tex.h;
1992		2276
1993	if (expect_false (cell->player == player) && expect_false (z == 2))	2277	if (expect_false (cell->player == player) && expect_false (z == 2))
1994	{	2278	{
1995	pl_x = px;	2279	pl_x = px;
1996	pl_y = py;	2280	pl_y = py;
…		…
2001	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2285	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2002	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2286	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2003	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2287	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2004	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2288	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2005		2289
2006	if (expect_false (cell->flags) && expect_false (z == 2))
2007	{
2008	// overlays such as the speech bubble, probably more to come
2009	if (cell->flags & 1)
2010	{
2011	maptex tex = self->tex [1];
2012	int px = x * T + T * 2 / 32;
2013	int py = y * T - T * 6 / 32;
2014
2015	if (tex.name)
2016	{
2017	if (key.texname != tex.name)
2018	{
2019	key.texname = tex.name;
2020	arr = rc_array (rc, &key);
2021	}
2022
2023	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2024	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2025	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2026	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2027	}
2028	}
2029	}
2030
2031	// update smooth hash	2290	// update smooth hash
2032	if (tex.smoothtile)	2291	if (tex.smoothtile)
2033	{	2292	{
2034	skey.tile = tex.smoothtile;	2293	skey.tile = tex.smoothtile;
2035	skey.level = tex.smoothlevel;	2294	skey.level = tex.smoothlevel;
…		…
2063	// corners	2322	// corners
2064	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2323	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2065	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2324	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2066	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2325	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2067	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2326	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2327	}
		2328	}
		2329
		2330	if (expect_false (z == 2) && expect_false (cell->flags))
		2331	{
		2332	// overlays such as the speech bubble, probably more to come
		2333	if (cell->flags & 1)
		2334	{
		2335	rc_key_t key_ov = key;
		2336	maptex tex = self->tex [TEXID_SPEECH];
		2337	rc_array_t *arr;
		2338	int px = x * Tw + Tw * 2 / 32;
		2339	int py = y * Th - Th * 6 / 32;
		2340
		2341	key_ov.texname = tex.name;
		2342	arr = rc_array (rc_ov, &key_ov);
		2343
		2344	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2345	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2346	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2347	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2068	}	2348	}
2069	}	2349	}
2070	}	2350	}
2071	}	2351	}
2072		2352
…		…
2099	if (!(bits & 0x1000)	2379	if (!(bits & 0x1000)
2100	&& skey->level == level	2380	&& skey->level == level
2101	&& level > smooth_max [skey->x][skey->y])	2381	&& level > smooth_max [skey->x][skey->y])
2102	{	2382	{
2103	maptex tex = self->tex [skey->tile];	2383	maptex tex = self->tex [skey->tile];
2104	int px = (((int)skey->x) - 1) * T;	2384	int px = (((int)skey->x) - 1) * Tw;
2105	int py = (((int)skey->y) - 1) * T;	2385	int py = (((int)skey->y) - 1) * Th;
2106	int border = bits & 15;	2386	int border = bits & 15;
2107	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2387	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2108	float dx = tex.s * .0625f; // 16 images/row	2388	float dx = tex.s * .0625f; // 16 images/row
2109	float dy = tex.t * .5f ; // 2 images/column	2389	float dy = tex.t * .5f ; // 2 images/column
2110		2390
…		…
2112	{	2392	{
2113	// this time avoiding texture state changes	2393	// this time avoiding texture state changes
2114	// save gobs of state changes.	2394	// save gobs of state changes.
2115	if (key.texname != tex.name)	2395	if (key.texname != tex.name)
2116	{	2396	{
		2397	self->tex [skey->tile].unused = 0;
		2398
2117	glEnd ();	2399	glEnd ();
2118	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2400	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2119	glBegin (GL_QUADS);	2401	glBegin (GL_QUADS);
2120	}	2402	}
2121		2403
2122	if (border)	2404	if (border)
2123	{	2405	{
2124	float ox = border * dx;	2406	float ox = border * dx;
2125		2407
2126	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2408	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2127	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2409	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2128	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2410	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2129	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2411	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2130	}	2412	}
2131		2413
2132	if (corner)	2414	if (corner)
2133	{	2415	{
2134	float ox = corner * dx;	2416	float ox = corner * dx;
2135		2417
2136	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2418	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2137	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2419	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2138	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2420	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2139	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2421	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2140	}	2422	}
2141	}	2423	}
2142	}	2424	}
2143	}	2425	}
2144	}	2426	}
…		…
2167	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2449	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2168		2450
2169	rc_draw (rc);	2451	rc_draw (rc);
2170	}	2452	}
2171		2453
		2454	rc_draw (rc_ov);
		2455	rc_clear (rc_ov);
		2456
2172	glDisable (GL_BLEND);	2457	glDisable (GL_BLEND);
2173	rc_free (rc);	2458	rc_free (rc);
		2459	rc_free (rc_ov);
2174		2460
2175	// top layer: overlays such as the health bar	2461	// top layer: overlays such as the health bar
2176	for (y = 0; y < sh; y++)	2462	for (y = 0; y < sh; y++)
2177	if (0 <= y + my && y + my < self->rows)	2463	if (0 <= y + my && y + my < self->rows)
2178	{	2464	{
…		…
2181	for (x = 0; x < sw; x++)	2467	for (x = 0; x < sw; x++)
2182	if (row->c0 <= x + mx && x + mx < row->c1)	2468	if (row->c0 <= x + mx && x + mx < row->c1)
2183	{	2469	{
2184	mapcell *cell = row->col + (x + mx - row->c0);	2470	mapcell *cell = row->col + (x + mx - row->c0);
2185		2471
2186	int px = x * T;	2472	int px = x * Tw;
2187	int py = y * T;	2473	int py = y * Th;
		2474
		2475	if (expect_false (cell->player == player))
		2476	{
		2477	px += sdx;
		2478	py += sdy;
		2479	}
2188		2480
2189	if (cell->stat_hp)	2481	if (cell->stat_hp)
2190	{	2482	{
2191	int width = cell->stat_width * T;	2483	int width = cell->stat_width * Tw;
2192	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2484	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2193		2485
2194	glColor3ub (0, 0, 0);	2486	glColor3ub (0, 0, 0);
2195	glRectf (px + 1, py - thick - 2,	2487	glRectf (px + 1, py - thick - 2,
2196	px + width - 1, py);	2488	px + width - 1, py);
2197		2489
…		…
2203	}	2495	}
2204	}	2496	}
2205	}	2497	}
2206		2498
2207	void	2499	void
2208	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2500	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2209	CODE:	2501	CODE:
2210	{	2502	{
2211	static float color[16][3] = {	2503	static float color[16][3] = {
2212	{ 0.00F, 0.00F, 0.00F },	2504	{ 0.00f, 0.00f, 0.00f },
2213	{ 1.00F, 1.00F, 1.00F },	2505	{ 1.00f, 1.00f, 1.00f },
2214	{ 0.00F, 0.00F, 0.55F },	2506	{ 0.00f, 0.00f, 0.55f },
2215	{ 1.00F, 0.00F, 0.00F },	2507	{ 1.00f, 0.00f, 0.00f },
2216		2508
2217	{ 1.00F, 0.54F, 0.00F },	2509	{ 1.00f, 0.54f, 0.00f },
2218	{ 0.11F, 0.56F, 1.00F },	2510	{ 0.11f, 0.56f, 1.00f },
2219	{ 0.93F, 0.46F, 0.00F },	2511	{ 0.93f, 0.46f, 0.00f },
2220	{ 0.18F, 0.54F, 0.34F },	2512	{ 0.18f, 0.54f, 0.34f },
2221		2513
2222	{ 0.56F, 0.73F, 0.56F },	2514	{ 0.56f, 0.73f, 0.56f },
2223	{ 0.80F, 0.80F, 0.80F },	2515	{ 0.80f, 0.80f, 0.80f },
2224	{ 0.55F, 0.41F, 0.13F },	2516	{ 0.55f, 0.41f, 0.13f },
2225	{ 0.99F, 0.77F, 0.26F },	2517	{ 0.99f, 0.77f, 0.26f },
2226		2518
2227	{ 0.74F, 0.65F, 0.41F },	2519	{ 0.74f, 0.65f, 0.41f },
2228		2520
2229	{ 0.00F, 1.00F, 1.00F },	2521	{ 0.00f, 1.00f, 1.00f },
2230	{ 1.00F, 0.00F, 1.00F },	2522	{ 1.00f, 0.00f, 1.00f },
2231	{ 1.00F, 1.00F, 0.00F },	2523	{ 1.00f, 1.00f, 0.00f },
2232	};	2524	};
2233		2525
2234	int x, y;	2526	int x, y;
2235		2527
2236	glEnable (GL_TEXTURE_2D);	2528	glEnable (GL_TEXTURE_2D);
		2529	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2530	* but the nvidia driver (185.18.14) mishandles alpha textures
		2531	* and takes the colour from god knows where instead of using
		2532	* Cp. MODULATE results in the same colour, but slightly different
		2533	* alpha, but atcually gives us the correct colour with nvidia.
		2534	*/
2237	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2535	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2238	glEnable (GL_BLEND);	2536	glEnable (GL_BLEND);
2239	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2537	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240	glBegin (GL_QUADS);	2538	glBegin (GL_QUADS);
2241		2539
2242	for (y = 0; y < h; y++)	2540	for (y = 0; y < h; y++)
…		…
2246		2544
2247	if (m)	2545	if (m)
2248	{	2546	{
2249	float *c = color [m & 15];	2547	float *c = color [m & 15];
2250		2548
2251	float tx1 = m & 0x40 ? 0.5 : 0.;	2549	float tx1 = m & 0x40 ? 0.5f : 0.f;
2252	float tx2 = tx1 + 0.5;	2550	float tx2 = tx1 + 0.5f;
2253		2551
2254	glColor4f (c[0], c[1], c[2], 0.75);	2552	glColor4f (c[0], c[1], c[2], 1);
2255	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2553	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2256	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2554	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2257	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2555	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2258	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2556	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2259	}	2557	}
…		…
2267	void	2565	void
2268	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2566	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2269	PPCODE:	2567	PPCODE:
2270	{	2568	{
2271	int x, y;	2569	int x, y;
2272	int sw1 = sw + 2;	2570	int sw1 = sw + 2;
2273	int sh1 = sh + 2;	2571	int sh1 = sh + 2;
2274	int sh3 = sh * 3;	2572	int sh3 = sh * 3;
2275	int sw34 = (sw * 3 + 3) & ~3;	2573	int sw3 = sw * 3;
		2574	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2575	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2276	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2576	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2277	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2577	memset (darkness1, 0, sw1*sh1);
2278	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2279		2578
2280	SvPOK_only (darkness3_sv);	2579	SvPOK_only (darkness3_sv);
2281	SvCUR_set (darkness3_sv, sw34 * sh3);	2580	SvCUR_set (darkness3_sv, sw3 * sh3);
2282		2581
2283	mx += self->x - 1;	2582	mx += self->x - 1;
2284	my += self->y - 1;	2583	my += self->y - 1;
2285
2286	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2287		2584
2288	for (y = 0; y < sh1; y++)	2585	for (y = 0; y < sh1; y++)
2289	if (0 <= y + my && y + my < self->rows)	2586	if (0 <= y + my && y + my < self->rows)
2290	{	2587	{
2291	maprow *row = self->row + (y + my);	2588	maprow *row = self->row + (y + my);
…		…
2294	if (row->c0 <= x + mx && x + mx < row->c1)	2591	if (row->c0 <= x + mx && x + mx < row->c1)
2295	{	2592	{
2296	mapcell *cell = row->col + (x + mx - row->c0);	2593	mapcell *cell = row->col + (x + mx - row->c0);
2297		2594
2298	darkness1 [y * sw1 + x] = cell->darkness	2595	darkness1 [y * sw1 + x] = cell->darkness
2299	? 255 - (cell->darkness - 1)	2596	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2300	: 255 - FOW_DARKNESS;	2597	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2301	}	2598	}
2302	}	2599	}
2303		2600
2304	for (y = 0; y < sh; ++y)	2601	for (y = 0; y < sh; ++y)
2305	for (x = 0; x < sw; ++x)	2602	for (x = 0; x < sw; ++x)
…		…
2324		2621
2325	uint8_t r13 = (d13 + d23 + d12) / 3;	2622	uint8_t r13 = (d13 + d23 + d12) / 3;
2326	uint8_t r23 = d23;	2623	uint8_t r23 = d23;
2327	uint8_t r33 = (d23 + d33 + d32) / 3;	2624	uint8_t r33 = (d23 + d33 + d32) / 3;
2328		2625
2329	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2626	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2330	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2627	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2331	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2628	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2332	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2629	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2333	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2630	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2334	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2631	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2335	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2632	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2336	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2633	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2337	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2634	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2338	}	2635	}
2339		2636
2340	free (darkness1);	2637	free (darkness1);
2341		2638
2342	EXTEND (SP, 3);	2639	EXTEND (SP, 3);
2343	PUSHs (sv_2mortal (newSViv (sw34)));	2640	PUSHs (sv_2mortal (newSViv (sw3)));
2344	PUSHs (sv_2mortal (newSViv (sh3)));	2641	PUSHs (sv_2mortal (newSViv (sh3)));
2345	PUSHs (darkness3_sv);	2642	PUSHs (darkness3_sv);
2346	}	2643	}
2347		2644
2348	SV *	2645	SV *
…		…
2546	if (RETVAL < 0)	2843	if (RETVAL < 0)
2547	{	2844	{
2548	RETVAL = Mix_GroupOldest (-1);	2845	RETVAL = Mix_GroupOldest (-1);
2549		2846
2550	if (RETVAL < 0)	2847	if (RETVAL < 0)
		2848	{
		2849	// happens sometimes, maybe it just stopped playing(?)
		2850	RETVAL = Mix_GroupAvailable (-1);
		2851
		2852	if (RETVAL < 0)
2551	XSRETURN_UNDEF;	2853	XSRETURN_UNDEF;
2552		2854	}
		2855	else
2553	Mix_HaltChannel (RETVAL);	2856	Mix_HaltChannel (RETVAL);
2554	}	2857	}
2555		2858
2556	Mix_UnregisterAllEffects (RETVAL);	2859	Mix_UnregisterAllEffects (RETVAL);
2557	Mix_Volume (RETVAL, 128);	2860	Mix_Volume (RETVAL, 128);
2558	}	2861	}
…		…
2605	void	2908	void
2606	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2909	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2607	CODE:	2910	CODE:
2608	{	2911	{
2609	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2912	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2610	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2913	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2611	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2914	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2612	}	2915	}
2613		2916
2614	void	2917	void
2615	set_reverse_stereo (DC::Channel self, int flip)	2918	set_reverse_stereo (DC::Channel self, int flip)
…		…
2617	Mix_SetReverseStereo (self, flip);	2920	Mix_SetReverseStereo (self, flip);
2618		2921
2619	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2922	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2620		2923
2621	PROTOTYPES: DISABLE	2924	PROTOTYPES: DISABLE
		2925
		2926	void
		2927	decoders ()
		2928	PPCODE:
		2929	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2930	int i, num = Mix_GetNumChunkDecoders ();
		2931	EXTEND (SP, num);
		2932	for (i = 0; i < num; ++i)
		2933	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2934	#else
		2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2936	#endif
2622		2937
2623	DC::MixChunk	2938	DC::MixChunk
2624	new (SV *class, DC::RW rwops)	2939	new (SV *class, DC::RW rwops)
2625	CODE:	2940	CODE:
2626	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2659	OUTPUT:	2974	OUTPUT:
2660	RETVAL	2975	RETVAL
2661		2976
2662	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2977	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2663		2978
		2979	void
		2980	decoders ()
		2981	PPCODE:
		2982	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2983	int i, num = Mix_GetNumMusicDecoders ();
		2984	EXTEND (SP, num);
		2985	for (i = 0; i < num; ++i)
		2986	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2987	#else
		2988	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2989	#endif
		2990
2664	int	2991	int
2665	volume (int volume = -1)	2992	volume (int volume = -1)
2666	PROTOTYPE: ;$	2993	PROTOTYPE: ;$
2667	CODE:	2994	CODE:
2668	if (items > 0)	2995	if (items > 0)
…		…
2678		3005
2679	void	3006	void
2680	halt ()	3007	halt ()
2681	CODE:	3008	CODE:
2682	Mix_HaltMusic ();	3009	Mix_HaltMusic ();
		3010
		3011	int
		3012	playing ()
		3013	CODE:
		3014	RETVAL = Mix_PlayingMusic ();
		3015	OUTPUT:
		3016	RETVAL
2683		3017
2684	DC::MixMusic	3018	DC::MixMusic
2685	new (SV *class, DC::RW rwops)	3019	new (SV *class, DC::RW rwops)
2686	CODE:	3020	CODE:
2687	RETVAL = Mix_LoadMUS_RW (rwops);	3021	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2718	} *civ, const_iv[] = {	3052	} *civ, const_iv[] = {
2719	# define const_iv(name) { # name, (IV)name }	3053	# define const_iv(name) { # name, (IV)name }
2720	const_iv (GL_VENDOR),	3054	const_iv (GL_VENDOR),
2721	const_iv (GL_VERSION),	3055	const_iv (GL_VERSION),
2722	const_iv (GL_EXTENSIONS),	3056	const_iv (GL_EXTENSIONS),
		3057	const_iv (GL_MAX_TEXTURE_UNITS),
2723	const_iv (GL_COLOR_MATERIAL),	3058	const_iv (GL_COLOR_MATERIAL),
2724	const_iv (GL_SMOOTH),	3059	const_iv (GL_SMOOTH),
2725	const_iv (GL_FLAT),	3060	const_iv (GL_FLAT),
2726	const_iv (GL_DITHER),	3061	const_iv (GL_DITHER),
2727	const_iv (GL_BLEND),	3062	const_iv (GL_BLEND),
…		…
2739	const_iv (GL_ZERO),	3074	const_iv (GL_ZERO),
2740	const_iv (GL_SRC_ALPHA),	3075	const_iv (GL_SRC_ALPHA),
2741	const_iv (GL_DST_ALPHA),	3076	const_iv (GL_DST_ALPHA),
2742	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3077	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2743	const_iv (GL_ONE_MINUS_DST_ALPHA),	3078	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3079	const_iv (GL_SRC_COLOR),
		3080	const_iv (GL_DST_COLOR),
		3081	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3082	const_iv (GL_ONE_MINUS_DST_COLOR),
2744	const_iv (GL_SRC_ALPHA_SATURATE),	3083	const_iv (GL_SRC_ALPHA_SATURATE),
2745	const_iv (GL_RGB),	3084	const_iv (GL_RGB),
2746	const_iv (GL_RGBA),	3085	const_iv (GL_RGBA),
2747	const_iv (GL_RGBA4),	3086	const_iv (GL_RGBA4),
2748	const_iv (GL_RGBA8),	3087	const_iv (GL_RGBA8),
…		…
2816	const_iv (GL_NICEST),	3155	const_iv (GL_NICEST),
2817	const_iv (GL_V2F),	3156	const_iv (GL_V2F),
2818	const_iv (GL_V3F),	3157	const_iv (GL_V3F),
2819	const_iv (GL_T2F_V3F),	3158	const_iv (GL_T2F_V3F),
2820	const_iv (GL_T2F_N3F_V3F),	3159	const_iv (GL_T2F_N3F_V3F),
		3160	const_iv (GL_FUNC_ADD),
		3161	const_iv (GL_FUNC_SUBTRACT),
		3162	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2821	# undef const_iv	3163	# undef const_iv
2822	};	3164	};
2823		3165
2824	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3166	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2825	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3167	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2826		3168
2827	texture_av = newAV ();	3169	texture_av = newAV ();
2828	AvREAL_off (texture_av);	3170	AvREAL_off (texture_av);
2829	}	3171	}
2830		3172
2831	void	3173	void
2832	disable_GL_EXT_blend_func_separate ()	3174	disable_GL_EXT_blend_func_separate ()
2833	CODE:	3175	CODE:
2834	gl.BlendFuncSeparate = 0;	3176	gl.BlendFuncSeparate = 0;
2835	gl.BlendFuncSeparateEXT = 0;	3177	gl.BlendFuncSeparateEXT = 0;
		3178
		3179	void
		3180	apple_nvidia_bug (int enable)
2836		3181
2837	char *	3182	char *
2838	gl_vendor ()	3183	gl_vendor ()
2839	CODE:	3184	CODE:
2840	RETVAL = (char *)glGetString (GL_VENDOR);	3185	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2871		3216
2872	int glGetError ()	3217	int glGetError ()
2873		3218
2874	void glFinish ()	3219	void glFinish ()
2875		3220
		3221	void glFlush ()
		3222
2876	void glClear (int mask)	3223	void glClear (int mask)
2877		3224
2878	void glClearColor (float r, float g, float b, float a = 1.0)	3225	void glClearColor (float r, float g, float b, float a = 1.0)
2879	PROTOTYPE: @	3226	PROTOTYPE: @
2880		3227
…		…
2889	void glBlendFunc (int sfactor, int dfactor)	3236	void glBlendFunc (int sfactor, int dfactor)
2890		3237
2891	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3238	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2892	CODE:	3239	CODE:
2893	gl_BlendFuncSeparate (sa, da, saa, daa);	3240	gl_BlendFuncSeparate (sa, da, saa, daa);
		3241
		3242	# void glBlendEquation (int se)
2894		3243
2895	void glDepthMask (int flag)	3244	void glDepthMask (int flag)
2896		3245
2897	void glLogicOp (int opcode)	3246	void glLogicOp (int opcode)
2898		3247
…		…
2933	void glRotate (float angle, float x, float y, float z)	3282	void glRotate (float angle, float x, float y, float z)
2934	CODE:	3283	CODE:
2935	glRotatef (angle, x, y, z);	3284	glRotatef (angle, x, y, z);
2936		3285
2937	void glColor (float r, float g, float b, float a = 1.0)	3286	void glColor (float r, float g, float b, float a = 1.0)
		3287	PROTOTYPE: @
2938	ALIAS:	3288	ALIAS:
2939	glColor_premultiply = 1	3289	glColor_premultiply = 1
2940	CODE:	3290	CODE:
2941	if (ix)	3291	if (ix)
2942	{	3292	{
…		…
3047	void glNewList (int list, int mode = GL_COMPILE)	3397	void glNewList (int list, int mode = GL_COMPILE)
3048		3398
3049	void glEndList ()	3399	void glEndList ()
3050		3400
3051	void glCallList (int list)	3401	void glCallList (int list)
		3402
		3403	void c_init ()
		3404	CODE:
		3405	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3406	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3052		3407
3053	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3408	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3054		3409
3055	PROTOTYPES: DISABLE	3410	PROTOTYPES: DISABLE
3056		3411

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC vs. Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC vs.
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC