ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.210 by root, Tue Jul 24 18:24:03 2007 UTC vs.
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 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>
…		…
38	#define G_DISABLE_CAST_CHECKS	45	#define G_DISABLE_CAST_CHECKS
39		46
40	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
41		48
42	#include <pango/pango.h>	49	#include <pango/pango.h>
		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
43		61
44	#ifndef _WIN32	62	#ifndef _WIN32
45	# include <sys/types.h>	63	# include <sys/types.h>
46	# include <sys/socket.h>	64	# include <sys/socket.h>
47	# include <netinet/in.h>	65	# include <netinet/in.h>
48	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
49	# include <inttypes.h>	67	# include <inttypes.h>
50	#endif	68	#endif
51		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
52	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
53		80
54	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
55		82
56	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
57	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
58		85
59	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
60		87
		88	/* mask out modifiers we are not interested in */
		89	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
		90
61	#if 0	91	#if 1
62	# define PARACHUTE SDL_INIT_NOPARACHUTE	92	# define PARACHUTE SDL_INIT_NOPARACHUTE
63	#else	93	#else
64	# define PARACHUTE 0	94	# define PARACHUTE 0
65	#endif	95	#endif
66		96
…		…
107	av_push (texture_av, (SV *)(size_t)name);	137	av_push (texture_av, (SV *)(size_t)name);
108	glDeleteTextures (1, &name);	138	glDeleteTextures (1, &name);
109	}	139	}
110		140
111	#include "texcache.c"	141	#include "texcache.c"
		142	#include "rendercache.c"
112		143
113	#include "pango-font.c"	144	#include "pango-font.c"
114	#include "pango-fontmap.c"	145	#include "pango-fontmap.c"
115	#include "pango-render.c"	146	#include "pango-render.c"
116		147
		148	typedef IV DC__Channel;
		149	typedef SDL_RWops *DC__RW;
117	typedef Mix_Chunk *CFPlus__MixChunk;	150	typedef Mix_Chunk *DC__MixChunk;
118	typedef Mix_Music *CFPlus__MixMusic;	151	typedef Mix_Music *DC__MixMusic;
119		152
120	typedef PangoFontDescription *CFPlus__Font;	153	typedef PangoFontDescription *DC__Font;
121		154
122	static int	155	static int
123	shape_attr_p (PangoLayoutRun *run)	156	shape_attr_p (PangoLayoutRun *run)
124	{	157	{
125	GSList *attrs = run->item->analysis.extra_attrs;	158	GSList *attrs = run->item->analysis.extra_attrs;
…		…
139		172
140	typedef struct cf_layout {	173	typedef struct cf_layout {
141	PangoLayout *pl;	174	PangoLayout *pl;
142	float r, g, b, a; // default color for rgba mode	175	float r, g, b, a; // default color for rgba mode
143	int base_height;	176	int base_height;
144	CFPlus__Font font;	177	DC__Font font;
		178	rc_t *rc;
145	} *CFPlus__Layout;	179	} *DC__Layout;
146		180
147	static CFPlus__Font default_font;	181	static DC__Font default_font;
148	static PangoContext *opengl_context;	182	static PangoContext *opengl_context;
149	static PangoFontMap *opengl_fontmap;	183	static PangoFontMap *opengl_fontmap;
150		184
151	static void	185	static void
152	substitute_func (FcPattern *pattern, gpointer data)	186	substitute_func (FcPattern *pattern, gpointer data)
…		…
157	#endif	191	#endif
158	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	192	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
159	}	193	}
160		194
161	static void	195	static void
162	layout_update_font (CFPlus__Layout self)	196	layout_update_font (DC__Layout self)
163	{	197	{
164	/* use a random scale factor to account for unknown descenders, 0.8 works	198	/* use a random scale factor to account for unknown descenders, 0.8 works
165	* reasonably well with bitstream vera	199	* reasonably well with dejavu/bistream fonts
166	*/	200	*/
167	PangoFontDescription *font = self->font ? self->font : default_font;	201	PangoFontDescription *font = self->font ? self->font : default_font;
168		202
169	pango_font_description_set_absolute_size (font,	203	pango_font_description_set_absolute_size (font,
170	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	204	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
171		205
172	pango_layout_set_font_description (self->pl, font);	206	pango_layout_set_font_description (self->pl, font);
173	}	207	}
174		208
175	static void	209	static void
176	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	210	layout_get_pixel_size (DC__Layout self, int *w, int *h)
177	{	211	{
178	PangoRectangle rect;	212	PangoRectangle rect;
179		213
180	// get_pixel_* wrongly rounds down	214	// get_pixel_* wrongly rounds down
181	pango_layout_get_extents (self->pl, 0, &rect);	215	pango_layout_get_extents (self->pl, 0, &rect);
…		…
192		226
193	typedef uint16_t tileid;	227	typedef uint16_t tileid;
194	typedef uint16_t faceid;	228	typedef uint16_t faceid;
195		229
196	typedef struct {	230	typedef struct {
197	int name;	231	GLuint name;
198	int w, h;	232	int w, h;
199	float s, t;	233	float s, t;
200	uint8_t r, g, b, a;	234	uint8_t r, g, b, a;
201	tileid smoothtile;	235	tileid smoothtile;
202	uint8_t smoothlevel;	236	uint8_t smoothlevel;
…		…
220	int faces; tileid *face2tile; // [faceid]	254	int faces; tileid *face2tile; // [faceid]
221	int texs; maptex *tex; // [tileid]	255	int texs; maptex *tex; // [tileid]
222		256
223	int32_t rows;	257	int32_t rows;
224	maprow *row;	258	maprow *row;
225	} *CFPlus__Map;	259	} *DC__Map;
226		260
227	static char *	261	static char *
228	prepend (char *ptr, int sze, int inc)	262	prepend (char *ptr, int sze, int inc)
229	{	263	{
230	char *p;	264	char *p;
…		…
268	self->texs *= 2;	302	self->texs *= 2;
269	}	303	}
270	}	304	}
271		305
272	static maprow *	306	static maprow *
273	map_get_row (CFPlus__Map self, int y)	307	map_get_row (DC__Map self, int y)
274	{	308	{
275	if (0 > y)	309	if (0 > y)
276	{	310	{
277	int extend = - y + MAP_EXTEND_Y;	311	int extend = - y + MAP_EXTEND_Y;
278	Prepend (maprow, self->row, self->rows, extend);	312	Prepend (maprow, self->row, self->rows, extend);
…		…
316		350
317	return row->col + (x - row->c0);	351	return row->col + (x - row->c0);
318	}	352	}
319		353
320	static mapcell *	354	static mapcell *
321	map_get_cell (CFPlus__Map self, int x, int y)	355	map_get_cell (DC__Map self, int x, int y)
322	{	356	{
323	return row_get_cell (map_get_row (self, y), x);	357	return row_get_cell (map_get_row (self, y), x);
324	}	358	}
325		359
326	static void	360	static void
327	map_clear (CFPlus__Map self)	361	map_clear (DC__Map self)
328	{	362	{
329	int r;	363	int r;
330		364
331	for (r = 0; r < self->rows; r++)	365	for (r = 0; r < self->rows; r++)
332	Safefree (self->row[r].col);	366	Safefree (self->row[r].col);
…		…
340	self->row = 0;	374	self->row = 0;
341	self->rows = 0;	375	self->rows = 0;
342	}	376	}
343		377
344	static void	378	static void
345	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	379	map_blank (DC__Map self, int x0, int y0, int w, int h)
346	{	380	{
347	int x, y;	381	int x, y;
348	maprow *row;	382	maprow *row;
349	mapcell *cell;	383	mapcell *cell;
350		384
…		…
429	n |= n >> 16;	463	n |= n >> 16;
430		464
431	return n + 1;	465	return n + 1;
432	}	466	}
433		467
		468	static unsigned int
		469	popcount (unsigned int n)
		470	{
		471	n -= (n >> 1) & 0x55555555U;
		472	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		473	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		474	n *= 0x01010101U;
		475
		476	return n >> 24;
		477	}
		478
434	/* SDL should provide this, really. */	479	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	480	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	481	#define SDLK_MODIFIER_MAX 314
437		482
438	/******************************************************************************/	483	/******************************************************************************/
…		…
476	return 0;	521	return 0;
477		522
478	return 1;	523	return 1;
479	}	524	}
480		525
481	MODULE = CFPlus PACKAGE = CFPlus	526	MODULE = Deliantra::Client PACKAGE = DC
482		527
483	PROTOTYPES: ENABLE	528	PROTOTYPES: ENABLE
484		529
485	BOOT:	530	BOOT:
486	{	531	{
487	HV *stash = gv_stashpv ("CFPlus", 1);	532	HV *stash = gv_stashpv ("DC", 1);
488	static const struct {	533	static const struct {
489	const char *name;	534	const char *name;
490	IV iv;	535	IV iv;
491	} *civ, const_iv[] = {	536	} *civ, const_iv[] = {
492	# define const_iv(name) { # name, (IV)name }	537	# define const_iv(name) { # name, (IV)name }
…		…
514		559
515	const_iv (SDL_APPINPUTFOCUS),	560	const_iv (SDL_APPINPUTFOCUS),
516	const_iv (SDL_APPMOUSEFOCUS),	561	const_iv (SDL_APPMOUSEFOCUS),
517	const_iv (SDL_APPACTIVE),	562	const_iv (SDL_APPACTIVE),
518		563
		564	const_iv (SDLK_FIRST),
		565	const_iv (SDLK_LAST),
519	const_iv (SDLK_KP0),	566	const_iv (SDLK_KP0),
520	const_iv (SDLK_KP1),	567	const_iv (SDLK_KP1),
521	const_iv (SDLK_KP2),	568	const_iv (SDLK_KP2),
522	const_iv (SDLK_KP3),	569	const_iv (SDLK_KP3),
523	const_iv (SDLK_KP4),	570	const_iv (SDLK_KP4),
…		…
595	const_iv (KMOD_LMETA),	642	const_iv (KMOD_LMETA),
596	const_iv (KMOD_RMETA),	643	const_iv (KMOD_RMETA),
597	const_iv (KMOD_NUM),	644	const_iv (KMOD_NUM),
598	const_iv (KMOD_CAPS),	645	const_iv (KMOD_CAPS),
599	const_iv (KMOD_MODE),	646	const_iv (KMOD_MODE),
		647
		648	const_iv (MIX_DEFAULT_FORMAT),
600	# undef const_iv	649	# undef const_iv
601	};	650	};
602		651
603	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	652	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
604	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	653	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
622		671
623	NV floor (NV x)	672	NV floor (NV x)
624		673
625	NV ceil (NV x)	674	NV ceil (NV x)
626		675
		676	IV minpot (UV n)
		677
		678	IV popcount (UV n)
		679
627	void	680	void
628	pango_init ()	681	pango_init ()
629	CODE:	682	CODE:
630	{	683	{
631	opengl_fontmap = pango_opengl_font_map_new ();	684	opengl_fontmap = pango_opengl_font_map_new ();
632	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	685	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
633	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	686	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		687	/*pango_context_set_font_description (opengl_context, default_font);*/
		688	#if PANGO_VERSION_CHECK (1, 15, 2)
		689	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		690	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		691	#endif
634	}	692	}
635		693
636	char *	694	char *
637	SDL_GetError ()	695	SDL_GetError ()
638		696
…		…
670	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	728	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
671		729
672	if (m && m != (SDL_Rect **)-1)	730	if (m && m != (SDL_Rect **)-1)
673	while (*m)	731	while (*m)
674	{	732	{
675	if ((*m)->w >= 640 && (*m)->h >= 480)	733	if ((*m)->w >= 800 && (*m)->h >= 480)
676	{	734	{
677	AV *av = newAV ();	735	AV *av = newAV ();
678	av_push (av, newSViv ((*m)->w));	736	av_push (av, newSViv ((*m)->w));
679	av_push (av, newSViv ((*m)->h));	737	av_push (av, newSViv ((*m)->h));
680	av_push (av, newSViv (rgb));	738	av_push (av, newSViv (rgb));
…		…
704		762
705	if (RETVAL)	763	if (RETVAL)
706	{	764	{
707	av_clear (texture_av);	765	av_clear (texture_av);
708		766
709	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	767	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
710	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	768	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
711	#include "glfunc.h"	769	#include "glfunc.h"
712	#undef GL_FUNC	770	#undef GL_FUNC
713	}	771	}
714	}	772	}
…		…
721	char *	779	char *
722	SDL_GetKeyName (int sym)	780	SDL_GetKeyName (int sym)
723		781
724	int	782	int
725	SDL_GetAppState ()	783	SDL_GetAppState ()
		784
		785	int
		786	SDL_GetModState ()
726		787
727	void	788	void
728	poll_events ()	789	poll_events ()
729	PPCODE:	790	PPCODE:
730	{	791	{
…		…
740	{	801	{
741	case SDL_KEYDOWN:	802	case SDL_KEYDOWN:
742	case SDL_KEYUP:	803	case SDL_KEYUP:
743	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	804	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
744	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	805	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
745	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	806	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
746	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	807	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
747	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	808	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
748	break;	809	break;
749		810
750	case SDL_ACTIVEEVENT:	811	case SDL_ACTIVEEVENT:
751	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	812	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
769	x = ev.motion.x;	830	x = ev.motion.x;
770	y = ev.motion.y;	831	y = ev.motion.y;
771	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	832	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
772	}	833	}
773		834
774	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	835	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
775	hv_store (hv, "state", 5, newSViv (state), 0);	836	hv_store (hv, "state", 5, newSViv (state), 0);
776	hv_store (hv, "x", 1, newSViv (x), 0);	837	hv_store (hv, "x", 1, newSViv (x), 0);
777	hv_store (hv, "y", 1, newSViv (y), 0);	838	hv_store (hv, "y", 1, newSViv (y), 0);
778	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	839	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
779	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	840	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
780	}	841	}
781	break;	842	break;
782		843
783	case SDL_MOUSEBUTTONDOWN:	844	case SDL_MOUSEBUTTONDOWN:
784	case SDL_MOUSEBUTTONUP:	845	case SDL_MOUSEBUTTONUP:
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	846	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
786		847
787	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	848	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
788	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	849	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
789	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	850	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
790	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	851	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
795	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	856	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
796	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	857	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
797	break;	858	break;
798	}	859	}
799		860
800	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	861	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
801	}	862	}
802	}	863	}
803		864
804	int	865	int
805	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	866	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
806	POSTCALL:	867	POSTCALL:
807	Mix_HookMusicFinished (music_finished);	868	Mix_HookMusicFinished (music_finished);
808	Mix_ChannelFinished (channel_finished);	869	Mix_ChannelFinished (channel_finished);
809		870
810	void	871	void
		872	Mix_QuerySpec ()
		873	PPCODE:
		874	{
		875	int freq, channels;
		876	Uint16 format;
		877
		878	if (Mix_QuerySpec (&freq, &format, &channels))
		879	{
		880	EXTEND (SP, 3);
		881	PUSHs (sv_2mortal (newSViv (freq)));
		882	PUSHs (sv_2mortal (newSViv (format)));
		883	PUSHs (sv_2mortal (newSViv (channels)));
		884	}
		885	}
		886
		887	void
811	Mix_CloseAudio ()	888	Mix_CloseAudio ()
812		889
813	int	890	int
814	Mix_AllocateChannels (int numchans = -1)	891	Mix_AllocateChannels (int numchans = -1)
		892
		893	const char *
		894	Mix_GetError ()
815		895
816	void	896	void
817	lowdelay (int fd, int val = 1)	897	lowdelay (int fd, int val = 1)
818	CODE:	898	CODE:
819	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	899	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
845	}	925	}
846	}	926	}
847	#endif	927	#endif
848	}	928	}
849		929
850	void	930	int
851	add_font (char *file)	931	add_font (char *file)
852	CODE:	932	CODE:
853	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	933	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		934	OUTPUT:
		935	RETVAL
854		936
855	void	937	void
856	load_image_inline (SV *image_)	938	load_image_inline (SV *image_)
857	ALIAS:	939	ALIAS:
858	load_image_file = 1	940	load_image_file = 1
…		…
861	STRLEN image_len;	943	STRLEN image_len;
862	char *image = (char *)SvPVbyte (image_, image_len);	944	char *image = (char *)SvPVbyte (image_, image_len);
863	SDL_Surface *surface, *surface2;	945	SDL_Surface *surface, *surface2;
864	SDL_PixelFormat fmt;	946	SDL_PixelFormat fmt;
865	SDL_RWops *rw = ix	947	SDL_RWops *rw = ix
866	? SDL_RWFromFile (image, "r")	948	? SDL_RWFromFile (image, "rb")
867	: SDL_RWFromConstMem (image, image_len);	949	: SDL_RWFromConstMem (image, image_len);
868		950
869	if (!rw)	951	if (!rw)
870	croak ("load_image: %s", SDL_GetError ());	952	croak ("load_image: %s", SDL_GetError ());
871		953
…		…
944	void	1026	void
945	error (char *message)	1027	error (char *message)
946	CODE:	1028	CODE:
947	fprintf (stderr, "ERROR: %s\n", message);	1029	fprintf (stderr, "ERROR: %s\n", message);
948	#ifdef _WIN32	1030	#ifdef _WIN32
949	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1031	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
950	#endif	1032	#endif
951		1033
952	void	1034	void
953	fatal (char *message)	1035	fatal (char *message)
954	CODE:	1036	CODE:
955	fprintf (stderr, "FATAL: %s\n", message);	1037	fprintf (stderr, "FATAL: %s\n", message);
956	#ifdef _WIN32	1038	#ifdef _WIN32
957	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1039	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
958	#endif	1040	#endif
959	_exit (1);	1041	_exit (1);
960		1042
961	void	1043	void
962	_exit (int retval = 0)	1044	_exit (int retval = 0)
…		…
974	#if DEBUG	1056	#if DEBUG
975	VALGRIND_DO_LEAK_CHECK;	1057	VALGRIND_DO_LEAK_CHECK;
976	#endif	1058	#endif
977	}	1059	}
978		1060
979	MODULE = CFPlus PACKAGE = CFPlus::Font	1061	MODULE = Deliantra::Client PACKAGE = DC::Font
980		1062
981	PROTOTYPES: DISABLE	1063	PROTOTYPES: DISABLE
982		1064
983	CFPlus::Font	1065	DC::Font
984	new_from_file (SV *class, char *path, int id = 0)	1066	new_from_file (SV *class, char *path, int id = 0)
985	CODE:	1067	CODE:
986	{	1068	{
987	int count;	1069	int count;
988	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1070	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
991	}	1073	}
992	OUTPUT:	1074	OUTPUT:
993	RETVAL	1075	RETVAL
994		1076
995	void	1077	void
996	DESTROY (CFPlus::Font self)	1078	DESTROY (DC::Font self)
997	CODE:	1079	CODE:
998	pango_font_description_free (self);	1080	pango_font_description_free (self);
999		1081
1000	void	1082	void
1001	make_default (CFPlus::Font self)	1083	make_default (DC::Font self)
1002	PROTOTYPE: $	1084	PROTOTYPE: $
1003	CODE:	1085	CODE:
1004	default_font = self;	1086	default_font = self;
1005		1087
1006	MODULE = CFPlus PACKAGE = CFPlus::Layout	1088	MODULE = Deliantra::Client PACKAGE = DC::Layout
1007		1089
1008	PROTOTYPES: DISABLE	1090	PROTOTYPES: DISABLE
1009		1091
1010	void	1092	void
1011	reset_glyph_cache ()	1093	glyph_cache_backup ()
1012	PROTOTYPE:	1094	PROTOTYPE:
1013	CODE:	1095	CODE:
		1096	tc_backup ();
		1097
		1098	void
		1099	glyph_cache_restore ()
		1100	PROTOTYPE:
		1101	CODE:
1014	tc_clear ();	1102	tc_restore ();
1015		1103
1016	CFPlus::Layout	1104	DC::Layout
1017	new (SV *class)	1105	new (SV *class)
1018	CODE:	1106	CODE:
1019	New (0, RETVAL, 1, struct cf_layout);	1107	New (0, RETVAL, 1, struct cf_layout);
1020		1108
1021	RETVAL->pl = pango_layout_new (opengl_context);	1109	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1023	RETVAL->g = 1.;	1111	RETVAL->g = 1.;
1024	RETVAL->b = 1.;	1112	RETVAL->b = 1.;
1025	RETVAL->a = 1.;	1113	RETVAL->a = 1.;
1026	RETVAL->base_height = MIN_FONT_HEIGHT;	1114	RETVAL->base_height = MIN_FONT_HEIGHT;
1027	RETVAL->font = 0;	1115	RETVAL->font = 0;
		1116	RETVAL->rc = rc_alloc ();
1028		1117
1029	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1118	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1030	layout_update_font (RETVAL);	1119	layout_update_font (RETVAL);
1031	OUTPUT:	1120	OUTPUT:
1032	RETVAL	1121	RETVAL
1033		1122
1034	void	1123	void
1035	DESTROY (CFPlus::Layout self)	1124	DESTROY (DC::Layout self)
1036	CODE:	1125	CODE:
1037	g_object_unref (self->pl);	1126	g_object_unref (self->pl);
		1127	rc_free (self->rc);
1038	Safefree (self);	1128	Safefree (self);
1039		1129
1040	void	1130	void
1041	set_text (CFPlus::Layout self, SV *text_)	1131	set_text (DC::Layout self, SV *text_)
1042	CODE:	1132	CODE:
1043	{	1133	{
1044	STRLEN textlen;	1134	STRLEN textlen;
1045	char *text = SvPVutf8 (text_, textlen);	1135	char *text = SvPVutf8 (text_, textlen);
1046		1136
1047	pango_layout_set_text (self->pl, text, textlen);	1137	pango_layout_set_text (self->pl, text, textlen);
1048	}	1138	}
1049		1139
1050	void	1140	void
1051	set_markup (CFPlus::Layout self, SV *text_)	1141	set_markup (DC::Layout self, SV *text_)
1052	CODE:	1142	CODE:
1053	{	1143	{
1054	STRLEN textlen;	1144	STRLEN textlen;
1055	char *text = SvPVutf8 (text_, textlen);	1145	char *text = SvPVutf8 (text_, textlen);
1056		1146
1057	pango_layout_set_markup (self->pl, text, textlen);	1147	pango_layout_set_markup (self->pl, text, textlen);
1058	}	1148	}
1059		1149
1060	void	1150	void
1061	set_shapes (CFPlus::Layout self, ...)	1151	set_shapes (DC::Layout self, ...)
1062	CODE:	1152	CODE:
1063	{	1153	{
1064	PangoAttrList *attrs = 0;	1154	PangoAttrList *attrs = 0;
1065	const char *text = pango_layout_get_text (self->pl);	1155	const char *text = pango_layout_get_text (self->pl);
1066	const char *pos = text;	1156	const char *pos = text;
…		…
1101	if (attrs)	1191	if (attrs)
1102	pango_layout_set_attributes (self->pl, attrs);	1192	pango_layout_set_attributes (self->pl, attrs);
1103	}	1193	}
1104		1194
1105	void	1195	void
1106	get_shapes (CFPlus::Layout self)	1196	get_shapes (DC::Layout self)
1107	PPCODE:	1197	PPCODE:
1108	{	1198	{
1109	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1199	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1110		1200
1111	do	1201	do
1112	{	1202	{
1113	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1203	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1114		1204
1115	if (run && shape_attr_p (run))	1205	if (run && shape_attr_p (run))
1116	{	1206	{
1117	PangoRectangle extents;	1207	PangoRectangle extents;
1118	pango_layout_iter_get_run_extents (iter, 0, &extents);	1208	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1126		1216
1127	pango_layout_iter_free (iter);	1217	pango_layout_iter_free (iter);
1128	}	1218	}
1129		1219
1130	int	1220	int
1131	has_wrapped (CFPlus::Layout self)	1221	has_wrapped (DC::Layout self)
1132	CODE:	1222	CODE:
1133	{	1223	{
1134	int lines = 1;	1224	int lines = 1;
1135	const char *text = pango_layout_get_text (self->pl);	1225	const char *text = pango_layout_get_text (self->pl);
1136		1226
…		…
1141	}	1231	}
1142	OUTPUT:	1232	OUTPUT:
1143	RETVAL	1233	RETVAL
1144		1234
1145	SV *	1235	SV *
1146	get_text (CFPlus::Layout self)	1236	get_text (DC::Layout self)
1147	CODE:	1237	CODE:
1148	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1238	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1149	sv_utf8_decode (RETVAL);	1239	sv_utf8_decode (RETVAL);
1150	OUTPUT:	1240	OUTPUT:
1151	RETVAL	1241	RETVAL
1152		1242
1153	void	1243	void
1154	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1244	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1155	CODE:	1245	CODE:
1156	self->r = r;	1246	self->r = r;
1157	self->g = g;	1247	self->g = g;
1158	self->b = b;	1248	self->b = b;
1159	self->a = a;	1249	self->a = a;
1160		1250
1161	void	1251	void
1162	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1252	set_font (DC::Layout self, DC::Font font = 0)
1163	CODE:	1253	CODE:
1164	if (self->font != font)	1254	if (self->font != font)
1165	{	1255	{
1166	self->font = font;	1256	self->font = font;
1167	layout_update_font (self);	1257	layout_update_font (self);
1168	}	1258	}
1169		1259
1170	void	1260	void
1171	set_height (CFPlus::Layout self, int base_height)	1261	set_height (DC::Layout self, int base_height)
1172	CODE:	1262	CODE:
1173	if (self->base_height != base_height)	1263	if (self->base_height != base_height)
1174	{	1264	{
1175	self->base_height = base_height;	1265	self->base_height = base_height;
1176	layout_update_font (self);	1266	layout_update_font (self);
1177	}	1267	}
1178		1268
1179	void	1269	void
1180	set_width (CFPlus::Layout self, int max_width = -1)	1270	set_width (DC::Layout self, int max_width = -1)
1181	CODE:	1271	CODE:
1182	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1272	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1183		1273
1184	void	1274	void
1185	set_indent (CFPlus::Layout self, int indent)	1275	set_indent (DC::Layout self, int indent)
1186	CODE:	1276	CODE:
1187	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1277	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1188		1278
1189	void	1279	void
1190	set_spacing (CFPlus::Layout self, int spacing)	1280	set_spacing (DC::Layout self, int spacing)
1191	CODE:	1281	CODE:
1192	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1282	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1193		1283
1194	void	1284	void
1195	set_ellipsise (CFPlus::Layout self, int ellipsise)	1285	set_ellipsise (DC::Layout self, int ellipsise)
1196	CODE:	1286	CODE:
1197	pango_layout_set_ellipsize (self->pl,	1287	pango_layout_set_ellipsize (self->pl,
1198	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1288	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1199	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1289	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1200	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1290	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1201	: PANGO_ELLIPSIZE_NONE	1291	: PANGO_ELLIPSIZE_NONE
1202	);	1292	);
1203		1293
1204	void	1294	void
1205	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1295	set_single_paragraph_mode (DC::Layout self, int spm)
1206	CODE:	1296	CODE:
1207	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1297	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1208		1298
1209	void	1299	void
1210	size (CFPlus::Layout self)	1300	size (DC::Layout self)
1211	PPCODE:	1301	PPCODE:
1212	{	1302	{
1213	int w, h;	1303	int w, h;
1214		1304
1215	layout_get_pixel_size (self, &w, &h);	1305	layout_get_pixel_size (self, &w, &h);
…		…
1218	PUSHs (sv_2mortal (newSViv (w)));	1308	PUSHs (sv_2mortal (newSViv (w)));
1219	PUSHs (sv_2mortal (newSViv (h)));	1309	PUSHs (sv_2mortal (newSViv (h)));
1220	}	1310	}
1221		1311
1222	int	1312	int
1223	descent (CFPlus::Layout self)	1313	descent (DC::Layout self)
1224	CODE:	1314	CODE:
1225	{	1315	{
1226	PangoRectangle rect;	1316	PangoRectangle rect;
1227	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1317	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1228	pango_layout_line_get_pixel_extents (line, 0, &rect);	1318	pango_layout_line_get_pixel_extents (line, 0, &rect);
1229	RETVAL = PANGO_DESCENT (rect);	1319	RETVAL = PANGO_DESCENT (rect);
1230	}	1320	}
1231	OUTPUT:	1321	OUTPUT:
1232	RETVAL	1322	RETVAL
1233		1323
1234	int	1324	int
1235	xy_to_index (CFPlus::Layout self, int x, int y)	1325	xy_to_index (DC::Layout self, int x, int y)
1236	CODE:	1326	CODE:
1237	{	1327	{
1238	int index, trailing;	1328	int index, trailing;
1239	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1329	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1240	RETVAL = index + trailing;	1330	RETVAL = index + trailing;
1241	}	1331	}
1242	OUTPUT:	1332	OUTPUT:
1243	RETVAL	1333	RETVAL
1244		1334
1245	void	1335	void
1246	cursor_pos (CFPlus::Layout self, int index)	1336	cursor_pos (DC::Layout self, int index)
1247	PPCODE:	1337	PPCODE:
1248	{	1338	{
1249	PangoRectangle strong_pos;	1339	PangoRectangle pos;
1250	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1340	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1251		1341
1252	EXTEND (SP, 3);	1342	EXTEND (SP, 3);
1253	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1343	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1254	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1344	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1255	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1345	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1256	}	1346	}
1257		1347
1258	void	1348	void
1259	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1349	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1260	PPCODE:	1350	PPCODE:
1261	{	1351	{
1262	int line, x;	1352	int line, x;
1263		1353
1264	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1354	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1355	#if !PANGO_VERSION_CHECK (1, 17, 3)
1265	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1356	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1266		1357	--line;
		1358	#endif
1267	EXTEND (SP, 2);	1359	EXTEND (SP, 2);
1268	PUSHs (sv_2mortal (newSViv (line - 1)));	1360	PUSHs (sv_2mortal (newSViv (line)));
1269	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1361	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1270	}	1362	}
1271		1363
1272	void	1364	void
1273	line_x_to_index (CFPlus::Layout self, int line, int x)	1365	line_x_to_index (DC::Layout self, int line, int x)
1274	PPCODE:	1366	PPCODE:
1275	{	1367	{
1276	PangoLayoutLine *lp;	1368	PangoLayoutLine *lp;
1277	int index, trailing;	1369	int index, trailing;
1278		1370
1279	if (line < 0)	1371	if (line < 0)
1280	XSRETURN_EMPTY;	1372	XSRETURN_EMPTY;
1281		1373
1282	if (!(lp = pango_layout_get_line (self->pl, line)))	1374	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1283	XSRETURN_EMPTY; /* do better */	1375	XSRETURN_EMPTY; /* do better */
1284		1376
1285	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1377	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1286		1378
1287	EXTEND (SP, 2);	1379	EXTEND (SP, 2);
…		…
1293	PUSHs (sv_2mortal (newSViv (trailing)));	1385	PUSHs (sv_2mortal (newSViv (trailing)));
1294	}	1386	}
1295	}	1387	}
1296		1388
1297	void	1389	void
1298	render (CFPlus::Layout self, float x, float y, int flags = 0)	1390	render (DC::Layout self, float x, float y, int flags = 0)
1299	PPCODE:	1391	CODE:
		1392	rc_clear (self->rc);
1300	pango_opengl_render_layout_subpixel (	1393	pango_opengl_render_layout_subpixel (
1301	self->pl,	1394	self->pl,
		1395	self->rc,
1302	x * PANGO_SCALE, y * PANGO_SCALE,	1396	x * PANGO_SCALE, y * PANGO_SCALE,
1303	self->r, self->g, self->b, self->a,	1397	self->r, self->g, self->b, self->a,
1304	flags	1398	flags
1305	);	1399	);
		1400	// we assume that context_change actually clears/frees stuff
		1401	// and does not do any recomputation...
		1402	pango_layout_context_changed (self->pl);
1306		1403
1307	MODULE = CFPlus PACKAGE = CFPlus::Texture	1404	void
		1405	draw (DC::Layout self)
		1406	CODE:
		1407	{
		1408	glEnable (GL_TEXTURE_2D);
		1409	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1410	glEnable (GL_BLEND);
		1411	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1412	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1413	glEnable (GL_ALPHA_TEST);
		1414	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1415
		1416	rc_draw (self->rc);
		1417
		1418	glDisable (GL_ALPHA_TEST);
		1419	glDisable (GL_BLEND);
		1420	glDisable (GL_TEXTURE_2D);
		1421	}
		1422
		1423	MODULE = Deliantra::Client PACKAGE = DC::Texture
1308		1424
1309	PROTOTYPES: ENABLE	1425	PROTOTYPES: ENABLE
1310
1311	int minpot (int n)
1312		1426
1313	void	1427	void
1314	pad (SV *data_, int ow, int oh, int nw, int nh)	1428	pad (SV *data_, int ow, int oh, int nw, int nh)
1315	CODE:	1429	CODE:
1316	{	1430	{
…		…
1343	HV *hv = (HV *)SvRV (self);	1457	HV *hv = (HV *)SvRV (self);
1344	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1458	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1459	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1460	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347		1461
		1462	if (name <= 0)
		1463	XSRETURN_EMPTY;
		1464
1348	if (items < 5)	1465	if (items < 5)
1349	{	1466	{
1350	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1467	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1468	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352	}	1469	}
…		…
1390	RETVAL = width > 0;	1507	RETVAL = width > 0;
1391	}	1508	}
1392	OUTPUT:	1509	OUTPUT:
1393	RETVAL	1510	RETVAL
1394		1511
1395	MODULE = CFPlus PACKAGE = CFPlus::Map	1512	MODULE = Deliantra::Client PACKAGE = DC::Map
1396		1513
1397	PROTOTYPES: DISABLE	1514	PROTOTYPES: DISABLE
1398		1515
1399	CFPlus::Map	1516	DC::Map
1400	new (SV *class)	1517	new (SV *class)
1401	CODE:	1518	CODE:
1402	New (0, RETVAL, 1, struct map);	1519	New (0, RETVAL, 1, struct map);
1403	RETVAL->x = 0;	1520	RETVAL->x = 0;
1404	RETVAL->y = 0;	1521	RETVAL->y = 0;
…		…
1412	RETVAL->row = 0;	1529	RETVAL->row = 0;
1413	OUTPUT:	1530	OUTPUT:
1414	RETVAL	1531	RETVAL
1415		1532
1416	void	1533	void
1417	DESTROY (CFPlus::Map self)	1534	DESTROY (DC::Map self)
1418	CODE:	1535	CODE:
1419	{	1536	{
1420	map_clear (self);	1537	map_clear (self);
1421	Safefree (self->face2tile);	1538	Safefree (self->face2tile);
1422	Safefree (self->tex);	1539	Safefree (self->tex);
1423	Safefree (self);	1540	Safefree (self);
1424	}	1541	}
1425		1542
1426	void	1543	void
1427	resize (CFPlus::Map self, int map_width, int map_height)	1544	resize (DC::Map self, int map_width, int map_height)
1428	CODE:	1545	CODE:
1429	self->w = map_width;	1546	self->w = map_width;
1430	self->h = map_height;	1547	self->h = map_height;
1431		1548
1432	void	1549	void
1433	clear (CFPlus::Map self)	1550	clear (DC::Map self)
1434	CODE:	1551	CODE:
1435	map_clear (self);	1552	map_clear (self);
1436		1553
1437	void	1554	void
1438	set_tileid (CFPlus::Map self, int face, int tile)	1555	set_tileid (DC::Map self, int face, int tile)
1439	CODE:	1556	CODE:
1440	{	1557	{
1441	need_facenum (self, face); self->face2tile [face] = tile;	1558	need_facenum (self, face); self->face2tile [face] = tile;
1442	need_texid (self, tile);	1559	need_texid (self, tile);
1443	}	1560	}
1444		1561
1445	void	1562	void
1446	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1563	set_smooth (DC::Map self, int face, int smooth, int level)
1447	CODE:	1564	CODE:
1448	{	1565	{
1449	tileid texid;	1566	tileid texid;
1450	maptex *tex;	1567	maptex *tex;
1451		1568
…		…
1464	tex->smoothtile = self->face2tile [smooth];	1581	tex->smoothtile = self->face2tile [smooth];
1465	tex->smoothlevel = level;	1582	tex->smoothlevel = level;
1466	}	1583	}
1467		1584
1468	void	1585	void
1469	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1586	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1470	CODE:	1587	CODE:
1471	{	1588	{
1472	need_texid (self, texid);	1589	need_texid (self, texid);
1473		1590
1474	{	1591	{
…		…
1494	// from transparent color bleeding and ugly wrapping effects.	1611	// from transparent color bleeding and ugly wrapping effects.
1495	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1496	}	1613	}
1497		1614
1498	int	1615	int
1499	ox (CFPlus::Map self)	1616	ox (DC::Map self)
1500	ALIAS:	1617	ALIAS:
1501	oy = 1	1618	oy = 1
1502	x = 2	1619	x = 2
1503	y = 3	1620	y = 3
1504	w = 4	1621	w = 4
…		…
1515	}	1632	}
1516	OUTPUT:	1633	OUTPUT:
1517	RETVAL	1634	RETVAL
1518		1635
1519	void	1636	void
1520	scroll (CFPlus::Map self, int dx, int dy)	1637	scroll (DC::Map self, int dx, int dy)
1521	CODE:	1638	CODE:
1522	{	1639	{
1523	if (dx > 0)	1640	if (dx > 0)
1524	map_blank (self, self->x, self->y, dx, self->h);	1641	map_blank (self, self->x, self->y, dx, self->h);
1525	else if (dx < 0)	1642	else if (dx < 0)
…		…
1540	self->rows += MAP_EXTEND_Y;	1657	self->rows += MAP_EXTEND_Y;
1541	self->y += MAP_EXTEND_Y;	1658	self->y += MAP_EXTEND_Y;
1542	}	1659	}
1543	}	1660	}
1544		1661
1545	void	1662	SV *
1546	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1663	map1a_update (DC::Map self, SV *data_, int extmap)
1547	CODE:	1664	CODE:
1548	{	1665	{
1549	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1666	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1550	uint8_t *data_end = (uint8_t *)SvEND (data_);	1667	uint8_t *data_end = (uint8_t *)SvEND (data_);
1551	mapcell *cell;	1668	mapcell *cell;
1552	int x, y, flags;	1669	int x, y, z, flags;
		1670	AV *missing = newAV ();
		1671	RETVAL = newRV_noinc ((SV *)missing);
1553		1672
1554	while (data < data_end - 1)	1673	while (data < data_end - 1)
1555	{	1674	{
1556	flags = (data [0] << 8) + data [1]; data += 2;	1675	flags = (data [0] << 8) + data [1]; data += 2;
1557		1676
…		…
1577	uint8_t ext, cmd;	1696	uint8_t ext, cmd;
1578		1697
1579	do	1698	do
1580	{	1699	{
1581	ext = *data++;	1700	ext = *data++;
1582	cmd = ext & 0x3f;	1701	cmd = ext & 0x7f;
1583		1702
1584	if (cmd < 4)	1703	if (cmd < 4)
1585	cell->darkness = 255 - ext * 64 + 1;	1704	cell->darkness = 255 - ext * 64 + 1;
1586	else if (cmd == 5) // health	1705	else if (cmd == 5) // health
1587	{	1706	{
…		…
1590	}	1709	}
1591	else if (cmd == 6) // monster width	1710	else if (cmd == 6) // monster width
1592	cell->stat_width = *data++ + 1;	1711	cell->stat_width = *data++ + 1;
1593	else if (cmd == 0x47)	1712	else if (cmd == 0x47)
1594	{	1713	{
1595	if (*data == 4)	1714	if (*data == 1) cell->player = data [1];
1596	; // decode player count	1715	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1716	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1717	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1597		1718
1598	data += *data + 1;	1719	data += *data + 1;
1599	}	1720	}
1600	else if (cmd == 8) // cell flags	1721	else if (cmd == 8) // cell flags
1601	cell->flags = *data++;	1722	cell->flags = *data++;
…		…
1608	}	1729	}
1609	else	1730	else
1610	cell->darkness = *data++ + 1;	1731	cell->darkness = *data++ + 1;
1611	}	1732	}
1612		1733
		1734	for (z = 0; z <= 2; ++z)
1613	if (flags & 4)	1735	if (flags & (4 >> z))
1614	{	1736	{
1615	faceid face = (data [0] << 8) + data [1]; data += 2;	1737	faceid face = (data [0] << 8) + data [1]; data += 2;
1616	need_facenum (self, face);	1738	need_facenum (self, face);
1617	cell->tile [0] = self->face2tile [face];	1739	cell->tile [z] = self->face2tile [face];
		1740
		1741	if (cell->tile [z])
		1742	{
		1743	maptex *tex = self->tex + cell->tile [z];
		1744	if (!tex->name)
		1745	av_push (missing, newSViv (cell->tile [z]));
		1746
		1747	if (tex->smoothtile)
		1748	{
		1749	maptex *smooth = self->tex + tex->smoothtile;
		1750	if (!smooth->name)
		1751	av_push (missing, newSViv (tex->smoothtile));
		1752	}
		1753	}
1618	}	1754	}
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	}	1755	}
1634	else	1756	else
1635	cell->darkness = 0;	1757	cell->darkness = 0;
1636	}	1758	}
1637	}	1759	}
		1760	OUTPUT:
		1761	RETVAL
1638		1762
1639	SV *	1763	SV *
1640	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1764	mapmap (DC::Map self, int x0, int y0, int w, int h)
1641	CODE:	1765	CODE:
1642	{	1766	{
1643	int x1, x;	1767	int x1, x;
1644	int y1, y;	1768	int y1, y;
1645	int z;	1769	int z;
…		…
1690	}	1814	}
1691	OUTPUT:	1815	OUTPUT:
1692	RETVAL	1816	RETVAL
1693		1817
1694	void	1818	void
1695	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1819	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1696	CODE:	1820	CODE:
1697	{	1821	{
		1822	int x, y, z;
		1823
1698	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	1824	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1699	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1825	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)	1826	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1701	smooth_key skey;	1827	smooth_key skey;
1702	int x, y, z;	1828	int pl_x, pl_y;
1703	int last_name;	1829	maptex pl_tex;
		1830
		1831	pl_tex.name = 0;
		1832
		1833	rc_t *rc = rc_alloc ();
		1834	rc_key_t key;
		1835	rc_array_t *arr;
1704		1836
1705	// thats current max. sorry.	1837	// thats current max. sorry.
1706	if (sw > 255) sw = 255;	1838	if (sw > 255) sw = 255;
1707	if (sh > 255) sh = 255;	1839	if (sh > 255) sh = 255;
1708		1840
1709	// clear key, in case of extra padding	1841	// clear key, in case of extra padding
1710	memset (&skey, 0, sizeof (skey));	1842	memset (&skey, 0, sizeof (skey));
1711		1843
1712	glColor4ub (255, 255, 255, 255);	1844	memset (&key, 0, sizeof (key));
1713		1845	key.r = 255;
1714	glEnable (GL_BLEND);	1846	key.g = 255;
1715	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1847	key.b = 255;
1716	glEnable (GL_TEXTURE_2D);	1848	key.a = 255;
1717	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1849	key.mode = GL_QUADS;
1718		1850	key.format = GL_T2F_V3F;
1719	glBegin (GL_QUADS);	1851	key.texname = -1;
1720
1721	last_name = 0;
1722		1852
1723	mx += self->x;	1853	mx += self->x;
1724	my += self->y;	1854	my += self->y;
1725		1855
1726	// first pass: determine smooth_max	1856	// first pass: determine smooth_max
…		…
1742	MAX (self->tex [cell->tile [0]].smoothlevel,	1872	MAX (self->tex [cell->tile [0]].smoothlevel,
1743	MAX (self->tex [cell->tile [1]].smoothlevel,	1873	MAX (self->tex [cell->tile [1]].smoothlevel,
1744	self->tex [cell->tile [2]].smoothlevel));	1874	self->tex [cell->tile [2]].smoothlevel));
1745	}	1875	}
1746	}	1876	}
		1877
		1878	glEnable (GL_BLEND);
		1879	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1880	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1747		1881
1748	for (z = 0; z <= 2; z++)	1882	for (z = 0; z <= 2; z++)
1749	{	1883	{
1750	memset (smooth_level, 0, sizeof (smooth_level));	1884	memset (smooth_level, 0, sizeof (smooth_level));
1751		1885
…		…
1764	{	1898	{
1765	maptex tex = self->tex [tile];	1899	maptex tex = self->tex [tile];
1766	int px = (x + 1) * T - tex.w;	1900	int px = (x + 1) * T - tex.w;
1767	int py = (y + 1) * T - tex.h;	1901	int py = (y + 1) * T - tex.h;
1768		1902
1769	// suppressing texture state switches here
1770	// is only moderately effective, but worth the extra effort
1771	if (last_name != tex.name)	1903	if (key.texname != tex.name)
1772	{	1904	{
1773	if (!tex.name)	1905	if (!tex.name)
1774	tex = self->tex [2]; /* missing, replace by noface */	1906	tex = self->tex [2]; /* missing, replace by noface */
1775		1907
1776	glEnd ();	1908	key.texname = tex.name;
1777	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1909	arr = rc_array (rc, &key);
1778	glBegin (GL_QUADS);
1779	}	1910	}
1780		1911
1781	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1912	if (expect_false (cell->player == player) && expect_false (z == 2))
1782	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1785
1786	if (cell->flags && z == 2)
1787	{	1913	{
		1914	pl_x = px;
		1915	pl_y = py;
		1916	pl_tex = tex;
		1917	continue;
		1918	}
		1919
		1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		1924
		1925	if (expect_false (cell->flags) && expect_false (z == 2))
		1926	{
		1927	// overlays such as the speech bubble, probably more to come
1788	if (cell->flags & 1)	1928	if (cell->flags & 1)
1789	{	1929	{
1790	maptex tex = self->tex [1];	1930	maptex tex = self->tex [1];
1791	int px = x * T + T * 2 / 32;	1931	int px = x * T + T * 2 / 32;
1792	int py = y * T - T * 6 / 32;	1932	int py = y * T - T * 6 / 32;
1793		1933
		1934	if (tex.name)
1794	glEnd ();	1935	{
1795	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1936	if (key.texname != tex.name)
		1937	{
		1938	key.texname = tex.name;
		1939	arr = rc_array (rc, &key);
		1940	}
		1941
		1942	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1943	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1944	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1945	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1796	glBegin (GL_QUADS);	1946	}
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	}	1947	}
1803	}	1948	}
1804		1949
1805	// update smooth hash	1950	// update smooth hash
1806	if (tex.smoothtile)	1951	if (tex.smoothtile)
…		…
1842	}	1987	}
1843	}	1988	}
1844	}	1989	}
1845	}	1990	}
1846		1991
		1992	rc_draw (rc);
		1993	rc_clear (rc);
		1994
1847	// go through all smoothlevels, lowest to highest, then draw.	1995	// go through all smoothlevels, lowest to highest, then draw.
1848	// this is basically counting sort	1996	// this is basically counting sort
1849	{	1997	{
1850	int w, b;	1998	int w, b;
1851		1999
		2000	glEnable (GL_TEXTURE_2D);
		2001	glBegin (GL_QUADS);
1852	for (w = 0; w < 256 / 32; ++w)	2002	for (w = 0; w < 256 / 32; ++w)
1853	{	2003	{
1854	uint32_t smask = smooth_level [w];	2004	uint32_t smask = smooth_level [w];
1855	if (smask)	2005	if (smask)
1856	for (b = 0; b < 32; ++b)	2006	for (b = 0; b < 32; ++b)
…		…
1875	int border = bits & 15;	2025	int border = bits & 15;
1876	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2026	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1877	float dx = tex.s * .0625f; // 16 images/row	2027	float dx = tex.s * .0625f; // 16 images/row
1878	float dy = tex.t * .5f ; // 2 images/column	2028	float dy = tex.t * .5f ; // 2 images/column
1879		2029
1880	// this time naively avoiding texture state changes
1881	// save gobs of state changes.
1882	if (last_name != tex.name)	2030	if (tex.name)
1883	{	2031	{
		2032	// this time avoiding texture state changes
		2033	// save gobs of state changes.
1884	if (!tex.name)	2034	if (key.texname != tex.name)
1885	continue; // smoothing not yet available	2035	{
1886
1887	glEnd ();	2036	glEnd ();
1888	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2037	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1889	glBegin (GL_QUADS);	2038	glBegin (GL_QUADS);
1890	}	2039	}
1891		2040
1892	if (border)	2041	if (border)
1893	{	2042	{
1894	float ox = border * dx;	2043	float ox = border * dx;
1895		2044
1896	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2045	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1897	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2046	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1898	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2047	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1899	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2048	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1900	}	2049	}
1901		2050
1902	if (corner)	2051	if (corner)
1903	{	2052	{
1904	float ox = corner * dx;	2053	float ox = corner * dx;
1905		2054
1906	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2055	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1907	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2056	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1908	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2057	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1909	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2058	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2059	}
1910	}	2060	}
1911	}	2061	}
1912	}	2062	}
1913	}	2063	}
1914	}	2064	}
		2065
		2066	glEnd ();
		2067	glDisable (GL_TEXTURE_2D);
		2068	key.texname = -1;
1915	}	2069	}
1916		2070
1917	hv_clear (smooth);	2071	hv_clear (smooth);
1918	}	2072	}
1919		2073
1920	glEnd ();	2074	if (pl_tex.name)
		2075	{
		2076	maptex tex = pl_tex;
		2077	int px = pl_x + pdx;
		2078	int py = pl_y + pdy;
1921		2079
1922	glDisable (GL_TEXTURE_2D);	2080	key.texname = tex.name;
		2081	arr = rc_array (rc, &key);
		2082
		2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2084	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2085	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2087
		2088	rc_draw (rc);
		2089	}
		2090
1923	glDisable (GL_BLEND);	2091	glDisable (GL_BLEND);
		2092	rc_free (rc);
1924		2093
1925	// top layer: overlays such as the health bar	2094	// top layer: overlays such as the health bar
1926	for (y = 0; y < sh; y++)	2095	for (y = 0; y < sh; y++)
1927	if (0 <= y + my && y + my < self->rows)	2096	if (0 <= y + my && y + my < self->rows)
1928	{	2097	{
…		…
1953	}	2122	}
1954	}	2123	}
1955	}	2124	}
1956		2125
1957	void	2126	void
1958	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2127	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1959	CODE:	2128	CODE:
1960	{	2129	{
1961	static float color[16][3] = {	2130	static float color[16][3] = {
1962	{ 0.00F, 0.00F, 0.00F },	2131	{ 0.00F, 0.00F, 0.00F },
1963	{ 1.00F, 1.00F, 1.00F },	2132	{ 1.00F, 1.00F, 1.00F },
…		…
2013	glDisable (GL_BLEND);	2182	glDisable (GL_BLEND);
2014	glDisable (GL_TEXTURE_2D);	2183	glDisable (GL_TEXTURE_2D);
2015	}	2184	}
2016		2185
2017	void	2186	void
2018	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2187	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2019	PPCODE:	2188	PPCODE:
2020	{	2189	{
2021	int x, y;	2190	int x, y;
2022	int sw1 = sw + 2;	2191	int sw1 = sw + 2;
2023	int sh1 = sh + 2;	2192	int sh1 = sh + 2;
…		…
2094	PUSHs (sv_2mortal (newSViv (sh3)));	2263	PUSHs (sv_2mortal (newSViv (sh3)));
2095	PUSHs (darkness3_sv);	2264	PUSHs (darkness3_sv);
2096	}	2265	}
2097		2266
2098	SV *	2267	SV *
2099	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2268	get_rect (DC::Map self, int x0, int y0, int w, int h)
2100	CODE:	2269	CODE:
2101	{	2270	{
2102	int x, y, x1, y1;	2271	int x, y, x1, y1;
2103	SV *data_sv = newSV (w * h * 7 + 5);	2272	SV *data_sv = newSV (w * h * 7 + 5);
2104	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2273	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2161	else	2330	else
2162	*data++ = 0;	2331	*data++ = 0;
2163	}	2332	}
2164	}	2333	}
2165		2334
		2335	/* if size is w*h + 5 then no data has been found */
		2336	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2337	{
2166	SvPOK_only (data_sv);	2338	SvPOK_only (data_sv);
2167	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2339	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2340	}
		2341
2168	RETVAL = data_sv;	2342	RETVAL = data_sv;
2169	}	2343	}
2170	OUTPUT:	2344	OUTPUT:
2171	RETVAL	2345	RETVAL
2172		2346
2173	void	2347	void
2174	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2348	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2175	PPCODE:	2349	PPCODE:
2176	{	2350	{
2177	int x, y, z;	2351	int x, y, z;
2178	int w, h;	2352	int w, h;
2179	int x1, y1;	2353	int x1, y1;
		2354	STRLEN len;
		2355	uint8_t *data, *end;
		2356
		2357	len = SvLEN (data_sv);
		2358	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2359	data = SvPVbyte_nolen (data_sv);
		2360	end = data + len + 8;
		2361
		2362	if (len < 5)
		2363	XSRETURN_EMPTY;
2180		2364
2181	if (*data++ != 0)	2365	if (*data++ != 0)
2182	return; /* version mismatch */	2366	XSRETURN_EMPTY; /* version mismatch */
2183		2367
2184	w = *data++ << 8; w |= *data++;	2368	w = *data++ << 8; w |= *data++;
2185	h = *data++ << 8; h |= *data++;	2369	h = *data++ << 8; h |= *data++;
2186		2370
2187	// we need to do this 'cause we don't keep an absolute coord system for rows	2371	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2199	{	2383	{
2200	maprow *row = map_get_row (self, y);	2384	maprow *row = map_get_row (self, y);
2201		2385
2202	for (x = x0; x < x1; x++)	2386	for (x = x0; x < x1; x++)
2203	{	2387	{
		2388	uint8_t flags;
		2389
		2390	if (data + 7 >= end)
		2391	XSRETURN_EMPTY;
		2392
2204	uint8_t flags = *data++;	2393	flags = *data++;
2205		2394
2206	if (flags)	2395	if (flags)
2207	{	2396	{
2208	mapcell *cell = row_get_cell (row, x);	2397	mapcell *cell = row_get_cell (row, x);
2209	tileid tile[3] = { 0, 0, 0 };	2398	tileid tile[3] = { 0, 0, 0 };
…		…
2212	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2401	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2213	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2402	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2214		2403
2215	if (cell->darkness == 0)	2404	if (cell->darkness == 0)
2216	{	2405	{
2217	cell->darkness = 0;	2406	/*cell->darkness = 0;*/
		2407	EXTEND (SP, 3);
2218		2408
2219	for (z = 0; z <= 2; z++)	2409	for (z = 0; z <= 2; z++)
2220	{	2410	{
2221	tileid t = tile [z];	2411	tileid t = tile [z];
2222		2412
2223	if (t >= self->texs || (t && !self->tex [t].name))	2413	if (t >= self->texs || (t && !self->tex [t].name))
2224	{	2414	{
2225	XPUSHs (sv_2mortal (newSViv (t)));	2415	PUSHs (sv_2mortal (newSViv (t)));
2226	need_texid (self, t);	2416	need_texid (self, t);
2227	}	2417	}
2228		2418
2229	cell->tile [z] = t;	2419	cell->tile [z] = t;
2230	}	2420	}
…		…
2232	}	2422	}
2233	}	2423	}
2234	}	2424	}
2235	}	2425	}
2236		2426
2237	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2427	MODULE = Deliantra::Client PACKAGE = DC::RW
		2428
		2429	DC::RW
		2430	new (SV *class, SV *data_sv)
		2431	CODE:
		2432	{
		2433	STRLEN datalen;
		2434	char *data = SvPVbyte (data_sv, datalen);
		2435
		2436	RETVAL = SDL_RWFromConstMem (data, datalen);
		2437	}
		2438	OUTPUT:
		2439	RETVAL
		2440
		2441	DC::RW
		2442	new_from_file (SV *class, const char *path, const char *mode = "rb")
		2443	CODE:
		2444	RETVAL = SDL_RWFromFile (path, mode);
		2445	OUTPUT:
		2446	RETVAL
		2447
		2448	# fails on win32:
		2449	# dc.xs(2268) : error C2059: syntax error : '('
		2450	#void
		2451	#close (DC::RW self)
		2452	# CODE:
		2453	# (self->(close)) (self);
		2454
		2455	MODULE = Deliantra::Client PACKAGE = DC::Channel
2238		2456
2239	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2240		2458
2241	CFPlus::MixChunk	2459	DC::Channel
2242	new_from_file (SV *class, char *path)	2460	find ()
2243	CODE:	2461	CODE:
2244	RETVAL = Mix_LoadWAV (path);	2462	{
		2463	RETVAL = Mix_GroupAvailable (-1);
		2464
		2465	if (RETVAL < 0)
		2466	{
		2467	RETVAL = Mix_GroupOldest (-1);
		2468
		2469	if (RETVAL < 0)
		2470	XSRETURN_UNDEF;
		2471
		2472	Mix_HaltChannel (RETVAL);
		2473	}
		2474
		2475	Mix_UnregisterAllEffects (RETVAL);
		2476	Mix_Volume (RETVAL, 128);
		2477	}
2245	OUTPUT:	2478	OUTPUT:
2246	RETVAL	2479	RETVAL
2247		2480
2248	void	2481	void
		2482	halt (DC::Channel self)
		2483	CODE:
		2484	Mix_HaltChannel (self);
		2485
		2486	void
		2487	expire (DC::Channel self, int ticks = -1)
		2488	CODE:
		2489	Mix_ExpireChannel (self, ticks);
		2490
		2491	void
		2492	fade_out (DC::Channel self, int ticks = -1)
		2493	CODE:
		2494	Mix_FadeOutChannel (self, ticks);
		2495
		2496	int
		2497	volume (DC::Channel self, int volume)
		2498	CODE:
		2499	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2500	OUTPUT:
		2501	RETVAL
		2502
		2503	void
		2504	unregister_all_effects (DC::Channel self)
		2505	CODE:
		2506	Mix_UnregisterAllEffects (self);
		2507
		2508	void
		2509	set_panning (DC::Channel self, int left, int right)
		2510	CODE:
		2511	left = CLAMP (left , 0, 255);
		2512	right = CLAMP (right, 0, 255);
		2513	Mix_SetPanning (self, left, right);
		2514
		2515	void
		2516	set_distance (DC::Channel self, int distance)
		2517	CODE:
		2518	Mix_SetDistance (self, CLAMP (distance, 0, 255));
		2519
		2520	void
		2521	set_position (DC::Channel self, int angle, int distance)
		2522	CODE:
		2523
		2524	void
		2525	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2526	CODE:
		2527	{
		2528	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2529	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
		2530	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2531	}
		2532
		2533	void
		2534	set_reverse_stereo (DC::Channel self, int flip)
		2535	CODE:
		2536	Mix_SetReverseStereo (self, flip);
		2537
		2538	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
		2539
		2540	PROTOTYPES: DISABLE
		2541
		2542	DC::MixChunk
		2543	new (SV *class, DC::RW rwops)
		2544	CODE:
		2545	RETVAL = Mix_LoadWAV_RW (rwops, 1);
		2546	OUTPUT:
		2547	RETVAL
		2548
		2549	void
2249	DESTROY (CFPlus::MixChunk self)	2550	DESTROY (DC::MixChunk self)
2250	CODE:	2551	CODE:
2251	Mix_FreeChunk (self);	2552	Mix_FreeChunk (self);
2252		2553
2253	int	2554	int
2254	volume (CFPlus::MixChunk self, int volume = -1)	2555	volume (DC::MixChunk self, int volume = -1)
2255	CODE:	2556	CODE:
		2557	if (items > 1)
		2558	volume = CLAMP (volume, 0, 128);
2256	RETVAL = Mix_VolumeChunk (self, volume);	2559	RETVAL = Mix_VolumeChunk (self, volume);
2257	OUTPUT:	2560	OUTPUT:
2258	RETVAL	2561	RETVAL
2259		2562
2260	int	2563	DC::Channel
2261	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2564	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2262	CODE:	2565	CODE:
		2566	{
2263	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2567	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2568
		2569	if (RETVAL < 0)
		2570	XSRETURN_UNDEF;
		2571
		2572	if (channel < 0)
		2573	{
		2574	Mix_UnregisterAllEffects (RETVAL);
		2575	Mix_Volume (RETVAL, 128);
		2576	}
		2577	}
2264	OUTPUT:	2578	OUTPUT:
2265	RETVAL	2579	RETVAL
2266		2580
2267	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2581	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2268		2582
2269	int	2583	int
2270	volume (int volume = -1)	2584	volume (int volume = -1)
2271	PROTOTYPE: ;$	2585	PROTOTYPE: ;$
2272	CODE:	2586	CODE:
		2587	if (items > 0)
		2588	volume = CLAMP (volume, 0, 128);
2273	RETVAL = Mix_VolumeMusic (volume);	2589	RETVAL = Mix_VolumeMusic (volume);
2274	OUTPUT:	2590	OUTPUT:
2275	RETVAL	2591	RETVAL
2276		2592
		2593	void
		2594	fade_out (int ms)
		2595	CODE:
		2596	Mix_FadeOutMusic (ms);
		2597
		2598	void
		2599	halt ()
		2600	CODE:
		2601	Mix_HaltMusic ();
		2602
		2603	DC::MixMusic
		2604	new (SV *class, DC::RW rwops)
		2605	CODE:
		2606	RETVAL = Mix_LoadMUS_RW (rwops);
		2607	OUTPUT:
		2608	RETVAL
		2609
		2610	void
		2611	DESTROY (DC::MixMusic self)
		2612	CODE:
		2613	Mix_FreeMusic (self);
		2614
2277	int	2615	int
2278	fade_out (int ms)
2279	CODE:
2280	RETVAL = Mix_FadeOutMusic (ms);
2281	OUTPUT:
2282	RETVAL
2283
2284	CFPlus::MixMusic
2285	new_from_file (SV *class, char *path)
2286	CODE:
2287	RETVAL = Mix_LoadMUS (path);
2288	OUTPUT:
2289	RETVAL
2290
2291	void
2292	DESTROY (CFPlus::MixMusic self)
2293	CODE:
2294	Mix_FreeMusic (self);
2295
2296	int
2297	play (CFPlus::MixMusic self, int loops = -1)	2616	play (DC::MixMusic self, int loops = -1)
2298	CODE:	2617	CODE:
2299	RETVAL = Mix_PlayMusic (self, loops);	2618	RETVAL = Mix_PlayMusic (self, loops);
2300	OUTPUT:	2619	OUTPUT:
2301	RETVAL	2620	RETVAL
2302		2621
2303	int	2622	void
2304	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2623	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2305	CODE:	2624	CODE:
2306	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2625	Mix_FadeInMusicPos (self, loops, ms, position);
2307	OUTPUT:
2308	RETVAL
2309		2626
2310	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2627	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2311		2628
2312	PROTOTYPES: ENABLE	2629	PROTOTYPES: ENABLE
2313		2630
2314	BOOT:	2631	BOOT:
2315	{	2632	{
2316	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2633	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2317	static const struct {	2634	static const struct {
2318	const char *name;	2635	const char *name;
2319	IV iv;	2636	IV iv;
2320	} *civ, const_iv[] = {	2637	} *civ, const_iv[] = {
2321	# define const_iv(name) { # name, (IV)name }	2638	# define const_iv(name) { # name, (IV)name }
…		…
2356	const_iv (GL_INTENSITY),	2673	const_iv (GL_INTENSITY),
2357	const_iv (GL_LUMINANCE),	2674	const_iv (GL_LUMINANCE),
2358	const_iv (GL_LUMINANCE_ALPHA),	2675	const_iv (GL_LUMINANCE_ALPHA),
2359	const_iv (GL_FLOAT),	2676	const_iv (GL_FLOAT),
2360	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2677	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2678	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2679	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2680	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2681	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2682	const_iv (GL_COMPRESSED_RGB_ARB),
		2683	const_iv (GL_COMPRESSED_RGBA_ARB),
2361	const_iv (GL_COMPILE),	2684	const_iv (GL_COMPILE),
2362	const_iv (GL_PROXY_TEXTURE_1D),	2685	const_iv (GL_PROXY_TEXTURE_1D),
2363	const_iv (GL_PROXY_TEXTURE_2D),	2686	const_iv (GL_PROXY_TEXTURE_2D),
2364	const_iv (GL_TEXTURE_1D),	2687	const_iv (GL_TEXTURE_1D),
2365	const_iv (GL_TEXTURE_2D),	2688	const_iv (GL_TEXTURE_2D),
…		…
2404	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2727	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2405	const_iv (GL_POINT_SMOOTH_HINT),	2728	const_iv (GL_POINT_SMOOTH_HINT),
2406	const_iv (GL_LINE_SMOOTH_HINT),	2729	const_iv (GL_LINE_SMOOTH_HINT),
2407	const_iv (GL_POLYGON_SMOOTH_HINT),	2730	const_iv (GL_POLYGON_SMOOTH_HINT),
2408	const_iv (GL_GENERATE_MIPMAP_HINT),	2731	const_iv (GL_GENERATE_MIPMAP_HINT),
		2732	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2409	const_iv (GL_FASTEST),	2733	const_iv (GL_FASTEST),
2410	const_iv (GL_DONT_CARE),	2734	const_iv (GL_DONT_CARE),
2411	const_iv (GL_NICEST),	2735	const_iv (GL_NICEST),
2412	const_iv (GL_V2F),	2736	const_iv (GL_V2F),
2413	const_iv (GL_V3F),	2737	const_iv (GL_V3F),
…		…
2421		2745
2422	texture_av = newAV ();	2746	texture_av = newAV ();
2423	AvREAL_off (texture_av);	2747	AvREAL_off (texture_av);
2424	}	2748	}
2425		2749
		2750	void
		2751	disable_GL_EXT_blend_func_separate ()
		2752	CODE:
		2753	gl.BlendFuncSeparate = 0;
		2754	gl.BlendFuncSeparateEXT = 0;
		2755
2426	char *	2756	char *
2427	gl_vendor ()	2757	gl_vendor ()
2428	CODE:	2758	CODE:
2429	RETVAL = (char *)glGetString (GL_VENDOR);	2759	RETVAL = (char *)glGetString (GL_VENDOR);
2430	OUTPUT:	2760	OUTPUT:
…		…
2551		2881
2552	void glRect (float x1, float y1, float x2, float y2)	2882	void glRect (float x1, float y1, float x2, float y2)
2553	CODE:	2883	CODE:
2554	glRectf (x1, y1, x2, y2);	2884	glRectf (x1, y1, x2, y2);
2555		2885
		2886	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2887	CODE:
		2888	glBegin (GL_LINE_LOOP);
		2889	glVertex2f (x1, y1);
		2890	glVertex2f (x2, y1);
		2891	glVertex2f (x2, y2);
		2892	glVertex2f (x1, y2);
		2893	glEnd ();
		2894
2556	PROTOTYPES: ENABLE	2895	PROTOTYPES: ENABLE
2557		2896
2558	void glBegin (int mode)	2897	void glBegin (int mode)
2559		2898
2560	void glEnd ()	2899	void glEnd ()
…		…
2592	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2931	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2593	CODE:	2932	CODE:
2594	if (gl.SeparableFilter2D)	2933	if (gl.SeparableFilter2D)
2595	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2934	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2596		2935
2597	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2936	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2598		2937
2599	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2938	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2600		2939
2601	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2940	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2602		2941
…		…
2628		2967
2629	void glEndList ()	2968	void glEndList ()
2630		2969
2631	void glCallList (int list)	2970	void glCallList (int list)
2632		2971
2633	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2972	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2634		2973
2635	PROTOTYPES: DISABLE	2974	PROTOTYPES: DISABLE
2636		2975
2637	void	2976	void
2638	find_widget (SV *self, NV x, NV y)	2977	find_widget (SV *self, NV x, NV y)
…		…
2642	XPUSHs (self);	2981	XPUSHs (self);
2643	}	2982	}
2644		2983
2645	BOOT:	2984	BOOT:
2646	{	2985	{
2647	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2986	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2648		2987
2649	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2988	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2650	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2989	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2651	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2990	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2652	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2991	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2653	}	2992	}
2654		2993
2655	void	2994	void
2656	draw (SV *self)	2995	draw (SV *self)
2657	CODE:	2996	CODE:
…		…
2661	NV x, y, w, h;	3000	NV x, y, w, h;
2662	SV *draw_x_sv = GvSV (draw_x_gv);	3001	SV *draw_x_sv = GvSV (draw_x_gv);
2663	SV *draw_y_sv = GvSV (draw_y_gv);	3002	SV *draw_y_sv = GvSV (draw_y_gv);
2664	SV *draw_w_sv = GvSV (draw_w_gv);	3003	SV *draw_w_sv = GvSV (draw_w_gv);
2665	SV *draw_h_sv = GvSV (draw_h_gv);	3004	SV *draw_h_sv = GvSV (draw_h_gv);
2666	SV *hover;
2667	double draw_x, draw_y, draw_w, draw_h;	3005	double draw_x, draw_y;
2668		3006
2669	if (!SvROK (self))	3007	if (!SvROK (self))
2670	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3008	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2671		3009
2672	hv = (HV *)SvRV (self);	3010	hv = (HV *)SvRV (self);
2673		3011
2674	if (SvTYPE (hv) != SVt_PVHV)	3012	if (SvTYPE (hv) != SVt_PVHV)
2675	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3013	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2676		3014
2677	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3015	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2678	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3016	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2679		3017
2680	if (!h || !w)	3018	if (!h || !w)
…		…
2700	{	3038	{
2701	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3039	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2702		3040
2703	if (svp && SvTRUE (*svp))	3041	if (svp && SvTRUE (*svp))
2704	{	3042	{
2705	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3043	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2706	glEnable (GL_BLEND);	3044	glEnable (GL_BLEND);
2707	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3045	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2708	glBegin (GL_QUADS);	3046	glBegin (GL_QUADS);
2709	glVertex2f (0, 0);	3047	glVertex2f (0, 0);
2710	glVertex2f (w, 0);	3048	glVertex2f (w, 0);
…		…
2713	glEnd ();	3051	glEnd ();
2714	glDisable (GL_BLEND);	3052	glDisable (GL_BLEND);
2715	}	3053	}
2716	}	3054	}
2717	#if 0	3055	#if 0
2718	if ($ENV{CFPLUS_DEBUG} & 1) {	3056	// draw borders, for debugging
2719	glPushMatrix;	3057	glPushMatrix ();
2720	glColor 1, 1, 0, 1;	3058	glColor4f (1., 1., 0., 1.);
2721	glTranslate 0.375, 0.375;	3059	glTranslatef (.5, .5, 0.);
2722	glBegin GL_LINE_LOOP;	3060	glBegin (GL_LINE_LOOP);
2723	glVertex 0 , 0;	3061	glVertex2f (0 , 0);
2724	glVertex $self->{w} - 1, 0;	3062	glVertex2f (w - 1, 0);
2725	glVertex $self->{w} - 1, $self->{h} - 1;	3063	glVertex2f (w - 1, h - 1);
2726	glVertex 0 , $self->{h} - 1;	3064	glVertex2f (0 , h - 1);
2727	glEnd;	3065	glEnd ();
2728	glPopMatrix;	3066	glPopMatrix ();
2729	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2730	}
2731	#endif	3067	#endif
2732	PUSHMARK (SP);	3068	PUSHMARK (SP);
2733	XPUSHs (self);	3069	XPUSHs (self);
2734	PUTBACK;	3070	PUTBACK;
2735	call_method ("_draw", G_VOID | G_DISCARD);	3071	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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