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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC

…		…
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
		22	// microsoft vs. C
		23	# define sqrtf(x) sqrt(x)
		24	# define roundf(x) (int)(x)
		25	# define atan2f(x,y) atan2(x,y)
		26	# define M_PI 3.14159265f
22	#endif	27	#endif
23		28
24	#include <assert.h>	29	#include <assert.h>
25	#include <math.h>	30	#include <math.h>
26	#include <string.h>	31	#include <string.h>
…		…
40	#define G_DISABLE_CAST_CHECKS	45	#define G_DISABLE_CAST_CHECKS
41		46
42	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
43		48
44	#include <pango/pango.h>	49	#include <pango/pango.h>
		50
		51	#ifndef PANGO_VERSION_CHECK
		52	# define PANGO_VERSION_CHECK(a,b,c) 0
		53	#endif
		54
		55	#if !PANGO_VERSION_CHECK (1, 15, 2)
		56	# define pango_layout_get_line_readonly pango_layout_get_line
		57	# define pango_layout_get_lines_readonly pango_layout_get_lines
		58	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
		59	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
		60	#endif
45		61
46	#ifndef _WIN32	62	#ifndef _WIN32
47	# include <sys/types.h>	63	# include <sys/types.h>
48	# include <sys/socket.h>	64	# include <sys/socket.h>
49	# include <netinet/in.h>	65	# include <netinet/in.h>
…		…
58	#define MAP_EXTEND_X 32	74	#define MAP_EXTEND_X 32
59	#define MAP_EXTEND_Y 512	75	#define MAP_EXTEND_Y 512
60		76
61	#define MIN_FONT_HEIGHT 10	77	#define MIN_FONT_HEIGHT 10
62		78
		79	/* mask out modifiers we are not interested in */
		80	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		81
63	#if 0	82	#if 0
64	# define PARACHUTE SDL_INIT_NOPARACHUTE	83	# define PARACHUTE SDL_INIT_NOPARACHUTE
65	#else	84	#else
66	# define PARACHUTE 0	85	# define PARACHUTE 0
67	#endif	86	#endif
…		…
109	av_push (texture_av, (SV *)(size_t)name);	128	av_push (texture_av, (SV *)(size_t)name);
110	glDeleteTextures (1, &name);	129	glDeleteTextures (1, &name);
111	}	130	}
112		131
113	#include "texcache.c"	132	#include "texcache.c"
		133	#include "rendercache.c"
114		134
115	#include "pango-font.c"	135	#include "pango-font.c"
116	#include "pango-fontmap.c"	136	#include "pango-fontmap.c"
117	#include "pango-render.c"	137	#include "pango-render.c"
118		138
119	typedef IV CFPlus__Channel;	139	typedef IV DC__Channel;
120	typedef SDL_RWops *CFPlus__RW;	140	typedef SDL_RWops *DC__RW;
121	typedef Mix_Chunk *CFPlus__MixChunk;	141	typedef Mix_Chunk *DC__MixChunk;
122	typedef Mix_Music *CFPlus__MixMusic;	142	typedef Mix_Music *DC__MixMusic;
123		143
124	typedef PangoFontDescription *CFPlus__Font;	144	typedef PangoFontDescription *DC__Font;
125		145
126	static int	146	static int
127	shape_attr_p (PangoLayoutRun *run)	147	shape_attr_p (PangoLayoutRun *run)
128	{	148	{
129	GSList *attrs = run->item->analysis.extra_attrs;	149	GSList *attrs = run->item->analysis.extra_attrs;
…		…
143		163
144	typedef struct cf_layout {	164	typedef struct cf_layout {
145	PangoLayout *pl;	165	PangoLayout *pl;
146	float r, g, b, a; // default color for rgba mode	166	float r, g, b, a; // default color for rgba mode
147	int base_height;	167	int base_height;
148	CFPlus__Font font;	168	DC__Font font;
		169	rc_t *rc;
149	} *CFPlus__Layout;	170	} *DC__Layout;
150		171
151	static CFPlus__Font default_font;	172	static DC__Font default_font;
152	static PangoContext *opengl_context;	173	static PangoContext *opengl_context;
153	static PangoFontMap *opengl_fontmap;	174	static PangoFontMap *opengl_fontmap;
154		175
155	static void	176	static void
156	substitute_func (FcPattern *pattern, gpointer data)	177	substitute_func (FcPattern *pattern, gpointer data)
…		…
161	#endif	182	#endif
162	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	183	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
163	}	184	}
164		185
165	static void	186	static void
166	layout_update_font (CFPlus__Layout self)	187	layout_update_font (DC__Layout self)
167	{	188	{
168	/* use a random scale factor to account for unknown descenders, 0.8 works	189	/* use a random scale factor to account for unknown descenders, 0.8 works
169	* reasonably well with bitstream vera	190	* reasonably well with bitstream vera
170	*/	191	*/
171	PangoFontDescription *font = self->font ? self->font : default_font;	192	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
175		196
176	pango_layout_set_font_description (self->pl, font);	197	pango_layout_set_font_description (self->pl, font);
177	}	198	}
178		199
179	static void	200	static void
180	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	201	layout_get_pixel_size (DC__Layout self, int w, int h)
181	{	202	{
182	PangoRectangle rect;	203	PangoRectangle rect;
183		204
184	// get_pixel_* wrongly rounds down	205	// get_pixel_* wrongly rounds down
185	pango_layout_get_extents (self->pl, 0, &rect);	206	pango_layout_get_extents (self->pl, 0, &rect);
…		…
196		217
197	typedef uint16_t tileid;	218	typedef uint16_t tileid;
198	typedef uint16_t faceid;	219	typedef uint16_t faceid;
199		220
200	typedef struct {	221	typedef struct {
201	int name;	222	GLuint name;
202	int w, h;	223	int w, h;
203	float s, t;	224	float s, t;
204	uint8_t r, g, b, a;	225	uint8_t r, g, b, a;
205	tileid smoothtile;	226	tileid smoothtile;
206	uint8_t smoothlevel;	227	uint8_t smoothlevel;
…		…
224	int faces; tileid *face2tile; // [faceid]	245	int faces; tileid *face2tile; // [faceid]
225	int texs; maptex *tex; // [tileid]	246	int texs; maptex *tex; // [tileid]
226		247
227	int32_t rows;	248	int32_t rows;
228	maprow *row;	249	maprow *row;
229	} *CFPlus__Map;	250	} *DC__Map;
230		251
231	static char *	252	static char *
232	prepend (char *ptr, int sze, int inc)	253	prepend (char *ptr, int sze, int inc)
233	{	254	{
234	char *p;	255	char *p;
…		…
272	self->texs *= 2;	293	self->texs *= 2;
273	}	294	}
274	}	295	}
275		296
276	static maprow *	297	static maprow *
277	map_get_row (CFPlus__Map self, int y)	298	map_get_row (DC__Map self, int y)
278	{	299	{
279	if (0 > y)	300	if (0 > y)
280	{	301	{
281	int extend = - y + MAP_EXTEND_Y;	302	int extend = - y + MAP_EXTEND_Y;
282	Prepend (maprow, self->row, self->rows, extend);	303	Prepend (maprow, self->row, self->rows, extend);
…		…
320		341
321	return row->col + (x - row->c0);	342	return row->col + (x - row->c0);
322	}	343	}
323		344
324	static mapcell *	345	static mapcell *
325	map_get_cell (CFPlus__Map self, int x, int y)	346	map_get_cell (DC__Map self, int x, int y)
326	{	347	{
327	return row_get_cell (map_get_row (self, y), x);	348	return row_get_cell (map_get_row (self, y), x);
328	}	349	}
329		350
330	static void	351	static void
331	map_clear (CFPlus__Map self)	352	map_clear (DC__Map self)
332	{	353	{
333	int r;	354	int r;
334		355
335	for (r = 0; r < self->rows; r++)	356	for (r = 0; r < self->rows; r++)
336	Safefree (self->row[r].col);	357	Safefree (self->row[r].col);
…		…
344	self->row = 0;	365	self->row = 0;
345	self->rows = 0;	366	self->rows = 0;
346	}	367	}
347		368
348	static void	369	static void
349	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	370	map_blank (DC__Map self, int x0, int y0, int w, int h)
350	{	371	{
351	int x, y;	372	int x, y;
352	maprow *row;	373	maprow *row;
353	mapcell *cell;	374	mapcell *cell;
354		375
…		…
433	n \|= n >> 16;	454	n \|= n >> 16;
434		455
435	return n + 1;	456	return n + 1;
436	}	457	}
437		458
		459	static unsigned int
		460	popcount (unsigned int n)
		461	{
		462	n -= (n >> 1) & 0x55555555U;
		463	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		464	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		465	n *= 0x01010101U;
		466
		467	return n >> 24;
		468	}
		469
438	/* SDL should provide this, really. */	470	/* SDL should provide this, really. */
439	#define SDLK_MODIFIER_MIN 300	471	#define SDLK_MODIFIER_MIN 300
440	#define SDLK_MODIFIER_MAX 314	472	#define SDLK_MODIFIER_MAX 314
441		473
442	/******************************************************************************/	474	/******************************************************************************/
…		…
480	return 0;	512	return 0;
481		513
482	return 1;	514	return 1;
483	}	515	}
484		516
485	MODULE = CFPlus PACKAGE = CFPlus	517	MODULE = Deliantra::Client PACKAGE = DC
486		518
487	PROTOTYPES: ENABLE	519	PROTOTYPES: ENABLE
488		520
489	BOOT:	521	BOOT:
490	{	522	{
491	HV *stash = gv_stashpv ("CFPlus", 1);	523	HV *stash = gv_stashpv ("DC", 1);
492	static const struct {	524	static const struct {
493	const char *name;	525	const char *name;
494	IV iv;	526	IV iv;
495	} *civ, const_iv[] = {	527	} *civ, const_iv[] = {
496	# define const_iv(name) { # name, (IV)name }	528	# define const_iv(name) { # name, (IV)name }
…		…
518		550
519	const_iv (SDL_APPINPUTFOCUS),	551	const_iv (SDL_APPINPUTFOCUS),
520	const_iv (SDL_APPMOUSEFOCUS),	552	const_iv (SDL_APPMOUSEFOCUS),
521	const_iv (SDL_APPACTIVE),	553	const_iv (SDL_APPACTIVE),
522		554
		555	const_iv (SDLK_FIRST),
		556	const_iv (SDLK_LAST),
523	const_iv (SDLK_KP0),	557	const_iv (SDLK_KP0),
524	const_iv (SDLK_KP1),	558	const_iv (SDLK_KP1),
525	const_iv (SDLK_KP2),	559	const_iv (SDLK_KP2),
526	const_iv (SDLK_KP3),	560	const_iv (SDLK_KP3),
527	const_iv (SDLK_KP4),	561	const_iv (SDLK_KP4),
…		…
599	const_iv (KMOD_LMETA),	633	const_iv (KMOD_LMETA),
600	const_iv (KMOD_RMETA),	634	const_iv (KMOD_RMETA),
601	const_iv (KMOD_NUM),	635	const_iv (KMOD_NUM),
602	const_iv (KMOD_CAPS),	636	const_iv (KMOD_CAPS),
603	const_iv (KMOD_MODE),	637	const_iv (KMOD_MODE),
		638
		639	const_iv (MIX_DEFAULT_FORMAT),
604	# undef const_iv	640	# undef const_iv
605	};	641	};
606		642
607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	643	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	644	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
626		662
627	NV floor (NV x)	663	NV floor (NV x)
628		664
629	NV ceil (NV x)	665	NV ceil (NV x)
630		666
		667	IV minpot (UV n)
		668
		669	IV popcount (UV n)
		670
631	void	671	void
632	pango_init ()	672	pango_init ()
633	CODE:	673	CODE:
634	{	674	{
635	opengl_fontmap = pango_opengl_font_map_new ();	675	opengl_fontmap = pango_opengl_font_map_new ();
636	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	676	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	677	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		678	#if PANGO_VERSION_CHECK (1, 15, 2)
		679	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		680	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		681	#endif
638	}	682	}
639		683
640	char *	684	char *
641	SDL_GetError ()	685	SDL_GetError ()
642		686
…		…
674	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	718	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
675		719
676	if (m && m != (SDL_Rect **)-1)	720	if (m && m != (SDL_Rect **)-1)
677	while (*m)	721	while (*m)
678	{	722	{
679	if ((m)->w >= 640 && (m)->h >= 480)	723	if ((m)->w >= 800 && (m)->h >= 480)
680	{	724	{
681	AV *av = newAV ();	725	AV *av = newAV ();
682	av_push (av, newSViv ((*m)->w));	726	av_push (av, newSViv ((*m)->w));
683	av_push (av, newSViv ((*m)->h));	727	av_push (av, newSViv ((*m)->h));
684	av_push (av, newSViv (rgb));	728	av_push (av, newSViv (rgb));
…		…
708		752
709	if (RETVAL)	753	if (RETVAL)
710	{	754	{
711	av_clear (texture_av);	755	av_clear (texture_av);
712		756
713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	757	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	758	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
715	#include "glfunc.h"	759	#include "glfunc.h"
716	#undef GL_FUNC	760	#undef GL_FUNC
717	}	761	}
718	}	762	}
…		…
725	char *	769	char *
726	SDL_GetKeyName (int sym)	770	SDL_GetKeyName (int sym)
727		771
728	int	772	int
729	SDL_GetAppState ()	773	SDL_GetAppState ()
		774
		775	int
		776	SDL_GetModState ()
730		777
731	void	778	void
732	poll_events ()	779	poll_events ()
733	PPCODE:	780	PPCODE:
734	{	781	{
…		…
744	{	791	{
745	case SDL_KEYDOWN:	792	case SDL_KEYDOWN:
746	case SDL_KEYUP:	793	case SDL_KEYUP:
747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	794	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	795	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
749	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	796	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
750	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */	797	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	798	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
752	break;	799	break;
753		800
754	case SDL_ACTIVEEVENT:	801	case SDL_ACTIVEEVENT:
755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	802	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
773	x = ev.motion.x;	820	x = ev.motion.x;
774	y = ev.motion.y;	821	y = ev.motion.y;
775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	822	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
776	}	823	}
777		824
778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	825	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
779	hv_store (hv, "state", 5, newSViv (state), 0);	826	hv_store (hv, "state", 5, newSViv (state), 0);
780	hv_store (hv, "x", 1, newSViv (x), 0);	827	hv_store (hv, "x", 1, newSViv (x), 0);
781	hv_store (hv, "y", 1, newSViv (y), 0);	828	hv_store (hv, "y", 1, newSViv (y), 0);
782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	829	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	830	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
784	}	831	}
785	break;	832	break;
786		833
787	case SDL_MOUSEBUTTONDOWN:	834	case SDL_MOUSEBUTTONDOWN:
788	case SDL_MOUSEBUTTONUP:	835	case SDL_MOUSEBUTTONUP:
789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	836	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
790		837
791	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	838	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
792	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	839	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
793	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	840	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
794	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	841	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
799	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	846	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
800	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	847	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
801	break;	848	break;
802	}	849	}
803		850
804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	851	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
805	}	852	}
806	}	853	}
807		854
808	int	855	int
809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	856	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
810	POSTCALL:	857	POSTCALL:
811	Mix_HookMusicFinished (music_finished);	858	Mix_HookMusicFinished (music_finished);
812	Mix_ChannelFinished (channel_finished);	859	Mix_ChannelFinished (channel_finished);
813		860
814	void	861	void
		862	Mix_QuerySpec ()
		863	PPCODE:
		864	{
		865	int freq, channels;
		866	Uint16 format;
		867
		868	if (Mix_QuerySpec (&freq, &format, &channels))
		869	{
		870	EXTEND (SP, 3);
		871	PUSHs (sv_2mortal (newSViv (freq)));
		872	PUSHs (sv_2mortal (newSViv (format)));
		873	PUSHs (sv_2mortal (newSViv (channels)));
		874	}
		875	}
		876
		877	void
815	Mix_CloseAudio ()	878	Mix_CloseAudio ()
816		879
817	int	880	int
818	Mix_AllocateChannels (int numchans = -1)	881	Mix_AllocateChannels (int numchans = -1)
		882
		883	const char *
		884	Mix_GetError ()
819		885
820	void	886	void
821	lowdelay (int fd, int val = 1)	887	lowdelay (int fd, int val = 1)
822	CODE:	888	CODE:
823	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	889	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
948	void	1014	void
949	error (char *message)	1015	error (char *message)
950	CODE:	1016	CODE:
951	fprintf (stderr, "ERROR: %s\n", message);	1017	fprintf (stderr, "ERROR: %s\n", message);
952	#ifdef _WIN32	1018	#ifdef _WIN32
953	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1019	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
954	#endif	1020	#endif
955		1021
956	void	1022	void
957	fatal (char *message)	1023	fatal (char *message)
958	CODE:	1024	CODE:
959	fprintf (stderr, "FATAL: %s\n", message);	1025	fprintf (stderr, "FATAL: %s\n", message);
960	#ifdef _WIN32	1026	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1027	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
962	#endif	1028	#endif
963	_exit (1);	1029	_exit (1);
964		1030
965	void	1031	void
966	_exit (int retval = 0)	1032	_exit (int retval = 0)
…		…
978	#if DEBUG	1044	#if DEBUG
979	VALGRIND_DO_LEAK_CHECK;	1045	VALGRIND_DO_LEAK_CHECK;
980	#endif	1046	#endif
981	}	1047	}
982		1048
983	MODULE = CFPlus PACKAGE = CFPlus::Font	1049	MODULE = Deliantra::Client PACKAGE = DC::Font
984		1050
985	PROTOTYPES: DISABLE	1051	PROTOTYPES: DISABLE
986		1052
987	CFPlus::Font	1053	DC::Font
988	new_from_file (SV class, char path, int id = 0)	1054	new_from_file (SV class, char path, int id = 0)
989	CODE:	1055	CODE:
990	{	1056	{
991	int count;	1057	int count;
992	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1058	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
995	}	1061	}
996	OUTPUT:	1062	OUTPUT:
997	RETVAL	1063	RETVAL
998		1064
999	void	1065	void
1000	DESTROY (CFPlus::Font self)	1066	DESTROY (DC::Font self)
1001	CODE:	1067	CODE:
1002	pango_font_description_free (self);	1068	pango_font_description_free (self);
1003		1069
1004	void	1070	void
1005	make_default (CFPlus::Font self)	1071	make_default (DC::Font self)
1006	PROTOTYPE: $	1072	PROTOTYPE: $
1007	CODE:	1073	CODE:
1008	default_font = self;	1074	default_font = self;
1009		1075
1010	MODULE = CFPlus PACKAGE = CFPlus::Layout	1076	MODULE = Deliantra::Client PACKAGE = DC::Layout
1011		1077
1012	PROTOTYPES: DISABLE	1078	PROTOTYPES: DISABLE
1013		1079
1014	void	1080	void
1015	reset_glyph_cache ()	1081	glyph_cache_backup ()
1016	PROTOTYPE:	1082	PROTOTYPE:
1017	CODE:	1083	CODE:
		1084	tc_backup ();
		1085
		1086	void
		1087	glyph_cache_restore ()
		1088	PROTOTYPE:
		1089	CODE:
1018	tc_clear ();	1090	tc_restore ();
1019		1091
1020	CFPlus::Layout	1092	DC::Layout
1021	new (SV *class)	1093	new (SV *class)
1022	CODE:	1094	CODE:
1023	New (0, RETVAL, 1, struct cf_layout);	1095	New (0, RETVAL, 1, struct cf_layout);
1024		1096
1025	RETVAL->pl = pango_layout_new (opengl_context);	1097	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1027	RETVAL->g = 1.;	1099	RETVAL->g = 1.;
1028	RETVAL->b = 1.;	1100	RETVAL->b = 1.;
1029	RETVAL->a = 1.;	1101	RETVAL->a = 1.;
1030	RETVAL->base_height = MIN_FONT_HEIGHT;	1102	RETVAL->base_height = MIN_FONT_HEIGHT;
1031	RETVAL->font = 0;	1103	RETVAL->font = 0;
		1104	RETVAL->rc = rc_alloc ();
1032		1105
1033	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1106	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1034	layout_update_font (RETVAL);	1107	layout_update_font (RETVAL);
1035	OUTPUT:	1108	OUTPUT:
1036	RETVAL	1109	RETVAL
1037		1110
1038	void	1111	void
1039	DESTROY (CFPlus::Layout self)	1112	DESTROY (DC::Layout self)
1040	CODE:	1113	CODE:
1041	g_object_unref (self->pl);	1114	g_object_unref (self->pl);
		1115	rc_free (self->rc);
1042	Safefree (self);	1116	Safefree (self);
1043		1117
1044	void	1118	void
1045	set_text (CFPlus::Layout self, SV *text_)	1119	set_text (DC::Layout self, SV *text_)
1046	CODE:	1120	CODE:
1047	{	1121	{
1048	STRLEN textlen;	1122	STRLEN textlen;
1049	char *text = SvPVutf8 (text_, textlen);	1123	char *text = SvPVutf8 (text_, textlen);
1050		1124
1051	pango_layout_set_text (self->pl, text, textlen);	1125	pango_layout_set_text (self->pl, text, textlen);
1052	}	1126	}
1053		1127
1054	void	1128	void
1055	set_markup (CFPlus::Layout self, SV *text_)	1129	set_markup (DC::Layout self, SV *text_)
1056	CODE:	1130	CODE:
1057	{	1131	{
1058	STRLEN textlen;	1132	STRLEN textlen;
1059	char *text = SvPVutf8 (text_, textlen);	1133	char *text = SvPVutf8 (text_, textlen);
1060		1134
1061	pango_layout_set_markup (self->pl, text, textlen);	1135	pango_layout_set_markup (self->pl, text, textlen);
1062	}	1136	}
1063		1137
1064	void	1138	void
1065	set_shapes (CFPlus::Layout self, ...)	1139	set_shapes (DC::Layout self, ...)
1066	CODE:	1140	CODE:
1067	{	1141	{
1068	PangoAttrList *attrs = 0;	1142	PangoAttrList *attrs = 0;
1069	const char *text = pango_layout_get_text (self->pl);	1143	const char *text = pango_layout_get_text (self->pl);
1070	const char *pos = text;	1144	const char *pos = text;
…		…
1105	if (attrs)	1179	if (attrs)
1106	pango_layout_set_attributes (self->pl, attrs);	1180	pango_layout_set_attributes (self->pl, attrs);
1107	}	1181	}
1108		1182
1109	void	1183	void
1110	get_shapes (CFPlus::Layout self)	1184	get_shapes (DC::Layout self)
1111	PPCODE:	1185	PPCODE:
1112	{	1186	{
1113	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1187	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1114		1188
1115	do	1189	do
1116	{	1190	{
1117	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1191	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1118		1192
1119	if (run && shape_attr_p (run))	1193	if (run && shape_attr_p (run))
1120	{	1194	{
1121	PangoRectangle extents;	1195	PangoRectangle extents;
1122	pango_layout_iter_get_run_extents (iter, 0, &extents);	1196	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1130		1204
1131	pango_layout_iter_free (iter);	1205	pango_layout_iter_free (iter);
1132	}	1206	}
1133		1207
1134	int	1208	int
1135	has_wrapped (CFPlus::Layout self)	1209	has_wrapped (DC::Layout self)
1136	CODE:	1210	CODE:
1137	{	1211	{
1138	int lines = 1;	1212	int lines = 1;
1139	const char *text = pango_layout_get_text (self->pl);	1213	const char *text = pango_layout_get_text (self->pl);
1140		1214
…		…
1145	}	1219	}
1146	OUTPUT:	1220	OUTPUT:
1147	RETVAL	1221	RETVAL
1148		1222
1149	SV *	1223	SV *
1150	get_text (CFPlus::Layout self)	1224	get_text (DC::Layout self)
1151	CODE:	1225	CODE:
1152	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1226	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1153	sv_utf8_decode (RETVAL);	1227	sv_utf8_decode (RETVAL);
1154	OUTPUT:	1228	OUTPUT:
1155	RETVAL	1229	RETVAL
1156		1230
1157	void	1231	void
1158	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1232	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1159	CODE:	1233	CODE:
1160	self->r = r;	1234	self->r = r;
1161	self->g = g;	1235	self->g = g;
1162	self->b = b;	1236	self->b = b;
1163	self->a = a;	1237	self->a = a;
1164		1238
1165	void	1239	void
1166	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1240	set_font (DC::Layout self, DC::Font font = 0)
1167	CODE:	1241	CODE:
1168	if (self->font != font)	1242	if (self->font != font)
1169	{	1243	{
1170	self->font = font;	1244	self->font = font;
1171	layout_update_font (self);	1245	layout_update_font (self);
1172	}	1246	}
1173		1247
1174	void	1248	void
1175	set_height (CFPlus::Layout self, int base_height)	1249	set_height (DC::Layout self, int base_height)
1176	CODE:	1250	CODE:
1177	if (self->base_height != base_height)	1251	if (self->base_height != base_height)
1178	{	1252	{
1179	self->base_height = base_height;	1253	self->base_height = base_height;
1180	layout_update_font (self);	1254	layout_update_font (self);
1181	}	1255	}
1182		1256
1183	void	1257	void
1184	set_width (CFPlus::Layout self, int max_width = -1)	1258	set_width (DC::Layout self, int max_width = -1)
1185	CODE:	1259	CODE:
1186	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1260	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1187		1261
1188	void	1262	void
1189	set_indent (CFPlus::Layout self, int indent)	1263	set_indent (DC::Layout self, int indent)
1190	CODE:	1264	CODE:
1191	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1265	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1192		1266
1193	void	1267	void
1194	set_spacing (CFPlus::Layout self, int spacing)	1268	set_spacing (DC::Layout self, int spacing)
1195	CODE:	1269	CODE:
1196	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1270	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1197		1271
1198	void	1272	void
1199	set_ellipsise (CFPlus::Layout self, int ellipsise)	1273	set_ellipsise (DC::Layout self, int ellipsise)
1200	CODE:	1274	CODE:
1201	pango_layout_set_ellipsize (self->pl,	1275	pango_layout_set_ellipsize (self->pl,
1202	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1276	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1203	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1277	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1204	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1278	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1205	: PANGO_ELLIPSIZE_NONE	1279	: PANGO_ELLIPSIZE_NONE
1206	);	1280	);
1207		1281
1208	void	1282	void
1209	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1283	set_single_paragraph_mode (DC::Layout self, int spm)
1210	CODE:	1284	CODE:
1211	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1285	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1212		1286
1213	void	1287	void
1214	size (CFPlus::Layout self)	1288	size (DC::Layout self)
1215	PPCODE:	1289	PPCODE:
1216	{	1290	{
1217	int w, h;	1291	int w, h;
1218		1292
1219	layout_get_pixel_size (self, &w, &h);	1293	layout_get_pixel_size (self, &w, &h);
…		…
1222	PUSHs (sv_2mortal (newSViv (w)));	1296	PUSHs (sv_2mortal (newSViv (w)));
1223	PUSHs (sv_2mortal (newSViv (h)));	1297	PUSHs (sv_2mortal (newSViv (h)));
1224	}	1298	}
1225		1299
1226	int	1300	int
1227	descent (CFPlus::Layout self)	1301	descent (DC::Layout self)
1228	CODE:	1302	CODE:
1229	{	1303	{
1230	PangoRectangle rect;	1304	PangoRectangle rect;
1231	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1305	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1232	pango_layout_line_get_pixel_extents (line, 0, &rect);	1306	pango_layout_line_get_pixel_extents (line, 0, &rect);
1233	RETVAL = PANGO_DESCENT (rect);	1307	RETVAL = PANGO_DESCENT (rect);
1234	}	1308	}
1235	OUTPUT:	1309	OUTPUT:
1236	RETVAL	1310	RETVAL
1237		1311
1238	int	1312	int
1239	xy_to_index (CFPlus::Layout self, int x, int y)	1313	xy_to_index (DC::Layout self, int x, int y)
1240	CODE:	1314	CODE:
1241	{	1315	{
1242	int index, trailing;	1316	int index, trailing;
1243	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1317	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1244	RETVAL = index + trailing;	1318	RETVAL = index + trailing;
1245	}	1319	}
1246	OUTPUT:	1320	OUTPUT:
1247	RETVAL	1321	RETVAL
1248		1322
1249	void	1323	void
1250	cursor_pos (CFPlus::Layout self, int index)	1324	cursor_pos (DC::Layout self, int index)
1251	PPCODE:	1325	PPCODE:
1252	{	1326	{
1253	PangoRectangle strong_pos;	1327	PangoRectangle pos;
1254	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1328	pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1255		1329
1256	EXTEND (SP, 3);	1330	EXTEND (SP, 3);
1257	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1331	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1258	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1332	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1259	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1333	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1260	}	1334	}
1261		1335
1262	void	1336	void
1263	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1337	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1264	PPCODE:	1338	PPCODE:
1265	{	1339	{
1266	int line, x;	1340	int line, x;
1267		1341
1268	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1342	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1343	#if !PANGO_VERSION_CHECK (1, 17, 3)
1269	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1344	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1270		1345	--line;
		1346	#endif
1271	EXTEND (SP, 2);	1347	EXTEND (SP, 2);
1272	PUSHs (sv_2mortal (newSViv (line - 1)));	1348	PUSHs (sv_2mortal (newSViv (line)));
1273	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1349	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1274	}	1350	}
1275		1351
1276	void	1352	void
1277	line_x_to_index (CFPlus::Layout self, int line, int x)	1353	line_x_to_index (DC::Layout self, int line, int x)
1278	PPCODE:	1354	PPCODE:
1279	{	1355	{
1280	PangoLayoutLine *lp;	1356	PangoLayoutLine *lp;
1281	int index, trailing;	1357	int index, trailing;
1282		1358
1283	if (line < 0)	1359	if (line < 0)
1284	XSRETURN_EMPTY;	1360	XSRETURN_EMPTY;
1285		1361
1286	if (!(lp = pango_layout_get_line (self->pl, line)))	1362	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1287	XSRETURN_EMPTY; /* do better */	1363	XSRETURN_EMPTY; /* do better */
1288		1364
1289	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1365	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1290		1366
1291	EXTEND (SP, 2);	1367	EXTEND (SP, 2);
…		…
1297	PUSHs (sv_2mortal (newSViv (trailing)));	1373	PUSHs (sv_2mortal (newSViv (trailing)));
1298	}	1374	}
1299	}	1375	}
1300		1376
1301	void	1377	void
1302	render (CFPlus::Layout self, float x, float y, int flags = 0)	1378	render (DC::Layout self, float x, float y, int flags = 0)
1303	PPCODE:	1379	CODE:
		1380	rc_clear (self->rc);
1304	pango_opengl_render_layout_subpixel (	1381	pango_opengl_render_layout_subpixel (
1305	self->pl,	1382	self->pl,
		1383	self->rc,
1306	x * PANGO_SCALE, y * PANGO_SCALE,	1384	x * PANGO_SCALE, y * PANGO_SCALE,
1307	self->r, self->g, self->b, self->a,	1385	self->r, self->g, self->b, self->a,
1308	flags	1386	flags
1309	);	1387	);
		1388	// we assume that context_change actually clears/frees stuff
		1389	// and does not do any recomputation...
		1390	pango_layout_context_changed (self->pl);
1310		1391
1311	MODULE = CFPlus PACKAGE = CFPlus::Texture	1392	void
		1393	draw (DC::Layout self)
		1394	CODE:
		1395	{
		1396	glEnable (GL_TEXTURE_2D);
		1397	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1398	glEnable (GL_BLEND);
		1399	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1400	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1401	glEnable (GL_ALPHA_TEST);
		1402	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1403
		1404	rc_draw (self->rc);
		1405
		1406	glDisable (GL_ALPHA_TEST);
		1407	glDisable (GL_BLEND);
		1408	glDisable (GL_TEXTURE_2D);
		1409	}
		1410
		1411	MODULE = Deliantra::Client PACKAGE = DC::Texture
1312		1412
1313	PROTOTYPES: ENABLE	1413	PROTOTYPES: ENABLE
1314
1315	int minpot (int n)
1316		1414
1317	void	1415	void
1318	pad (SV *data_, int ow, int oh, int nw, int nh)	1416	pad (SV *data_, int ow, int oh, int nw, int nh)
1319	CODE:	1417	CODE:
1320	{	1418	{
…		…
1347	HV hv = (HV )SvRV (self);	1445	HV hv = (HV )SvRV (self);
1348	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1446	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1349	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1447	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1350	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1448	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1351		1449
		1450	if (name <= 0)
		1451	XSRETURN_EMPTY;
		1452
1352	if (items < 5)	1453	if (items < 5)
1353	{	1454	{
1354	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1455	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1355	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1456	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1356	}	1457	}
…		…
1394	RETVAL = width > 0;	1495	RETVAL = width > 0;
1395	}	1496	}
1396	OUTPUT:	1497	OUTPUT:
1397	RETVAL	1498	RETVAL
1398		1499
1399	MODULE = CFPlus PACKAGE = CFPlus::Map	1500	MODULE = Deliantra::Client PACKAGE = DC::Map
1400		1501
1401	PROTOTYPES: DISABLE	1502	PROTOTYPES: DISABLE
1402		1503
1403	CFPlus::Map	1504	DC::Map
1404	new (SV *class)	1505	new (SV *class)
1405	CODE:	1506	CODE:
1406	New (0, RETVAL, 1, struct map);	1507	New (0, RETVAL, 1, struct map);
1407	RETVAL->x = 0;	1508	RETVAL->x = 0;
1408	RETVAL->y = 0;	1509	RETVAL->y = 0;
…		…
1416	RETVAL->row = 0;	1517	RETVAL->row = 0;
1417	OUTPUT:	1518	OUTPUT:
1418	RETVAL	1519	RETVAL
1419		1520
1420	void	1521	void
1421	DESTROY (CFPlus::Map self)	1522	DESTROY (DC::Map self)
1422	CODE:	1523	CODE:
1423	{	1524	{
1424	map_clear (self);	1525	map_clear (self);
1425	Safefree (self->face2tile);	1526	Safefree (self->face2tile);
1426	Safefree (self->tex);	1527	Safefree (self->tex);
1427	Safefree (self);	1528	Safefree (self);
1428	}	1529	}
1429		1530
1430	void	1531	void
1431	resize (CFPlus::Map self, int map_width, int map_height)	1532	resize (DC::Map self, int map_width, int map_height)
1432	CODE:	1533	CODE:
1433	self->w = map_width;	1534	self->w = map_width;
1434	self->h = map_height;	1535	self->h = map_height;
1435		1536
1436	void	1537	void
1437	clear (CFPlus::Map self)	1538	clear (DC::Map self)
1438	CODE:	1539	CODE:
1439	map_clear (self);	1540	map_clear (self);
1440		1541
1441	void	1542	void
1442	set_tileid (CFPlus::Map self, int face, int tile)	1543	set_tileid (DC::Map self, int face, int tile)
1443	CODE:	1544	CODE:
1444	{	1545	{
1445	need_facenum (self, face); self->face2tile [face] = tile;	1546	need_facenum (self, face); self->face2tile [face] = tile;
1446	need_texid (self, tile);	1547	need_texid (self, tile);
1447	}	1548	}
1448		1549
1449	void	1550	void
1450	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1551	set_smooth (DC::Map self, int face, int smooth, int level)
1451	CODE:	1552	CODE:
1452	{	1553	{
1453	tileid texid;	1554	tileid texid;
1454	maptex *tex;	1555	maptex *tex;
1455		1556
…		…
1468	tex->smoothtile = self->face2tile [smooth];	1569	tex->smoothtile = self->face2tile [smooth];
1469	tex->smoothlevel = level;	1570	tex->smoothlevel = level;
1470	}	1571	}
1471		1572
1472	void	1573	void
1473	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)	1574	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)
1474	CODE:	1575	CODE:
1475	{	1576	{
1476	need_texid (self, texid);	1577	need_texid (self, texid);
1477		1578
1478	{	1579	{
…		…
1498	// from transparent color bleeding and ugly wrapping effects.	1599	// from transparent color bleeding and ugly wrapping effects.
1499	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1600	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1500	}	1601	}
1501		1602
1502	int	1603	int
1503	ox (CFPlus::Map self)	1604	ox (DC::Map self)
1504	ALIAS:	1605	ALIAS:
1505	oy = 1	1606	oy = 1
1506	x = 2	1607	x = 2
1507	y = 3	1608	y = 3
1508	w = 4	1609	w = 4
…		…
1519	}	1620	}
1520	OUTPUT:	1621	OUTPUT:
1521	RETVAL	1622	RETVAL
1522		1623
1523	void	1624	void
1524	scroll (CFPlus::Map self, int dx, int dy)	1625	scroll (DC::Map self, int dx, int dy)
1525	CODE:	1626	CODE:
1526	{	1627	{
1527	if (dx > 0)	1628	if (dx > 0)
1528	map_blank (self, self->x, self->y, dx, self->h);	1629	map_blank (self, self->x, self->y, dx, self->h);
1529	else if (dx < 0)	1630	else if (dx < 0)
…		…
1544	self->rows += MAP_EXTEND_Y;	1645	self->rows += MAP_EXTEND_Y;
1545	self->y += MAP_EXTEND_Y;	1646	self->y += MAP_EXTEND_Y;
1546	}	1647	}
1547	}	1648	}
1548		1649
1549	void	1650	SV *
1550	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1651	map1a_update (DC::Map self, SV *data_, int extmap)
1551	CODE:	1652	CODE:
1552	{	1653	{
1553	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1654	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1554	uint8_t data_end = (uint8_t )SvEND (data_);	1655	uint8_t data_end = (uint8_t )SvEND (data_);
1555	mapcell *cell;	1656	mapcell *cell;
1556	int x, y, flags;	1657	int x, y, z, flags;
		1658	AV *missing = newAV ();
		1659	RETVAL = newRV_noinc ((SV *)missing);
1557		1660
1558	while (data < data_end - 1)	1661	while (data < data_end - 1)
1559	{	1662	{
1560	flags = (data [0] << 8) + data [1]; data += 2;	1663	flags = (data [0] << 8) + data [1]; data += 2;
1561		1664
…		…
1612	}	1715	}
1613	else	1716	else
1614	cell->darkness = *data++ + 1;	1717	cell->darkness = *data++ + 1;
1615	}	1718	}
1616		1719
		1720	for (z = 0; z <= 2; ++z)
1617	if (flags & 4)	1721	if (flags & (4 >> z))
1618	{	1722	{
1619	faceid face = (data [0] << 8) + data [1]; data += 2;	1723	faceid face = (data [0] << 8) + data [1]; data += 2;
1620	need_facenum (self, face);	1724	need_facenum (self, face);
1621	cell->tile [0] = self->face2tile [face];	1725	cell->tile [z] = self->face2tile [face];
		1726
		1727	if (cell->tile [z])
		1728	{
		1729	maptex *tex = self->tex + cell->tile [z];
		1730	if (!tex->name)
		1731	av_push (missing, newSViv (cell->tile [z]));
		1732
		1733	if (tex->smoothtile)
		1734	{
		1735	maptex *smooth = self->tex + tex->smoothtile;
		1736	if (!smooth->name)
		1737	av_push (missing, newSViv (tex->smoothtile));
		1738	}
		1739	}
1622	}	1740	}
1623
1624	if (flags & 2)
1625	{
1626	faceid face = (data [0] << 8) + data [1]; data += 2;
1627	need_facenum (self, face);
1628	cell->tile [1] = self->face2tile [face];
1629	}
1630
1631	if (flags & 1)
1632	{
1633	faceid face = (data [0] << 8) + data [1]; data += 2;
1634	need_facenum (self, face);
1635	cell->tile [2] = self->face2tile [face];
1636	}
1637	}	1741	}
1638	else	1742	else
1639	cell->darkness = 0;	1743	cell->darkness = 0;
1640	}	1744	}
1641	}	1745	}
		1746	OUTPUT:
		1747	RETVAL
1642		1748
1643	SV *	1749	SV *
1644	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1750	mapmap (DC::Map self, int x0, int y0, int w, int h)
1645	CODE:	1751	CODE:
1646	{	1752	{
1647	int x1, x;	1753	int x1, x;
1648	int y1, y;	1754	int y1, y;
1649	int z;	1755	int z;
…		…
1694	}	1800	}
1695	OUTPUT:	1801	OUTPUT:
1696	RETVAL	1802	RETVAL
1697		1803
1698	void	1804	void
1699	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1805	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1700	CODE:	1806	CODE:
1701	{	1807	{
		1808	int x, y, z;
		1809
1702	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1810	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1703	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1811	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1704	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1812	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1705	smooth_key skey;	1813	smooth_key skey;
1706	int x, y, z;	1814
1707	int last_name;	1815	rc_t *rc = rc_alloc ();
		1816	rc_key_t key;
		1817	rc_array_t *arr;
1708		1818
1709	// thats current max. sorry.	1819	// thats current max. sorry.
1710	if (sw > 255) sw = 255;	1820	if (sw > 255) sw = 255;
1711	if (sh > 255) sh = 255;	1821	if (sh > 255) sh = 255;
1712		1822
1713	// clear key, in case of extra padding	1823	// clear key, in case of extra padding
1714	memset (&skey, 0, sizeof (skey));	1824	memset (&skey, 0, sizeof (skey));
1715		1825
1716	glColor4ub (255, 255, 255, 255);	1826	memset (&key, 0, sizeof (key));
1717		1827	key.r = 255;
1718	glEnable (GL_BLEND);	1828	key.g = 255;
1719	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1829	key.b = 255;
1720	glEnable (GL_TEXTURE_2D);	1830	key.a = 255;
1721	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1831	key.mode = GL_QUADS;
1722		1832	key.format = GL_T2F_V3F;
1723	glBegin (GL_QUADS);	1833	key.texname = -1;
1724
1725	last_name = 0;
1726		1834
1727	mx += self->x;	1835	mx += self->x;
1728	my += self->y;	1836	my += self->y;
1729		1837
1730	// first pass: determine smooth_max	1838	// first pass: determine smooth_max
…		…
1746	MAX (self->tex [cell->tile [0]].smoothlevel,	1854	MAX (self->tex [cell->tile [0]].smoothlevel,
1747	MAX (self->tex [cell->tile [1]].smoothlevel,	1855	MAX (self->tex [cell->tile [1]].smoothlevel,
1748	self->tex [cell->tile [2]].smoothlevel));	1856	self->tex [cell->tile [2]].smoothlevel));
1749	}	1857	}
1750	}	1858	}
		1859
		1860	glEnable (GL_BLEND);
		1861	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1862	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1751		1863
1752	for (z = 0; z <= 2; z++)	1864	for (z = 0; z <= 2; z++)
1753	{	1865	{
1754	memset (smooth_level, 0, sizeof (smooth_level));	1866	memset (smooth_level, 0, sizeof (smooth_level));
1755		1867
…		…
1765	tileid tile = cell->tile [z];	1877	tileid tile = cell->tile [z];
1766		1878
1767	if (tile)	1879	if (tile)
1768	{	1880	{
1769	maptex tex = self->tex [tile];	1881	maptex tex = self->tex [tile];
1770	int px = (x + 1) * T - tex.w;	1882	int px, py;
1771	int py = (y + 1) * T - tex.h;
1772		1883
1773	// suppressing texture state switches here
1774	// is only moderately effective, but worth the extra effort
1775	if (last_name != tex.name)	1884	if (key.texname != tex.name)
1776	{	1885	{
1777	if (!tex.name)	1886	if (!tex.name)
1778	tex = self->tex [2]; /* missing, replace by noface */	1887	tex = self->tex [2]; /* missing, replace by noface */
1779		1888
1780	glEnd ();	1889	key.texname = tex.name;
1781	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1890	arr = rc_array (rc, &key);
1782	glBegin (GL_QUADS);
1783	}	1891	}
1784		1892
1785	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1893	px = (x + 1) * T - tex.w;
		1894	py = (y + 1) * T - tex.h;
		1895
		1896	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1786	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1897	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1787	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1898	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1788	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1899	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1789		1900
1790	if (cell->flags && z == 2)	1901	if (cell->flags && z == 2)
1791	{	1902	{
		1903	// overlays such as the speech bubble, probably more to come
1792	if (cell->flags & 1)	1904	if (cell->flags & 1)
1793	{	1905	{
1794	maptex tex = self->tex [1];	1906	maptex tex = self->tex [1];
1795	int px = x * T + T * 2 / 32;	1907	int px = x * T + T * 2 / 32;
1796	int py = y * T - T * 6 / 32;	1908	int py = y * T - T * 6 / 32;
1797		1909
		1910	if (tex.name)
1798	glEnd ();	1911	{
1799	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1912	if (key.texname != tex.name)
		1913	{
		1914	key.texname = tex.name;
		1915	arr = rc_array (rc, &key);
		1916	}
		1917
		1918	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1919	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1920	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1921	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1800	glBegin (GL_QUADS);	1922	}
1801
1802	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1803	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1804	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1805	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1806	}	1923	}
1807	}	1924	}
1808		1925
1809	// update smooth hash	1926	// update smooth hash
1810	if (tex.smoothtile)	1927	if (tex.smoothtile)
…		…
1846	}	1963	}
1847	}	1964	}
1848	}	1965	}
1849	}	1966	}
1850		1967
		1968	rc_draw (rc);
		1969	rc_clear (rc);
		1970
1851	// go through all smoothlevels, lowest to highest, then draw.	1971	// go through all smoothlevels, lowest to highest, then draw.
1852	// this is basically counting sort	1972	// this is basically counting sort
1853	{	1973	{
1854	int w, b;	1974	int w, b;
1855		1975
		1976	glEnable (GL_TEXTURE_2D);
		1977	glBegin (GL_QUADS);
1856	for (w = 0; w < 256 / 32; ++w)	1978	for (w = 0; w < 256 / 32; ++w)
1857	{	1979	{
1858	uint32_t smask = smooth_level [w];	1980	uint32_t smask = smooth_level [w];
1859	if (smask)	1981	if (smask)
1860	for (b = 0; b < 32; ++b)	1982	for (b = 0; b < 32; ++b)
…		…
1879	int border = bits & 15;	2001	int border = bits & 15;
1880	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2002	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1881	float dx = tex.s * .0625f; // 16 images/row	2003	float dx = tex.s * .0625f; // 16 images/row
1882	float dy = tex.t * .5f ; // 2 images/column	2004	float dy = tex.t * .5f ; // 2 images/column
1883		2005
1884	// this time naively avoiding texture state changes
1885	// save gobs of state changes.
1886	if (last_name != tex.name)	2006	if (tex.name)
1887	{	2007	{
		2008	// this time avoiding texture state changes
		2009	// save gobs of state changes.
1888	if (!tex.name)	2010	if (key.texname != tex.name)
1889	continue; // smoothing not yet available	2011	{
1890
1891	glEnd ();	2012	glEnd ();
1892	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2013	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1893	glBegin (GL_QUADS);	2014	glBegin (GL_QUADS);
1894	}	2015	}
1895		2016
1896	if (border)	2017	if (border)
1897	{	2018	{
1898	float ox = border * dx;	2019	float ox = border * dx;
1899		2020
1900	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2021	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1901	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2022	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1902	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2023	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1903	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2024	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1904	}	2025	}
1905		2026
1906	if (corner)	2027	if (corner)
1907	{	2028	{
1908	float ox = corner * dx;	2029	float ox = corner * dx;
1909		2030
1910	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2031	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1911	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2032	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1912	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2033	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1913	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2034	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2035	}
1914	}	2036	}
1915	}	2037	}
1916	}	2038	}
1917	}	2039	}
1918	}	2040	}
		2041
		2042	glEnd ();
		2043	glDisable (GL_TEXTURE_2D);
		2044	key.texname = -1;
1919	}	2045	}
1920		2046
1921	hv_clear (smooth);	2047	hv_clear (smooth);
1922	}	2048	}
1923		2049
1924	glEnd ();
1925
1926	glDisable (GL_TEXTURE_2D);
1927	glDisable (GL_BLEND);	2050	glDisable (GL_BLEND);
		2051	rc_free (rc);
1928		2052
1929	// top layer: overlays such as the health bar	2053	// top layer: overlays such as the health bar
1930	for (y = 0; y < sh; y++)	2054	for (y = 0; y < sh; y++)
1931	if (0 <= y + my && y + my < self->rows)	2055	if (0 <= y + my && y + my < self->rows)
1932	{	2056	{
…		…
1957	}	2081	}
1958	}	2082	}
1959	}	2083	}
1960		2084
1961	void	2085	void
1962	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2086	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1963	CODE:	2087	CODE:
1964	{	2088	{
1965	static float color[16][3] = {	2089	static float color[16][3] = {
1966	{ 0.00F, 0.00F, 0.00F },	2090	{ 0.00F, 0.00F, 0.00F },
1967	{ 1.00F, 1.00F, 1.00F },	2091	{ 1.00F, 1.00F, 1.00F },
…		…
2017	glDisable (GL_BLEND);	2141	glDisable (GL_BLEND);
2018	glDisable (GL_TEXTURE_2D);	2142	glDisable (GL_TEXTURE_2D);
2019	}	2143	}
2020		2144
2021	void	2145	void
2022	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2146	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2023	PPCODE:	2147	PPCODE:
2024	{	2148	{
2025	int x, y;	2149	int x, y;
2026	int sw1 = sw + 2;	2150	int sw1 = sw + 2;
2027	int sh1 = sh + 2;	2151	int sh1 = sh + 2;
…		…
2098	PUSHs (sv_2mortal (newSViv (sh3)));	2222	PUSHs (sv_2mortal (newSViv (sh3)));
2099	PUSHs (darkness3_sv);	2223	PUSHs (darkness3_sv);
2100	}	2224	}
2101		2225
2102	SV *	2226	SV *
2103	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2227	get_rect (DC::Map self, int x0, int y0, int w, int h)
2104	CODE:	2228	CODE:
2105	{	2229	{
2106	int x, y, x1, y1;	2230	int x, y, x1, y1;
2107	SV data_sv = newSV (w h * 7 + 5);	2231	SV data_sv = newSV (w h * 7 + 5);
2108	uint8_t data = (uint8_t )SvPVX (data_sv);	2232	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2173	}	2297	}
2174	OUTPUT:	2298	OUTPUT:
2175	RETVAL	2299	RETVAL
2176		2300
2177	void	2301	void
2178	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2302	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2179	PPCODE:	2303	PPCODE:
2180	{	2304	{
2181	int x, y, z;	2305	int x, y, z;
2182	int w, h;	2306	int w, h;
2183	int x1, y1;	2307	int x1, y1;
2184		2308
2185	if (*data++ != 0)	2309	if (*data++ != 0)
2186	return; /* version mismatch */	2310	XSRETURN_EMPTY; /* version mismatch */
2187		2311
2188	w = data++ << 8; w \|= data++;	2312	w = data++ << 8; w \|= data++;
2189	h = data++ << 8; h \|= data++;	2313	h = data++ << 8; h \|= data++;
2190		2314
2191	// we need to do this 'cause we don't keep an absolute coord system for rows	2315	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2236	}	2360	}
2237	}	2361	}
2238	}	2362	}
2239	}	2363	}
2240		2364
2241	MODULE = CFPlus PACKAGE = CFPlus::RW	2365	MODULE = Deliantra::Client PACKAGE = DC::RW
2242		2366
2243	CFPlus::RW	2367	DC::RW
2244	new (SV class, SV data_sv)	2368	new (SV class, SV data_sv)
2245	CODE:	2369	CODE:
2246	{	2370	{
2247	STRLEN datalen;	2371	STRLEN datalen;
2248	char *data = SvPVbyte (data_sv, datalen);	2372	char *data = SvPVbyte (data_sv, datalen);
…		…
2250	RETVAL = SDL_RWFromConstMem (data, datalen);	2374	RETVAL = SDL_RWFromConstMem (data, datalen);
2251	}	2375	}
2252	OUTPUT:	2376	OUTPUT:
2253	RETVAL	2377	RETVAL
2254		2378
2255	CFPlus::RW	2379	DC::RW
2256	new_from_file (SV class, const char path, const char *mode = "rb")	2380	new_from_file (SV class, const char path, const char *mode = "rb")
2257	CODE:	2381	CODE:
2258	RETVAL = SDL_RWFromFile (path, mode);	2382	RETVAL = SDL_RWFromFile (path, mode);
2259	OUTPUT:	2383	OUTPUT:
2260	RETVAL	2384	RETVAL
2261		2385
		2386	# fails on win32:
		2387	# dc.xs(2268) : error C2059: syntax error : '('
2262	void	2388	#void
2263	close (CFPlus::RW self)	2389	#close (DC::RW self)
2264	CODE:	2390	# CODE:
2265	SDL_RWclose (self);	2391	# (self->(close)) (self);
2266		2392
2267	MODULE = CFPlus PACKAGE = CFPlus::Channel	2393	MODULE = Deliantra::Client PACKAGE = DC::Channel
2268		2394
2269	PROTOTYPES: DISABLE	2395	PROTOTYPES: DISABLE
2270		2396
2271	void	2397	DC::Channel
2272	halt (CFPlus::Channel self)	2398	find ()
2273	CODE:	2399	CODE:
		2400	{
		2401	RETVAL = Mix_GroupAvailable (-1);
		2402
		2403	if (RETVAL < 0)
		2404	{
		2405	RETVAL = Mix_GroupOldest (-1);
		2406
		2407	if (RETVAL < 0)
		2408	XSRETURN_UNDEF;
		2409
2274	Mix_HaltChannel (self);	2410	Mix_HaltChannel (RETVAL);
		2411	}
2275		2412
2276	void	2413	Mix_UnregisterAllEffects (RETVAL);
2277	expire (CFPlus::Channel self, int ticks = -1)	2414	Mix_Volume (RETVAL, 128);
2278	CODE:	2415	}
2279	Mix_ExpireChannel (self, ticks);
2280
2281	void
2282	fade_out (CFPlus::Channel self, int ticks = -1)
2283	CODE:
2284	Mix_FadeOutChannel (self, ticks);
2285
2286	int
2287	volume (CFPlus::Channel self, int volume)
2288	CODE:
2289	RETVAL = Mix_Volume (self, volume);
2290	OUTPUT:	2416	OUTPUT:
2291	RETVAL	2417	RETVAL
2292		2418
2293	void	2419	void
		2420	halt (DC::Channel self)
		2421	CODE:
		2422	Mix_HaltChannel (self);
		2423
		2424	void
		2425	expire (DC::Channel self, int ticks = -1)
		2426	CODE:
		2427	Mix_ExpireChannel (self, ticks);
		2428
		2429	void
		2430	fade_out (DC::Channel self, int ticks = -1)
		2431	CODE:
		2432	Mix_FadeOutChannel (self, ticks);
		2433
		2434	int
		2435	volume (DC::Channel self, int volume)
		2436	CODE:
		2437	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2438	OUTPUT:
		2439	RETVAL
		2440
		2441	void
2294	unregister_all_effects (CFPlus::Channel self)	2442	unregister_all_effects (DC::Channel self)
2295	CODE:	2443	CODE:
2296	Mix_UnregisterAllEffects (self);	2444	Mix_UnregisterAllEffects (self);
2297		2445
2298	void	2446	void
2299	set_panning (CFPlus::Channel self, int left, int right)	2447	set_panning (DC::Channel self, int left, int right)
2300	CODE:	2448	CODE:
		2449	left = CLAMP (left , 0, 255);
		2450	right = CLAMP (right, 0, 255);
2301	Mix_SetPanning (self, left, right);	2451	Mix_SetPanning (self, left, right);
2302		2452
2303	void	2453	void
2304	set_distance (CFPlus::Channel self, int distance)	2454	set_distance (DC::Channel self, int distance)
2305	CODE:	2455	CODE:
2306	Mix_SetDistance (self, distance);	2456	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2307		2457
2308	void	2458	void
2309	set_position (CFPlus::Channel self, int angle, int distance)	2459	set_position (DC::Channel self, int angle, int distance)
2310	CODE:	2460	CODE:
		2461
		2462	void
		2463	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2464	CODE:
		2465	{
		2466	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2467	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2311	Mix_SetPosition (self, angle, distance);	2468	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2469	}
2312		2470
2313	void	2471	void
2314	set_reverse_stereo (CFPlus::Channel self, int flip)	2472	set_reverse_stereo (DC::Channel self, int flip)
2315	CODE:	2473	CODE:
2316	Mix_SetReverseStereo (self, flip);	2474	Mix_SetReverseStereo (self, flip);
2317		2475
2318	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2476	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2319		2477
2320	PROTOTYPES: DISABLE	2478	PROTOTYPES: DISABLE
2321		2479
2322	CFPlus::MixChunk	2480	DC::MixChunk
2323	new (SV *class, CFPlus::RW rwops)	2481	new (SV *class, DC::RW rwops)
2324	CODE:	2482	CODE:
2325	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2483	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2326	OUTPUT:	2484	OUTPUT:
2327	RETVAL	2485	RETVAL
2328		2486
2329	void	2487	void
2330	DESTROY (CFPlus::MixChunk self)	2488	DESTROY (DC::MixChunk self)
2331	CODE:	2489	CODE:
2332	Mix_FreeChunk (self);	2490	Mix_FreeChunk (self);
2333		2491
2334	int	2492	int
2335	volume (CFPlus::MixChunk self, int volume = -1)	2493	volume (DC::MixChunk self, int volume = -1)
2336	CODE:	2494	CODE:
		2495	if (items > 1)
		2496	volume = CLAMP (volume, 0, 128);
2337	RETVAL = Mix_VolumeChunk (self, volume);	2497	RETVAL = Mix_VolumeChunk (self, volume);
2338	OUTPUT:	2498	OUTPUT:
2339	RETVAL	2499	RETVAL
2340		2500
2341	CFPlus::Channel	2501	DC::Channel
2342	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2502	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2343	CODE:	2503	CODE:
		2504	{
2344	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2506
		2507	if (RETVAL < 0)
		2508	XSRETURN_UNDEF;
		2509
		2510	if (channel < 0)
		2511	{
2345	Mix_UnregisterAllEffects (RETVAL);	2512	Mix_UnregisterAllEffects (RETVAL);
		2513	Mix_Volume (RETVAL, 128);
		2514	}
		2515	}
2346	OUTPUT:	2516	OUTPUT:
2347	RETVAL	2517	RETVAL
2348		2518
2349	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2519	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2350		2520
2351	int	2521	int
2352	volume (int volume = -1)	2522	volume (int volume = -1)
2353	PROTOTYPE: ;$	2523	PROTOTYPE: ;$
2354	CODE:	2524	CODE:
		2525	if (items > 0)
		2526	volume = CLAMP (volume, 0, 128);
2355	RETVAL = Mix_VolumeMusic (volume);	2527	RETVAL = Mix_VolumeMusic (volume);
2356	OUTPUT:	2528	OUTPUT:
2357	RETVAL	2529	RETVAL
2358		2530
2359	void	2531	void
…		…
2364	void	2536	void
2365	halt ()	2537	halt ()
2366	CODE:	2538	CODE:
2367	Mix_HaltMusic ();	2539	Mix_HaltMusic ();
2368		2540
2369	CFPlus::MixMusic	2541	DC::MixMusic
2370	new (SV *class, CFPlus::RW rwops)	2542	new (SV *class, DC::RW rwops)
2371	CODE:	2543	CODE:
2372	RETVAL = Mix_LoadMUS_RW (rwops);	2544	RETVAL = Mix_LoadMUS_RW (rwops);
2373	OUTPUT:	2545	OUTPUT:
2374	RETVAL	2546	RETVAL
2375		2547
2376	void	2548	void
2377	DESTROY (CFPlus::MixMusic self)	2549	DESTROY (DC::MixMusic self)
2378	CODE:	2550	CODE:
2379	Mix_FreeMusic (self);	2551	Mix_FreeMusic (self);
2380		2552
2381	int	2553	int
2382	play (CFPlus::MixMusic self, int loops = -1)	2554	play (DC::MixMusic self, int loops = -1)
2383	CODE:	2555	CODE:
2384	RETVAL = Mix_PlayMusic (self, loops);	2556	RETVAL = Mix_PlayMusic (self, loops);
2385	OUTPUT:	2557	OUTPUT:
2386	RETVAL	2558	RETVAL
2387		2559
2388	void	2560	void
2389	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2561	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2390	CODE:	2562	CODE:
2391	Mix_FadeInMusicPos (self, loops, ms, position);	2563	Mix_FadeInMusicPos (self, loops, ms, position);
2392		2564
2393	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2565	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2394		2566
2395	PROTOTYPES: ENABLE	2567	PROTOTYPES: ENABLE
2396		2568
2397	BOOT:	2569	BOOT:
2398	{	2570	{
2399	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2571	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2400	static const struct {	2572	static const struct {
2401	const char *name;	2573	const char *name;
2402	IV iv;	2574	IV iv;
2403	} *civ, const_iv[] = {	2575	} *civ, const_iv[] = {
2404	# define const_iv(name) { # name, (IV)name }	2576	# define const_iv(name) { # name, (IV)name }
…		…
2439	const_iv (GL_INTENSITY),	2611	const_iv (GL_INTENSITY),
2440	const_iv (GL_LUMINANCE),	2612	const_iv (GL_LUMINANCE),
2441	const_iv (GL_LUMINANCE_ALPHA),	2613	const_iv (GL_LUMINANCE_ALPHA),
2442	const_iv (GL_FLOAT),	2614	const_iv (GL_FLOAT),
2443	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2615	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2616	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2617	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2618	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2619	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2620	const_iv (GL_COMPRESSED_RGB_ARB),
		2621	const_iv (GL_COMPRESSED_RGBA_ARB),
2444	const_iv (GL_COMPILE),	2622	const_iv (GL_COMPILE),
2445	const_iv (GL_PROXY_TEXTURE_1D),	2623	const_iv (GL_PROXY_TEXTURE_1D),
2446	const_iv (GL_PROXY_TEXTURE_2D),	2624	const_iv (GL_PROXY_TEXTURE_2D),
2447	const_iv (GL_TEXTURE_1D),	2625	const_iv (GL_TEXTURE_1D),
2448	const_iv (GL_TEXTURE_2D),	2626	const_iv (GL_TEXTURE_2D),
…		…
2487	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2665	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2488	const_iv (GL_POINT_SMOOTH_HINT),	2666	const_iv (GL_POINT_SMOOTH_HINT),
2489	const_iv (GL_LINE_SMOOTH_HINT),	2667	const_iv (GL_LINE_SMOOTH_HINT),
2490	const_iv (GL_POLYGON_SMOOTH_HINT),	2668	const_iv (GL_POLYGON_SMOOTH_HINT),
2491	const_iv (GL_GENERATE_MIPMAP_HINT),	2669	const_iv (GL_GENERATE_MIPMAP_HINT),
		2670	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2492	const_iv (GL_FASTEST),	2671	const_iv (GL_FASTEST),
2493	const_iv (GL_DONT_CARE),	2672	const_iv (GL_DONT_CARE),
2494	const_iv (GL_NICEST),	2673	const_iv (GL_NICEST),
2495	const_iv (GL_V2F),	2674	const_iv (GL_V2F),
2496	const_iv (GL_V3F),	2675	const_iv (GL_V3F),
…		…
2504		2683
2505	texture_av = newAV ();	2684	texture_av = newAV ();
2506	AvREAL_off (texture_av);	2685	AvREAL_off (texture_av);
2507	}	2686	}
2508		2687
		2688	void
		2689	disable_GL_EXT_blend_func_separate ()
		2690	CODE:
		2691	gl.BlendFuncSeparate = 0;
		2692	gl.BlendFuncSeparateEXT = 0;
		2693
2509	char *	2694	char *
2510	gl_vendor ()	2695	gl_vendor ()
2511	CODE:	2696	CODE:
2512	RETVAL = (char *)glGetString (GL_VENDOR);	2697	RETVAL = (char *)glGetString (GL_VENDOR);
2513	OUTPUT:	2698	OUTPUT:
…		…
2634		2819
2635	void glRect (float x1, float y1, float x2, float y2)	2820	void glRect (float x1, float y1, float x2, float y2)
2636	CODE:	2821	CODE:
2637	glRectf (x1, y1, x2, y2);	2822	glRectf (x1, y1, x2, y2);
2638		2823
		2824	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2825	CODE:
		2826	glBegin (GL_LINE_LOOP);
		2827	glVertex2f (x1, y1);
		2828	glVertex2f (x2, y1);
		2829	glVertex2f (x2, y2);
		2830	glVertex2f (x1, y2);
		2831	glEnd ();
		2832
2639	PROTOTYPES: ENABLE	2833	PROTOTYPES: ENABLE
2640		2834
2641	void glBegin (int mode)	2835	void glBegin (int mode)
2642		2836
2643	void glEnd ()	2837	void glEnd ()
…		…
2675	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2869	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2676	CODE:	2870	CODE:
2677	if (gl.SeparableFilter2D)	2871	if (gl.SeparableFilter2D)
2678	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2872	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2679		2873
2680	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2874	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2681		2875
2682	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2876	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2683		2877
2684	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2878	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2685		2879
…		…
2711		2905
2712	void glEndList ()	2906	void glEndList ()
2713		2907
2714	void glCallList (int list)	2908	void glCallList (int list)
2715		2909
2716	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2910	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2717		2911
2718	PROTOTYPES: DISABLE	2912	PROTOTYPES: DISABLE
2719		2913
2720	void	2914	void
2721	find_widget (SV *self, NV x, NV y)	2915	find_widget (SV *self, NV x, NV y)
…		…
2725	XPUSHs (self);	2919	XPUSHs (self);
2726	}	2920	}
2727		2921
2728	BOOT:	2922	BOOT:
2729	{	2923	{
2730	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2924	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2731		2925
2732	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2926	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2733	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2927	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2734	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2928	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2735	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2929	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2736	}	2930	}
2737		2931
2738	void	2932	void
2739	draw (SV *self)	2933	draw (SV *self)
2740	CODE:	2934	CODE:
…		…
2744	NV x, y, w, h;	2938	NV x, y, w, h;
2745	SV *draw_x_sv = GvSV (draw_x_gv);	2939	SV *draw_x_sv = GvSV (draw_x_gv);
2746	SV *draw_y_sv = GvSV (draw_y_gv);	2940	SV *draw_y_sv = GvSV (draw_y_gv);
2747	SV *draw_w_sv = GvSV (draw_w_gv);	2941	SV *draw_w_sv = GvSV (draw_w_gv);
2748	SV *draw_h_sv = GvSV (draw_h_gv);	2942	SV *draw_h_sv = GvSV (draw_h_gv);
2749	SV *hover;
2750	double draw_x, draw_y, draw_w, draw_h;	2943	double draw_x, draw_y;
2751		2944
2752	if (!SvROK (self))	2945	if (!SvROK (self))
2753	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2946	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2754		2947
2755	hv = (HV *)SvRV (self);	2948	hv = (HV *)SvRV (self);
2756		2949
2757	if (SvTYPE (hv) != SVt_PVHV)	2950	if (SvTYPE (hv) != SVt_PVHV)
2758	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2951	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2759		2952
2760	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2953	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2761	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2954	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2762		2955
2763	if (!h \|\| !w)	2956	if (!h \|\| !w)
…		…
2783	{	2976	{
2784	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2977	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2785		2978
2786	if (svp && SvTRUE (*svp))	2979	if (svp && SvTRUE (*svp))
2787	{	2980	{
2788	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2981	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2789	glEnable (GL_BLEND);	2982	glEnable (GL_BLEND);
2790	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2983	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2791	glBegin (GL_QUADS);	2984	glBegin (GL_QUADS);
2792	glVertex2f (0, 0);	2985	glVertex2f (0, 0);
2793	glVertex2f (w, 0);	2986	glVertex2f (w, 0);
…		…
2796	glEnd ();	2989	glEnd ();
2797	glDisable (GL_BLEND);	2990	glDisable (GL_BLEND);
2798	}	2991	}
2799	}	2992	}
2800	#if 0	2993	#if 0
2801	if ($ENV{CFPLUS_DEBUG} & 1) {	2994	// draw borders, for debugging
2802	glPushMatrix;	2995	glPushMatrix ();
2803	glColor 1, 1, 0, 1;	2996	glColor4f (1., 1., 0., 1.);
2804	glTranslate 0.375, 0.375;	2997	glTranslatef (.5, .5, 0.);
2805	glBegin GL_LINE_LOOP;	2998	glBegin (GL_LINE_LOOP);
2806	glVertex 0 , 0;	2999	glVertex2f (0 , 0);
2807	glVertex $self->{w} - 1, 0;	3000	glVertex2f (w - 1, 0);
2808	glVertex $self->{w} - 1, $self->{h} - 1;	3001	glVertex2f (w - 1, h - 1);
2809	glVertex 0 , $self->{h} - 1;	3002	glVertex2f (0 , h - 1);
2810	glEnd;	3003	glEnd ();
2811	glPopMatrix;	3004	glPopMatrix ();
2812	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2813	}
2814	#endif	3005	#endif
2815	PUSHMARK (SP);	3006	PUSHMARK (SP);
2816	XPUSHs (self);	3007	XPUSHs (self);
2817	PUTBACK;	3008	PUTBACK;
2818	call_method ("_draw", G_VOID \| G_DISCARD);	3009	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC vs. Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC vs.
Revision 1.256 by root, Mon Mar 24 00:24:46 2008 UTC