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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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>
…		…
40	#define G_DISABLE_CAST_CHECKS	45	#define G_DISABLE_CAST_CHECKS
41		46
42	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
43		48
44	#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
45		61
46	#ifndef _WIN32	62	#ifndef _WIN32
47	# include <sys/types.h>	63	# include <sys/types.h>
48	# include <sys/socket.h>	64	# include <sys/socket.h>
49	# include <netinet/in.h>	65	# include <netinet/in.h>
50	# include <netinet/tcp.h>	66	# include <netinet/tcp.h>
51	# include <inttypes.h>	67	# include <inttypes.h>
52	#endif	68	#endif
53		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
54	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
55		80
56	#define FOW_DARKNESS 32	81	#define FOW_DARKNESS 32
57		82
58	#define MAP_EXTEND_X 32	83	#define MAP_EXTEND_X 32
59	#define MAP_EXTEND_Y 512	84	#define MAP_EXTEND_Y 512
60		85
61	#define MIN_FONT_HEIGHT 10	86	#define MIN_FONT_HEIGHT 10
62		87
63	#if 0	88	/* mask out modifiers we are not interested in */
64	# define PARACHUTE SDL_INIT_NOPARACHUTE	89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
65	#else
66	# define PARACHUTE 0
67	#endif
68		90
69	static AV *texture_av;	91	static AV *texture_av;
70		92
71	static struct	93	static struct
72	{	94	{
…		…
109	av_push (texture_av, (SV *)(size_t)name);	131	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	132	glDeleteTextures (1, &name);
111	}	133	}
112		134
113	#include "texcache.c"	135	#include "texcache.c"
		136	#include "rendercache.c"
114		137
115	#include "pango-font.c"	138	#include "pango-font.c"
116	#include "pango-fontmap.c"	139	#include "pango-fontmap.c"
117	#include "pango-render.c"	140	#include "pango-render.c"
118		141
119	typedef IV CFPlus__Channel;	142	typedef IV DC__Channel;
120	typedef SDL_RWops *CFPlus__RW;	143	typedef SDL_RWops *DC__RW;
121	typedef Mix_Chunk *CFPlus__MixChunk;	144	typedef Mix_Chunk *DC__MixChunk;
122	typedef Mix_Music *CFPlus__MixMusic;	145	typedef Mix_Music *DC__MixMusic;
123		146
124	typedef PangoFontDescription *CFPlus__Font;	147	typedef PangoFontDescription *DC__Font;
125		148
126	static int	149	static int
127	shape_attr_p (PangoLayoutRun *run)	150	shape_attr_p (PangoLayoutRun *run)
128	{	151	{
129	GSList *attrs = run->item->analysis.extra_attrs;	152	GSList *attrs = run->item->analysis.extra_attrs;
…		…
143		166
144	typedef struct cf_layout {	167	typedef struct cf_layout {
145	PangoLayout *pl;	168	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	169	float r, g, b, a; // default color for rgba mode
147	int base_height;	170	int base_height;
148	CFPlus__Font font;	171	DC__Font font;
		172	rc_t *rc;
149	} *CFPlus__Layout;	173	} *DC__Layout;
150		174
151	static CFPlus__Font default_font;	175	static DC__Font default_font;
152	static PangoContext *opengl_context;	176	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	177	static PangoFontMap *opengl_fontmap;
154		178
155	static void	179	static void
156	substitute_func (FcPattern *pattern, gpointer data)	180	substitute_func (FcPattern *pattern, gpointer data)
…		…
161	#endif	185	#endif
162	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	186	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163	}	187	}
164		188
165	static void	189	static void
166	layout_update_font (CFPlus__Layout self)	190	layout_update_font (DC__Layout self)
167	{	191	{
168	/* use a random scale factor to account for unknown descenders, 0.8 works	192	/* use a random scale factor to account for unknown descenders, 0.8 works
169	* reasonably well with bitstream vera	193	* reasonably well with dejavu/bistream fonts
170	*/	194	*/
171	PangoFontDescription *font = self->font ? self->font : default_font;	195	PangoFontDescription *font = self->font ? self->font : default_font;
172		196
173	pango_font_description_set_absolute_size (font,	197	pango_font_description_set_absolute_size (font,
174	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	198	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
175		199
176	pango_layout_set_font_description (self->pl, font);	200	pango_layout_set_font_description (self->pl, font);
177	}	201	}
178		202
179	static void	203	static void
180	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	204	layout_get_pixel_size (DC__Layout self, int w, int h)
181	{	205	{
182	PangoRectangle rect;	206	PangoRectangle rect;
183		207
184	// get_pixel_* wrongly rounds down	208	// get_pixel_* wrongly rounds down
185	pango_layout_get_extents (self->pl, 0, &rect);	209	pango_layout_get_extents (self->pl, 0, &rect);
…		…
196		220
197	typedef uint16_t tileid;	221	typedef uint16_t tileid;
198	typedef uint16_t faceid;	222	typedef uint16_t faceid;
199		223
200	typedef struct {	224	typedef struct {
201	int name;	225	GLuint name;
202	int w, h;	226	int w, h;
203	float s, t;	227	float s, t;
204	uint8_t r, g, b, a;	228	uint8_t r, g, b, a;
205	tileid smoothtile;	229	tileid smoothtile;
206	uint8_t smoothlevel;	230	uint8_t smoothlevel;
…		…
224	int faces; tileid *face2tile; // [faceid]	248	int faces; tileid *face2tile; // [faceid]
225	int texs; maptex *tex; // [tileid]	249	int texs; maptex *tex; // [tileid]
226		250
227	int32_t rows;	251	int32_t rows;
228	maprow *row;	252	maprow *row;
229	} *CFPlus__Map;	253	} *DC__Map;
230		254
231	static char *	255	static char *
232	prepend (char *ptr, int sze, int inc)	256	prepend (char *ptr, int sze, int inc)
233	{	257	{
234	char *p;	258	char *p;
…		…
272	self->texs *= 2;	296	self->texs *= 2;
273	}	297	}
274	}	298	}
275		299
276	static maprow *	300	static maprow *
277	map_get_row (CFPlus__Map self, int y)	301	map_get_row (DC__Map self, int y)
278	{	302	{
279	if (0 > y)	303	if (0 > y)
280	{	304	{
281	int extend = - y + MAP_EXTEND_Y;	305	int extend = - y + MAP_EXTEND_Y;
282	Prepend (maprow, self->row, self->rows, extend);	306	Prepend (maprow, self->row, self->rows, extend);
…		…
320		344
321	return row->col + (x - row->c0);	345	return row->col + (x - row->c0);
322	}	346	}
323		347
324	static mapcell *	348	static mapcell *
325	map_get_cell (CFPlus__Map self, int x, int y)	349	map_get_cell (DC__Map self, int x, int y)
326	{	350	{
327	return row_get_cell (map_get_row (self, y), x);	351	return row_get_cell (map_get_row (self, y), x);
328	}	352	}
329		353
330	static void	354	static void
331	map_clear (CFPlus__Map self)	355	map_clear (DC__Map self)
332	{	356	{
333	int r;	357	int r;
334		358
335	for (r = 0; r < self->rows; r++)	359	for (r = 0; r < self->rows; r++)
336	Safefree (self->row[r].col);	360	Safefree (self->row[r].col);
…		…
343	self->oy = 0;	367	self->oy = 0;
344	self->row = 0;	368	self->row = 0;
345	self->rows = 0;	369	self->rows = 0;
346	}	370	}
347		371
		372	#define CELL_CLEAR(cell) \
		373	do { \
		374	(cell)->darkness = 0; \
		375	(cell)->stat_hp = 0; \
		376	(cell)->flags = 0; \
		377	(cell)->player = 0; \
		378	} while (0)
		379
348	static void	380	static void
349	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	381	map_blank (DC__Map self, int x0, int y0, int w, int h)
350	{	382	{
351	int x, y;	383	int x, y;
352	maprow *row;	384	maprow *row;
353	mapcell *cell;	385	mapcell *cell;
354		386
…		…
366	if (x >= row->c1)	398	if (x >= row->c1)
367	break;	399	break;
368		400
369	cell = row->col + x - row->c0;	401	cell = row->col + x - row->c0;
370		402
371	cell->darkness = 0;	403	CELL_CLEAR (cell);
372	cell->stat_hp = 0;
373	cell->flags = 0;
374	cell->player = 0;
375	}	404	}
376	}	405	}
377	}	406	}
378		407
379	typedef struct {	408	typedef struct {
…		…
433	n \|= n >> 16;	462	n \|= n >> 16;
434		463
435	return n + 1;	464	return n + 1;
436	}	465	}
437		466
		467	static unsigned int
		468	popcount (unsigned int n)
		469	{
		470	n -= (n >> 1) & 0x55555555U;
		471	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		472	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		473	n *= 0x01010101U;
		474
		475	return n >> 24;
		476	}
		477
438	/* SDL should provide this, really. */	478	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	479	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	480	#define SDLK_MODIFIER_MAX 314
441		481
442	/******************************************************************************/	482	/******************************************************************************/
…		…
480	return 0;	520	return 0;
481		521
482	return 1;	522	return 1;
483	}	523	}
484		524
485	MODULE = CFPlus PACKAGE = CFPlus	525	MODULE = Deliantra::Client PACKAGE = DC
486		526
487	PROTOTYPES: ENABLE	527	PROTOTYPES: ENABLE
488		528
489	BOOT:	529	BOOT:
490	{	530	{
491	HV *stash = gv_stashpv ("CFPlus", 1);	531	HV *stash = gv_stashpv ("DC", 1);
492	static const struct {	532	static const struct {
493	const char *name;	533	const char *name;
494	IV iv;	534	IV iv;
495	} *civ, const_iv[] = {	535	} *civ, const_iv[] = {
496	# define const_iv(name) { # name, (IV)name }	536	# define const_iv(name) { # name, (IV)name }
…		…
518		558
519	const_iv (SDL_APPINPUTFOCUS),	559	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	560	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	561	const_iv (SDL_APPACTIVE),
522		562
		563	const_iv (SDLK_FIRST),
		564	const_iv (SDLK_LAST),
523	const_iv (SDLK_KP0),	565	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	566	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	567	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	568	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	569	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	641	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	642	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	643	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	644	const_iv (KMOD_CAPS),
603	const_iv (KMOD_MODE),	645	const_iv (KMOD_MODE),
		646
		647	const_iv (MIX_DEFAULT_FORMAT),
		648
		649	const_iv (SDL_INIT_TIMER),
		650	const_iv (SDL_INIT_AUDIO),
		651	const_iv (SDL_INIT_VIDEO),
		652	const_iv (SDL_INIT_CDROM),
		653	const_iv (SDL_INIT_JOYSTICK),
		654	const_iv (SDL_INIT_EVERYTHING),
		655	const_iv (SDL_INIT_NOPARACHUTE),
		656	const_iv (SDL_INIT_EVENTTHREAD),
		657
		658	const_iv (SDL_GL_RED_SIZE),
		659	const_iv (SDL_GL_GREEN_SIZE),
		660	const_iv (SDL_GL_BLUE_SIZE),
		661	const_iv (SDL_GL_ALPHA_SIZE),
		662	const_iv (SDL_GL_DOUBLEBUFFER),
		663	const_iv (SDL_GL_BUFFER_SIZE),
		664	const_iv (SDL_GL_DEPTH_SIZE),
		665	const_iv (SDL_GL_STENCIL_SIZE),
		666	const_iv (SDL_GL_ACCUM_RED_SIZE),
		667	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		668	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		669	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		670	const_iv (SDL_GL_STEREO),
		671	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		672	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		673	const_iv (SDL_GL_ACCELERATED_VISUAL),
		674	const_iv (SDL_GL_SWAP_CONTROL)
604	# undef const_iv	675	# undef const_iv
605	};	676	};
606		677
607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	678	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	679	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
626		697
627	NV floor (NV x)	698	NV floor (NV x)
628		699
629	NV ceil (NV x)	700	NV ceil (NV x)
630		701
		702	IV minpot (UV n)
		703
		704	IV popcount (UV n)
		705
631	void	706	void
632	pango_init ()	707	pango_init ()
633	CODE:	708	CODE:
634	{	709	{
635	opengl_fontmap = pango_opengl_font_map_new ();	710	opengl_fontmap = pango_opengl_font_map_new ();
636	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	711	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	712	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		713	/pango_context_set_font_description (opengl_context, default_font);/
		714	#if PANGO_VERSION_CHECK (1, 15, 2)
		715	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		716	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		717	#endif
638	}	718	}
639		719
640	char *
641	SDL_GetError ()	720	char *SDL_GetError ()
642		721
643	int	722	int SDL_Init (U32 flags)
644	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
645		723
646	void	724	int SDL_InitSubSystem (U32 flags)
		725
		726	void SDL_QuitSubSystem (U32 flags)
		727
647	SDL_Quit ()	728	void SDL_Quit ()
		729
		730	int SDL_GL_SetAttribute (int attr, int value)
		731
		732	int SDL_GL_GetAttribute (int attr)
		733	CODE:
		734	if (SDL_GL_GetAttribute (attr, &RETVAL))
		735	XSRETURN_UNDEF;
		736	OUTPUT:
		737	RETVAL
648		738
649	void	739	void
650	SDL_ListModes (int rgb, int alpha)	740	SDL_ListModes (int rgb, int alpha)
651	PPCODE:	741	PPCODE:
652	{	742	{
…		…
664	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	754	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
665	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	755	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
666	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	756	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
667		757
668	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	758	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
669	#if SDL_VERSION_ATLEAST(1,2,10)
670	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
671	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	759	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
672	#endif
673		760
674	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	761	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
675		762
676	if (m && m != (SDL_Rect **)-1)	763	if (m && m != (SDL_Rect **)-1)
677	while (*m)	764	while (*m)
678	{	765	{
679	if ((m)->w >= 640 && (m)->h >= 480)	766	if ((m)->w >= 400 && (m)->h >= 300)
680	{	767	{
681	AV *av = newAV ();	768	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	769	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	770	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	771	av_push (av, newSViv (rgb));
…		…
708		795
709	if (RETVAL)	796	if (RETVAL)
710	{	797	{
711	av_clear (texture_av);	798	av_clear (texture_av);
712		799
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	800	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	801	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715	#include "glfunc.h"	802	#include "glfunc.h"
716	#undef GL_FUNC	803	#undef GL_FUNC
717	}	804	}
718	}	805	}
…		…
725	char *	812	char *
726	SDL_GetKeyName (int sym)	813	SDL_GetKeyName (int sym)
727		814
728	int	815	int
729	SDL_GetAppState ()	816	SDL_GetAppState ()
		817
		818	int
		819	SDL_GetModState ()
730		820
731	void	821	void
732	poll_events ()	822	poll_events ()
733	PPCODE:	823	PPCODE:
734	{	824	{
…		…
744	{	834	{
745	case SDL_KEYDOWN:	835	case SDL_KEYDOWN:
746	case SDL_KEYUP:	836	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	837	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	838	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	839	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	840	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	841	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	842	break;
753		843
754	case SDL_ACTIVEEVENT:	844	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	845	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	863	x = ev.motion.x;
774	y = ev.motion.y;	864	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	865	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	866	}
777		867
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	868	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	869	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	870	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	871	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	872	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	873	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	874	}
785	break;	875	break;
786		876
787	case SDL_MOUSEBUTTONDOWN:	877	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	878	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	879	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		880
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	881	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	882	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	883	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	884	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	889	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	890	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	891	break;
802	}	892	}
803		893
804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	894	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805	}	895	}
806	}	896	}
807		897
808	int	898	int
809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	899	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810	POSTCALL:	900	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	901	Mix_HookMusicFinished (music_finished);
812	Mix_ChannelFinished (channel_finished);	902	Mix_ChannelFinished (channel_finished);
		903
		904	void
		905	Mix_QuerySpec ()
		906	PPCODE:
		907	{
		908	int freq, channels;
		909	Uint16 format;
		910
		911	if (Mix_QuerySpec (&freq, &format, &channels))
		912	{
		913	EXTEND (SP, 3);
		914	PUSHs (sv_2mortal (newSViv (freq)));
		915	PUSHs (sv_2mortal (newSViv (format)));
		916	PUSHs (sv_2mortal (newSViv (channels)));
		917	}
		918	}
813		919
814	void	920	void
815	Mix_CloseAudio ()	921	Mix_CloseAudio ()
816		922
817	int	923	int
…		…
852	}	958	}
853	}	959	}
854	#endif	960	#endif
855	}	961	}
856		962
857	void	963	int
858	add_font (char *file)	964	add_font (char *file)
859	CODE:	965	CODE:
860	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	966	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		967	OUTPUT:
		968	RETVAL
861		969
862	void	970	void
863	load_image_inline (SV *image_)	971	load_image_inline (SV *image_)
864	ALIAS:	972	ALIAS:
865	load_image_file = 1	973	load_image_file = 1
…		…
951	void	1059	void
952	error (char *message)	1060	error (char *message)
953	CODE:	1061	CODE:
954	fprintf (stderr, "ERROR: %s\n", message);	1062	fprintf (stderr, "ERROR: %s\n", message);
955	#ifdef _WIN32	1063	#ifdef _WIN32
956	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1064	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
957	#endif	1065	#endif
958		1066
959	void	1067	void
960	fatal (char *message)	1068	fatal (char *message)
961	CODE:	1069	CODE:
962	fprintf (stderr, "FATAL: %s\n", message);	1070	fprintf (stderr, "FATAL: %s\n", message);
963	#ifdef _WIN32	1071	#ifdef _WIN32
964	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1072	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
965	#endif	1073	#endif
966	_exit (1);	1074	_exit (1);
967		1075
968	void	1076	void
969	_exit (int retval = 0)	1077	_exit (int retval = 0)
…		…
981	#if DEBUG	1089	#if DEBUG
982	VALGRIND_DO_LEAK_CHECK;	1090	VALGRIND_DO_LEAK_CHECK;
983	#endif	1091	#endif
984	}	1092	}
985		1093
986	MODULE = CFPlus PACKAGE = CFPlus::Font	1094	MODULE = Deliantra::Client PACKAGE = DC::Font
987		1095
988	PROTOTYPES: DISABLE	1096	PROTOTYPES: DISABLE
989		1097
990	CFPlus::Font	1098	DC::Font
991	new_from_file (SV class, char path, int id = 0)	1099	new_from_file (SV class, char path, int id = 0)
992	CODE:	1100	CODE:
993	{	1101	{
994	int count;	1102	int count;
995	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1103	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
998	}	1106	}
999	OUTPUT:	1107	OUTPUT:
1000	RETVAL	1108	RETVAL
1001		1109
1002	void	1110	void
1003	DESTROY (CFPlus::Font self)	1111	DESTROY (DC::Font self)
1004	CODE:	1112	CODE:
1005	pango_font_description_free (self);	1113	pango_font_description_free (self);
1006		1114
1007	void	1115	void
1008	make_default (CFPlus::Font self)	1116	make_default (DC::Font self)
1009	PROTOTYPE: $	1117	PROTOTYPE: $
1010	CODE:	1118	CODE:
1011	default_font = self;	1119	default_font = self;
1012		1120
1013	MODULE = CFPlus PACKAGE = CFPlus::Layout	1121	MODULE = Deliantra::Client PACKAGE = DC::Layout
1014		1122
1015	PROTOTYPES: DISABLE	1123	PROTOTYPES: DISABLE
1016		1124
1017	void	1125	void
1018	reset_glyph_cache ()	1126	glyph_cache_backup ()
1019	PROTOTYPE:	1127	PROTOTYPE:
1020	CODE:	1128	CODE:
		1129	tc_backup ();
		1130
		1131	void
		1132	glyph_cache_restore ()
		1133	PROTOTYPE:
		1134	CODE:
1021	tc_clear ();	1135	tc_restore ();
1022		1136
1023	CFPlus::Layout	1137	DC::Layout
1024	new (SV *class)	1138	new (SV *class)
1025	CODE:	1139	CODE:
1026	New (0, RETVAL, 1, struct cf_layout);	1140	New (0, RETVAL, 1, struct cf_layout);
1027		1141
1028	RETVAL->pl = pango_layout_new (opengl_context);	1142	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1030	RETVAL->g = 1.;	1144	RETVAL->g = 1.;
1031	RETVAL->b = 1.;	1145	RETVAL->b = 1.;
1032	RETVAL->a = 1.;	1146	RETVAL->a = 1.;
1033	RETVAL->base_height = MIN_FONT_HEIGHT;	1147	RETVAL->base_height = MIN_FONT_HEIGHT;
1034	RETVAL->font = 0;	1148	RETVAL->font = 0;
		1149	RETVAL->rc = rc_alloc ();
1035		1150
1036	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1151	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1037	layout_update_font (RETVAL);	1152	layout_update_font (RETVAL);
1038	OUTPUT:	1153	OUTPUT:
1039	RETVAL	1154	RETVAL
1040		1155
1041	void	1156	void
1042	DESTROY (CFPlus::Layout self)	1157	DESTROY (DC::Layout self)
1043	CODE:	1158	CODE:
1044	g_object_unref (self->pl);	1159	g_object_unref (self->pl);
		1160	rc_free (self->rc);
1045	Safefree (self);	1161	Safefree (self);
1046		1162
1047	void	1163	void
1048	set_text (CFPlus::Layout self, SV *text_)	1164	set_text (DC::Layout self, SV *text_)
1049	CODE:	1165	CODE:
1050	{	1166	{
1051	STRLEN textlen;	1167	STRLEN textlen;
1052	char *text = SvPVutf8 (text_, textlen);	1168	char *text = SvPVutf8 (text_, textlen);
1053		1169
1054	pango_layout_set_text (self->pl, text, textlen);	1170	pango_layout_set_text (self->pl, text, textlen);
1055	}	1171	}
1056		1172
1057	void	1173	void
1058	set_markup (CFPlus::Layout self, SV *text_)	1174	set_markup (DC::Layout self, SV *text_)
1059	CODE:	1175	CODE:
1060	{	1176	{
1061	STRLEN textlen;	1177	STRLEN textlen;
1062	char *text = SvPVutf8 (text_, textlen);	1178	char *text = SvPVutf8 (text_, textlen);
1063		1179
1064	pango_layout_set_markup (self->pl, text, textlen);	1180	pango_layout_set_markup (self->pl, text, textlen);
1065	}	1181	}
1066		1182
1067	void	1183	void
1068	set_shapes (CFPlus::Layout self, ...)	1184	set_shapes (DC::Layout self, ...)
1069	CODE:	1185	CODE:
1070	{	1186	{
1071	PangoAttrList *attrs = 0;	1187	PangoAttrList *attrs = 0;
1072	const char *text = pango_layout_get_text (self->pl);	1188	const char *text = pango_layout_get_text (self->pl);
1073	const char *pos = text;	1189	const char *pos = text;
…		…
1108	if (attrs)	1224	if (attrs)
1109	pango_layout_set_attributes (self->pl, attrs);	1225	pango_layout_set_attributes (self->pl, attrs);
1110	}	1226	}
1111		1227
1112	void	1228	void
1113	get_shapes (CFPlus::Layout self)	1229	get_shapes (DC::Layout self)
1114	PPCODE:	1230	PPCODE:
1115	{	1231	{
1116	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1232	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1117		1233
1118	do	1234	do
1119	{	1235	{
1120	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1236	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1121		1237
1122	if (run && shape_attr_p (run))	1238	if (run && shape_attr_p (run))
1123	{	1239	{
1124	PangoRectangle extents;	1240	PangoRectangle extents;
1125	pango_layout_iter_get_run_extents (iter, 0, &extents);	1241	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1133		1249
1134	pango_layout_iter_free (iter);	1250	pango_layout_iter_free (iter);
1135	}	1251	}
1136		1252
1137	int	1253	int
1138	has_wrapped (CFPlus::Layout self)	1254	has_wrapped (DC::Layout self)
1139	CODE:	1255	CODE:
1140	{	1256	{
1141	int lines = 1;	1257	int lines = 1;
1142	const char *text = pango_layout_get_text (self->pl);	1258	const char *text = pango_layout_get_text (self->pl);
1143		1259
…		…
1148	}	1264	}
1149	OUTPUT:	1265	OUTPUT:
1150	RETVAL	1266	RETVAL
1151		1267
1152	SV *	1268	SV *
1153	get_text (CFPlus::Layout self)	1269	get_text (DC::Layout self)
1154	CODE:	1270	CODE:
1155	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1271	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1156	sv_utf8_decode (RETVAL);	1272	sv_utf8_decode (RETVAL);
1157	OUTPUT:	1273	OUTPUT:
1158	RETVAL	1274	RETVAL
1159		1275
1160	void	1276	void
1161	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1277	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1162	CODE:	1278	CODE:
1163	self->r = r;	1279	self->r = r;
1164	self->g = g;	1280	self->g = g;
1165	self->b = b;	1281	self->b = b;
1166	self->a = a;	1282	self->a = a;
1167		1283
1168	void	1284	void
1169	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1285	set_font (DC::Layout self, DC::Font font = 0)
1170	CODE:	1286	CODE:
1171	if (self->font != font)	1287	if (self->font != font)
1172	{	1288	{
1173	self->font = font;	1289	self->font = font;
1174	layout_update_font (self);	1290	layout_update_font (self);
1175	}	1291	}
1176		1292
1177	void	1293	void
1178	set_height (CFPlus::Layout self, int base_height)	1294	set_height (DC::Layout self, int base_height)
1179	CODE:	1295	CODE:
1180	if (self->base_height != base_height)	1296	if (self->base_height != base_height)
1181	{	1297	{
1182	self->base_height = base_height;	1298	self->base_height = base_height;
1183	layout_update_font (self);	1299	layout_update_font (self);
1184	}	1300	}
1185		1301
1186	void	1302	void
1187	set_width (CFPlus::Layout self, int max_width = -1)	1303	set_width (DC::Layout self, int max_width = -1)
1188	CODE:	1304	CODE:
1189	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1305	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1190		1306
1191	void	1307	void
1192	set_indent (CFPlus::Layout self, int indent)	1308	set_indent (DC::Layout self, int indent)
1193	CODE:	1309	CODE:
1194	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1310	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1195		1311
1196	void	1312	void
1197	set_spacing (CFPlus::Layout self, int spacing)	1313	set_spacing (DC::Layout self, int spacing)
1198	CODE:	1314	CODE:
1199	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1315	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1200		1316
1201	void	1317	void
1202	set_ellipsise (CFPlus::Layout self, int ellipsise)	1318	set_ellipsise (DC::Layout self, int ellipsise)
1203	CODE:	1319	CODE:
1204	pango_layout_set_ellipsize (self->pl,	1320	pango_layout_set_ellipsize (self->pl,
1205	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1321	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1206	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1322	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1207	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1323	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1208	: PANGO_ELLIPSIZE_NONE	1324	: PANGO_ELLIPSIZE_NONE
1209	);	1325	);
1210		1326
1211	void	1327	void
1212	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1328	set_single_paragraph_mode (DC::Layout self, int spm)
1213	CODE:	1329	CODE:
1214	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1330	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1215		1331
1216	void	1332	void
1217	size (CFPlus::Layout self)	1333	size (DC::Layout self)
1218	PPCODE:	1334	PPCODE:
1219	{	1335	{
1220	int w, h;	1336	int w, h;
1221		1337
1222	layout_get_pixel_size (self, &w, &h);	1338	layout_get_pixel_size (self, &w, &h);
…		…
1225	PUSHs (sv_2mortal (newSViv (w)));	1341	PUSHs (sv_2mortal (newSViv (w)));
1226	PUSHs (sv_2mortal (newSViv (h)));	1342	PUSHs (sv_2mortal (newSViv (h)));
1227	}	1343	}
1228		1344
1229	int	1345	int
1230	descent (CFPlus::Layout self)	1346	descent (DC::Layout self)
1231	CODE:	1347	CODE:
1232	{	1348	{
1233	PangoRectangle rect;	1349	PangoRectangle rect;
1234	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1350	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1235	pango_layout_line_get_pixel_extents (line, 0, &rect);	1351	pango_layout_line_get_pixel_extents (line, 0, &rect);
1236	RETVAL = PANGO_DESCENT (rect);	1352	RETVAL = PANGO_DESCENT (rect);
1237	}	1353	}
1238	OUTPUT:	1354	OUTPUT:
1239	RETVAL	1355	RETVAL
1240		1356
1241	int	1357	int
1242	xy_to_index (CFPlus::Layout self, int x, int y)	1358	xy_to_index (DC::Layout self, int x, int y)
1243	CODE:	1359	CODE:
1244	{	1360	{
1245	int index, trailing;	1361	int index, trailing;
1246	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1362	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1247	RETVAL = index + trailing;	1363	RETVAL = index + trailing;
1248	}	1364	}
1249	OUTPUT:	1365	OUTPUT:
1250	RETVAL	1366	RETVAL
1251		1367
1252	void	1368	void
1253	cursor_pos (CFPlus::Layout self, int index)	1369	cursor_pos (DC::Layout self, int index)
1254	PPCODE:	1370	PPCODE:
1255	{	1371	{
1256	PangoRectangle strong_pos;	1372	PangoRectangle pos;
1257	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1373	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1258		1374
1259	EXTEND (SP, 3);	1375	EXTEND (SP, 3);
1260	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1376	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1261	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1377	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1262	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1378	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1263	}	1379	}
1264		1380
1265	void	1381	void
1266	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1382	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1267	PPCODE:	1383	PPCODE:
1268	{	1384	{
1269	int line, x;	1385	int line, x;
1270		1386
1271	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1387	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1388	#if !PANGO_VERSION_CHECK (1, 17, 3)
1272	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1389	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1273		1390	--line;
		1391	#endif
1274	EXTEND (SP, 2);	1392	EXTEND (SP, 2);
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1393	PUSHs (sv_2mortal (newSViv (line)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1394	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1395	}
1278		1396
1279	void	1397	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1398	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1399	PPCODE:
1282	{	1400	{
1283	PangoLayoutLine *lp;	1401	PangoLayoutLine *lp;
1284	int index, trailing;	1402	int index, trailing;
1285		1403
1286	if (line < 0)	1404	if (line < 0)
1287	XSRETURN_EMPTY;	1405	XSRETURN_EMPTY;
1288		1406
1289	if (!(lp = pango_layout_get_line (self->pl, line)))	1407	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1290	XSRETURN_EMPTY; /* do better */	1408	XSRETURN_EMPTY; /* do better */
1291		1409
1292	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1410	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1293		1411
1294	EXTEND (SP, 2);	1412	EXTEND (SP, 2);
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1418	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1419	}
1302	}	1420	}
1303		1421
1304	void	1422	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1423	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1424	CODE:
		1425	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1426	pango_opengl_render_layout_subpixel (
1308	self->pl,	1427	self->pl,
		1428	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1429	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1430	self->r, self->g, self->b, self->a,
1311	flags	1431	flags
1312	);	1432	);
		1433	// we assume that context_change actually clears/frees stuff
		1434	// and does not do any recomputation...
		1435	pango_layout_context_changed (self->pl);
1313		1436
1314	MODULE = CFPlus PACKAGE = CFPlus::Texture	1437	void
		1438	draw (DC::Layout self)
		1439	CODE:
		1440	{
		1441	glEnable (GL_TEXTURE_2D);
		1442	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1443	glEnable (GL_BLEND);
		1444	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1445	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1446	glEnable (GL_ALPHA_TEST);
		1447	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1448
		1449	rc_draw (self->rc);
		1450
		1451	glDisable (GL_ALPHA_TEST);
		1452	glDisable (GL_BLEND);
		1453	glDisable (GL_TEXTURE_2D);
		1454	}
		1455
		1456	MODULE = Deliantra::Client PACKAGE = DC::Texture
1315		1457
1316	PROTOTYPES: ENABLE	1458	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1459
1320	void	1460	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1461	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1462	CODE:
1323	{	1463	{
…		…
1350	HV hv = (HV )SvRV (self);	1490	HV hv = (HV )SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1491	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1492	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1493	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1494
		1495	if (name <= 0)
		1496	XSRETURN_EMPTY;
		1497
1355	if (items < 5)	1498	if (items < 5)
1356	{	1499	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1500	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1501	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1502	}
…		…
1397	RETVAL = width > 0;	1540	RETVAL = width > 0;
1398	}	1541	}
1399	OUTPUT:	1542	OUTPUT:
1400	RETVAL	1543	RETVAL
1401		1544
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1545	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1546
1404	PROTOTYPES: DISABLE	1547	PROTOTYPES: DISABLE
1405		1548
1406	CFPlus::Map	1549	DC::Map
1407	new (SV *class)	1550	new (SV *class)
1408	CODE:	1551	CODE:
1409	New (0, RETVAL, 1, struct map);	1552	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1553	RETVAL->x = 0;
1411	RETVAL->y = 0;	1554	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1562	RETVAL->row = 0;
1420	OUTPUT:	1563	OUTPUT:
1421	RETVAL	1564	RETVAL
1422		1565
1423	void	1566	void
1424	DESTROY (CFPlus::Map self)	1567	DESTROY (DC::Map self)
1425	CODE:	1568	CODE:
1426	{	1569	{
1427	map_clear (self);	1570	map_clear (self);
1428	Safefree (self->face2tile);	1571	Safefree (self->face2tile);
1429	Safefree (self->tex);	1572	Safefree (self->tex);
1430	Safefree (self);	1573	Safefree (self);
1431	}	1574	}
1432		1575
1433	void	1576	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1577	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1578	CODE:
1436	self->w = map_width;	1579	self->w = map_width;
1437	self->h = map_height;	1580	self->h = map_height;
1438		1581
1439	void	1582	void
1440	clear (CFPlus::Map self)	1583	clear (DC::Map self)
1441	CODE:	1584	CODE:
1442	map_clear (self);	1585	map_clear (self);
1443		1586
1444	void	1587	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1588	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1589	CODE:
1447	{	1590	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1591	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1592	need_texid (self, tile);
1450	}	1593	}
1451		1594
1452	void	1595	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1596	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1597	CODE:
1455	{	1598	{
1456	tileid texid;	1599	tileid texid;
1457	maptex *tex;	1600	maptex *tex;
1458		1601
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1614	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1615	tex->smoothlevel = level;
1473	}	1616	}
1474		1617
1475	void	1618	void
1476	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)	1619	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)
1477	CODE:	1620	CODE:
1478	{	1621	{
1479	need_texid (self, texid);	1622	need_texid (self, texid);
1480		1623
1481	{	1624	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1644	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1645	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1646	}
1504		1647
1505	int	1648	int
1506	ox (CFPlus::Map self)	1649	ox (DC::Map self)
1507	ALIAS:	1650	ALIAS:
1508	oy = 1	1651	oy = 1
1509	x = 2	1652	x = 2
1510	y = 3	1653	y = 3
1511	w = 4	1654	w = 4
…		…
1522	}	1665	}
1523	OUTPUT:	1666	OUTPUT:
1524	RETVAL	1667	RETVAL
1525		1668
1526	void	1669	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1670	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1671	CODE:
1529	{	1672	{
1530	if (dx > 0)	1673	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1674	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1675	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1690	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1691	self->y += MAP_EXTEND_Y;
1549	}	1692	}
1550	}	1693	}
1551		1694
1552	void	1695	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1696	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1697	CODE:
1555	{	1698	{
1556	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1699	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1557	uint8_t data_end = (uint8_t )SvEND (data_);	1700	uint8_t data_end = (uint8_t )SvEND (data_);
1558	mapcell *cell;	1701	mapcell *cell;
1559	int x, y, flags;	1702	int x, y, z, flags;
		1703	AV *missing = newAV ();
		1704	RETVAL = newRV_noinc ((SV *)missing);
1560		1705
1561	while (data < data_end - 1)	1706	while (data < data_end - 1)
1562	{	1707	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1708	flags = (data [0] << 8) + data [1]; data += 2;
1564		1709
…		…
1584	uint8_t ext, cmd;	1729	uint8_t ext, cmd;
1585		1730
1586	do	1731	do
1587	{	1732	{
1588	ext = *data++;	1733	ext = *data++;
1589	cmd = ext & 0x3f;	1734	cmd = ext & 0x7f;
1590		1735
1591	if (cmd < 4)	1736	if (cmd < 4)
1592	cell->darkness = 255 - ext * 64 + 1;	1737	cell->darkness = 255 - ext * 64 + 1;
1593	else if (cmd == 5) // health	1738	else if (cmd == 5) // health
1594	{	1739	{
…		…
1597	}	1742	}
1598	else if (cmd == 6) // monster width	1743	else if (cmd == 6) // monster width
1599	cell->stat_width = *data++ + 1;	1744	cell->stat_width = *data++ + 1;
1600	else if (cmd == 0x47)	1745	else if (cmd == 0x47)
1601	{	1746	{
1602	if (*data == 4)	1747	if (*data == 1) cell->player = data [1];
1603	; // decode player count	1748	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		1749	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		1750	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1604		1751
1605	data += *data + 1;	1752	data += *data + 1;
1606	}	1753	}
1607	else if (cmd == 8) // cell flags	1754	else if (cmd == 8) // cell flags
1608	cell->flags = *data++;	1755	cell->flags = *data++;
…		…
1615	}	1762	}
1616	else	1763	else
1617	cell->darkness = *data++ + 1;	1764	cell->darkness = *data++ + 1;
1618	}	1765	}
1619		1766
		1767	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1768	if (flags & (4 >> z))
1621	{	1769	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1770	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1771	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1772	cell->tile [z] = self->face2tile [face];
		1773
		1774	if (cell->tile [z])
		1775	{
		1776	maptex *tex = self->tex + cell->tile [z];
		1777	if (!tex->name)
		1778	av_push (missing, newSViv (cell->tile [z]));
		1779
		1780	if (tex->smoothtile)
		1781	{
		1782	maptex *smooth = self->tex + tex->smoothtile;
		1783	if (!smooth->name)
		1784	av_push (missing, newSViv (tex->smoothtile));
		1785	}
		1786	}
1625	}	1787	}
1626
1627	if (flags & 2)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [1] = self->face2tile [face];
1632	}
1633
1634	if (flags & 1)
1635	{
1636	faceid face = (data [0] << 8) + data [1]; data += 2;
1637	need_facenum (self, face);
1638	cell->tile [2] = self->face2tile [face];
1639	}
1640	}	1788	}
1641	else	1789	else
1642	cell->darkness = 0;	1790	CELL_CLEAR (cell);
1643	}	1791	}
1644	}	1792	}
		1793	OUTPUT:
		1794	RETVAL
1645		1795
1646	SV *	1796	SV *
1647	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1797	mapmap (DC::Map self, int x0, int y0, int w, int h)
1648	CODE:	1798	CODE:
1649	{	1799	{
1650	int x1, x;	1800	int x1, x;
1651	int y1, y;	1801	int y1, y;
1652	int z;	1802	int z;
…		…
1697	}	1847	}
1698	OUTPUT:	1848	OUTPUT:
1699	RETVAL	1849	RETVAL
1700		1850
1701	void	1851	void
1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1852	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1703	CODE:	1853	CODE:
1704	{	1854	{
		1855	int x, y, z;
		1856
1705	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1857	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1858	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1707	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1859	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708	smooth_key skey;	1860	smooth_key skey;
1709	int x, y, z;	1861	int pl_x, pl_y;
1710	int last_name;	1862	maptex pl_tex;
		1863	rc_t *rc = rc_alloc ();
		1864	rc_key_t key;
		1865	rc_array_t *arr;
		1866
		1867	pl_tex.name = 0;
1711		1868
1712	// thats current max. sorry.	1869	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1870	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1871	if (sh > 255) sh = 255;
1715		1872
1716	// clear key, in case of extra padding	1873	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1874	memset (&skey, 0, sizeof (skey));
1718		1875
1719	glColor4ub (255, 255, 255, 255);	1876	memset (&key, 0, sizeof (key));
1720		1877	key.r = 255;
1721	glEnable (GL_BLEND);	1878	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1879	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1880	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1881	key.mode = GL_QUADS;
1725		1882	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1883	key.texname = -1;
1727
1728	last_name = 0;
1729		1884
1730	mx += self->x;	1885	mx += self->x;
1731	my += self->y;	1886	my += self->y;
1732		1887
1733	// first pass: determine smooth_max	1888	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1904	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1905	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1906	self->tex [cell->tile [2]].smoothlevel));
1752	}	1907	}
1753	}	1908	}
		1909
		1910	glEnable (GL_BLEND);
		1911	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1912	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754		1913
1755	for (z = 0; z <= 2; z++)	1914	for (z = 0; z <= 2; z++)
1756	{	1915	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1916	memset (smooth_level, 0, sizeof (smooth_level));
1758		1917
…		…
1771	{	1930	{
1772	maptex tex = self->tex [tile];	1931	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1932	int px = (x + 1) * T - tex.w;
1774	int py = (y + 1) * T - tex.h;	1933	int py = (y + 1) * T - tex.h;
1775		1934
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1935	if (key.texname != tex.name)
1779	{	1936	{
1780	if (!tex.name)	1937	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1938	tex = self->tex [2]; /* missing, replace by noface */
1782		1939
1783	glEnd ();	1940	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1941	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1942	}
1787		1943
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1944	if (expect_false (cell->player == player) && expect_false (z == 2))
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1790	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1792
1793	if (cell->flags && z == 2)
1794	{	1945	{
		1946	pl_x = px;
		1947	pl_y = py;
		1948	pl_tex = tex;
		1949	continue;
		1950	}
		1951
		1952	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1953	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		1954	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		1955	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		1956
		1957	if (expect_false (cell->flags) && expect_false (z == 2))
		1958	{
		1959	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	1960	if (cell->flags & 1)
1796	{	1961	{
1797	maptex tex = self->tex [1];	1962	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1963	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1964	int py = y * T - T * 6 / 32;
1800		1965
		1966	if (tex.name)
1801	glEnd ();	1967	{
1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1968	if (key.texname != tex.name)
		1969	{
		1970	key.texname = tex.name;
		1971	arr = rc_array (rc, &key);
		1972	}
		1973
		1974	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1975	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1976	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1977	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803	glBegin (GL_QUADS);	1978	}
1804
1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809	}	1979	}
1810	}	1980	}
1811		1981
1812	// update smooth hash	1982	// update smooth hash
1813	if (tex.smoothtile)	1983	if (tex.smoothtile)
…		…
1849	}	2019	}
1850	}	2020	}
1851	}	2021	}
1852	}	2022	}
1853		2023
		2024	rc_draw (rc);
		2025	rc_clear (rc);
		2026
1854	// go through all smoothlevels, lowest to highest, then draw.	2027	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	2028	// this is basically counting sort
1856	{	2029	{
1857	int w, b;	2030	int w, b;
1858		2031
		2032	glEnable (GL_TEXTURE_2D);
		2033	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	2034	for (w = 0; w < 256 / 32; ++w)
1860	{	2035	{
1861	uint32_t smask = smooth_level [w];	2036	uint32_t smask = smooth_level [w];
1862	if (smask)	2037	if (smask)
1863	for (b = 0; b < 32; ++b)	2038	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	2057	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2058	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	2059	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	2060	float dy = tex.t * .5f ; // 2 images/column
1886		2061
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	2062	if (tex.name)
1890	{	2063	{
		2064	// this time avoiding texture state changes
		2065	// save gobs of state changes.
1891	if (!tex.name)	2066	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	2067	{
1893
1894	glEnd ();	2068	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2069	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	2070	glBegin (GL_QUADS);
1897	}	2071	}
1898		2072
1899	if (border)	2073	if (border)
1900	{	2074	{
1901	float ox = border * dx;	2075	float ox = border * dx;
1902		2076
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2077	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2078	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2079	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2080	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2081	}
1908		2082
1909	if (corner)	2083	if (corner)
1910	{	2084	{
1911	float ox = corner * dx;	2085	float ox = corner * dx;
1912		2086
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2087	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2088	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2089	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2090	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2091	}
1917	}	2092	}
1918	}	2093	}
1919	}	2094	}
1920	}	2095	}
1921	}	2096	}
		2097
		2098	glEnd ();
		2099	glDisable (GL_TEXTURE_2D);
		2100	key.texname = -1;
1922	}	2101	}
1923		2102
1924	hv_clear (smooth);	2103	hv_clear (smooth);
1925	}	2104	}
1926		2105
1927	glEnd ();	2106	if (pl_tex.name)
		2107	{
		2108	maptex tex = pl_tex;
		2109	int px = pl_x + sdx;
		2110	int py = pl_y + sdy;
1928		2111
1929	glDisable (GL_TEXTURE_2D);	2112	key.texname = tex.name;
		2113	arr = rc_array (rc, &key);
		2114
		2115	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2116	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2117	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2118	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2119
		2120	rc_draw (rc);
		2121	}
		2122
1930	glDisable (GL_BLEND);	2123	glDisable (GL_BLEND);
		2124	rc_free (rc);
1931		2125
1932	// top layer: overlays such as the health bar	2126	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2127	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2128	if (0 <= y + my && y + my < self->rows)
1935	{	2129	{
…		…
1960	}	2154	}
1961	}	2155	}
1962	}	2156	}
1963		2157
1964	void	2158	void
1965	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2159	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966	CODE:	2160	CODE:
1967	{	2161	{
1968	static float color[16][3] = {	2162	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2163	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2164	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2214	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2215	glDisable (GL_TEXTURE_2D);
2022	}	2216	}
2023		2217
2024	void	2218	void
2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2219	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026	PPCODE:	2220	PPCODE:
2027	{	2221	{
2028	int x, y;	2222	int x, y;
2029	int sw1 = sw + 2;	2223	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2224	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2295	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2296	PUSHs (darkness3_sv);
2103	}	2297	}
2104		2298
2105	SV *	2299	SV *
2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2300	get_rect (DC::Map self, int x0, int y0, int w, int h)
2107	CODE:	2301	CODE:
2108	{	2302	{
2109	int x, y, x1, y1;	2303	int x, y, x1, y1;
2110	SV data_sv = newSV (w h * 7 + 5);	2304	SV data_sv = newSV (w h * 7 + 5);
2111	uint8_t data = (uint8_t )SvPVX (data_sv);	2305	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2168	else	2362	else
2169	*data++ = 0;	2363	*data++ = 0;
2170	}	2364	}
2171	}	2365	}
2172		2366
		2367	/* if size is wh + 5 then no data has been found /
		2368	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2369	{
2173	SvPOK_only (data_sv);	2370	SvPOK_only (data_sv);
2174	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2371	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2372	}
		2373
2175	RETVAL = data_sv;	2374	RETVAL = data_sv;
2176	}	2375	}
2177	OUTPUT:	2376	OUTPUT:
2178	RETVAL	2377	RETVAL
2179		2378
2180	void	2379	void
2181	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2380	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2182	PPCODE:	2381	PPCODE:
2183	{	2382	{
2184	int x, y, z;	2383	int x, y, z;
2185	int w, h;	2384	int w, h;
2186	int x1, y1;	2385	int x1, y1;
		2386	STRLEN len;
		2387	uint8_t data, end;
		2388
		2389	len = SvLEN (data_sv);
		2390	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2391	data = SvPVbyte_nolen (data_sv);
		2392	end = data + len + 8;
		2393
		2394	if (len < 5)
		2395	XSRETURN_EMPTY;
2187		2396
2188	if (*data++ != 0)	2397	if (*data++ != 0)
2189	return; /* version mismatch */	2398	XSRETURN_EMPTY; /* version mismatch */
2190		2399
2191	w = data++ << 8; w \|= data++;	2400	w = data++ << 8; w \|= data++;
2192	h = data++ << 8; h \|= data++;	2401	h = data++ << 8; h \|= data++;
2193		2402
2194	// we need to do this 'cause we don't keep an absolute coord system for rows	2403	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2206	{	2415	{
2207	maprow *row = map_get_row (self, y);	2416	maprow *row = map_get_row (self, y);
2208		2417
2209	for (x = x0; x < x1; x++)	2418	for (x = x0; x < x1; x++)
2210	{	2419	{
		2420	uint8_t flags;
		2421
		2422	if (data + 7 >= end)
		2423	XSRETURN_EMPTY;
		2424
2211	uint8_t flags = *data++;	2425	flags = *data++;
2212		2426
2213	if (flags)	2427	if (flags)
2214	{	2428	{
2215	mapcell *cell = row_get_cell (row, x);	2429	mapcell *cell = row_get_cell (row, x);
2216	tileid tile[3] = { 0, 0, 0 };	2430	tileid tile[3] = { 0, 0, 0 };
…		…
2219	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2433	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2220	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2434	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2221		2435
2222	if (cell->darkness == 0)	2436	if (cell->darkness == 0)
2223	{	2437	{
2224	cell->darkness = 0;	2438	/cell->darkness = 0;/
		2439	EXTEND (SP, 3);
2225		2440
2226	for (z = 0; z <= 2; z++)	2441	for (z = 0; z <= 2; z++)
2227	{	2442	{
2228	tileid t = tile [z];	2443	tileid t = tile [z];
2229		2444
2230	if (t >= self->texs \|\| (t && !self->tex [t].name))	2445	if (t >= self->texs \|\| (t && !self->tex [t].name))
2231	{	2446	{
2232	XPUSHs (sv_2mortal (newSViv (t)));	2447	PUSHs (sv_2mortal (newSViv (t)));
2233	need_texid (self, t);	2448	need_texid (self, t);
2234	}	2449	}
2235		2450
2236	cell->tile [z] = t;	2451	cell->tile [z] = t;
2237	}	2452	}
…		…
2239	}	2454	}
2240	}	2455	}
2241	}	2456	}
2242	}	2457	}
2243		2458
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2459	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2460
2246	CFPlus::RW	2461	DC::RW
2247	new (SV class, SV data_sv)	2462	new (SV class, SV data_sv)
2248	CODE:	2463	CODE:
2249	{	2464	{
2250	STRLEN datalen;	2465	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2466	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2468	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2469	}
2255	OUTPUT:	2470	OUTPUT:
2256	RETVAL	2471	RETVAL
2257		2472
2258	CFPlus::RW	2473	DC::RW
2259	new_from_file (SV class, const char path, const char *mode = "rb")	2474	new_from_file (SV class, const char path, const char *mode = "rb")
2260	CODE:	2475	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2476	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2477	OUTPUT:
2263	RETVAL	2478	RETVAL
2264		2479
2265	# fails on win32:	2480	# fails on win32:
2266	# CFPlus.xs(2268) : error C2059: syntax error : '('	2481	# dc.xs(2268) : error C2059: syntax error : '('
2267	#void	2482	#void
2268	#close (CFPlus::RW self)	2483	#close (DC::RW self)
2269	# CODE:	2484	# CODE:
2270	# (self->(close)) (self);	2485	# (self->(close)) (self);
2271		2486
2272	MODULE = CFPlus PACKAGE = CFPlus::Channel	2487	MODULE = Deliantra::Client PACKAGE = DC::Channel
2273		2488
2274	PROTOTYPES: DISABLE	2489	PROTOTYPES: DISABLE
2275		2490
2276	CFPlus::Channel	2491	DC::Channel
2277	find ()	2492	find ()
2278	CODE:	2493	CODE:
2279	{	2494	{
2280	RETVAL = Mix_GroupAvailable (-1);	2495	RETVAL = Mix_GroupAvailable (-1);
2281		2496
…		…
2294	}	2509	}
2295	OUTPUT:	2510	OUTPUT:
2296	RETVAL	2511	RETVAL
2297		2512
2298	void	2513	void
2299	halt (CFPlus::Channel self)	2514	halt (DC::Channel self)
2300	CODE:	2515	CODE:
2301	Mix_HaltChannel (self);	2516	Mix_HaltChannel (self);
2302		2517
2303	void	2518	void
2304	expire (CFPlus::Channel self, int ticks = -1)	2519	expire (DC::Channel self, int ticks = -1)
2305	CODE:	2520	CODE:
2306	Mix_ExpireChannel (self, ticks);	2521	Mix_ExpireChannel (self, ticks);
2307		2522
2308	void	2523	void
2309	fade_out (CFPlus::Channel self, int ticks = -1)	2524	fade_out (DC::Channel self, int ticks = -1)
2310	CODE:	2525	CODE:
2311	Mix_FadeOutChannel (self, ticks);	2526	Mix_FadeOutChannel (self, ticks);
2312		2527
2313	int	2528	int
2314	volume (CFPlus::Channel self, int volume)	2529	volume (DC::Channel self, int volume)
2315	CODE:	2530	CODE:
2316	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2531	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2317	OUTPUT:	2532	OUTPUT:
2318	RETVAL	2533	RETVAL
2319		2534
2320	void	2535	void
2321	unregister_all_effects (CFPlus::Channel self)	2536	unregister_all_effects (DC::Channel self)
2322	CODE:	2537	CODE:
2323	Mix_UnregisterAllEffects (self);	2538	Mix_UnregisterAllEffects (self);
2324		2539
2325	void	2540	void
2326	set_panning (CFPlus::Channel self, int left, int right)	2541	set_panning (DC::Channel self, int left, int right)
2327	CODE:	2542	CODE:
2328	left = CLAMP (left , 0, 255);	2543	left = CLAMP (left , 0, 255);
2329	right = CLAMP (right, 0, 255);	2544	right = CLAMP (right, 0, 255);
2330	Mix_SetPanning (self, left, right);	2545	Mix_SetPanning (self, left, right);
2331		2546
2332	void	2547	void
2333	set_distance (CFPlus::Channel self, int distance)	2548	set_distance (DC::Channel self, int distance)
2334	CODE:	2549	CODE:
2335	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2550	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2336		2551
2337	void	2552	void
2338	set_position (CFPlus::Channel self, int angle, int distance)	2553	set_position (DC::Channel self, int angle, int distance)
2339	CODE:	2554	CODE:
		2555
		2556	void
		2557	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2558	CODE:
		2559	{
		2560	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2561	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2340	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2562	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2563	}
2341		2564
2342	void	2565	void
2343	set_reverse_stereo (CFPlus::Channel self, int flip)	2566	set_reverse_stereo (DC::Channel self, int flip)
2344	CODE:	2567	CODE:
2345	Mix_SetReverseStereo (self, flip);	2568	Mix_SetReverseStereo (self, flip);
2346		2569
2347	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2570	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2348		2571
2349	PROTOTYPES: DISABLE	2572	PROTOTYPES: DISABLE
2350		2573
2351	CFPlus::MixChunk	2574	DC::MixChunk
2352	new (SV *class, CFPlus::RW rwops)	2575	new (SV *class, DC::RW rwops)
2353	CODE:	2576	CODE:
2354	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2577	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2355	OUTPUT:	2578	OUTPUT:
2356	RETVAL	2579	RETVAL
2357		2580
2358	void	2581	void
2359	DESTROY (CFPlus::MixChunk self)	2582	DESTROY (DC::MixChunk self)
2360	CODE:	2583	CODE:
2361	Mix_FreeChunk (self);	2584	Mix_FreeChunk (self);
2362		2585
2363	int	2586	int
2364	volume (CFPlus::MixChunk self, int volume = -1)	2587	volume (DC::MixChunk self, int volume = -1)
2365	CODE:	2588	CODE:
2366	if (items > 1)	2589	if (items > 1)
2367	volume = CLAMP (volume, 0, 128);	2590	volume = CLAMP (volume, 0, 128);
2368	RETVAL = Mix_VolumeChunk (self, volume);	2591	RETVAL = Mix_VolumeChunk (self, volume);
2369	OUTPUT:	2592	OUTPUT:
2370	RETVAL	2593	RETVAL
2371		2594
2372	CFPlus::Channel	2595	DC::Channel
2373	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2596	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2374	CODE:	2597	CODE:
2375	{	2598	{
2376	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2599	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2377		2600
2378	if (RETVAL < 0)	2601	if (RETVAL < 0)
…		…
2385	}	2608	}
2386	}	2609	}
2387	OUTPUT:	2610	OUTPUT:
2388	RETVAL	2611	RETVAL
2389		2612
2390	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2613	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2391		2614
2392	int	2615	int
2393	volume (int volume = -1)	2616	volume (int volume = -1)
2394	PROTOTYPE: ;$	2617	PROTOTYPE: ;$
2395	CODE:	2618	CODE:
…		…
2407	void	2630	void
2408	halt ()	2631	halt ()
2409	CODE:	2632	CODE:
2410	Mix_HaltMusic ();	2633	Mix_HaltMusic ();
2411		2634
2412	CFPlus::MixMusic	2635	DC::MixMusic
2413	new (SV *class, CFPlus::RW rwops)	2636	new (SV *class, DC::RW rwops)
2414	CODE:	2637	CODE:
2415	RETVAL = Mix_LoadMUS_RW (rwops);	2638	RETVAL = Mix_LoadMUS_RW (rwops);
2416	OUTPUT:	2639	OUTPUT:
2417	RETVAL	2640	RETVAL
2418		2641
2419	void	2642	void
2420	DESTROY (CFPlus::MixMusic self)	2643	DESTROY (DC::MixMusic self)
2421	CODE:	2644	CODE:
2422	Mix_FreeMusic (self);	2645	Mix_FreeMusic (self);
2423		2646
2424	int	2647	int
2425	play (CFPlus::MixMusic self, int loops = -1)	2648	play (DC::MixMusic self, int loops = -1)
2426	CODE:	2649	CODE:
2427	RETVAL = Mix_PlayMusic (self, loops);	2650	RETVAL = Mix_PlayMusic (self, loops);
2428	OUTPUT:	2651	OUTPUT:
2429	RETVAL	2652	RETVAL
2430		2653
2431	void	2654	void
2432	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2655	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2433	CODE:	2656	CODE:
2434	Mix_FadeInMusicPos (self, loops, ms, position);	2657	Mix_FadeInMusicPos (self, loops, ms, position);
2435		2658
2436	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2659	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2437		2660
2438	PROTOTYPES: ENABLE	2661	PROTOTYPES: ENABLE
2439		2662
2440	BOOT:	2663	BOOT:
2441	{	2664	{
2442	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2665	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2443	static const struct {	2666	static const struct {
2444	const char *name;	2667	const char *name;
2445	IV iv;	2668	IV iv;
2446	} *civ, const_iv[] = {	2669	} *civ, const_iv[] = {
2447	# define const_iv(name) { # name, (IV)name }	2670	# define const_iv(name) { # name, (IV)name }
…		…
2482	const_iv (GL_INTENSITY),	2705	const_iv (GL_INTENSITY),
2483	const_iv (GL_LUMINANCE),	2706	const_iv (GL_LUMINANCE),
2484	const_iv (GL_LUMINANCE_ALPHA),	2707	const_iv (GL_LUMINANCE_ALPHA),
2485	const_iv (GL_FLOAT),	2708	const_iv (GL_FLOAT),
2486	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2709	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2710	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2711	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2712	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2713	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2714	const_iv (GL_COMPRESSED_RGB_ARB),
		2715	const_iv (GL_COMPRESSED_RGBA_ARB),
2487	const_iv (GL_COMPILE),	2716	const_iv (GL_COMPILE),
2488	const_iv (GL_PROXY_TEXTURE_1D),	2717	const_iv (GL_PROXY_TEXTURE_1D),
2489	const_iv (GL_PROXY_TEXTURE_2D),	2718	const_iv (GL_PROXY_TEXTURE_2D),
2490	const_iv (GL_TEXTURE_1D),	2719	const_iv (GL_TEXTURE_1D),
2491	const_iv (GL_TEXTURE_2D),	2720	const_iv (GL_TEXTURE_2D),
…		…
2530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2759	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2531	const_iv (GL_POINT_SMOOTH_HINT),	2760	const_iv (GL_POINT_SMOOTH_HINT),
2532	const_iv (GL_LINE_SMOOTH_HINT),	2761	const_iv (GL_LINE_SMOOTH_HINT),
2533	const_iv (GL_POLYGON_SMOOTH_HINT),	2762	const_iv (GL_POLYGON_SMOOTH_HINT),
2534	const_iv (GL_GENERATE_MIPMAP_HINT),	2763	const_iv (GL_GENERATE_MIPMAP_HINT),
		2764	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2535	const_iv (GL_FASTEST),	2765	const_iv (GL_FASTEST),
2536	const_iv (GL_DONT_CARE),	2766	const_iv (GL_DONT_CARE),
2537	const_iv (GL_NICEST),	2767	const_iv (GL_NICEST),
2538	const_iv (GL_V2F),	2768	const_iv (GL_V2F),
2539	const_iv (GL_V3F),	2769	const_iv (GL_V3F),
…		…
2547		2777
2548	texture_av = newAV ();	2778	texture_av = newAV ();
2549	AvREAL_off (texture_av);	2779	AvREAL_off (texture_av);
2550	}	2780	}
2551		2781
		2782	void
		2783	disable_GL_EXT_blend_func_separate ()
		2784	CODE:
		2785	gl.BlendFuncSeparate = 0;
		2786	gl.BlendFuncSeparateEXT = 0;
		2787
2552	char *	2788	char *
2553	gl_vendor ()	2789	gl_vendor ()
2554	CODE:	2790	CODE:
2555	RETVAL = (char *)glGetString (GL_VENDOR);	2791	RETVAL = (char *)glGetString (GL_VENDOR);
2556	OUTPUT:	2792	OUTPUT:
…		…
2677		2913
2678	void glRect (float x1, float y1, float x2, float y2)	2914	void glRect (float x1, float y1, float x2, float y2)
2679	CODE:	2915	CODE:
2680	glRectf (x1, y1, x2, y2);	2916	glRectf (x1, y1, x2, y2);
2681		2917
		2918	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2919	CODE:
		2920	glBegin (GL_LINE_LOOP);
		2921	glVertex2f (x1, y1);
		2922	glVertex2f (x2, y1);
		2923	glVertex2f (x2, y2);
		2924	glVertex2f (x1, y2);
		2925	glEnd ();
		2926
2682	PROTOTYPES: ENABLE	2927	PROTOTYPES: ENABLE
2683		2928
2684	void glBegin (int mode)	2929	void glBegin (int mode)
2685		2930
2686	void glEnd ()	2931	void glEnd ()
…		…
2718	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2963	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2719	CODE:	2964	CODE:
2720	if (gl.SeparableFilter2D)	2965	if (gl.SeparableFilter2D)
2721	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2966	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2722		2967
2723	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2968	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2724		2969
2725	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2970	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2726		2971
2727	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2972	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2728		2973
…		…
2754		2999
2755	void glEndList ()	3000	void glEndList ()
2756		3001
2757	void glCallList (int list)	3002	void glCallList (int list)
2758		3003
2759	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3004	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2760		3005
2761	PROTOTYPES: DISABLE	3006	PROTOTYPES: DISABLE
2762		3007
2763	void	3008	void
2764	find_widget (SV *self, NV x, NV y)	3009	find_widget (SV *self, NV x, NV y)
…		…
2768	XPUSHs (self);	3013	XPUSHs (self);
2769	}	3014	}
2770		3015
2771	BOOT:	3016	BOOT:
2772	{	3017	{
2773	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3018	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2774		3019
2775	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3020	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2776	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3021	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2777	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3022	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2778	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3023	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2779	}	3024	}
2780		3025
2781	void	3026	void
2782	draw (SV *self)	3027	draw (SV *self)
2783	CODE:	3028	CODE:
…		…
2787	NV x, y, w, h;	3032	NV x, y, w, h;
2788	SV *draw_x_sv = GvSV (draw_x_gv);	3033	SV *draw_x_sv = GvSV (draw_x_gv);
2789	SV *draw_y_sv = GvSV (draw_y_gv);	3034	SV *draw_y_sv = GvSV (draw_y_gv);
2790	SV *draw_w_sv = GvSV (draw_w_gv);	3035	SV *draw_w_sv = GvSV (draw_w_gv);
2791	SV *draw_h_sv = GvSV (draw_h_gv);	3036	SV *draw_h_sv = GvSV (draw_h_gv);
2792	SV *hover;
2793	double draw_x, draw_y, draw_w, draw_h;	3037	double draw_x, draw_y;
2794		3038
2795	if (!SvROK (self))	3039	if (!SvROK (self))
2796	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3040	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2797		3041
2798	hv = (HV *)SvRV (self);	3042	hv = (HV *)SvRV (self);
2799		3043
2800	if (SvTYPE (hv) != SVt_PVHV)	3044	if (SvTYPE (hv) != SVt_PVHV)
2801	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3045	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2802		3046
2803	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3047	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2804	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3048	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2805		3049
2806	if (!h \|\| !w)	3050	if (!h \|\| !w)
…		…
2826	{	3070	{
2827	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3071	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2828		3072
2829	if (svp && SvTRUE (*svp))	3073	if (svp && SvTRUE (*svp))
2830	{	3074	{
2831	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	3075	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2832	glEnable (GL_BLEND);	3076	glEnable (GL_BLEND);
2833	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3077	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2834	glBegin (GL_QUADS);	3078	glBegin (GL_QUADS);
2835	glVertex2f (0, 0);	3079	glVertex2f (0, 0);
2836	glVertex2f (w, 0);	3080	glVertex2f (w, 0);
…		…
2839	glEnd ();	3083	glEnd ();
2840	glDisable (GL_BLEND);	3084	glDisable (GL_BLEND);
2841	}	3085	}
2842	}	3086	}
2843	#if 0	3087	#if 0
2844	if ($ENV{CFPLUS_DEBUG} & 1) {	3088	// draw borders, for debugging
2845	glPushMatrix;	3089	glPushMatrix ();
2846	glColor 1, 1, 0, 1;	3090	glColor4f (1., 1., 0., 1.);
2847	glTranslate 0.375, 0.375;	3091	glTranslatef (.5, .5, 0.);
2848	glBegin GL_LINE_LOOP;	3092	glBegin (GL_LINE_LOOP);
2849	glVertex 0 , 0;	3093	glVertex2f (0 , 0);
2850	glVertex $self->{w} - 1, 0;	3094	glVertex2f (w - 1, 0);
2851	glVertex $self->{w} - 1, $self->{h} - 1;	3095	glVertex2f (w - 1, h - 1);
2852	glVertex 0 , $self->{h} - 1;	3096	glVertex2f (0 , h - 1);
2853	glEnd;	3097	glEnd ();
2854	glPopMatrix;	3098	glPopMatrix ();
2855	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2856	}
2857	#endif	3099	#endif
2858	PUSHMARK (SP);	3100	PUSHMARK (SP);
2859	XPUSHs (self);	3101	XPUSHs (self);
2860	PUTBACK;	3102	PUTBACK;
2861	call_method ("_draw", G_VOID \| G_DISCARD);	3103	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.218 by root, Mon Aug 6 02:11:45 2007 UTC vs. Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.218 by root, Mon Aug 6 02:11:45 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 2008 UTC