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.240 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.298 by root, Tue Dec 22 00:46:05 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);
…		…
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 {
…		…
498	return 0;	537	return 0;
499		538
500	return 1;	539	return 1;
501	}	540	}
502		541
503	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
504		595
505	PROTOTYPES: ENABLE	596	PROTOTYPES: ENABLE
506		597
507	BOOT:	598	BOOT:
508	{	599	{
509	HV *stash = gv_stashpv ("CFPlus", 1);	600	HV *stash = gv_stashpv ("DC", 1);
510	static const struct {	601	static const struct {
511	const char *name;	602	const char *name;
512	IV iv;	603	IV iv;
513	} *civ, const_iv[] = {	604	} *civ, const_iv[] = {
514	# define const_iv(name) { # name, (IV)name }	605	# define const_iv(name) { # name, (IV)name }
…		…
535	const_iv (SDL_USEREVENT),	626	const_iv (SDL_USEREVENT),
536		627
537	const_iv (SDL_APPINPUTFOCUS),	628	const_iv (SDL_APPINPUTFOCUS),
538	const_iv (SDL_APPMOUSEFOCUS),	629	const_iv (SDL_APPMOUSEFOCUS),
539	const_iv (SDL_APPACTIVE),	630	const_iv (SDL_APPACTIVE),
		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),
540		681
541	const_iv (SDLK_FIRST),	682	const_iv (SDLK_FIRST),
542	const_iv (SDLK_LAST),	683	const_iv (SDLK_LAST),
543	const_iv (SDLK_KP0),	684	const_iv (SDLK_KP0),
544	const_iv (SDLK_KP1),	685	const_iv (SDLK_KP1),
…		…
620	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
621	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
622	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
623	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
624		765
		766	const_iv (KMOD_LRAM),
		767
625	const_iv (MIX_DEFAULT_FORMAT),	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)
626	# undef const_iv	798	# undef const_iv
627	};	799	};
628		800
629	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; )
630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
652		824
653	IV minpot (UV n)	825	IV minpot (UV n)
654		826
655	IV popcount (UV n)	827	IV popcount (UV n)
656		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
657	void	835	void
658	pango_init ()	836	pango_init ()
659	CODE:	837	CODE:
660	{	838	{
661	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
662	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);
663	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
664	}	847	}
665		848
666	char *
667	SDL_GetError ()	849	char *SDL_GetError ()
668		850
669	int	851	void SDL_braino ()
670	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671		852
672	void	853	int SDL_Init (U32 flags)
		854
		855	int SDL_InitSubSystem (U32 flags)
		856
		857	void SDL_QuitSubSystem (U32 flags)
		858
673	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
674		869
675	void	870	void
676	SDL_ListModes (int rgb, int alpha)	871	SDL_ListModes (int rgb, int alpha)
677	PPCODE:	872	PPCODE:
678	{	873	{
…		…
690	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	885	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	886	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	887	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693		888
694	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	889	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695	#if SDL_VERSION_ATLEAST(1,2,10)
696	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	890	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698	#endif
699		891
700	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	892	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701		893
702	if (m && m != (SDL_Rect **)-1)	894	if (m && m != (SDL_Rect **)-1)
703	while (*m)	895	while (*m)
704	{	896	{
705	if ((*m)->w >= 800 && (*m)->h >= 600)	897	if ((*m)->w >= 400 && (*m)->h >= 300)
706	{	898	{
707	AV *av = newAV ();	899	AV *av = newAV ();
708	av_push (av, newSViv ((*m)->w));	900	av_push (av, newSViv ((*m)->w));
709	av_push (av, newSViv ((*m)->h));	901	av_push (av, newSViv ((*m)->h));
710	av_push (av, newSViv (rgb));	902	av_push (av, newSViv (rgb));
…		…
752	SDL_GetKeyName (int sym)	944	SDL_GetKeyName (int sym)
753		945
754	int	946	int
755	SDL_GetAppState ()	947	SDL_GetAppState ()
756		948
		949	int
		950	SDL_GetModState ()
		951
757	void	952	void
758	poll_events ()	953	poll_events ()
759	PPCODE:	954	PPCODE:
760	{	955	{
761	SDL_Event ev;	956	SDL_Event ev;
…		…
770	{	965	{
771	case SDL_KEYDOWN:	966	case SDL_KEYDOWN:
772	case SDL_KEYUP:	967	case SDL_KEYUP:
773	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	968	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	969	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	970	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
776	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	971	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
777	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	972	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778	break;	973	break;
779		974
780	case SDL_ACTIVEEVENT:	975	case SDL_ACTIVEEVENT:
781	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	976	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
799	x = ev.motion.x;	994	x = ev.motion.x;
800	y = ev.motion.y;	995	y = ev.motion.y;
801	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	996	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802	}	997	}
803		998
804	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	999	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
805	hv_store (hv, "state", 5, newSViv (state), 0);	1000	hv_store (hv, "state", 5, newSViv (state), 0);
806	hv_store (hv, "x", 1, newSViv (x), 0);	1001	hv_store (hv, "x", 1, newSViv (x), 0);
807	hv_store (hv, "y", 1, newSViv (y), 0);	1002	hv_store (hv, "y", 1, newSViv (y), 0);
808	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1003	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1004	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810	}	1005	}
811	break;	1006	break;
812		1007
813	case SDL_MOUSEBUTTONDOWN:	1008	case SDL_MOUSEBUTTONDOWN:
814	case SDL_MOUSEBUTTONUP:	1009	case SDL_MOUSEBUTTONUP:
815	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	1010	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816		1011
817	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	1012	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	1013	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	1014	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	1015	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	1020	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	1021	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
827	break;	1022	break;
828	}	1023	}
829		1024
830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	1025	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
831	}	1026	}
832	}	1027	}
833		1028
834	int	1029	int
835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1030	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
…		…
894	}	1089	}
895	}	1090	}
896	#endif	1091	#endif
897	}	1092	}
898		1093
899	void	1094	int
900	add_font (char *file)	1095	add_font (char *file)
901	CODE:	1096	CODE:
902	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1097	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1098	OUTPUT:
		1099	RETVAL
903		1100
904	void	1101	void
905	load_image_inline (SV *image_)	1102	load_image_inline (SV *image_)
906	ALIAS:	1103	ALIAS:
907	load_image_file = 1	1104	load_image_file = 1
…		…
1023	#if DEBUG	1220	#if DEBUG
1024	VALGRIND_DO_LEAK_CHECK;	1221	VALGRIND_DO_LEAK_CHECK;
1025	#endif	1222	#endif
1026	}	1223	}
1027		1224
1028	MODULE = CFPlus PACKAGE = CFPlus::Font	1225	int
		1226	SvREFCNT (SV *sv)
		1227	CODE:
		1228	RETVAL = SvREFCNT (sv);
		1229	OUTPUT:
		1230	RETVAL
		1231
		1232	MODULE = Deliantra::Client PACKAGE = DC::Font
1029		1233
1030	PROTOTYPES: DISABLE	1234	PROTOTYPES: DISABLE
1031		1235
1032	CFPlus::Font	1236	DC::Font
1033	new_from_file (SV *class, char *path, int id = 0)	1237	new_from_file (SV *class, char *path, int id = 0)
1034	CODE:	1238	CODE:
1035	{	1239	{
1036	int count;	1240	int count;
1037	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1241	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
1040	}	1244	}
1041	OUTPUT:	1245	OUTPUT:
1042	RETVAL	1246	RETVAL
1043		1247
1044	void	1248	void
1045	DESTROY (CFPlus::Font self)	1249	DESTROY (DC::Font self)
1046	CODE:	1250	CODE:
1047	pango_font_description_free (self);	1251	pango_font_description_free (self);
1048		1252
1049	void	1253	void
1050	make_default (CFPlus::Font self)	1254	make_default (DC::Font self)
1051	PROTOTYPE: $	1255	PROTOTYPE: $
1052	CODE:	1256	CODE:
1053	default_font = self;	1257	default_font = self;
1054		1258
1055	MODULE = CFPlus PACKAGE = CFPlus::Layout	1259	MODULE = Deliantra::Client PACKAGE = DC::Layout
1056		1260
1057	PROTOTYPES: DISABLE	1261	PROTOTYPES: DISABLE
1058		1262
1059	void	1263	void
1060	glyph_cache_backup ()	1264	glyph_cache_backup ()
…		…
1066	glyph_cache_restore ()	1270	glyph_cache_restore ()
1067	PROTOTYPE:	1271	PROTOTYPE:
1068	CODE:	1272	CODE:
1069	tc_restore ();	1273	tc_restore ();
1070		1274
1071	CFPlus::Layout	1275	DC::Layout
1072	new (SV *class)	1276	new (SV *class)
1073	CODE:	1277	CODE:
1074	New (0, RETVAL, 1, struct cf_layout);	1278	New (0, RETVAL, 1, struct cf_layout);
1075		1279
1076	RETVAL->pl = pango_layout_new (opengl_context);	1280	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1086	layout_update_font (RETVAL);	1290	layout_update_font (RETVAL);
1087	OUTPUT:	1291	OUTPUT:
1088	RETVAL	1292	RETVAL
1089		1293
1090	void	1294	void
1091	DESTROY (CFPlus::Layout self)	1295	DESTROY (DC::Layout self)
1092	CODE:	1296	CODE:
1093	g_object_unref (self->pl);	1297	g_object_unref (self->pl);
1094	rc_free (self->rc);	1298	rc_free (self->rc);
1095	Safefree (self);	1299	Safefree (self);
1096		1300
1097	void	1301	void
1098	set_text (CFPlus::Layout self, SV *text_)	1302	set_text (DC::Layout self, SV *text_)
1099	CODE:	1303	CODE:
1100	{	1304	{
1101	STRLEN textlen;	1305	STRLEN textlen;
1102	char *text = SvPVutf8 (text_, textlen);	1306	char *text = SvPVutf8 (text_, textlen);
1103		1307
1104	pango_layout_set_text (self->pl, text, textlen);	1308	pango_layout_set_text (self->pl, text, textlen);
1105	}	1309	}
1106		1310
1107	void	1311	void
1108	set_markup (CFPlus::Layout self, SV *text_)	1312	set_markup (DC::Layout self, SV *text_)
1109	CODE:	1313	CODE:
1110	{	1314	{
1111	STRLEN textlen;	1315	STRLEN textlen;
1112	char *text = SvPVutf8 (text_, textlen);	1316	char *text = SvPVutf8 (text_, textlen);
1113		1317
1114	pango_layout_set_markup (self->pl, text, textlen);	1318	pango_layout_set_markup (self->pl, text, textlen);
1115	}	1319	}
1116		1320
1117	void	1321	void
1118	set_shapes (CFPlus::Layout self, ...)	1322	set_shapes (DC::Layout self, ...)
1119	CODE:	1323	CODE:
1120	{	1324	{
1121	PangoAttrList *attrs = 0;	1325	PangoAttrList *attrs = 0;
1122	const char *text = pango_layout_get_text (self->pl);	1326	const char *text = pango_layout_get_text (self->pl);
1123	const char *pos = text;	1327	const char *pos = text;
…		…
1158	if (attrs)	1362	if (attrs)
1159	pango_layout_set_attributes (self->pl, attrs);	1363	pango_layout_set_attributes (self->pl, attrs);
1160	}	1364	}
1161		1365
1162	void	1366	void
1163	get_shapes (CFPlus::Layout self)	1367	get_shapes (DC::Layout self)
1164	PPCODE:	1368	PPCODE:
1165	{	1369	{
1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1370	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167		1371
1168	do	1372	do
1169	{	1373	{
1170	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1374	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171		1375
1172	if (run && shape_attr_p (run))	1376	if (run && shape_attr_p (run))
1173	{	1377	{
1174	PangoRectangle extents;	1378	PangoRectangle extents;
1175	pango_layout_iter_get_run_extents (iter, 0, &extents);	1379	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1183		1387
1184	pango_layout_iter_free (iter);	1388	pango_layout_iter_free (iter);
1185	}	1389	}
1186		1390
1187	int	1391	int
1188	has_wrapped (CFPlus::Layout self)	1392	has_wrapped (DC::Layout self)
1189	CODE:	1393	CODE:
1190	{	1394	{
1191	int lines = 1;	1395	int lines = 1;
1192	const char *text = pango_layout_get_text (self->pl);	1396	const char *text = pango_layout_get_text (self->pl);
1193		1397
…		…
1198	}	1402	}
1199	OUTPUT:	1403	OUTPUT:
1200	RETVAL	1404	RETVAL
1201		1405
1202	SV *	1406	SV *
1203	get_text (CFPlus::Layout self)	1407	get_text (DC::Layout self)
1204	CODE:	1408	CODE:
1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1409	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1206	sv_utf8_decode (RETVAL);	1410	sv_utf8_decode (RETVAL);
1207	OUTPUT:	1411	OUTPUT:
1208	RETVAL	1412	RETVAL
1209		1413
1210	void	1414	void
1211	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1415	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1212	CODE:	1416	CODE:
1213	self->r = r;	1417	self->r = r;
1214	self->g = g;	1418	self->g = g;
1215	self->b = b;	1419	self->b = b;
1216	self->a = a;	1420	self->a = a;
1217		1421
1218	void	1422	void
1219	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1423	set_font (DC::Layout self, DC::Font font = 0)
1220	CODE:	1424	CODE:
1221	if (self->font != font)	1425	if (self->font != font)
1222	{	1426	{
1223	self->font = font;	1427	self->font = font;
1224	layout_update_font (self);	1428	layout_update_font (self);
1225	}	1429	}
1226		1430
1227	void	1431	void
1228	set_height (CFPlus::Layout self, int base_height)	1432	set_height (DC::Layout self, int base_height)
1229	CODE:	1433	CODE:
1230	if (self->base_height != base_height)	1434	if (self->base_height != base_height)
1231	{	1435	{
1232	self->base_height = base_height;	1436	self->base_height = base_height;
1233	layout_update_font (self);	1437	layout_update_font (self);
1234	}	1438	}
1235		1439
1236	void	1440	void
1237	set_width (CFPlus::Layout self, int max_width = -1)	1441	set_width (DC::Layout self, int max_width = -1)
1238	CODE:	1442	CODE:
1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1443	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1240		1444
1241	void	1445	void
1242	set_indent (CFPlus::Layout self, int indent)	1446	set_indent (DC::Layout self, int indent)
1243	CODE:	1447	CODE:
1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1448	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1245		1449
1246	void	1450	void
1247	set_spacing (CFPlus::Layout self, int spacing)	1451	set_spacing (DC::Layout self, int spacing)
1248	CODE:	1452	CODE:
1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1453	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1250		1454
1251	void	1455	void
1252	set_ellipsise (CFPlus::Layout self, int ellipsise)	1456	set_ellipsise (DC::Layout self, int ellipsise)
1253	CODE:	1457	CODE:
1254	pango_layout_set_ellipsize (self->pl,	1458	pango_layout_set_ellipsize (self->pl,
1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1459	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1460	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1461	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1258	: PANGO_ELLIPSIZE_NONE	1462	: PANGO_ELLIPSIZE_NONE
1259	);	1463	);
1260		1464
1261	void	1465	void
1262	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1466	set_single_paragraph_mode (DC::Layout self, int spm)
1263	CODE:	1467	CODE:
1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1468	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1265		1469
1266	void	1470	void
1267	size (CFPlus::Layout self)	1471	size (DC::Layout self)
1268	PPCODE:	1472	PPCODE:
1269	{	1473	{
1270	int w, h;	1474	int w, h;
1271		1475
1272	layout_get_pixel_size (self, &w, &h);	1476	layout_get_pixel_size (self, &w, &h);
…		…
1275	PUSHs (sv_2mortal (newSViv (w)));	1479	PUSHs (sv_2mortal (newSViv (w)));
1276	PUSHs (sv_2mortal (newSViv (h)));	1480	PUSHs (sv_2mortal (newSViv (h)));
1277	}	1481	}
1278		1482
1279	int	1483	int
1280	descent (CFPlus::Layout self)	1484	descent (DC::Layout self)
1281	CODE:	1485	CODE:
1282	{	1486	{
1283	PangoRectangle rect;	1487	PangoRectangle rect;
1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1488	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285	pango_layout_line_get_pixel_extents (line, 0, &rect);	1489	pango_layout_line_get_pixel_extents (line, 0, &rect);
1286	RETVAL = PANGO_DESCENT (rect);	1490	RETVAL = PANGO_DESCENT (rect);
1287	}	1491	}
1288	OUTPUT:	1492	OUTPUT:
1289	RETVAL	1493	RETVAL
1290		1494
1291	int	1495	int
1292	xy_to_index (CFPlus::Layout self, int x, int y)	1496	xy_to_index (DC::Layout self, int x, int y)
1293	CODE:	1497	CODE:
1294	{	1498	{
1295	int index, trailing;	1499	int index, trailing;
1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1500	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1297	RETVAL = index + trailing;	1501	RETVAL = index + trailing;
1298	}	1502	}
1299	OUTPUT:	1503	OUTPUT:
1300	RETVAL	1504	RETVAL
1301		1505
1302	void	1506	void
1303	cursor_pos (CFPlus::Layout self, int index)	1507	cursor_pos (DC::Layout self, int index)
1304	PPCODE:	1508	PPCODE:
1305	{	1509	{
1306	PangoRectangle strong_pos;	1510	PangoRectangle pos;
1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1511	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308		1512
1309	EXTEND (SP, 3);	1513	EXTEND (SP, 3);
1310	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1514	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1515	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1516	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313	}	1517	}
1314		1518
1315	void	1519	void
1316	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1520	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317	PPCODE:	1521	PPCODE:
1318	{	1522	{
1319	int line, x;	1523	int line, x;
1320		1524
1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1525	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1526	#if !PANGO_VERSION_CHECK (1, 17, 3)
1322	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1527	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323		1528	--line;
		1529	#endif
1324	EXTEND (SP, 2);	1530	EXTEND (SP, 2);
1325	PUSHs (sv_2mortal (newSViv (line - 1)));	1531	PUSHs (sv_2mortal (newSViv (line)));
1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1532	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327	}	1533	}
1328		1534
1329	void	1535	void
1330	line_x_to_index (CFPlus::Layout self, int line, int x)	1536	line_x_to_index (DC::Layout self, int line, int x)
1331	PPCODE:	1537	PPCODE:
1332	{	1538	{
1333	PangoLayoutLine *lp;	1539	PangoLayoutLine *lp;
1334	int index, trailing;	1540	int index, trailing;
1335		1541
1336	if (line < 0)	1542	if (line < 0)
1337	XSRETURN_EMPTY;	1543	XSRETURN_EMPTY;
1338		1544
1339	if (!(lp = pango_layout_get_line (self->pl, line)))	1545	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340	XSRETURN_EMPTY; /* do better */	1546	XSRETURN_EMPTY; /* do better */
1341		1547
1342	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1548	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343		1549
1344	EXTEND (SP, 2);	1550	EXTEND (SP, 2);
…		…
1350	PUSHs (sv_2mortal (newSViv (trailing)));	1556	PUSHs (sv_2mortal (newSViv (trailing)));
1351	}	1557	}
1352	}	1558	}
1353		1559
1354	void	1560	void
1355	render (CFPlus::Layout self, float x, float y, int flags = 0)	1561	render (DC::Layout self, float x, float y, int flags = 0)
1356	CODE:	1562	CODE:
1357	rc_clear (self->rc);	1563	rc_clear (self->rc);
1358	pango_opengl_render_layout_subpixel (	1564	pango_opengl_render_layout_subpixel (
1359	self->pl,	1565	self->pl,
1360	self->rc,	1566	self->rc,
…		…
1365	// we assume that context_change actually clears/frees stuff	1571	// we assume that context_change actually clears/frees stuff
1366	// and does not do any recomputation...	1572	// and does not do any recomputation...
1367	pango_layout_context_changed (self->pl);	1573	pango_layout_context_changed (self->pl);
1368		1574
1369	void	1575	void
1370	draw (CFPlus::Layout self)	1576	draw (DC::Layout self)
1371	CODE:	1577	CODE:
1372	{	1578	{
1373	glEnable (GL_TEXTURE_2D);	1579	glEnable (GL_TEXTURE_2D);
1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	1580	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1375	glEnable (GL_BLEND);	1581	glEnable (GL_BLEND);
…		…
1383	glDisable (GL_ALPHA_TEST);	1589	glDisable (GL_ALPHA_TEST);
1384	glDisable (GL_BLEND);	1590	glDisable (GL_BLEND);
1385	glDisable (GL_TEXTURE_2D);	1591	glDisable (GL_TEXTURE_2D);
1386	}	1592	}
1387		1593
1388	MODULE = CFPlus PACKAGE = CFPlus::Texture	1594	MODULE = Deliantra::Client PACKAGE = DC::Texture
1389		1595
1390	PROTOTYPES: ENABLE	1596	PROTOTYPES: ENABLE
1391		1597
1392	void	1598	void
1393	pad (SV *data_, int ow, int oh, int nw, int nh)	1599	pad (SV *data_, int ow, int oh, int nw, int nh)
…		…
1461	glDisable (GL_ALPHA_TEST);	1667	glDisable (GL_ALPHA_TEST);
1462	glDisable (GL_BLEND);	1668	glDisable (GL_BLEND);
1463	}	1669	}
1464	}	1670	}
1465		1671
		1672	void
		1673	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)
		1674	PROTOTYPE: @
		1675	CODE:
		1676	{
		1677	glEnable (GL_TEXTURE_2D);
		1678	glEnable (GL_BLEND);
		1679	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1680	glBindTexture (GL_TEXTURE_2D, name1);
		1681
		1682	glColor3f (intensity, intensity, intensity);
		1683	glPushMatrix ();
		1684	glScalef (1./3, 1./3, 1.);
		1685
		1686	if (blend > 0.f)
		1687	{
		1688	float dx3 = dx * -3.f / w;
		1689	float dy3 = dy * -3.f / h;
		1690	GLfloat env_color[4] = { 0., 0., 0., blend };
		1691
		1692	/* interpolate the two shadow textures */
		1693	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1694	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1695
		1696	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1697	gl.ActiveTexture (GL_TEXTURE1);
		1698	glEnable (GL_TEXTURE_2D);
		1699	glBindTexture (GL_TEXTURE_2D, name2);
		1700	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1701
		1702	/* rgb == rgb(glcolor) */
		1703	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1704	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);
		1705	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1706
		1707	/* alpha = interpolate t0, t1 by env_alpha */
		1708	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1709
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1711	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1712	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1713
		1714	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1715	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1716
		1717	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1718	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1719
		1720	glBegin (GL_QUADS);
		1721	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1722	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1723	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1724	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1725	glEnd ();
		1726
		1727	glDisable (GL_TEXTURE_2D);
		1728	gl.ActiveTexture (GL_TEXTURE0);
		1729	}
		1730	else
		1731	{
		1732	/* simple blending of one texture, also opengl <1.3 path */
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1734
		1735	glBegin (GL_QUADS);
		1736	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1737	glTexCoord2f (0, t); glVertex2f (0, h);
		1738	glTexCoord2f (s, t); glVertex2f (w, h);
		1739	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1740	glEnd ();
		1741	}
		1742
		1743	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1744	{
		1745	int x, y;
		1746	int dx3 = dx * 3;
		1747	int dy3 = dy * 3;
		1748
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1750	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1751	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1752	glTranslatef (-1., -1., 0);
		1753	glBegin (GL_QUADS);
		1754
		1755	for (y = 1; y < h; y += 3)
		1756	{
		1757	int y1 = y - dy3;
		1758	int y1valid = y1 >= 0 && y1 < h;
		1759
		1760	for (x = 1; x < w; x += 3)
		1761	{
		1762	int x1 = x - dx3;
		1763	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1764	uint8_t h2;
		1765
		1766	if (y1valid && x1 >= 0 && x1 < w)
		1767	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1768	else
		1769	h2 = 1; /* out of range == invisible */
		1770
		1771	if (h1 || h2)
		1772	{
		1773	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1774	glColor4f (1., 1., 1., alpha);
		1775
		1776	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1777	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1778	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1779	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1780	}
		1781	}
		1782	}
		1783	}
		1784
		1785	glEnd ();
		1786
		1787	glPopMatrix ();
		1788
		1789	glDisable (GL_TEXTURE_2D);
		1790	glDisable (GL_BLEND);
		1791	}
		1792
1466	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1793	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1467	CODE:	1794	CODE:
1468	{	1795	{
1469	GLint width;	1796	GLint width;
1470	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);	1797	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
…		…
1472	RETVAL = width > 0;	1799	RETVAL = width > 0;
1473	}	1800	}
1474	OUTPUT:	1801	OUTPUT:
1475	RETVAL	1802	RETVAL
1476		1803
1477	MODULE = CFPlus PACKAGE = CFPlus::Map	1804	MODULE = Deliantra::Client PACKAGE = DC::Map
1478		1805
1479	PROTOTYPES: DISABLE	1806	PROTOTYPES: DISABLE
1480		1807
1481	CFPlus::Map	1808	DC::Map
1482	new (SV *class)	1809	new (SV *class)
1483	CODE:	1810	CODE:
1484	New (0, RETVAL, 1, struct map);	1811	New (0, RETVAL, 1, struct map);
1485	RETVAL->x = 0;	1812	RETVAL->x = 0;
1486	RETVAL->y = 0;	1813	RETVAL->y = 0;
…		…
1494	RETVAL->row = 0;	1821	RETVAL->row = 0;
1495	OUTPUT:	1822	OUTPUT:
1496	RETVAL	1823	RETVAL
1497		1824
1498	void	1825	void
1499	DESTROY (CFPlus::Map self)	1826	DESTROY (DC::Map self)
1500	CODE:	1827	CODE:
1501	{	1828	{
1502	map_clear (self);	1829	map_clear (self);
1503	Safefree (self->face2tile);	1830	Safefree (self->face2tile);
1504	Safefree (self->tex);	1831	Safefree (self->tex);
1505	Safefree (self);	1832	Safefree (self);
1506	}	1833	}
1507		1834
1508	void	1835	void
1509	resize (CFPlus::Map self, int map_width, int map_height)	1836	resize (DC::Map self, int map_width, int map_height)
1510	CODE:	1837	CODE:
1511	self->w = map_width;	1838	self->w = map_width;
1512	self->h = map_height;	1839	self->h = map_height;
1513		1840
1514	void	1841	void
1515	clear (CFPlus::Map self)	1842	clear (DC::Map self)
1516	CODE:	1843	CODE:
1517	map_clear (self);	1844	map_clear (self);
1518		1845
1519	void	1846	void
1520	set_tileid (CFPlus::Map self, int face, int tile)	1847	set_tileid (DC::Map self, int face, int tile)
1521	CODE:	1848	CODE:
1522	{	1849	{
1523	need_facenum (self, face); self->face2tile [face] = tile;	1850	need_facenum (self, face); self->face2tile [face] = tile;
1524	need_texid (self, tile);	1851	need_texid (self, tile);
1525	}	1852	}
1526		1853
1527	void	1854	void
1528	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1855	set_smooth (DC::Map self, int face, int smooth, int level)
1529	CODE:	1856	CODE:
1530	{	1857	{
1531	tileid texid;	1858	tileid texid;
1532	maptex *tex;	1859	maptex *tex;
1533		1860
…		…
1546	tex->smoothtile = self->face2tile [smooth];	1873	tex->smoothtile = self->face2tile [smooth];
1547	tex->smoothlevel = level;	1874	tex->smoothlevel = level;
1548	}	1875	}
1549		1876
1550	void	1877	void
1551	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)	1878	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)
1552	CODE:	1879	CODE:
1553	{	1880	{
1554	need_texid (self, texid);	1881	need_texid (self, texid);
1555		1882
1556	{	1883	{
…		…
1575	// use uglier nearest interpolation because linear suffers	1902	// use uglier nearest interpolation because linear suffers
1576	// from transparent color bleeding and ugly wrapping effects.	1903	// from transparent color bleeding and ugly wrapping effects.
1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1904	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1578	}	1905	}
1579		1906
		1907	void
		1908	expire_textures (DC::Map self, int texid, int count)
		1909	PPCODE:
		1910	for (; texid < self->texs && count; ++texid, --count)
		1911	{
		1912	maptex *tex = self->tex + texid;
		1913
		1914	if (tex->name)
		1915	{
		1916	if (tex->unused)
		1917	{
		1918	tex->name = 0;
		1919	tex->unused = 0;
		1920	XPUSHs (sv_2mortal (newSViv (texid)));
		1921	}
		1922	else
		1923	tex->unused = 1;
		1924	}
		1925	}
		1926
1580	int	1927	int
1581	ox (CFPlus::Map self)	1928	ox (DC::Map self)
1582	ALIAS:	1929	ALIAS:
1583	oy = 1	1930	oy = 1
1584	x = 2	1931	x = 2
1585	y = 3	1932	y = 3
1586	w = 4	1933	w = 4
…		…
1597	}	1944	}
1598	OUTPUT:	1945	OUTPUT:
1599	RETVAL	1946	RETVAL
1600		1947
1601	void	1948	void
1602	scroll (CFPlus::Map self, int dx, int dy)	1949	scroll (DC::Map self, int dx, int dy)
1603	CODE:	1950	CODE:
1604	{	1951	{
1605	if (dx > 0)	1952	if (dx > 0)
1606	map_blank (self, self->x, self->y, dx, self->h);	1953	map_blank (self, self->x, self->y, dx, self->h);
1607	else if (dx < 0)	1954	else if (dx < 0)
…		…
1623	self->y += MAP_EXTEND_Y;	1970	self->y += MAP_EXTEND_Y;
1624	}	1971	}
1625	}	1972	}
1626		1973
1627	SV *	1974	SV *
1628	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1975	map1a_update (DC::Map self, SV *data_, int extmap)
1629	CODE:	1976	CODE:
1630	{	1977	{
1631	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1978	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1632	uint8_t *data_end = (uint8_t *)SvEND (data_);	1979	uint8_t *data_end = (uint8_t *)SvEND (data_);
1633	mapcell *cell;	1980	mapcell *cell;
…		…
1661	uint8_t ext, cmd;	2008	uint8_t ext, cmd;
1662		2009
1663	do	2010	do
1664	{	2011	{
1665	ext = *data++;	2012	ext = *data++;
1666	cmd = ext & 0x3f;	2013	cmd = ext & 0x7f;
1667		2014
1668	if (cmd < 4)	2015	if (cmd < 4)
1669	cell->darkness = 255 - ext * 64 + 1;	2016	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1670	else if (cmd == 5) // health	2017	else if (cmd == 5) // health
1671	{	2018	{
1672	cell->stat_width = 1;	2019	cell->stat_width = 1;
1673	cell->stat_hp = *data++;	2020	cell->stat_hp = *data++;
1674	}	2021	}
1675	else if (cmd == 6) // monster width	2022	else if (cmd == 6) // monster width
1676	cell->stat_width = *data++ + 1;	2023	cell->stat_width = *data++ + 1;
1677	else if (cmd == 0x47)	2024	else if (cmd == 0x47)
1678	{	2025	{
1679	if (*data == 4)	2026	if (*data == 1) cell->player = data [1];
1680	; // decode player count	2027	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2028	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2029	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681		2030
1682	data += *data + 1;	2031	data += *data + 1;
1683	}	2032	}
1684	else if (cmd == 8) // cell flags	2033	else if (cmd == 8) // cell flags
1685	cell->flags = *data++;	2034	cell->flags = *data++;
…		…
1702	cell->tile [z] = self->face2tile [face];	2051	cell->tile [z] = self->face2tile [face];
1703		2052
1704	if (cell->tile [z])	2053	if (cell->tile [z])
1705	{	2054	{
1706	maptex *tex = self->tex + cell->tile [z];	2055	maptex *tex = self->tex + cell->tile [z];
		2056	tex->unused = 0;
1707	if (!tex->name)	2057	if (!tex->name)
1708	av_push (missing, newSViv (cell->tile [z]));	2058	av_push (missing, newSViv (cell->tile [z]));
1709		2059
1710	if (tex->smoothtile)	2060	if (tex->smoothtile)
1711	{	2061	{
1712	maptex *smooth = self->tex + tex->smoothtile;	2062	maptex *smooth = self->tex + tex->smoothtile;
		2063	smooth->unused = 0;
1713	if (!smooth->name)	2064	if (!smooth->name)
1714	av_push (missing, newSViv (tex->smoothtile));	2065	av_push (missing, newSViv (tex->smoothtile));
1715	}	2066	}
1716	}	2067	}
1717	}	2068	}
1718	}	2069	}
1719	else	2070	else
1720	cell->darkness = 0;	2071	CELL_CLEAR (cell);
1721	}	2072	}
1722	}	2073	}
1723	OUTPUT:	2074	OUTPUT:
1724	RETVAL	2075	RETVAL
1725		2076
1726	SV *	2077	SV *
1727	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	2078	mapmap (DC::Map self, int x0, int y0, int w, int h)
1728	CODE:	2079	CODE:
1729	{	2080	{
1730	int x1, x;	2081	int x1, x;
1731	int y1, y;	2082	int y1, y;
1732	int z;	2083	int z;
…		…
1777	}	2128	}
1778	OUTPUT:	2129	OUTPUT:
1779	RETVAL	2130	RETVAL
1780		2131
1781	void	2132	void
1782	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	2133	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783	CODE:	2134	CODE:
1784	{	2135	{
1785	int x, y, z;	2136	int x, y, z;
1786		2137
1787	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());	2138	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2139	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2140	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790	smooth_key skey;	2141	smooth_key skey;
1791		2142	int pl_x, pl_y;
		2143	maptex pl_tex;
1792	rc_t *rc = rc_alloc ();	2144	rc_t *rc = rc_alloc ();
		2145	rc_t *rc_ov = rc_alloc ();
1793	rc_key_t key;	2146	rc_key_t key;
1794	rc_array_t *arr;	2147	rc_array_t *arr;
1795		2148
		2149	pl_tex.name = 0;
		2150
1796	// thats current max. sorry.	2151	// that's current max. sorry.
1797	if (sw > 255) sw = 255;	2152	if (sw > 255) sw = 255;
1798	if (sh > 255) sh = 255;	2153	if (sh > 255) sh = 255;
1799		2154
1800	// clear key, in case of extra padding	2155	// clear key, in case of extra padding
1801	memset (&skey, 0, sizeof (skey));	2156	memset (&skey, 0, sizeof (skey));
…		…
1805	key.g = 255;	2160	key.g = 255;
1806	key.b = 255;	2161	key.b = 255;
1807	key.a = 255;	2162	key.a = 255;
1808	key.mode = GL_QUADS;	2163	key.mode = GL_QUADS;
1809	key.format = GL_T2F_V3F;	2164	key.format = GL_T2F_V3F;
1810	key.texname = -1;
1811		2165
1812	mx += self->x;	2166	mx += self->x;
1813	my += self->y;	2167	my += self->y;
1814		2168
1815	// first pass: determine smooth_max	2169	// first pass: determine smooth_max
…		…
1839	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2193	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1840		2194
1841	for (z = 0; z <= 2; z++)	2195	for (z = 0; z <= 2; z++)
1842	{	2196	{
1843	memset (smooth_level, 0, sizeof (smooth_level));	2197	memset (smooth_level, 0, sizeof (smooth_level));
		2198	key.texname = -1;
1844		2199
1845	for (y = 0; y < sh; y++)	2200	for (y = 0; y < sh; y++)
1846	if (0 <= y + my && y + my < self->rows)	2201	if (0 <= y + my && y + my < self->rows)
1847	{	2202	{
1848	maprow *row = self->row + (y + my);	2203	maprow *row = self->row + (y + my);
…		…
1858	maptex tex = self->tex [tile];	2213	maptex tex = self->tex [tile];
1859	int px, py;	2214	int px, py;
1860		2215
1861	if (key.texname != tex.name)	2216	if (key.texname != tex.name)
1862	{	2217	{
		2218	self->tex [tile].unused = 0;
		2219
1863	if (!tex.name)	2220	if (!tex.name)
1864	tex = self->tex [2]; /* missing, replace by noface */	2221	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1865		2222
1866	key.texname = tex.name;	2223	key.texname = tex.name;
1867	arr = rc_array (rc, &key);	2224	arr = rc_array (rc, &key);
1868	}	2225	}
1869		2226
1870	px = (x + 1) * T - tex.w;	2227	px = (x + 1) * T - tex.w;
1871	py = (y + 1) * T - tex.h;	2228	py = (y + 1) * T - tex.h;
		2229
		2230	if (expect_false (cell->player == player) && expect_false (z == 2))
		2231	{
		2232	pl_x = px;
		2233	pl_y = py;
		2234	pl_tex = tex;
		2235	continue;
		2236	}
1872		2237
1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2238	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2239	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2240	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2241	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877
1878	if (cell->flags && z == 2)
1879	{
1880	// overlays such as the speech bubble, probably more to come
1881	if (cell->flags & 1)
1882	{
1883	maptex tex = self->tex [1];
1884	int px = x * T + T * 2 / 32;
1885	int py = y * T - T * 6 / 32;
1886
1887	if (tex.name)
1888	{
1889	if (key.texname != tex.name)
1890	{
1891	key.texname = tex.name;
1892	arr = rc_array (rc, &key);
1893	}
1894
1895	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1896	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1897	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1898	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1899	}
1900	}
1901	}
1902		2242
1903	// update smooth hash	2243	// update smooth hash
1904	if (tex.smoothtile)	2244	if (tex.smoothtile)
1905	{	2245	{
1906	skey.tile = tex.smoothtile;	2246	skey.tile = tex.smoothtile;
…		…
1935	// corners	2275	// corners
1936	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2276	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1937	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2277	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1938	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2278	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1939	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2279	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2280	}
		2281	}
		2282
		2283	if (expect_false (z == 2) && expect_false (cell->flags))
		2284	{
		2285	// overlays such as the speech bubble, probably more to come
		2286	if (cell->flags & 1)
		2287	{
		2288	rc_key_t key_ov = key;
		2289	maptex tex = self->tex [TEXID_SPEECH];
		2290	rc_array_t *arr;
		2291	int px = x * T + T * 2 / 32;
		2292	int py = y * T - T * 6 / 32;
		2293
		2294	key_ov.texname = tex.name;
		2295	arr = rc_array (rc_ov, &key_ov);
		2296
		2297	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2298	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2299	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2300	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1940	}	2301	}
1941	}	2302	}
1942	}	2303	}
1943	}	2304	}
1944		2305
…		…
1984	{	2345	{
1985	// this time avoiding texture state changes	2346	// this time avoiding texture state changes
1986	// save gobs of state changes.	2347	// save gobs of state changes.
1987	if (key.texname != tex.name)	2348	if (key.texname != tex.name)
1988	{	2349	{
		2350	self->tex [skey->tile].unused = 0;
		2351
1989	glEnd ();	2352	glEnd ();
1990	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2353	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1991	glBegin (GL_QUADS);	2354	glBegin (GL_QUADS);
1992	}	2355	}
1993		2356
…		…
2022	}	2385	}
2023		2386
2024	hv_clear (smooth);	2387	hv_clear (smooth);
2025	}	2388	}
2026		2389
		2390	if (pl_tex.name)
		2391	{
		2392	maptex tex = pl_tex;
		2393	int px = pl_x + sdx;
		2394	int py = pl_y + sdy;
		2395
		2396	key.texname = tex.name;
		2397	arr = rc_array (rc, &key);
		2398
		2399	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2400	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2401	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2402	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2403
		2404	rc_draw (rc);
		2405	}
		2406
		2407	rc_draw (rc_ov);
		2408	rc_clear (rc_ov);
		2409
2027	glDisable (GL_BLEND);	2410	glDisable (GL_BLEND);
2028	rc_free (rc);	2411	rc_free (rc);
		2412	rc_free (rc_ov);
2029		2413
2030	// top layer: overlays such as the health bar	2414	// top layer: overlays such as the health bar
2031	for (y = 0; y < sh; y++)	2415	for (y = 0; y < sh; y++)
2032	if (0 <= y + my && y + my < self->rows)	2416	if (0 <= y + my && y + my < self->rows)
2033	{	2417	{
…		…
2038	{	2422	{
2039	mapcell *cell = row->col + (x + mx - row->c0);	2423	mapcell *cell = row->col + (x + mx - row->c0);
2040		2424
2041	int px = x * T;	2425	int px = x * T;
2042	int py = y * T;	2426	int py = y * T;
		2427
		2428	if (expect_false (cell->player == player))
		2429	{
		2430	px += sdx;
		2431	py += sdy;
		2432	}
2043		2433
2044	if (cell->stat_hp)	2434	if (cell->stat_hp)
2045	{	2435	{
2046	int width = cell->stat_width * T;	2436	int width = cell->stat_width * T;
2047	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2437	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2058	}	2448	}
2059	}	2449	}
2060	}	2450	}
2061		2451
2062	void	2452	void
2063	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2453	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2064	CODE:	2454	CODE:
2065	{	2455	{
2066	static float color[16][3] = {	2456	static float color[16][3] = {
2067	{ 0.00F, 0.00F, 0.00F },	2457	{ 0.00f, 0.00f, 0.00f },
2068	{ 1.00F, 1.00F, 1.00F },	2458	{ 1.00f, 1.00f, 1.00f },
2069	{ 0.00F, 0.00F, 0.55F },	2459	{ 0.00f, 0.00f, 0.55f },
2070	{ 1.00F, 0.00F, 0.00F },	2460	{ 1.00f, 0.00f, 0.00f },
2071		2461
2072	{ 1.00F, 0.54F, 0.00F },	2462	{ 1.00f, 0.54f, 0.00f },
2073	{ 0.11F, 0.56F, 1.00F },	2463	{ 0.11f, 0.56f, 1.00f },
2074	{ 0.93F, 0.46F, 0.00F },	2464	{ 0.93f, 0.46f, 0.00f },
2075	{ 0.18F, 0.54F, 0.34F },	2465	{ 0.18f, 0.54f, 0.34f },
2076		2466
2077	{ 0.56F, 0.73F, 0.56F },	2467	{ 0.56f, 0.73f, 0.56f },
2078	{ 0.80F, 0.80F, 0.80F },	2468	{ 0.80f, 0.80f, 0.80f },
2079	{ 0.55F, 0.41F, 0.13F },	2469	{ 0.55f, 0.41f, 0.13f },
2080	{ 0.99F, 0.77F, 0.26F },	2470	{ 0.99f, 0.77f, 0.26f },
2081		2471
2082	{ 0.74F, 0.65F, 0.41F },	2472	{ 0.74f, 0.65f, 0.41f },
2083		2473
2084	{ 0.00F, 1.00F, 1.00F },	2474	{ 0.00f, 1.00f, 1.00f },
2085	{ 1.00F, 0.00F, 1.00F },	2475	{ 1.00f, 0.00f, 1.00f },
2086	{ 1.00F, 1.00F, 0.00F },	2476	{ 1.00f, 1.00f, 0.00f },
2087	};	2477	};
2088		2478
2089	int x, y;	2479	int x, y;
2090		2480
2091	glEnable (GL_TEXTURE_2D);	2481	glEnable (GL_TEXTURE_2D);
		2482	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2483	* but the nvidia driver (185.18.14) mishandles alpha textures
		2484	* and takes the colour from god knows where instead of using
		2485	* Cp. MODULATE results in the same colour, but slightly different
		2486	* alpha, but atcually gives us the correct colour with nvidia.
		2487	*/
2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2488	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2093	glEnable (GL_BLEND);	2489	glEnable (GL_BLEND);
2094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2490	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2095	glBegin (GL_QUADS);	2491	glBegin (GL_QUADS);
2096		2492
2097	for (y = 0; y < h; y++)	2493	for (y = 0; y < h; y++)
…		…
2101		2497
2102	if (m)	2498	if (m)
2103	{	2499	{
2104	float *c = color [m & 15];	2500	float *c = color [m & 15];
2105		2501
2106	float tx1 = m & 0x40 ? 0.5 : 0.;	2502	float tx1 = m & 0x40 ? 0.5f : 0.f;
2107	float tx2 = tx1 + 0.5;	2503	float tx2 = tx1 + 0.5f;
2108		2504
2109	glColor4f (c[0], c[1], c[2], 0.75);	2505	glColor4f (c[0], c[1], c[2], 1);
2110	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2506	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2111	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2507	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2112	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2508	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2113	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2509	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2114	}	2510	}
…		…
2118	glDisable (GL_BLEND);	2514	glDisable (GL_BLEND);
2119	glDisable (GL_TEXTURE_2D);	2515	glDisable (GL_TEXTURE_2D);
2120	}	2516	}
2121		2517
2122	void	2518	void
2123	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2519	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2124	PPCODE:	2520	PPCODE:
2125	{	2521	{
2126	int x, y;	2522	int x, y;
2127	int sw1 = sw + 2;	2523	int sw1 = sw + 2;
2128	int sh1 = sh + 2;	2524	int sh1 = sh + 2;
2129	int sh3 = sh * 3;	2525	int sh3 = sh * 3;
2130	int sw34 = (sw * 3 + 3) & ~3;	2526	int sw3 = sw * 3;
2131	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2527	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2132	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2528	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2133	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);	2529	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2134		2530
2135	SvPOK_only (darkness3_sv);	2531	SvPOK_only (darkness3_sv);
2136	SvCUR_set (darkness3_sv, sw34 * sh3);	2532	SvCUR_set (darkness3_sv, sw3 * sh3);
2137		2533
2138	mx += self->x - 1;	2534	mx += self->x - 1;
2139	my += self->y - 1;	2535	my += self->y - 1;
2140
2141	memset (darkness1, 255, sw1 * sh1);
2142		2536
2143	for (y = 0; y < sh1; y++)	2537	for (y = 0; y < sh1; y++)
2144	if (0 <= y + my && y + my < self->rows)	2538	if (0 <= y + my && y + my < self->rows)
2145	{	2539	{
2146	maprow *row = self->row + (y + my);	2540	maprow *row = self->row + (y + my);
…		…
2149	if (row->c0 <= x + mx && x + mx < row->c1)	2543	if (row->c0 <= x + mx && x + mx < row->c1)
2150	{	2544	{
2151	mapcell *cell = row->col + (x + mx - row->c0);	2545	mapcell *cell = row->col + (x + mx - row->c0);
2152		2546
2153	darkness1 [y * sw1 + x] = cell->darkness	2547	darkness1 [y * sw1 + x] = cell->darkness
2154	? 255 - (cell->darkness - 1)	2548	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2155	: 255 - FOW_DARKNESS;	2549	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2156	}	2550	}
2157	}	2551	}
2158		2552
2159	for (y = 0; y < sh; ++y)	2553	for (y = 0; y < sh; ++y)
2160	for (x = 0; x < sw; ++x)	2554	for (x = 0; x < sw; ++x)
…		…
2179		2573
2180	uint8_t r13 = (d13 + d23 + d12) / 3;	2574	uint8_t r13 = (d13 + d23 + d12) / 3;
2181	uint8_t r23 = d23;	2575	uint8_t r23 = d23;
2182	uint8_t r33 = (d23 + d33 + d32) / 3;	2576	uint8_t r33 = (d23 + d33 + d32) / 3;
2183		2577
2184	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2578	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2185	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2579	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2186	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2580	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2187	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2581	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2188	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2582	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2189	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2583	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2190	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2584	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2191	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2585	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2192	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2586	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2193	}	2587	}
2194		2588
2195	free (darkness1);	2589	free (darkness1);
2196		2590
2197	EXTEND (SP, 3);	2591	EXTEND (SP, 3);
2198	PUSHs (sv_2mortal (newSViv (sw34)));	2592	PUSHs (sv_2mortal (newSViv (sw3)));
2199	PUSHs (sv_2mortal (newSViv (sh3)));	2593	PUSHs (sv_2mortal (newSViv (sh3)));
2200	PUSHs (darkness3_sv);	2594	PUSHs (darkness3_sv);
2201	}	2595	}
2202		2596
2203	SV *	2597	SV *
2204	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2598	get_rect (DC::Map self, int x0, int y0, int w, int h)
2205	CODE:	2599	CODE:
2206	{	2600	{
2207	int x, y, x1, y1;	2601	int x, y, x1, y1;
2208	SV *data_sv = newSV (w * h * 7 + 5);	2602	SV *data_sv = newSV (w * h * 7 + 5);
2209	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2603	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
2266	else	2660	else
2267	*data++ = 0;	2661	*data++ = 0;
2268	}	2662	}
2269	}	2663	}
2270		2664
		2665	/* if size is w*h + 5 then no data has been found */
		2666	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
		2667	{
2271	SvPOK_only (data_sv);	2668	SvPOK_only (data_sv);
2272	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2669	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2670	}
		2671
2273	RETVAL = data_sv;	2672	RETVAL = data_sv;
2274	}	2673	}
2275	OUTPUT:	2674	OUTPUT:
2276	RETVAL	2675	RETVAL
2277		2676
2278	void	2677	void
2279	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2678	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280	PPCODE:	2679	PPCODE:
2281	{	2680	{
2282	int x, y, z;	2681	int x, y, z;
2283	int w, h;	2682	int w, h;
2284	int x1, y1;	2683	int x1, y1;
		2684	STRLEN len;
		2685	uint8_t *data, *end;
		2686
		2687	len = SvLEN (data_sv);
		2688	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2689	data = SvPVbyte_nolen (data_sv);
		2690	end = data + len + 8;
		2691
		2692	if (len < 5)
		2693	XSRETURN_EMPTY;
2285		2694
2286	if (*data++ != 0)	2695	if (*data++ != 0)
2287	XSRETURN_EMPTY; /* version mismatch */	2696	XSRETURN_EMPTY; /* version mismatch */
2288		2697
2289	w = *data++ << 8; w |= *data++;	2698	w = *data++ << 8; w |= *data++;
…		…
2304	{	2713	{
2305	maprow *row = map_get_row (self, y);	2714	maprow *row = map_get_row (self, y);
2306		2715
2307	for (x = x0; x < x1; x++)	2716	for (x = x0; x < x1; x++)
2308	{	2717	{
		2718	uint8_t flags;
		2719
		2720	if (data + 7 >= end)
		2721	XSRETURN_EMPTY;
		2722
2309	uint8_t flags = *data++;	2723	flags = *data++;
2310		2724
2311	if (flags)	2725	if (flags)
2312	{	2726	{
2313	mapcell *cell = row_get_cell (row, x);	2727	mapcell *cell = row_get_cell (row, x);
2314	tileid tile[3] = { 0, 0, 0 };	2728	tileid tile[3] = { 0, 0, 0 };
…		…
2317	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }	2731	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }	2732	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319		2733
2320	if (cell->darkness == 0)	2734	if (cell->darkness == 0)
2321	{	2735	{
2322	cell->darkness = 0;	2736	/*cell->darkness = 0;*/
		2737	EXTEND (SP, 3);
2323		2738
2324	for (z = 0; z <= 2; z++)	2739	for (z = 0; z <= 2; z++)
2325	{	2740	{
2326	tileid t = tile [z];	2741	tileid t = tile [z];
2327		2742
2328	if (t >= self->texs || (t && !self->tex [t].name))	2743	if (t >= self->texs || (t && !self->tex [t].name))
2329	{	2744	{
2330	XPUSHs (sv_2mortal (newSViv (t)));	2745	PUSHs (sv_2mortal (newSViv (t)));
2331	need_texid (self, t);	2746	need_texid (self, t);
2332	}	2747	}
2333		2748
2334	cell->tile [z] = t;	2749	cell->tile [z] = t;
2335	}	2750	}
…		…
2337	}	2752	}
2338	}	2753	}
2339	}	2754	}
2340	}	2755	}
2341		2756
2342	MODULE = CFPlus PACKAGE = CFPlus::RW	2757	MODULE = Deliantra::Client PACKAGE = DC::RW
2343		2758
2344	CFPlus::RW	2759	DC::RW
2345	new (SV *class, SV *data_sv)	2760	new (SV *class, SV *data_sv)
2346	CODE:	2761	CODE:
2347	{	2762	{
2348	STRLEN datalen;	2763	STRLEN datalen;
2349	char *data = SvPVbyte (data_sv, datalen);	2764	char *data = SvPVbyte (data_sv, datalen);
…		…
2351	RETVAL = SDL_RWFromConstMem (data, datalen);	2766	RETVAL = SDL_RWFromConstMem (data, datalen);
2352	}	2767	}
2353	OUTPUT:	2768	OUTPUT:
2354	RETVAL	2769	RETVAL
2355		2770
2356	CFPlus::RW	2771	DC::RW
2357	new_from_file (SV *class, const char *path, const char *mode = "rb")	2772	new_from_file (SV *class, const char *path, const char *mode = "rb")
2358	CODE:	2773	CODE:
2359	RETVAL = SDL_RWFromFile (path, mode);	2774	RETVAL = SDL_RWFromFile (path, mode);
2360	OUTPUT:	2775	OUTPUT:
2361	RETVAL	2776	RETVAL
2362		2777
2363	# fails on win32:	2778	# fails on win32:
2364	# CFPlus.xs(2268) : error C2059: syntax error : '('	2779	# dc.xs(2268) : error C2059: syntax error : '('
2365	#void	2780	#void
2366	#close (CFPlus::RW self)	2781	#close (DC::RW self)
2367	# CODE:	2782	# CODE:
2368	# (self->(close)) (self);	2783	# (self->(close)) (self);
2369		2784
2370	MODULE = CFPlus PACKAGE = CFPlus::Channel	2785	MODULE = Deliantra::Client PACKAGE = DC::Channel
2371		2786
2372	PROTOTYPES: DISABLE	2787	PROTOTYPES: DISABLE
2373		2788
2374	CFPlus::Channel	2789	DC::Channel
2375	find ()	2790	find ()
2376	CODE:	2791	CODE:
2377	{	2792	{
2378	RETVAL = Mix_GroupAvailable (-1);	2793	RETVAL = Mix_GroupAvailable (-1);
2379		2794
…		…
2392	}	2807	}
2393	OUTPUT:	2808	OUTPUT:
2394	RETVAL	2809	RETVAL
2395		2810
2396	void	2811	void
2397	halt (CFPlus::Channel self)	2812	halt (DC::Channel self)
2398	CODE:	2813	CODE:
2399	Mix_HaltChannel (self);	2814	Mix_HaltChannel (self);
2400		2815
2401	void	2816	void
2402	expire (CFPlus::Channel self, int ticks = -1)	2817	expire (DC::Channel self, int ticks = -1)
2403	CODE:	2818	CODE:
2404	Mix_ExpireChannel (self, ticks);	2819	Mix_ExpireChannel (self, ticks);
2405		2820
2406	void	2821	void
2407	fade_out (CFPlus::Channel self, int ticks = -1)	2822	fade_out (DC::Channel self, int ticks = -1)
2408	CODE:	2823	CODE:
2409	Mix_FadeOutChannel (self, ticks);	2824	Mix_FadeOutChannel (self, ticks);
2410		2825
2411	int	2826	int
2412	volume (CFPlus::Channel self, int volume)	2827	volume (DC::Channel self, int volume)
2413	CODE:	2828	CODE:
2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2829	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2415	OUTPUT:	2830	OUTPUT:
2416	RETVAL	2831	RETVAL
2417		2832
2418	void	2833	void
2419	unregister_all_effects (CFPlus::Channel self)	2834	unregister_all_effects (DC::Channel self)
2420	CODE:	2835	CODE:
2421	Mix_UnregisterAllEffects (self);	2836	Mix_UnregisterAllEffects (self);
2422		2837
2423	void	2838	void
2424	set_panning (CFPlus::Channel self, int left, int right)	2839	set_panning (DC::Channel self, int left, int right)
2425	CODE:	2840	CODE:
2426	left = CLAMP (left , 0, 255);	2841	left = CLAMP (left , 0, 255);
2427	right = CLAMP (right, 0, 255);	2842	right = CLAMP (right, 0, 255);
2428	Mix_SetPanning (self, left, right);	2843	Mix_SetPanning (self, left, right);
2429		2844
2430	void	2845	void
2431	set_distance (CFPlus::Channel self, int distance)	2846	set_distance (DC::Channel self, int distance)
2432	CODE:	2847	CODE:
2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2848	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2434		2849
2435	void	2850	void
2436	set_position (CFPlus::Channel self, int angle, int distance)	2851	set_position (DC::Channel self, int angle, int distance)
2437	CODE:	2852	CODE:
2438		2853
2439	void	2854	void
2440	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2855	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2441	CODE:	2856	CODE:
2442	{	2857	{
2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2858	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2859	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2860	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2446	}	2861	}
2447		2862
2448	void	2863	void
2449	set_reverse_stereo (CFPlus::Channel self, int flip)	2864	set_reverse_stereo (DC::Channel self, int flip)
2450	CODE:	2865	CODE:
2451	Mix_SetReverseStereo (self, flip);	2866	Mix_SetReverseStereo (self, flip);
2452		2867
2453	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2868	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2454		2869
2455	PROTOTYPES: DISABLE	2870	PROTOTYPES: DISABLE
2456		2871
2457	CFPlus::MixChunk	2872	DC::MixChunk
2458	new (SV *class, CFPlus::RW rwops)	2873	new (SV *class, DC::RW rwops)
2459	CODE:	2874	CODE:
2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2875	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2461	OUTPUT:	2876	OUTPUT:
2462	RETVAL	2877	RETVAL
2463		2878
2464	void	2879	void
2465	DESTROY (CFPlus::MixChunk self)	2880	DESTROY (DC::MixChunk self)
2466	CODE:	2881	CODE:
2467	Mix_FreeChunk (self);	2882	Mix_FreeChunk (self);
2468		2883
2469	int	2884	int
2470	volume (CFPlus::MixChunk self, int volume = -1)	2885	volume (DC::MixChunk self, int volume = -1)
2471	CODE:	2886	CODE:
2472	if (items > 1)	2887	if (items > 1)
2473	volume = CLAMP (volume, 0, 128);	2888	volume = CLAMP (volume, 0, 128);
2474	RETVAL = Mix_VolumeChunk (self, volume);	2889	RETVAL = Mix_VolumeChunk (self, volume);
2475	OUTPUT:	2890	OUTPUT:
2476	RETVAL	2891	RETVAL
2477		2892
2478	CFPlus::Channel	2893	DC::Channel
2479	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2894	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2480	CODE:	2895	CODE:
2481	{	2896	{
2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2897	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2483		2898
2484	if (RETVAL < 0)	2899	if (RETVAL < 0)
…		…
2491	}	2906	}
2492	}	2907	}
2493	OUTPUT:	2908	OUTPUT:
2494	RETVAL	2909	RETVAL
2495		2910
2496	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2911	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2497		2912
2498	int	2913	int
2499	volume (int volume = -1)	2914	volume (int volume = -1)
2500	PROTOTYPE: ;$	2915	PROTOTYPE: ;$
2501	CODE:	2916	CODE:
…		…
2513	void	2928	void
2514	halt ()	2929	halt ()
2515	CODE:	2930	CODE:
2516	Mix_HaltMusic ();	2931	Mix_HaltMusic ();
2517		2932
2518	CFPlus::MixMusic	2933	DC::MixMusic
2519	new (SV *class, CFPlus::RW rwops)	2934	new (SV *class, DC::RW rwops)
2520	CODE:	2935	CODE:
2521	RETVAL = Mix_LoadMUS_RW (rwops);	2936	RETVAL = Mix_LoadMUS_RW (rwops);
2522	OUTPUT:	2937	OUTPUT:
2523	RETVAL	2938	RETVAL
2524		2939
2525	void	2940	void
2526	DESTROY (CFPlus::MixMusic self)	2941	DESTROY (DC::MixMusic self)
2527	CODE:	2942	CODE:
2528	Mix_FreeMusic (self);	2943	Mix_FreeMusic (self);
2529		2944
2530	int	2945	int
2531	play (CFPlus::MixMusic self, int loops = -1)	2946	play (DC::MixMusic self, int loops = -1)
2532	CODE:	2947	CODE:
2533	RETVAL = Mix_PlayMusic (self, loops);	2948	RETVAL = Mix_PlayMusic (self, loops);
2534	OUTPUT:	2949	OUTPUT:
2535	RETVAL	2950	RETVAL
2536		2951
2537	void	2952	void
2538	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2953	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2539	CODE:	2954	CODE:
2540	Mix_FadeInMusicPos (self, loops, ms, position);	2955	Mix_FadeInMusicPos (self, loops, ms, position);
2541		2956
2542	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2957	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2543		2958
2544	PROTOTYPES: ENABLE	2959	PROTOTYPES: ENABLE
2545		2960
2546	BOOT:	2961	BOOT:
2547	{	2962	{
2548	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2963	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2549	static const struct {	2964	static const struct {
2550	const char *name;	2965	const char *name;
2551	IV iv;	2966	IV iv;
2552	} *civ, const_iv[] = {	2967	} *civ, const_iv[] = {
2553	# define const_iv(name) { # name, (IV)name }	2968	# define const_iv(name) { # name, (IV)name }
2554	const_iv (GL_VENDOR),	2969	const_iv (GL_VENDOR),
2555	const_iv (GL_VERSION),	2970	const_iv (GL_VERSION),
2556	const_iv (GL_EXTENSIONS),	2971	const_iv (GL_EXTENSIONS),
		2972	const_iv (GL_MAX_TEXTURE_UNITS),
2557	const_iv (GL_COLOR_MATERIAL),	2973	const_iv (GL_COLOR_MATERIAL),
2558	const_iv (GL_SMOOTH),	2974	const_iv (GL_SMOOTH),
2559	const_iv (GL_FLAT),	2975	const_iv (GL_FLAT),
2560	const_iv (GL_DITHER),	2976	const_iv (GL_DITHER),
2561	const_iv (GL_BLEND),	2977	const_iv (GL_BLEND),
…		…
2573	const_iv (GL_ZERO),	2989	const_iv (GL_ZERO),
2574	const_iv (GL_SRC_ALPHA),	2990	const_iv (GL_SRC_ALPHA),
2575	const_iv (GL_DST_ALPHA),	2991	const_iv (GL_DST_ALPHA),
2576	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2992	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2577	const_iv (GL_ONE_MINUS_DST_ALPHA),	2993	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2994	const_iv (GL_SRC_COLOR),
		2995	const_iv (GL_DST_COLOR),
		2996	const_iv (GL_ONE_MINUS_SRC_COLOR),
		2997	const_iv (GL_ONE_MINUS_DST_COLOR),
2578	const_iv (GL_SRC_ALPHA_SATURATE),	2998	const_iv (GL_SRC_ALPHA_SATURATE),
2579	const_iv (GL_RGB),	2999	const_iv (GL_RGB),
2580	const_iv (GL_RGBA),	3000	const_iv (GL_RGBA),
2581	const_iv (GL_RGBA4),	3001	const_iv (GL_RGBA4),
2582	const_iv (GL_RGBA8),	3002	const_iv (GL_RGBA8),
…		…
2650	const_iv (GL_NICEST),	3070	const_iv (GL_NICEST),
2651	const_iv (GL_V2F),	3071	const_iv (GL_V2F),
2652	const_iv (GL_V3F),	3072	const_iv (GL_V3F),
2653	const_iv (GL_T2F_V3F),	3073	const_iv (GL_T2F_V3F),
2654	const_iv (GL_T2F_N3F_V3F),	3074	const_iv (GL_T2F_N3F_V3F),
		3075	const_iv (GL_FUNC_ADD),
		3076	const_iv (GL_FUNC_SUBTRACT),
		3077	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2655	# undef const_iv	3078	# undef const_iv
2656	};	3079	};
2657		3080
2658	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3081	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2659	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3082	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2666	disable_GL_EXT_blend_func_separate ()	3089	disable_GL_EXT_blend_func_separate ()
2667	CODE:	3090	CODE:
2668	gl.BlendFuncSeparate = 0;	3091	gl.BlendFuncSeparate = 0;
2669	gl.BlendFuncSeparateEXT = 0;	3092	gl.BlendFuncSeparateEXT = 0;
2670		3093
		3094	void
		3095	apple_nvidia_bug (int enable)
		3096
2671	char *	3097	char *
2672	gl_vendor ()	3098	gl_vendor ()
2673	CODE:	3099	CODE:
2674	RETVAL = (char *)glGetString (GL_VENDOR);	3100	RETVAL = (char *)glGetString (GL_VENDOR);
2675	OUTPUT:	3101	OUTPUT:
…		…
2724		3150
2725	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3151	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2726	CODE:	3152	CODE:
2727	gl_BlendFuncSeparate (sa, da, saa, daa);	3153	gl_BlendFuncSeparate (sa, da, saa, daa);
2728		3154
		3155	# void glBlendEquation (int se)
		3156
2729	void glDepthMask (int flag)	3157	void glDepthMask (int flag)
2730		3158
2731	void glLogicOp (int opcode)	3159	void glLogicOp (int opcode)
2732		3160
2733	void glColorMask (int red, int green, int blue, int alpha)	3161	void glColorMask (int red, int green, int blue, int alpha)
…		…
2767	void glRotate (float angle, float x, float y, float z)	3195	void glRotate (float angle, float x, float y, float z)
2768	CODE:	3196	CODE:
2769	glRotatef (angle, x, y, z);	3197	glRotatef (angle, x, y, z);
2770		3198
2771	void glColor (float r, float g, float b, float a = 1.0)	3199	void glColor (float r, float g, float b, float a = 1.0)
		3200	PROTOTYPE: @
2772	ALIAS:	3201	ALIAS:
2773	glColor_premultiply = 1	3202	glColor_premultiply = 1
2774	CODE:	3203	CODE:
2775	if (ix)	3204	if (ix)
2776	{	3205	{
…		…
2846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	3275	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847	CODE:	3276	CODE:
2848	if (gl.SeparableFilter2D)	3277	if (gl.SeparableFilter2D)
2849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	3278	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850		3279
2851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	3280	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852		3281
2853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	3282	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854		3283
2855	void glDrawPixels (int width, int height, int format, int type, char *pixels)	3284	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856		3285
…		…
2882		3311
2883	void glEndList ()	3312	void glEndList ()
2884		3313
2885	void glCallList (int list)	3314	void glCallList (int list)
2886		3315
2887	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	3316	void c_init ()
		3317	CODE:
		3318	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3319	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3320
		3321	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2888		3322
2889	PROTOTYPES: DISABLE	3323	PROTOTYPES: DISABLE
2890		3324
2891	void	3325	void
2892	find_widget (SV *self, NV x, NV y)	3326	find_widget (SV *self, NV x, NV y)
…		…
2896	XPUSHs (self);	3330	XPUSHs (self);
2897	}	3331	}
2898		3332
2899	BOOT:	3333	BOOT:
2900	{	3334	{
2901	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	3335	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2902		3336
2903	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	3337	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2904	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	3338	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2905	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	3339	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2906	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	3340	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2907	}	3341	}
2908		3342
2909	void	3343	void
2910	draw (SV *self)	3344	draw (SV *self)
2911	CODE:	3345	CODE:
…		…
2918	SV *draw_w_sv = GvSV (draw_w_gv);	3352	SV *draw_w_sv = GvSV (draw_w_gv);
2919	SV *draw_h_sv = GvSV (draw_h_gv);	3353	SV *draw_h_sv = GvSV (draw_h_gv);
2920	double draw_x, draw_y;	3354	double draw_x, draw_y;
2921		3355
2922	if (!SvROK (self))	3356	if (!SvROK (self))
2923	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	3357	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2924		3358
2925	hv = (HV *)SvRV (self);	3359	hv = (HV *)SvRV (self);
2926		3360
2927	if (SvTYPE (hv) != SVt_PVHV)	3361	if (SvTYPE (hv) != SVt_PVHV)
2928	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	3362	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2929		3363
2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	3364	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2931	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	3365	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2932		3366
2933	if (!h || !w)	3367	if (!h || !w)

Diff Legend

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