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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 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
90		104
91	static AV *texture_av;	105	static AV *texture_av;
92		106
93	static struct	107	static struct
94	{	108	{
…		…
226	int w, h;	240	int w, h;
227	float s, t;	241	float s, t;
228	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
229	tileid smoothtile;	243	tileid smoothtile;
230	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
231	} maptex;	246	} maptex;
232		247
233	typedef struct {	248	typedef struct {
234	uint32_t player;	249	uint32_t player;
235	tileid tile[3];	250	tileid tile[3];
…		…
367	self->oy = 0;	382	self->oy = 0;
368	self->row = 0;	383	self->row = 0;
369	self->rows = 0;	384	self->rows = 0;
370	}	385	}
371		386
		387	#define CELL_CLEAR(cell) \
		388	do { \
		389	if ((cell)->player) \
		390	(cell)->tile [2] = 0; \
		391	(cell)->darkness = 0; \
		392	(cell)->stat_hp = 0; \
		393	(cell)->flags = 0; \
		394	(cell)->player = 0; \
		395	} while (0)
		396
372	static void	397	static void
373	map_blank (DC__Map self, int x0, int y0, int w, int h)	398	map_blank (DC__Map self, int x0, int y0, int w, int h)
374	{	399	{
375	int x, y;	400	int x, y;
376	maprow *row;	401	maprow *row;
…		…
390	if (x >= row->c1)	415	if (x >= row->c1)
391	break;	416	break;
392		417
393	cell = row->col + x - row->c0;	418	cell = row->col + x - row->c0;
394		419
395	cell->darkness = 0;	420	CELL_CLEAR (cell);
396	cell->stat_hp = 0;
397	cell->flags = 0;
398	cell->player = 0;
399	}	421	}
400	}	422	}
401	}	423	}
402		424
403	typedef struct {	425	typedef struct {
…		…
514	if (!svp \|\| !SvTRUE (*svp))	536	if (!svp \|\| !SvTRUE (*svp))
515	return 0;	537	return 0;
516		538
517	return 1;	539	return 1;
518	}	540	}
		541
		542	/******************************************************************************/
		543
		544	/* process keyboard modifiers */
		545	static int
		546	mod_munge (int mod)
		547	{
		548	mod &= MOD_MASK;
		549
		550	if (mod & (KMOD_META \| KMOD_ALT))
		551	mod \|= KMOD_LRAM;
		552
		553	return mod;
		554	}
		555
		556	static void
		557	deliantra_main ()
		558	{
		559	char *argv[] = { 0 };
		560	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		561	}
		562
		563	#ifdef __MACOSX__
		564	/* to due surprising braindamage on the side of SDL design, we
		565	* do some mind-boggling hack here: SDL requires a custom main()
		566	* on OS X, so... we provide one and call the original main(), which,
		567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		568	* and which calls our main (== SDL_main) back.
		569	*/
		570	extern C_LINKAGE int
		571	main (int argc, char *argv[])
		572	{
		573	deliantra_main ();
		574	}
		575
		576	#undef main
		577
		578	extern C_LINKAGE int main (int argc, char *argv[]);
		579
		580	static void
		581	SDL_braino (void)
		582	{
		583	char *argv[] = { "deliantra client", 0 };
		584	(main) (1, argv);
		585	}
		586	#else
		587	static void
		588	SDL_braino (void)
		589	{
		590	deliantra_main ();
		591	}
		592	#endif
519		593
520	MODULE = Deliantra::Client PACKAGE = DC	594	MODULE = Deliantra::Client PACKAGE = DC
521		595
522	PROTOTYPES: ENABLE	596	PROTOTYPES: ENABLE
523		597
…		…
552	const_iv (SDL_USEREVENT),	626	const_iv (SDL_USEREVENT),
553		627
554	const_iv (SDL_APPINPUTFOCUS),	628	const_iv (SDL_APPINPUTFOCUS),
555	const_iv (SDL_APPMOUSEFOCUS),	629	const_iv (SDL_APPMOUSEFOCUS),
556	const_iv (SDL_APPACTIVE),	630	const_iv (SDL_APPACTIVE),
		631
		632
		633	const_iv (SDLK_UNKNOWN),
		634	const_iv (SDLK_FIRST),
		635	const_iv (SDLK_BACKSPACE),
		636	const_iv (SDLK_TAB),
		637	const_iv (SDLK_CLEAR),
		638	const_iv (SDLK_RETURN),
		639	const_iv (SDLK_PAUSE),
		640	const_iv (SDLK_ESCAPE),
		641	const_iv (SDLK_SPACE),
		642	const_iv (SDLK_EXCLAIM),
		643	const_iv (SDLK_QUOTEDBL),
		644	const_iv (SDLK_HASH),
		645	const_iv (SDLK_DOLLAR),
		646	const_iv (SDLK_AMPERSAND),
		647	const_iv (SDLK_QUOTE),
		648	const_iv (SDLK_LEFTPAREN),
		649	const_iv (SDLK_RIGHTPAREN),
		650	const_iv (SDLK_ASTERISK),
		651	const_iv (SDLK_PLUS),
		652	const_iv (SDLK_COMMA),
		653	const_iv (SDLK_MINUS),
		654	const_iv (SDLK_PERIOD),
		655	const_iv (SDLK_SLASH),
		656	const_iv (SDLK_0),
		657	const_iv (SDLK_1),
		658	const_iv (SDLK_2),
		659	const_iv (SDLK_3),
		660	const_iv (SDLK_4),
		661	const_iv (SDLK_5),
		662	const_iv (SDLK_6),
		663	const_iv (SDLK_7),
		664	const_iv (SDLK_8),
		665	const_iv (SDLK_9),
		666	const_iv (SDLK_COLON),
		667	const_iv (SDLK_SEMICOLON),
		668	const_iv (SDLK_LESS),
		669	const_iv (SDLK_EQUALS),
		670	const_iv (SDLK_GREATER),
		671	const_iv (SDLK_QUESTION),
		672	const_iv (SDLK_AT),
		673
		674	const_iv (SDLK_LEFTBRACKET),
		675	const_iv (SDLK_BACKSLASH),
		676	const_iv (SDLK_RIGHTBRACKET),
		677	const_iv (SDLK_CARET),
		678	const_iv (SDLK_UNDERSCORE),
		679	const_iv (SDLK_BACKQUOTE),
		680	const_iv (SDLK_DELETE),
557		681
558	const_iv (SDLK_FIRST),	682	const_iv (SDLK_FIRST),
559	const_iv (SDLK_LAST),	683	const_iv (SDLK_LAST),
560	const_iv (SDLK_KP0),	684	const_iv (SDLK_KP0),
561	const_iv (SDLK_KP1),	685	const_iv (SDLK_KP1),
…		…
637	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
638	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
639	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
640	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
641		765
		766	const_iv (KMOD_LRAM),
		767
642	const_iv (MIX_DEFAULT_FORMAT),	768	const_iv (MIX_DEFAULT_FORMAT),
643		769
644	const_iv (SDL_INIT_TIMER),	770	const_iv (SDL_INIT_TIMER),
645	const_iv (SDL_INIT_AUDIO),	771	const_iv (SDL_INIT_AUDIO),
646	const_iv (SDL_INIT_VIDEO),	772	const_iv (SDL_INIT_VIDEO),
647	const_iv (SDL_INIT_CDROM),	773	const_iv (SDL_INIT_CDROM),
648	const_iv (SDL_INIT_JOYSTICK),	774	const_iv (SDL_INIT_JOYSTICK),
649	const_iv (SDL_INIT_EVERYTHING),	775	const_iv (SDL_INIT_EVERYTHING),
650	const_iv (SDL_INIT_NOPARACHUTE),	776	const_iv (SDL_INIT_NOPARACHUTE),
651	const_iv (SDL_INIT_EVENTTHREAD),	777	const_iv (SDL_INIT_EVENTTHREAD),
		778
		779	const_iv (SDL_GL_RED_SIZE),
		780	const_iv (SDL_GL_GREEN_SIZE),
		781	const_iv (SDL_GL_BLUE_SIZE),
		782	const_iv (SDL_GL_ALPHA_SIZE),
		783	const_iv (SDL_GL_DOUBLEBUFFER),
		784	const_iv (SDL_GL_BUFFER_SIZE),
		785	const_iv (SDL_GL_DEPTH_SIZE),
		786	const_iv (SDL_GL_STENCIL_SIZE),
		787	const_iv (SDL_GL_ACCUM_RED_SIZE),
		788	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		789	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		790	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		791	const_iv (SDL_GL_STEREO),
		792	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		793	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		794	const_iv (SDL_GL_ACCELERATED_VISUAL),
		795	const_iv (SDL_GL_SWAP_CONTROL),
		796
		797	const_iv (FOW_DARKNESS)
652	# undef const_iv	798	# undef const_iv
653	};	799	};
654		800
655	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
656	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
677	NV ceil (NV x)	823	NV ceil (NV x)
678		824
679	IV minpot (UV n)	825	IV minpot (UV n)
680		826
681	IV popcount (UV n)	827	IV popcount (UV n)
		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
682		834
683	void	835	void
684	pango_init ()	836	pango_init ()
685	CODE:	837	CODE:
686	{	838	{
…		…
694	#endif	846	#endif
695	}	847	}
696		848
697	char *SDL_GetError ()	849	char *SDL_GetError ()
698		850
		851	void SDL_braino ()
		852
699	int SDL_Init (U32 flags)	853	int SDL_Init (U32 flags)
700		854
701	int SDL_InitSubSystem (U32 flags)	855	int SDL_InitSubSystem (U32 flags)
702		856
703	void SDL_QuitSubSystem (U32 flags)	857	void SDL_QuitSubSystem (U32 flags)
704		858
705	void SDL_Quit ()	859	void SDL_Quit ()
		860
		861	int SDL_GL_SetAttribute (int attr, int value)
		862
		863	int SDL_GL_GetAttribute (int attr)
		864	CODE:
		865	if (SDL_GL_GetAttribute (attr, &RETVAL))
		866	XSRETURN_UNDEF;
		867	OUTPUT:
		868	RETVAL
706		869
707	void	870	void
708	SDL_ListModes (int rgb, int alpha)	871	SDL_ListModes (int rgb, int alpha)
709	PPCODE:	872	PPCODE:
710	{	873	{
…		…
722	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	885	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
723	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	886	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
724	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	887	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
725		888
726	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	889	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
727	#if SDL_VERSION_ATLEAST(1,2,10)
728	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
729	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	890	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
730	#endif
731		891
732	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	892	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
733		893
734	if (m && m != (SDL_Rect **)-1)	894	if (m && m != (SDL_Rect **)-1)
735	while (*m)	895	while (*m)
736	{	896	{
		897	if ((m)->w >= 400 && (m)->h >= 300)
		898	{
737	AV *av = newAV ();	899	AV *av = newAV ();
738	av_push (av, newSViv ((*m)->w));	900	av_push (av, newSViv ((*m)->w));
739	av_push (av, newSViv ((*m)->h));	901	av_push (av, newSViv ((*m)->h));
740	av_push (av, newSViv (rgb));	902	av_push (av, newSViv (rgb));
741	av_push (av, newSViv (alpha));	903	av_push (av, newSViv (alpha));
742	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	904	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		905	}
743		906
744	++m;	907	++m;
745	}	908	}
746	}	909	}
747		910
…		…
767		930
768	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
769	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
770	#include "glfunc.h"	933	#include "glfunc.h"
771	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
772	}	938	}
773	}	939	}
774	OUTPUT:	940	OUTPUT:
775	RETVAL	941	RETVAL
776		942
…		…
802	{	968	{
803	case SDL_KEYDOWN:	969	case SDL_KEYDOWN:
804	case SDL_KEYUP:	970	case SDL_KEYUP:
805	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	971	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
806	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	972	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
807	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	973	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
808	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	974	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
809	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	975	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
810	break;	976	break;
811		977
812	case SDL_ACTIVEEVENT:	978	case SDL_ACTIVEEVENT:
813	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	979	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
831	x = ev.motion.x;	997	x = ev.motion.x;
832	y = ev.motion.y;	998	y = ev.motion.y;
833	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	999	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
834	}	1000	}
835		1001
836	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1002	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
837	hv_store (hv, "state", 5, newSViv (state), 0);	1003	hv_store (hv, "state", 5, newSViv (state), 0);
838	hv_store (hv, "x", 1, newSViv (x), 0);	1004	hv_store (hv, "x", 1, newSViv (x), 0);
839	hv_store (hv, "y", 1, newSViv (y), 0);	1005	hv_store (hv, "y", 1, newSViv (y), 0);
840	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1006	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
841	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1007	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
861		1027
862	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
863	}	1029	}
864	}	1030	}
865		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
		1044
866	int	1045	int
867	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
868	POSTCALL:	1047	POSTCALL:
869	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
870	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
932	add_font (char *file)	1111	add_font (char *file)
933	CODE:	1112	CODE:
934	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935	OUTPUT:	1114	OUTPUT:
936	RETVAL	1115	RETVAL
		1116
		1117	void
		1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
937		1119
938	void	1120	void
939	load_image_inline (SV *image_)	1121	load_image_inline (SV *image_)
940	ALIAS:	1122	ALIAS:
941	load_image_file = 1	1123	load_image_file = 1
…		…
1057	#if DEBUG	1239	#if DEBUG
1058	VALGRIND_DO_LEAK_CHECK;	1240	VALGRIND_DO_LEAK_CHECK;
1059	#endif	1241	#endif
1060	}	1242	}
1061		1243
		1244	int
		1245	SvREFCNT (SV *sv)
		1246	CODE:
		1247	RETVAL = SvREFCNT (sv);
		1248	OUTPUT:
		1249	RETVAL
		1250
1062	MODULE = Deliantra::Client PACKAGE = DC::Font	1251	MODULE = Deliantra::Client PACKAGE = DC::Font
1063		1252
1064	PROTOTYPES: DISABLE	1253	PROTOTYPES: DISABLE
1065		1254
1066	DC::Font	1255	DC::Font
…		…
1495	if (ix)	1684	if (ix)
1496	{	1685	{
1497	glDisable (GL_ALPHA_TEST);	1686	glDisable (GL_ALPHA_TEST);
1498	glDisable (GL_BLEND);	1687	glDisable (GL_BLEND);
1499	}	1688	}
		1689	}
		1690
		1691	void
		1692	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)
		1693	PROTOTYPE: @
		1694	CODE:
		1695	{
		1696	glEnable (GL_BLEND);
		1697	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1698	glEnable (GL_TEXTURE_2D);
		1699	glBindTexture (GL_TEXTURE_2D, name1);
		1700
		1701	glColor3f (intensity, intensity, intensity);
		1702	glPushMatrix ();
		1703	glScalef (1./3, 1./3, 1.);
		1704
		1705	if (blend > 0.f)
		1706	{
		1707	float dx3 = dx * -3.f / w;
		1708	float dy3 = dy * -3.f / h;
		1709	GLfloat env_color[4] = { 0., 0., 0., blend };
		1710
		1711	/* interpolate the two shadow textures */
		1712	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1713	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1714
		1715	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1716	gl.ActiveTexture (GL_TEXTURE1);
		1717	glEnable (GL_TEXTURE_2D);
		1718	glBindTexture (GL_TEXTURE_2D, name2);
		1719	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1720
		1721	/* rgb == rgb(glcolor) */
		1722	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1723	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1724	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1725
		1726	/* alpha = interpolate t0, t1 by env_alpha */
		1727	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1728
		1729	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1730	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1732
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1735
		1736	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1737	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1738
		1739	glBegin (GL_QUADS);
		1740	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1741	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1742	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1743	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1744	glEnd ();
		1745
		1746	glDisable (GL_TEXTURE_2D);
		1747	gl.ActiveTexture (GL_TEXTURE0);
		1748	}
		1749	else
		1750	{
		1751	/* simple blending of one texture, also opengl <1.3 path */
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1753
		1754	glBegin (GL_QUADS);
		1755	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1756	glTexCoord2f (0, t); glVertex2f (0, h);
		1757	glTexCoord2f (s, t); glVertex2f (w, h);
		1758	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1759	glEnd ();
		1760	}
		1761
		1762	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1763	{
		1764	int x, y;
		1765	int dx3 = dx * 3;
		1766	int dy3 = dy * 3;
		1767
		1768	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1769	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1770	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1771	glTranslatef (-1., -1., 0);
		1772	glBegin (GL_QUADS);
		1773
		1774	for (y = 1; y < h; y += 3)
		1775	{
		1776	int y1 = y - dy3;
		1777	int y1valid = y1 >= 0 && y1 < h;
		1778
		1779	for (x = 1; x < w; x += 3)
		1780	{
		1781	int x1 = x - dx3;
		1782	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1783	uint8_t h2;
		1784
		1785	if (y1valid && x1 >= 0 && x1 < w)
		1786	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1787	else
		1788	h2 = 1; /* out of range == invisible */
		1789
		1790	if (h1 \|\| h2)
		1791	{
		1792	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1793	glColor4f (1., 1., 1., alpha);
		1794
		1795	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1796	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1797	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1798	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1799	}
		1800	}
		1801	}
		1802	}
		1803
		1804	glEnd ();
		1805
		1806	glPopMatrix ();
		1807
		1808	glDisable (GL_TEXTURE_2D);
		1809	glDisable (GL_BLEND);
1500	}	1810	}
1501		1811
1502	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1812	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1503	CODE:	1813	CODE:
1504	{	1814	{
…		…
1610	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1920	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1611	// use uglier nearest interpolation because linear suffers	1921	// use uglier nearest interpolation because linear suffers
1612	// from transparent color bleeding and ugly wrapping effects.	1922	// from transparent color bleeding and ugly wrapping effects.
1613	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1923	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1614	}	1924	}
		1925
		1926	void
		1927	expire_textures (DC::Map self, int texid, int count)
		1928	PPCODE:
		1929	for (; texid < self->texs && count; ++texid, --count)
		1930	{
		1931	maptex *tex = self->tex + texid;
		1932
		1933	if (tex->name)
		1934	{
		1935	if (tex->unused)
		1936	{
		1937	tex->name = 0;
		1938	tex->unused = 0;
		1939	XPUSHs (sv_2mortal (newSViv (texid)));
		1940	}
		1941	else
		1942	tex->unused = 1;
		1943	}
		1944	}
1615		1945
1616	int	1946	int
1617	ox (DC::Map self)	1947	ox (DC::Map self)
1618	ALIAS:	1948	ALIAS:
1619	oy = 1	1949	oy = 1
…		…
1700	{	2030	{
1701	ext = *data++;	2031	ext = *data++;
1702	cmd = ext & 0x7f;	2032	cmd = ext & 0x7f;
1703		2033
1704	if (cmd < 4)	2034	if (cmd < 4)
1705	cell->darkness = 255 - ext * 64 + 1;	2035	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1706	else if (cmd == 5) // health	2036	else if (cmd == 5) // health
1707	{	2037	{
1708	cell->stat_width = 1;	2038	cell->stat_width = 1;
1709	cell->stat_hp = *data++;	2039	cell->stat_hp = *data++;
1710	}	2040	}
…		…
1740	cell->tile [z] = self->face2tile [face];	2070	cell->tile [z] = self->face2tile [face];
1741		2071
1742	if (cell->tile [z])	2072	if (cell->tile [z])
1743	{	2073	{
1744	maptex *tex = self->tex + cell->tile [z];	2074	maptex *tex = self->tex + cell->tile [z];
		2075	tex->unused = 0;
1745	if (!tex->name)	2076	if (!tex->name)
1746	av_push (missing, newSViv (cell->tile [z]));	2077	av_push (missing, newSViv (cell->tile [z]));
1747		2078
1748	if (tex->smoothtile)	2079	if (tex->smoothtile)
1749	{	2080	{
1750	maptex *smooth = self->tex + tex->smoothtile;	2081	maptex *smooth = self->tex + tex->smoothtile;
		2082	smooth->unused = 0;
1751	if (!smooth->name)	2083	if (!smooth->name)
1752	av_push (missing, newSViv (tex->smoothtile));	2084	av_push (missing, newSViv (tex->smoothtile));
1753	}	2085	}
1754	}	2086	}
1755	}	2087	}
1756	}	2088	}
1757	else	2089	else
1758	cell->darkness = 0;	2090	CELL_CLEAR (cell);
1759	}	2091	}
1760	}	2092	}
1761	OUTPUT:	2093	OUTPUT:
1762	RETVAL	2094	RETVAL
1763		2095
…		…
1815	}	2147	}
1816	OUTPUT:	2148	OUTPUT:
1817	RETVAL	2149	RETVAL
1818		2150
1819	void	2151	void
1820	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)	2152	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1821	CODE:	2153	CODE:
1822	{	2154	{
1823	int x, y, z;	2155	int x, y, z;
1824		2156
1825	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2157	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1826	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2158	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1827	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2159	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1828	smooth_key skey;	2160	smooth_key skey;
1829	int pl_x, pl_y;	2161	int pl_x, pl_y;
1830	maptex pl_tex;	2162	maptex pl_tex;
1831	rc_t *rc = rc_alloc ();	2163	rc_t *rc = rc_alloc ();
		2164	rc_t *rc_ov = rc_alloc ();
1832	rc_key_t key;	2165	rc_key_t key;
1833	rc_array_t *arr;	2166	rc_array_t *arr;
1834		2167
1835	pl_tex.name = 0;	2168	pl_tex.name = 0;
1836		2169
1837	// thats current max. sorry.	2170	// that's current max. sorry.
1838	if (sw > 255) sw = 255;	2171	if (sw > 255) sw = 255;
1839	if (sh > 255) sh = 255;	2172	if (sh > 255) sh = 255;
1840		2173
1841	// clear key, in case of extra padding	2174	// clear key, in case of extra padding
1842	memset (&skey, 0, sizeof (skey));	2175	memset (&skey, 0, sizeof (skey));
…		…
1846	key.g = 255;	2179	key.g = 255;
1847	key.b = 255;	2180	key.b = 255;
1848	key.a = 255;	2181	key.a = 255;
1849	key.mode = GL_QUADS;	2182	key.mode = GL_QUADS;
1850	key.format = GL_T2F_V3F;	2183	key.format = GL_T2F_V3F;
1851	key.texname = -1;
1852		2184
1853	mx += self->x;	2185	mx += self->x;
1854	my += self->y;	2186	my += self->y;
1855		2187
1856	// first pass: determine smooth_max	2188	// first pass: determine smooth_max
…		…
1880	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2212	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881		2213
1882	for (z = 0; z <= 2; z++)	2214	for (z = 0; z <= 2; z++)
1883	{	2215	{
1884	memset (smooth_level, 0, sizeof (smooth_level));	2216	memset (smooth_level, 0, sizeof (smooth_level));
		2217	key.texname = -1;
1885		2218
1886	for (y = 0; y < sh; y++)	2219	for (y = 0; y < sh; y++)
1887	if (0 <= y + my && y + my < self->rows)	2220	if (0 <= y + my && y + my < self->rows)
1888	{	2221	{
1889	maprow *row = self->row + (y + my);	2222	maprow *row = self->row + (y + my);
…		…
1895	tileid tile = cell->tile [z];	2228	tileid tile = cell->tile [z];
1896		2229
1897	if (tile)	2230	if (tile)
1898	{	2231	{
1899	maptex tex = self->tex [tile];	2232	maptex tex = self->tex [tile];
1900	int px = (x + 1) * T - tex.w;	2233	int px, py;
1901	int py = (y + 1) * T - tex.h;
1902		2234
1903	if (key.texname != tex.name)	2235	if (key.texname != tex.name)
1904	{	2236	{
		2237	self->tex [tile].unused = 0;
		2238
1905	if (!tex.name)	2239	if (!tex.name)
1906	tex = self->tex [2]; /* missing, replace by noface */	2240	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907		2241
1908	key.texname = tex.name;	2242	key.texname = tex.name;
1909	arr = rc_array (rc, &key);	2243	arr = rc_array (rc, &key);
1910	}	2244	}
		2245
		2246	px = (x + 1) * T - tex.w;
		2247	py = (y + 1) * T - tex.h;
1911		2248
1912	if (expect_false (cell->player == player) && expect_false (z == 2))	2249	if (expect_false (cell->player == player) && expect_false (z == 2))
1913	{	2250	{
1914	pl_x = px;	2251	pl_x = px;
1915	pl_y = py;	2252	pl_y = py;
…		…
1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2257	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2258	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2259	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2260	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924		2261
1925	if (expect_false (cell->flags) && expect_false (z == 2))
1926	{
1927	// overlays such as the speech bubble, probably more to come
1928	if (cell->flags & 1)
1929	{
1930	maptex tex = self->tex [1];
1931	int px = x * T + T * 2 / 32;
1932	int py = y * T - T * 6 / 32;
1933
1934	if (tex.name)
1935	{
1936	if (key.texname != tex.name)
1937	{
1938	key.texname = tex.name;
1939	arr = rc_array (rc, &key);
1940	}
1941
1942	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946	}
1947	}
1948	}
1949
1950	// update smooth hash	2262	// update smooth hash
1951	if (tex.smoothtile)	2263	if (tex.smoothtile)
1952	{	2264	{
1953	skey.tile = tex.smoothtile;	2265	skey.tile = tex.smoothtile;
1954	skey.level = tex.smoothlevel;	2266	skey.level = tex.smoothlevel;
…		…
1982	// corners	2294	// corners
1983	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2295	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1984	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2296	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1985	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2297	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1986	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2298	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2299	}
		2300	}
		2301
		2302	if (expect_false (z == 2) && expect_false (cell->flags))
		2303	{
		2304	// overlays such as the speech bubble, probably more to come
		2305	if (cell->flags & 1)
		2306	{
		2307	rc_key_t key_ov = key;
		2308	maptex tex = self->tex [TEXID_SPEECH];
		2309	rc_array_t *arr;
		2310	int px = x * T + T * 2 / 32;
		2311	int py = y * T - T * 6 / 32;
		2312
		2313	key_ov.texname = tex.name;
		2314	arr = rc_array (rc_ov, &key_ov);
		2315
		2316	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2317	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2318	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2319	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1987	}	2320	}
1988	}	2321	}
1989	}	2322	}
1990	}	2323	}
1991		2324
…		…
2031	{	2364	{
2032	// this time avoiding texture state changes	2365	// this time avoiding texture state changes
2033	// save gobs of state changes.	2366	// save gobs of state changes.
2034	if (key.texname != tex.name)	2367	if (key.texname != tex.name)
2035	{	2368	{
		2369	self->tex [skey->tile].unused = 0;
		2370
2036	glEnd ();	2371	glEnd ();
2037	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2372	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038	glBegin (GL_QUADS);	2373	glBegin (GL_QUADS);
2039	}	2374	}
2040		2375
…		…
2072	}	2407	}
2073		2408
2074	if (pl_tex.name)	2409	if (pl_tex.name)
2075	{	2410	{
2076	maptex tex = pl_tex;	2411	maptex tex = pl_tex;
2077	int px = pl_x + pdx;	2412	int px = pl_x + sdx;
2078	int py = pl_y + pdy;	2413	int py = pl_y + sdy;
2079		2414
2080	key.texname = tex.name;	2415	key.texname = tex.name;
2081	arr = rc_array (rc, &key);	2416	arr = rc_array (rc, &key);
2082		2417
2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2418	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
…		…
2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2421	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087		2422
2088	rc_draw (rc);	2423	rc_draw (rc);
2089	}	2424	}
2090		2425
		2426	rc_draw (rc_ov);
		2427	rc_clear (rc_ov);
		2428
2091	glDisable (GL_BLEND);	2429	glDisable (GL_BLEND);
2092	rc_free (rc);	2430	rc_free (rc);
		2431	rc_free (rc_ov);
2093		2432
2094	// top layer: overlays such as the health bar	2433	// top layer: overlays such as the health bar
2095	for (y = 0; y < sh; y++)	2434	for (y = 0; y < sh; y++)
2096	if (0 <= y + my && y + my < self->rows)	2435	if (0 <= y + my && y + my < self->rows)
2097	{	2436	{
…		…
2102	{	2441	{
2103	mapcell *cell = row->col + (x + mx - row->c0);	2442	mapcell *cell = row->col + (x + mx - row->c0);
2104		2443
2105	int px = x * T;	2444	int px = x * T;
2106	int py = y * T;	2445	int py = y * T;
		2446
		2447	if (expect_false (cell->player == player))
		2448	{
		2449	px += sdx;
		2450	py += sdy;
		2451	}
2107		2452
2108	if (cell->stat_hp)	2453	if (cell->stat_hp)
2109	{	2454	{
2110	int width = cell->stat_width * T;	2455	int width = cell->stat_width * T;
2111	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2456	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2122	}	2467	}
2123	}	2468	}
2124	}	2469	}
2125		2470
2126	void	2471	void
2127	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2472	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2128	CODE:	2473	CODE:
2129	{	2474	{
2130	static float color[16][3] = {	2475	static float color[16][3] = {
2131	{ 0.00F, 0.00F, 0.00F },	2476	{ 0.00f, 0.00f, 0.00f },
2132	{ 1.00F, 1.00F, 1.00F },	2477	{ 1.00f, 1.00f, 1.00f },
2133	{ 0.00F, 0.00F, 0.55F },	2478	{ 0.00f, 0.00f, 0.55f },
2134	{ 1.00F, 0.00F, 0.00F },	2479	{ 1.00f, 0.00f, 0.00f },
2135		2480
2136	{ 1.00F, 0.54F, 0.00F },	2481	{ 1.00f, 0.54f, 0.00f },
2137	{ 0.11F, 0.56F, 1.00F },	2482	{ 0.11f, 0.56f, 1.00f },
2138	{ 0.93F, 0.46F, 0.00F },	2483	{ 0.93f, 0.46f, 0.00f },
2139	{ 0.18F, 0.54F, 0.34F },	2484	{ 0.18f, 0.54f, 0.34f },
2140		2485
2141	{ 0.56F, 0.73F, 0.56F },	2486	{ 0.56f, 0.73f, 0.56f },
2142	{ 0.80F, 0.80F, 0.80F },	2487	{ 0.80f, 0.80f, 0.80f },
2143	{ 0.55F, 0.41F, 0.13F },	2488	{ 0.55f, 0.41f, 0.13f },
2144	{ 0.99F, 0.77F, 0.26F },	2489	{ 0.99f, 0.77f, 0.26f },
2145		2490
2146	{ 0.74F, 0.65F, 0.41F },	2491	{ 0.74f, 0.65f, 0.41f },
2147		2492
2148	{ 0.00F, 1.00F, 1.00F },	2493	{ 0.00f, 1.00f, 1.00f },
2149	{ 1.00F, 0.00F, 1.00F },	2494	{ 1.00f, 0.00f, 1.00f },
2150	{ 1.00F, 1.00F, 0.00F },	2495	{ 1.00f, 1.00f, 0.00f },
2151	};	2496	};
2152		2497
2153	int x, y;	2498	int x, y;
2154		2499
2155	glEnable (GL_TEXTURE_2D);	2500	glEnable (GL_TEXTURE_2D);
		2501	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2502	* but the nvidia driver (185.18.14) mishandles alpha textures
		2503	* and takes the colour from god knows where instead of using
		2504	* Cp. MODULATE results in the same colour, but slightly different
		2505	* alpha, but atcually gives us the correct colour with nvidia.
		2506	*/
2156	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157	glEnable (GL_BLEND);	2508	glEnable (GL_BLEND);
2158	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2509	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159	glBegin (GL_QUADS);	2510	glBegin (GL_QUADS);
2160		2511
2161	for (y = 0; y < h; y++)	2512	for (y = 0; y < h; y++)
…		…
2165		2516
2166	if (m)	2517	if (m)
2167	{	2518	{
2168	float *c = color [m & 15];	2519	float *c = color [m & 15];
2169		2520
2170	float tx1 = m & 0x40 ? 0.5 : 0.;	2521	float tx1 = m & 0x40 ? 0.5f : 0.f;
2171	float tx2 = tx1 + 0.5;	2522	float tx2 = tx1 + 0.5f;
2172		2523
2173	glColor4f (c[0], c[1], c[2], 0.75);	2524	glColor4f (c[0], c[1], c[2], 1);
2174	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2525	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2526	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2527	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2528	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178	}	2529	}
…		…
2186	void	2537	void
2187	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2538	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2188	PPCODE:	2539	PPCODE:
2189	{	2540	{
2190	int x, y;	2541	int x, y;
2191	int sw1 = sw + 2;	2542	int sw1 = sw + 2;
2192	int sh1 = sh + 2;	2543	int sh1 = sh + 2;
2193	int sh3 = sh * 3;	2544	int sh3 = sh * 3;
2194	int sw34 = (sw * 3 + 3) & ~3;	2545	int sw3 = sw * 3;
2195	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2546	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2196	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2547	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2197	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2548	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2198		2549
2199	SvPOK_only (darkness3_sv);	2550	SvPOK_only (darkness3_sv);
2200	SvCUR_set (darkness3_sv, sw34 * sh3);	2551	SvCUR_set (darkness3_sv, sw3 * sh3);
2201		2552
2202	mx += self->x - 1;	2553	mx += self->x - 1;
2203	my += self->y - 1;	2554	my += self->y - 1;
2204
2205	memset (darkness1, 255, sw1 * sh1);
2206		2555
2207	for (y = 0; y < sh1; y++)	2556	for (y = 0; y < sh1; y++)
2208	if (0 <= y + my && y + my < self->rows)	2557	if (0 <= y + my && y + my < self->rows)
2209	{	2558	{
2210	maprow *row = self->row + (y + my);	2559	maprow *row = self->row + (y + my);
…		…
2213	if (row->c0 <= x + mx && x + mx < row->c1)	2562	if (row->c0 <= x + mx && x + mx < row->c1)
2214	{	2563	{
2215	mapcell *cell = row->col + (x + mx - row->c0);	2564	mapcell *cell = row->col + (x + mx - row->c0);
2216		2565
2217	darkness1 [y * sw1 + x] = cell->darkness	2566	darkness1 [y * sw1 + x] = cell->darkness
2218	? 255 - (cell->darkness - 1)	2567	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2219	: 255 - FOW_DARKNESS;	2568	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2220	}	2569	}
2221	}	2570	}
2222		2571
2223	for (y = 0; y < sh; ++y)	2572	for (y = 0; y < sh; ++y)
2224	for (x = 0; x < sw; ++x)	2573	for (x = 0; x < sw; ++x)
…		…
2243		2592
2244	uint8_t r13 = (d13 + d23 + d12) / 3;	2593	uint8_t r13 = (d13 + d23 + d12) / 3;
2245	uint8_t r23 = d23;	2594	uint8_t r23 = d23;
2246	uint8_t r33 = (d23 + d33 + d32) / 3;	2595	uint8_t r33 = (d23 + d33 + d32) / 3;
2247		2596
2248	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2597	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2249	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2598	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2250	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2599	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2251	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2600	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2252	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2601	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2253	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2602	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2254	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2603	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2255	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2604	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2256	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2605	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2257	}	2606	}
2258		2607
2259	free (darkness1);	2608	free (darkness1);
2260		2609
2261	EXTEND (SP, 3);	2610	EXTEND (SP, 3);
2262	PUSHs (sv_2mortal (newSViv (sw34)));	2611	PUSHs (sv_2mortal (newSViv (sw3)));
2263	PUSHs (sv_2mortal (newSViv (sh3)));	2612	PUSHs (sv_2mortal (newSViv (sh3)));
2264	PUSHs (darkness3_sv);	2613	PUSHs (darkness3_sv);
2265	}	2614	}
2266		2615
2267	SV *	2616	SV *
…		…
2465	if (RETVAL < 0)	2814	if (RETVAL < 0)
2466	{	2815	{
2467	RETVAL = Mix_GroupOldest (-1);	2816	RETVAL = Mix_GroupOldest (-1);
2468		2817
2469	if (RETVAL < 0)	2818	if (RETVAL < 0)
		2819	{
		2820	// happens sometimes, maybe it just stopped playing(?)
		2821	RETVAL = Mix_GroupAvailable (-1);
		2822
		2823	if (RETVAL < 0)
2470	XSRETURN_UNDEF;	2824	XSRETURN_UNDEF;
2471		2825	}
		2826	else
2472	Mix_HaltChannel (RETVAL);	2827	Mix_HaltChannel (RETVAL);
2473	}	2828	}
2474		2829
2475	Mix_UnregisterAllEffects (RETVAL);	2830	Mix_UnregisterAllEffects (RETVAL);
2476	Mix_Volume (RETVAL, 128);	2831	Mix_Volume (RETVAL, 128);
2477	}	2832	}
…		…
2524	void	2879	void
2525	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2880	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2526	CODE:	2881	CODE:
2527	{	2882	{
2528	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2883	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2529	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2884	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2530	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2885	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2531	}	2886	}
2532		2887
2533	void	2888	void
2534	set_reverse_stereo (DC::Channel self, int flip)	2889	set_reverse_stereo (DC::Channel self, int flip)
…		…
2536	Mix_SetReverseStereo (self, flip);	2891	Mix_SetReverseStereo (self, flip);
2537		2892
2538	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2893	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2539		2894
2540	PROTOTYPES: DISABLE	2895	PROTOTYPES: DISABLE
		2896
		2897	void
		2898	decoders ()
		2899	PPCODE:
		2900	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2901	int i, num = Mix_GetNumChunkDecoders ();
		2902	EXTEND (SP, num);
		2903	for (i = 0; i < num; ++i)
		2904	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2905	#else
		2906	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2907	#endif
2541		2908
2542	DC::MixChunk	2909	DC::MixChunk
2543	new (SV *class, DC::RW rwops)	2910	new (SV *class, DC::RW rwops)
2544	CODE:	2911	CODE:
2545	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2578	OUTPUT:	2945	OUTPUT:
2579	RETVAL	2946	RETVAL
2580		2947
2581	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2948	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2582		2949
		2950	void
		2951	decoders ()
		2952	PPCODE:
		2953	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2954	int i, num = Mix_GetNumMusicDecoders ();
		2955	EXTEND (SP, num);
		2956	for (i = 0; i < num; ++i)
		2957	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2958	#else
		2959	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2960	#endif
		2961
2583	int	2962	int
2584	volume (int volume = -1)	2963	volume (int volume = -1)
2585	PROTOTYPE: ;$	2964	PROTOTYPE: ;$
2586	CODE:	2965	CODE:
2587	if (items > 0)	2966	if (items > 0)
…		…
2597		2976
2598	void	2977	void
2599	halt ()	2978	halt ()
2600	CODE:	2979	CODE:
2601	Mix_HaltMusic ();	2980	Mix_HaltMusic ();
		2981
		2982	int
		2983	playing ()
		2984	CODE:
		2985	RETVAL = Mix_PlayingMusic ();
		2986	OUTPUT:
		2987	RETVAL
2602		2988
2603	DC::MixMusic	2989	DC::MixMusic
2604	new (SV *class, DC::RW rwops)	2990	new (SV *class, DC::RW rwops)
2605	CODE:	2991	CODE:
2606	RETVAL = Mix_LoadMUS_RW (rwops);	2992	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2637	} *civ, const_iv[] = {	3023	} *civ, const_iv[] = {
2638	# define const_iv(name) { # name, (IV)name }	3024	# define const_iv(name) { # name, (IV)name }
2639	const_iv (GL_VENDOR),	3025	const_iv (GL_VENDOR),
2640	const_iv (GL_VERSION),	3026	const_iv (GL_VERSION),
2641	const_iv (GL_EXTENSIONS),	3027	const_iv (GL_EXTENSIONS),
		3028	const_iv (GL_MAX_TEXTURE_UNITS),
2642	const_iv (GL_COLOR_MATERIAL),	3029	const_iv (GL_COLOR_MATERIAL),
2643	const_iv (GL_SMOOTH),	3030	const_iv (GL_SMOOTH),
2644	const_iv (GL_FLAT),	3031	const_iv (GL_FLAT),
2645	const_iv (GL_DITHER),	3032	const_iv (GL_DITHER),
2646	const_iv (GL_BLEND),	3033	const_iv (GL_BLEND),
…		…
2658	const_iv (GL_ZERO),	3045	const_iv (GL_ZERO),
2659	const_iv (GL_SRC_ALPHA),	3046	const_iv (GL_SRC_ALPHA),
2660	const_iv (GL_DST_ALPHA),	3047	const_iv (GL_DST_ALPHA),
2661	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3048	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662	const_iv (GL_ONE_MINUS_DST_ALPHA),	3049	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3050	const_iv (GL_SRC_COLOR),
		3051	const_iv (GL_DST_COLOR),
		3052	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3053	const_iv (GL_ONE_MINUS_DST_COLOR),
2663	const_iv (GL_SRC_ALPHA_SATURATE),	3054	const_iv (GL_SRC_ALPHA_SATURATE),
2664	const_iv (GL_RGB),	3055	const_iv (GL_RGB),
2665	const_iv (GL_RGBA),	3056	const_iv (GL_RGBA),
2666	const_iv (GL_RGBA4),	3057	const_iv (GL_RGBA4),
2667	const_iv (GL_RGBA8),	3058	const_iv (GL_RGBA8),
…		…
2735	const_iv (GL_NICEST),	3126	const_iv (GL_NICEST),
2736	const_iv (GL_V2F),	3127	const_iv (GL_V2F),
2737	const_iv (GL_V3F),	3128	const_iv (GL_V3F),
2738	const_iv (GL_T2F_V3F),	3129	const_iv (GL_T2F_V3F),
2739	const_iv (GL_T2F_N3F_V3F),	3130	const_iv (GL_T2F_N3F_V3F),
		3131	const_iv (GL_FUNC_ADD),
		3132	const_iv (GL_FUNC_SUBTRACT),
		3133	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740	# undef const_iv	3134	# undef const_iv
2741	};	3135	};
2742		3136
2743	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3137	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2744	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3138	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2751	disable_GL_EXT_blend_func_separate ()	3145	disable_GL_EXT_blend_func_separate ()
2752	CODE:	3146	CODE:
2753	gl.BlendFuncSeparate = 0;	3147	gl.BlendFuncSeparate = 0;
2754	gl.BlendFuncSeparateEXT = 0;	3148	gl.BlendFuncSeparateEXT = 0;
2755		3149
		3150	void
		3151	apple_nvidia_bug (int enable)
		3152
2756	char *	3153	char *
2757	gl_vendor ()	3154	gl_vendor ()
2758	CODE:	3155	CODE:
2759	RETVAL = (char *)glGetString (GL_VENDOR);	3156	RETVAL = (char *)glGetString (GL_VENDOR);
2760	OUTPUT:	3157	OUTPUT:
…		…
2790		3187
2791	int glGetError ()	3188	int glGetError ()
2792		3189
2793	void glFinish ()	3190	void glFinish ()
2794		3191
		3192	void glFlush ()
		3193
2795	void glClear (int mask)	3194	void glClear (int mask)
2796		3195
2797	void glClearColor (float r, float g, float b, float a = 1.0)	3196	void glClearColor (float r, float g, float b, float a = 1.0)
2798	PROTOTYPE: @	3197	PROTOTYPE: @
2799		3198
…		…
2808	void glBlendFunc (int sfactor, int dfactor)	3207	void glBlendFunc (int sfactor, int dfactor)
2809		3208
2810	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3209	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811	CODE:	3210	CODE:
2812	gl_BlendFuncSeparate (sa, da, saa, daa);	3211	gl_BlendFuncSeparate (sa, da, saa, daa);
		3212
		3213	# void glBlendEquation (int se)
2813		3214
2814	void glDepthMask (int flag)	3215	void glDepthMask (int flag)
2815		3216
2816	void glLogicOp (int opcode)	3217	void glLogicOp (int opcode)
2817		3218
…		…
2852	void glRotate (float angle, float x, float y, float z)	3253	void glRotate (float angle, float x, float y, float z)
2853	CODE:	3254	CODE:
2854	glRotatef (angle, x, y, z);	3255	glRotatef (angle, x, y, z);
2855		3256
2856	void glColor (float r, float g, float b, float a = 1.0)	3257	void glColor (float r, float g, float b, float a = 1.0)
		3258	PROTOTYPE: @
2857	ALIAS:	3259	ALIAS:
2858	glColor_premultiply = 1	3260	glColor_premultiply = 1
2859	CODE:	3261	CODE:
2860	if (ix)	3262	if (ix)
2861	{	3263	{
…		…
2966	void glNewList (int list, int mode = GL_COMPILE)	3368	void glNewList (int list, int mode = GL_COMPILE)
2967		3369
2968	void glEndList ()	3370	void glEndList ()
2969		3371
2970	void glCallList (int list)	3372	void glCallList (int list)
		3373
		3374	void c_init ()
		3375	CODE:
		3376	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3377	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2971		3378
2972	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3379	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2973		3380
2974	PROTOTYPES: DISABLE	3381	PROTOTYPES: DISABLE
2975		3382

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC vs. Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.263 by root, Fri Jul 18 21:18:42 2008 UTC vs.
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC