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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
		61
51	#ifndef _WIN32	62	#ifndef _WIN32
52	# include <sys/types.h>	63	# include <sys/types.h>
53	# include <sys/socket.h>	64	# include <sys/socket.h>
54	# include <netinet/in.h>	65	# include <netinet/in.h>
55	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
56	# include <inttypes.h>	67	# include <inttypes.h>
57	#endif	68	#endif
58		69
		70	#if __GNUC__ >= 4
		71	# define expect(expr,value) __builtin_expect ((expr),(value))
		72	#else
		73	# define expect(expr,value) (expr)
		74	#endif
		75
		76	#define expect_false(expr) expect ((expr) != 0, 0)
		77	#define expect_true(expr) expect ((expr) != 0, 1)
		78
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		80
61	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
62		82
63	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
65		85
66	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
67		87
68	#if 0	88	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
70	#else
71	# define PARACHUTE 0
72	#endif
73		90
74	static AV *texture_av;	91	static AV *texture_av;
75		92
76	static struct	93	static struct
77	{	94	{
…		…
171		188
172	static void	189	static void
173	layout_update_font (DC__Layout self)	190	layout_update_font (DC__Layout self)
174	{	191	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
177	*/	194	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
179		196
180	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
350	self->oy = 0;	367	self->oy = 0;
351	self->row = 0;	368	self->row = 0;
352	self->rows = 0;	369	self->rows = 0;
353	}	370	}
354		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	if ((cell)->player) \
		375	(cell)->tile [2] = 0; \
		376	(cell)->darkness = 0; \
		377	(cell)->stat_hp = 0; \
		378	(cell)->flags = 0; \
		379	(cell)->player = 0; \
		380	} while (0)
		381
355	static void	382	static void
356	map_blank (DC__Map self, int x0, int y0, int w, int h)	383	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	384	{
358	int x, y;	385	int x, y;
359	maprow *row;	386	maprow *row;
…		…
373	if (x >= row->c1)	400	if (x >= row->c1)
374	break;	401	break;
375		402
376	cell = row->col + x - row->c0;	403	cell = row->col + x - row->c0;
377		404
378	cell->darkness = 0;	405	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	406	}
383	}	407	}
384	}	408	}
385		409
386	typedef struct {	410	typedef struct {
…		…
621	const_iv (KMOD_NUM),	645	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	646	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	647	const_iv (KMOD_MODE),
624		648
625	const_iv (MIX_DEFAULT_FORMAT),	649	const_iv (MIX_DEFAULT_FORMAT),
		650
		651	const_iv (SDL_INIT_TIMER),
		652	const_iv (SDL_INIT_AUDIO),
		653	const_iv (SDL_INIT_VIDEO),
		654	const_iv (SDL_INIT_CDROM),
		655	const_iv (SDL_INIT_JOYSTICK),
		656	const_iv (SDL_INIT_EVERYTHING),
		657	const_iv (SDL_INIT_NOPARACHUTE),
		658	const_iv (SDL_INIT_EVENTTHREAD),
		659
		660	const_iv (SDL_GL_RED_SIZE),
		661	const_iv (SDL_GL_GREEN_SIZE),
		662	const_iv (SDL_GL_BLUE_SIZE),
		663	const_iv (SDL_GL_ALPHA_SIZE),
		664	const_iv (SDL_GL_DOUBLEBUFFER),
		665	const_iv (SDL_GL_BUFFER_SIZE),
		666	const_iv (SDL_GL_DEPTH_SIZE),
		667	const_iv (SDL_GL_STENCIL_SIZE),
		668	const_iv (SDL_GL_ACCUM_RED_SIZE),
		669	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		670	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		671	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		672	const_iv (SDL_GL_STEREO),
		673	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		674	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		675	const_iv (SDL_GL_ACCELERATED_VISUAL),
		676	const_iv (SDL_GL_SWAP_CONTROL)
626	# undef const_iv	677	# undef const_iv
627	};	678	};
628		679
629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	680	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	681	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
659	CODE:	710	CODE:
660	{	711	{
661	opengl_fontmap = pango_opengl_font_map_new ();	712	opengl_fontmap = pango_opengl_font_map_new ();
662	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	713	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);	714	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		715	/pango_context_set_font_description (opengl_context, default_font);/
		716	#if PANGO_VERSION_CHECK (1, 15, 2)
		717	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		718	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		719	#endif
664	}	720	}
665		721
666	char *
667	SDL_GetError ()	722	char *SDL_GetError ()
668		723
669	int	724	int SDL_Init (U32 flags)
670	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
671		725
672	void	726	int SDL_InitSubSystem (U32 flags)
		727
		728	void SDL_QuitSubSystem (U32 flags)
		729
673	SDL_Quit ()	730	void SDL_Quit ()
		731
		732	int SDL_GL_SetAttribute (int attr, int value)
		733
		734	int SDL_GL_GetAttribute (int attr)
		735	CODE:
		736	if (SDL_GL_GetAttribute (attr, &RETVAL))
		737	XSRETURN_UNDEF;
		738	OUTPUT:
		739	RETVAL
674		740
675	void	741	void
676	SDL_ListModes (int rgb, int alpha)	742	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	743	PPCODE:
678	{	744	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	756	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	757	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	758	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		759
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	760	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);	761	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		762
700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	763	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
701		764
702	if (m && m != (SDL_Rect **)-1)	765	if (m && m != (SDL_Rect **)-1)
703	while (*m)	766	while (*m)
704	{	767	{
705	if ((m)->w >= 800 && (m)->h >= 480)	768	if ((m)->w >= 400 && (m)->h >= 300)
706	{	769	{
707	AV *av = newAV ();	770	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	771	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	772	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	773	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	815	SDL_GetKeyName (int sym)
753		816
754	int	817	int
755	SDL_GetAppState ()	818	SDL_GetAppState ()
756		819
		820	int
		821	SDL_GetModState ()
		822
757	void	823	void
758	poll_events ()	824	poll_events ()
759	PPCODE:	825	PPCODE:
760	{	826	{
761	SDL_Event ev;	827	SDL_Event ev;
…		…
770	{	836	{
771	case SDL_KEYDOWN:	837	case SDL_KEYDOWN:
772	case SDL_KEYUP:	838	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	839	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	840	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	841	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 */	842	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);	843	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	844	break;
779		845
780	case SDL_ACTIVEEVENT:	846	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	847	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	865	x = ev.motion.x;
800	y = ev.motion.y;	866	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	867	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	868	}
803		869
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	870	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	871	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	872	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	873	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	874	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	875	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	876	}
811	break;	877	break;
812		878
813	case SDL_MOUSEBUTTONDOWN:	879	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	880	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	881	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		882
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	883	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	884	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	885	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	886	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
894	}	960	}
895	}	961	}
896	#endif	962	#endif
897	}	963	}
898		964
899	void	965	int
900	add_font (char *file)	966	add_font (char *file)
901	CODE:	967	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	968	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		969	OUTPUT:
		970	RETVAL
903		971
904	void	972	void
905	load_image_inline (SV *image_)	973	load_image_inline (SV *image_)
906	ALIAS:	974	ALIAS:
907	load_image_file = 1	975	load_image_file = 1
…		…
1165	{	1233	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1234	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1235
1168	do	1236	do
1169	{	1237	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1238	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1239
1172	if (run && shape_attr_p (run))	1240	if (run && shape_attr_p (run))
1173	{	1241	{
1174	PangoRectangle extents;	1242	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1243	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1279	int	1347	int
1280	descent (DC::Layout self)	1348	descent (DC::Layout self)
1281	CODE:	1349	CODE:
1282	{	1350	{
1283	PangoRectangle rect;	1351	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1352	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1353	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1354	RETVAL = PANGO_DESCENT (rect);
1287	}	1355	}
1288	OUTPUT:	1356	OUTPUT:
1289	RETVAL	1357	RETVAL
…		…
1301		1369
1302	void	1370	void
1303	cursor_pos (DC::Layout self, int index)	1371	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1372	PPCODE:
1305	{	1373	{
1306	PangoRectangle strong_pos;	1374	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1375	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1376
1309	EXTEND (SP, 3);	1377	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1378	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1379	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1380	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1381	}
1314		1382
1315	void	1383	void
1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)	1384	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1385	PPCODE:
1318	{	1386	{
1319	int line, x;	1387	int line, x;
1320		1388
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1389	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1390	#if !PANGO_VERSION_CHECK (1, 17, 3)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1391	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1392	--line;
		1393	#endif
1324	EXTEND (SP, 2);	1394	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1395	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1396	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1397	}
1328		1398
1329	void	1399	void
1330	line_x_to_index (DC::Layout self, int line, int x)	1400	line_x_to_index (DC::Layout self, int line, int x)
…		…
1334	int index, trailing;	1404	int index, trailing;
1335		1405
1336	if (line < 0)	1406	if (line < 0)
1337	XSRETURN_EMPTY;	1407	XSRETURN_EMPTY;
1338		1408
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1409	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1410	XSRETURN_EMPTY; /* do better */
1341		1411
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1412	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1413
1344	EXTEND (SP, 2);	1414	EXTEND (SP, 2);
…		…
1661	uint8_t ext, cmd;	1731	uint8_t ext, cmd;
1662		1732
1663	do	1733	do
1664	{	1734	{
1665	ext = *data++;	1735	ext = *data++;
1666	cmd = ext & 0x3f;	1736	cmd = ext & 0x7f;
1667		1737
1668	if (cmd < 4)	1738	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	1739	cell->darkness = 255 - ext * 64 + 1;
1670	else if (cmd == 5) // health	1740	else if (cmd == 5) // health
1671	{	1741	{
…		…
1674	}	1744	}
1675	else if (cmd == 6) // monster width	1745	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	1746	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	1747	else if (cmd == 0x47)
1678	{	1748	{
1679	if (*data == 4)	1749	if (*data == 1) cell->player = data [1];
1680	; // decode player count	1750	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1751	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1752	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681		1753
1682	data += *data + 1;	1754	data += *data + 1;
1683	}	1755	}
1684	else if (cmd == 8) // cell flags	1756	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	1757	cell->flags = *data++;
…		…
1715	}	1787	}
1716	}	1788	}
1717	}	1789	}
1718	}	1790	}
1719	else	1791	else
1720	cell->darkness = 0;	1792	CELL_CLEAR (cell);
1721	}	1793	}
1722	}	1794	}
1723	OUTPUT:	1795	OUTPUT:
1724	RETVAL	1796	RETVAL
1725		1797
…		…
1777	}	1849	}
1778	OUTPUT:	1850	OUTPUT:
1779	RETVAL	1851	RETVAL
1780		1852
1781	void	1853	void
1782	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1854	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783	CODE:	1855	CODE:
1784	{	1856	{
1785	int x, y, z;	1857	int x, y, z;
1786		1858
1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1859	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1860	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1861	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790	smooth_key skey;	1862	smooth_key skey;
1791		1863	int pl_x, pl_y;
		1864	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	1865	rc_t *rc = rc_alloc ();
1793	rc_key_t key;	1866	rc_key_t key;
1794	rc_array_t *arr;	1867	rc_array_t *arr;
		1868
		1869	pl_tex.name = 0;
1795		1870
1796	// thats current max. sorry.	1871	// thats current max. sorry.
1797	if (sw > 255) sw = 255;	1872	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	1873	if (sh > 255) sh = 255;
1799		1874
…		…
1854	tileid tile = cell->tile [z];	1929	tileid tile = cell->tile [z];
1855		1930
1856	if (tile)	1931	if (tile)
1857	{	1932	{
1858	maptex tex = self->tex [tile];	1933	maptex tex = self->tex [tile];
1859	int px, py;	1934	int px = (x + 1) * T - tex.w;
		1935	int py = (y + 1) * T - tex.h;
1860		1936
1861	if (key.texname != tex.name)	1937	if (key.texname != tex.name)
1862	{	1938	{
1863	if (!tex.name)	1939	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	1940	tex = self->tex [2]; /* missing, replace by noface */
1865		1941
1866	key.texname = tex.name;	1942	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	1943	arr = rc_array (rc, &key);
1868	}	1944	}
1869		1945
1870	px = (x + 1) * T - tex.w;	1946	if (expect_false (cell->player == player) && expect_false (z == 2))
1871	py = (y + 1) * T - tex.h;	1947	{
		1948	pl_x = px;
		1949	pl_y = py;
		1950	pl_tex = tex;
		1951	continue;
		1952	}
1872		1953
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1954	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1955	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1956	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1957	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877		1958
1878	if (cell->flags && z == 2)	1959	if (expect_false (cell->flags) && expect_false (z == 2))
1879	{	1960	{
1880	// overlays such as the speech bubble, probably more to come	1961	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)	1962	if (cell->flags & 1)
1882	{	1963	{
1883	maptex tex = self->tex [1];	1964	maptex tex = self->tex [1];
…		…
2020	glDisable (GL_TEXTURE_2D);	2101	glDisable (GL_TEXTURE_2D);
2021	key.texname = -1;	2102	key.texname = -1;
2022	}	2103	}
2023		2104
2024	hv_clear (smooth);	2105	hv_clear (smooth);
		2106	}
		2107
		2108	if (pl_tex.name)
		2109	{
		2110	maptex tex = pl_tex;
		2111	int px = pl_x + sdx;
		2112	int py = pl_y + sdy;
		2113
		2114	key.texname = tex.name;
		2115	arr = rc_array (rc, &key);
		2116
		2117	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2118	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2119	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2120	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2121
		2122	rc_draw (rc);
2025	}	2123	}
2026		2124
2027	glDisable (GL_BLEND);	2125	glDisable (GL_BLEND);
2028	rc_free (rc);	2126	rc_free (rc);
2029		2127
…		…
2266	else	2364	else
2267	*data++ = 0;	2365	*data++ = 0;
2268	}	2366	}
2269	}	2367	}
2270		2368
		2369	/* if size is wh + 5 then no data has been found /
		2370	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2371	{
2271	SvPOK_only (data_sv);	2372	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2373	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2374	}
		2375
2273	RETVAL = data_sv;	2376	RETVAL = data_sv;
2274	}	2377	}
2275	OUTPUT:	2378	OUTPUT:
2276	RETVAL	2379	RETVAL
2277		2380
2278	void	2381	void
2279	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2382	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2383	PPCODE:
2281	{	2384	{
2282	int x, y, z;	2385	int x, y, z;
2283	int w, h;	2386	int w, h;
2284	int x1, y1;	2387	int x1, y1;
		2388	STRLEN len;
		2389	uint8_t data, end;
		2390
		2391	len = SvLEN (data_sv);
		2392	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2393	data = SvPVbyte_nolen (data_sv);
		2394	end = data + len + 8;
		2395
		2396	if (len < 5)
		2397	XSRETURN_EMPTY;
2285		2398
2286	if (*data++ != 0)	2399	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2400	XSRETURN_EMPTY; /* version mismatch */
2288		2401
2289	w = data++ << 8; w \|= data++;	2402	w = data++ << 8; w \|= data++;
…		…
2304	{	2417	{
2305	maprow *row = map_get_row (self, y);	2418	maprow *row = map_get_row (self, y);
2306		2419
2307	for (x = x0; x < x1; x++)	2420	for (x = x0; x < x1; x++)
2308	{	2421	{
		2422	uint8_t flags;
		2423
		2424	if (data + 7 >= end)
		2425	XSRETURN_EMPTY;
		2426
2309	uint8_t flags = *data++;	2427	flags = *data++;
2310		2428
2311	if (flags)	2429	if (flags)
2312	{	2430	{
2313	mapcell *cell = row_get_cell (row, x);	2431	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2432	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2435	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2318	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2436	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2319		2437
2320	if (cell->darkness == 0)	2438	if (cell->darkness == 0)
2321	{	2439	{
2322	cell->darkness = 0;	2440	/cell->darkness = 0;/
		2441	EXTEND (SP, 3);
2323		2442
2324	for (z = 0; z <= 2; z++)	2443	for (z = 0; z <= 2; z++)
2325	{	2444	{
2326	tileid t = tile [z];	2445	tileid t = tile [z];
2327		2446
2328	if (t >= self->texs \|\| (t && !self->tex [t].name))	2447	if (t >= self->texs \|\| (t && !self->tex [t].name))
2329	{	2448	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2449	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2450	need_texid (self, t);
2332	}	2451	}
2333		2452
2334	cell->tile [z] = t;	2453	cell->tile [z] = t;
2335	}	2454	}
…		…
2846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2965	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2847	CODE:	2966	CODE:
2848	if (gl.SeparableFilter2D)	2967	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2968	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		2969
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2970	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		2971
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2972	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		2973
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2974	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		2975

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC vs. Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC vs.
Revision 1.268 by root, Sun Jul 20 02:57:43 2008 UTC