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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 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>
…		…
38	#include <SDL_thread.h>	37	#include <SDL_thread.h>
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		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);
		48	#endif
43		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib/gmacros.h>
…		…
76	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
77	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
78		84
79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80		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 */
81	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
82		91
83	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
84	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
85		94
86	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
87		96
88	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
89	#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	}
90		123
91	static AV *texture_av;	124	static AV *texture_av;
92		125
93	static struct	126	static struct
94	{	127	{
…		…
226	int w, h;	259	int w, h;
227	float s, t;	260	float s, t;
228	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
229	tileid smoothtile;	262	tileid smoothtile;
230	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
231	} maptex;	265	} maptex;
232		266
233	typedef struct {	267	typedef struct {
234	uint32_t player;	268	uint32_t player;
235	tileid tile[3];	269	tileid tile[3];
…		…
448		482
449	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
450	}	484	}
451		485
452	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
453	minpot (unsigned int n)	493	minpot (unsigned int n)
454	{	494	{
455	if (!n)	495	if (!n)
456	return 0;	496	return 0;
457		497
…		…
521	if (!svp \|\| !SvTRUE (*svp))	561	if (!svp \|\| !SvTRUE (*svp))
522	return 0;	562	return 0;
523		563
524	return 1;	564	return 1;
525	}	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;
		579	}
		580
		581	static void
		582	deliantra_main ()
		583	{
		584	char *argv[] = { 0 };
		585	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		586	}
		587
		588	#ifdef __MACOSX__
		589	/* to due surprising braindamage on the side of SDL design, we
		590	* do some mind-boggling hack here: SDL requires a custom main()
		591	* on OS X, so... we provide one and call the original main(), which,
		592	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		593	* and which calls our main (== SDL_main) back.
		594	*/
		595	extern C_LINKAGE int
		596	main (int argc, char *argv[])
		597	{
		598	deliantra_main ();
		599	}
		600
		601	#undef main
		602
		603	extern C_LINKAGE int main (int argc, char *argv[]);
		604
		605	static void
		606	SDL_braino (void)
		607	{
		608	char *argv[] = { "deliantra client", 0 };
		609	(main) (1, argv);
		610	}
		611	#else
		612	static void
		613	SDL_braino (void)
		614	{
		615	deliantra_main ();
		616	}
		617	#endif
526		618
527	MODULE = Deliantra::Client PACKAGE = DC	619	MODULE = Deliantra::Client PACKAGE = DC
528		620
529	PROTOTYPES: ENABLE	621	PROTOTYPES: ENABLE
530		622
…		…
559	const_iv (SDL_USEREVENT),	651	const_iv (SDL_USEREVENT),
560		652
561	const_iv (SDL_APPINPUTFOCUS),	653	const_iv (SDL_APPINPUTFOCUS),
562	const_iv (SDL_APPMOUSEFOCUS),	654	const_iv (SDL_APPMOUSEFOCUS),
563	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),
564		706
565	const_iv (SDLK_FIRST),	707	const_iv (SDLK_FIRST),
566	const_iv (SDLK_LAST),	708	const_iv (SDLK_LAST),
567	const_iv (SDLK_KP0),	709	const_iv (SDLK_KP0),
568	const_iv (SDLK_KP1),	710	const_iv (SDLK_KP1),
…		…
644	const_iv (KMOD_RMETA),	786	const_iv (KMOD_RMETA),
645	const_iv (KMOD_NUM),	787	const_iv (KMOD_NUM),
646	const_iv (KMOD_CAPS),	788	const_iv (KMOD_CAPS),
647	const_iv (KMOD_MODE),	789	const_iv (KMOD_MODE),
648		790
		791	const_iv (KMOD_LRAM),
		792
649	const_iv (MIX_DEFAULT_FORMAT),	793	const_iv (MIX_DEFAULT_FORMAT),
650		794
651	const_iv (SDL_INIT_TIMER),	795	const_iv (SDL_INIT_TIMER),
652	const_iv (SDL_INIT_AUDIO),	796	const_iv (SDL_INIT_AUDIO),
653	const_iv (SDL_INIT_VIDEO),	797	const_iv (SDL_INIT_VIDEO),
…		…
701		845
702	NV floor (NV x)	846	NV floor (NV x)
703		847
704	NV ceil (NV x)	848	NV ceil (NV x)
705		849
706	NV ceilabs (NV x)	850	IV minpot (UV n)
		851
		852	IV popcount (UV n)
		853
		854	NV distance (NV dx, NV dy)
707	CODE:	855	CODE:
708	RETVAL = x < 0. ? - ceil (-x) : ceil (x);	856	RETVAL = pow (dx * dx + dy * dy, 0.5);
709	OUTPUT:	857	OUTPUT:
710	RETVAL	858	RETVAL
711
712	IV minpot (UV n)
713
714	IV popcount (UV n)
715		859
716	void	860	void
717	pango_init ()	861	pango_init ()
718	CODE:	862	CODE:
719	{	863	{
…		…
726	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	870	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
727	#endif	871	#endif
728	}	872	}
729		873
730	char *SDL_GetError ()	874	char *SDL_GetError ()
		875
		876	void SDL_braino ()
731		877
732	int SDL_Init (U32 flags)	878	int SDL_Init (U32 flags)
733		879
734	int SDL_InitSubSystem (U32 flags)	880	int SDL_InitSubSystem (U32 flags)
735		881
…		…
809		955
810	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
811	#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);
812	#include "glfunc.h"	958	#include "glfunc.h"
813	#undef GL_FUNC	959	#undef GL_FUNC
		960
		961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
814	}	963	}
815	}	964	}
816	OUTPUT:	965	OUTPUT:
817	RETVAL	966	RETVAL
818		967
…		…
844	{	993	{
845	case SDL_KEYDOWN:	994	case SDL_KEYDOWN:
846	case SDL_KEYUP:	995	case SDL_KEYUP:
847	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	996	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
848	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	997	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
849	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);
850	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 */
851	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1000	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
852	break;	1001	break;
853		1002
854	case SDL_ACTIVEEVENT:	1003	case SDL_ACTIVEEVENT:
855	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1004	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
873	x = ev.motion.x;	1022	x = ev.motion.x;
874	y = ev.motion.y;	1023	y = ev.motion.y;
875	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1024	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
876	}	1025	}
877		1026
878	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1027	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
879	hv_store (hv, "state", 5, newSViv (state), 0);	1028	hv_store (hv, "state", 5, newSViv (state), 0);
880	hv_store (hv, "x", 1, newSViv (x), 0);	1029	hv_store (hv, "x", 1, newSViv (x), 0);
881	hv_store (hv, "y", 1, newSViv (y), 0);	1030	hv_store (hv, "y", 1, newSViv (y), 0);
882	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1031	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
883	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1032	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
903		1052
904	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))));
905	}	1054	}
906	}	1055	}
907		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
908	int	1070	int
909	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)
910	POSTCALL:	1072	POSTCALL:
911	Mix_HookMusicFinished (music_finished);	1073	Mix_HookMusicFinished (music_finished);
912	Mix_ChannelFinished (channel_finished);	1074	Mix_ChannelFinished (channel_finished);
…		…
974	add_font (char *file)	1136	add_font (char *file)
975	CODE:	1137	CODE:
976	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1138	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977	OUTPUT:	1139	OUTPUT:
978	RETVAL	1140	RETVAL
		1141
		1142	void
		1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
979		1144
980	void	1145	void
981	load_image_inline (SV *image_)	1146	load_image_inline (SV *image_)
982	ALIAS:	1147	ALIAS:
983	load_image_file = 1	1148	load_image_file = 1
…		…
1099	#if DEBUG	1264	#if DEBUG
1100	VALGRIND_DO_LEAK_CHECK;	1265	VALGRIND_DO_LEAK_CHECK;
1101	#endif	1266	#endif
1102	}	1267	}
1103		1268
		1269	int
		1270	SvREFCNT (SV *sv)
		1271	CODE:
		1272	RETVAL = SvREFCNT (sv);
		1273	OUTPUT:
		1274	RETVAL
		1275
1104	MODULE = Deliantra::Client PACKAGE = DC::Font	1276	MODULE = Deliantra::Client PACKAGE = DC::Font
1105		1277
1106	PROTOTYPES: DISABLE	1278	PROTOTYPES: DISABLE
1107		1279
1108	DC::Font	1280	DC::Font
…		…
1537	if (ix)	1709	if (ix)
1538	{	1710	{
1539	glDisable (GL_ALPHA_TEST);	1711	glDisable (GL_ALPHA_TEST);
1540	glDisable (GL_BLEND);	1712	glDisable (GL_BLEND);
1541	}	1713	}
		1714	}
		1715
		1716	void
		1717	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)
		1718	PROTOTYPE: @
		1719	CODE:
		1720	{
		1721	glEnable (GL_BLEND);
		1722	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1723	glEnable (GL_TEXTURE_2D);
		1724	glBindTexture (GL_TEXTURE_2D, name1);
		1725
		1726	glColor3f (intensity, intensity, intensity);
		1727	glPushMatrix ();
		1728	glScalef (1./3, 1./3, 1.);
		1729
		1730	if (blend > 0.f)
		1731	{
		1732	float dx3 = dx * -3.f / w;
		1733	float dy3 = dy * -3.f / h;
		1734	GLfloat env_color[4] = { 0., 0., 0., blend };
		1735
		1736	/* interpolate the two shadow textures */
		1737	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1738	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1739
		1740	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1741	gl.ActiveTexture (GL_TEXTURE1);
		1742	glEnable (GL_TEXTURE_2D);
		1743	glBindTexture (GL_TEXTURE_2D, name2);
		1744	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1745
		1746	/* rgb == rgb(glcolor) */
		1747	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1748	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1750
		1751	/* alpha = interpolate t0, t1 by env_alpha */
		1752	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1753
		1754	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1755	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1757
		1758	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1759	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1760
		1761	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1763
		1764	glBegin (GL_QUADS);
		1765	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1766	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1767	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1768	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1769	glEnd ();
		1770
		1771	glDisable (GL_TEXTURE_2D);
		1772	gl.ActiveTexture (GL_TEXTURE0);
		1773	}
		1774	else
		1775	{
		1776	/* simple blending of one texture, also opengl <1.3 path */
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1778
		1779	glBegin (GL_QUADS);
		1780	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1781	glTexCoord2f (0, t); glVertex2f (0, h);
		1782	glTexCoord2f (s, t); glVertex2f (w, h);
		1783	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1784	glEnd ();
		1785	}
		1786
		1787	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1788	{
		1789	int x, y;
		1790	int dx3 = dx * 3;
		1791	int dy3 = dy * 3;
		1792
		1793	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1794	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1795	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1796	glTranslatef (-1., -1., 0);
		1797	glBegin (GL_QUADS);
		1798
		1799	for (y = 1; y < h; y += 3)
		1800	{
		1801	int y1 = y - dy3;
		1802	int y1valid = y1 >= 0 && y1 < h;
		1803
		1804	for (x = 1; x < w; x += 3)
		1805	{
		1806	int x1 = x - dx3;
		1807	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1808	uint8_t h2;
		1809
		1810	if (y1valid && x1 >= 0 && x1 < w)
		1811	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1812	else
		1813	h2 = 1; /* out of range == invisible */
		1814
		1815	if (h1 \|\| h2)
		1816	{
		1817	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1818	glColor4f (1., 1., 1., alpha);
		1819
		1820	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1821	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1822	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1823	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1824	}
		1825	}
		1826	}
		1827	}
		1828
		1829	glEnd ();
		1830
		1831	glPopMatrix ();
		1832
		1833	glDisable (GL_TEXTURE_2D);
		1834	glDisable (GL_BLEND);
1542	}	1835	}
1543		1836
1544	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1837	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1545	CODE:	1838	CODE:
1546	{	1839	{
…		…
1652	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1945	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1653	// use uglier nearest interpolation because linear suffers	1946	// use uglier nearest interpolation because linear suffers
1654	// from transparent color bleeding and ugly wrapping effects.	1947	// from transparent color bleeding and ugly wrapping effects.
1655	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1948	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1656	}	1949	}
		1950
		1951	void
		1952	expire_textures (DC::Map self, int texid, int count)
		1953	PPCODE:
		1954	for (; texid < self->texs && count; ++texid, --count)
		1955	{
		1956	maptex *tex = self->tex + texid;
		1957
		1958	if (tex->name)
		1959	{
		1960	if (tex->unused)
		1961	{
		1962	tex->name = 0;
		1963	tex->unused = 0;
		1964	XPUSHs (sv_2mortal (newSViv (texid)));
		1965	}
		1966	else
		1967	tex->unused = 1;
		1968	}
		1969	}
1657		1970
1658	int	1971	int
1659	ox (DC::Map self)	1972	ox (DC::Map self)
1660	ALIAS:	1973	ALIAS:
1661	oy = 1	1974	oy = 1
…		…
1742	{	2055	{
1743	ext = *data++;	2056	ext = *data++;
1744	cmd = ext & 0x7f;	2057	cmd = ext & 0x7f;
1745		2058
1746	if (cmd < 4)	2059	if (cmd < 4)
1747	cell->darkness = 255 - ext * 64 + 1;	2060	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1748	else if (cmd == 5) // health	2061	else if (cmd == 5) // health
1749	{	2062	{
1750	cell->stat_width = 1;	2063	cell->stat_width = 1;
1751	cell->stat_hp = *data++;	2064	cell->stat_hp = *data++;
1752	}	2065	}
…		…
1782	cell->tile [z] = self->face2tile [face];	2095	cell->tile [z] = self->face2tile [face];
1783		2096
1784	if (cell->tile [z])	2097	if (cell->tile [z])
1785	{	2098	{
1786	maptex *tex = self->tex + cell->tile [z];	2099	maptex *tex = self->tex + cell->tile [z];
		2100	tex->unused = 0;
1787	if (!tex->name)	2101	if (!tex->name)
1788	av_push (missing, newSViv (cell->tile [z]));	2102	av_push (missing, newSViv (cell->tile [z]));
1789		2103
1790	if (tex->smoothtile)	2104	if (tex->smoothtile)
1791	{	2105	{
1792	maptex *smooth = self->tex + tex->smoothtile;	2106	maptex *smooth = self->tex + tex->smoothtile;
		2107	smooth->unused = 0;
1793	if (!smooth->name)	2108	if (!smooth->name)
1794	av_push (missing, newSViv (tex->smoothtile));	2109	av_push (missing, newSViv (tex->smoothtile));
1795	}	2110	}
1796	}	2111	}
1797	}	2112	}
…		…
1825	? self->row + y	2140	? self->row + y
1826	: 0;	2141	: 0;
1827		2142
1828	for (x = x0; x < x1; x++)	2143	for (x = x0; x < x1; x++)
1829	{	2144	{
1830	int r = 32, g = 32, b = 32, a = 192;	2145	unsigned int r = 32, g = 32, b = 32, a = 192;
1831		2146
1832	if (row && row->c0 <= x && x < row->c1)	2147	if (row && row->c0 <= x && x < row->c1)
1833	{	2148	{
1834	mapcell *cell = row->col + (x - row->c0);	2149	mapcell *cell = row->col + (x - row->c0);
1835		2150
…		…
1837	{	2152	{
1838	maptex tex = self->tex [cell->tile [z]];	2153	maptex tex = self->tex [cell->tile [z]];
1839	int a0 = 255 - tex.a;	2154	int a0 = 255 - tex.a;
1840	int a1 = tex.a;	2155	int a1 = tex.a;
1841		2156
1842	r = (r * a0 + tex.r * a1) / 255;	2157	r = div255 (r * a0 + tex.r * a1);
1843	g = (g * a0 + tex.g * a1) / 255;	2158	g = div255 (g * a0 + tex.g * a1);
1844	b = (b * a0 + tex.b * a1) / 255;	2159	b = div255 (b * a0 + tex.b * a1);
1845	a = (a * a0 + tex.a * a1) / 255;	2160	a = div255 (a * a0 + tex.a * a1);
1846	}	2161	}
1847	}	2162	}
1848		2163
1849	*map++ = (r )	2164	*map++ = (r )
1850	\| (g << 8)	2165	\| (g << 8)
…		…
1857	}	2172	}
1858	OUTPUT:	2173	OUTPUT:
1859	RETVAL	2174	RETVAL
1860		2175
1861	void	2176	void
1862	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2177	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)
1863	CODE:	2178	CODE:
1864	{	2179	{
1865	int x, y, z;	2180	int x, y, z;
1866		2181
1867	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2182	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1868	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2183	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1869	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2184	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1870	smooth_key skey;	2185	smooth_key skey;
1871	int pl_x, pl_y;	2186	int pl_x, pl_y;
1872	maptex pl_tex;	2187	maptex pl_tex;
1873	rc_t *rc = rc_alloc ();	2188	rc_t *rc = rc_alloc ();
		2189	rc_t *rc_ov = rc_alloc ();
1874	rc_key_t key;	2190	rc_key_t key;
1875	rc_array_t *arr;	2191	rc_array_t *arr;
1876		2192
1877	pl_tex.name = 0;	2193	pl_tex.name = 0;
1878		2194
1879	// thats current max. sorry.	2195	// that's current max. sorry.
1880	if (sw > 255) sw = 255;	2196	if (sw > 255) sw = 255;
1881	if (sh > 255) sh = 255;	2197	if (sh > 255) sh = 255;
1882		2198
1883	// clear key, in case of extra padding	2199	// clear key, in case of extra padding
1884	memset (&skey, 0, sizeof (skey));	2200	memset (&skey, 0, sizeof (skey));
…		…
1888	key.g = 255;	2204	key.g = 255;
1889	key.b = 255;	2205	key.b = 255;
1890	key.a = 255;	2206	key.a = 255;
1891	key.mode = GL_QUADS;	2207	key.mode = GL_QUADS;
1892	key.format = GL_T2F_V3F;	2208	key.format = GL_T2F_V3F;
1893	key.texname = -1;
1894		2209
1895	mx += self->x;	2210	mx += self->x;
1896	my += self->y;	2211	my += self->y;
1897		2212
1898	// first pass: determine smooth_max	2213	// first pass: determine smooth_max
…		…
1922	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2237	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1923		2238
1924	for (z = 0; z <= 2; z++)	2239	for (z = 0; z <= 2; z++)
1925	{	2240	{
1926	memset (smooth_level, 0, sizeof (smooth_level));	2241	memset (smooth_level, 0, sizeof (smooth_level));
		2242	key.texname = -1;
1927		2243
1928	for (y = 0; y < sh; y++)	2244	for (y = 0; y < sh; y++)
1929	if (0 <= y + my && y + my < self->rows)	2245	if (0 <= y + my && y + my < self->rows)
1930	{	2246	{
1931	maprow *row = self->row + (y + my);	2247	maprow *row = self->row + (y + my);
…		…
1937	tileid tile = cell->tile [z];	2253	tileid tile = cell->tile [z];
1938		2254
1939	if (tile)	2255	if (tile)
1940	{	2256	{
1941	maptex tex = self->tex [tile];	2257	maptex tex = self->tex [tile];
1942	int px = (x + 1) * T - tex.w;	2258	int px, py;
1943	int py = (y + 1) * T - tex.h;
1944		2259
1945	if (key.texname != tex.name)	2260	if (key.texname != tex.name)
1946	{	2261	{
		2262	self->tex [tile].unused = 0;
		2263
1947	if (!tex.name)	2264	if (!tex.name)
1948	tex = self->tex [2]; /* missing, replace by noface */	2265	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1949		2266
1950	key.texname = tex.name;	2267	key.texname = tex.name;
1951	arr = rc_array (rc, &key);	2268	arr = rc_array (rc, &key);
1952	}	2269	}
		2270
		2271	px = (x + 1) * Th - tex.w;
		2272	py = (y + 1) * Tw - tex.h;
1953		2273
1954	if (expect_false (cell->player == player) && expect_false (z == 2))	2274	if (expect_false (cell->player == player) && expect_false (z == 2))
1955	{	2275	{
1956	pl_x = px;	2276	pl_x = px;
1957	pl_y = py;	2277	pl_y = py;
…		…
1962	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2282	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1963	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2283	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1964	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2284	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1965	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2285	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1966		2286
1967	if (expect_false (cell->flags) && expect_false (z == 2))
1968	{
1969	// overlays such as the speech bubble, probably more to come
1970	if (cell->flags & 1)
1971	{
1972	maptex tex = self->tex [1];
1973	int px = x * T + T * 2 / 32;
1974	int py = y * T - T * 6 / 32;
1975
1976	if (tex.name)
1977	{
1978	if (key.texname != tex.name)
1979	{
1980	key.texname = tex.name;
1981	arr = rc_array (rc, &key);
1982	}
1983
1984	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1985	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1986	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1987	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1988	}
1989	}
1990	}
1991
1992	// update smooth hash	2287	// update smooth hash
1993	if (tex.smoothtile)	2288	if (tex.smoothtile)
1994	{	2289	{
1995	skey.tile = tex.smoothtile;	2290	skey.tile = tex.smoothtile;
1996	skey.level = tex.smoothlevel;	2291	skey.level = tex.smoothlevel;
…		…
2024	// corners	2319	// corners
2025	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2320	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2026	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2321	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2027	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2322	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2028	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2323	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2324	}
		2325	}
		2326
		2327	if (expect_false (z == 2) && expect_false (cell->flags))
		2328	{
		2329	// overlays such as the speech bubble, probably more to come
		2330	if (cell->flags & 1)
		2331	{
		2332	rc_key_t key_ov = key;
		2333	maptex tex = self->tex [TEXID_SPEECH];
		2334	rc_array_t *arr;
		2335	int px = x * Tw + Tw * 2 / 32;
		2336	int py = y * Th - Th * 6 / 32;
		2337
		2338	key_ov.texname = tex.name;
		2339	arr = rc_array (rc_ov, &key_ov);
		2340
		2341	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2342	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2343	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2344	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2029	}	2345	}
2030	}	2346	}
2031	}	2347	}
2032	}	2348	}
2033		2349
…		…
2060	if (!(bits & 0x1000)	2376	if (!(bits & 0x1000)
2061	&& skey->level == level	2377	&& skey->level == level
2062	&& level > smooth_max [skey->x][skey->y])	2378	&& level > smooth_max [skey->x][skey->y])
2063	{	2379	{
2064	maptex tex = self->tex [skey->tile];	2380	maptex tex = self->tex [skey->tile];
2065	int px = (((int)skey->x) - 1) * T;	2381	int px = (((int)skey->x) - 1) * Tw;
2066	int py = (((int)skey->y) - 1) * T;	2382	int py = (((int)skey->y) - 1) * Th;
2067	int border = bits & 15;	2383	int border = bits & 15;
2068	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2384	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2069	float dx = tex.s * .0625f; // 16 images/row	2385	float dx = tex.s * .0625f; // 16 images/row
2070	float dy = tex.t * .5f ; // 2 images/column	2386	float dy = tex.t * .5f ; // 2 images/column
2071		2387
…		…
2073	{	2389	{
2074	// this time avoiding texture state changes	2390	// this time avoiding texture state changes
2075	// save gobs of state changes.	2391	// save gobs of state changes.
2076	if (key.texname != tex.name)	2392	if (key.texname != tex.name)
2077	{	2393	{
		2394	self->tex [skey->tile].unused = 0;
		2395
2078	glEnd ();	2396	glEnd ();
2079	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2397	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2080	glBegin (GL_QUADS);	2398	glBegin (GL_QUADS);
2081	}	2399	}
2082		2400
2083	if (border)	2401	if (border)
2084	{	2402	{
2085	float ox = border * dx;	2403	float ox = border * dx;
2086		2404
2087	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2405	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2088	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2406	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2089	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2407	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2090	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2408	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2091	}	2409	}
2092		2410
2093	if (corner)	2411	if (corner)
2094	{	2412	{
2095	float ox = corner * dx;	2413	float ox = corner * dx;
2096		2414
2097	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2415	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2098	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2416	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2099	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2417	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2100	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2101	}	2419	}
2102	}	2420	}
2103	}	2421	}
2104	}	2422	}
2105	}	2423	}
…		…
2128	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2446	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129		2447
2130	rc_draw (rc);	2448	rc_draw (rc);
2131	}	2449	}
2132		2450
		2451	rc_draw (rc_ov);
		2452	rc_clear (rc_ov);
		2453
2133	glDisable (GL_BLEND);	2454	glDisable (GL_BLEND);
2134	rc_free (rc);	2455	rc_free (rc);
		2456	rc_free (rc_ov);
2135		2457
2136	// top layer: overlays such as the health bar	2458	// top layer: overlays such as the health bar
2137	for (y = 0; y < sh; y++)	2459	for (y = 0; y < sh; y++)
2138	if (0 <= y + my && y + my < self->rows)	2460	if (0 <= y + my && y + my < self->rows)
2139	{	2461	{
…		…
2142	for (x = 0; x < sw; x++)	2464	for (x = 0; x < sw; x++)
2143	if (row->c0 <= x + mx && x + mx < row->c1)	2465	if (row->c0 <= x + mx && x + mx < row->c1)
2144	{	2466	{
2145	mapcell *cell = row->col + (x + mx - row->c0);	2467	mapcell *cell = row->col + (x + mx - row->c0);
2146		2468
2147	int px = x * T;	2469	int px = x * Tw;
2148	int py = y * T;	2470	int py = y * Th;
		2471
		2472	if (expect_false (cell->player == player))
		2473	{
		2474	px += sdx;
		2475	py += sdy;
		2476	}
2149		2477
2150	if (cell->stat_hp)	2478	if (cell->stat_hp)
2151	{	2479	{
2152	int width = cell->stat_width * T;	2480	int width = cell->stat_width * Tw;
2153	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2481	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2154		2482
2155	glColor3ub (0, 0, 0);	2483	glColor3ub (0, 0, 0);
2156	glRectf (px + 1, py - thick - 2,	2484	glRectf (px + 1, py - thick - 2,
2157	px + width - 1, py);	2485	px + width - 1, py);
2158		2486
…		…
2164	}	2492	}
2165	}	2493	}
2166	}	2494	}
2167		2495
2168	void	2496	void
2169	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2497	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2170	CODE:	2498	CODE:
2171	{	2499	{
2172	static float color[16][3] = {	2500	static float color[16][3] = {
2173	{ 0.00F, 0.00F, 0.00F },	2501	{ 0.00f, 0.00f, 0.00f },
2174	{ 1.00F, 1.00F, 1.00F },	2502	{ 1.00f, 1.00f, 1.00f },
2175	{ 0.00F, 0.00F, 0.55F },	2503	{ 0.00f, 0.00f, 0.55f },
2176	{ 1.00F, 0.00F, 0.00F },	2504	{ 1.00f, 0.00f, 0.00f },
2177		2505
2178	{ 1.00F, 0.54F, 0.00F },	2506	{ 1.00f, 0.54f, 0.00f },
2179	{ 0.11F, 0.56F, 1.00F },	2507	{ 0.11f, 0.56f, 1.00f },
2180	{ 0.93F, 0.46F, 0.00F },	2508	{ 0.93f, 0.46f, 0.00f },
2181	{ 0.18F, 0.54F, 0.34F },	2509	{ 0.18f, 0.54f, 0.34f },
2182		2510
2183	{ 0.56F, 0.73F, 0.56F },	2511	{ 0.56f, 0.73f, 0.56f },
2184	{ 0.80F, 0.80F, 0.80F },	2512	{ 0.80f, 0.80f, 0.80f },
2185	{ 0.55F, 0.41F, 0.13F },	2513	{ 0.55f, 0.41f, 0.13f },
2186	{ 0.99F, 0.77F, 0.26F },	2514	{ 0.99f, 0.77f, 0.26f },
2187		2515
2188	{ 0.74F, 0.65F, 0.41F },	2516	{ 0.74f, 0.65f, 0.41f },
2189		2517
2190	{ 0.00F, 1.00F, 1.00F },	2518	{ 0.00f, 1.00f, 1.00f },
2191	{ 1.00F, 0.00F, 1.00F },	2519	{ 1.00f, 0.00f, 1.00f },
2192	{ 1.00F, 1.00F, 0.00F },	2520	{ 1.00f, 1.00f, 0.00f },
2193	};	2521	};
2194		2522
2195	int x, y;	2523	int x, y;
2196		2524
2197	glEnable (GL_TEXTURE_2D);	2525	glEnable (GL_TEXTURE_2D);
		2526	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2527	* but the nvidia driver (185.18.14) mishandles alpha textures
		2528	* and takes the colour from god knows where instead of using
		2529	* Cp. MODULATE results in the same colour, but slightly different
		2530	* alpha, but atcually gives us the correct colour with nvidia.
		2531	*/
2198	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2532	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2199	glEnable (GL_BLEND);	2533	glEnable (GL_BLEND);
2200	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2534	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2201	glBegin (GL_QUADS);	2535	glBegin (GL_QUADS);
2202		2536
2203	for (y = 0; y < h; y++)	2537	for (y = 0; y < h; y++)
…		…
2207		2541
2208	if (m)	2542	if (m)
2209	{	2543	{
2210	float *c = color [m & 15];	2544	float *c = color [m & 15];
2211		2545
2212	float tx1 = m & 0x40 ? 0.5 : 0.;	2546	float tx1 = m & 0x40 ? 0.5f : 0.f;
2213	float tx2 = tx1 + 0.5;	2547	float tx2 = tx1 + 0.5f;
2214		2548
2215	glColor4f (c[0], c[1], c[2], 0.75);	2549	glColor4f (c[0], c[1], c[2], 1);
2216	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2550	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2217	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2551	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2218	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2552	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2219	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2553	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2220	}	2554	}
…		…
2228	void	2562	void
2229	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2563	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2230	PPCODE:	2564	PPCODE:
2231	{	2565	{
2232	int x, y;	2566	int x, y;
2233	int sw1 = sw + 2;	2567	int sw1 = sw + 2;
2234	int sh1 = sh + 2;	2568	int sh1 = sh + 2;
2235	int sh3 = sh * 3;	2569	int sh3 = sh * 3;
2236	int sw34 = (sw * 3 + 3) & ~3;	2570	int sw3 = sw * 3;
2237	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2571	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2238	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2572	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2239	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2573	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2240		2574
2241	SvPOK_only (darkness3_sv);	2575	SvPOK_only (darkness3_sv);
2242	SvCUR_set (darkness3_sv, sw34 * sh3);	2576	SvCUR_set (darkness3_sv, sw3 * sh3);
2243		2577
2244	mx += self->x - 1;	2578	mx += self->x - 1;
2245	my += self->y - 1;	2579	my += self->y - 1;
2246
2247	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2248		2580
2249	for (y = 0; y < sh1; y++)	2581	for (y = 0; y < sh1; y++)
2250	if (0 <= y + my && y + my < self->rows)	2582	if (0 <= y + my && y + my < self->rows)
2251	{	2583	{
2252	maprow *row = self->row + (y + my);	2584	maprow *row = self->row + (y + my);
…		…
2255	if (row->c0 <= x + mx && x + mx < row->c1)	2587	if (row->c0 <= x + mx && x + mx < row->c1)
2256	{	2588	{
2257	mapcell *cell = row->col + (x + mx - row->c0);	2589	mapcell *cell = row->col + (x + mx - row->c0);
2258		2590
2259	darkness1 [y * sw1 + x] = cell->darkness	2591	darkness1 [y * sw1 + x] = cell->darkness
2260	? 255 - (cell->darkness - 1)	2592	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2261	: 255 - FOW_DARKNESS;	2593	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2262	}	2594	}
2263	}	2595	}
2264		2596
2265	for (y = 0; y < sh; ++y)	2597	for (y = 0; y < sh; ++y)
2266	for (x = 0; x < sw; ++x)	2598	for (x = 0; x < sw; ++x)
…		…
2285		2617
2286	uint8_t r13 = (d13 + d23 + d12) / 3;	2618	uint8_t r13 = (d13 + d23 + d12) / 3;
2287	uint8_t r23 = d23;	2619	uint8_t r23 = d23;
2288	uint8_t r33 = (d23 + d33 + d32) / 3;	2620	uint8_t r33 = (d23 + d33 + d32) / 3;
2289		2621
2290	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2622	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2291	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2623	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2292	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2624	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2293	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2625	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2294	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2626	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2295	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2627	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2296	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2628	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2297	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2629	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2298	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2630	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2299	}	2631	}
2300		2632
2301	free (darkness1);	2633	free (darkness1);
2302		2634
2303	EXTEND (SP, 3);	2635	EXTEND (SP, 3);
2304	PUSHs (sv_2mortal (newSViv (sw34)));	2636	PUSHs (sv_2mortal (newSViv (sw3)));
2305	PUSHs (sv_2mortal (newSViv (sh3)));	2637	PUSHs (sv_2mortal (newSViv (sh3)));
2306	PUSHs (darkness3_sv);	2638	PUSHs (darkness3_sv);
2307	}	2639	}
2308		2640
2309	SV *	2641	SV *
…		…
2507	if (RETVAL < 0)	2839	if (RETVAL < 0)
2508	{	2840	{
2509	RETVAL = Mix_GroupOldest (-1);	2841	RETVAL = Mix_GroupOldest (-1);
2510		2842
2511	if (RETVAL < 0)	2843	if (RETVAL < 0)
		2844	{
		2845	// happens sometimes, maybe it just stopped playing(?)
		2846	RETVAL = Mix_GroupAvailable (-1);
		2847
		2848	if (RETVAL < 0)
2512	XSRETURN_UNDEF;	2849	XSRETURN_UNDEF;
2513		2850	}
		2851	else
2514	Mix_HaltChannel (RETVAL);	2852	Mix_HaltChannel (RETVAL);
2515	}	2853	}
2516		2854
2517	Mix_UnregisterAllEffects (RETVAL);	2855	Mix_UnregisterAllEffects (RETVAL);
2518	Mix_Volume (RETVAL, 128);	2856	Mix_Volume (RETVAL, 128);
2519	}	2857	}
…		…
2566	void	2904	void
2567	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2905	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2568	CODE:	2906	CODE:
2569	{	2907	{
2570	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2908	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2571	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2909	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2572	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2910	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2573	}	2911	}
2574		2912
2575	void	2913	void
2576	set_reverse_stereo (DC::Channel self, int flip)	2914	set_reverse_stereo (DC::Channel self, int flip)
…		…
2578	Mix_SetReverseStereo (self, flip);	2916	Mix_SetReverseStereo (self, flip);
2579		2917
2580	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2918	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2581		2919
2582	PROTOTYPES: DISABLE	2920	PROTOTYPES: DISABLE
		2921
		2922	void
		2923	decoders ()
		2924	PPCODE:
		2925	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2926	int i, num = Mix_GetNumChunkDecoders ();
		2927	EXTEND (SP, num);
		2928	for (i = 0; i < num; ++i)
		2929	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2930	#else
		2931	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2932	#endif
2583		2933
2584	DC::MixChunk	2934	DC::MixChunk
2585	new (SV *class, DC::RW rwops)	2935	new (SV *class, DC::RW rwops)
2586	CODE:	2936	CODE:
2587	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2937	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2620	OUTPUT:	2970	OUTPUT:
2621	RETVAL	2971	RETVAL
2622		2972
2623	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2973	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2624		2974
		2975	void
		2976	decoders ()
		2977	PPCODE:
		2978	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2979	int i, num = Mix_GetNumMusicDecoders ();
		2980	EXTEND (SP, num);
		2981	for (i = 0; i < num; ++i)
		2982	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2983	#else
		2984	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2985	#endif
		2986
2625	int	2987	int
2626	volume (int volume = -1)	2988	volume (int volume = -1)
2627	PROTOTYPE: ;$	2989	PROTOTYPE: ;$
2628	CODE:	2990	CODE:
2629	if (items > 0)	2991	if (items > 0)
…		…
2639		3001
2640	void	3002	void
2641	halt ()	3003	halt ()
2642	CODE:	3004	CODE:
2643	Mix_HaltMusic ();	3005	Mix_HaltMusic ();
		3006
		3007	int
		3008	playing ()
		3009	CODE:
		3010	RETVAL = Mix_PlayingMusic ();
		3011	OUTPUT:
		3012	RETVAL
2644		3013
2645	DC::MixMusic	3014	DC::MixMusic
2646	new (SV *class, DC::RW rwops)	3015	new (SV *class, DC::RW rwops)
2647	CODE:	3016	CODE:
2648	RETVAL = Mix_LoadMUS_RW (rwops);	3017	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2679	} *civ, const_iv[] = {	3048	} *civ, const_iv[] = {
2680	# define const_iv(name) { # name, (IV)name }	3049	# define const_iv(name) { # name, (IV)name }
2681	const_iv (GL_VENDOR),	3050	const_iv (GL_VENDOR),
2682	const_iv (GL_VERSION),	3051	const_iv (GL_VERSION),
2683	const_iv (GL_EXTENSIONS),	3052	const_iv (GL_EXTENSIONS),
		3053	const_iv (GL_MAX_TEXTURE_UNITS),
2684	const_iv (GL_COLOR_MATERIAL),	3054	const_iv (GL_COLOR_MATERIAL),
2685	const_iv (GL_SMOOTH),	3055	const_iv (GL_SMOOTH),
2686	const_iv (GL_FLAT),	3056	const_iv (GL_FLAT),
2687	const_iv (GL_DITHER),	3057	const_iv (GL_DITHER),
2688	const_iv (GL_BLEND),	3058	const_iv (GL_BLEND),
…		…
2700	const_iv (GL_ZERO),	3070	const_iv (GL_ZERO),
2701	const_iv (GL_SRC_ALPHA),	3071	const_iv (GL_SRC_ALPHA),
2702	const_iv (GL_DST_ALPHA),	3072	const_iv (GL_DST_ALPHA),
2703	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3073	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2704	const_iv (GL_ONE_MINUS_DST_ALPHA),	3074	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3075	const_iv (GL_SRC_COLOR),
		3076	const_iv (GL_DST_COLOR),
		3077	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3078	const_iv (GL_ONE_MINUS_DST_COLOR),
2705	const_iv (GL_SRC_ALPHA_SATURATE),	3079	const_iv (GL_SRC_ALPHA_SATURATE),
2706	const_iv (GL_RGB),	3080	const_iv (GL_RGB),
2707	const_iv (GL_RGBA),	3081	const_iv (GL_RGBA),
2708	const_iv (GL_RGBA4),	3082	const_iv (GL_RGBA4),
2709	const_iv (GL_RGBA8),	3083	const_iv (GL_RGBA8),
…		…
2777	const_iv (GL_NICEST),	3151	const_iv (GL_NICEST),
2778	const_iv (GL_V2F),	3152	const_iv (GL_V2F),
2779	const_iv (GL_V3F),	3153	const_iv (GL_V3F),
2780	const_iv (GL_T2F_V3F),	3154	const_iv (GL_T2F_V3F),
2781	const_iv (GL_T2F_N3F_V3F),	3155	const_iv (GL_T2F_N3F_V3F),
		3156	const_iv (GL_FUNC_ADD),
		3157	const_iv (GL_FUNC_SUBTRACT),
		3158	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2782	# undef const_iv	3159	# undef const_iv
2783	};	3160	};
2784		3161
2785	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3162	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2786	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3163	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2793	disable_GL_EXT_blend_func_separate ()	3170	disable_GL_EXT_blend_func_separate ()
2794	CODE:	3171	CODE:
2795	gl.BlendFuncSeparate = 0;	3172	gl.BlendFuncSeparate = 0;
2796	gl.BlendFuncSeparateEXT = 0;	3173	gl.BlendFuncSeparateEXT = 0;
2797		3174
		3175	void
		3176	apple_nvidia_bug (int enable)
		3177
2798	char *	3178	char *
2799	gl_vendor ()	3179	gl_vendor ()
2800	CODE:	3180	CODE:
2801	RETVAL = (char *)glGetString (GL_VENDOR);	3181	RETVAL = (char *)glGetString (GL_VENDOR);
2802	OUTPUT:	3182	OUTPUT:
…		…
2832		3212
2833	int glGetError ()	3213	int glGetError ()
2834		3214
2835	void glFinish ()	3215	void glFinish ()
2836		3216
		3217	void glFlush ()
		3218
2837	void glClear (int mask)	3219	void glClear (int mask)
2838		3220
2839	void glClearColor (float r, float g, float b, float a = 1.0)	3221	void glClearColor (float r, float g, float b, float a = 1.0)
2840	PROTOTYPE: @	3222	PROTOTYPE: @
2841		3223
…		…
2850	void glBlendFunc (int sfactor, int dfactor)	3232	void glBlendFunc (int sfactor, int dfactor)
2851		3233
2852	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3234	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2853	CODE:	3235	CODE:
2854	gl_BlendFuncSeparate (sa, da, saa, daa);	3236	gl_BlendFuncSeparate (sa, da, saa, daa);
		3237
		3238	# void glBlendEquation (int se)
2855		3239
2856	void glDepthMask (int flag)	3240	void glDepthMask (int flag)
2857		3241
2858	void glLogicOp (int opcode)	3242	void glLogicOp (int opcode)
2859		3243
…		…
2894	void glRotate (float angle, float x, float y, float z)	3278	void glRotate (float angle, float x, float y, float z)
2895	CODE:	3279	CODE:
2896	glRotatef (angle, x, y, z);	3280	glRotatef (angle, x, y, z);
2897		3281
2898	void glColor (float r, float g, float b, float a = 1.0)	3282	void glColor (float r, float g, float b, float a = 1.0)
		3283	PROTOTYPE: @
2899	ALIAS:	3284	ALIAS:
2900	glColor_premultiply = 1	3285	glColor_premultiply = 1
2901	CODE:	3286	CODE:
2902	if (ix)	3287	if (ix)
2903	{	3288	{
…		…
3008	void glNewList (int list, int mode = GL_COMPILE)	3393	void glNewList (int list, int mode = GL_COMPILE)
3009		3394
3010	void glEndList ()	3395	void glEndList ()
3011		3396
3012	void glCallList (int list)	3397	void glCallList (int list)
		3398
		3399	void c_init ()
		3400	CODE:
		3401	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3402	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3013		3403
3014	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3404	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3015		3405
3016	PROTOTYPES: DISABLE	3406	PROTOTYPES: DISABLE
3017		3407

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC vs. Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC vs.
Revision 1.306 by root, Thu Oct 14 00:02:39 2010 UTC