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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
…		…
65	# include <netinet/in.h>	70	# include <netinet/in.h>
66	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
67	# include <inttypes.h>	72	# include <inttypes.h>
68	#endif	73	#endif
69		74
		75	#if __GNUC__ >= 4
		76	# define expect(expr,value) __builtin_expect ((expr),(value))
		77	#else
		78	# define expect(expr,value) (expr)
		79	#endif
		80
		81	#define expect_false(expr) expect ((expr) != 0, 0)
		82	#define expect_true(expr) expect ((expr) != 0, 1)
		83
70	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71		85
72	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 64
		87	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */
73		88
74	#define MAP_EXTEND_X 32	89	#define MAP_EXTEND_X 32
75	#define MAP_EXTEND_Y 512	90	#define MAP_EXTEND_Y 512
76		91
77	#define MIN_FONT_HEIGHT 10	92	#define MIN_FONT_HEIGHT 10
78		93
79	/* mask out modifiers we are not interested in */	94	/* mask out modifiers we are not interested in */
80	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	95	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
81		96
82	#if 0	97	#define KMOD_LRAM 0x10000 // our extension
83	# define PARACHUTE SDL_INIT_NOPARACHUTE	98
84	#else	99	#define TEXID_SPEECH 1
85	# define PARACHUTE 0	100	#define TEXID_NOFACE 2
86	#endif	101	#define TEXID_HIDDEN 3
87		102
88	static AV *texture_av;	103	static AV *texture_av;
89		104
90	static struct	105	static struct
91	{	106	{
…		…
185		200
186	static void	201	static void
187	layout_update_font (DC__Layout self)	202	layout_update_font (DC__Layout self)
188	{	203	{
189	/* use a random scale factor to account for unknown descenders, 0.8 works	204	/* use a random scale factor to account for unknown descenders, 0.8 works
190	* reasonably well with bitstream vera	205	* reasonably well with dejavu/bistream fonts
191	*/	206	*/
192	PangoFontDescription *font = self->font ? self->font : default_font;	207	PangoFontDescription *font = self->font ? self->font : default_font;
193		208
194	pango_font_description_set_absolute_size (font,	209	pango_font_description_set_absolute_size (font,
195	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	210	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
223	int w, h;	238	int w, h;
224	float s, t;	239	float s, t;
225	uint8_t r, g, b, a;	240	uint8_t r, g, b, a;
226	tileid smoothtile;	241	tileid smoothtile;
227	uint8_t smoothlevel;	242	uint8_t smoothlevel;
		243	uint8_t unused; /* set to zero on use */
228	} maptex;	244	} maptex;
229		245
230	typedef struct {	246	typedef struct {
231	uint32_t player;	247	uint32_t player;
232	tileid tile[3];	248	tileid tile[3];
…		…
364	self->oy = 0;	380	self->oy = 0;
365	self->row = 0;	381	self->row = 0;
366	self->rows = 0;	382	self->rows = 0;
367	}	383	}
368		384
		385	#define CELL_CLEAR(cell) \
		386	do { \
		387	if ((cell)->player) \
		388	(cell)->tile [2] = 0; \
		389	(cell)->darkness = 0; \
		390	(cell)->stat_hp = 0; \
		391	(cell)->flags = 0; \
		392	(cell)->player = 0; \
		393	} while (0)
		394
369	static void	395	static void
370	map_blank (DC__Map self, int x0, int y0, int w, int h)	396	map_blank (DC__Map self, int x0, int y0, int w, int h)
371	{	397	{
372	int x, y;	398	int x, y;
373	maprow *row;	399	maprow *row;
…		…
387	if (x >= row->c1)	413	if (x >= row->c1)
388	break;	414	break;
389		415
390	cell = row->col + x - row->c0;	416	cell = row->col + x - row->c0;
391		417
392	cell->darkness = 0;	418	CELL_CLEAR (cell);
393	cell->stat_hp = 0;
394	cell->flags = 0;
395	cell->player = 0;
396	}	419	}
397	}	420	}
398	}	421	}
399		422
400	typedef struct {	423	typedef struct {
…		…
511	if (!svp \|\| !SvTRUE (*svp))	534	if (!svp \|\| !SvTRUE (*svp))
512	return 0;	535	return 0;
513		536
514	return 1;	537	return 1;
515	}	538	}
		539
		540	/******************************************************************************/
		541
		542	/* process keyboard modifiers */
		543	static int
		544	mod_munge (int mod)
		545	{
		546	mod &= MOD_MASK;
		547
		548	if (mod & (KMOD_META \| KMOD_ALT))
		549	mod \|= KMOD_LRAM;
		550
		551	return mod;
		552	}
		553
		554	static void
		555	deliantra_main ()
		556	{
		557	char *argv[] = { 0 };
		558	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		559	}
		560
		561	#ifdef __MACOSX__
		562	/* to due surprising braindamage on the side of SDL design, we
		563	* do some mind-boggling hack here: SDL requires a custom main()
		564	* on OS X, so... we provide one and call the original main(), which,
		565	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		566	* and which calls our main (== SDL_main) back.
		567	*/
		568	extern C_LINKAGE int
		569	main (int argc, char *argv[])
		570	{
		571	deliantra_main ();
		572	}
		573
		574	#undef main
		575
		576	extern C_LINKAGE int main (int argc, char *argv[]);
		577
		578	static void
		579	SDL_braino (void)
		580	{
		581	char *argv[] = { "deliantra client", 0 };
		582	(main) (1, argv);
		583	}
		584	#else
		585	static void
		586	SDL_braino (void)
		587	{
		588	deliantra_main ();
		589	}
		590	#endif
516		591
517	MODULE = Deliantra::Client PACKAGE = DC	592	MODULE = Deliantra::Client PACKAGE = DC
518		593
519	PROTOTYPES: ENABLE	594	PROTOTYPES: ENABLE
520		595
…		…
549	const_iv (SDL_USEREVENT),	624	const_iv (SDL_USEREVENT),
550		625
551	const_iv (SDL_APPINPUTFOCUS),	626	const_iv (SDL_APPINPUTFOCUS),
552	const_iv (SDL_APPMOUSEFOCUS),	627	const_iv (SDL_APPMOUSEFOCUS),
553	const_iv (SDL_APPACTIVE),	628	const_iv (SDL_APPACTIVE),
		629
		630
		631	const_iv (SDLK_UNKNOWN),
		632	const_iv (SDLK_FIRST),
		633	const_iv (SDLK_BACKSPACE),
		634	const_iv (SDLK_TAB),
		635	const_iv (SDLK_CLEAR),
		636	const_iv (SDLK_RETURN),
		637	const_iv (SDLK_PAUSE),
		638	const_iv (SDLK_ESCAPE),
		639	const_iv (SDLK_SPACE),
		640	const_iv (SDLK_EXCLAIM),
		641	const_iv (SDLK_QUOTEDBL),
		642	const_iv (SDLK_HASH),
		643	const_iv (SDLK_DOLLAR),
		644	const_iv (SDLK_AMPERSAND),
		645	const_iv (SDLK_QUOTE),
		646	const_iv (SDLK_LEFTPAREN),
		647	const_iv (SDLK_RIGHTPAREN),
		648	const_iv (SDLK_ASTERISK),
		649	const_iv (SDLK_PLUS),
		650	const_iv (SDLK_COMMA),
		651	const_iv (SDLK_MINUS),
		652	const_iv (SDLK_PERIOD),
		653	const_iv (SDLK_SLASH),
		654	const_iv (SDLK_0),
		655	const_iv (SDLK_1),
		656	const_iv (SDLK_2),
		657	const_iv (SDLK_3),
		658	const_iv (SDLK_4),
		659	const_iv (SDLK_5),
		660	const_iv (SDLK_6),
		661	const_iv (SDLK_7),
		662	const_iv (SDLK_8),
		663	const_iv (SDLK_9),
		664	const_iv (SDLK_COLON),
		665	const_iv (SDLK_SEMICOLON),
		666	const_iv (SDLK_LESS),
		667	const_iv (SDLK_EQUALS),
		668	const_iv (SDLK_GREATER),
		669	const_iv (SDLK_QUESTION),
		670	const_iv (SDLK_AT),
		671
		672	const_iv (SDLK_LEFTBRACKET),
		673	const_iv (SDLK_BACKSLASH),
		674	const_iv (SDLK_RIGHTBRACKET),
		675	const_iv (SDLK_CARET),
		676	const_iv (SDLK_UNDERSCORE),
		677	const_iv (SDLK_BACKQUOTE),
		678	const_iv (SDLK_DELETE),
554		679
555	const_iv (SDLK_FIRST),	680	const_iv (SDLK_FIRST),
556	const_iv (SDLK_LAST),	681	const_iv (SDLK_LAST),
557	const_iv (SDLK_KP0),	682	const_iv (SDLK_KP0),
558	const_iv (SDLK_KP1),	683	const_iv (SDLK_KP1),
…		…
634	const_iv (KMOD_RMETA),	759	const_iv (KMOD_RMETA),
635	const_iv (KMOD_NUM),	760	const_iv (KMOD_NUM),
636	const_iv (KMOD_CAPS),	761	const_iv (KMOD_CAPS),
637	const_iv (KMOD_MODE),	762	const_iv (KMOD_MODE),
638		763
		764	const_iv (KMOD_LRAM),
		765
639	const_iv (MIX_DEFAULT_FORMAT),	766	const_iv (MIX_DEFAULT_FORMAT),
		767
		768	const_iv (SDL_INIT_TIMER),
		769	const_iv (SDL_INIT_AUDIO),
		770	const_iv (SDL_INIT_VIDEO),
		771	const_iv (SDL_INIT_CDROM),
		772	const_iv (SDL_INIT_JOYSTICK),
		773	const_iv (SDL_INIT_EVERYTHING),
		774	const_iv (SDL_INIT_NOPARACHUTE),
		775	const_iv (SDL_INIT_EVENTTHREAD),
		776
		777	const_iv (SDL_GL_RED_SIZE),
		778	const_iv (SDL_GL_GREEN_SIZE),
		779	const_iv (SDL_GL_BLUE_SIZE),
		780	const_iv (SDL_GL_ALPHA_SIZE),
		781	const_iv (SDL_GL_DOUBLEBUFFER),
		782	const_iv (SDL_GL_BUFFER_SIZE),
		783	const_iv (SDL_GL_DEPTH_SIZE),
		784	const_iv (SDL_GL_STENCIL_SIZE),
		785	const_iv (SDL_GL_ACCUM_RED_SIZE),
		786	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		787	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		788	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		789	const_iv (SDL_GL_STEREO),
		790	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		791	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		792	const_iv (SDL_GL_ACCELERATED_VISUAL),
		793	const_iv (SDL_GL_SWAP_CONTROL),
		794
		795	const_iv (FOW_DARKNESS)
640	# undef const_iv	796	# undef const_iv
641	};	797	};
642		798
643	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	799	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	800	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
673	CODE:	829	CODE:
674	{	830	{
675	opengl_fontmap = pango_opengl_font_map_new ();	831	opengl_fontmap = pango_opengl_font_map_new ();
676	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	832	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
677	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	833	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		834	/pango_context_set_font_description (opengl_context, default_font);/
678	#if PANGO_VERSION_CHECK (1, 15, 2)	835	#if PANGO_VERSION_CHECK (1, 15, 2)
679	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	836	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	837	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
681	#endif	838	#endif
682	}	839	}
683		840
684	char *
685	SDL_GetError ()	841	char *SDL_GetError ()
686		842
687	int	843	void SDL_braino ()
688	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
689		844
690	void	845	int SDL_Init (U32 flags)
		846
		847	int SDL_InitSubSystem (U32 flags)
		848
		849	void SDL_QuitSubSystem (U32 flags)
		850
691	SDL_Quit ()	851	void SDL_Quit ()
		852
		853	int SDL_GL_SetAttribute (int attr, int value)
		854
		855	int SDL_GL_GetAttribute (int attr)
		856	CODE:
		857	if (SDL_GL_GetAttribute (attr, &RETVAL))
		858	XSRETURN_UNDEF;
		859	OUTPUT:
		860	RETVAL
692		861
693	void	862	void
694	SDL_ListModes (int rgb, int alpha)	863	SDL_ListModes (int rgb, int alpha)
695	PPCODE:	864	PPCODE:
696	{	865	{
…		…
708	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	879	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711		880
712	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	881	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
713	#if SDL_VERSION_ATLEAST(1,2,10)
714	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
715	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	882	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716	#endif
717		883
718	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	884	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
719		885
720	if (m && m != (SDL_Rect **)-1)	886	if (m && m != (SDL_Rect **)-1)
721	while (*m)	887	while (*m)
722	{	888	{
723	if ((m)->w >= 800 && (m)->h >= 480)	889	if ((m)->w >= 400 && (m)->h >= 300)
724	{	890	{
725	AV *av = newAV ();	891	AV *av = newAV ();
726	av_push (av, newSViv ((*m)->w));	892	av_push (av, newSViv ((*m)->w));
727	av_push (av, newSViv ((*m)->h));	893	av_push (av, newSViv ((*m)->h));
728	av_push (av, newSViv (rgb));	894	av_push (av, newSViv (rgb));
…		…
770	SDL_GetKeyName (int sym)	936	SDL_GetKeyName (int sym)
771		937
772	int	938	int
773	SDL_GetAppState ()	939	SDL_GetAppState ()
774		940
		941	int
		942	SDL_GetModState ()
		943
775	void	944	void
776	poll_events ()	945	poll_events ()
777	PPCODE:	946	PPCODE:
778	{	947	{
779	SDL_Event ev;	948	SDL_Event ev;
…		…
788	{	957	{
789	case SDL_KEYDOWN:	958	case SDL_KEYDOWN:
790	case SDL_KEYUP:	959	case SDL_KEYUP:
791	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	960	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
792	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	961	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
793	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	962	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
794	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	963	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
795	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	964	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
796	break;	965	break;
797		966
798	case SDL_ACTIVEEVENT:	967	case SDL_ACTIVEEVENT:
799	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	968	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
817	x = ev.motion.x;	986	x = ev.motion.x;
818	y = ev.motion.y;	987	y = ev.motion.y;
819	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	988	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
820	}	989	}
821		990
822	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	991	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
823	hv_store (hv, "state", 5, newSViv (state), 0);	992	hv_store (hv, "state", 5, newSViv (state), 0);
824	hv_store (hv, "x", 1, newSViv (x), 0);	993	hv_store (hv, "x", 1, newSViv (x), 0);
825	hv_store (hv, "y", 1, newSViv (y), 0);	994	hv_store (hv, "y", 1, newSViv (y), 0);
826	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	995	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
827	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	996	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
912	}	1081	}
913	}	1082	}
914	#endif	1083	#endif
915	}	1084	}
916		1085
917	void	1086	int
918	add_font (char *file)	1087	add_font (char *file)
919	CODE:	1088	CODE:
920	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1089	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1090	OUTPUT:
		1091	RETVAL
921		1092
922	void	1093	void
923	load_image_inline (SV *image_)	1094	load_image_inline (SV *image_)
924	ALIAS:	1095	ALIAS:
925	load_image_file = 1	1096	load_image_file = 1
…		…
1041	#if DEBUG	1212	#if DEBUG
1042	VALGRIND_DO_LEAK_CHECK;	1213	VALGRIND_DO_LEAK_CHECK;
1043	#endif	1214	#endif
1044	}	1215	}
1045		1216
		1217	int
		1218	SvREFCNT (SV *sv)
		1219	CODE:
		1220	RETVAL = SvREFCNT (sv);
		1221	OUTPUT:
		1222	RETVAL
		1223
1046	MODULE = Deliantra::Client PACKAGE = DC::Font	1224	MODULE = Deliantra::Client PACKAGE = DC::Font
1047		1225
1048	PROTOTYPES: DISABLE	1226	PROTOTYPES: DISABLE
1049		1227
1050	DC::Font	1228	DC::Font
…		…
1479	if (ix)	1657	if (ix)
1480	{	1658	{
1481	glDisable (GL_ALPHA_TEST);	1659	glDisable (GL_ALPHA_TEST);
1482	glDisable (GL_BLEND);	1660	glDisable (GL_BLEND);
1483	}	1661	}
		1662	}
		1663
		1664	void
		1665	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)
		1666	PROTOTYPE: @
		1667	CODE:
		1668	{
		1669	glEnable (GL_TEXTURE_2D);
		1670	glEnable (GL_BLEND);
		1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1672	glBindTexture (GL_TEXTURE_2D, name1);
		1673
		1674	glColor3f (intensity, intensity, intensity);
		1675	glPushMatrix ();
		1676	glScalef (1./3, 1./3, 1.);
		1677
		1678	if (blend > 0.f)
		1679	{
		1680	float S2, T2; /* 0. 0. for texture 2 */
		1681	float w = w1 > w2 ? w1 : w2;
		1682	float h = h1 > h2 ? h1 : h2;
		1683	GLfloat env_color[4] = { 0., 0., 0., blend };
		1684
		1685	/* interpolate the two shadow textures */
		1686	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1687	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1688
		1689	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1690	gl.ActiveTexture (GL_TEXTURE1);
		1691	glEnable (GL_TEXTURE_2D);
		1692	glBindTexture (GL_TEXTURE_2D, name2);
		1693	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1694
		1695	/* rgb == rgb(glcolor) */
		1696	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1697	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
		1698	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1699
		1700	/* alpha = interpolate t0, t1 by env_alpha */
		1701	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1702
		1703	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1704	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1705	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1706
		1707	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1709
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1711	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1712
		1713	s1 *= w / w1;
		1714	t1 *= h / h1;
		1715
		1716	dx *= -3.f / w2;
		1717	dy *= -3.f / h2;
		1718	dx *= w / w2;
		1719	dy *= h / h2;
		1720
		1721	s2 *= w / w2;
		1722	t2 *= h / h2;
		1723
		1724	glBegin (GL_QUADS);
		1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);
		1726	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);
		1727	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);
		1728	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);
		1729	glEnd ();
		1730
		1731	glDisable (GL_TEXTURE_2D);
		1732	gl.ActiveTexture (GL_TEXTURE0);
		1733	}
		1734	else
		1735	{
		1736	/* simple blending of one texture, also opengl <1.3 path */
		1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1738
		1739	glBegin (GL_QUADS);
		1740	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
		1741	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
		1742	glTexCoord2f (s1, t1); glVertex2f (w1, h1);
		1743	glTexCoord2f (s1, 0); glVertex2f (w1, 0);
		1744	glEnd ();
		1745	}
		1746
		1747	glPopMatrix ();
		1748
		1749	glDisable (GL_TEXTURE_2D);
		1750	glDisable (GL_BLEND);
1484	}	1751	}
1485		1752
1486	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1753	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1487	CODE:	1754	CODE:
1488	{	1755	{
…		…
1594	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1861	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1595	// use uglier nearest interpolation because linear suffers	1862	// use uglier nearest interpolation because linear suffers
1596	// from transparent color bleeding and ugly wrapping effects.	1863	// from transparent color bleeding and ugly wrapping effects.
1597	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1864	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1598	}	1865	}
		1866
		1867	void
		1868	expire_textures (DC::Map self, int texid, int count)
		1869	PPCODE:
		1870	for (; texid < self->texs && count; ++texid, --count)
		1871	{
		1872	maptex *tex = self->tex + texid;
		1873
		1874	if (tex->name)
		1875	{
		1876	if (tex->unused)
		1877	{
		1878	tex->name = 0;
		1879	tex->unused = 0;
		1880	XPUSHs (sv_2mortal (newSViv (texid)));
		1881	}
		1882	else
		1883	tex->unused = 1;
		1884	}
		1885	}
1599		1886
1600	int	1887	int
1601	ox (DC::Map self)	1888	ox (DC::Map self)
1602	ALIAS:	1889	ALIAS:
1603	oy = 1	1890	oy = 1
…		…
1681	uint8_t ext, cmd;	1968	uint8_t ext, cmd;
1682		1969
1683	do	1970	do
1684	{	1971	{
1685	ext = *data++;	1972	ext = *data++;
1686	cmd = ext & 0x3f;	1973	cmd = ext & 0x7f;
1687		1974
1688	if (cmd < 4)	1975	if (cmd < 4)
1689	cell->darkness = 255 - ext * 64 + 1;	1976	cell->darkness = 255 - ext * 64 + 1;
1690	else if (cmd == 5) // health	1977	else if (cmd == 5) // health
1691	{	1978	{
…		…
1694	}	1981	}
1695	else if (cmd == 6) // monster width	1982	else if (cmd == 6) // monster width
1696	cell->stat_width = *data++ + 1;	1983	cell->stat_width = *data++ + 1;
1697	else if (cmd == 0x47)	1984	else if (cmd == 0x47)
1698	{	1985	{
1699	if (*data == 4)	1986	if (*data == 1) cell->player = data [1];
1700	; // decode player count	1987	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1988	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1989	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701		1990
1702	data += *data + 1;	1991	data += *data + 1;
1703	}	1992	}
1704	else if (cmd == 8) // cell flags	1993	else if (cmd == 8) // cell flags
1705	cell->flags = *data++;	1994	cell->flags = *data++;
…		…
1722	cell->tile [z] = self->face2tile [face];	2011	cell->tile [z] = self->face2tile [face];
1723		2012
1724	if (cell->tile [z])	2013	if (cell->tile [z])
1725	{	2014	{
1726	maptex *tex = self->tex + cell->tile [z];	2015	maptex *tex = self->tex + cell->tile [z];
		2016	tex->unused = 0;
1727	if (!tex->name)	2017	if (!tex->name)
1728	av_push (missing, newSViv (cell->tile [z]));	2018	av_push (missing, newSViv (cell->tile [z]));
1729		2019
1730	if (tex->smoothtile)	2020	if (tex->smoothtile)
1731	{	2021	{
1732	maptex *smooth = self->tex + tex->smoothtile;	2022	maptex *smooth = self->tex + tex->smoothtile;
		2023	smooth->unused = 0;
1733	if (!smooth->name)	2024	if (!smooth->name)
1734	av_push (missing, newSViv (tex->smoothtile));	2025	av_push (missing, newSViv (tex->smoothtile));
1735	}	2026	}
1736	}	2027	}
1737	}	2028	}
1738	}	2029	}
1739	else	2030	else
1740	cell->darkness = 0;	2031	CELL_CLEAR (cell);
1741	}	2032	}
1742	}	2033	}
1743	OUTPUT:	2034	OUTPUT:
1744	RETVAL	2035	RETVAL
1745		2036
…		…
1797	}	2088	}
1798	OUTPUT:	2089	OUTPUT:
1799	RETVAL	2090	RETVAL
1800		2091
1801	void	2092	void
1802	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	2093	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1803	CODE:	2094	CODE:
1804	{	2095	{
1805	int x, y, z;	2096	int x, y, z;
1806		2097
1807	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2098	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1808	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2099	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1809	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2100	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810	smooth_key skey;	2101	smooth_key skey;
1811		2102	int pl_x, pl_y;
		2103	maptex pl_tex;
1812	rc_t *rc = rc_alloc ();	2104	rc_t *rc = rc_alloc ();
		2105	rc_t *rc_ov = rc_alloc ();
1813	rc_key_t key;	2106	rc_key_t key;
1814	rc_array_t *arr;	2107	rc_array_t arr, arr_hidden;
1815		2108
		2109	pl_tex.name = 0;
		2110
1816	// thats current max. sorry.	2111	// that's current max. sorry.
1817	if (sw > 255) sw = 255;	2112	if (sw > 255) sw = 255;
1818	if (sh > 255) sh = 255;	2113	if (sh > 255) sh = 255;
1819		2114
1820	// clear key, in case of extra padding	2115	// clear key, in case of extra padding
1821	memset (&skey, 0, sizeof (skey));	2116	memset (&skey, 0, sizeof (skey));
…		…
1825	key.g = 255;	2120	key.g = 255;
1826	key.b = 255;	2121	key.b = 255;
1827	key.a = 255;	2122	key.a = 255;
1828	key.mode = GL_QUADS;	2123	key.mode = GL_QUADS;
1829	key.format = GL_T2F_V3F;	2124	key.format = GL_T2F_V3F;
1830	key.texname = -1;
1831		2125
1832	mx += self->x;	2126	mx += self->x;
1833	my += self->y;	2127	my += self->y;
1834		2128
1835	// first pass: determine smooth_max	2129	// first pass: determine smooth_max
…		…
1856		2150
1857	glEnable (GL_BLEND);	2151	glEnable (GL_BLEND);
1858	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2152	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1859	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2153	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1860		2154
		2155	key.texname = self->tex [TEXID_HIDDEN].name;
		2156	arr_hidden = rc_array (rc_ov, &key);
		2157
1861	for (z = 0; z <= 2; z++)	2158	for (z = 0; z <= 2; z++)
1862	{	2159	{
1863	memset (smooth_level, 0, sizeof (smooth_level));	2160	memset (smooth_level, 0, sizeof (smooth_level));
		2161	key.texname = -1;
1864		2162
1865	for (y = 0; y < sh; y++)	2163	for (y = 0; y < sh; y++)
1866	if (0 <= y + my && y + my < self->rows)	2164	if (0 <= y + my && y + my < self->rows)
1867	{	2165	{
1868	maprow *row = self->row + (y + my);	2166	maprow *row = self->row + (y + my);
…		…
1878	maptex tex = self->tex [tile];	2176	maptex tex = self->tex [tile];
1879	int px, py;	2177	int px, py;
1880		2178
1881	if (key.texname != tex.name)	2179	if (key.texname != tex.name)
1882	{	2180	{
		2181	self->tex [tile].unused = 0;
		2182
1883	if (!tex.name)	2183	if (!tex.name)
1884	tex = self->tex [2]; /* missing, replace by noface */	2184	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1885		2185
1886	key.texname = tex.name;	2186	key.texname = tex.name;
1887	arr = rc_array (rc, &key);	2187	arr = rc_array (rc, &key);
1888	}	2188	}
1889		2189
1890	px = (x + 1) * T - tex.w;	2190	px = (x + 1) * T - tex.w;
1891	py = (y + 1) * T - tex.h;	2191	py = (y + 1) * T - tex.h;
		2192
		2193	if (expect_false (cell->player == player) && expect_false (z == 2))
		2194	{
		2195	pl_x = px;
		2196	pl_y = py;
		2197	pl_tex = tex;
		2198	continue;
		2199	}
1892		2200
1893	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2201	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2202	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1895	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2203	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1896	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2204	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897
1898	if (cell->flags && z == 2)
1899	{
1900	// overlays such as the speech bubble, probably more to come
1901	if (cell->flags & 1)
1902	{
1903	maptex tex = self->tex [1];
1904	int px = x * T + T * 2 / 32;
1905	int py = y * T - T * 6 / 32;
1906
1907	if (tex.name)
1908	{
1909	if (key.texname != tex.name)
1910	{
1911	key.texname = tex.name;
1912	arr = rc_array (rc, &key);
1913	}
1914
1915	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1916	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1917	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1918	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1919	}
1920	}
1921	}
1922		2205
1923	// update smooth hash	2206	// update smooth hash
1924	if (tex.smoothtile)	2207	if (tex.smoothtile)
1925	{	2208	{
1926	skey.tile = tex.smoothtile;	2209	skey.tile = tex.smoothtile;
…		…
1955	// corners	2238	// corners
1956	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2239	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1957	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2240	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1958	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2241	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1959	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2242	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2243	}
		2244	}
		2245
		2246	if (expect_false (z == 2))
		2247	{
		2248	/* draw question marks on top of hidden spaces */
		2249	if (!cell->darkness)
		2250	{
		2251	maptex tex = self->tex [TEXID_HIDDEN];
		2252	int px = (x + 1) * T - tex.w;
		2253	int py = (y + 1) * T - tex.h;
		2254
		2255	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
		2256	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
		2257	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2258	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
		2259	}
		2260
		2261	if (expect_false (cell->flags))
		2262	{
		2263	// overlays such as the speech bubble, probably more to come
		2264	if (cell->flags & 1)
		2265	{
		2266	rc_key_t key_ov = key;
		2267	maptex tex = self->tex [TEXID_SPEECH];
		2268	rc_array_t *arr;
		2269	int px = x * T + T * 2 / 32;
		2270	int py = y * T - T * 6 / 32;
		2271
		2272	key_ov.texname = tex.name;
		2273	arr = rc_array (rc_ov, &key_ov);
		2274
		2275	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2276	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2277	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2278	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2279	}
1960	}	2280	}
1961	}	2281	}
1962	}	2282	}
1963	}	2283	}
1964		2284
…		…
2004	{	2324	{
2005	// this time avoiding texture state changes	2325	// this time avoiding texture state changes
2006	// save gobs of state changes.	2326	// save gobs of state changes.
2007	if (key.texname != tex.name)	2327	if (key.texname != tex.name)
2008	{	2328	{
		2329	self->tex [skey->tile].unused = 0;
		2330
2009	glEnd ();	2331	glEnd ();
2010	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2332	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2011	glBegin (GL_QUADS);	2333	glBegin (GL_QUADS);
2012	}	2334	}
2013		2335
…		…
2042	}	2364	}
2043		2365
2044	hv_clear (smooth);	2366	hv_clear (smooth);
2045	}	2367	}
2046		2368
		2369	if (pl_tex.name)
		2370	{
		2371	maptex tex = pl_tex;
		2372	int px = pl_x + sdx;
		2373	int py = pl_y + sdy;
		2374
		2375	key.texname = tex.name;
		2376	arr = rc_array (rc, &key);
		2377
		2378	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2379	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2380	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2381	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2382
		2383	rc_draw (rc);
		2384	}
		2385
		2386	rc_draw (rc_ov);
		2387	rc_clear (rc_ov);
		2388
2047	glDisable (GL_BLEND);	2389	glDisable (GL_BLEND);
2048	rc_free (rc);	2390	rc_free (rc);
		2391	rc_free (rc_ov);
2049		2392
2050	// top layer: overlays such as the health bar	2393	// top layer: overlays such as the health bar
2051	for (y = 0; y < sh; y++)	2394	for (y = 0; y < sh; y++)
2052	if (0 <= y + my && y + my < self->rows)	2395	if (0 <= y + my && y + my < self->rows)
2053	{	2396	{
…		…
2058	{	2401	{
2059	mapcell *cell = row->col + (x + mx - row->c0);	2402	mapcell *cell = row->col + (x + mx - row->c0);
2060		2403
2061	int px = x * T;	2404	int px = x * T;
2062	int py = y * T;	2405	int py = y * T;
		2406
		2407	if (expect_false (cell->player == player))
		2408	{
		2409	px += sdx;
		2410	py += sdy;
		2411	}
2063		2412
2064	if (cell->stat_hp)	2413	if (cell->stat_hp)
2065	{	2414	{
2066	int width = cell->stat_width * T;	2415	int width = cell->stat_width * T;
2067	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2416	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2107	};	2456	};
2108		2457
2109	int x, y;	2458	int x, y;
2110		2459
2111	glEnable (GL_TEXTURE_2D);	2460	glEnable (GL_TEXTURE_2D);
		2461	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2462	* but the nvidia driver (185.18.14) mishandles alpha textures
		2463	* ansd takes the colour from god knows where instead of using
		2464	* Cp. MODULATE results in the same colour, but slightly different
		2465	* alpha, but atcually gives us the correct colour with nvidia.
		2466	*/
2112	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2467	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2113	glEnable (GL_BLEND);	2468	glEnable (GL_BLEND);
2114	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2469	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2115	glBegin (GL_QUADS);	2470	glBegin (GL_QUADS);
2116		2471
2117	for (y = 0; y < h; y++)	2472	for (y = 0; y < h; y++)
…		…
2124	float *c = color [m & 15];	2479	float *c = color [m & 15];
2125		2480
2126	float tx1 = m & 0x40 ? 0.5 : 0.;	2481	float tx1 = m & 0x40 ? 0.5 : 0.;
2127	float tx2 = tx1 + 0.5;	2482	float tx2 = tx1 + 0.5;
2128		2483
2129	glColor4f (c[0], c[1], c[2], 0.75);	2484	glColor4f (c[0], c[1], c[2], 1);
2130	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2485	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2131	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2486	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2132	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2487	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2133	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2488	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2134	}	2489	}
…		…
2156	SvCUR_set (darkness3_sv, sw34 * sh3);	2511	SvCUR_set (darkness3_sv, sw34 * sh3);
2157		2512
2158	mx += self->x - 1;	2513	mx += self->x - 1;
2159	my += self->y - 1;	2514	my += self->y - 1;
2160		2515
2161	memset (darkness1, 255, sw1 * sh1);	2516	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2162		2517
2163	for (y = 0; y < sh1; y++)	2518	for (y = 0; y < sh1; y++)
2164	if (0 <= y + my && y + my < self->rows)	2519	if (0 <= y + my && y + my < self->rows)
2165	{	2520	{
2166	maprow *row = self->row + (y + my);	2521	maprow *row = self->row + (y + my);
…		…
2169	if (row->c0 <= x + mx && x + mx < row->c1)	2524	if (row->c0 <= x + mx && x + mx < row->c1)
2170	{	2525	{
2171	mapcell *cell = row->col + (x + mx - row->c0);	2526	mapcell *cell = row->col + (x + mx - row->c0);
2172		2527
2173	darkness1 [y * sw1 + x] = cell->darkness	2528	darkness1 [y * sw1 + x] = cell->darkness
2174	? 255 - (cell->darkness - 1)	2529	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2175	: 255 - FOW_DARKNESS;	2530	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2176	}	2531	}
2177	}	2532	}
2178		2533
2179	for (y = 0; y < sh; ++y)	2534	for (y = 0; y < sh; ++y)
2180	for (x = 0; x < sw; ++x)	2535	for (x = 0; x < sw; ++x)
…		…
2286	else	2641	else
2287	*data++ = 0;	2642	*data++ = 0;
2288	}	2643	}
2289	}	2644	}
2290		2645
		2646	/* if size is wh + 5 then no data has been found /
		2647	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2648	{
2291	SvPOK_only (data_sv);	2649	SvPOK_only (data_sv);
2292	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2650	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2651	}
		2652
2293	RETVAL = data_sv;	2653	RETVAL = data_sv;
2294	}	2654	}
2295	OUTPUT:	2655	OUTPUT:
2296	RETVAL	2656	RETVAL
2297		2657
2298	void	2658	void
2299	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2659	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300	PPCODE:	2660	PPCODE:
2301	{	2661	{
2302	int x, y, z;	2662	int x, y, z;
2303	int w, h;	2663	int w, h;
2304	int x1, y1;	2664	int x1, y1;
		2665	STRLEN len;
		2666	uint8_t data, end;
		2667
		2668	len = SvLEN (data_sv);
		2669	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2670	data = SvPVbyte_nolen (data_sv);
		2671	end = data + len + 8;
		2672
		2673	if (len < 5)
		2674	XSRETURN_EMPTY;
2305		2675
2306	if (*data++ != 0)	2676	if (*data++ != 0)
2307	XSRETURN_EMPTY; /* version mismatch */	2677	XSRETURN_EMPTY; /* version mismatch */
2308		2678
2309	w = data++ << 8; w \|= data++;	2679	w = data++ << 8; w \|= data++;
…		…
2324	{	2694	{
2325	maprow *row = map_get_row (self, y);	2695	maprow *row = map_get_row (self, y);
2326		2696
2327	for (x = x0; x < x1; x++)	2697	for (x = x0; x < x1; x++)
2328	{	2698	{
		2699	uint8_t flags;
		2700
		2701	if (data + 7 >= end)
		2702	XSRETURN_EMPTY;
		2703
2329	uint8_t flags = *data++;	2704	flags = *data++;
2330		2705
2331	if (flags)	2706	if (flags)
2332	{	2707	{
2333	mapcell *cell = row_get_cell (row, x);	2708	mapcell *cell = row_get_cell (row, x);
2334	tileid tile[3] = { 0, 0, 0 };	2709	tileid tile[3] = { 0, 0, 0 };
…		…
2337	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2712	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2338	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2713	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2339		2714
2340	if (cell->darkness == 0)	2715	if (cell->darkness == 0)
2341	{	2716	{
2342	cell->darkness = 0;	2717	/cell->darkness = 0;/
		2718	EXTEND (SP, 3);
2343		2719
2344	for (z = 0; z <= 2; z++)	2720	for (z = 0; z <= 2; z++)
2345	{	2721	{
2346	tileid t = tile [z];	2722	tileid t = tile [z];
2347		2723
2348	if (t >= self->texs \|\| (t && !self->tex [t].name))	2724	if (t >= self->texs \|\| (t && !self->tex [t].name))
2349	{	2725	{
2350	XPUSHs (sv_2mortal (newSViv (t)));	2726	PUSHs (sv_2mortal (newSViv (t)));
2351	need_texid (self, t);	2727	need_texid (self, t);
2352	}	2728	}
2353		2729
2354	cell->tile [z] = t;	2730	cell->tile [z] = t;
2355	}	2731	}
…		…
2572	} *civ, const_iv[] = {	2948	} *civ, const_iv[] = {
2573	# define const_iv(name) { # name, (IV)name }	2949	# define const_iv(name) { # name, (IV)name }
2574	const_iv (GL_VENDOR),	2950	const_iv (GL_VENDOR),
2575	const_iv (GL_VERSION),	2951	const_iv (GL_VERSION),
2576	const_iv (GL_EXTENSIONS),	2952	const_iv (GL_EXTENSIONS),
		2953	const_iv (GL_MAX_TEXTURE_UNITS),
2577	const_iv (GL_COLOR_MATERIAL),	2954	const_iv (GL_COLOR_MATERIAL),
2578	const_iv (GL_SMOOTH),	2955	const_iv (GL_SMOOTH),
2579	const_iv (GL_FLAT),	2956	const_iv (GL_FLAT),
2580	const_iv (GL_DITHER),	2957	const_iv (GL_DITHER),
2581	const_iv (GL_BLEND),	2958	const_iv (GL_BLEND),
…		…
2593	const_iv (GL_ZERO),	2970	const_iv (GL_ZERO),
2594	const_iv (GL_SRC_ALPHA),	2971	const_iv (GL_SRC_ALPHA),
2595	const_iv (GL_DST_ALPHA),	2972	const_iv (GL_DST_ALPHA),
2596	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2973	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2597	const_iv (GL_ONE_MINUS_DST_ALPHA),	2974	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2975	const_iv (GL_SRC_COLOR),
		2976	const_iv (GL_DST_COLOR),
		2977	const_iv (GL_ONE_MINUS_SRC_COLOR),
		2978	const_iv (GL_ONE_MINUS_DST_COLOR),
2598	const_iv (GL_SRC_ALPHA_SATURATE),	2979	const_iv (GL_SRC_ALPHA_SATURATE),
2599	const_iv (GL_RGB),	2980	const_iv (GL_RGB),
2600	const_iv (GL_RGBA),	2981	const_iv (GL_RGBA),
2601	const_iv (GL_RGBA4),	2982	const_iv (GL_RGBA4),
2602	const_iv (GL_RGBA8),	2983	const_iv (GL_RGBA8),
…		…
2670	const_iv (GL_NICEST),	3051	const_iv (GL_NICEST),
2671	const_iv (GL_V2F),	3052	const_iv (GL_V2F),
2672	const_iv (GL_V3F),	3053	const_iv (GL_V3F),
2673	const_iv (GL_T2F_V3F),	3054	const_iv (GL_T2F_V3F),
2674	const_iv (GL_T2F_N3F_V3F),	3055	const_iv (GL_T2F_N3F_V3F),
		3056	const_iv (GL_FUNC_ADD),
		3057	const_iv (GL_FUNC_SUBTRACT),
		3058	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2675	# undef const_iv	3059	# undef const_iv
2676	};	3060	};
2677		3061
2678	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3062	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2679	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3063	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2686	disable_GL_EXT_blend_func_separate ()	3070	disable_GL_EXT_blend_func_separate ()
2687	CODE:	3071	CODE:
2688	gl.BlendFuncSeparate = 0;	3072	gl.BlendFuncSeparate = 0;
2689	gl.BlendFuncSeparateEXT = 0;	3073	gl.BlendFuncSeparateEXT = 0;
2690		3074
		3075	void
		3076	apple_nvidia_bug (int enable)
		3077
2691	char *	3078	char *
2692	gl_vendor ()	3079	gl_vendor ()
2693	CODE:	3080	CODE:
2694	RETVAL = (char *)glGetString (GL_VENDOR);	3081	RETVAL = (char *)glGetString (GL_VENDOR);
2695	OUTPUT:	3082	OUTPUT:
…		…
2744		3131
2745	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3132	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2746	CODE:	3133	CODE:
2747	gl_BlendFuncSeparate (sa, da, saa, daa);	3134	gl_BlendFuncSeparate (sa, da, saa, daa);
2748		3135
		3136	# void glBlendEquation (int se)
		3137
2749	void glDepthMask (int flag)	3138	void glDepthMask (int flag)
2750		3139
2751	void glLogicOp (int opcode)	3140	void glLogicOp (int opcode)
2752		3141
2753	void glColorMask (int red, int green, int blue, int alpha)	3142	void glColorMask (int red, int green, int blue, int alpha)
…		…
2787	void glRotate (float angle, float x, float y, float z)	3176	void glRotate (float angle, float x, float y, float z)
2788	CODE:	3177	CODE:
2789	glRotatef (angle, x, y, z);	3178	glRotatef (angle, x, y, z);
2790		3179
2791	void glColor (float r, float g, float b, float a = 1.0)	3180	void glColor (float r, float g, float b, float a = 1.0)
		3181	PROTOTYPE: @
2792	ALIAS:	3182	ALIAS:
2793	glColor_premultiply = 1	3183	glColor_premultiply = 1
2794	CODE:	3184	CODE:
2795	if (ix)	3185	if (ix)
2796	{	3186	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.255 by root, Sun Jan 6 18:25:59 2008 UTC vs. Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.255 by root, Sun Jan 6 18:25:59 2008 UTC vs.
Revision 1.294 by root, Sat Dec 19 05:06:56 2009 UTC