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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.247 by root, Fri Dec 28 15:06:08 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 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
49	#include <pango/pango.h>	54	#include <pango/pango.h>
		55
		56	#ifndef PANGO_VERSION_CHECK
		57	# define PANGO_VERSION_CHECK(a,b,c) 0
		58	#endif
		59
		60	#if !PANGO_VERSION_CHECK (1, 15, 2)
		61	# define pango_layout_get_line_readonly pango_layout_get_line
		62	# define pango_layout_get_lines_readonly pango_layout_get_lines
		63	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		64	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		65	#endif
50		66
51	#ifndef _WIN32	67	#ifndef _WIN32
52	# include <sys/types.h>	68	# include <sys/types.h>
53	# include <sys/socket.h>	69	# include <sys/socket.h>
54	# include <netinet/in.h>	70	# include <netinet/in.h>
55	# include <netinet/tcp.h>	71	# include <netinet/tcp.h>
56	# include <inttypes.h>	72	# include <inttypes.h>
57	#endif	73	#endif
58		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
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		85
61	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 32
62		87
63	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
65		90
66	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
67		92
68	#if 0	93	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		95
74	static AV *texture_av;	96	static AV *texture_av;
75		97
76	static struct	98	static struct
77	{	99	{
…		…
171		193
172	static void	194	static void
173	layout_update_font (DC__Layout self)	195	layout_update_font (DC__Layout self)
174	{	196	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	197	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	198	* reasonably well with dejavu/bistream fonts
177	*/	199	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	200	PangoFontDescription *font = self->font ? self->font : default_font;
179		201
180	pango_font_description_set_absolute_size (font,	202	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	203	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
350	self->oy = 0;	372	self->oy = 0;
351	self->row = 0;	373	self->row = 0;
352	self->rows = 0;	374	self->rows = 0;
353	}	375	}
354		376
		377	#define CELL_CLEAR(cell) \
		378	do { \
		379	if ((cell)->player) \
		380	(cell)->tile [2] = 0; \
		381	(cell)->darkness = 0; \
		382	(cell)->stat_hp = 0; \
		383	(cell)->flags = 0; \
		384	(cell)->player = 0; \
		385	} while (0)
		386
355	static void	387	static void
356	map_blank (DC__Map self, int x0, int y0, int w, int h)	388	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	389	{
358	int x, y;	390	int x, y;
359	maprow *row;	391	maprow *row;
…		…
373	if (x >= row->c1)	405	if (x >= row->c1)
374	break;	406	break;
375		407
376	cell = row->col + x - row->c0;	408	cell = row->col + x - row->c0;
377		409
378	cell->darkness = 0;	410	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	411	}
383	}	412	}
384	}	413	}
385		414
386	typedef struct {	415	typedef struct {
…		…
497	if (!svp \|\| !SvTRUE (*svp))	526	if (!svp \|\| !SvTRUE (*svp))
498	return 0;	527	return 0;
499		528
500	return 1;	529	return 1;
501	}	530	}
		531
		532	static void
		533	deliantra_main ()
		534	{
		535	char *argv[] = { 0 };
		536	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		537	}
		538
		539	#ifdef __MACOSX__
		540	/* to due surprising braindamage on the side of SDL design, we
		541	* do some mind-boggling hack here: SDL requires a custom main()
		542	* on OS X, so... we provide one and call the original main(), which,
		543	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		544	* and which calls our main (== SDL_main) back.
		545	*/
		546	extern C_LINKAGE int
		547	main (int argc, char *argv[])
		548	{
		549	deliantra_main ();
		550	}
		551
		552	#undef main
		553
		554	extern C_LINKAGE int main (int argc, char *argv[]);
		555
		556	static void
		557	SDL_braino (void)
		558	{
		559	char *argv[] = { "deliantra client", 0 };
		560	(main) (1, argv);
		561	}
		562	#else
		563	static void
		564	SDL_braino (void)
		565	{
		566	deliantra_main ();
		567	}
		568	#endif
502		569
503	MODULE = Deliantra::Client PACKAGE = DC	570	MODULE = Deliantra::Client PACKAGE = DC
504		571
505	PROTOTYPES: ENABLE	572	PROTOTYPES: ENABLE
506		573
…		…
621	const_iv (KMOD_NUM),	688	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	689	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	690	const_iv (KMOD_MODE),
624		691
625	const_iv (MIX_DEFAULT_FORMAT),	692	const_iv (MIX_DEFAULT_FORMAT),
		693
		694	const_iv (SDL_INIT_TIMER),
		695	const_iv (SDL_INIT_AUDIO),
		696	const_iv (SDL_INIT_VIDEO),
		697	const_iv (SDL_INIT_CDROM),
		698	const_iv (SDL_INIT_JOYSTICK),
		699	const_iv (SDL_INIT_EVERYTHING),
		700	const_iv (SDL_INIT_NOPARACHUTE),
		701	const_iv (SDL_INIT_EVENTTHREAD),
		702
		703	const_iv (SDL_GL_RED_SIZE),
		704	const_iv (SDL_GL_GREEN_SIZE),
		705	const_iv (SDL_GL_BLUE_SIZE),
		706	const_iv (SDL_GL_ALPHA_SIZE),
		707	const_iv (SDL_GL_DOUBLEBUFFER),
		708	const_iv (SDL_GL_BUFFER_SIZE),
		709	const_iv (SDL_GL_DEPTH_SIZE),
		710	const_iv (SDL_GL_STENCIL_SIZE),
		711	const_iv (SDL_GL_ACCUM_RED_SIZE),
		712	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		713	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		714	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		715	const_iv (SDL_GL_STEREO),
		716	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		717	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		718	const_iv (SDL_GL_ACCELERATED_VISUAL),
		719	const_iv (SDL_GL_SWAP_CONTROL),
		720
		721	const_iv (FOW_DARKNESS)
626	# undef const_iv	722	# undef const_iv
627	};	723	};
628		724
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	725	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	726	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	755	CODE:
660	{	756	{
661	opengl_fontmap = pango_opengl_font_map_new ();	757	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	758	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	759	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		760	/pango_context_set_font_description (opengl_context, default_font);/
		761	#if PANGO_VERSION_CHECK (1, 15, 2)
		762	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		763	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		764	#endif
664	}	765	}
665		766
666	char *
667	SDL_GetError ()	767	char *SDL_GetError ()
668		768
669	int	769	void SDL_braino ()
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		770
672	void	771	int SDL_Init (U32 flags)
		772
		773	int SDL_InitSubSystem (U32 flags)
		774
		775	void SDL_QuitSubSystem (U32 flags)
		776
673	SDL_Quit ()	777	void SDL_Quit ()
		778
		779	int SDL_GL_SetAttribute (int attr, int value)
		780
		781	int SDL_GL_GetAttribute (int attr)
		782	CODE:
		783	if (SDL_GL_GetAttribute (attr, &RETVAL))
		784	XSRETURN_UNDEF;
		785	OUTPUT:
		786	RETVAL
674		787
675	void	788	void
676	SDL_ListModes (int rgb, int alpha)	789	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	790	PPCODE:
678	{	791	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	803	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	804	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	805	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		806
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	807	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	808	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		809
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	810	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		811
702	if (m && m != (SDL_Rect **)-1)	812	if (m && m != (SDL_Rect **)-1)
703	while (*m)	813	while (*m)
704	{	814	{
705	if ((m)->w >= 800 && (m)->h >= 480)	815	if ((m)->w >= 400 && (m)->h >= 300)
706	{	816	{
707	AV *av = newAV ();	817	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	818	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	819	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	820	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	862	SDL_GetKeyName (int sym)
753		863
754	int	864	int
755	SDL_GetAppState ()	865	SDL_GetAppState ()
756		866
		867	int
		868	SDL_GetModState ()
		869
757	void	870	void
758	poll_events ()	871	poll_events ()
759	PPCODE:	872	PPCODE:
760	{	873	{
761	SDL_Event ev;	874	SDL_Event ev;
…		…
770	{	883	{
771	case SDL_KEYDOWN:	884	case SDL_KEYDOWN:
772	case SDL_KEYUP:	885	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	886	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	887	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	888	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	889	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	890	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	891	break;
779		892
780	case SDL_ACTIVEEVENT:	893	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	894	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	912	x = ev.motion.x;
800	y = ev.motion.y;	913	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	914	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	915	}
803		916
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	917	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	918	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	919	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	920	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	921	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	922	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	923	}
811	break;	924	break;
812		925
813	case SDL_MOUSEBUTTONDOWN:	926	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	927	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	928	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		929
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	930	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	931	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	932	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	933	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
894	}	1007	}
895	}	1008	}
896	#endif	1009	#endif
897	}	1010	}
898		1011
899	void	1012	int
900	add_font (char *file)	1013	add_font (char *file)
901	CODE:	1014	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1015	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1016	OUTPUT:
		1017	RETVAL
903		1018
904	void	1019	void
905	load_image_inline (SV *image_)	1020	load_image_inline (SV *image_)
906	ALIAS:	1021	ALIAS:
907	load_image_file = 1	1022	load_image_file = 1
…		…
1165	{	1280	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1281	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1282
1168	do	1283	do
1169	{	1284	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1285	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1286
1172	if (run && shape_attr_p (run))	1287	if (run && shape_attr_p (run))
1173	{	1288	{
1174	PangoRectangle extents;	1289	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1290	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1279	int	1394	int
1280	descent (DC::Layout self)	1395	descent (DC::Layout self)
1281	CODE:	1396	CODE:
1282	{	1397	{
1283	PangoRectangle rect;	1398	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1399	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1400	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1401	RETVAL = PANGO_DESCENT (rect);
1287	}	1402	}
1288	OUTPUT:	1403	OUTPUT:
1289	RETVAL	1404	RETVAL
…		…
1301		1416
1302	void	1417	void
1303	cursor_pos (DC::Layout self, int index)	1418	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1419	PPCODE:
1305	{	1420	{
1306	PangoRectangle strong_pos;	1421	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1422	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1423
1309	EXTEND (SP, 3);	1424	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1425	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1426	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1427	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1428	}
1314		1429
1315	void	1430	void
1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)	1431	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1432	PPCODE:
…		…
1336	int index, trailing;	1451	int index, trailing;
1337		1452
1338	if (line < 0)	1453	if (line < 0)
1339	XSRETURN_EMPTY;	1454	XSRETURN_EMPTY;
1340		1455
1341	if (!(lp = pango_layout_get_line (self->pl, line)))	1456	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1342	XSRETURN_EMPTY; /* do better */	1457	XSRETURN_EMPTY; /* do better */
1343		1458
1344	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1459	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1345		1460
1346	EXTEND (SP, 2);	1461	EXTEND (SP, 2);
…		…
1663	uint8_t ext, cmd;	1778	uint8_t ext, cmd;
1664		1779
1665	do	1780	do
1666	{	1781	{
1667	ext = *data++;	1782	ext = *data++;
1668	cmd = ext & 0x3f;	1783	cmd = ext & 0x7f;
1669		1784
1670	if (cmd < 4)	1785	if (cmd < 4)
1671	cell->darkness = 255 - ext * 64 + 1;	1786	cell->darkness = 255 - ext * 64 + 1;
1672	else if (cmd == 5) // health	1787	else if (cmd == 5) // health
1673	{	1788	{
…		…
1676	}	1791	}
1677	else if (cmd == 6) // monster width	1792	else if (cmd == 6) // monster width
1678	cell->stat_width = *data++ + 1;	1793	cell->stat_width = *data++ + 1;
1679	else if (cmd == 0x47)	1794	else if (cmd == 0x47)
1680	{	1795	{
1681	if (*data == 4)	1796	if (*data == 1) cell->player = data [1];
1682	; // decode player count	1797	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1798	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1799	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1683		1800
1684	data += *data + 1;	1801	data += *data + 1;
1685	}	1802	}
1686	else if (cmd == 8) // cell flags	1803	else if (cmd == 8) // cell flags
1687	cell->flags = *data++;	1804	cell->flags = *data++;
…		…
1717	}	1834	}
1718	}	1835	}
1719	}	1836	}
1720	}	1837	}
1721	else	1838	else
1722	cell->darkness = 0;	1839	CELL_CLEAR (cell);
1723	}	1840	}
1724	}	1841	}
1725	OUTPUT:	1842	OUTPUT:
1726	RETVAL	1843	RETVAL
1727		1844
…		…
1779	}	1896	}
1780	OUTPUT:	1897	OUTPUT:
1781	RETVAL	1898	RETVAL
1782		1899
1783	void	1900	void
1784	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1901	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1785	CODE:	1902	CODE:
1786	{	1903	{
1787	int x, y, z;	1904	int x, y, z;
1788		1905
1789	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1906	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1790	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1907	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1791	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1908	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1792	smooth_key skey;	1909	smooth_key skey;
1793		1910	int pl_x, pl_y;
		1911	maptex pl_tex;
1794	rc_t *rc = rc_alloc ();	1912	rc_t *rc = rc_alloc ();
1795	rc_key_t key;	1913	rc_key_t key;
1796	rc_array_t *arr;	1914	rc_array_t *arr;
		1915
		1916	pl_tex.name = 0;
1797		1917
1798	// thats current max. sorry.	1918	// thats current max. sorry.
1799	if (sw > 255) sw = 255;	1919	if (sw > 255) sw = 255;
1800	if (sh > 255) sh = 255;	1920	if (sh > 255) sh = 255;
1801		1921
…		…
1856	tileid tile = cell->tile [z];	1976	tileid tile = cell->tile [z];
1857		1977
1858	if (tile)	1978	if (tile)
1859	{	1979	{
1860	maptex tex = self->tex [tile];	1980	maptex tex = self->tex [tile];
1861	int px, py;	1981	int px = (x + 1) * T - tex.w;
		1982	int py = (y + 1) * T - tex.h;
1862		1983
1863	if (key.texname != tex.name)	1984	if (key.texname != tex.name)
1864	{	1985	{
1865	if (!tex.name)	1986	if (!tex.name)
1866	tex = self->tex [2]; /* missing, replace by noface */	1987	tex = self->tex [2]; /* missing, replace by noface */
1867		1988
1868	key.texname = tex.name;	1989	key.texname = tex.name;
1869	arr = rc_array (rc, &key);	1990	arr = rc_array (rc, &key);
1870	}	1991	}
1871		1992
1872	px = (x + 1) * T - tex.w;	1993	if (expect_false (cell->player == player) && expect_false (z == 2))
1873	py = (y + 1) * T - tex.h;	1994	{
		1995	pl_x = px;
		1996	pl_y = py;
		1997	pl_tex = tex;
		1998	continue;
		1999	}
1874		2000
1875	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2001	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1876	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2002	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1877	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2003	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1878	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2004	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1879		2005
1880	if (cell->flags && z == 2)	2006	if (expect_false (cell->flags) && expect_false (z == 2))
1881	{	2007	{
1882	// overlays such as the speech bubble, probably more to come	2008	// overlays such as the speech bubble, probably more to come
1883	if (cell->flags & 1)	2009	if (cell->flags & 1)
1884	{	2010	{
1885	maptex tex = self->tex [1];	2011	maptex tex = self->tex [1];
…		…
2024	}	2150	}
2025		2151
2026	hv_clear (smooth);	2152	hv_clear (smooth);
2027	}	2153	}
2028		2154
		2155	if (pl_tex.name)
		2156	{
		2157	maptex tex = pl_tex;
		2158	int px = pl_x + sdx;
		2159	int py = pl_y + sdy;
		2160
		2161	key.texname = tex.name;
		2162	arr = rc_array (rc, &key);
		2163
		2164	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2165	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2166	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2167	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2168
		2169	rc_draw (rc);
		2170	}
		2171
2029	glDisable (GL_BLEND);	2172	glDisable (GL_BLEND);
2030	rc_free (rc);	2173	rc_free (rc);
2031		2174
2032	// top layer: overlays such as the health bar	2175	// top layer: overlays such as the health bar
2033	for (y = 0; y < sh; y++)	2176	for (y = 0; y < sh; y++)
…		…
2138	SvCUR_set (darkness3_sv, sw34 * sh3);	2281	SvCUR_set (darkness3_sv, sw34 * sh3);
2139		2282
2140	mx += self->x - 1;	2283	mx += self->x - 1;
2141	my += self->y - 1;	2284	my += self->y - 1;
2142		2285
2143	memset (darkness1, 255, sw1 * sh1);	2286	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2144		2287
2145	for (y = 0; y < sh1; y++)	2288	for (y = 0; y < sh1; y++)
2146	if (0 <= y + my && y + my < self->rows)	2289	if (0 <= y + my && y + my < self->rows)
2147	{	2290	{
2148	maprow *row = self->row + (y + my);	2291	maprow *row = self->row + (y + my);
…		…
2268	else	2411	else
2269	*data++ = 0;	2412	*data++ = 0;
2270	}	2413	}
2271	}	2414	}
2272		2415
		2416	/* if size is wh + 5 then no data has been found /
		2417	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2418	{
2273	SvPOK_only (data_sv);	2419	SvPOK_only (data_sv);
2274	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2420	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2421	}
		2422
2275	RETVAL = data_sv;	2423	RETVAL = data_sv;
2276	}	2424	}
2277	OUTPUT:	2425	OUTPUT:
2278	RETVAL	2426	RETVAL
2279		2427
2280	void	2428	void
2281	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2429	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2282	PPCODE:	2430	PPCODE:
2283	{	2431	{
2284	int x, y, z;	2432	int x, y, z;
2285	int w, h;	2433	int w, h;
2286	int x1, y1;	2434	int x1, y1;
		2435	STRLEN len;
		2436	uint8_t data, end;
		2437
		2438	len = SvLEN (data_sv);
		2439	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2440	data = SvPVbyte_nolen (data_sv);
		2441	end = data + len + 8;
		2442
		2443	if (len < 5)
		2444	XSRETURN_EMPTY;
2287		2445
2288	if (*data++ != 0)	2446	if (*data++ != 0)
2289	XSRETURN_EMPTY; /* version mismatch */	2447	XSRETURN_EMPTY; /* version mismatch */
2290		2448
2291	w = data++ << 8; w \|= data++;	2449	w = data++ << 8; w \|= data++;
…		…
2306	{	2464	{
2307	maprow *row = map_get_row (self, y);	2465	maprow *row = map_get_row (self, y);
2308		2466
2309	for (x = x0; x < x1; x++)	2467	for (x = x0; x < x1; x++)
2310	{	2468	{
		2469	uint8_t flags;
		2470
		2471	if (data + 7 >= end)
		2472	XSRETURN_EMPTY;
		2473
2311	uint8_t flags = *data++;	2474	flags = *data++;
2312		2475
2313	if (flags)	2476	if (flags)
2314	{	2477	{
2315	mapcell *cell = row_get_cell (row, x);	2478	mapcell *cell = row_get_cell (row, x);
2316	tileid tile[3] = { 0, 0, 0 };	2479	tileid tile[3] = { 0, 0, 0 };
…		…
2319	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2482	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2320	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2483	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2321		2484
2322	if (cell->darkness == 0)	2485	if (cell->darkness == 0)
2323	{	2486	{
2324	cell->darkness = 0;	2487	/cell->darkness = 0;/
		2488	EXTEND (SP, 3);
2325		2489
2326	for (z = 0; z <= 2; z++)	2490	for (z = 0; z <= 2; z++)
2327	{	2491	{
2328	tileid t = tile [z];	2492	tileid t = tile [z];
2329		2493
2330	if (t >= self->texs \|\| (t && !self->tex [t].name))	2494	if (t >= self->texs \|\| (t && !self->tex [t].name))
2331	{	2495	{
2332	XPUSHs (sv_2mortal (newSViv (t)));	2496	PUSHs (sv_2mortal (newSViv (t)));
2333	need_texid (self, t);	2497	need_texid (self, t);
2334	}	2498	}
2335		2499
2336	cell->tile [z] = t;	2500	cell->tile [z] = t;
2337	}	2501	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.247 by root, Fri Dec 28 15:06:08 2007 UTC vs. Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.247 by root, Fri Dec 28 15:06:08 2007 UTC vs.
Revision 1.274 by root, Wed Aug 20 17:50:47 2008 UTC