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.226 by root, Sat Aug 11 13:05:58 2007 UTC vs.
Revision 1.299 by root, Tue Dec 22 01:37:41 2009 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib/gmacros.h>
48		54
49	#include <pango/pango.h>	55	#include <pango/pango.h>
		56
		57	#ifndef PANGO_VERSION_CHECK
		58	# define PANGO_VERSION_CHECK(a,b,c) 0
		59	#endif
		60
		61	#if !PANGO_VERSION_CHECK (1, 15, 2)
		62	# define pango_layout_get_line_readonly pango_layout_get_line
		63	# define pango_layout_get_lines_readonly pango_layout_get_lines
		64	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		65	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		66	#endif
50		67
51	#ifndef _WIN32	68	#ifndef _WIN32
52	# include <sys/types.h>	69	# include <sys/types.h>
53	# include <sys/socket.h>	70	# include <sys/socket.h>
54	# include <netinet/in.h>	71	# include <netinet/in.h>
55	# include <netinet/tcp.h>	72	# include <netinet/tcp.h>
56	# include <inttypes.h>	73	# include <inttypes.h>
57	#endif	74	#endif
58		75
		76	#if __GNUC__ >= 4
		77	# define expect(expr,value) __builtin_expect ((expr),(value))
		78	#else
		79	# define expect(expr,value) (expr)
		80	#endif
		81
		82	#define expect_false(expr) expect ((expr) != 0, 0)
		83	#define expect_true(expr) expect ((expr) != 0, 1)
		84
59	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
61	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
62		91
63	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
64	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
65		94
66	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
67		96
68	#if 0	97	/* mask out modifiers we are not interested in */
69	# define PARACHUTE SDL_INIT_NOPARACHUTE	98	#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70	#else	99
71	# define PARACHUTE 0	100	#define KMOD_LRAM 0x10000 // our extension
72	#endif	101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
73		104
74	static AV *texture_av;	105	static AV *texture_av;
75		106
76	static struct	107	static struct
77	{	108	{
…		…
120		151
121	#include "pango-font.c"	152	#include "pango-font.c"
122	#include "pango-fontmap.c"	153	#include "pango-fontmap.c"
123	#include "pango-render.c"	154	#include "pango-render.c"
124		155
125	typedef IV CFPlus__Channel;	156	typedef IV DC__Channel;
126	typedef SDL_RWops *CFPlus__RW;	157	typedef SDL_RWops *DC__RW;
127	typedef Mix_Chunk *CFPlus__MixChunk;	158	typedef Mix_Chunk *DC__MixChunk;
128	typedef Mix_Music *CFPlus__MixMusic;	159	typedef Mix_Music *DC__MixMusic;
129		160
130	typedef PangoFontDescription *CFPlus__Font;	161	typedef PangoFontDescription *DC__Font;
131		162
132	static int	163	static int
133	shape_attr_p (PangoLayoutRun *run)	164	shape_attr_p (PangoLayoutRun *run)
134	{	165	{
135	GSList *attrs = run->item->analysis.extra_attrs;	166	GSList *attrs = run->item->analysis.extra_attrs;
…		…
149		180
150	typedef struct cf_layout {	181	typedef struct cf_layout {
151	PangoLayout *pl;	182	PangoLayout *pl;
152	float r, g, b, a; // default color for rgba mode	183	float r, g, b, a; // default color for rgba mode
153	int base_height;	184	int base_height;
154	CFPlus__Font font;	185	DC__Font font;
155	rc_t *rc;	186	rc_t *rc;
156	} *CFPlus__Layout;	187	} *DC__Layout;
157		188
158	static CFPlus__Font default_font;	189	static DC__Font default_font;
159	static PangoContext *opengl_context;	190	static PangoContext *opengl_context;
160	static PangoFontMap *opengl_fontmap;	191	static PangoFontMap *opengl_fontmap;
161		192
162	static void	193	static void
163	substitute_func (FcPattern *pattern, gpointer data)	194	substitute_func (FcPattern *pattern, gpointer data)
…		…
168	#endif	199	#endif
169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
170	}	201	}
171		202
172	static void	203	static void
173	layout_update_font (CFPlus__Layout self)	204	layout_update_font (DC__Layout self)
174	{	205	{
175	/* use a random scale factor to account for unknown descenders, 0.8 works	206	/* use a random scale factor to account for unknown descenders, 0.8 works
176	* reasonably well with bitstream vera	207	* reasonably well with dejavu/bistream fonts
177	*/	208	*/
178	PangoFontDescription *font = self->font ? self->font : default_font;	209	PangoFontDescription *font = self->font ? self->font : default_font;
179		210
180	pango_font_description_set_absolute_size (font,	211	pango_font_description_set_absolute_size (font,
181	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	212	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
182		213
183	pango_layout_set_font_description (self->pl, font);	214	pango_layout_set_font_description (self->pl, font);
184	}	215	}
185		216
186	static void	217	static void
187	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)	218	layout_get_pixel_size (DC__Layout self, int *w, int *h)
188	{	219	{
189	PangoRectangle rect;	220	PangoRectangle rect;
190		221
191	// get_pixel_* wrongly rounds down	222	// get_pixel_* wrongly rounds down
192	pango_layout_get_extents (self->pl, 0, &rect);	223	pango_layout_get_extents (self->pl, 0, &rect);
…		…
203		234
204	typedef uint16_t tileid;	235	typedef uint16_t tileid;
205	typedef uint16_t faceid;	236	typedef uint16_t faceid;
206		237
207	typedef struct {	238	typedef struct {
208	int name;	239	GLuint name;
209	int w, h;	240	int w, h;
210	float s, t;	241	float s, t;
211	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
212	tileid smoothtile;	243	tileid smoothtile;
213	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
214	} maptex;	246	} maptex;
215		247
216	typedef struct {	248	typedef struct {
217	uint32_t player;	249	uint32_t player;
218	tileid tile[3];	250	tileid tile[3];
…		…
231	int faces; tileid *face2tile; // [faceid]	263	int faces; tileid *face2tile; // [faceid]
232	int texs; maptex *tex; // [tileid]	264	int texs; maptex *tex; // [tileid]
233		265
234	int32_t rows;	266	int32_t rows;
235	maprow *row;	267	maprow *row;
236	} *CFPlus__Map;	268	} *DC__Map;
237		269
238	static char *	270	static char *
239	prepend (char *ptr, int sze, int inc)	271	prepend (char *ptr, int sze, int inc)
240	{	272	{
241	char *p;	273	char *p;
…		…
279	self->texs *= 2;	311	self->texs *= 2;
280	}	312	}
281	}	313	}
282		314
283	static maprow *	315	static maprow *
284	map_get_row (CFPlus__Map self, int y)	316	map_get_row (DC__Map self, int y)
285	{	317	{
286	if (0 > y)	318	if (0 > y)
287	{	319	{
288	int extend = - y + MAP_EXTEND_Y;	320	int extend = - y + MAP_EXTEND_Y;
289	Prepend (maprow, self->row, self->rows, extend);	321	Prepend (maprow, self->row, self->rows, extend);
…		…
327		359
328	return row->col + (x - row->c0);	360	return row->col + (x - row->c0);
329	}	361	}
330		362
331	static mapcell *	363	static mapcell *
332	map_get_cell (CFPlus__Map self, int x, int y)	364	map_get_cell (DC__Map self, int x, int y)
333	{	365	{
334	return row_get_cell (map_get_row (self, y), x);	366	return row_get_cell (map_get_row (self, y), x);
335	}	367	}
336		368
337	static void	369	static void
338	map_clear (CFPlus__Map self)	370	map_clear (DC__Map self)
339	{	371	{
340	int r;	372	int r;
341		373
342	for (r = 0; r < self->rows; r++)	374	for (r = 0; r < self->rows; r++)
343	Safefree (self->row[r].col);	375	Safefree (self->row[r].col);
…		…
350	self->oy = 0;	382	self->oy = 0;
351	self->row = 0;	383	self->row = 0;
352	self->rows = 0;	384	self->rows = 0;
353	}	385	}
354		386
		387	#define CELL_CLEAR(cell) \
		388	do { \
		389	if ((cell)->player) \
		390	(cell)->tile [2] = 0; \
		391	(cell)->darkness = 0; \
		392	(cell)->stat_hp = 0; \
		393	(cell)->flags = 0; \
		394	(cell)->player = 0; \
		395	} while (0)
		396
355	static void	397	static void
356	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	398	map_blank (DC__Map self, int x0, int y0, int w, int h)
357	{	399	{
358	int x, y;	400	int x, y;
359	maprow *row;	401	maprow *row;
360	mapcell *cell;	402	mapcell *cell;
361		403
…		…
373	if (x >= row->c1)	415	if (x >= row->c1)
374	break;	416	break;
375		417
376	cell = row->col + x - row->c0;	418	cell = row->col + x - row->c0;
377		419
378	cell->darkness = 0;	420	CELL_CLEAR (cell);
379	cell->stat_hp = 0;
380	cell->flags = 0;
381	cell->player = 0;
382	}	421	}
383	}	422	}
384	}	423	}
385		424
386	typedef struct {	425	typedef struct {
…		…
440	n |= n >> 16;	479	n |= n >> 16;
441		480
442	return n + 1;	481	return n + 1;
443	}	482	}
444		483
		484	static unsigned int
		485	popcount (unsigned int n)
		486	{
		487	n -= (n >> 1) & 0x55555555U;
		488	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		489	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		490	n *= 0x01010101U;
		491
		492	return n >> 24;
		493	}
		494
445	/* SDL should provide this, really. */	495	/* SDL should provide this, really. */
446	#define SDLK_MODIFIER_MIN 300	496	#define SDLK_MODIFIER_MIN 300
447	#define SDLK_MODIFIER_MAX 314	497	#define SDLK_MODIFIER_MAX 314
448		498
449	/******************************************************************************/	499	/******************************************************************************/
…		…
487	return 0;	537	return 0;
488		538
489	return 1;	539	return 1;
490	}	540	}
491		541
492	MODULE = CFPlus PACKAGE = CFPlus	542	/******************************************************************************/
		543
		544	/* process keyboard modifiers */
		545	static int
		546	mod_munge (int mod)
		547	{
		548	mod &= MOD_MASK;
		549
		550	if (mod & (KMOD_META | KMOD_ALT))
		551	mod |= KMOD_LRAM;
		552
		553	return mod;
		554	}
		555
		556	static void
		557	deliantra_main ()
		558	{
		559	char *argv[] = { 0 };
		560	call_argv ("::main", G_DISCARD | G_VOID, argv);
		561	}
		562
		563	#ifdef __MACOSX__
		564	/* to due surprising braindamage on the side of SDL design, we
		565	* do some mind-boggling hack here: SDL requires a custom main()
		566	* on OS X, so... we provide one and call the original main(), which,
		567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		568	* and which calls our main (== SDL_main) back.
		569	*/
		570	extern C_LINKAGE int
		571	main (int argc, char *argv[])
		572	{
		573	deliantra_main ();
		574	}
		575
		576	#undef main
		577
		578	extern C_LINKAGE int main (int argc, char *argv[]);
		579
		580	static void
		581	SDL_braino (void)
		582	{
		583	char *argv[] = { "deliantra client", 0 };
		584	(main) (1, argv);
		585	}
		586	#else
		587	static void
		588	SDL_braino (void)
		589	{
		590	deliantra_main ();
		591	}
		592	#endif
		593
		594	MODULE = Deliantra::Client PACKAGE = DC
493		595
494	PROTOTYPES: ENABLE	596	PROTOTYPES: ENABLE
495		597
496	BOOT:	598	BOOT:
497	{	599	{
498	HV *stash = gv_stashpv ("CFPlus", 1);	600	HV *stash = gv_stashpv ("DC", 1);
499	static const struct {	601	static const struct {
500	const char *name;	602	const char *name;
501	IV iv;	603	IV iv;
502	} *civ, const_iv[] = {	604	} *civ, const_iv[] = {
503	# define const_iv(name) { # name, (IV)name }	605	# define const_iv(name) { # name, (IV)name }
…		…
525		627
526	const_iv (SDL_APPINPUTFOCUS),	628	const_iv (SDL_APPINPUTFOCUS),
527	const_iv (SDL_APPMOUSEFOCUS),	629	const_iv (SDL_APPMOUSEFOCUS),
528	const_iv (SDL_APPACTIVE),	630	const_iv (SDL_APPACTIVE),
529		631
		632
		633	const_iv (SDLK_UNKNOWN),
		634	const_iv (SDLK_FIRST),
		635	const_iv (SDLK_BACKSPACE),
		636	const_iv (SDLK_TAB),
		637	const_iv (SDLK_CLEAR),
		638	const_iv (SDLK_RETURN),
		639	const_iv (SDLK_PAUSE),
		640	const_iv (SDLK_ESCAPE),
		641	const_iv (SDLK_SPACE),
		642	const_iv (SDLK_EXCLAIM),
		643	const_iv (SDLK_QUOTEDBL),
		644	const_iv (SDLK_HASH),
		645	const_iv (SDLK_DOLLAR),
		646	const_iv (SDLK_AMPERSAND),
		647	const_iv (SDLK_QUOTE),
		648	const_iv (SDLK_LEFTPAREN),
		649	const_iv (SDLK_RIGHTPAREN),
		650	const_iv (SDLK_ASTERISK),
		651	const_iv (SDLK_PLUS),
		652	const_iv (SDLK_COMMA),
		653	const_iv (SDLK_MINUS),
		654	const_iv (SDLK_PERIOD),
		655	const_iv (SDLK_SLASH),
		656	const_iv (SDLK_0),
		657	const_iv (SDLK_1),
		658	const_iv (SDLK_2),
		659	const_iv (SDLK_3),
		660	const_iv (SDLK_4),
		661	const_iv (SDLK_5),
		662	const_iv (SDLK_6),
		663	const_iv (SDLK_7),
		664	const_iv (SDLK_8),
		665	const_iv (SDLK_9),
		666	const_iv (SDLK_COLON),
		667	const_iv (SDLK_SEMICOLON),
		668	const_iv (SDLK_LESS),
		669	const_iv (SDLK_EQUALS),
		670	const_iv (SDLK_GREATER),
		671	const_iv (SDLK_QUESTION),
		672	const_iv (SDLK_AT),
		673
		674	const_iv (SDLK_LEFTBRACKET),
		675	const_iv (SDLK_BACKSLASH),
		676	const_iv (SDLK_RIGHTBRACKET),
		677	const_iv (SDLK_CARET),
		678	const_iv (SDLK_UNDERSCORE),
		679	const_iv (SDLK_BACKQUOTE),
		680	const_iv (SDLK_DELETE),
		681
		682	const_iv (SDLK_FIRST),
		683	const_iv (SDLK_LAST),
530	const_iv (SDLK_KP0),	684	const_iv (SDLK_KP0),
531	const_iv (SDLK_KP1),	685	const_iv (SDLK_KP1),
532	const_iv (SDLK_KP2),	686	const_iv (SDLK_KP2),
533	const_iv (SDLK_KP3),	687	const_iv (SDLK_KP3),
534	const_iv (SDLK_KP4),	688	const_iv (SDLK_KP4),
…		…
606	const_iv (KMOD_LMETA),	760	const_iv (KMOD_LMETA),
607	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
608	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
609	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
610	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
		765
		766	const_iv (KMOD_LRAM),
		767
		768	const_iv (MIX_DEFAULT_FORMAT),
		769
		770	const_iv (SDL_INIT_TIMER),
		771	const_iv (SDL_INIT_AUDIO),
		772	const_iv (SDL_INIT_VIDEO),
		773	const_iv (SDL_INIT_CDROM),
		774	const_iv (SDL_INIT_JOYSTICK),
		775	const_iv (SDL_INIT_EVERYTHING),
		776	const_iv (SDL_INIT_NOPARACHUTE),
		777	const_iv (SDL_INIT_EVENTTHREAD),
		778
		779	const_iv (SDL_GL_RED_SIZE),
		780	const_iv (SDL_GL_GREEN_SIZE),
		781	const_iv (SDL_GL_BLUE_SIZE),
		782	const_iv (SDL_GL_ALPHA_SIZE),
		783	const_iv (SDL_GL_DOUBLEBUFFER),
		784	const_iv (SDL_GL_BUFFER_SIZE),
		785	const_iv (SDL_GL_DEPTH_SIZE),
		786	const_iv (SDL_GL_STENCIL_SIZE),
		787	const_iv (SDL_GL_ACCUM_RED_SIZE),
		788	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		789	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		790	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		791	const_iv (SDL_GL_STEREO),
		792	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		793	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		794	const_iv (SDL_GL_ACCELERATED_VISUAL),
		795	const_iv (SDL_GL_SWAP_CONTROL),
		796
		797	const_iv (FOW_DARKNESS)
611	# undef const_iv	798	# undef const_iv
612	};	799	};
613		800
614	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
615	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
633		820
634	NV floor (NV x)	821	NV floor (NV x)
635		822
636	NV ceil (NV x)	823	NV ceil (NV x)
637		824
		825	IV minpot (UV n)
		826
		827	IV popcount (UV n)
		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
638	void	835	void
639	pango_init ()	836	pango_init ()
640	CODE:	837	CODE:
641	{	838	{
642	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
643	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	840	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
644	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	841	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		842	/*pango_context_set_font_description (opengl_context, default_font);*/
		843	#if PANGO_VERSION_CHECK (1, 15, 2)
		844	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		845	/*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
		846	#endif
645	}	847	}
646		848
647	char *
648	SDL_GetError ()	849	char *SDL_GetError ()
649		850
650	int	851	void SDL_braino ()
651	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
652		852
653	void	853	int SDL_Init (U32 flags)
		854
		855	int SDL_InitSubSystem (U32 flags)
		856
		857	void SDL_QuitSubSystem (U32 flags)
		858
654	SDL_Quit ()	859	void SDL_Quit ()
		860
		861	int SDL_GL_SetAttribute (int attr, int value)
		862
		863	int SDL_GL_GetAttribute (int attr)
		864	CODE:
		865	if (SDL_GL_GetAttribute (attr, &RETVAL))
		866	XSRETURN_UNDEF;
		867	OUTPUT:
		868	RETVAL
655		869
656	void	870	void
657	SDL_ListModes (int rgb, int alpha)	871	SDL_ListModes (int rgb, int alpha)
658	PPCODE:	872	PPCODE:
659	{	873	{
…		…
671	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	885	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
672	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	886	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
673	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	887	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
674		888
675	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	889	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
676	#if SDL_VERSION_ATLEAST(1,2,10)
677	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
678	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	890	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
679	#endif
680		891
681	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	892	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
682		893
683	if (m && m != (SDL_Rect **)-1)	894	if (m && m != (SDL_Rect **)-1)
684	while (*m)	895	while (*m)
685	{	896	{
686	if ((*m)->w >= 640 && (*m)->h >= 480)	897	if ((*m)->w >= 400 && (*m)->h >= 300)
687	{	898	{
688	AV *av = newAV ();	899	AV *av = newAV ();
689	av_push (av, newSViv ((*m)->w));	900	av_push (av, newSViv ((*m)->w));
690	av_push (av, newSViv ((*m)->h));	901	av_push (av, newSViv ((*m)->h));
691	av_push (av, newSViv (rgb));	902	av_push (av, newSViv (rgb));
…		…
715		926
716	if (RETVAL)	927	if (RETVAL)
717	{	928	{
718	av_clear (texture_av);	929	av_clear (texture_av);
719		930
720	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
721	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
722	#include "glfunc.h"	933	#include "glfunc.h"
723	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
724	}	938	}
725	}	939	}
726	OUTPUT:	940	OUTPUT:
727	RETVAL	941	RETVAL
728		942
…		…
732	char *	946	char *
733	SDL_GetKeyName (int sym)	947	SDL_GetKeyName (int sym)
734		948
735	int	949	int
736	SDL_GetAppState ()	950	SDL_GetAppState ()
		951
		952	int
		953	SDL_GetModState ()
737		954
738	void	955	void
739	poll_events ()	956	poll_events ()
740	PPCODE:	957	PPCODE:
741	{	958	{
…		…
751	{	968	{
752	case SDL_KEYDOWN:	969	case SDL_KEYDOWN:
753	case SDL_KEYUP:	970	case SDL_KEYUP:
754	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	971	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
755	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	972	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
756	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	973	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
757	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	974	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
758	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	975	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
759	break;	976	break;
760		977
761	case SDL_ACTIVEEVENT:	978	case SDL_ACTIVEEVENT:
762	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	979	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
780	x = ev.motion.x;	997	x = ev.motion.x;
781	y = ev.motion.y;	998	y = ev.motion.y;
782	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	999	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
783	}	1000	}
784		1001
785	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1002	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
786	hv_store (hv, "state", 5, newSViv (state), 0);	1003	hv_store (hv, "state", 5, newSViv (state), 0);
787	hv_store (hv, "x", 1, newSViv (x), 0);	1004	hv_store (hv, "x", 1, newSViv (x), 0);
788	hv_store (hv, "y", 1, newSViv (y), 0);	1005	hv_store (hv, "y", 1, newSViv (y), 0);
789	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1006	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
790	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1007	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
791	}	1008	}
792	break;	1009	break;
793		1010
794	case SDL_MOUSEBUTTONDOWN:	1011	case SDL_MOUSEBUTTONDOWN:
795	case SDL_MOUSEBUTTONUP:	1012	case SDL_MOUSEBUTTONUP:
796	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1013	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
797		1014
798	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1015	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
799	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1016	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
800	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1017	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
801	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1018	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
806	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1023	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
807	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1024	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
808	break;	1025	break;
809	}	1026	}
810		1027
811	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
812	}	1029	}
813	}	1030	}
814		1031
815	int	1032	int
816	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	1033	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
817	POSTCALL:	1034	POSTCALL:
818	Mix_HookMusicFinished (music_finished);	1035	Mix_HookMusicFinished (music_finished);
819	Mix_ChannelFinished (channel_finished);	1036	Mix_ChannelFinished (channel_finished);
		1037
		1038	void
		1039	Mix_QuerySpec ()
		1040	PPCODE:
		1041	{
		1042	int freq, channels;
		1043	Uint16 format;
		1044
		1045	if (Mix_QuerySpec (&freq, &format, &channels))
		1046	{
		1047	EXTEND (SP, 3);
		1048	PUSHs (sv_2mortal (newSViv (freq)));
		1049	PUSHs (sv_2mortal (newSViv (format)));
		1050	PUSHs (sv_2mortal (newSViv (channels)));
		1051	}
		1052	}
820		1053
821	void	1054	void
822	Mix_CloseAudio ()	1055	Mix_CloseAudio ()
823		1056
824	int	1057	int
…		…
859	}	1092	}
860	}	1093	}
861	#endif	1094	#endif
862	}	1095	}
863		1096
864	void	1097	int
865	add_font (char *file)	1098	add_font (char *file)
866	CODE:	1099	CODE:
867	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1100	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1101	OUTPUT:
		1102	RETVAL
868		1103
869	void	1104	void
870	load_image_inline (SV *image_)	1105	load_image_inline (SV *image_)
871	ALIAS:	1106	ALIAS:
872	load_image_file = 1	1107	load_image_file = 1
…		…
958	void	1193	void
959	error (char *message)	1194	error (char *message)
960	CODE:	1195	CODE:
961	fprintf (stderr, "ERROR: %s\n", message);	1196	fprintf (stderr, "ERROR: %s\n", message);
962	#ifdef _WIN32	1197	#ifdef _WIN32
963	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);	1198	MessageBox (0, message, "Deliantra Client Error", MB_OK | MB_ICONERROR);
964	#endif	1199	#endif
965		1200
966	void	1201	void
967	fatal (char *message)	1202	fatal (char *message)
968	CODE:	1203	CODE:
969	fprintf (stderr, "FATAL: %s\n", message);	1204	fprintf (stderr, "FATAL: %s\n", message);
970	#ifdef _WIN32	1205	#ifdef _WIN32
971	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	1206	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK | MB_ICONERROR);
972	#endif	1207	#endif
973	_exit (1);	1208	_exit (1);
974		1209
975	void	1210	void
976	_exit (int retval = 0)	1211	_exit (int retval = 0)
…		…
988	#if DEBUG	1223	#if DEBUG
989	VALGRIND_DO_LEAK_CHECK;	1224	VALGRIND_DO_LEAK_CHECK;
990	#endif	1225	#endif
991	}	1226	}
992		1227
993	MODULE = CFPlus PACKAGE = CFPlus::Font	1228	int
		1229	SvREFCNT (SV *sv)
		1230	CODE:
		1231	RETVAL = SvREFCNT (sv);
		1232	OUTPUT:
		1233	RETVAL
		1234
		1235	MODULE = Deliantra::Client PACKAGE = DC::Font
994		1236
995	PROTOTYPES: DISABLE	1237	PROTOTYPES: DISABLE
996		1238
997	CFPlus::Font	1239	DC::Font
998	new_from_file (SV *class, char *path, int id = 0)	1240	new_from_file (SV *class, char *path, int id = 0)
999	CODE:	1241	CODE:
1000	{	1242	{
1001	int count;	1243	int count;
1002	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1244	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1005	}	1247	}
1006	OUTPUT:	1248	OUTPUT:
1007	RETVAL	1249	RETVAL
1008		1250
1009	void	1251	void
1010	DESTROY (CFPlus::Font self)	1252	DESTROY (DC::Font self)
1011	CODE:	1253	CODE:
1012	pango_font_description_free (self);	1254	pango_font_description_free (self);
1013		1255
1014	void	1256	void
1015	make_default (CFPlus::Font self)	1257	make_default (DC::Font self)
1016	PROTOTYPE: $	1258	PROTOTYPE: $
1017	CODE:	1259	CODE:
1018	default_font = self;	1260	default_font = self;
1019		1261
1020	MODULE = CFPlus PACKAGE = CFPlus::Layout	1262	MODULE = Deliantra::Client PACKAGE = DC::Layout
1021		1263
1022	PROTOTYPES: DISABLE	1264	PROTOTYPES: DISABLE
1023		1265
1024	void	1266	void
1025	reset_glyph_cache ()	1267	glyph_cache_backup ()
1026	PROTOTYPE:	1268	PROTOTYPE:
1027	CODE:	1269	CODE:
		1270	tc_backup ();
		1271
		1272	void
		1273	glyph_cache_restore ()
		1274	PROTOTYPE:
		1275	CODE:
1028	tc_clear ();	1276	tc_restore ();
1029		1277
1030	CFPlus::Layout	1278	DC::Layout
1031	new (SV *class)	1279	new (SV *class)
1032	CODE:	1280	CODE:
1033	New (0, RETVAL, 1, struct cf_layout);	1281	New (0, RETVAL, 1, struct cf_layout);
1034		1282
1035	RETVAL->pl = pango_layout_new (opengl_context);	1283	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1045	layout_update_font (RETVAL);	1293	layout_update_font (RETVAL);
1046	OUTPUT:	1294	OUTPUT:
1047	RETVAL	1295	RETVAL
1048		1296
1049	void	1297	void
1050	DESTROY (CFPlus::Layout self)	1298	DESTROY (DC::Layout self)
1051	CODE:	1299	CODE:
1052	g_object_unref (self->pl);	1300	g_object_unref (self->pl);
1053	rc_free (self->rc);	1301	rc_free (self->rc);
1054	Safefree (self);	1302	Safefree (self);
1055		1303
1056	void	1304	void
1057	set_text (CFPlus::Layout self, SV *text_)	1305	set_text (DC::Layout self, SV *text_)
1058	CODE:	1306	CODE:
1059	{	1307	{
1060	STRLEN textlen;	1308	STRLEN textlen;
1061	char *text = SvPVutf8 (text_, textlen);	1309	char *text = SvPVutf8 (text_, textlen);
1062		1310
1063	pango_layout_set_text (self->pl, text, textlen);	1311	pango_layout_set_text (self->pl, text, textlen);
1064	}	1312	}
1065		1313
1066	void	1314	void
1067	set_markup (CFPlus::Layout self, SV *text_)	1315	set_markup (DC::Layout self, SV *text_)
1068	CODE:	1316	CODE:
1069	{	1317	{
1070	STRLEN textlen;	1318	STRLEN textlen;
1071	char *text = SvPVutf8 (text_, textlen);	1319	char *text = SvPVutf8 (text_, textlen);
1072		1320
1073	pango_layout_set_markup (self->pl, text, textlen);	1321	pango_layout_set_markup (self->pl, text, textlen);
1074	}	1322	}
1075		1323
1076	void	1324	void
1077	set_shapes (CFPlus::Layout self, ...)	1325	set_shapes (DC::Layout self, ...)
1078	CODE:	1326	CODE:
1079	{	1327	{
1080	PangoAttrList *attrs = 0;	1328	PangoAttrList *attrs = 0;
1081	const char *text = pango_layout_get_text (self->pl);	1329	const char *text = pango_layout_get_text (self->pl);
1082	const char *pos = text;	1330	const char *pos = text;
…		…
1117	if (attrs)	1365	if (attrs)
1118	pango_layout_set_attributes (self->pl, attrs);	1366	pango_layout_set_attributes (self->pl, attrs);
1119	}	1367	}
1120		1368
1121	void	1369	void
1122	get_shapes (CFPlus::Layout self)	1370	get_shapes (DC::Layout self)
1123	PPCODE:	1371	PPCODE:
1124	{	1372	{
1125	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1373	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1126		1374
1127	do	1375	do
1128	{	1376	{
1129	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1377	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1130		1378
1131	if (run && shape_attr_p (run))	1379	if (run && shape_attr_p (run))
1132	{	1380	{
1133	PangoRectangle extents;	1381	PangoRectangle extents;
1134	pango_layout_iter_get_run_extents (iter, 0, &extents);	1382	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1142		1390
1143	pango_layout_iter_free (iter);	1391	pango_layout_iter_free (iter);
1144	}	1392	}
1145		1393
1146	int	1394	int
1147	has_wrapped (CFPlus::Layout self)	1395	has_wrapped (DC::Layout self)
1148	CODE:	1396	CODE:
1149	{	1397	{
1150	int lines = 1;	1398	int lines = 1;
1151	const char *text = pango_layout_get_text (self->pl);	1399	const char *text = pango_layout_get_text (self->pl);
1152		1400
…		…
1157	}	1405	}
1158	OUTPUT:	1406	OUTPUT:
1159	RETVAL	1407	RETVAL
1160		1408
1161	SV *	1409	SV *
1162	get_text (CFPlus::Layout self)	1410	get_text (DC::Layout self)
1163	CODE:	1411	CODE:
1164	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1412	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1165	sv_utf8_decode (RETVAL);	1413	sv_utf8_decode (RETVAL);
1166	OUTPUT:	1414	OUTPUT:
1167	RETVAL	1415	RETVAL
1168		1416
1169	void	1417	void
1170	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1418	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1171	CODE:	1419	CODE:
1172	self->r = r;	1420	self->r = r;
1173	self->g = g;	1421	self->g = g;
1174	self->b = b;	1422	self->b = b;
1175	self->a = a;	1423	self->a = a;
1176		1424
1177	void	1425	void
1178	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1426	set_font (DC::Layout self, DC::Font font = 0)
1179	CODE:	1427	CODE:
1180	if (self->font != font)	1428	if (self->font != font)
1181	{	1429	{
1182	self->font = font;	1430	self->font = font;
1183	layout_update_font (self);	1431	layout_update_font (self);
1184	}	1432	}
1185		1433
1186	void	1434	void
1187	set_height (CFPlus::Layout self, int base_height)	1435	set_height (DC::Layout self, int base_height)
1188	CODE:	1436	CODE:
1189	if (self->base_height != base_height)	1437	if (self->base_height != base_height)
1190	{	1438	{
1191	self->base_height = base_height;	1439	self->base_height = base_height;
1192	layout_update_font (self);	1440	layout_update_font (self);
1193	}	1441	}
1194		1442
1195	void	1443	void
1196	set_width (CFPlus::Layout self, int max_width = -1)	1444	set_width (DC::Layout self, int max_width = -1)
1197	CODE:	1445	CODE:
1198	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1446	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1199		1447
1200	void	1448	void
1201	set_indent (CFPlus::Layout self, int indent)	1449	set_indent (DC::Layout self, int indent)
1202	CODE:	1450	CODE:
1203	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1451	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1204		1452
1205	void	1453	void
1206	set_spacing (CFPlus::Layout self, int spacing)	1454	set_spacing (DC::Layout self, int spacing)
1207	CODE:	1455	CODE:
1208	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1456	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1209		1457
1210	void	1458	void
1211	set_ellipsise (CFPlus::Layout self, int ellipsise)	1459	set_ellipsise (DC::Layout self, int ellipsise)
1212	CODE:	1460	CODE:
1213	pango_layout_set_ellipsize (self->pl,	1461	pango_layout_set_ellipsize (self->pl,
1214	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1462	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1215	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1463	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1216	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1464	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1217	: PANGO_ELLIPSIZE_NONE	1465	: PANGO_ELLIPSIZE_NONE
1218	);	1466	);
1219		1467
1220	void	1468	void
1221	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1469	set_single_paragraph_mode (DC::Layout self, int spm)
1222	CODE:	1470	CODE:
1223	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1471	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1224		1472
1225	void	1473	void
1226	size (CFPlus::Layout self)	1474	size (DC::Layout self)
1227	PPCODE:	1475	PPCODE:
1228	{	1476	{
1229	int w, h;	1477	int w, h;
1230		1478
1231	layout_get_pixel_size (self, &w, &h);	1479	layout_get_pixel_size (self, &w, &h);
…		…
1234	PUSHs (sv_2mortal (newSViv (w)));	1482	PUSHs (sv_2mortal (newSViv (w)));
1235	PUSHs (sv_2mortal (newSViv (h)));	1483	PUSHs (sv_2mortal (newSViv (h)));
1236	}	1484	}
1237		1485
1238	int	1486	int
1239	descent (CFPlus::Layout self)	1487	descent (DC::Layout self)
1240	CODE:	1488	CODE:
1241	{	1489	{
1242	PangoRectangle rect;	1490	PangoRectangle rect;
1243	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1491	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1244	pango_layout_line_get_pixel_extents (line, 0, &rect);	1492	pango_layout_line_get_pixel_extents (line, 0, &rect);
1245	RETVAL = PANGO_DESCENT (rect);	1493	RETVAL = PANGO_DESCENT (rect);
1246	}	1494	}
1247	OUTPUT:	1495	OUTPUT:
1248	RETVAL	1496	RETVAL
1249		1497
1250	int	1498	int
1251	xy_to_index (CFPlus::Layout self, int x, int y)	1499	xy_to_index (DC::Layout self, int x, int y)
1252	CODE:	1500	CODE:
1253	{	1501	{
1254	int index, trailing;	1502	int index, trailing;
1255	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1503	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1256	RETVAL = index + trailing;	1504	RETVAL = index + trailing;
1257	}	1505	}
1258	OUTPUT:	1506	OUTPUT:
1259	RETVAL	1507	RETVAL
1260		1508
1261	void	1509	void
1262	cursor_pos (CFPlus::Layout self, int index)	1510	cursor_pos (DC::Layout self, int index)
1263	PPCODE:	1511	PPCODE:
1264	{	1512	{
1265	PangoRectangle strong_pos;	1513	PangoRectangle pos;
1266	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1514	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1267		1515
1268	EXTEND (SP, 3);	1516	EXTEND (SP, 3);
1269	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1517	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1270	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1518	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1271	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1519	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1272	}	1520	}
1273		1521
1274	void	1522	void
1275	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1523	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1276	PPCODE:	1524	PPCODE:
1277	{	1525	{
1278	int line, x;	1526	int line, x;
1279		1527
1280	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1528	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1529	#if !PANGO_VERSION_CHECK (1, 17, 3)
1281	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1530	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1282		1531	--line;
		1532	#endif
1283	EXTEND (SP, 2);	1533	EXTEND (SP, 2);
1284	PUSHs (sv_2mortal (newSViv (line - 1)));	1534	PUSHs (sv_2mortal (newSViv (line)));
1285	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1535	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1286	}	1536	}
1287		1537
1288	void	1538	void
1289	line_x_to_index (CFPlus::Layout self, int line, int x)	1539	line_x_to_index (DC::Layout self, int line, int x)
1290	PPCODE:	1540	PPCODE:
1291	{	1541	{
1292	PangoLayoutLine *lp;	1542	PangoLayoutLine *lp;
1293	int index, trailing;	1543	int index, trailing;
1294		1544
1295	if (line < 0)	1545	if (line < 0)
1296	XSRETURN_EMPTY;	1546	XSRETURN_EMPTY;
1297		1547
1298	if (!(lp = pango_layout_get_line (self->pl, line)))	1548	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1299	XSRETURN_EMPTY; /* do better */	1549	XSRETURN_EMPTY; /* do better */
1300		1550
1301	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1551	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1302		1552
1303	EXTEND (SP, 2);	1553	EXTEND (SP, 2);
…		…
1309	PUSHs (sv_2mortal (newSViv (trailing)));	1559	PUSHs (sv_2mortal (newSViv (trailing)));
1310	}	1560	}
1311	}	1561	}
1312		1562
1313	void	1563	void
1314	render (CFPlus::Layout self, float x, float y, int flags = 0)	1564	render (DC::Layout self, float x, float y, int flags = 0)
1315	CODE:	1565	CODE:
1316	rc_clear (self->rc);	1566	rc_clear (self->rc);
1317	pango_opengl_render_layout_subpixel (	1567	pango_opengl_render_layout_subpixel (
1318	self->pl,	1568	self->pl,
1319	self->rc,	1569	self->rc,
…		…
1324	// we assume that context_change actually clears/frees stuff	1574	// we assume that context_change actually clears/frees stuff
1325	// and does not do any recomputation...	1575	// and does not do any recomputation...
1326	pango_layout_context_changed (self->pl);	1576	pango_layout_context_changed (self->pl);
1327		1577
1328	void	1578	void
1329	draw (CFPlus::Layout self)	1579	draw (DC::Layout self)
1330	CODE:	1580	CODE:
1331	{	1581	{
1332	glEnable (GL_TEXTURE_2D);	1582	glEnable (GL_TEXTURE_2D);
1333	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1583	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1334	glEnable (GL_BLEND);	1584	glEnable (GL_BLEND);
…		…
1342	glDisable (GL_ALPHA_TEST);	1592	glDisable (GL_ALPHA_TEST);
1343	glDisable (GL_BLEND);	1593	glDisable (GL_BLEND);
1344	glDisable (GL_TEXTURE_2D);	1594	glDisable (GL_TEXTURE_2D);
1345	}	1595	}
1346		1596
1347	MODULE = CFPlus PACKAGE = CFPlus::Texture	1597	MODULE = Deliantra::Client PACKAGE = DC::Texture
1348		1598
1349	PROTOTYPES: ENABLE	1599	PROTOTYPES: ENABLE
1350
1351	int minpot (int n)
1352		1600
1353	void	1601	void
1354	pad (SV *data_, int ow, int oh, int nw, int nh)	1602	pad (SV *data_, int ow, int oh, int nw, int nh)
1355	CODE:	1603	CODE:
1356	{	1604	{
…		…
1422	glDisable (GL_ALPHA_TEST);	1670	glDisable (GL_ALPHA_TEST);
1423	glDisable (GL_BLEND);	1671	glDisable (GL_BLEND);
1424	}	1672	}
1425	}	1673	}
1426		1674
		1675	void
		1676	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
		1677	PROTOTYPE: @
		1678	CODE:
		1679	{
		1680	glEnable (GL_BLEND);
		1681	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1682	glEnable (GL_TEXTURE_2D);
		1683	glBindTexture (GL_TEXTURE_2D, name1);
		1684
		1685	glColor3f (intensity, intensity, intensity);
		1686	glPushMatrix ();
		1687	glScalef (1./3, 1./3, 1.);
		1688
		1689	if (blend > 0.f)
		1690	{
		1691	float dx3 = dx * -3.f / w;
		1692	float dy3 = dy * -3.f / h;
		1693	GLfloat env_color[4] = { 0., 0., 0., blend };
		1694
		1695	/* interpolate the two shadow textures */
		1696	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1697	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1698
		1699	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1700	gl.ActiveTexture (GL_TEXTURE1);
		1701	glEnable (GL_TEXTURE_2D);
		1702	glBindTexture (GL_TEXTURE_2D, name2);
		1703	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1704
		1705	/* rgb == rgb(glcolor) */
		1706	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1707	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
		1708	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1709
		1710	/* alpha = interpolate t0, t1 by env_alpha */
		1711	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1712
		1713	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1714	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1715	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1716
		1717	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1718	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1719
		1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1722
		1723	glBegin (GL_QUADS);
		1724	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1725	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1726	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1727	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1728	glEnd ();
		1729
		1730	glDisable (GL_TEXTURE_2D);
		1731	gl.ActiveTexture (GL_TEXTURE0);
		1732	}
		1733	else
		1734	{
		1735	/* simple blending of one texture, also opengl <1.3 path */
		1736	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1737
		1738	glBegin (GL_QUADS);
		1739	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1740	glTexCoord2f (0, t); glVertex2f (0, h);
		1741	glTexCoord2f (s, t); glVertex2f (w, h);
		1742	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1743	glEnd ();
		1744	}
		1745
		1746	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1747	{
		1748	int x, y;
		1749	int dx3 = dx * 3;
		1750	int dy3 = dy * 3;
		1751
		1752	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1753	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1754	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1755	glTranslatef (-1., -1., 0);
		1756	glBegin (GL_QUADS);
		1757
		1758	for (y = 1; y < h; y += 3)
		1759	{
		1760	int y1 = y - dy3;
		1761	int y1valid = y1 >= 0 && y1 < h;
		1762
		1763	for (x = 1; x < w; x += 3)
		1764	{
		1765	int x1 = x - dx3;
		1766	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1767	uint8_t h2;
		1768
		1769	if (y1valid && x1 >= 0 && x1 < w)
		1770	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1771	else
		1772	h2 = 1; /* out of range == invisible */
		1773
		1774	if (h1 || h2)
		1775	{
		1776	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1777	glColor4f (1., 1., 1., alpha);
		1778
		1779	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1780	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1781	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1782	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1783	}
		1784	}
		1785	}
		1786	}
		1787
		1788	glEnd ();
		1789
		1790	glPopMatrix ();
		1791
		1792	glDisable (GL_TEXTURE_2D);
		1793	glDisable (GL_BLEND);
		1794	}
		1795
1427	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1796	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1428	CODE:	1797	CODE:
1429	{	1798	{
1430	GLint width;	1799	GLint width;
1431	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1800	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1433	RETVAL = width > 0;	1802	RETVAL = width > 0;
1434	}	1803	}
1435	OUTPUT:	1804	OUTPUT:
1436	RETVAL	1805	RETVAL
1437		1806
1438	MODULE = CFPlus PACKAGE = CFPlus::Map	1807	MODULE = Deliantra::Client PACKAGE = DC::Map
1439		1808
1440	PROTOTYPES: DISABLE	1809	PROTOTYPES: DISABLE
1441		1810
1442	CFPlus::Map	1811	DC::Map
1443	new (SV *class)	1812	new (SV *class)
1444	CODE:	1813	CODE:
1445	New (0, RETVAL, 1, struct map);	1814	New (0, RETVAL, 1, struct map);
1446	RETVAL->x = 0;	1815	RETVAL->x = 0;
1447	RETVAL->y = 0;	1816	RETVAL->y = 0;
…		…
1455	RETVAL->row = 0;	1824	RETVAL->row = 0;
1456	OUTPUT:	1825	OUTPUT:
1457	RETVAL	1826	RETVAL
1458		1827
1459	void	1828	void
1460	DESTROY (CFPlus::Map self)	1829	DESTROY (DC::Map self)
1461	CODE:	1830	CODE:
1462	{	1831	{
1463	map_clear (self);	1832	map_clear (self);
1464	Safefree (self->face2tile);	1833	Safefree (self->face2tile);
1465	Safefree (self->tex);	1834	Safefree (self->tex);
1466	Safefree (self);	1835	Safefree (self);
1467	}	1836	}
1468		1837
1469	void	1838	void
1470	resize (CFPlus::Map self, int map_width, int map_height)	1839	resize (DC::Map self, int map_width, int map_height)
1471	CODE:	1840	CODE:
1472	self->w = map_width;	1841	self->w = map_width;
1473	self->h = map_height;	1842	self->h = map_height;
1474		1843
1475	void	1844	void
1476	clear (CFPlus::Map self)	1845	clear (DC::Map self)
1477	CODE:	1846	CODE:
1478	map_clear (self);	1847	map_clear (self);
1479		1848
1480	void	1849	void
1481	set_tileid (CFPlus::Map self, int face, int tile)	1850	set_tileid (DC::Map self, int face, int tile)
1482	CODE:	1851	CODE:
1483	{	1852	{
1484	need_facenum (self, face); self->face2tile [face] = tile;	1853	need_facenum (self, face); self->face2tile [face] = tile;
1485	need_texid (self, tile);	1854	need_texid (self, tile);
1486	}	1855	}
1487		1856
1488	void	1857	void
1489	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1858	set_smooth (DC::Map self, int face, int smooth, int level)
1490	CODE:	1859	CODE:
1491	{	1860	{
1492	tileid texid;	1861	tileid texid;
1493	maptex *tex;	1862	maptex *tex;
1494		1863
…		…
1507	tex->smoothtile = self->face2tile [smooth];	1876	tex->smoothtile = self->face2tile [smooth];
1508	tex->smoothlevel = level;	1877	tex->smoothlevel = level;
1509	}	1878	}
1510		1879
1511	void	1880	void
1512	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)	1881	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)
1513	CODE:	1882	CODE:
1514	{	1883	{
1515	need_texid (self, texid);	1884	need_texid (self, texid);
1516		1885
1517	{	1886	{
…		…
1536	// use uglier nearest interpolation because linear suffers	1905	// use uglier nearest interpolation because linear suffers
1537	// from transparent color bleeding and ugly wrapping effects.	1906	// from transparent color bleeding and ugly wrapping effects.
1538	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1907	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1539	}	1908	}
1540		1909
		1910	void
		1911	expire_textures (DC::Map self, int texid, int count)
		1912	PPCODE:
		1913	for (; texid < self->texs && count; ++texid, --count)
		1914	{
		1915	maptex *tex = self->tex + texid;
		1916
		1917	if (tex->name)
		1918	{
		1919	if (tex->unused)
		1920	{
		1921	tex->name = 0;
		1922	tex->unused = 0;
		1923	XPUSHs (sv_2mortal (newSViv (texid)));
		1924	}
		1925	else
		1926	tex->unused = 1;
		1927	}
		1928	}
		1929
1541	int	1930	int
1542	ox (CFPlus::Map self)	1931	ox (DC::Map self)
1543	ALIAS:	1932	ALIAS:
1544	oy = 1	1933	oy = 1
1545	x = 2	1934	x = 2
1546	y = 3	1935	y = 3
1547	w = 4	1936	w = 4
…		…
1558	}	1947	}
1559	OUTPUT:	1948	OUTPUT:
1560	RETVAL	1949	RETVAL
1561		1950
1562	void	1951	void
1563	scroll (CFPlus::Map self, int dx, int dy)	1952	scroll (DC::Map self, int dx, int dy)
1564	CODE:	1953	CODE:
1565	{	1954	{
1566	if (dx > 0)	1955	if (dx > 0)
1567	map_blank (self, self->x, self->y, dx, self->h);	1956	map_blank (self, self->x, self->y, dx, self->h);
1568	else if (dx < 0)	1957	else if (dx < 0)
…		…
1584	self->y += MAP_EXTEND_Y;	1973	self->y += MAP_EXTEND_Y;
1585	}	1974	}
1586	}	1975	}
1587		1976
1588	SV *	1977	SV *
1589	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1978	map1a_update (DC::Map self, SV *data_, int extmap)
1590	CODE:	1979	CODE:
1591	{	1980	{
1592	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1981	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1593	uint8_t *data_end = (uint8_t *)SvEND (data_);	1982	uint8_t *data_end = (uint8_t *)SvEND (data_);
1594	mapcell *cell;	1983	mapcell *cell;
…		…
1622	uint8_t ext, cmd;	2011	uint8_t ext, cmd;
1623		2012
1624	do	2013	do
1625	{	2014	{
1626	ext = *data++;	2015	ext = *data++;
1627	cmd = ext & 0x3f;	2016	cmd = ext & 0x7f;
1628		2017
1629	if (cmd < 4)	2018	if (cmd < 4)
1630	cell->darkness = 255 - ext * 64 + 1;	2019	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1631	else if (cmd == 5) // health	2020	else if (cmd == 5) // health
1632	{	2021	{
1633	cell->stat_width = 1;	2022	cell->stat_width = 1;
1634	cell->stat_hp = *data++;	2023	cell->stat_hp = *data++;
1635	}	2024	}
1636	else if (cmd == 6) // monster width	2025	else if (cmd == 6) // monster width
1637	cell->stat_width = *data++ + 1;	2026	cell->stat_width = *data++ + 1;
1638	else if (cmd == 0x47)	2027	else if (cmd == 0x47)
1639	{	2028	{
1640	if (*data == 4)	2029	if (*data == 1) cell->player = data [1];
1641	; // decode player count	2030	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2031	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2032	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1642		2033
1643	data += *data + 1;	2034	data += *data + 1;
1644	}	2035	}
1645	else if (cmd == 8) // cell flags	2036	else if (cmd == 8) // cell flags
1646	cell->flags = *data++;	2037	cell->flags = *data++;
…		…
1663	cell->tile [z] = self->face2tile [face];	2054	cell->tile [z] = self->face2tile [face];
1664		2055
1665	if (cell->tile [z])	2056	if (cell->tile [z])
1666	{	2057	{
1667	maptex *tex = self->tex + cell->tile [z];	2058	maptex *tex = self->tex + cell->tile [z];
		2059	tex->unused = 0;
1668	if (!tex->name)	2060	if (!tex->name)
1669	av_push (missing, newSViv (cell->tile [z]));	2061	av_push (missing, newSViv (cell->tile [z]));
1670		2062
1671	if (tex->smoothtile)	2063	if (tex->smoothtile)
1672	{	2064	{
1673	maptex *smooth = self->tex + tex->smoothtile;	2065	maptex *smooth = self->tex + tex->smoothtile;
		2066	smooth->unused = 0;
1674	if (!smooth->name)	2067	if (!smooth->name)
1675	av_push (missing, newSViv (tex->smoothtile));	2068	av_push (missing, newSViv (tex->smoothtile));
1676	}	2069	}
1677	}	2070	}
1678	}	2071	}
1679	}	2072	}
1680	else	2073	else
1681	cell->darkness = 0;	2074	CELL_CLEAR (cell);
1682	}	2075	}
1683	}	2076	}
1684	OUTPUT:	2077	OUTPUT:
1685	RETVAL	2078	RETVAL
1686		2079
1687	SV *	2080	SV *
1688	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	2081	mapmap (DC::Map self, int x0, int y0, int w, int h)
1689	CODE:	2082	CODE:
1690	{	2083	{
1691	int x1, x;	2084	int x1, x;
1692	int y1, y;	2085	int y1, y;
1693	int z;	2086	int z;
…		…
1738	}	2131	}
1739	OUTPUT:	2132	OUTPUT:
1740	RETVAL	2133	RETVAL
1741		2134
1742	void	2135	void
1743	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	2136	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1744	CODE:	2137	CODE:
1745	{	2138	{
1746	int x, y, z;	2139	int x, y, z;
1747		2140
1748	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2141	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1749	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2142	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1750	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2143	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1751	smooth_key skey;	2144	smooth_key skey;
1752		2145	int pl_x, pl_y;
		2146	maptex pl_tex;
1753	rc_t *rc = rc_alloc ();	2147	rc_t *rc = rc_alloc ();
		2148	rc_t *rc_ov = rc_alloc ();
1754	rc_key_t key;	2149	rc_key_t key;
1755	rc_array_t *arr;	2150	rc_array_t *arr;
1756		2151
		2152	pl_tex.name = 0;
		2153
1757	// thats current max. sorry.	2154	// that's current max. sorry.
1758	if (sw > 255) sw = 255;	2155	if (sw > 255) sw = 255;
1759	if (sh > 255) sh = 255;	2156	if (sh > 255) sh = 255;
1760		2157
1761	// clear key, in case of extra padding	2158	// clear key, in case of extra padding
1762	memset (&skey, 0, sizeof (skey));	2159	memset (&skey, 0, sizeof (skey));
…		…
1766	key.g = 255;	2163	key.g = 255;
1767	key.b = 255;	2164	key.b = 255;
1768	key.a = 255;	2165	key.a = 255;
1769	key.mode = GL_QUADS;	2166	key.mode = GL_QUADS;
1770	key.format = GL_T2F_V3F;	2167	key.format = GL_T2F_V3F;
1771	key.texname = -1;
1772		2168
1773	mx += self->x;	2169	mx += self->x;
1774	my += self->y;	2170	my += self->y;
1775		2171
1776	// first pass: determine smooth_max	2172	// first pass: determine smooth_max
…		…
1800	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2196	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1801		2197
1802	for (z = 0; z <= 2; z++)	2198	for (z = 0; z <= 2; z++)
1803	{	2199	{
1804	memset (smooth_level, 0, sizeof (smooth_level));	2200	memset (smooth_level, 0, sizeof (smooth_level));
		2201	key.texname = -1;
1805		2202
1806	for (y = 0; y < sh; y++)	2203	for (y = 0; y < sh; y++)
1807	if (0 <= y + my && y + my < self->rows)	2204	if (0 <= y + my && y + my < self->rows)
1808	{	2205	{
1809	maprow *row = self->row + (y + my);	2206	maprow *row = self->row + (y + my);
…		…
1819	maptex tex = self->tex [tile];	2216	maptex tex = self->tex [tile];
1820	int px, py;	2217	int px, py;
1821		2218
1822	if (key.texname != tex.name)	2219	if (key.texname != tex.name)
1823	{	2220	{
		2221	self->tex [tile].unused = 0;
		2222
1824	if (!tex.name)	2223	if (!tex.name)
1825	tex = self->tex [2]; /* missing, replace by noface */	2224	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1826		2225
1827	key.texname = tex.name;	2226	key.texname = tex.name;
1828	arr = rc_array (rc, &key);	2227	arr = rc_array (rc, &key);
1829	}	2228	}
1830		2229
1831	px = (x + 1) * T - tex.w;	2230	px = (x + 1) * T - tex.w;
1832	py = (y + 1) * T - tex.h;	2231	py = (y + 1) * T - tex.h;
		2232
		2233	if (expect_false (cell->player == player) && expect_false (z == 2))
		2234	{
		2235	pl_x = px;
		2236	pl_y = py;
		2237	pl_tex = tex;
		2238	continue;
		2239	}
1833		2240
1834	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2241	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1835	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2242	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1836	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2243	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1837	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2244	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1838
1839	if (cell->flags && z == 2)
1840	{
1841	// overlays such as the speech bubble, probably more to come
1842	if (cell->flags & 1)
1843	{
1844	maptex tex = self->tex [1];
1845	int px = x * T + T * 2 / 32;
1846	int py = y * T - T * 6 / 32;
1847
1848	if (tex.name)
1849	{
1850	if (key.texname != tex.name)
1851	{
1852	key.texname = tex.name;
1853	arr = rc_array (rc, &key);
1854	}
1855
1856	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1857	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1858	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1859	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1860	}
1861	}
1862	}
1863		2245
1864	// update smooth hash	2246	// update smooth hash
1865	if (tex.smoothtile)	2247	if (tex.smoothtile)
1866	{	2248	{
1867	skey.tile = tex.smoothtile;	2249	skey.tile = tex.smoothtile;
…		…
1896	// corners	2278	// corners
1897	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2279	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1898	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2280	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1899	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2281	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1900	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2282	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2283	}
		2284	}
		2285
		2286	if (expect_false (z == 2) && expect_false (cell->flags))
		2287	{
		2288	// overlays such as the speech bubble, probably more to come
		2289	if (cell->flags & 1)
		2290	{
		2291	rc_key_t key_ov = key;
		2292	maptex tex = self->tex [TEXID_SPEECH];
		2293	rc_array_t *arr;
		2294	int px = x * T + T * 2 / 32;
		2295	int py = y * T - T * 6 / 32;
		2296
		2297	key_ov.texname = tex.name;
		2298	arr = rc_array (rc_ov, &key_ov);
		2299
		2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2302	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2303	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1901	}	2304	}
1902	}	2305	}
1903	}	2306	}
1904	}	2307	}
1905		2308
…		…
1945	{	2348	{
1946	// this time avoiding texture state changes	2349	// this time avoiding texture state changes
1947	// save gobs of state changes.	2350	// save gobs of state changes.
1948	if (key.texname != tex.name)	2351	if (key.texname != tex.name)
1949	{	2352	{
		2353	self->tex [skey->tile].unused = 0;
		2354
1950	glEnd ();	2355	glEnd ();
1951	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2356	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1952	glBegin (GL_QUADS);	2357	glBegin (GL_QUADS);
1953	}	2358	}
1954		2359
…		…
1983	}	2388	}
1984		2389
1985	hv_clear (smooth);	2390	hv_clear (smooth);
1986	}	2391	}
1987		2392
		2393	if (pl_tex.name)
		2394	{
		2395	maptex tex = pl_tex;
		2396	int px = pl_x + sdx;
		2397	int py = pl_y + sdy;
		2398
		2399	key.texname = tex.name;
		2400	arr = rc_array (rc, &key);
		2401
		2402	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2403	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2404	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2405	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2406
		2407	rc_draw (rc);
		2408	}
		2409
		2410	rc_draw (rc_ov);
		2411	rc_clear (rc_ov);
		2412
1988	glDisable (GL_BLEND);	2413	glDisable (GL_BLEND);
1989	rc_free (rc);	2414	rc_free (rc);
		2415	rc_free (rc_ov);
1990		2416
1991	// top layer: overlays such as the health bar	2417	// top layer: overlays such as the health bar
1992	for (y = 0; y < sh; y++)	2418	for (y = 0; y < sh; y++)
1993	if (0 <= y + my && y + my < self->rows)	2419	if (0 <= y + my && y + my < self->rows)
1994	{	2420	{
…		…
1999	{	2425	{
2000	mapcell *cell = row->col + (x + mx - row->c0);	2426	mapcell *cell = row->col + (x + mx - row->c0);
2001		2427
2002	int px = x * T;	2428	int px = x * T;
2003	int py = y * T;	2429	int py = y * T;
		2430
		2431	if (expect_false (cell->player == player))
		2432	{
		2433	px += sdx;
		2434	py += sdy;
		2435	}
2004		2436
2005	if (cell->stat_hp)	2437	if (cell->stat_hp)
2006	{	2438	{
2007	int width = cell->stat_width * T;	2439	int width = cell->stat_width * T;
2008	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2440	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2019	}	2451	}
2020	}	2452	}
2021	}	2453	}
2022		2454
2023	void	2455	void
2024	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2456	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2025	CODE:	2457	CODE:
2026	{	2458	{
2027	static float color[16][3] = {	2459	static float color[16][3] = {
2028	{ 0.00F, 0.00F, 0.00F },	2460	{ 0.00f, 0.00f, 0.00f },
2029	{ 1.00F, 1.00F, 1.00F },	2461	{ 1.00f, 1.00f, 1.00f },
2030	{ 0.00F, 0.00F, 0.55F },	2462	{ 0.00f, 0.00f, 0.55f },
2031	{ 1.00F, 0.00F, 0.00F },	2463	{ 1.00f, 0.00f, 0.00f },
2032		2464
2033	{ 1.00F, 0.54F, 0.00F },	2465	{ 1.00f, 0.54f, 0.00f },
2034	{ 0.11F, 0.56F, 1.00F },	2466	{ 0.11f, 0.56f, 1.00f },
2035	{ 0.93F, 0.46F, 0.00F },	2467	{ 0.93f, 0.46f, 0.00f },
2036	{ 0.18F, 0.54F, 0.34F },	2468	{ 0.18f, 0.54f, 0.34f },
2037		2469
2038	{ 0.56F, 0.73F, 0.56F },	2470	{ 0.56f, 0.73f, 0.56f },
2039	{ 0.80F, 0.80F, 0.80F },	2471	{ 0.80f, 0.80f, 0.80f },
2040	{ 0.55F, 0.41F, 0.13F },	2472	{ 0.55f, 0.41f, 0.13f },
2041	{ 0.99F, 0.77F, 0.26F },	2473	{ 0.99f, 0.77f, 0.26f },
2042		2474
2043	{ 0.74F, 0.65F, 0.41F },	2475	{ 0.74f, 0.65f, 0.41f },
2044		2476
2045	{ 0.00F, 1.00F, 1.00F },	2477	{ 0.00f, 1.00f, 1.00f },
2046	{ 1.00F, 0.00F, 1.00F },	2478	{ 1.00f, 0.00f, 1.00f },
2047	{ 1.00F, 1.00F, 0.00F },	2479	{ 1.00f, 1.00f, 0.00f },
2048	};	2480	};
2049		2481
2050	int x, y;	2482	int x, y;
2051		2483
2052	glEnable (GL_TEXTURE_2D);	2484	glEnable (GL_TEXTURE_2D);
		2485	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2486	* but the nvidia driver (185.18.14) mishandles alpha textures
		2487	* and takes the colour from god knows where instead of using
		2488	* Cp. MODULATE results in the same colour, but slightly different
		2489	* alpha, but atcually gives us the correct colour with nvidia.
		2490	*/
2053	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2491	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2054	glEnable (GL_BLEND);	2492	glEnable (GL_BLEND);
2055	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2493	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2056	glBegin (GL_QUADS);	2494	glBegin (GL_QUADS);
2057		2495
2058	for (y = 0; y < h; y++)	2496	for (y = 0; y < h; y++)
…		…
2062		2500
2063	if (m)	2501	if (m)
2064	{	2502	{
2065	float *c = color [m & 15];	2503	float *c = color [m & 15];
2066		2504
2067	float tx1 = m & 0x40 ? 0.5 : 0.;	2505	float tx1 = m & 0x40 ? 0.5f : 0.f;
2068	float tx2 = tx1 + 0.5;	2506	float tx2 = tx1 + 0.5f;
2069		2507
2070	glColor4f (c[0], c[1], c[2], 0.75);	2508	glColor4f (c[0], c[1], c[2], 1);
2071	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2509	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2072	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2510	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2073	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2511	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2074	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2512	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2075	}	2513	}
…		…
2079	glDisable (GL_BLEND);	2517	glDisable (GL_BLEND);
2080	glDisable (GL_TEXTURE_2D);	2518	glDisable (GL_TEXTURE_2D);
2081	}	2519	}
2082		2520
2083	void	2521	void
2084	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2522	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2085	PPCODE:	2523	PPCODE:
2086	{	2524	{
2087	int x, y;	2525	int x, y;
2088	int sw1 = sw + 2;	2526	int sw1 = sw + 2;
2089	int sh1 = sh + 2;	2527	int sh1 = sh + 2;
2090	int sh3 = sh * 3;	2528	int sh3 = sh * 3;
2091	int sw34 = (sw * 3 + 3) & ~3;	2529	int sw3 = sw * 3;
2092	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2530	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2093	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2531	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2094	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);	2532	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2095		2533
2096	SvPOK_only (darkness3_sv);	2534	SvPOK_only (darkness3_sv);
2097	SvCUR_set (darkness3_sv, sw34 * sh3);	2535	SvCUR_set (darkness3_sv, sw3 * sh3);
2098		2536
2099	mx += self->x - 1;	2537	mx += self->x - 1;
2100	my += self->y - 1;	2538	my += self->y - 1;
2101
2102	memset (darkness1, 255, sw1 * sh1);
2103		2539
2104	for (y = 0; y < sh1; y++)	2540	for (y = 0; y < sh1; y++)
2105	if (0 <= y + my && y + my < self->rows)	2541	if (0 <= y + my && y + my < self->rows)
2106	{	2542	{
2107	maprow *row = self->row + (y + my);	2543	maprow *row = self->row + (y + my);
…		…
2110	if (row->c0 <= x + mx && x + mx < row->c1)	2546	if (row->c0 <= x + mx && x + mx < row->c1)
2111	{	2547	{
2112	mapcell *cell = row->col + (x + mx - row->c0);	2548	mapcell *cell = row->col + (x + mx - row->c0);
2113		2549
2114	darkness1 [y * sw1 + x] = cell->darkness	2550	darkness1 [y * sw1 + x] = cell->darkness
2115	? 255 - (cell->darkness - 1)	2551	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2116	: 255 - FOW_DARKNESS;	2552	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2117	}	2553	}
2118	}	2554	}
2119		2555
2120	for (y = 0; y < sh; ++y)	2556	for (y = 0; y < sh; ++y)
2121	for (x = 0; x < sw; ++x)	2557	for (x = 0; x < sw; ++x)
…		…
2140		2576
2141	uint8_t r13 = (d13 + d23 + d12) / 3;	2577	uint8_t r13 = (d13 + d23 + d12) / 3;
2142	uint8_t r23 = d23;	2578	uint8_t r23 = d23;
2143	uint8_t r33 = (d23 + d33 + d32) / 3;	2579	uint8_t r33 = (d23 + d33 + d32) / 3;
2144		2580
2145	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2581	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2146	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2582	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2147	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2583	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2148	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2584	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2149	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2585	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2150	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2586	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2151	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2587	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2152	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2588	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2153	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2589	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2154	}	2590	}
2155		2591
2156	free (darkness1);	2592	free (darkness1);
2157		2593
2158	EXTEND (SP, 3);	2594	EXTEND (SP, 3);
2159	PUSHs (sv_2mortal (newSViv (sw34)));	2595	PUSHs (sv_2mortal (newSViv (sw3)));
2160	PUSHs (sv_2mortal (newSViv (sh3)));	2596	PUSHs (sv_2mortal (newSViv (sh3)));
2161	PUSHs (darkness3_sv);	2597	PUSHs (darkness3_sv);
2162	}	2598	}
2163		2599
2164	SV *	2600	SV *
2165	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2601	get_rect (DC::Map self, int x0, int y0, int w, int h)
2166	CODE:	2602	CODE:
2167	{	2603	{
2168	int x, y, x1, y1;	2604	int x, y, x1, y1;
2169	SV *data_sv = newSV (w * h * 7 + 5);	2605	SV *data_sv = newSV (w * h * 7 + 5);
2170	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2606	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2227	else	2663	else
2228	*data++ = 0;	2664	*data++ = 0;
2229	}	2665	}
2230	}	2666	}
2231		2667
		2668	/* if size is w*h + 5 then no data has been found */
		2669	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2670	{
2232	SvPOK_only (data_sv);	2671	SvPOK_only (data_sv);
2233	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2672	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2673	}
		2674
2234	RETVAL = data_sv;	2675	RETVAL = data_sv;
2235	}	2676	}
2236	OUTPUT:	2677	OUTPUT:
2237	RETVAL	2678	RETVAL
2238		2679
2239	void	2680	void
2240	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2681	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2241	PPCODE:	2682	PPCODE:
2242	{	2683	{
2243	int x, y, z;	2684	int x, y, z;
2244	int w, h;	2685	int w, h;
2245	int x1, y1;	2686	int x1, y1;
		2687	STRLEN len;
		2688	uint8_t *data, *end;
		2689
		2690	len = SvLEN (data_sv);
		2691	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2692	data = SvPVbyte_nolen (data_sv);
		2693	end = data + len + 8;
		2694
		2695	if (len < 5)
		2696	XSRETURN_EMPTY;
2246		2697
2247	if (*data++ != 0)	2698	if (*data++ != 0)
2248	return; /* version mismatch */	2699	XSRETURN_EMPTY; /* version mismatch */
2249		2700
2250	w = *data++ << 8; w |= *data++;	2701	w = *data++ << 8; w |= *data++;
2251	h = *data++ << 8; h |= *data++;	2702	h = *data++ << 8; h |= *data++;
2252		2703
2253	// we need to do this 'cause we don't keep an absolute coord system for rows	2704	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2265	{	2716	{
2266	maprow *row = map_get_row (self, y);	2717	maprow *row = map_get_row (self, y);
2267		2718
2268	for (x = x0; x < x1; x++)	2719	for (x = x0; x < x1; x++)
2269	{	2720	{
		2721	uint8_t flags;
		2722
		2723	if (data + 7 >= end)
		2724	XSRETURN_EMPTY;
		2725
2270	uint8_t flags = *data++;	2726	flags = *data++;
2271		2727
2272	if (flags)	2728	if (flags)
2273	{	2729	{
2274	mapcell *cell = row_get_cell (row, x);	2730	mapcell *cell = row_get_cell (row, x);
2275	tileid tile[3] = { 0, 0, 0 };	2731	tileid tile[3] = { 0, 0, 0 };
…		…
2278	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2734	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2279	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2735	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2280		2736
2281	if (cell->darkness == 0)	2737	if (cell->darkness == 0)
2282	{	2738	{
2283	cell->darkness = 0;	2739	/*cell->darkness = 0;*/
		2740	EXTEND (SP, 3);
2284		2741
2285	for (z = 0; z <= 2; z++)	2742	for (z = 0; z <= 2; z++)
2286	{	2743	{
2287	tileid t = tile [z];	2744	tileid t = tile [z];
2288		2745
2289	if (t >= self->texs || (t && !self->tex [t].name))	2746	if (t >= self->texs || (t && !self->tex [t].name))
2290	{	2747	{
2291	XPUSHs (sv_2mortal (newSViv (t)));	2748	PUSHs (sv_2mortal (newSViv (t)));
2292	need_texid (self, t);	2749	need_texid (self, t);
2293	}	2750	}
2294		2751
2295	cell->tile [z] = t;	2752	cell->tile [z] = t;
2296	}	2753	}
…		…
2298	}	2755	}
2299	}	2756	}
2300	}	2757	}
2301	}	2758	}
2302		2759
2303	MODULE = CFPlus PACKAGE = CFPlus::RW	2760	MODULE = Deliantra::Client PACKAGE = DC::RW
2304		2761
2305	CFPlus::RW	2762	DC::RW
2306	new (SV *class, SV *data_sv)	2763	new (SV *class, SV *data_sv)
2307	CODE:	2764	CODE:
2308	{	2765	{
2309	STRLEN datalen;	2766	STRLEN datalen;
2310	char *data = SvPVbyte (data_sv, datalen);	2767	char *data = SvPVbyte (data_sv, datalen);
…		…
2312	RETVAL = SDL_RWFromConstMem (data, datalen);	2769	RETVAL = SDL_RWFromConstMem (data, datalen);
2313	}	2770	}
2314	OUTPUT:	2771	OUTPUT:
2315	RETVAL	2772	RETVAL
2316		2773
2317	CFPlus::RW	2774	DC::RW
2318	new_from_file (SV *class, const char *path, const char *mode = "rb")	2775	new_from_file (SV *class, const char *path, const char *mode = "rb")
2319	CODE:	2776	CODE:
2320	RETVAL = SDL_RWFromFile (path, mode);	2777	RETVAL = SDL_RWFromFile (path, mode);
2321	OUTPUT:	2778	OUTPUT:
2322	RETVAL	2779	RETVAL
2323		2780
2324	# fails on win32:	2781	# fails on win32:
2325	# CFPlus.xs(2268) : error C2059: syntax error : '('	2782	# dc.xs(2268) : error C2059: syntax error : '('
2326	#void	2783	#void
2327	#close (CFPlus::RW self)	2784	#close (DC::RW self)
2328	# CODE:	2785	# CODE:
2329	# (self->(close)) (self);	2786	# (self->(close)) (self);
2330		2787
2331	MODULE = CFPlus PACKAGE = CFPlus::Channel	2788	MODULE = Deliantra::Client PACKAGE = DC::Channel
2332		2789
2333	PROTOTYPES: DISABLE	2790	PROTOTYPES: DISABLE
2334		2791
2335	CFPlus::Channel	2792	DC::Channel
2336	find ()	2793	find ()
2337	CODE:	2794	CODE:
2338	{	2795	{
2339	RETVAL = Mix_GroupAvailable (-1);	2796	RETVAL = Mix_GroupAvailable (-1);
2340		2797
…		…
2353	}	2810	}
2354	OUTPUT:	2811	OUTPUT:
2355	RETVAL	2812	RETVAL
2356		2813
2357	void	2814	void
2358	halt (CFPlus::Channel self)	2815	halt (DC::Channel self)
2359	CODE:	2816	CODE:
2360	Mix_HaltChannel (self);	2817	Mix_HaltChannel (self);
2361		2818
2362	void	2819	void
2363	expire (CFPlus::Channel self, int ticks = -1)	2820	expire (DC::Channel self, int ticks = -1)
2364	CODE:	2821	CODE:
2365	Mix_ExpireChannel (self, ticks);	2822	Mix_ExpireChannel (self, ticks);
2366		2823
2367	void	2824	void
2368	fade_out (CFPlus::Channel self, int ticks = -1)	2825	fade_out (DC::Channel self, int ticks = -1)
2369	CODE:	2826	CODE:
2370	Mix_FadeOutChannel (self, ticks);	2827	Mix_FadeOutChannel (self, ticks);
2371		2828
2372	int	2829	int
2373	volume (CFPlus::Channel self, int volume)	2830	volume (DC::Channel self, int volume)
2374	CODE:	2831	CODE:
2375	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2832	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2376	OUTPUT:	2833	OUTPUT:
2377	RETVAL	2834	RETVAL
2378		2835
2379	void	2836	void
2380	unregister_all_effects (CFPlus::Channel self)	2837	unregister_all_effects (DC::Channel self)
2381	CODE:	2838	CODE:
2382	Mix_UnregisterAllEffects (self);	2839	Mix_UnregisterAllEffects (self);
2383		2840
2384	void	2841	void
2385	set_panning (CFPlus::Channel self, int left, int right)	2842	set_panning (DC::Channel self, int left, int right)
2386	CODE:	2843	CODE:
2387	left = CLAMP (left , 0, 255);	2844	left = CLAMP (left , 0, 255);
2388	right = CLAMP (right, 0, 255);	2845	right = CLAMP (right, 0, 255);
2389	Mix_SetPanning (self, left, right);	2846	Mix_SetPanning (self, left, right);
2390		2847
2391	void	2848	void
2392	set_distance (CFPlus::Channel self, int distance)	2849	set_distance (DC::Channel self, int distance)
2393	CODE:	2850	CODE:
2394	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2851	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2395		2852
2396	void	2853	void
2397	set_position (CFPlus::Channel self, int angle, int distance)	2854	set_position (DC::Channel self, int angle, int distance)
2398	CODE:	2855	CODE:
2399		2856
2400	void	2857	void
2401	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2858	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2402	CODE:	2859	CODE:
2403	{	2860	{
2404	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2861	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2405	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2862	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2406	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2863	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2407	}	2864	}
2408		2865
2409	void	2866	void
2410	set_reverse_stereo (CFPlus::Channel self, int flip)	2867	set_reverse_stereo (DC::Channel self, int flip)
2411	CODE:	2868	CODE:
2412	Mix_SetReverseStereo (self, flip);	2869	Mix_SetReverseStereo (self, flip);
2413		2870
2414	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2871	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2415		2872
2416	PROTOTYPES: DISABLE	2873	PROTOTYPES: DISABLE
2417		2874
2418	CFPlus::MixChunk	2875	DC::MixChunk
2419	new (SV *class, CFPlus::RW rwops)	2876	new (SV *class, DC::RW rwops)
2420	CODE:	2877	CODE:
2421	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2878	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2422	OUTPUT:	2879	OUTPUT:
2423	RETVAL	2880	RETVAL
2424		2881
2425	void	2882	void
2426	DESTROY (CFPlus::MixChunk self)	2883	DESTROY (DC::MixChunk self)
2427	CODE:	2884	CODE:
2428	Mix_FreeChunk (self);	2885	Mix_FreeChunk (self);
2429		2886
2430	int	2887	int
2431	volume (CFPlus::MixChunk self, int volume = -1)	2888	volume (DC::MixChunk self, int volume = -1)
2432	CODE:	2889	CODE:
2433	if (items > 1)	2890	if (items > 1)
2434	volume = CLAMP (volume, 0, 128);	2891	volume = CLAMP (volume, 0, 128);
2435	RETVAL = Mix_VolumeChunk (self, volume);	2892	RETVAL = Mix_VolumeChunk (self, volume);
2436	OUTPUT:	2893	OUTPUT:
2437	RETVAL	2894	RETVAL
2438		2895
2439	CFPlus::Channel	2896	DC::Channel
2440	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2897	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2441	CODE:	2898	CODE:
2442	{	2899	{
2443	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2900	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2444		2901
2445	if (RETVAL < 0)	2902	if (RETVAL < 0)
…		…
2452	}	2909	}
2453	}	2910	}
2454	OUTPUT:	2911	OUTPUT:
2455	RETVAL	2912	RETVAL
2456		2913
2457	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2914	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2458		2915
2459	int	2916	int
2460	volume (int volume = -1)	2917	volume (int volume = -1)
2461	PROTOTYPE: ;$	2918	PROTOTYPE: ;$
2462	CODE:	2919	CODE:
…		…
2474	void	2931	void
2475	halt ()	2932	halt ()
2476	CODE:	2933	CODE:
2477	Mix_HaltMusic ();	2934	Mix_HaltMusic ();
2478		2935
2479	CFPlus::MixMusic	2936	DC::MixMusic
2480	new (SV *class, CFPlus::RW rwops)	2937	new (SV *class, DC::RW rwops)
2481	CODE:	2938	CODE:
2482	RETVAL = Mix_LoadMUS_RW (rwops);	2939	RETVAL = Mix_LoadMUS_RW (rwops);
2483	OUTPUT:	2940	OUTPUT:
2484	RETVAL	2941	RETVAL
2485		2942
2486	void	2943	void
2487	DESTROY (CFPlus::MixMusic self)	2944	DESTROY (DC::MixMusic self)
2488	CODE:	2945	CODE:
2489	Mix_FreeMusic (self);	2946	Mix_FreeMusic (self);
2490		2947
2491	int	2948	int
2492	play (CFPlus::MixMusic self, int loops = -1)	2949	play (DC::MixMusic self, int loops = -1)
2493	CODE:	2950	CODE:
2494	RETVAL = Mix_PlayMusic (self, loops);	2951	RETVAL = Mix_PlayMusic (self, loops);
2495	OUTPUT:	2952	OUTPUT:
2496	RETVAL	2953	RETVAL
2497		2954
2498	void	2955	void
2499	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2956	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2500	CODE:	2957	CODE:
2501	Mix_FadeInMusicPos (self, loops, ms, position);	2958	Mix_FadeInMusicPos (self, loops, ms, position);
2502		2959
2503	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2960	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2504		2961
2505	PROTOTYPES: ENABLE	2962	PROTOTYPES: ENABLE
2506		2963
2507	BOOT:	2964	BOOT:
2508	{	2965	{
2509	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2966	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2510	static const struct {	2967	static const struct {
2511	const char *name;	2968	const char *name;
2512	IV iv;	2969	IV iv;
2513	} *civ, const_iv[] = {	2970	} *civ, const_iv[] = {
2514	# define const_iv(name) { # name, (IV)name }	2971	# define const_iv(name) { # name, (IV)name }
2515	const_iv (GL_VENDOR),	2972	const_iv (GL_VENDOR),
2516	const_iv (GL_VERSION),	2973	const_iv (GL_VERSION),
2517	const_iv (GL_EXTENSIONS),	2974	const_iv (GL_EXTENSIONS),
		2975	const_iv (GL_MAX_TEXTURE_UNITS),
2518	const_iv (GL_COLOR_MATERIAL),	2976	const_iv (GL_COLOR_MATERIAL),
2519	const_iv (GL_SMOOTH),	2977	const_iv (GL_SMOOTH),
2520	const_iv (GL_FLAT),	2978	const_iv (GL_FLAT),
2521	const_iv (GL_DITHER),	2979	const_iv (GL_DITHER),
2522	const_iv (GL_BLEND),	2980	const_iv (GL_BLEND),
…		…
2534	const_iv (GL_ZERO),	2992	const_iv (GL_ZERO),
2535	const_iv (GL_SRC_ALPHA),	2993	const_iv (GL_SRC_ALPHA),
2536	const_iv (GL_DST_ALPHA),	2994	const_iv (GL_DST_ALPHA),
2537	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2995	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2538	const_iv (GL_ONE_MINUS_DST_ALPHA),	2996	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2997	const_iv (GL_SRC_COLOR),
		2998	const_iv (GL_DST_COLOR),
		2999	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3000	const_iv (GL_ONE_MINUS_DST_COLOR),
2539	const_iv (GL_SRC_ALPHA_SATURATE),	3001	const_iv (GL_SRC_ALPHA_SATURATE),
2540	const_iv (GL_RGB),	3002	const_iv (GL_RGB),
2541	const_iv (GL_RGBA),	3003	const_iv (GL_RGBA),
2542	const_iv (GL_RGBA4),	3004	const_iv (GL_RGBA4),
2543	const_iv (GL_RGBA8),	3005	const_iv (GL_RGBA8),
…		…
2549	const_iv (GL_INTENSITY),	3011	const_iv (GL_INTENSITY),
2550	const_iv (GL_LUMINANCE),	3012	const_iv (GL_LUMINANCE),
2551	const_iv (GL_LUMINANCE_ALPHA),	3013	const_iv (GL_LUMINANCE_ALPHA),
2552	const_iv (GL_FLOAT),	3014	const_iv (GL_FLOAT),
2553	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	3015	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		3016	const_iv (GL_COMPRESSED_ALPHA_ARB),
		3017	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		3018	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		3019	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		3020	const_iv (GL_COMPRESSED_RGB_ARB),
		3021	const_iv (GL_COMPRESSED_RGBA_ARB),
2554	const_iv (GL_COMPILE),	3022	const_iv (GL_COMPILE),
2555	const_iv (GL_PROXY_TEXTURE_1D),	3023	const_iv (GL_PROXY_TEXTURE_1D),
2556	const_iv (GL_PROXY_TEXTURE_2D),	3024	const_iv (GL_PROXY_TEXTURE_2D),
2557	const_iv (GL_TEXTURE_1D),	3025	const_iv (GL_TEXTURE_1D),
2558	const_iv (GL_TEXTURE_2D),	3026	const_iv (GL_TEXTURE_2D),
…		…
2597	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	3065	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2598	const_iv (GL_POINT_SMOOTH_HINT),	3066	const_iv (GL_POINT_SMOOTH_HINT),
2599	const_iv (GL_LINE_SMOOTH_HINT),	3067	const_iv (GL_LINE_SMOOTH_HINT),
2600	const_iv (GL_POLYGON_SMOOTH_HINT),	3068	const_iv (GL_POLYGON_SMOOTH_HINT),
2601	const_iv (GL_GENERATE_MIPMAP_HINT),	3069	const_iv (GL_GENERATE_MIPMAP_HINT),
		3070	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2602	const_iv (GL_FASTEST),	3071	const_iv (GL_FASTEST),
2603	const_iv (GL_DONT_CARE),	3072	const_iv (GL_DONT_CARE),
2604	const_iv (GL_NICEST),	3073	const_iv (GL_NICEST),
2605	const_iv (GL_V2F),	3074	const_iv (GL_V2F),
2606	const_iv (GL_V3F),	3075	const_iv (GL_V3F),
2607	const_iv (GL_T2F_V3F),	3076	const_iv (GL_T2F_V3F),
2608	const_iv (GL_T2F_N3F_V3F),	3077	const_iv (GL_T2F_N3F_V3F),
		3078	const_iv (GL_FUNC_ADD),
		3079	const_iv (GL_FUNC_SUBTRACT),
		3080	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2609	# undef const_iv	3081	# undef const_iv
2610	};	3082	};
2611		3083
2612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3084	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3085	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
2614		3086
2615	texture_av = newAV ();	3087	texture_av = newAV ();
2616	AvREAL_off (texture_av);	3088	AvREAL_off (texture_av);
2617	}	3089	}
2618		3090
		3091	void
		3092	disable_GL_EXT_blend_func_separate ()
		3093	CODE:
		3094	gl.BlendFuncSeparate = 0;
		3095	gl.BlendFuncSeparateEXT = 0;
		3096
		3097	void
		3098	apple_nvidia_bug (int enable)
		3099
2619	char *	3100	char *
2620	gl_vendor ()	3101	gl_vendor ()
2621	CODE:	3102	CODE:
2622	RETVAL = (char *)glGetString (GL_VENDOR);	3103	RETVAL = (char *)glGetString (GL_VENDOR);
2623	OUTPUT:	3104	OUTPUT:
…		…
2672		3153
2673	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3154	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2674	CODE:	3155	CODE:
2675	gl_BlendFuncSeparate (sa, da, saa, daa);	3156	gl_BlendFuncSeparate (sa, da, saa, daa);
2676		3157
		3158	# void glBlendEquation (int se)
		3159
2677	void glDepthMask (int flag)	3160	void glDepthMask (int flag)
2678		3161
2679	void glLogicOp (int opcode)	3162	void glLogicOp (int opcode)
2680		3163
2681	void glColorMask (int red, int green, int blue, int alpha)	3164	void glColorMask (int red, int green, int blue, int alpha)
…		…
2715	void glRotate (float angle, float x, float y, float z)	3198	void glRotate (float angle, float x, float y, float z)
2716	CODE:	3199	CODE:
2717	glRotatef (angle, x, y, z);	3200	glRotatef (angle, x, y, z);
2718		3201
2719	void glColor (float r, float g, float b, float a = 1.0)	3202	void glColor (float r, float g, float b, float a = 1.0)
		3203	PROTOTYPE: @
2720	ALIAS:	3204	ALIAS:
2721	glColor_premultiply = 1	3205	glColor_premultiply = 1
2722	CODE:	3206	CODE:
2723	if (ix)	3207	if (ix)
2724	{	3208	{
…		…
2744		3228
2745	void glRect (float x1, float y1, float x2, float y2)	3229	void glRect (float x1, float y1, float x2, float y2)
2746	CODE:	3230	CODE:
2747	glRectf (x1, y1, x2, y2);	3231	glRectf (x1, y1, x2, y2);
2748		3232
		3233	void glRect_lineloop (float x1, float y1, float x2, float y2)
		3234	CODE:
		3235	glBegin (GL_LINE_LOOP);
		3236	glVertex2f (x1, y1);
		3237	glVertex2f (x2, y1);
		3238	glVertex2f (x2, y2);
		3239	glVertex2f (x1, y2);
		3240	glEnd ();
		3241
2749	PROTOTYPES: ENABLE	3242	PROTOTYPES: ENABLE
2750		3243
2751	void glBegin (int mode)	3244	void glBegin (int mode)
2752		3245
2753	void glEnd ()	3246	void glEnd ()
…		…
2785	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3278	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2786	CODE:	3279	CODE:
2787	if (gl.SeparableFilter2D)	3280	if (gl.SeparableFilter2D)
2788	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3281	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2789		3282
2790	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3283	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2791		3284
2792	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3285	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2793		3286
2794	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3287	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2795		3288
…		…
2821		3314
2822	void glEndList ()	3315	void glEndList ()
2823		3316
2824	void glCallList (int list)	3317	void glCallList (int list)
2825		3318
2826	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3319	void c_init ()
		3320	CODE:
		3321	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3322	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3323
		3324	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2827		3325
2828	PROTOTYPES: DISABLE	3326	PROTOTYPES: DISABLE
2829		3327
2830	void	3328	void
2831	find_widget (SV *self, NV x, NV y)	3329	find_widget (SV *self, NV x, NV y)
…		…
2835	XPUSHs (self);	3333	XPUSHs (self);
2836	}	3334	}
2837		3335
2838	BOOT:	3336	BOOT:
2839	{	3337	{
2840	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3338	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2841		3339
2842	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3340	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2843	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3341	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2844	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3342	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2845	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3343	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2846	}	3344	}
2847		3345
2848	void	3346	void
2849	draw (SV *self)	3347	draw (SV *self)
2850	CODE:	3348	CODE:
…		…
2854	NV x, y, w, h;	3352	NV x, y, w, h;
2855	SV *draw_x_sv = GvSV (draw_x_gv);	3353	SV *draw_x_sv = GvSV (draw_x_gv);
2856	SV *draw_y_sv = GvSV (draw_y_gv);	3354	SV *draw_y_sv = GvSV (draw_y_gv);
2857	SV *draw_w_sv = GvSV (draw_w_gv);	3355	SV *draw_w_sv = GvSV (draw_w_gv);
2858	SV *draw_h_sv = GvSV (draw_h_gv);	3356	SV *draw_h_sv = GvSV (draw_h_gv);
2859	SV *hover;
2860	double draw_x, draw_y, draw_w, draw_h;	3357	double draw_x, draw_y;
2861		3358
2862	if (!SvROK (self))	3359	if (!SvROK (self))
2863	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3360	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2864		3361
2865	hv = (HV *)SvRV (self);	3362	hv = (HV *)SvRV (self);
2866		3363
2867	if (SvTYPE (hv) != SVt_PVHV)	3364	if (SvTYPE (hv) != SVt_PVHV)
2868	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3365	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2869		3366
2870	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3367	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2871	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3368	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2872		3369
2873	if (!h || !w)	3370	if (!h || !w)
…		…
2893	{	3390	{
2894	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	3391	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2895		3392
2896	if (svp && SvTRUE (*svp))	3393	if (svp && SvTRUE (*svp))
2897	{	3394	{
2898	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);	3395	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2899	glEnable (GL_BLEND);	3396	glEnable (GL_BLEND);
2900	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	3397	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2901	glBegin (GL_QUADS);	3398	glBegin (GL_QUADS);
2902	glVertex2f (0, 0);	3399	glVertex2f (0, 0);
2903	glVertex2f (w, 0);	3400	glVertex2f (w, 0);
…		…
2906	glEnd ();	3403	glEnd ();
2907	glDisable (GL_BLEND);	3404	glDisable (GL_BLEND);
2908	}	3405	}
2909	}	3406	}
2910	#if 0	3407	#if 0
2911	if ($ENV{CFPLUS_DEBUG} & 1) {	3408	// draw borders, for debugging
2912	glPushMatrix;	3409	glPushMatrix ();
2913	glColor 1, 1, 0, 1;	3410	glColor4f (1., 1., 0., 1.);
2914	glTranslate 0.375, 0.375;	3411	glTranslatef (.5, .5, 0.);
2915	glBegin GL_LINE_LOOP;	3412	glBegin (GL_LINE_LOOP);
2916	glVertex 0 , 0;	3413	glVertex2f (0 , 0);
2917	glVertex $self->{w} - 1, 0;	3414	glVertex2f (w - 1, 0);
2918	glVertex $self->{w} - 1, $self->{h} - 1;	3415	glVertex2f (w - 1, h - 1);
2919	glVertex 0 , $self->{h} - 1;	3416	glVertex2f (0 , h - 1);
2920	glEnd;	3417	glEnd ();
2921	glPopMatrix;	3418	glPopMatrix ();
2922	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2923	}
2924	#endif	3419	#endif
2925	PUSHMARK (SP);	3420	PUSHMARK (SP);
2926	XPUSHs (self);	3421	XPUSHs (self);
2927	PUTBACK;	3422	PUTBACK;
2928	call_method ("_draw", G_VOID | G_DISCARD);	3423	call_method ("_draw", G_VOID | G_DISCARD);

Diff Legend

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