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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC

…		…
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
		22	// microsoft vs. C
		23	# define sqrtf(x) sqrt(x)
		24	# define roundf(x) (int)(x)
		25	# define atan2f(x,y) atan2(x,y)
		26	# define M_PI 3.14159265f
22	#endif	27	#endif
23		28
24	#include <assert.h>	29	#include <assert.h>
25	#include <math.h>	30	#include <math.h>
26	#include <string.h>	31	#include <string.h>
…		…
109	av_push (texture_av, (SV *)(size_t)name);	114	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	115	glDeleteTextures (1, &name);
111	}	116	}
112		117
113	#include "texcache.c"	118	#include "texcache.c"
		119	#include "rendercache.c"
114		120
115	#include "pango-font.c"	121	#include "pango-font.c"
116	#include "pango-fontmap.c"	122	#include "pango-fontmap.c"
117	#include "pango-render.c"	123	#include "pango-render.c"
118		124
…		…
144	typedef struct cf_layout {	150	typedef struct cf_layout {
145	PangoLayout *pl;	151	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	152	float r, g, b, a; // default color for rgba mode
147	int base_height;	153	int base_height;
148	CFPlus__Font font;	154	CFPlus__Font font;
		155	rc_t *rc;
149	} *CFPlus__Layout;	156	} *CFPlus__Layout;
150		157
151	static CFPlus__Font default_font;	158	static CFPlus__Font default_font;
152	static PangoContext *opengl_context;	159	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	160	static PangoFontMap *opengl_fontmap;
…		…
196		203
197	typedef uint16_t tileid;	204	typedef uint16_t tileid;
198	typedef uint16_t faceid;	205	typedef uint16_t faceid;
199		206
200	typedef struct {	207	typedef struct {
201	int name;	208	GLuint name;
202	int w, h;	209	int w, h;
203	float s, t;	210	float s, t;
204	uint8_t r, g, b, a;	211	uint8_t r, g, b, a;
205	tileid smoothtile;	212	tileid smoothtile;
206	uint8_t smoothlevel;	213	uint8_t smoothlevel;
…		…
431	n \|= n >> 4;	438	n \|= n >> 4;
432	n \|= n >> 8;	439	n \|= n >> 8;
433	n \|= n >> 16;	440	n \|= n >> 16;
434		441
435	return n + 1;	442	return n + 1;
		443	}
		444
		445	static unsigned int
		446	popcount (unsigned int n)
		447	{
		448	n -= (n >> 1) & 0x55555555U;
		449	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		450	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		451	n *= 0x01010101U;
		452
		453	return n >> 24;
436	}	454	}
437		455
438	/* SDL should provide this, really. */	456	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	457	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	458	#define SDLK_MODIFIER_MAX 314
…		…
518		536
519	const_iv (SDL_APPINPUTFOCUS),	537	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	538	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	539	const_iv (SDL_APPACTIVE),
522		540
		541	const_iv (SDLK_FIRST),
		542	const_iv (SDLK_LAST),
523	const_iv (SDLK_KP0),	543	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	544	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	545	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	546	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	547	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	619	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	620	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	621	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	622	const_iv (KMOD_CAPS),
603	const_iv (KMOD_MODE),	623	const_iv (KMOD_MODE),
		624
		625	const_iv (MIX_DEFAULT_FORMAT),
604	# undef const_iv	626	# undef const_iv
605	};	627	};
606		628
607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
625	RETVAL	647	RETVAL
626		648
627	NV floor (NV x)	649	NV floor (NV x)
628		650
629	NV ceil (NV x)	651	NV ceil (NV x)
		652
		653	IV minpot (UV n)
		654
		655	IV popcount (UV n)
630		656
631	void	657	void
632	pango_init ()	658	pango_init ()
633	CODE:	659	CODE:
634	{	660	{
…		…
674	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
675		701
676	if (m && m != (SDL_Rect **)-1)	702	if (m && m != (SDL_Rect **)-1)
677	while (*m)	703	while (*m)
678	{	704	{
679	if ((m)->w >= 640 && (m)->h >= 480)	705	if ((m)->w >= 800 && (m)->h >= 600)
680	{	706	{
681	AV *av = newAV ();	707	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	708	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	709	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	710	av_push (av, newSViv (rgb));
…		…
708		734
709	if (RETVAL)	735	if (RETVAL)
710	{	736	{
711	av_clear (texture_av);	737	av_clear (texture_av);
712		738
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	739	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	740	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715	#include "glfunc.h"	741	#include "glfunc.h"
716	#undef GL_FUNC	742	#undef GL_FUNC
717	}	743	}
718	}	744	}
…		…
810	POSTCALL:	836	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	837	Mix_HookMusicFinished (music_finished);
812	Mix_ChannelFinished (channel_finished);	838	Mix_ChannelFinished (channel_finished);
813		839
814	void	840	void
		841	Mix_QuerySpec ()
		842	PPCODE:
		843	{
		844	int freq, channels;
		845	Uint16 format;
		846
		847	if (Mix_QuerySpec (&freq, &format, &channels))
		848	{
		849	EXTEND (SP, 3);
		850	PUSHs (sv_2mortal (newSViv (freq)));
		851	PUSHs (sv_2mortal (newSViv (format)));
		852	PUSHs (sv_2mortal (newSViv (channels)));
		853	}
		854	}
		855
		856	void
815	Mix_CloseAudio ()	857	Mix_CloseAudio ()
816		858
817	int	859	int
818	Mix_AllocateChannels (int numchans = -1)	860	Mix_AllocateChannels (int numchans = -1)
		861
		862	const char *
		863	Mix_GetError ()
819		864
820	void	865	void
821	lowdelay (int fd, int val = 1)	866	lowdelay (int fd, int val = 1)
822	CODE:	867	CODE:
823	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	868	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
1010	MODULE = CFPlus PACKAGE = CFPlus::Layout	1055	MODULE = CFPlus PACKAGE = CFPlus::Layout
1011		1056
1012	PROTOTYPES: DISABLE	1057	PROTOTYPES: DISABLE
1013		1058
1014	void	1059	void
1015	reset_glyph_cache ()	1060	glyph_cache_backup ()
1016	PROTOTYPE:	1061	PROTOTYPE:
1017	CODE:	1062	CODE:
		1063	tc_backup ();
		1064
		1065	void
		1066	glyph_cache_restore ()
		1067	PROTOTYPE:
		1068	CODE:
1018	tc_clear ();	1069	tc_restore ();
1019		1070
1020	CFPlus::Layout	1071	CFPlus::Layout
1021	new (SV *class)	1072	new (SV *class)
1022	CODE:	1073	CODE:
1023	New (0, RETVAL, 1, struct cf_layout);	1074	New (0, RETVAL, 1, struct cf_layout);
…		…
1027	RETVAL->g = 1.;	1078	RETVAL->g = 1.;
1028	RETVAL->b = 1.;	1079	RETVAL->b = 1.;
1029	RETVAL->a = 1.;	1080	RETVAL->a = 1.;
1030	RETVAL->base_height = MIN_FONT_HEIGHT;	1081	RETVAL->base_height = MIN_FONT_HEIGHT;
1031	RETVAL->font = 0;	1082	RETVAL->font = 0;
		1083	RETVAL->rc = rc_alloc ();
1032		1084
1033	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1085	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034	layout_update_font (RETVAL);	1086	layout_update_font (RETVAL);
1035	OUTPUT:	1087	OUTPUT:
1036	RETVAL	1088	RETVAL
1037		1089
1038	void	1090	void
1039	DESTROY (CFPlus::Layout self)	1091	DESTROY (CFPlus::Layout self)
1040	CODE:	1092	CODE:
1041	g_object_unref (self->pl);	1093	g_object_unref (self->pl);
		1094	rc_free (self->rc);
1042	Safefree (self);	1095	Safefree (self);
1043		1096
1044	void	1097	void
1045	set_text (CFPlus::Layout self, SV *text_)	1098	set_text (CFPlus::Layout self, SV *text_)
1046	CODE:	1099	CODE:
…		…
1298	}	1351	}
1299	}	1352	}
1300		1353
1301	void	1354	void
1302	render (CFPlus::Layout self, float x, float y, int flags = 0)	1355	render (CFPlus::Layout self, float x, float y, int flags = 0)
1303	PPCODE:	1356	CODE:
		1357	rc_clear (self->rc);
1304	pango_opengl_render_layout_subpixel (	1358	pango_opengl_render_layout_subpixel (
1305	self->pl,	1359	self->pl,
		1360	self->rc,
1306	x * PANGO_SCALE, y * PANGO_SCALE,	1361	x * PANGO_SCALE, y * PANGO_SCALE,
1307	self->r, self->g, self->b, self->a,	1362	self->r, self->g, self->b, self->a,
1308	flags	1363	flags
1309	);	1364	);
		1365	// we assume that context_change actually clears/frees stuff
		1366	// and does not do any recomputation...
		1367	pango_layout_context_changed (self->pl);
		1368
		1369	void
		1370	draw (CFPlus::Layout self)
		1371	CODE:
		1372	{
		1373	glEnable (GL_TEXTURE_2D);
		1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1375	glEnable (GL_BLEND);
		1376	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1377	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1378	glEnable (GL_ALPHA_TEST);
		1379	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1380
		1381	rc_draw (self->rc);
		1382
		1383	glDisable (GL_ALPHA_TEST);
		1384	glDisable (GL_BLEND);
		1385	glDisable (GL_TEXTURE_2D);
		1386	}
1310		1387
1311	MODULE = CFPlus PACKAGE = CFPlus::Texture	1388	MODULE = CFPlus PACKAGE = CFPlus::Texture
1312		1389
1313	PROTOTYPES: ENABLE	1390	PROTOTYPES: ENABLE
1314
1315	int minpot (int n)
1316		1391
1317	void	1392	void
1318	pad (SV *data_, int ow, int oh, int nw, int nh)	1393	pad (SV *data_, int ow, int oh, int nw, int nh)
1319	CODE:	1394	CODE:
1320	{	1395	{
…		…
1346	{	1421	{
1347	HV hv = (HV )SvRV (self);	1422	HV hv = (HV )SvRV (self);
1348	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1423	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1424	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1425	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
		1426
		1427	if (name <= 0)
		1428	XSRETURN_EMPTY;
1351		1429
1352	if (items < 5)	1430	if (items < 5)
1353	{	1431	{
1354	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1432	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1433	h = SvNV (*hv_fetch (hv, "h", 1, 1));
…		…
1544	self->rows += MAP_EXTEND_Y;	1622	self->rows += MAP_EXTEND_Y;
1545	self->y += MAP_EXTEND_Y;	1623	self->y += MAP_EXTEND_Y;
1546	}	1624	}
1547	}	1625	}
1548		1626
1549	void	1627	SV *
1550	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1551	CODE:	1629	CODE:
1552	{	1630	{
1553	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1554	uint8_t data_end = (uint8_t )SvEND (data_);	1632	uint8_t data_end = (uint8_t )SvEND (data_);
1555	mapcell *cell;	1633	mapcell *cell;
1556	int x, y, flags;	1634	int x, y, z, flags;
		1635	AV *missing = newAV ();
		1636	RETVAL = newRV_noinc ((SV *)missing);
1557		1637
1558	while (data < data_end - 1)	1638	while (data < data_end - 1)
1559	{	1639	{
1560	flags = (data [0] << 8) + data [1]; data += 2;	1640	flags = (data [0] << 8) + data [1]; data += 2;
1561		1641
…		…
1612	}	1692	}
1613	else	1693	else
1614	cell->darkness = *data++ + 1;	1694	cell->darkness = *data++ + 1;
1615	}	1695	}
1616		1696
		1697	for (z = 0; z <= 2; ++z)
1617	if (flags & 4)	1698	if (flags & (4 >> z))
1618	{	1699	{
1619	faceid face = (data [0] << 8) + data [1]; data += 2;	1700	faceid face = (data [0] << 8) + data [1]; data += 2;
1620	need_facenum (self, face);	1701	need_facenum (self, face);
1621	cell->tile [0] = self->face2tile [face];	1702	cell->tile [z] = self->face2tile [face];
		1703
		1704	if (cell->tile [z])
		1705	{
		1706	maptex *tex = self->tex + cell->tile [z];
		1707	if (!tex->name)
		1708	av_push (missing, newSViv (cell->tile [z]));
		1709
		1710	if (tex->smoothtile)
		1711	{
		1712	maptex *smooth = self->tex + tex->smoothtile;
		1713	if (!smooth->name)
		1714	av_push (missing, newSViv (tex->smoothtile));
		1715	}
		1716	}
1622	}	1717	}
1623
1624	if (flags & 2)
1625	{
1626	faceid face = (data [0] << 8) + data [1]; data += 2;
1627	need_facenum (self, face);
1628	cell->tile [1] = self->face2tile [face];
1629	}
1630
1631	if (flags & 1)
1632	{
1633	faceid face = (data [0] << 8) + data [1]; data += 2;
1634	need_facenum (self, face);
1635	cell->tile [2] = self->face2tile [face];
1636	}
1637	}	1718	}
1638	else	1719	else
1639	cell->darkness = 0;	1720	cell->darkness = 0;
1640	}	1721	}
1641	}	1722	}
		1723	OUTPUT:
		1724	RETVAL
1642		1725
1643	SV *	1726	SV *
1644	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1645	CODE:	1728	CODE:
1646	{	1729	{
…		…
1697		1780
1698	void	1781	void
1699	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1700	CODE:	1783	CODE:
1701	{	1784	{
		1785	int x, y, z;
		1786
1702	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1703	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705	smooth_key skey;	1790	smooth_key skey;
1706	int x, y, z;	1791
1707	int last_name;	1792	rc_t *rc = rc_alloc ();
		1793	rc_key_t key;
		1794	rc_array_t *arr;
1708		1795
1709	// thats current max. sorry.	1796	// thats current max. sorry.
1710	if (sw > 255) sw = 255;	1797	if (sw > 255) sw = 255;
1711	if (sh > 255) sh = 255;	1798	if (sh > 255) sh = 255;
1712		1799
1713	// clear key, in case of extra padding	1800	// clear key, in case of extra padding
1714	memset (&skey, 0, sizeof (skey));	1801	memset (&skey, 0, sizeof (skey));
1715		1802
1716	glColor4ub (255, 255, 255, 255);	1803	memset (&key, 0, sizeof (key));
1717		1804	key.r = 255;
1718	glEnable (GL_BLEND);	1805	key.g = 255;
1719	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1806	key.b = 255;
1720	glEnable (GL_TEXTURE_2D);	1807	key.a = 255;
1721	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1808	key.mode = GL_QUADS;
1722		1809	key.format = GL_T2F_V3F;
1723	glBegin (GL_QUADS);	1810	key.texname = -1;
1724
1725	last_name = 0;
1726		1811
1727	mx += self->x;	1812	mx += self->x;
1728	my += self->y;	1813	my += self->y;
1729		1814
1730	// first pass: determine smooth_max	1815	// first pass: determine smooth_max
…		…
1746	MAX (self->tex [cell->tile [0]].smoothlevel,	1831	MAX (self->tex [cell->tile [0]].smoothlevel,
1747	MAX (self->tex [cell->tile [1]].smoothlevel,	1832	MAX (self->tex [cell->tile [1]].smoothlevel,
1748	self->tex [cell->tile [2]].smoothlevel));	1833	self->tex [cell->tile [2]].smoothlevel));
1749	}	1834	}
1750	}	1835	}
		1836
		1837	glEnable (GL_BLEND);
		1838	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1839	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751		1840
1752	for (z = 0; z <= 2; z++)	1841	for (z = 0; z <= 2; z++)
1753	{	1842	{
1754	memset (smooth_level, 0, sizeof (smooth_level));	1843	memset (smooth_level, 0, sizeof (smooth_level));
1755		1844
…		…
1765	tileid tile = cell->tile [z];	1854	tileid tile = cell->tile [z];
1766		1855
1767	if (tile)	1856	if (tile)
1768	{	1857	{
1769	maptex tex = self->tex [tile];	1858	maptex tex = self->tex [tile];
1770	int px = (x + 1) * T - tex.w;	1859	int px, py;
1771	int py = (y + 1) * T - tex.h;
1772		1860
1773	// suppressing texture state switches here
1774	// is only moderately effective, but worth the extra effort
1775	if (last_name != tex.name)	1861	if (key.texname != tex.name)
1776	{	1862	{
1777	if (!tex.name)	1863	if (!tex.name)
1778	tex = self->tex [2]; /* missing, replace by noface */	1864	tex = self->tex [2]; /* missing, replace by noface */
1779		1865
1780	glEnd ();	1866	key.texname = tex.name;
1781	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1867	arr = rc_array (rc, &key);
1782	glBegin (GL_QUADS);
1783	}	1868	}
1784		1869
1785	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1870	px = (x + 1) * T - tex.w;
		1871	py = (y + 1) * T - tex.h;
		1872
		1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789		1877
1790	if (cell->flags && z == 2)	1878	if (cell->flags && z == 2)
1791	{	1879	{
		1880	// overlays such as the speech bubble, probably more to come
1792	if (cell->flags & 1)	1881	if (cell->flags & 1)
1793	{	1882	{
1794	maptex tex = self->tex [1];	1883	maptex tex = self->tex [1];
1795	int px = x * T + T * 2 / 32;	1884	int px = x * T + T * 2 / 32;
1796	int py = y * T - T * 6 / 32;	1885	int py = y * T - T * 6 / 32;
1797		1886
		1887	if (tex.name)
1798	glEnd ();	1888	{
1799	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1889	if (key.texname != tex.name)
		1890	{
		1891	key.texname = tex.name;
		1892	arr = rc_array (rc, &key);
		1893	}
		1894
		1895	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1896	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1897	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1898	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800	glBegin (GL_QUADS);	1899	}
1801
1802	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806	}	1900	}
1807	}	1901	}
1808		1902
1809	// update smooth hash	1903	// update smooth hash
1810	if (tex.smoothtile)	1904	if (tex.smoothtile)
…		…
1846	}	1940	}
1847	}	1941	}
1848	}	1942	}
1849	}	1943	}
1850		1944
		1945	rc_draw (rc);
		1946	rc_clear (rc);
		1947
1851	// go through all smoothlevels, lowest to highest, then draw.	1948	// go through all smoothlevels, lowest to highest, then draw.
1852	// this is basically counting sort	1949	// this is basically counting sort
1853	{	1950	{
1854	int w, b;	1951	int w, b;
1855		1952
		1953	glEnable (GL_TEXTURE_2D);
		1954	glBegin (GL_QUADS);
1856	for (w = 0; w < 256 / 32; ++w)	1955	for (w = 0; w < 256 / 32; ++w)
1857	{	1956	{
1858	uint32_t smask = smooth_level [w];	1957	uint32_t smask = smooth_level [w];
1859	if (smask)	1958	if (smask)
1860	for (b = 0; b < 32; ++b)	1959	for (b = 0; b < 32; ++b)
…		…
1879	int border = bits & 15;	1978	int border = bits & 15;
1880	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1979	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881	float dx = tex.s * .0625f; // 16 images/row	1980	float dx = tex.s * .0625f; // 16 images/row
1882	float dy = tex.t * .5f ; // 2 images/column	1981	float dy = tex.t * .5f ; // 2 images/column
1883		1982
1884	// this time naively avoiding texture state changes
1885	// save gobs of state changes.
1886	if (last_name != tex.name)	1983	if (tex.name)
1887	{	1984	{
		1985	// this time avoiding texture state changes
		1986	// save gobs of state changes.
1888	if (!tex.name)	1987	if (key.texname != tex.name)
1889	continue; // smoothing not yet available	1988	{
1890
1891	glEnd ();	1989	glEnd ();
1892	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1990	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893	glBegin (GL_QUADS);	1991	glBegin (GL_QUADS);
1894	}	1992	}
1895		1993
1896	if (border)	1994	if (border)
1897	{	1995	{
1898	float ox = border * dx;	1996	float ox = border * dx;
1899		1997
1900	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	1998	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	1999	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2000	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2001	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904	}	2002	}
1905		2003
1906	if (corner)	2004	if (corner)
1907	{	2005	{
1908	float ox = corner * dx;	2006	float ox = corner * dx;
1909		2007
1910	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2008	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2009	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2010	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2011	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2012	}
1914	}	2013	}
1915	}	2014	}
1916	}	2015	}
1917	}	2016	}
1918	}	2017	}
		2018
		2019	glEnd ();
		2020	glDisable (GL_TEXTURE_2D);
		2021	key.texname = -1;
1919	}	2022	}
1920		2023
1921	hv_clear (smooth);	2024	hv_clear (smooth);
1922	}	2025	}
1923		2026
1924	glEnd ();
1925
1926	glDisable (GL_TEXTURE_2D);
1927	glDisable (GL_BLEND);	2027	glDisable (GL_BLEND);
		2028	rc_free (rc);
1928		2029
1929	// top layer: overlays such as the health bar	2030	// top layer: overlays such as the health bar
1930	for (y = 0; y < sh; y++)	2031	for (y = 0; y < sh; y++)
1931	if (0 <= y + my && y + my < self->rows)	2032	if (0 <= y + my && y + my < self->rows)
1932	{	2033	{
…		…
2181	int x, y, z;	2282	int x, y, z;
2182	int w, h;	2283	int w, h;
2183	int x1, y1;	2284	int x1, y1;
2184		2285
2185	if (*data++ != 0)	2286	if (*data++ != 0)
2186	return; /* version mismatch */	2287	XSRETURN_EMPTY; /* version mismatch */
2187		2288
2188	w = data++ << 8; w \|= data++;	2289	w = data++ << 8; w \|= data++;
2189	h = data++ << 8; h \|= data++;	2290	h = data++ << 8; h \|= data++;
2190		2291
2191	// we need to do this 'cause we don't keep an absolute coord system for rows	2292	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2257	CODE:	2358	CODE:
2258	RETVAL = SDL_RWFromFile (path, mode);	2359	RETVAL = SDL_RWFromFile (path, mode);
2259	OUTPUT:	2360	OUTPUT:
2260	RETVAL	2361	RETVAL
2261		2362
		2363	# fails on win32:
		2364	# CFPlus.xs(2268) : error C2059: syntax error : '('
2262	void	2365	#void
2263	close (CFPlus::RW self)	2366	#close (CFPlus::RW self)
2264	CODE:	2367	# CODE:
2265	SDL_RWclose (self);	2368	# (self->(close)) (self);
2266		2369
2267	MODULE = CFPlus PACKAGE = CFPlus::Channel	2370	MODULE = CFPlus PACKAGE = CFPlus::Channel
2268		2371
2269	PROTOTYPES: DISABLE	2372	PROTOTYPES: DISABLE
		2373
		2374	CFPlus::Channel
		2375	find ()
		2376	CODE:
		2377	{
		2378	RETVAL = Mix_GroupAvailable (-1);
		2379
		2380	if (RETVAL < 0)
		2381	{
		2382	RETVAL = Mix_GroupOldest (-1);
		2383
		2384	if (RETVAL < 0)
		2385	XSRETURN_UNDEF;
		2386
		2387	Mix_HaltChannel (RETVAL);
		2388	}
		2389
		2390	Mix_UnregisterAllEffects (RETVAL);
		2391	Mix_Volume (RETVAL, 128);
		2392	}
		2393	OUTPUT:
		2394	RETVAL
		2395
		2396	void
		2397	halt (CFPlus::Channel self)
		2398	CODE:
		2399	Mix_HaltChannel (self);
		2400
		2401	void
		2402	expire (CFPlus::Channel self, int ticks = -1)
		2403	CODE:
		2404	Mix_ExpireChannel (self, ticks);
		2405
		2406	void
		2407	fade_out (CFPlus::Channel self, int ticks = -1)
		2408	CODE:
		2409	Mix_FadeOutChannel (self, ticks);
2270		2410
2271	int	2411	int
2272	volume (CFPlus::Channel self, int volume)	2412	volume (CFPlus::Channel self, int volume)
2273	CODE:	2413	CODE:
2274	RETVAL = Mix_Volume (self, volume);	2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2275	OUTPUT:	2415	OUTPUT:
2276	RETVAL	2416	RETVAL
2277		2417
2278	int	2418	void
2279	unregister_all_effects (CFPlus::Channel self)	2419	unregister_all_effects (CFPlus::Channel self)
2280	CODE:	2420	CODE:
2281	RETVAL = Mix_UnregisterAllEffects (self);	2421	Mix_UnregisterAllEffects (self);
2282	OUTPUT:
2283	RETVAL
2284		2422
2285	int	2423	void
2286	set_panning (CFPlus::Channel self, int left, int right)	2424	set_panning (CFPlus::Channel self, int left, int right)
2287	CODE:	2425	CODE:
		2426	left = CLAMP (left , 0, 255);
		2427	right = CLAMP (right, 0, 255);
2288	RETVAL = Mix_SetPanning (self, left, right);	2428	Mix_SetPanning (self, left, right);
2289	OUTPUT:
2290	RETVAL
2291		2429
2292	int	2430	void
2293	set_distance (CFPlus::Channel self, int distance)	2431	set_distance (CFPlus::Channel self, int distance)
2294	CODE:	2432	CODE:
2295	RETVAL = Mix_SetDistance (self, distance);	2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2296	OUTPUT:
2297	RETVAL
2298		2434
2299	int	2435	void
2300	set_position (CFPlus::Channel self, int angle, int distance)	2436	set_position (CFPlus::Channel self, int angle, int distance)
2301	CODE:	2437	CODE:
		2438
		2439	void
		2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
		2441	CODE:
		2442	{
		2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2302	RETVAL = Mix_SetPosition (self, angle, distance);	2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2303	OUTPUT:	2446	}
2304	RETVAL
2305		2447
2306	int	2448	void
2307	set_reverse_stereo (CFPlus::Channel self, int flip)	2449	set_reverse_stereo (CFPlus::Channel self, int flip)
2308	CODE:	2450	CODE:
2309	RETVAL = Mix_SetReverseStereo (self, flip);	2451	Mix_SetReverseStereo (self, flip);
2310	OUTPUT:
2311	RETVAL
2312		2452
2313	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2314		2454
2315	PROTOTYPES: DISABLE	2455	PROTOTYPES: DISABLE
2316		2456
…		…
2327	Mix_FreeChunk (self);	2467	Mix_FreeChunk (self);
2328		2468
2329	int	2469	int
2330	volume (CFPlus::MixChunk self, int volume = -1)	2470	volume (CFPlus::MixChunk self, int volume = -1)
2331	CODE:	2471	CODE:
		2472	if (items > 1)
		2473	volume = CLAMP (volume, 0, 128);
2332	RETVAL = Mix_VolumeChunk (self, volume);	2474	RETVAL = Mix_VolumeChunk (self, volume);
2333	OUTPUT:	2475	OUTPUT:
2334	RETVAL	2476	RETVAL
2335		2477
2336	CFPlus::Channel	2478	CFPlus::Channel
2337	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2338	CODE:	2480	CODE:
		2481	{
2339	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2483
		2484	if (RETVAL < 0)
		2485	XSRETURN_UNDEF;
		2486
		2487	if (channel < 0)
		2488	{
2340	Mix_UnregisterAllEffects (RETVAL);	2489	Mix_UnregisterAllEffects (RETVAL);
		2490	Mix_Volume (RETVAL, 128);
		2491	}
		2492	}
2341	OUTPUT:	2493	OUTPUT:
2342	RETVAL	2494	RETVAL
2343		2495
2344	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2345		2497
2346	int	2498	int
2347	volume (int volume = -1)	2499	volume (int volume = -1)
2348	PROTOTYPE: ;$	2500	PROTOTYPE: ;$
2349	CODE:	2501	CODE:
		2502	if (items > 0)
		2503	volume = CLAMP (volume, 0, 128);
2350	RETVAL = Mix_VolumeMusic (volume);	2504	RETVAL = Mix_VolumeMusic (volume);
2351	OUTPUT:	2505	OUTPUT:
2352	RETVAL	2506	RETVAL
2353		2507
2354	int	2508	void
2355	fade_out (int ms)	2509	fade_out (int ms)
2356	CODE:	2510	CODE:
2357	RETVAL = Mix_FadeOutMusic (ms);	2511	Mix_FadeOutMusic (ms);
2358	OUTPUT:
2359	RETVAL
2360		2512
2361	void	2513	void
2362	halt ()	2514	halt ()
2363	CODE:	2515	CODE:
2364	Mix_HaltMusic ();	2516	Mix_HaltMusic ();
…		…
2380	CODE:	2532	CODE:
2381	RETVAL = Mix_PlayMusic (self, loops);	2533	RETVAL = Mix_PlayMusic (self, loops);
2382	OUTPUT:	2534	OUTPUT:
2383	RETVAL	2535	RETVAL
2384		2536
2385	int	2537	void
2386	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2387	CODE:	2539	CODE:
2388	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2540	Mix_FadeInMusicPos (self, loops, ms, position);
2389	OUTPUT:
2390	RETVAL
2391		2541
2392	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2393		2543
2394	PROTOTYPES: ENABLE	2544	PROTOTYPES: ENABLE
2395		2545
…		…
2438	const_iv (GL_INTENSITY),	2588	const_iv (GL_INTENSITY),
2439	const_iv (GL_LUMINANCE),	2589	const_iv (GL_LUMINANCE),
2440	const_iv (GL_LUMINANCE_ALPHA),	2590	const_iv (GL_LUMINANCE_ALPHA),
2441	const_iv (GL_FLOAT),	2591	const_iv (GL_FLOAT),
2442	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2592	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2593	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2594	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2595	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2596	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2597	const_iv (GL_COMPRESSED_RGB_ARB),
		2598	const_iv (GL_COMPRESSED_RGBA_ARB),
2443	const_iv (GL_COMPILE),	2599	const_iv (GL_COMPILE),
2444	const_iv (GL_PROXY_TEXTURE_1D),	2600	const_iv (GL_PROXY_TEXTURE_1D),
2445	const_iv (GL_PROXY_TEXTURE_2D),	2601	const_iv (GL_PROXY_TEXTURE_2D),
2446	const_iv (GL_TEXTURE_1D),	2602	const_iv (GL_TEXTURE_1D),
2447	const_iv (GL_TEXTURE_2D),	2603	const_iv (GL_TEXTURE_2D),
…		…
2486	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2642	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2487	const_iv (GL_POINT_SMOOTH_HINT),	2643	const_iv (GL_POINT_SMOOTH_HINT),
2488	const_iv (GL_LINE_SMOOTH_HINT),	2644	const_iv (GL_LINE_SMOOTH_HINT),
2489	const_iv (GL_POLYGON_SMOOTH_HINT),	2645	const_iv (GL_POLYGON_SMOOTH_HINT),
2490	const_iv (GL_GENERATE_MIPMAP_HINT),	2646	const_iv (GL_GENERATE_MIPMAP_HINT),
		2647	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2491	const_iv (GL_FASTEST),	2648	const_iv (GL_FASTEST),
2492	const_iv (GL_DONT_CARE),	2649	const_iv (GL_DONT_CARE),
2493	const_iv (GL_NICEST),	2650	const_iv (GL_NICEST),
2494	const_iv (GL_V2F),	2651	const_iv (GL_V2F),
2495	const_iv (GL_V3F),	2652	const_iv (GL_V3F),
…		…
2503		2660
2504	texture_av = newAV ();	2661	texture_av = newAV ();
2505	AvREAL_off (texture_av);	2662	AvREAL_off (texture_av);
2506	}	2663	}
2507		2664
		2665	void
		2666	disable_GL_EXT_blend_func_separate ()
		2667	CODE:
		2668	gl.BlendFuncSeparate = 0;
		2669	gl.BlendFuncSeparateEXT = 0;
		2670
2508	char *	2671	char *
2509	gl_vendor ()	2672	gl_vendor ()
2510	CODE:	2673	CODE:
2511	RETVAL = (char *)glGetString (GL_VENDOR);	2674	RETVAL = (char *)glGetString (GL_VENDOR);
2512	OUTPUT:	2675	OUTPUT:
…		…
2633		2796
2634	void glRect (float x1, float y1, float x2, float y2)	2797	void glRect (float x1, float y1, float x2, float y2)
2635	CODE:	2798	CODE:
2636	glRectf (x1, y1, x2, y2);	2799	glRectf (x1, y1, x2, y2);
2637		2800
		2801	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2802	CODE:
		2803	glBegin (GL_LINE_LOOP);
		2804	glVertex2f (x1, y1);
		2805	glVertex2f (x2, y1);
		2806	glVertex2f (x2, y2);
		2807	glVertex2f (x1, y2);
		2808	glEnd ();
		2809
2638	PROTOTYPES: ENABLE	2810	PROTOTYPES: ENABLE
2639		2811
2640	void glBegin (int mode)	2812	void glBegin (int mode)
2641		2813
2642	void glEnd ()	2814	void glEnd ()
…		…
2743	NV x, y, w, h;	2915	NV x, y, w, h;
2744	SV *draw_x_sv = GvSV (draw_x_gv);	2916	SV *draw_x_sv = GvSV (draw_x_gv);
2745	SV *draw_y_sv = GvSV (draw_y_gv);	2917	SV *draw_y_sv = GvSV (draw_y_gv);
2746	SV *draw_w_sv = GvSV (draw_w_gv);	2918	SV *draw_w_sv = GvSV (draw_w_gv);
2747	SV *draw_h_sv = GvSV (draw_h_gv);	2919	SV *draw_h_sv = GvSV (draw_h_gv);
2748	SV *hover;
2749	double draw_x, draw_y, draw_w, draw_h;	2920	double draw_x, draw_y;
2750		2921
2751	if (!SvROK (self))	2922	if (!SvROK (self))
2752	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2753		2924
2754	hv = (HV *)SvRV (self);	2925	hv = (HV *)SvRV (self);
…		…
2782	{	2953	{
2783	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2954	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2784		2955
2785	if (svp && SvTRUE (*svp))	2956	if (svp && SvTRUE (*svp))
2786	{	2957	{
2787	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2958	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2788	glEnable (GL_BLEND);	2959	glEnable (GL_BLEND);
2789	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2960	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2790	glBegin (GL_QUADS);	2961	glBegin (GL_QUADS);
2791	glVertex2f (0, 0);	2962	glVertex2f (0, 0);
2792	glVertex2f (w, 0);	2963	glVertex2f (w, 0);
…		…
2795	glEnd ();	2966	glEnd ();
2796	glDisable (GL_BLEND);	2967	glDisable (GL_BLEND);
2797	}	2968	}
2798	}	2969	}
2799	#if 0	2970	#if 0
2800	if ($ENV{CFPLUS_DEBUG} & 1) {	2971	// draw borders, for debugging
2801	glPushMatrix;	2972	glPushMatrix ();
2802	glColor 1, 1, 0, 1;	2973	glColor4f (1., 1., 0., 1.);
2803	glTranslate 0.375, 0.375;	2974	glTranslatef (.5, .5, 0.);
2804	glBegin GL_LINE_LOOP;	2975	glBegin (GL_LINE_LOOP);
2805	glVertex 0 , 0;	2976	glVertex2f (0 , 0);
2806	glVertex $self->{w} - 1, 0;	2977	glVertex2f (w - 1, 0);
2807	glVertex $self->{w} - 1, $self->{h} - 1;	2978	glVertex2f (w - 1, h - 1);
2808	glVertex 0 , $self->{h} - 1;	2979	glVertex2f (0 , h - 1);
2809	glEnd;	2980	glEnd ();
2810	glPopMatrix;	2981	glPopMatrix ();
2811	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2812	}
2813	#endif	2982	#endif
2814	PUSHMARK (SP);	2983	PUSHMARK (SP);
2815	XPUSHs (self);	2984	XPUSHs (self);
2816	PUTBACK;	2985	PUTBACK;
2817	call_method ("_draw", G_VOID \| G_DISCARD);	2986	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC vs. Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.212 by root, Sun Jul 29 03:58:26 2007 UTC vs.
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC