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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

…		…
65	# include <netinet/in.h>	65	# include <netinet/in.h>
66	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
67	# include <inttypes.h>	67	# include <inttypes.h>
68	#endif	68	#endif
69		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
70	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71		80
72	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
73		82
74	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
…		…
76		85
77	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
78		87
79	/* mask out modifiers we are not interested in */	88	/* mask out modifiers we are not interested in */
80	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
81
82	#if 0
83	# define PARACHUTE SDL_INIT_NOPARACHUTE
84	#else
85	# define PARACHUTE 0
86	#endif
87		90
88	static AV *texture_av;	91	static AV *texture_av;
89		92
90	static struct	93	static struct
91	{	94	{
…		…
635	const_iv (KMOD_NUM),	638	const_iv (KMOD_NUM),
636	const_iv (KMOD_CAPS),	639	const_iv (KMOD_CAPS),
637	const_iv (KMOD_MODE),	640	const_iv (KMOD_MODE),
638		641
639	const_iv (MIX_DEFAULT_FORMAT),	642	const_iv (MIX_DEFAULT_FORMAT),
		643
		644	const_iv (SDL_INIT_TIMER),
		645	const_iv (SDL_INIT_AUDIO),
		646	const_iv (SDL_INIT_VIDEO),
		647	const_iv (SDL_INIT_CDROM),
		648	const_iv (SDL_INIT_JOYSTICK),
		649	const_iv (SDL_INIT_EVERYTHING),
		650	const_iv (SDL_INIT_NOPARACHUTE),
		651	const_iv (SDL_INIT_EVENTTHREAD),
		652
		653	const_iv (SDL_GL_RED_SIZE),
		654	const_iv (SDL_GL_GREEN_SIZE),
		655	const_iv (SDL_GL_BLUE_SIZE),
		656	const_iv (SDL_GL_ALPHA_SIZE),
		657	const_iv (SDL_GL_DOUBLEBUFFER),
		658	const_iv (SDL_GL_BUFFER_SIZE),
		659	const_iv (SDL_GL_DEPTH_SIZE),
		660	const_iv (SDL_GL_STENCIL_SIZE),
		661	const_iv (SDL_GL_ACCUM_RED_SIZE),
		662	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		663	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		665	const_iv (SDL_GL_STEREO),
		666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		667	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		668	const_iv (SDL_GL_ACCELERATED_VISUAL),
		669	const_iv (SDL_GL_SWAP_CONTROL)
640	# undef const_iv	670	# undef const_iv
641	};	671	};
642		672
643	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	673	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
680	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	710	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	711	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
682	#endif	712	#endif
683	}	713	}
684		714
685	char *
686	SDL_GetError ()	715	char *SDL_GetError ()
687		716
688	int	717	int SDL_Init (U32 flags)
689	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
690		718
691	void	719	int SDL_InitSubSystem (U32 flags)
		720
		721	void SDL_QuitSubSystem (U32 flags)
		722
692	SDL_Quit ()	723	void SDL_Quit ()
		724
		725	int SDL_GL_SetAttribute (int attr, int value)
		726
		727	int SDL_GL_GetAttribute (int attr)
		728	CODE:
		729	if (SDL_GL_GetAttribute (attr, &RETVAL))
		730	XSRETURN_UNDEF;
		731	OUTPUT:
		732	RETVAL
693		733
694	void	734	void
695	SDL_ListModes (int rgb, int alpha)	735	SDL_ListModes (int rgb, int alpha)
696	PPCODE:	736	PPCODE:
697	{	737	{
…		…
709	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	749	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	750	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	751	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712		752
713	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	753	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714	#if SDL_VERSION_ATLEAST(1,2,10)
715	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	754	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717	#endif
718		755
719	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	756	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
720		757
721	if (m && m != (SDL_Rect **)-1)	758	if (m && m != (SDL_Rect **)-1)
722	while (*m)	759	while (*m)
723	{	760	{
724	if ((m)->w >= 800 && (m)->h >= 480)
725	{
726	AV *av = newAV ();	761	AV *av = newAV ();
727	av_push (av, newSViv ((*m)->w));	762	av_push (av, newSViv ((*m)->w));
728	av_push (av, newSViv ((*m)->h));	763	av_push (av, newSViv ((*m)->h));
729	av_push (av, newSViv (rgb));	764	av_push (av, newSViv (rgb));
730	av_push (av, newSViv (alpha));	765	av_push (av, newSViv (alpha));
731	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
732	}
733		767
734	++m;	768	++m;
735	}	769	}
736	}	770	}
737		771
…		…
1687	uint8_t ext, cmd;	1721	uint8_t ext, cmd;
1688		1722
1689	do	1723	do
1690	{	1724	{
1691	ext = *data++;	1725	ext = *data++;
1692	cmd = ext & 0x3f;	1726	cmd = ext & 0x7f;
1693		1727
1694	if (cmd < 4)	1728	if (cmd < 4)
1695	cell->darkness = 255 - ext * 64 + 1;	1729	cell->darkness = 255 - ext * 64 + 1;
1696	else if (cmd == 5) // health	1730	else if (cmd == 5) // health
1697	{	1731	{
…		…
1700	}	1734	}
1701	else if (cmd == 6) // monster width	1735	else if (cmd == 6) // monster width
1702	cell->stat_width = *data++ + 1;	1736	cell->stat_width = *data++ + 1;
1703	else if (cmd == 0x47)	1737	else if (cmd == 0x47)
1704	{	1738	{
1705	if (*data == 4)	1739	if (*data == 1) cell->player = data [1];
1706	; // decode player count	1740	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1741	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1742	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707		1743
1708	data += *data + 1;	1744	data += *data + 1;
1709	}	1745	}
1710	else if (cmd == 8) // cell flags	1746	else if (cmd == 8) // cell flags
1711	cell->flags = *data++;	1747	cell->flags = *data++;
…		…
1803	}	1839	}
1804	OUTPUT:	1840	OUTPUT:
1805	RETVAL	1841	RETVAL
1806		1842
1807	void	1843	void
1808	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1844	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1809	CODE:	1845	CODE:
1810	{	1846	{
1811	int x, y, z;	1847	int x, y, z;
1812		1848
1813	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1849	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1814	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1850	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	1851	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816	smooth_key skey;	1852	smooth_key skey;
1817		1853	int pl_x, pl_y;
		1854	maptex pl_tex;
1818	rc_t *rc = rc_alloc ();	1855	rc_t *rc = rc_alloc ();
1819	rc_key_t key;	1856	rc_key_t key;
1820	rc_array_t *arr;	1857	rc_array_t *arr;
		1858
		1859	pl_tex.name = 0;
1821		1860
1822	// thats current max. sorry.	1861	// thats current max. sorry.
1823	if (sw > 255) sw = 255;	1862	if (sw > 255) sw = 255;
1824	if (sh > 255) sh = 255;	1863	if (sh > 255) sh = 255;
1825		1864
…		…
1880	tileid tile = cell->tile [z];	1919	tileid tile = cell->tile [z];
1881		1920
1882	if (tile)	1921	if (tile)
1883	{	1922	{
1884	maptex tex = self->tex [tile];	1923	maptex tex = self->tex [tile];
1885	int px, py;	1924	int px = (x + 1) * T - tex.w;
		1925	int py = (y + 1) * T - tex.h;
1886		1926
1887	if (key.texname != tex.name)	1927	if (key.texname != tex.name)
1888	{	1928	{
1889	if (!tex.name)	1929	if (!tex.name)
1890	tex = self->tex [2]; /* missing, replace by noface */	1930	tex = self->tex [2]; /* missing, replace by noface */
1891		1931
1892	key.texname = tex.name;	1932	key.texname = tex.name;
1893	arr = rc_array (rc, &key);	1933	arr = rc_array (rc, &key);
1894	}	1934	}
1895		1935
1896	px = (x + 1) * T - tex.w;	1936	if (expect_false (cell->player == player) && expect_false (z == 2))
1897	py = (y + 1) * T - tex.h;	1937	{
		1938	pl_x = px;
		1939	pl_y = py;
		1940	pl_tex = tex;
		1941	continue;
		1942	}
1898		1943
1899	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1944	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1945	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	1946	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	1947	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903		1948
1904	if (cell->flags && z == 2)	1949	if (expect_false (cell->flags) && expect_false (z == 2))
1905	{	1950	{
1906	// overlays such as the speech bubble, probably more to come	1951	// overlays such as the speech bubble, probably more to come
1907	if (cell->flags & 1)	1952	if (cell->flags & 1)
1908	{	1953	{
1909	maptex tex = self->tex [1];	1954	maptex tex = self->tex [1];
…		…
2046	glDisable (GL_TEXTURE_2D);	2091	glDisable (GL_TEXTURE_2D);
2047	key.texname = -1;	2092	key.texname = -1;
2048	}	2093	}
2049		2094
2050	hv_clear (smooth);	2095	hv_clear (smooth);
		2096	}
		2097
		2098	if (pl_tex.name)
		2099	{
		2100	maptex tex = pl_tex;
		2101	int px = pl_x + pdx;
		2102	int py = pl_y + pdy;
		2103
		2104	key.texname = tex.name;
		2105	arr = rc_array (rc, &key);
		2106
		2107	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2108	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2109	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2110	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2111
		2112	rc_draw (rc);
2051	}	2113	}
2052		2114
2053	glDisable (GL_BLEND);	2115	glDisable (GL_BLEND);
2054	rc_free (rc);	2116	rc_free (rc);
2055		2117
…		…
2292	else	2354	else
2293	*data++ = 0;	2355	*data++ = 0;
2294	}	2356	}
2295	}	2357	}
2296		2358
		2359	/* if size is wh + 5 then no data has been found /
		2360	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2361	{
2297	SvPOK_only (data_sv);	2362	SvPOK_only (data_sv);
2298	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2363	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2364	}
		2365
2299	RETVAL = data_sv;	2366	RETVAL = data_sv;
2300	}	2367	}
2301	OUTPUT:	2368	OUTPUT:
2302	RETVAL	2369	RETVAL
2303		2370
2304	void	2371	void
2305	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2372	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306	PPCODE:	2373	PPCODE:
2307	{	2374	{
2308	int x, y, z;	2375	int x, y, z;
2309	int w, h;	2376	int w, h;
2310	int x1, y1;	2377	int x1, y1;
		2378	STRLEN len;
		2379	uint8_t data, end;
		2380
		2381	len = SvLEN (data_sv);
		2382	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2383	data = SvPVbyte_nolen (data_sv);
		2384	end = data + len + 8;
		2385
		2386	if (len < 5)
		2387	XSRETURN_EMPTY;
2311		2388
2312	if (*data++ != 0)	2389	if (*data++ != 0)
2313	XSRETURN_EMPTY; /* version mismatch */	2390	XSRETURN_EMPTY; /* version mismatch */
2314		2391
2315	w = data++ << 8; w \|= data++;	2392	w = data++ << 8; w \|= data++;
…		…
2330	{	2407	{
2331	maprow *row = map_get_row (self, y);	2408	maprow *row = map_get_row (self, y);
2332		2409
2333	for (x = x0; x < x1; x++)	2410	for (x = x0; x < x1; x++)
2334	{	2411	{
		2412	uint8_t flags;
		2413
		2414	if (data + 7 >= end)
		2415	XSRETURN_EMPTY;
		2416
2335	uint8_t flags = *data++;	2417	flags = *data++;
2336		2418
2337	if (flags)	2419	if (flags)
2338	{	2420	{
2339	mapcell *cell = row_get_cell (row, x);	2421	mapcell *cell = row_get_cell (row, x);
2340	tileid tile[3] = { 0, 0, 0 };	2422	tileid tile[3] = { 0, 0, 0 };
…		…
2343	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2425	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2344	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2426	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2345		2427
2346	if (cell->darkness == 0)	2428	if (cell->darkness == 0)
2347	{	2429	{
2348	cell->darkness = 0;	2430	/cell->darkness = 0;/
		2431	EXTEND (SP, 3);
2349		2432
2350	for (z = 0; z <= 2; z++)	2433	for (z = 0; z <= 2; z++)
2351	{	2434	{
2352	tileid t = tile [z];	2435	tileid t = tile [z];
2353		2436
2354	if (t >= self->texs \|\| (t && !self->tex [t].name))	2437	if (t >= self->texs \|\| (t && !self->tex [t].name))
2355	{	2438	{
2356	XPUSHs (sv_2mortal (newSViv (t)));	2439	PUSHs (sv_2mortal (newSViv (t)));
2357	need_texid (self, t);	2440	need_texid (self, t);
2358	}	2441	}
2359		2442
2360	cell->tile [z] = t;	2443	cell->tile [z] = t;
2361	}	2444	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.258 by root, Thu Apr 10 14:35:50 2008 UTC vs. Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC