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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.209 by root, Sat Jul 21 22:54:52 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>
27	#include <stdio.h>	32	#include <stdio.h>
28	#include <stdlib.h>	33	#include <stdlib.h>
		34
		35	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
29		36
30	#include <SDL.h>	37	#include <SDL.h>
31	#include <SDL_thread.h>	38	#include <SDL_thread.h>
32	#include <SDL_endian.h>	39	#include <SDL_endian.h>
33	#include <SDL_image.h>	40	#include <SDL_image.h>
…		…
107	av_push (texture_av, (SV *)(size_t)name);	114	av_push (texture_av, (SV *)(size_t)name);
108	glDeleteTextures (1, &name);	115	glDeleteTextures (1, &name);
109	}	116	}
110		117
111	#include "texcache.c"	118	#include "texcache.c"
		119	#include "rendercache.c"
112		120
113	#include "pango-font.c"	121	#include "pango-font.c"
114	#include "pango-fontmap.c"	122	#include "pango-fontmap.c"
115	#include "pango-render.c"	123	#include "pango-render.c"
116		124
		125	typedef IV CFPlus__Channel;
		126	typedef SDL_RWops *CFPlus__RW;
117	typedef Mix_Chunk *CFPlus__MixChunk;	127	typedef Mix_Chunk *CFPlus__MixChunk;
118	typedef Mix_Music *CFPlus__MixMusic;	128	typedef Mix_Music *CFPlus__MixMusic;
119		129
120	typedef PangoFontDescription *CFPlus__Font;	130	typedef PangoFontDescription *CFPlus__Font;
121		131
…		…
140	typedef struct cf_layout {	150	typedef struct cf_layout {
141	PangoLayout *pl;	151	PangoLayout *pl;
142	float r, g, b, a; // default color for rgba mode	152	float r, g, b, a; // default color for rgba mode
143	int base_height;	153	int base_height;
144	CFPlus__Font font;	154	CFPlus__Font font;
		155	rc_t *rc;
145	} *CFPlus__Layout;	156	} *CFPlus__Layout;
146		157
147	static CFPlus__Font default_font;	158	static CFPlus__Font default_font;
148	static PangoContext *opengl_context;	159	static PangoContext *opengl_context;
149	static PangoFontMap *opengl_fontmap;	160	static PangoFontMap *opengl_fontmap;
…		…
192		203
193	typedef uint16_t tileid;	204	typedef uint16_t tileid;
194	typedef uint16_t faceid;	205	typedef uint16_t faceid;
195		206
196	typedef struct {	207	typedef struct {
197	int name;	208	GLuint name;
198	int w, h;	209	int w, h;
199	float s, t;	210	float s, t;
200	uint8_t r, g, b, a;	211	uint8_t r, g, b, a;
201	tileid smoothtile;	212	tileid smoothtile;
202	uint8_t smoothlevel;	213	uint8_t smoothlevel;
…		…
427	n \|= n >> 4;	438	n \|= n >> 4;
428	n \|= n >> 8;	439	n \|= n >> 8;
429	n \|= n >> 16;	440	n \|= n >> 16;
430		441
431	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;
432	}	454	}
433		455
434	/* SDL should provide this, really. */	456	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	457	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	458	#define SDLK_MODIFIER_MAX 314
…		…
514		536
515	const_iv (SDL_APPINPUTFOCUS),	537	const_iv (SDL_APPINPUTFOCUS),
516	const_iv (SDL_APPMOUSEFOCUS),	538	const_iv (SDL_APPMOUSEFOCUS),
517	const_iv (SDL_APPACTIVE),	539	const_iv (SDL_APPACTIVE),
518		540
		541	const_iv (SDLK_FIRST),
		542	const_iv (SDLK_LAST),
519	const_iv (SDLK_KP0),	543	const_iv (SDLK_KP0),
520	const_iv (SDLK_KP1),	544	const_iv (SDLK_KP1),
521	const_iv (SDLK_KP2),	545	const_iv (SDLK_KP2),
522	const_iv (SDLK_KP3),	546	const_iv (SDLK_KP3),
523	const_iv (SDLK_KP4),	547	const_iv (SDLK_KP4),
…		…
595	const_iv (KMOD_LMETA),	619	const_iv (KMOD_LMETA),
596	const_iv (KMOD_RMETA),	620	const_iv (KMOD_RMETA),
597	const_iv (KMOD_NUM),	621	const_iv (KMOD_NUM),
598	const_iv (KMOD_CAPS),	622	const_iv (KMOD_CAPS),
599	const_iv (KMOD_MODE),	623	const_iv (KMOD_MODE),
		624
		625	const_iv (MIX_DEFAULT_FORMAT),
600	# undef const_iv	626	# undef const_iv
601	};	627	};
602		628
603	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; )
604	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
621	RETVAL	647	RETVAL
622		648
623	NV floor (NV x)	649	NV floor (NV x)
624		650
625	NV ceil (NV x)	651	NV ceil (NV x)
		652
		653	IV minpot (UV n)
		654
		655	IV popcount (UV n)
626		656
627	void	657	void
628	pango_init ()	658	pango_init ()
629	CODE:	659	CODE:
630	{	660	{
…		…
670	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
671		701
672	if (m && m != (SDL_Rect **)-1)	702	if (m && m != (SDL_Rect **)-1)
673	while (*m)	703	while (*m)
674	{	704	{
675	if ((m)->w >= 640 && (m)->h >= 480)	705	if ((m)->w >= 800 && (m)->h >= 600)
676	{	706	{
677	AV *av = newAV ();	707	AV *av = newAV ();
678	av_push (av, newSViv ((*m)->w));	708	av_push (av, newSViv ((*m)->w));
679	av_push (av, newSViv ((*m)->h));	709	av_push (av, newSViv ((*m)->h));
680	av_push (av, newSViv (rgb));	710	av_push (av, newSViv (rgb));
…		…
704		734
705	if (RETVAL)	735	if (RETVAL)
706	{	736	{
707	av_clear (texture_av);	737	av_clear (texture_av);
708		738
709	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	739	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710	#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);
711	#include "glfunc.h"	741	#include "glfunc.h"
712	#undef GL_FUNC	742	#undef GL_FUNC
713	}	743	}
714	}	744	}
…		…
800	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
801	}	831	}
802	}	832	}
803		833
804	int	834	int
805	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806	POSTCALL:	836	POSTCALL:
807	Mix_HookMusicFinished (music_finished);	837	Mix_HookMusicFinished (music_finished);
808	Mix_ChannelFinished (channel_finished);	838	Mix_ChannelFinished (channel_finished);
809		839
810	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
811	Mix_CloseAudio ()	857	Mix_CloseAudio ()
812		858
813	int	859	int
814	Mix_AllocateChannels (int numchans = -1)	860	Mix_AllocateChannels (int numchans = -1)
		861
		862	const char *
		863	Mix_GetError ()
815		864
816	void	865	void
817	lowdelay (int fd, int val = 1)	866	lowdelay (int fd, int val = 1)
818	CODE:	867	CODE:
819	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	868	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
861	STRLEN image_len;	910	STRLEN image_len;
862	char image = (char )SvPVbyte (image_, image_len);	911	char image = (char )SvPVbyte (image_, image_len);
863	SDL_Surface surface, surface2;	912	SDL_Surface surface, surface2;
864	SDL_PixelFormat fmt;	913	SDL_PixelFormat fmt;
865	SDL_RWops *rw = ix	914	SDL_RWops *rw = ix
866	? SDL_RWFromFile (image, "r")	915	? SDL_RWFromFile (image, "rb")
867	: SDL_RWFromConstMem (image, image_len);	916	: SDL_RWFromConstMem (image, image_len);
868		917
869	if (!rw)	918	if (!rw)
870	croak ("load_image: %s", SDL_GetError ());	919	croak ("load_image: %s", SDL_GetError ());
871		920
…		…
1006	MODULE = CFPlus PACKAGE = CFPlus::Layout	1055	MODULE = CFPlus PACKAGE = CFPlus::Layout
1007		1056
1008	PROTOTYPES: DISABLE	1057	PROTOTYPES: DISABLE
1009		1058
1010	void	1059	void
1011	reset_glyph_cache ()	1060	glyph_cache_backup ()
1012	PROTOTYPE:	1061	PROTOTYPE:
1013	CODE:	1062	CODE:
		1063	tc_backup ();
		1064
		1065	void
		1066	glyph_cache_restore ()
		1067	PROTOTYPE:
		1068	CODE:
1014	tc_clear ();	1069	tc_restore ();
1015		1070
1016	CFPlus::Layout	1071	CFPlus::Layout
1017	new (SV *class)	1072	new (SV *class)
1018	CODE:	1073	CODE:
1019	New (0, RETVAL, 1, struct cf_layout);	1074	New (0, RETVAL, 1, struct cf_layout);
…		…
1023	RETVAL->g = 1.;	1078	RETVAL->g = 1.;
1024	RETVAL->b = 1.;	1079	RETVAL->b = 1.;
1025	RETVAL->a = 1.;	1080	RETVAL->a = 1.;
1026	RETVAL->base_height = MIN_FONT_HEIGHT;	1081	RETVAL->base_height = MIN_FONT_HEIGHT;
1027	RETVAL->font = 0;	1082	RETVAL->font = 0;
		1083	RETVAL->rc = rc_alloc ();
1028		1084
1029	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1085	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030	layout_update_font (RETVAL);	1086	layout_update_font (RETVAL);
1031	OUTPUT:	1087	OUTPUT:
1032	RETVAL	1088	RETVAL
1033		1089
1034	void	1090	void
1035	DESTROY (CFPlus::Layout self)	1091	DESTROY (CFPlus::Layout self)
1036	CODE:	1092	CODE:
1037	g_object_unref (self->pl);	1093	g_object_unref (self->pl);
		1094	rc_free (self->rc);
1038	Safefree (self);	1095	Safefree (self);
1039		1096
1040	void	1097	void
1041	set_text (CFPlus::Layout self, SV *text_)	1098	set_text (CFPlus::Layout self, SV *text_)
1042	CODE:	1099	CODE:
…		…
1294	}	1351	}
1295	}	1352	}
1296		1353
1297	void	1354	void
1298	render (CFPlus::Layout self, float x, float y, int flags = 0)	1355	render (CFPlus::Layout self, float x, float y, int flags = 0)
1299	PPCODE:	1356	CODE:
		1357	rc_clear (self->rc);
1300	pango_opengl_render_layout_subpixel (	1358	pango_opengl_render_layout_subpixel (
1301	self->pl,	1359	self->pl,
		1360	self->rc,
1302	x * PANGO_SCALE, y * PANGO_SCALE,	1361	x * PANGO_SCALE, y * PANGO_SCALE,
1303	self->r, self->g, self->b, self->a,	1362	self->r, self->g, self->b, self->a,
1304	flags	1363	flags
1305	);	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	}
1306		1387
1307	MODULE = CFPlus PACKAGE = CFPlus::Texture	1388	MODULE = CFPlus PACKAGE = CFPlus::Texture
1308		1389
1309	PROTOTYPES: ENABLE	1390	PROTOTYPES: ENABLE
1310
1311	int minpot (int n)
1312		1391
1313	void	1392	void
1314	pad (SV *data_, int ow, int oh, int nw, int nh)	1393	pad (SV *data_, int ow, int oh, int nw, int nh)
1315	CODE:	1394	CODE:
1316	{	1395	{
…		…
1342	{	1421	{
1343	HV hv = (HV )SvRV (self);	1422	HV hv = (HV )SvRV (self);
1344	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1423	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1424	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346	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;
1347		1429
1348	if (items < 5)	1430	if (items < 5)
1349	{	1431	{
1350	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1432	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1433	h = SvNV (*hv_fetch (hv, "h", 1, 1));
…		…
1540	self->rows += MAP_EXTEND_Y;	1622	self->rows += MAP_EXTEND_Y;
1541	self->y += MAP_EXTEND_Y;	1623	self->y += MAP_EXTEND_Y;
1542	}	1624	}
1543	}	1625	}
1544		1626
1545	void	1627	SV *
1546	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1547	CODE:	1629	CODE:
1548	{	1630	{
1549	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1550	uint8_t data_end = (uint8_t )SvEND (data_);	1632	uint8_t data_end = (uint8_t )SvEND (data_);
1551	mapcell *cell;	1633	mapcell *cell;
1552	int x, y, flags;	1634	int x, y, z, flags;
		1635	AV *missing = newAV ();
		1636	RETVAL = newRV_noinc ((SV *)missing);
1553		1637
1554	while (data < data_end - 1)	1638	while (data < data_end - 1)
1555	{	1639	{
1556	flags = (data [0] << 8) + data [1]; data += 2;	1640	flags = (data [0] << 8) + data [1]; data += 2;
1557		1641
…		…
1608	}	1692	}
1609	else	1693	else
1610	cell->darkness = *data++ + 1;	1694	cell->darkness = *data++ + 1;
1611	}	1695	}
1612		1696
		1697	for (z = 0; z <= 2; ++z)
1613	if (flags & 4)	1698	if (flags & (4 >> z))
1614	{	1699	{
1615	faceid face = (data [0] << 8) + data [1]; data += 2;	1700	faceid face = (data [0] << 8) + data [1]; data += 2;
1616	need_facenum (self, face);	1701	need_facenum (self, face);
1617	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	}
1618	}	1717	}
1619
1620	if (flags & 2)
1621	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);
1624	cell->tile [1] = self->face2tile [face];
1625	}
1626
1627	if (flags & 1)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [2] = self->face2tile [face];
1632	}
1633	}	1718	}
1634	else	1719	else
1635	cell->darkness = 0;	1720	cell->darkness = 0;
1636	}	1721	}
1637	}	1722	}
		1723	OUTPUT:
		1724	RETVAL
1638		1725
1639	SV *	1726	SV *
1640	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)
1641	CODE:	1728	CODE:
1642	{	1729	{
…		…
1693		1780
1694	void	1781	void
1695	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)
1696	CODE:	1783	CODE:
1697	{	1784	{
		1785	int x, y, z;
		1786
1698	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1699	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
1700	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)
1701	smooth_key skey;	1790	smooth_key skey;
1702	int x, y, z;	1791
1703	int last_name;	1792	rc_t *rc = rc_alloc ();
		1793	rc_key_t key;
		1794	rc_array_t *arr;
1704		1795
1705	// thats current max. sorry.	1796	// thats current max. sorry.
1706	if (sw > 255) sw = 255;	1797	if (sw > 255) sw = 255;
1707	if (sh > 255) sh = 255;	1798	if (sh > 255) sh = 255;
1708		1799
1709	// clear key, in case of extra padding	1800	// clear key, in case of extra padding
1710	memset (&skey, 0, sizeof (skey));	1801	memset (&skey, 0, sizeof (skey));
1711		1802
1712	glColor4ub (255, 255, 255, 255);	1803	memset (&key, 0, sizeof (key));
1713		1804	key.r = 255;
1714	glEnable (GL_BLEND);	1805	key.g = 255;
1715	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1806	key.b = 255;
1716	glEnable (GL_TEXTURE_2D);	1807	key.a = 255;
1717	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1808	key.mode = GL_QUADS;
1718		1809	key.format = GL_T2F_V3F;
1719	glBegin (GL_QUADS);	1810	key.texname = -1;
1720
1721	last_name = 0;
1722		1811
1723	mx += self->x;	1812	mx += self->x;
1724	my += self->y;	1813	my += self->y;
1725		1814
1726	// first pass: determine smooth_max	1815	// first pass: determine smooth_max
…		…
1742	MAX (self->tex [cell->tile [0]].smoothlevel,	1831	MAX (self->tex [cell->tile [0]].smoothlevel,
1743	MAX (self->tex [cell->tile [1]].smoothlevel,	1832	MAX (self->tex [cell->tile [1]].smoothlevel,
1744	self->tex [cell->tile [2]].smoothlevel));	1833	self->tex [cell->tile [2]].smoothlevel));
1745	}	1834	}
1746	}	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);
1747		1840
1748	for (z = 0; z <= 2; z++)	1841	for (z = 0; z <= 2; z++)
1749	{	1842	{
1750	memset (smooth_level, 0, sizeof (smooth_level));	1843	memset (smooth_level, 0, sizeof (smooth_level));
1751		1844
…		…
1761	tileid tile = cell->tile [z];	1854	tileid tile = cell->tile [z];
1762		1855
1763	if (tile)	1856	if (tile)
1764	{	1857	{
1765	maptex tex = self->tex [tile];	1858	maptex tex = self->tex [tile];
1766	int px = (x + 1) * T - tex.w;	1859	int px, py;
1767	int py = (y + 1) * T - tex.h;
1768		1860
1769	// suppressing texture state switches here
1770	// is only moderately effective, but worth the extra effort
1771	if (last_name != tex.name)	1861	if (key.texname != tex.name)
1772	{	1862	{
1773	if (!tex.name)	1863	if (!tex.name)
1774	tex = self->tex [2]; /* missing, replace by noface */	1864	tex = self->tex [2]; /* missing, replace by noface */
1775		1865
1776	glEnd ();	1866	key.texname = tex.name;
1777	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1867	arr = rc_array (rc, &key);
1778	glBegin (GL_QUADS);
1779	}	1868	}
1780		1869
1781	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);
1782	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1783	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);
1784	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1785		1877
1786	if (cell->flags && z == 2)	1878	if (cell->flags && z == 2)
1787	{	1879	{
		1880	// overlays such as the speech bubble, probably more to come
1788	if (cell->flags & 1)	1881	if (cell->flags & 1)
1789	{	1882	{
1790	maptex tex = self->tex [1];	1883	maptex tex = self->tex [1];
1791	int px = x * T + T * 2 / 32;	1884	int px = x * T + T * 2 / 32;
1792	int py = y * T - T * 6 / 32;	1885	int py = y * T - T * 6 / 32;
1793		1886
		1887	if (tex.name)
1794	glEnd ();	1888	{
1795	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);
1796	glBegin (GL_QUADS);	1899	}
1797
1798	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1799	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1800	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1801	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1802	}	1900	}
1803	}	1901	}
1804		1902
1805	// update smooth hash	1903	// update smooth hash
1806	if (tex.smoothtile)	1904	if (tex.smoothtile)
…		…
1842	}	1940	}
1843	}	1941	}
1844	}	1942	}
1845	}	1943	}
1846		1944
		1945	rc_draw (rc);
		1946	rc_clear (rc);
		1947
1847	// go through all smoothlevels, lowest to highest, then draw.	1948	// go through all smoothlevels, lowest to highest, then draw.
1848	// this is basically counting sort	1949	// this is basically counting sort
1849	{	1950	{
1850	int w, b;	1951	int w, b;
1851		1952
		1953	glEnable (GL_TEXTURE_2D);
		1954	glBegin (GL_QUADS);
1852	for (w = 0; w < 256 / 32; ++w)	1955	for (w = 0; w < 256 / 32; ++w)
1853	{	1956	{
1854	uint32_t smask = smooth_level [w];	1957	uint32_t smask = smooth_level [w];
1855	if (smask)	1958	if (smask)
1856	for (b = 0; b < 32; ++b)	1959	for (b = 0; b < 32; ++b)
…		…
1875	int border = bits & 15;	1978	int border = bits & 15;
1876	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1979	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877	float dx = tex.s * .0625f; // 16 images/row	1980	float dx = tex.s * .0625f; // 16 images/row
1878	float dy = tex.t * .5f ; // 2 images/column	1981	float dy = tex.t * .5f ; // 2 images/column
1879		1982
1880	// this time naively avoiding texture state changes
1881	// save gobs of state changes.
1882	if (last_name != tex.name)	1983	if (tex.name)
1883	{	1984	{
		1985	// this time avoiding texture state changes
		1986	// save gobs of state changes.
1884	if (!tex.name)	1987	if (key.texname != tex.name)
1885	continue; // smoothing not yet available	1988	{
1886
1887	glEnd ();	1989	glEnd ();
1888	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1990	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889	glBegin (GL_QUADS);	1991	glBegin (GL_QUADS);
1890	}	1992	}
1891		1993
1892	if (border)	1994	if (border)
1893	{	1995	{
1894	float ox = border * dx;	1996	float ox = border * dx;
1895		1997
1896	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	1998	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	1999	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2000	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2001	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900	}	2002	}
1901		2003
1902	if (corner)	2004	if (corner)
1903	{	2005	{
1904	float ox = corner * dx;	2006	float ox = corner * dx;
1905		2007
1906	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2008	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2009	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2010	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2011	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2012	}
1910	}	2013	}
1911	}	2014	}
1912	}	2015	}
1913	}	2016	}
1914	}	2017	}
		2018
		2019	glEnd ();
		2020	glDisable (GL_TEXTURE_2D);
		2021	key.texname = -1;
1915	}	2022	}
1916		2023
1917	hv_clear (smooth);	2024	hv_clear (smooth);
1918	}	2025	}
1919		2026
1920	glEnd ();
1921
1922	glDisable (GL_TEXTURE_2D);
1923	glDisable (GL_BLEND);	2027	glDisable (GL_BLEND);
		2028	rc_free (rc);
1924		2029
1925	// top layer: overlays such as the health bar	2030	// top layer: overlays such as the health bar
1926	for (y = 0; y < sh; y++)	2031	for (y = 0; y < sh; y++)
1927	if (0 <= y + my && y + my < self->rows)	2032	if (0 <= y + my && y + my < self->rows)
1928	{	2033	{
…		…
2177	int x, y, z;	2282	int x, y, z;
2178	int w, h;	2283	int w, h;
2179	int x1, y1;	2284	int x1, y1;
2180		2285
2181	if (*data++ != 0)	2286	if (*data++ != 0)
2182	return; /* version mismatch */	2287	XSRETURN_EMPTY; /* version mismatch */
2183		2288
2184	w = data++ << 8; w \|= data++;	2289	w = data++ << 8; w \|= data++;
2185	h = data++ << 8; h \|= data++;	2290	h = data++ << 8; h \|= data++;
2186		2291
2187	// 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
…		…
2232	}	2337	}
2233	}	2338	}
2234	}	2339	}
2235	}	2340	}
2236		2341
		2342	MODULE = CFPlus PACKAGE = CFPlus::RW
		2343
		2344	CFPlus::RW
		2345	new (SV class, SV data_sv)
		2346	CODE:
		2347	{
		2348	STRLEN datalen;
		2349	char *data = SvPVbyte (data_sv, datalen);
		2350
		2351	RETVAL = SDL_RWFromConstMem (data, datalen);
		2352	}
		2353	OUTPUT:
		2354	RETVAL
		2355
		2356	CFPlus::RW
		2357	new_from_file (SV class, const char path, const char *mode = "rb")
		2358	CODE:
		2359	RETVAL = SDL_RWFromFile (path, mode);
		2360	OUTPUT:
		2361	RETVAL
		2362
		2363	# fails on win32:
		2364	# CFPlus.xs(2268) : error C2059: syntax error : '('
		2365	#void
		2366	#close (CFPlus::RW self)
		2367	# CODE:
		2368	# (self->(close)) (self);
		2369
		2370	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2371
		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);
		2410
		2411	int
		2412	volume (CFPlus::Channel self, int volume)
		2413	CODE:
		2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2415	OUTPUT:
		2416	RETVAL
		2417
		2418	void
		2419	unregister_all_effects (CFPlus::Channel self)
		2420	CODE:
		2421	Mix_UnregisterAllEffects (self);
		2422
		2423	void
		2424	set_panning (CFPlus::Channel self, int left, int right)
		2425	CODE:
		2426	left = CLAMP (left , 0, 255);
		2427	right = CLAMP (right, 0, 255);
		2428	Mix_SetPanning (self, left, right);
		2429
		2430	void
		2431	set_distance (CFPlus::Channel self, int distance)
		2432	CODE:
		2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));
		2434
		2435	void
		2436	set_position (CFPlus::Channel self, int angle, int distance)
		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);
		2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2446	}
		2447
		2448	void
		2449	set_reverse_stereo (CFPlus::Channel self, int flip)
		2450	CODE:
		2451	Mix_SetReverseStereo (self, flip);
		2452
2237	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2238		2454
2239	PROTOTYPES: DISABLE	2455	PROTOTYPES: DISABLE
2240		2456
2241	CFPlus::MixChunk	2457	CFPlus::MixChunk
2242	new_from_file (SV class, char path)	2458	new (SV *class, CFPlus::RW rwops)
2243	CODE:	2459	CODE:
2244	RETVAL = Mix_LoadWAV (path);	2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2245	OUTPUT:	2461	OUTPUT:
2246	RETVAL	2462	RETVAL
2247		2463
2248	void	2464	void
2249	DESTROY (CFPlus::MixChunk self)	2465	DESTROY (CFPlus::MixChunk self)
…		…
2251	Mix_FreeChunk (self);	2467	Mix_FreeChunk (self);
2252		2468
2253	int	2469	int
2254	volume (CFPlus::MixChunk self, int volume = -1)	2470	volume (CFPlus::MixChunk self, int volume = -1)
2255	CODE:	2471	CODE:
		2472	if (items > 1)
		2473	volume = CLAMP (volume, 0, 128);
2256	RETVAL = Mix_VolumeChunk (self, volume);	2474	RETVAL = Mix_VolumeChunk (self, volume);
2257	OUTPUT:	2475	OUTPUT:
2258	RETVAL	2476	RETVAL
2259		2477
2260	int	2478	CFPlus::Channel
2261	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)
2262	CODE:	2480	CODE:
		2481	{
2263	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	{
		2489	Mix_UnregisterAllEffects (RETVAL);
		2490	Mix_Volume (RETVAL, 128);
		2491	}
		2492	}
2264	OUTPUT:	2493	OUTPUT:
2265	RETVAL	2494	RETVAL
2266		2495
2267	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2268		2497
2269	int	2498	int
2270	volume (int volume = -1)	2499	volume (int volume = -1)
2271	PROTOTYPE: ;$	2500	PROTOTYPE: ;$
2272	CODE:	2501	CODE:
		2502	if (items > 0)
		2503	volume = CLAMP (volume, 0, 128);
2273	RETVAL = Mix_VolumeMusic (volume);	2504	RETVAL = Mix_VolumeMusic (volume);
2274	OUTPUT:	2505	OUTPUT:
2275	RETVAL	2506	RETVAL
2276		2507
2277	int	2508	void
2278	fade_out (int ms)	2509	fade_out (int ms)
2279	CODE:	2510	CODE:
2280	RETVAL = Mix_FadeOutMusic (ms);	2511	Mix_FadeOutMusic (ms);
2281	OUTPUT:	2512
2282	RETVAL	2513	void
		2514	halt ()
		2515	CODE:
		2516	Mix_HaltMusic ();
2283		2517
2284	CFPlus::MixMusic	2518	CFPlus::MixMusic
2285	new_from_file (SV class, char path)	2519	new (SV *class, CFPlus::RW rwops)
2286	CODE:	2520	CODE:
2287	RETVAL = Mix_LoadMUS (path);	2521	RETVAL = Mix_LoadMUS_RW (rwops);
2288	OUTPUT:	2522	OUTPUT:
2289	RETVAL	2523	RETVAL
2290		2524
2291	void	2525	void
2292	DESTROY (CFPlus::MixMusic self)	2526	DESTROY (CFPlus::MixMusic self)
…		…
2298	CODE:	2532	CODE:
2299	RETVAL = Mix_PlayMusic (self, loops);	2533	RETVAL = Mix_PlayMusic (self, loops);
2300	OUTPUT:	2534	OUTPUT:
2301	RETVAL	2535	RETVAL
2302		2536
2303	int	2537	void
2304	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)
2305	CODE:	2539	CODE:
2306	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2540	Mix_FadeInMusicPos (self, loops, ms, position);
2307	OUTPUT:
2308	RETVAL
2309		2541
2310	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2311		2543
2312	PROTOTYPES: ENABLE	2544	PROTOTYPES: ENABLE
2313		2545
…		…
2356	const_iv (GL_INTENSITY),	2588	const_iv (GL_INTENSITY),
2357	const_iv (GL_LUMINANCE),	2589	const_iv (GL_LUMINANCE),
2358	const_iv (GL_LUMINANCE_ALPHA),	2590	const_iv (GL_LUMINANCE_ALPHA),
2359	const_iv (GL_FLOAT),	2591	const_iv (GL_FLOAT),
2360	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),
2361	const_iv (GL_COMPILE),	2599	const_iv (GL_COMPILE),
2362	const_iv (GL_PROXY_TEXTURE_1D),	2600	const_iv (GL_PROXY_TEXTURE_1D),
2363	const_iv (GL_PROXY_TEXTURE_2D),	2601	const_iv (GL_PROXY_TEXTURE_2D),
2364	const_iv (GL_TEXTURE_1D),	2602	const_iv (GL_TEXTURE_1D),
2365	const_iv (GL_TEXTURE_2D),	2603	const_iv (GL_TEXTURE_2D),
…		…
2404	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2642	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405	const_iv (GL_POINT_SMOOTH_HINT),	2643	const_iv (GL_POINT_SMOOTH_HINT),
2406	const_iv (GL_LINE_SMOOTH_HINT),	2644	const_iv (GL_LINE_SMOOTH_HINT),
2407	const_iv (GL_POLYGON_SMOOTH_HINT),	2645	const_iv (GL_POLYGON_SMOOTH_HINT),
2408	const_iv (GL_GENERATE_MIPMAP_HINT),	2646	const_iv (GL_GENERATE_MIPMAP_HINT),
		2647	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409	const_iv (GL_FASTEST),	2648	const_iv (GL_FASTEST),
2410	const_iv (GL_DONT_CARE),	2649	const_iv (GL_DONT_CARE),
2411	const_iv (GL_NICEST),	2650	const_iv (GL_NICEST),
2412	const_iv (GL_V2F),	2651	const_iv (GL_V2F),
2413	const_iv (GL_V3F),	2652	const_iv (GL_V3F),
…		…
2421		2660
2422	texture_av = newAV ();	2661	texture_av = newAV ();
2423	AvREAL_off (texture_av);	2662	AvREAL_off (texture_av);
2424	}	2663	}
2425		2664
		2665	void
		2666	disable_GL_EXT_blend_func_separate ()
		2667	CODE:
		2668	gl.BlendFuncSeparate = 0;
		2669	gl.BlendFuncSeparateEXT = 0;
		2670
2426	char *	2671	char *
2427	gl_vendor ()	2672	gl_vendor ()
2428	CODE:	2673	CODE:
2429	RETVAL = (char *)glGetString (GL_VENDOR);	2674	RETVAL = (char *)glGetString (GL_VENDOR);
2430	OUTPUT:	2675	OUTPUT:
…		…
2547		2792
2548	void glTexCoord (float s, float t)	2793	void glTexCoord (float s, float t)
2549	CODE:	2794	CODE:
2550	glTexCoord2f (s, t);	2795	glTexCoord2f (s, t);
2551		2796
		2797	void glRect (float x1, float y1, float x2, float y2)
		2798	CODE:
		2799	glRectf (x1, y1, x2, y2);
		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
2552	PROTOTYPES: ENABLE	2810	PROTOTYPES: ENABLE
2553		2811
2554	void glBegin (int mode)	2812	void glBegin (int mode)
2555		2813
2556	void glEnd ()	2814	void glEnd ()
…		…
2657	NV x, y, w, h;	2915	NV x, y, w, h;
2658	SV *draw_x_sv = GvSV (draw_x_gv);	2916	SV *draw_x_sv = GvSV (draw_x_gv);
2659	SV *draw_y_sv = GvSV (draw_y_gv);	2917	SV *draw_y_sv = GvSV (draw_y_gv);
2660	SV *draw_w_sv = GvSV (draw_w_gv);	2918	SV *draw_w_sv = GvSV (draw_w_gv);
2661	SV *draw_h_sv = GvSV (draw_h_gv);	2919	SV *draw_h_sv = GvSV (draw_h_gv);
2662	SV *hover;
2663	double draw_x, draw_y, draw_w, draw_h;	2920	double draw_x, draw_y;
2664		2921
2665	if (!SvROK (self))	2922	if (!SvROK (self))
2666	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
2667		2924
2668	hv = (HV *)SvRV (self);	2925	hv = (HV *)SvRV (self);
…		…
2696	{	2953	{
2697	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2954	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2698		2955
2699	if (svp && SvTRUE (*svp))	2956	if (svp && SvTRUE (*svp))
2700	{	2957	{
2701	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);
2702	glEnable (GL_BLEND);	2959	glEnable (GL_BLEND);
2703	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2960	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2704	glBegin (GL_QUADS);	2961	glBegin (GL_QUADS);
2705	glVertex2f (0, 0);	2962	glVertex2f (0, 0);
2706	glVertex2f (w, 0);	2963	glVertex2f (w, 0);
…		…
2709	glEnd ();	2966	glEnd ();
2710	glDisable (GL_BLEND);	2967	glDisable (GL_BLEND);
2711	}	2968	}
2712	}	2969	}
2713	#if 0	2970	#if 0
2714	if ($ENV{CFPLUS_DEBUG} & 1) {	2971	// draw borders, for debugging
2715	glPushMatrix;	2972	glPushMatrix ();
2716	glColor 1, 1, 0, 1;	2973	glColor4f (1., 1., 0., 1.);
2717	glTranslate 0.375, 0.375;	2974	glTranslatef (.5, .5, 0.);
2718	glBegin GL_LINE_LOOP;	2975	glBegin (GL_LINE_LOOP);
2719	glVertex 0 , 0;	2976	glVertex2f (0 , 0);
2720	glVertex $self->{w} - 1, 0;	2977	glVertex2f (w - 1, 0);
2721	glVertex $self->{w} - 1, $self->{h} - 1;	2978	glVertex2f (w - 1, h - 1);
2722	glVertex 0 , $self->{h} - 1;	2979	glVertex2f (0 , h - 1);
2723	glEnd;	2980	glEnd ();
2724	glPopMatrix;	2981	glPopMatrix ();
2725	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2726	}
2727	#endif	2982	#endif
2728	PUSHMARK (SP);	2983	PUSHMARK (SP);
2729	XPUSHs (self);	2984	XPUSHs (self);
2730	PUTBACK;	2985	PUTBACK;
2731	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.209 by root, Sat Jul 21 22:54:52 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.209 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.239 by root, Tue Dec 25 18:58:32 2007 UTC