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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.256 by root, Mon Mar 24 00:24:46 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	{
…		…
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)
724	{
725	AV *av = newAV ();	761	AV *av = newAV ();
726	av_push (av, newSViv ((*m)->w));	762	av_push (av, newSViv ((*m)->w));
727	av_push (av, newSViv ((*m)->h));	763	av_push (av, newSViv ((*m)->h));
728	av_push (av, newSViv (rgb));	764	av_push (av, newSViv (rgb));
729	av_push (av, newSViv (alpha));	765	av_push (av, newSViv (alpha));
730	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
731	}
732		767
733	++m;	768	++m;
734	}	769	}
735	}	770	}
736		771
…		…
915	}	950	}
916	}	951	}
917	#endif	952	#endif
918	}	953	}
919		954
920	void	955	int
921	add_font (char *file)	956	add_font (char *file)
922	CODE:	957	CODE:
923	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	958	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		959	OUTPUT:
		960	RETVAL
924		961
925	void	962	void
926	load_image_inline (SV *image_)	963	load_image_inline (SV *image_)
927	ALIAS:	964	ALIAS:
928	load_image_file = 1	965	load_image_file = 1
…		…
1684	uint8_t ext, cmd;	1721	uint8_t ext, cmd;
1685		1722
1686	do	1723	do
1687	{	1724	{
1688	ext = *data++;	1725	ext = *data++;
1689	cmd = ext & 0x3f;	1726	cmd = ext & 0x7f;
1690		1727
1691	if (cmd < 4)	1728	if (cmd < 4)
1692	cell->darkness = 255 - ext * 64 + 1;	1729	cell->darkness = 255 - ext * 64 + 1;
1693	else if (cmd == 5) // health	1730	else if (cmd == 5) // health
1694	{	1731	{
…		…
1697	}	1734	}
1698	else if (cmd == 6) // monster width	1735	else if (cmd == 6) // monster width
1699	cell->stat_width = *data++ + 1;	1736	cell->stat_width = *data++ + 1;
1700	else if (cmd == 0x47)	1737	else if (cmd == 0x47)
1701	{	1738	{
1702	if (*data == 4)	1739	if (*data == 1) cell->player = data [1];
1703	; // 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);
1704		1743
1705	data += *data + 1;	1744	data += *data + 1;
1706	}	1745	}
1707	else if (cmd == 8) // cell flags	1746	else if (cmd == 8) // cell flags
1708	cell->flags = *data++;	1747	cell->flags = *data++;
…		…
1800	}	1839	}
1801	OUTPUT:	1840	OUTPUT:
1802	RETVAL	1841	RETVAL
1803		1842
1804	void	1843	void
1805	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)
1806	CODE:	1845	CODE:
1807	{	1846	{
1808	int x, y, z;	1847	int x, y, z;
1809		1848
1810	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1849	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1811	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
1812	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)
1813	smooth_key skey;	1852	smooth_key skey;
1814		1853	int pl_x, pl_y;
		1854	maptex pl_tex;
1815	rc_t *rc = rc_alloc ();	1855	rc_t *rc = rc_alloc ();
1816	rc_key_t key;	1856	rc_key_t key;
1817	rc_array_t *arr;	1857	rc_array_t *arr;
		1858
		1859	pl_tex.name = 0;
1818		1860
1819	// thats current max. sorry.	1861	// thats current max. sorry.
1820	if (sw > 255) sw = 255;	1862	if (sw > 255) sw = 255;
1821	if (sh > 255) sh = 255;	1863	if (sh > 255) sh = 255;
1822		1864
…		…
1877	tileid tile = cell->tile [z];	1919	tileid tile = cell->tile [z];
1878		1920
1879	if (tile)	1921	if (tile)
1880	{	1922	{
1881	maptex tex = self->tex [tile];	1923	maptex tex = self->tex [tile];
1882	int px, py;	1924	int px = (x + 1) * T - tex.w;
		1925	int py = (y + 1) * T - tex.h;
1883		1926
1884	if (key.texname != tex.name)	1927	if (key.texname != tex.name)
1885	{	1928	{
1886	if (!tex.name)	1929	if (!tex.name)
1887	tex = self->tex [2]; /* missing, replace by noface */	1930	tex = self->tex [2]; /* missing, replace by noface */
1888		1931
1889	key.texname = tex.name;	1932	key.texname = tex.name;
1890	arr = rc_array (rc, &key);	1933	arr = rc_array (rc, &key);
1891	}	1934	}
1892		1935
1893	px = (x + 1) * T - tex.w;	1936	if (expect_false (cell->player == player) && expect_false (z == 2))
1894	py = (y + 1) * T - tex.h;	1937	{
		1938	pl_x = px;
		1939	pl_y = py;
		1940	pl_tex = tex;
		1941	continue;
		1942	}
1895		1943
1896	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	1944	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1897	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);
1898	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);
1899	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);
1900		1948
1901	if (cell->flags && z == 2)	1949	if (expect_false (cell->flags) && expect_false (z == 2))
1902	{	1950	{
1903	// overlays such as the speech bubble, probably more to come	1951	// overlays such as the speech bubble, probably more to come
1904	if (cell->flags & 1)	1952	if (cell->flags & 1)
1905	{	1953	{
1906	maptex tex = self->tex [1];	1954	maptex tex = self->tex [1];
…		…
2043	glDisable (GL_TEXTURE_2D);	2091	glDisable (GL_TEXTURE_2D);
2044	key.texname = -1;	2092	key.texname = -1;
2045	}	2093	}
2046		2094
2047	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);
2048	}	2113	}
2049		2114
2050	glDisable (GL_BLEND);	2115	glDisable (GL_BLEND);
2051	rc_free (rc);	2116	rc_free (rc);
2052		2117
…		…
2289	else	2354	else
2290	*data++ = 0;	2355	*data++ = 0;
2291	}	2356	}
2292	}	2357	}
2293		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	{
2294	SvPOK_only (data_sv);	2362	SvPOK_only (data_sv);
2295	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2363	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2364	}
		2365
2296	RETVAL = data_sv;	2366	RETVAL = data_sv;
2297	}	2367	}
2298	OUTPUT:	2368	OUTPUT:
2299	RETVAL	2369	RETVAL
2300		2370
2301	void	2371	void
2302	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)
2303	PPCODE:	2373	PPCODE:
2304	{	2374	{
2305	int x, y, z;	2375	int x, y, z;
2306	int w, h;	2376	int w, h;
2307	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;
2308		2388
2309	if (*data++ != 0)	2389	if (*data++ != 0)
2310	XSRETURN_EMPTY; /* version mismatch */	2390	XSRETURN_EMPTY; /* version mismatch */
2311		2391
2312	w = data++ << 8; w \|= data++;	2392	w = data++ << 8; w \|= data++;
…		…
2327	{	2407	{
2328	maprow *row = map_get_row (self, y);	2408	maprow *row = map_get_row (self, y);
2329		2409
2330	for (x = x0; x < x1; x++)	2410	for (x = x0; x < x1; x++)
2331	{	2411	{
		2412	uint8_t flags;
		2413
		2414	if (data + 7 >= end)
		2415	XSRETURN_EMPTY;
		2416
2332	uint8_t flags = *data++;	2417	flags = *data++;
2333		2418
2334	if (flags)	2419	if (flags)
2335	{	2420	{
2336	mapcell *cell = row_get_cell (row, x);	2421	mapcell *cell = row_get_cell (row, x);
2337	tileid tile[3] = { 0, 0, 0 };	2422	tileid tile[3] = { 0, 0, 0 };
…		…
2340	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2425	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2341	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2426	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2342		2427
2343	if (cell->darkness == 0)	2428	if (cell->darkness == 0)
2344	{	2429	{
2345	cell->darkness = 0;	2430	/cell->darkness = 0;/
		2431	EXTEND (SP, 3);
2346		2432
2347	for (z = 0; z <= 2; z++)	2433	for (z = 0; z <= 2; z++)
2348	{	2434	{
2349	tileid t = tile [z];	2435	tileid t = tile [z];
2350		2436
2351	if (t >= self->texs \|\| (t && !self->tex [t].name))	2437	if (t >= self->texs \|\| (t && !self->tex [t].name))
2352	{	2438	{
2353	XPUSHs (sv_2mortal (newSViv (t)));	2439	PUSHs (sv_2mortal (newSViv (t)));
2354	need_texid (self, t);	2440	need_texid (self, t);
2355	}	2441	}
2356		2442
2357	cell->tile [z] = t;	2443	cell->tile [z] = t;
2358	}	2444	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.256 by root, Mon Mar 24 00:24:46 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.256 by root, Mon Mar 24 00:24:46 2008 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC