[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.265 by root, Fri Jul 18 22:56:11 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	{
…		…
185		188
186	static void	189	static void
187	layout_update_font (DC__Layout self)	190	layout_update_font (DC__Layout self)
188	{	191	{
189	/* 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
190	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
191	*/	194	*/
192	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
193		196
194	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
195	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
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));
…		…
673	CODE:	703	CODE:
674	{	704	{
675	opengl_fontmap = pango_opengl_font_map_new ();	705	opengl_fontmap = pango_opengl_font_map_new ();
676	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	706	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);	707	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		708	/pango_context_set_font_description (opengl_context, default_font);/
678	#if PANGO_VERSION_CHECK (1, 15, 2)	709	#if PANGO_VERSION_CHECK (1, 15, 2)
679	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	710	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
680	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	711	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
681	#endif	712	#endif
682	}	713	}
683		714
684	char *
685	SDL_GetError ()	715	char *SDL_GetError ()
686		716
687	int	717	int SDL_Init (U32 flags)
688	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
689		718
690	void	719	int SDL_InitSubSystem (U32 flags)
		720
		721	void SDL_QuitSubSystem (U32 flags)
		722
691	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
692		733
693	void	734	void
694	SDL_ListModes (int rgb, int alpha)	735	SDL_ListModes (int rgb, int alpha)
695	PPCODE:	736	PPCODE:
696	{	737	{
…		…
708	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	749	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
709	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	750	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
710	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	751	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
711		752
712	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	753	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);	754	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
716	#endif
717		755
718	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	756	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
719		757
720	if (m && m != (SDL_Rect **)-1)	758	if (m && m != (SDL_Rect **)-1)
721	while (*m)	759	while (*m)
722	{	760	{
723	if ((m)->w >= 800 && (m)->h >= 480)	761	if ((m)->w >= 400 && (m)->h >= 300)
724	{	762	{
725	AV *av = newAV ();	763	AV *av = newAV ();
726	av_push (av, newSViv ((*m)->w));	764	av_push (av, newSViv ((*m)->w));
727	av_push (av, newSViv ((*m)->h));	765	av_push (av, newSViv ((*m)->h));
728	av_push (av, newSViv (rgb));	766	av_push (av, newSViv (rgb));
…		…
769	char *	807	char *
770	SDL_GetKeyName (int sym)	808	SDL_GetKeyName (int sym)
771		809
772	int	810	int
773	SDL_GetAppState ()	811	SDL_GetAppState ()
		812
		813	int
		814	SDL_GetModState ()
774		815
775	void	816	void
776	poll_events ()	817	poll_events ()
777	PPCODE:	818	PPCODE:
778	{	819	{
…		…
912	}	953	}
913	}	954	}
914	#endif	955	#endif
915	}	956	}
916		957
917	void	958	int
918	add_font (char *file)	959	add_font (char *file)
919	CODE:	960	CODE:
920	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	961	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		962	OUTPUT:
		963	RETVAL
921		964
922	void	965	void
923	load_image_inline (SV *image_)	966	load_image_inline (SV *image_)
924	ALIAS:	967	ALIAS:
925	load_image_file = 1	968	load_image_file = 1
…		…
1681	uint8_t ext, cmd;	1724	uint8_t ext, cmd;
1682		1725
1683	do	1726	do
1684	{	1727	{
1685	ext = *data++;	1728	ext = *data++;
1686	cmd = ext & 0x3f;	1729	cmd = ext & 0x7f;
1687		1730
1688	if (cmd < 4)	1731	if (cmd < 4)
1689	cell->darkness = 255 - ext * 64 + 1;	1732	cell->darkness = 255 - ext * 64 + 1;
1690	else if (cmd == 5) // health	1733	else if (cmd == 5) // health
1691	{	1734	{
…		…
1694	}	1737	}
1695	else if (cmd == 6) // monster width	1738	else if (cmd == 6) // monster width
1696	cell->stat_width = *data++ + 1;	1739	cell->stat_width = *data++ + 1;
1697	else if (cmd == 0x47)	1740	else if (cmd == 0x47)
1698	{	1741	{
1699	if (*data == 4)	1742	if (*data == 1) cell->player = data [1];
1700	; // decode player count	1743	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1744	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1745	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1701		1746
1702	data += *data + 1;	1747	data += *data + 1;
1703	}	1748	}
1704	else if (cmd == 8) // cell flags	1749	else if (cmd == 8) // cell flags
1705	cell->flags = *data++;	1750	cell->flags = *data++;
…		…
1797	}	1842	}
1798	OUTPUT:	1843	OUTPUT:
1799	RETVAL	1844	RETVAL
1800		1845
1801	void	1846	void
1802	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	1847	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1803	CODE:	1848	CODE:
1804	{	1849	{
1805	int x, y, z;	1850	int x, y, z;
1806		1851
1807	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1852	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1808	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1853	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)	1854	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1810	smooth_key skey;	1855	smooth_key skey;
1811		1856	int pl_x, pl_y;
		1857	maptex pl_tex;
1812	rc_t *rc = rc_alloc ();	1858	rc_t *rc = rc_alloc ();
1813	rc_key_t key;	1859	rc_key_t key;
1814	rc_array_t *arr;	1860	rc_array_t *arr;
		1861
		1862	pl_tex.name = 0;
1815		1863
1816	// thats current max. sorry.	1864	// thats current max. sorry.
1817	if (sw > 255) sw = 255;	1865	if (sw > 255) sw = 255;
1818	if (sh > 255) sh = 255;	1866	if (sh > 255) sh = 255;
1819		1867
…		…
1874	tileid tile = cell->tile [z];	1922	tileid tile = cell->tile [z];
1875		1923
1876	if (tile)	1924	if (tile)
1877	{	1925	{
1878	maptex tex = self->tex [tile];	1926	maptex tex = self->tex [tile];
1879	int px, py;	1927	int px = (x + 1) * T - tex.w;
		1928	int py = (y + 1) * T - tex.h;
1880		1929
1881	if (key.texname != tex.name)	1930	if (key.texname != tex.name)
1882	{	1931	{
1883	if (!tex.name)	1932	if (!tex.name)
1884	tex = self->tex [2]; /* missing, replace by noface */	1933	tex = self->tex [2]; /* missing, replace by noface */
1885		1934
1886	key.texname = tex.name;	1935	key.texname = tex.name;
1887	arr = rc_array (rc, &key);	1936	arr = rc_array (rc, &key);
1888	}	1937	}
1889		1938
1890	px = (x + 1) * T - tex.w;	1939	if (expect_false (cell->player == player) && expect_false (z == 2))
1891	py = (y + 1) * T - tex.h;	1940	{
		1941	pl_x = px;
		1942	pl_y = py;
		1943	pl_tex = tex;
		1944	continue;
		1945	}
1892		1946
1893	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1947	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1894	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	1948	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);	1949	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);	1950	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1897		1951
1898	if (cell->flags && z == 2)	1952	if (expect_false (cell->flags) && expect_false (z == 2))
1899	{	1953	{
1900	// overlays such as the speech bubble, probably more to come	1954	// overlays such as the speech bubble, probably more to come
1901	if (cell->flags & 1)	1955	if (cell->flags & 1)
1902	{	1956	{
1903	maptex tex = self->tex [1];	1957	maptex tex = self->tex [1];
…		…
2040	glDisable (GL_TEXTURE_2D);	2094	glDisable (GL_TEXTURE_2D);
2041	key.texname = -1;	2095	key.texname = -1;
2042	}	2096	}
2043		2097
2044	hv_clear (smooth);	2098	hv_clear (smooth);
		2099	}
		2100
		2101	if (pl_tex.name)
		2102	{
		2103	maptex tex = pl_tex;
		2104	int px = pl_x + pdx;
		2105	int py = pl_y + pdy;
		2106
		2107	key.texname = tex.name;
		2108	arr = rc_array (rc, &key);
		2109
		2110	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2111	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2112	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2113	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2114
		2115	rc_draw (rc);
2045	}	2116	}
2046		2117
2047	glDisable (GL_BLEND);	2118	glDisable (GL_BLEND);
2048	rc_free (rc);	2119	rc_free (rc);
2049		2120
…		…
2286	else	2357	else
2287	*data++ = 0;	2358	*data++ = 0;
2288	}	2359	}
2289	}	2360	}
2290		2361
		2362	/* if size is wh + 5 then no data has been found /
		2363	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2364	{
2291	SvPOK_only (data_sv);	2365	SvPOK_only (data_sv);
2292	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2366	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2367	}
		2368
2293	RETVAL = data_sv;	2369	RETVAL = data_sv;
2294	}	2370	}
2295	OUTPUT:	2371	OUTPUT:
2296	RETVAL	2372	RETVAL
2297		2373
2298	void	2374	void
2299	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2375	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2300	PPCODE:	2376	PPCODE:
2301	{	2377	{
2302	int x, y, z;	2378	int x, y, z;
2303	int w, h;	2379	int w, h;
2304	int x1, y1;	2380	int x1, y1;
		2381	STRLEN len;
		2382	uint8_t data, end;
		2383
		2384	len = SvLEN (data_sv);
		2385	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2386	data = SvPVbyte_nolen (data_sv);
		2387	end = data + len + 8;
		2388
		2389	if (len < 5)
		2390	XSRETURN_EMPTY;
2305		2391
2306	if (*data++ != 0)	2392	if (*data++ != 0)
2307	XSRETURN_EMPTY; /* version mismatch */	2393	XSRETURN_EMPTY; /* version mismatch */
2308		2394
2309	w = data++ << 8; w \|= data++;	2395	w = data++ << 8; w \|= data++;
…		…
2324	{	2410	{
2325	maprow *row = map_get_row (self, y);	2411	maprow *row = map_get_row (self, y);
2326		2412
2327	for (x = x0; x < x1; x++)	2413	for (x = x0; x < x1; x++)
2328	{	2414	{
		2415	uint8_t flags;
		2416
		2417	if (data + 7 >= end)
		2418	XSRETURN_EMPTY;
		2419
2329	uint8_t flags = *data++;	2420	flags = *data++;
2330		2421
2331	if (flags)	2422	if (flags)
2332	{	2423	{
2333	mapcell *cell = row_get_cell (row, x);	2424	mapcell *cell = row_get_cell (row, x);
2334	tileid tile[3] = { 0, 0, 0 };	2425	tileid tile[3] = { 0, 0, 0 };
…		…
2337	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2428	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2338	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2429	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2339		2430
2340	if (cell->darkness == 0)	2431	if (cell->darkness == 0)
2341	{	2432	{
2342	cell->darkness = 0;	2433	/cell->darkness = 0;/
		2434	EXTEND (SP, 3);
2343		2435
2344	for (z = 0; z <= 2; z++)	2436	for (z = 0; z <= 2; z++)
2345	{	2437	{
2346	tileid t = tile [z];	2438	tileid t = tile [z];
2347		2439
2348	if (t >= self->texs \|\| (t && !self->tex [t].name))	2440	if (t >= self->texs \|\| (t && !self->tex [t].name))
2349	{	2441	{
2350	XPUSHs (sv_2mortal (newSViv (t)));	2442	PUSHs (sv_2mortal (newSViv (t)));
2351	need_texid (self, t);	2443	need_texid (self, t);
2352	}	2444	}
2353		2445
2354	cell->tile [z] = t;	2446	cell->tile [z] = t;
2355	}	2447	}

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.265 by root, Fri Jul 18 22:56:11 2008 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.265 by root, Fri Jul 18 22:56:11 2008 UTC