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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC

…		…
114	av_push (texture_av, (SV *)(size_t)name);	114	av_push (texture_av, (SV *)(size_t)name);
115	glDeleteTextures (1, &name);	115	glDeleteTextures (1, &name);
116	}	116	}
117		117
118	#include "texcache.c"	118	#include "texcache.c"
		119	#include "rendercache.c"
119		120
120	#include "pango-font.c"	121	#include "pango-font.c"
121	#include "pango-fontmap.c"	122	#include "pango-fontmap.c"
122	#include "pango-render.c"	123	#include "pango-render.c"
123		124
124	typedef IV CFPlus__Channel;	125	typedef IV DC__Channel;
125	typedef SDL_RWops *CFPlus__RW;	126	typedef SDL_RWops *DC__RW;
126	typedef Mix_Chunk *CFPlus__MixChunk;	127	typedef Mix_Chunk *DC__MixChunk;
127	typedef Mix_Music *CFPlus__MixMusic;	128	typedef Mix_Music *DC__MixMusic;
128		129
129	typedef PangoFontDescription *CFPlus__Font;	130	typedef PangoFontDescription *DC__Font;
130		131
131	static int	132	static int
132	shape_attr_p (PangoLayoutRun *run)	133	shape_attr_p (PangoLayoutRun *run)
133	{	134	{
134	GSList *attrs = run->item->analysis.extra_attrs;	135	GSList *attrs = run->item->analysis.extra_attrs;
…		…
148		149
149	typedef struct cf_layout {	150	typedef struct cf_layout {
150	PangoLayout *pl;	151	PangoLayout *pl;
151	float r, g, b, a; // default color for rgba mode	152	float r, g, b, a; // default color for rgba mode
152	int base_height;	153	int base_height;
153	CFPlus__Font font;	154	DC__Font font;
		155	rc_t *rc;
154	} *CFPlus__Layout;	156	} *DC__Layout;
155		157
156	static CFPlus__Font default_font;	158	static DC__Font default_font;
157	static PangoContext *opengl_context;	159	static PangoContext *opengl_context;
158	static PangoFontMap *opengl_fontmap;	160	static PangoFontMap *opengl_fontmap;
159		161
160	static void	162	static void
161	substitute_func (FcPattern *pattern, gpointer data)	163	substitute_func (FcPattern *pattern, gpointer data)
…		…
166	#endif	168	#endif
167	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	169	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168	}	170	}
169		171
170	static void	172	static void
171	layout_update_font (CFPlus__Layout self)	173	layout_update_font (DC__Layout self)
172	{	174	{
173	/* use a random scale factor to account for unknown descenders, 0.8 works	175	/* use a random scale factor to account for unknown descenders, 0.8 works
174	* reasonably well with bitstream vera	176	* reasonably well with bitstream vera
175	*/	177	*/
176	PangoFontDescription *font = self->font ? self->font : default_font;	178	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
180		182
181	pango_layout_set_font_description (self->pl, font);	183	pango_layout_set_font_description (self->pl, font);
182	}	184	}
183		185
184	static void	186	static void
185	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	187	layout_get_pixel_size (DC__Layout self, int w, int h)
186	{	188	{
187	PangoRectangle rect;	189	PangoRectangle rect;
188		190
189	// get_pixel_* wrongly rounds down	191	// get_pixel_* wrongly rounds down
190	pango_layout_get_extents (self->pl, 0, &rect);	192	pango_layout_get_extents (self->pl, 0, &rect);
…		…
201		203
202	typedef uint16_t tileid;	204	typedef uint16_t tileid;
203	typedef uint16_t faceid;	205	typedef uint16_t faceid;
204		206
205	typedef struct {	207	typedef struct {
206	int name;	208	GLuint name;
207	int w, h;	209	int w, h;
208	float s, t;	210	float s, t;
209	uint8_t r, g, b, a;	211	uint8_t r, g, b, a;
210	tileid smoothtile;	212	tileid smoothtile;
211	uint8_t smoothlevel;	213	uint8_t smoothlevel;
…		…
229	int faces; tileid *face2tile; // [faceid]	231	int faces; tileid *face2tile; // [faceid]
230	int texs; maptex *tex; // [tileid]	232	int texs; maptex *tex; // [tileid]
231		233
232	int32_t rows;	234	int32_t rows;
233	maprow *row;	235	maprow *row;
234	} *CFPlus__Map;	236	} *DC__Map;
235		237
236	static char *	238	static char *
237	prepend (char *ptr, int sze, int inc)	239	prepend (char *ptr, int sze, int inc)
238	{	240	{
239	char *p;	241	char *p;
…		…
277	self->texs *= 2;	279	self->texs *= 2;
278	}	280	}
279	}	281	}
280		282
281	static maprow *	283	static maprow *
282	map_get_row (CFPlus__Map self, int y)	284	map_get_row (DC__Map self, int y)
283	{	285	{
284	if (0 > y)	286	if (0 > y)
285	{	287	{
286	int extend = - y + MAP_EXTEND_Y;	288	int extend = - y + MAP_EXTEND_Y;
287	Prepend (maprow, self->row, self->rows, extend);	289	Prepend (maprow, self->row, self->rows, extend);
…		…
325		327
326	return row->col + (x - row->c0);	328	return row->col + (x - row->c0);
327	}	329	}
328		330
329	static mapcell *	331	static mapcell *
330	map_get_cell (CFPlus__Map self, int x, int y)	332	map_get_cell (DC__Map self, int x, int y)
331	{	333	{
332	return row_get_cell (map_get_row (self, y), x);	334	return row_get_cell (map_get_row (self, y), x);
333	}	335	}
334		336
335	static void	337	static void
336	map_clear (CFPlus__Map self)	338	map_clear (DC__Map self)
337	{	339	{
338	int r;	340	int r;
339		341
340	for (r = 0; r < self->rows; r++)	342	for (r = 0; r < self->rows; r++)
341	Safefree (self->row[r].col);	343	Safefree (self->row[r].col);
…		…
349	self->row = 0;	351	self->row = 0;
350	self->rows = 0;	352	self->rows = 0;
351	}	353	}
352		354
353	static void	355	static void
354	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	356	map_blank (DC__Map self, int x0, int y0, int w, int h)
355	{	357	{
356	int x, y;	358	int x, y;
357	maprow *row;	359	maprow *row;
358	mapcell *cell;	360	mapcell *cell;
359		361
…		…
438	n \|= n >> 16;	440	n \|= n >> 16;
439		441
440	return n + 1;	442	return n + 1;
441	}	443	}
442		444
		445	static unsigned int
		446	popcount (unsigned int n)
		447	{
		448	n -= (n >> 1) & 0x55555555U;
		449	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		450	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		451	n *= 0x01010101U;
		452
		453	return n >> 24;
		454	}
		455
443	/* SDL should provide this, really. */	456	/* SDL should provide this, really. */
444	#define SDLK_MODIFIER_MIN 300	457	#define SDLK_MODIFIER_MIN 300
445	#define SDLK_MODIFIER_MAX 314	458	#define SDLK_MODIFIER_MAX 314
446		459
447	/******************************************************************************/	460	/******************************************************************************/
…		…
485	return 0;	498	return 0;
486		499
487	return 1;	500	return 1;
488	}	501	}
489		502
490	MODULE = CFPlus PACKAGE = CFPlus	503	MODULE = Deliantra::Client PACKAGE = DC
491		504
492	PROTOTYPES: ENABLE	505	PROTOTYPES: ENABLE
493		506
494	BOOT:	507	BOOT:
495	{	508	{
496	HV *stash = gv_stashpv ("CFPlus", 1);	509	HV *stash = gv_stashpv ("DC", 1);
497	static const struct {	510	static const struct {
498	const char *name;	511	const char *name;
499	IV iv;	512	IV iv;
500	} *civ, const_iv[] = {	513	} *civ, const_iv[] = {
501	# define const_iv(name) { # name, (IV)name }	514	# define const_iv(name) { # name, (IV)name }
…		…
523		536
524	const_iv (SDL_APPINPUTFOCUS),	537	const_iv (SDL_APPINPUTFOCUS),
525	const_iv (SDL_APPMOUSEFOCUS),	538	const_iv (SDL_APPMOUSEFOCUS),
526	const_iv (SDL_APPACTIVE),	539	const_iv (SDL_APPACTIVE),
527		540
		541	const_iv (SDLK_FIRST),
		542	const_iv (SDLK_LAST),
528	const_iv (SDLK_KP0),	543	const_iv (SDLK_KP0),
529	const_iv (SDLK_KP1),	544	const_iv (SDLK_KP1),
530	const_iv (SDLK_KP2),	545	const_iv (SDLK_KP2),
531	const_iv (SDLK_KP3),	546	const_iv (SDLK_KP3),
532	const_iv (SDLK_KP4),	547	const_iv (SDLK_KP4),
…		…
604	const_iv (KMOD_LMETA),	619	const_iv (KMOD_LMETA),
605	const_iv (KMOD_RMETA),	620	const_iv (KMOD_RMETA),
606	const_iv (KMOD_NUM),	621	const_iv (KMOD_NUM),
607	const_iv (KMOD_CAPS),	622	const_iv (KMOD_CAPS),
608	const_iv (KMOD_MODE),	623	const_iv (KMOD_MODE),
		624
		625	const_iv (MIX_DEFAULT_FORMAT),
609	# undef const_iv	626	# undef const_iv
610	};	627	};
611		628
612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	629	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	630	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
630	RETVAL	647	RETVAL
631		648
632	NV floor (NV x)	649	NV floor (NV x)
633		650
634	NV ceil (NV x)	651	NV ceil (NV x)
		652
		653	IV minpot (UV n)
		654
		655	IV popcount (UV n)
635		656
636	void	657	void
637	pango_init ()	658	pango_init ()
638	CODE:	659	CODE:
639	{	660	{
…		…
679	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	700	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
680		701
681	if (m && m != (SDL_Rect **)-1)	702	if (m && m != (SDL_Rect **)-1)
682	while (*m)	703	while (*m)
683	{	704	{
684	if ((m)->w >= 640 && (m)->h >= 480)	705	if ((m)->w >= 800 && (m)->h >= 480)
685	{	706	{
686	AV *av = newAV ();	707	AV *av = newAV ();
687	av_push (av, newSViv ((*m)->w));	708	av_push (av, newSViv ((*m)->w));
688	av_push (av, newSViv ((*m)->h));	709	av_push (av, newSViv ((*m)->h));
689	av_push (av, newSViv (rgb));	710	av_push (av, newSViv (rgb));
…		…
713		734
714	if (RETVAL)	735	if (RETVAL)
715	{	736	{
716	av_clear (texture_av);	737	av_clear (texture_av);
717		738
718	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	739	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	740	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720	#include "glfunc.h"	741	#include "glfunc.h"
721	#undef GL_FUNC	742	#undef GL_FUNC
722	}	743	}
723	}	744	}
…		…
804	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	825	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	826	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806	break;	827	break;
807	}	828	}
808		829
809	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	830	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810	}	831	}
811	}	832	}
812		833
813	int	834	int
814	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	835	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815	POSTCALL:	836	POSTCALL:
816	Mix_HookMusicFinished (music_finished);	837	Mix_HookMusicFinished (music_finished);
817	Mix_ChannelFinished (channel_finished);	838	Mix_ChannelFinished (channel_finished);
		839
		840	void
		841	Mix_QuerySpec ()
		842	PPCODE:
		843	{
		844	int freq, channels;
		845	Uint16 format;
		846
		847	if (Mix_QuerySpec (&freq, &format, &channels))
		848	{
		849	EXTEND (SP, 3);
		850	PUSHs (sv_2mortal (newSViv (freq)));
		851	PUSHs (sv_2mortal (newSViv (format)));
		852	PUSHs (sv_2mortal (newSViv (channels)));
		853	}
		854	}
818		855
819	void	856	void
820	Mix_CloseAudio ()	857	Mix_CloseAudio ()
821		858
822	int	859	int
…		…
956	void	993	void
957	error (char *message)	994	error (char *message)
958	CODE:	995	CODE:
959	fprintf (stderr, "ERROR: %s\n", message);	996	fprintf (stderr, "ERROR: %s\n", message);
960	#ifdef _WIN32	997	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	998	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
962	#endif	999	#endif
963		1000
964	void	1001	void
965	fatal (char *message)	1002	fatal (char *message)
966	CODE:	1003	CODE:
967	fprintf (stderr, "FATAL: %s\n", message);	1004	fprintf (stderr, "FATAL: %s\n", message);
968	#ifdef _WIN32	1005	#ifdef _WIN32
969	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1006	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
970	#endif	1007	#endif
971	_exit (1);	1008	_exit (1);
972		1009
973	void	1010	void
974	_exit (int retval = 0)	1011	_exit (int retval = 0)
…		…
986	#if DEBUG	1023	#if DEBUG
987	VALGRIND_DO_LEAK_CHECK;	1024	VALGRIND_DO_LEAK_CHECK;
988	#endif	1025	#endif
989	}	1026	}
990		1027
991	MODULE = CFPlus PACKAGE = CFPlus::Font	1028	MODULE = Deliantra::Client PACKAGE = DC::Font
992		1029
993	PROTOTYPES: DISABLE	1030	PROTOTYPES: DISABLE
994		1031
995	CFPlus::Font	1032	DC::Font
996	new_from_file (SV class, char path, int id = 0)	1033	new_from_file (SV class, char path, int id = 0)
997	CODE:	1034	CODE:
998	{	1035	{
999	int count;	1036	int count;
1000	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1037	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1003	}	1040	}
1004	OUTPUT:	1041	OUTPUT:
1005	RETVAL	1042	RETVAL
1006		1043
1007	void	1044	void
1008	DESTROY (CFPlus::Font self)	1045	DESTROY (DC::Font self)
1009	CODE:	1046	CODE:
1010	pango_font_description_free (self);	1047	pango_font_description_free (self);
1011		1048
1012	void	1049	void
1013	make_default (CFPlus::Font self)	1050	make_default (DC::Font self)
1014	PROTOTYPE: $	1051	PROTOTYPE: $
1015	CODE:	1052	CODE:
1016	default_font = self;	1053	default_font = self;
1017		1054
1018	MODULE = CFPlus PACKAGE = CFPlus::Layout	1055	MODULE = Deliantra::Client PACKAGE = DC::Layout
1019		1056
1020	PROTOTYPES: DISABLE	1057	PROTOTYPES: DISABLE
1021		1058
1022	void	1059	void
1023	reset_glyph_cache ()	1060	glyph_cache_backup ()
1024	PROTOTYPE:	1061	PROTOTYPE:
1025	CODE:	1062	CODE:
		1063	tc_backup ();
		1064
		1065	void
		1066	glyph_cache_restore ()
		1067	PROTOTYPE:
		1068	CODE:
1026	tc_clear ();	1069	tc_restore ();
1027		1070
1028	CFPlus::Layout	1071	DC::Layout
1029	new (SV *class)	1072	new (SV *class)
1030	CODE:	1073	CODE:
1031	New (0, RETVAL, 1, struct cf_layout);	1074	New (0, RETVAL, 1, struct cf_layout);
1032		1075
1033	RETVAL->pl = pango_layout_new (opengl_context);	1076	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1035	RETVAL->g = 1.;	1078	RETVAL->g = 1.;
1036	RETVAL->b = 1.;	1079	RETVAL->b = 1.;
1037	RETVAL->a = 1.;	1080	RETVAL->a = 1.;
1038	RETVAL->base_height = MIN_FONT_HEIGHT;	1081	RETVAL->base_height = MIN_FONT_HEIGHT;
1039	RETVAL->font = 0;	1082	RETVAL->font = 0;
		1083	RETVAL->rc = rc_alloc ();
1040		1084
1041	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1085	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042	layout_update_font (RETVAL);	1086	layout_update_font (RETVAL);
1043	OUTPUT:	1087	OUTPUT:
1044	RETVAL	1088	RETVAL
1045		1089
1046	void	1090	void
1047	DESTROY (CFPlus::Layout self)	1091	DESTROY (DC::Layout self)
1048	CODE:	1092	CODE:
1049	g_object_unref (self->pl);	1093	g_object_unref (self->pl);
		1094	rc_free (self->rc);
1050	Safefree (self);	1095	Safefree (self);
1051		1096
1052	void	1097	void
1053	set_text (CFPlus::Layout self, SV *text_)	1098	set_text (DC::Layout self, SV *text_)
1054	CODE:	1099	CODE:
1055	{	1100	{
1056	STRLEN textlen;	1101	STRLEN textlen;
1057	char *text = SvPVutf8 (text_, textlen);	1102	char *text = SvPVutf8 (text_, textlen);
1058		1103
1059	pango_layout_set_text (self->pl, text, textlen);	1104	pango_layout_set_text (self->pl, text, textlen);
1060	}	1105	}
1061		1106
1062	void	1107	void
1063	set_markup (CFPlus::Layout self, SV *text_)	1108	set_markup (DC::Layout self, SV *text_)
1064	CODE:	1109	CODE:
1065	{	1110	{
1066	STRLEN textlen;	1111	STRLEN textlen;
1067	char *text = SvPVutf8 (text_, textlen);	1112	char *text = SvPVutf8 (text_, textlen);
1068		1113
1069	pango_layout_set_markup (self->pl, text, textlen);	1114	pango_layout_set_markup (self->pl, text, textlen);
1070	}	1115	}
1071		1116
1072	void	1117	void
1073	set_shapes (CFPlus::Layout self, ...)	1118	set_shapes (DC::Layout self, ...)
1074	CODE:	1119	CODE:
1075	{	1120	{
1076	PangoAttrList *attrs = 0;	1121	PangoAttrList *attrs = 0;
1077	const char *text = pango_layout_get_text (self->pl);	1122	const char *text = pango_layout_get_text (self->pl);
1078	const char *pos = text;	1123	const char *pos = text;
…		…
1113	if (attrs)	1158	if (attrs)
1114	pango_layout_set_attributes (self->pl, attrs);	1159	pango_layout_set_attributes (self->pl, attrs);
1115	}	1160	}
1116		1161
1117	void	1162	void
1118	get_shapes (CFPlus::Layout self)	1163	get_shapes (DC::Layout self)
1119	PPCODE:	1164	PPCODE:
1120	{	1165	{
1121	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1166	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122		1167
1123	do	1168	do
…		…
1138		1183
1139	pango_layout_iter_free (iter);	1184	pango_layout_iter_free (iter);
1140	}	1185	}
1141		1186
1142	int	1187	int
1143	has_wrapped (CFPlus::Layout self)	1188	has_wrapped (DC::Layout self)
1144	CODE:	1189	CODE:
1145	{	1190	{
1146	int lines = 1;	1191	int lines = 1;
1147	const char *text = pango_layout_get_text (self->pl);	1192	const char *text = pango_layout_get_text (self->pl);
1148		1193
…		…
1153	}	1198	}
1154	OUTPUT:	1199	OUTPUT:
1155	RETVAL	1200	RETVAL
1156		1201
1157	SV *	1202	SV *
1158	get_text (CFPlus::Layout self)	1203	get_text (DC::Layout self)
1159	CODE:	1204	CODE:
1160	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1205	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161	sv_utf8_decode (RETVAL);	1206	sv_utf8_decode (RETVAL);
1162	OUTPUT:	1207	OUTPUT:
1163	RETVAL	1208	RETVAL
1164		1209
1165	void	1210	void
1166	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1211	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167	CODE:	1212	CODE:
1168	self->r = r;	1213	self->r = r;
1169	self->g = g;	1214	self->g = g;
1170	self->b = b;	1215	self->b = b;
1171	self->a = a;	1216	self->a = a;
1172		1217
1173	void	1218	void
1174	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1219	set_font (DC::Layout self, DC::Font font = 0)
1175	CODE:	1220	CODE:
1176	if (self->font != font)	1221	if (self->font != font)
1177	{	1222	{
1178	self->font = font;	1223	self->font = font;
1179	layout_update_font (self);	1224	layout_update_font (self);
1180	}	1225	}
1181		1226
1182	void	1227	void
1183	set_height (CFPlus::Layout self, int base_height)	1228	set_height (DC::Layout self, int base_height)
1184	CODE:	1229	CODE:
1185	if (self->base_height != base_height)	1230	if (self->base_height != base_height)
1186	{	1231	{
1187	self->base_height = base_height;	1232	self->base_height = base_height;
1188	layout_update_font (self);	1233	layout_update_font (self);
1189	}	1234	}
1190		1235
1191	void	1236	void
1192	set_width (CFPlus::Layout self, int max_width = -1)	1237	set_width (DC::Layout self, int max_width = -1)
1193	CODE:	1238	CODE:
1194	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1239	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195		1240
1196	void	1241	void
1197	set_indent (CFPlus::Layout self, int indent)	1242	set_indent (DC::Layout self, int indent)
1198	CODE:	1243	CODE:
1199	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1244	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200		1245
1201	void	1246	void
1202	set_spacing (CFPlus::Layout self, int spacing)	1247	set_spacing (DC::Layout self, int spacing)
1203	CODE:	1248	CODE:
1204	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1249	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205		1250
1206	void	1251	void
1207	set_ellipsise (CFPlus::Layout self, int ellipsise)	1252	set_ellipsise (DC::Layout self, int ellipsise)
1208	CODE:	1253	CODE:
1209	pango_layout_set_ellipsize (self->pl,	1254	pango_layout_set_ellipsize (self->pl,
1210	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1255	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1256	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1257	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213	: PANGO_ELLIPSIZE_NONE	1258	: PANGO_ELLIPSIZE_NONE
1214	);	1259	);
1215		1260
1216	void	1261	void
1217	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1262	set_single_paragraph_mode (DC::Layout self, int spm)
1218	CODE:	1263	CODE:
1219	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1264	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220		1265
1221	void	1266	void
1222	size (CFPlus::Layout self)	1267	size (DC::Layout self)
1223	PPCODE:	1268	PPCODE:
1224	{	1269	{
1225	int w, h;	1270	int w, h;
1226		1271
1227	layout_get_pixel_size (self, &w, &h);	1272	layout_get_pixel_size (self, &w, &h);
…		…
1230	PUSHs (sv_2mortal (newSViv (w)));	1275	PUSHs (sv_2mortal (newSViv (w)));
1231	PUSHs (sv_2mortal (newSViv (h)));	1276	PUSHs (sv_2mortal (newSViv (h)));
1232	}	1277	}
1233		1278
1234	int	1279	int
1235	descent (CFPlus::Layout self)	1280	descent (DC::Layout self)
1236	CODE:	1281	CODE:
1237	{	1282	{
1238	PangoRectangle rect;	1283	PangoRectangle rect;
1239	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1284	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1240	pango_layout_line_get_pixel_extents (line, 0, &rect);	1285	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1242	}	1287	}
1243	OUTPUT:	1288	OUTPUT:
1244	RETVAL	1289	RETVAL
1245		1290
1246	int	1291	int
1247	xy_to_index (CFPlus::Layout self, int x, int y)	1292	xy_to_index (DC::Layout self, int x, int y)
1248	CODE:	1293	CODE:
1249	{	1294	{
1250	int index, trailing;	1295	int index, trailing;
1251	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1296	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252	RETVAL = index + trailing;	1297	RETVAL = index + trailing;
1253	}	1298	}
1254	OUTPUT:	1299	OUTPUT:
1255	RETVAL	1300	RETVAL
1256		1301
1257	void	1302	void
1258	cursor_pos (CFPlus::Layout self, int index)	1303	cursor_pos (DC::Layout self, int index)
1259	PPCODE:	1304	PPCODE:
1260	{	1305	{
1261	PangoRectangle strong_pos;	1306	PangoRectangle strong_pos;
1262	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1307	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1263		1308
…		…
1266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1311	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1312	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1268	}	1313	}
1269		1314
1270	void	1315	void
1271	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1316	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272	PPCODE:	1317	PPCODE:
1273	{	1318	{
1274	int line, x;	1319	int line, x;
1275		1320
1276	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1321	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1322	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1277	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1323	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278		1324	--line;
		1325	#endif
1279	EXTEND (SP, 2);	1326	EXTEND (SP, 2);
1280	PUSHs (sv_2mortal (newSViv (line - 1)));	1327	PUSHs (sv_2mortal (newSViv (line)));
1281	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1328	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282	}	1329	}
1283		1330
1284	void	1331	void
1285	line_x_to_index (CFPlus::Layout self, int line, int x)	1332	line_x_to_index (DC::Layout self, int line, int x)
1286	PPCODE:	1333	PPCODE:
1287	{	1334	{
1288	PangoLayoutLine *lp;	1335	PangoLayoutLine *lp;
1289	int index, trailing;	1336	int index, trailing;
1290		1337
…		…
1305	PUSHs (sv_2mortal (newSViv (trailing)));	1352	PUSHs (sv_2mortal (newSViv (trailing)));
1306	}	1353	}
1307	}	1354	}
1308		1355
1309	void	1356	void
1310	render (CFPlus::Layout self, float x, float y, int flags = 0)	1357	render (DC::Layout self, float x, float y, int flags = 0)
1311	PPCODE:	1358	CODE:
		1359	rc_clear (self->rc);
1312	pango_opengl_render_layout_subpixel (	1360	pango_opengl_render_layout_subpixel (
1313	self->pl,	1361	self->pl,
		1362	self->rc,
1314	x * PANGO_SCALE, y * PANGO_SCALE,	1363	x * PANGO_SCALE, y * PANGO_SCALE,
1315	self->r, self->g, self->b, self->a,	1364	self->r, self->g, self->b, self->a,
1316	flags	1365	flags
1317	);	1366	);
		1367	// we assume that context_change actually clears/frees stuff
		1368	// and does not do any recomputation...
		1369	pango_layout_context_changed (self->pl);
1318		1370
1319	MODULE = CFPlus PACKAGE = CFPlus::Texture	1371	void
		1372	draw (DC::Layout self)
		1373	CODE:
		1374	{
		1375	glEnable (GL_TEXTURE_2D);
		1376	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1377	glEnable (GL_BLEND);
		1378	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1379	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1380	glEnable (GL_ALPHA_TEST);
		1381	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1382
		1383	rc_draw (self->rc);
		1384
		1385	glDisable (GL_ALPHA_TEST);
		1386	glDisable (GL_BLEND);
		1387	glDisable (GL_TEXTURE_2D);
		1388	}
		1389
		1390	MODULE = Deliantra::Client PACKAGE = DC::Texture
1320		1391
1321	PROTOTYPES: ENABLE	1392	PROTOTYPES: ENABLE
1322
1323	int minpot (int n)
1324		1393
1325	void	1394	void
1326	pad (SV *data_, int ow, int oh, int nw, int nh)	1395	pad (SV *data_, int ow, int oh, int nw, int nh)
1327	CODE:	1396	CODE:
1328	{	1397	{
…		…
1405	RETVAL = width > 0;	1474	RETVAL = width > 0;
1406	}	1475	}
1407	OUTPUT:	1476	OUTPUT:
1408	RETVAL	1477	RETVAL
1409		1478
1410	MODULE = CFPlus PACKAGE = CFPlus::Map	1479	MODULE = Deliantra::Client PACKAGE = DC::Map
1411		1480
1412	PROTOTYPES: DISABLE	1481	PROTOTYPES: DISABLE
1413		1482
1414	CFPlus::Map	1483	DC::Map
1415	new (SV *class)	1484	new (SV *class)
1416	CODE:	1485	CODE:
1417	New (0, RETVAL, 1, struct map);	1486	New (0, RETVAL, 1, struct map);
1418	RETVAL->x = 0;	1487	RETVAL->x = 0;
1419	RETVAL->y = 0;	1488	RETVAL->y = 0;
…		…
1427	RETVAL->row = 0;	1496	RETVAL->row = 0;
1428	OUTPUT:	1497	OUTPUT:
1429	RETVAL	1498	RETVAL
1430		1499
1431	void	1500	void
1432	DESTROY (CFPlus::Map self)	1501	DESTROY (DC::Map self)
1433	CODE:	1502	CODE:
1434	{	1503	{
1435	map_clear (self);	1504	map_clear (self);
1436	Safefree (self->face2tile);	1505	Safefree (self->face2tile);
1437	Safefree (self->tex);	1506	Safefree (self->tex);
1438	Safefree (self);	1507	Safefree (self);
1439	}	1508	}
1440		1509
1441	void	1510	void
1442	resize (CFPlus::Map self, int map_width, int map_height)	1511	resize (DC::Map self, int map_width, int map_height)
1443	CODE:	1512	CODE:
1444	self->w = map_width;	1513	self->w = map_width;
1445	self->h = map_height;	1514	self->h = map_height;
1446		1515
1447	void	1516	void
1448	clear (CFPlus::Map self)	1517	clear (DC::Map self)
1449	CODE:	1518	CODE:
1450	map_clear (self);	1519	map_clear (self);
1451		1520
1452	void	1521	void
1453	set_tileid (CFPlus::Map self, int face, int tile)	1522	set_tileid (DC::Map self, int face, int tile)
1454	CODE:	1523	CODE:
1455	{	1524	{
1456	need_facenum (self, face); self->face2tile [face] = tile;	1525	need_facenum (self, face); self->face2tile [face] = tile;
1457	need_texid (self, tile);	1526	need_texid (self, tile);
1458	}	1527	}
1459		1528
1460	void	1529	void
1461	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1530	set_smooth (DC::Map self, int face, int smooth, int level)
1462	CODE:	1531	CODE:
1463	{	1532	{
1464	tileid texid;	1533	tileid texid;
1465	maptex *tex;	1534	maptex *tex;
1466		1535
…		…
1479	tex->smoothtile = self->face2tile [smooth];	1548	tex->smoothtile = self->face2tile [smooth];
1480	tex->smoothlevel = level;	1549	tex->smoothlevel = level;
1481	}	1550	}
1482		1551
1483	void	1552	void
1484	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)	1553	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)
1485	CODE:	1554	CODE:
1486	{	1555	{
1487	need_texid (self, texid);	1556	need_texid (self, texid);
1488		1557
1489	{	1558	{
…		…
1509	// from transparent color bleeding and ugly wrapping effects.	1578	// from transparent color bleeding and ugly wrapping effects.
1510	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1579	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511	}	1580	}
1512		1581
1513	int	1582	int
1514	ox (CFPlus::Map self)	1583	ox (DC::Map self)
1515	ALIAS:	1584	ALIAS:
1516	oy = 1	1585	oy = 1
1517	x = 2	1586	x = 2
1518	y = 3	1587	y = 3
1519	w = 4	1588	w = 4
…		…
1530	}	1599	}
1531	OUTPUT:	1600	OUTPUT:
1532	RETVAL	1601	RETVAL
1533		1602
1534	void	1603	void
1535	scroll (CFPlus::Map self, int dx, int dy)	1604	scroll (DC::Map self, int dx, int dy)
1536	CODE:	1605	CODE:
1537	{	1606	{
1538	if (dx > 0)	1607	if (dx > 0)
1539	map_blank (self, self->x, self->y, dx, self->h);	1608	map_blank (self, self->x, self->y, dx, self->h);
1540	else if (dx < 0)	1609	else if (dx < 0)
…		…
1556	self->y += MAP_EXTEND_Y;	1625	self->y += MAP_EXTEND_Y;
1557	}	1626	}
1558	}	1627	}
1559		1628
1560	SV *	1629	SV *
1561	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1630	map1a_update (DC::Map self, SV *data_, int extmap)
1562	CODE:	1631	CODE:
1563	{	1632	{
1564	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1633	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1565	uint8_t data_end = (uint8_t )SvEND (data_);	1634	uint8_t data_end = (uint8_t )SvEND (data_);
1566	mapcell *cell;	1635	mapcell *cell;
…		…
1655	}	1724	}
1656	OUTPUT:	1725	OUTPUT:
1657	RETVAL	1726	RETVAL
1658		1727
1659	SV *	1728	SV *
1660	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1729	mapmap (DC::Map self, int x0, int y0, int w, int h)
1661	CODE:	1730	CODE:
1662	{	1731	{
1663	int x1, x;	1732	int x1, x;
1664	int y1, y;	1733	int y1, y;
1665	int z;	1734	int z;
…		…
1710	}	1779	}
1711	OUTPUT:	1780	OUTPUT:
1712	RETVAL	1781	RETVAL
1713		1782
1714	void	1783	void
1715	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1784	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1716	CODE:	1785	CODE:
1717	{	1786	{
		1787	int x, y, z;
		1788
1718	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1789	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1719	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1790	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1791	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721	smooth_key skey;	1792	smooth_key skey;
1722	int x, y, z;	1793
1723	int last_name;	1794	rc_t *rc = rc_alloc ();
		1795	rc_key_t key;
		1796	rc_array_t *arr;
1724		1797
1725	// thats current max. sorry.	1798	// thats current max. sorry.
1726	if (sw > 255) sw = 255;	1799	if (sw > 255) sw = 255;
1727	if (sh > 255) sh = 255;	1800	if (sh > 255) sh = 255;
1728		1801
1729	// clear key, in case of extra padding	1802	// clear key, in case of extra padding
1730	memset (&skey, 0, sizeof (skey));	1803	memset (&skey, 0, sizeof (skey));
1731		1804
1732	glColor4ub (255, 255, 255, 255);	1805	memset (&key, 0, sizeof (key));
1733		1806	key.r = 255;
1734	glEnable (GL_BLEND);	1807	key.g = 255;
1735	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1808	key.b = 255;
1736	glEnable (GL_TEXTURE_2D);	1809	key.a = 255;
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1810	key.mode = GL_QUADS;
1738		1811	key.format = GL_T2F_V3F;
1739	glBegin (GL_QUADS);
1740
1741	last_name = -1;	1812	key.texname = -1;
1742		1813
1743	mx += self->x;	1814	mx += self->x;
1744	my += self->y;	1815	my += self->y;
1745		1816
1746	// first pass: determine smooth_max	1817	// first pass: determine smooth_max
…		…
1762	MAX (self->tex [cell->tile [0]].smoothlevel,	1833	MAX (self->tex [cell->tile [0]].smoothlevel,
1763	MAX (self->tex [cell->tile [1]].smoothlevel,	1834	MAX (self->tex [cell->tile [1]].smoothlevel,
1764	self->tex [cell->tile [2]].smoothlevel));	1835	self->tex [cell->tile [2]].smoothlevel));
1765	}	1836	}
1766	}	1837	}
		1838
		1839	glEnable (GL_BLEND);
		1840	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1841	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767		1842
1768	for (z = 0; z <= 2; z++)	1843	for (z = 0; z <= 2; z++)
1769	{	1844	{
1770	memset (smooth_level, 0, sizeof (smooth_level));	1845	memset (smooth_level, 0, sizeof (smooth_level));
1771		1846
…		…
1783	if (tile)	1858	if (tile)
1784	{	1859	{
1785	maptex tex = self->tex [tile];	1860	maptex tex = self->tex [tile];
1786	int px, py;	1861	int px, py;
1787		1862
1788	// suppressing texture state switches here
1789	// is only moderately effective, but worth the extra effort
1790	if (last_name != tex.name)	1863	if (key.texname != tex.name)
1791	{	1864	{
1792	if (!tex.name)	1865	if (!tex.name)
1793	tex = self->tex [2]; /* missing, replace by noface */	1866	tex = self->tex [2]; /* missing, replace by noface */
1794		1867
1795	glEnd ();	1868	key.texname = tex.name;
1796	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1869	arr = rc_array (rc, &key);
1797	glBegin (GL_QUADS);
1798	}	1870	}
1799		1871
1800	px = (x + 1) * T - tex.w;	1872	px = (x + 1) * T - tex.w;
1801	py = (y + 1) * T - tex.h;	1873	py = (y + 1) * T - tex.h;
1802		1874
1803	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1875	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1804	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1876	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1805	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1877	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1806	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1878	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1807		1879
1808	if (cell->flags && z == 2)	1880	if (cell->flags && z == 2)
1809	{	1881	{
		1882	// overlays such as the speech bubble, probably more to come
1810	if (cell->flags & 1)	1883	if (cell->flags & 1)
1811	{	1884	{
1812	maptex tex = self->tex [1];	1885	maptex tex = self->tex [1];
1813	int px = x * T + T * 2 / 32;	1886	int px = x * T + T * 2 / 32;
1814	int py = y * T - T * 6 / 32;	1887	int py = y * T - T * 6 / 32;
1815		1888
		1889	if (tex.name)
1816	glEnd ();	1890	{
1817	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1891	if (key.texname != tex.name)
		1892	{
		1893	key.texname = tex.name;
		1894	arr = rc_array (rc, &key);
		1895	}
		1896
		1897	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1898	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1899	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1900	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818	glBegin (GL_QUADS);	1901	}
1819
1820	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824	}	1902	}
1825	}	1903	}
1826		1904
1827	// update smooth hash	1905	// update smooth hash
1828	if (tex.smoothtile)	1906	if (tex.smoothtile)
…		…
1864	}	1942	}
1865	}	1943	}
1866	}	1944	}
1867	}	1945	}
1868		1946
		1947	rc_draw (rc);
		1948	rc_clear (rc);
		1949
1869	// go through all smoothlevels, lowest to highest, then draw.	1950	// go through all smoothlevels, lowest to highest, then draw.
1870	// this is basically counting sort	1951	// this is basically counting sort
1871	{	1952	{
1872	int w, b;	1953	int w, b;
1873		1954
		1955	glEnable (GL_TEXTURE_2D);
		1956	glBegin (GL_QUADS);
1874	for (w = 0; w < 256 / 32; ++w)	1957	for (w = 0; w < 256 / 32; ++w)
1875	{	1958	{
1876	uint32_t smask = smooth_level [w];	1959	uint32_t smask = smooth_level [w];
1877	if (smask)	1960	if (smask)
1878	for (b = 0; b < 32; ++b)	1961	for (b = 0; b < 32; ++b)
…		…
1897	int border = bits & 15;	1980	int border = bits & 15;
1898	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1981	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899	float dx = tex.s * .0625f; // 16 images/row	1982	float dx = tex.s * .0625f; // 16 images/row
1900	float dy = tex.t * .5f ; // 2 images/column	1983	float dy = tex.t * .5f ; // 2 images/column
1901		1984
1902	// this time naively avoiding texture state changes
1903	// save gobs of state changes.
1904	if (last_name != tex.name)	1985	if (tex.name)
1905	{	1986	{
		1987	// this time avoiding texture state changes
		1988	// save gobs of state changes.
1906	if (!tex.name)	1989	if (key.texname != tex.name)
1907	continue; // smoothing not yet available	1990	{
1908
1909	glEnd ();	1991	glEnd ();
1910	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1992	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911	glBegin (GL_QUADS);	1993	glBegin (GL_QUADS);
1912	}	1994	}
1913		1995
1914	if (border)	1996	if (border)
1915	{	1997	{
1916	float ox = border * dx;	1998	float ox = border * dx;
1917		1999
1918	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2000	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2001	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2002	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2003	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922	}	2004	}
1923		2005
1924	if (corner)	2006	if (corner)
1925	{	2007	{
1926	float ox = corner * dx;	2008	float ox = corner * dx;
1927		2009
1928	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2010	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2011	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2012	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2013	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2014	}
1932	}	2015	}
1933	}	2016	}
1934	}	2017	}
1935	}	2018	}
1936	}	2019	}
		2020
		2021	glEnd ();
		2022	glDisable (GL_TEXTURE_2D);
		2023	key.texname = -1;
1937	}	2024	}
1938		2025
1939	hv_clear (smooth);	2026	hv_clear (smooth);
1940	}	2027	}
1941		2028
1942	glEnd ();
1943
1944	glDisable (GL_TEXTURE_2D);
1945	glDisable (GL_BLEND);	2029	glDisable (GL_BLEND);
		2030	rc_free (rc);
1946		2031
1947	// top layer: overlays such as the health bar	2032	// top layer: overlays such as the health bar
1948	for (y = 0; y < sh; y++)	2033	for (y = 0; y < sh; y++)
1949	if (0 <= y + my && y + my < self->rows)	2034	if (0 <= y + my && y + my < self->rows)
1950	{	2035	{
…		…
1975	}	2060	}
1976	}	2061	}
1977	}	2062	}
1978		2063
1979	void	2064	void
1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2065	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981	CODE:	2066	CODE:
1982	{	2067	{
1983	static float color[16][3] = {	2068	static float color[16][3] = {
1984	{ 0.00F, 0.00F, 0.00F },	2069	{ 0.00F, 0.00F, 0.00F },
1985	{ 1.00F, 1.00F, 1.00F },	2070	{ 1.00F, 1.00F, 1.00F },
…		…
2035	glDisable (GL_BLEND);	2120	glDisable (GL_BLEND);
2036	glDisable (GL_TEXTURE_2D);	2121	glDisable (GL_TEXTURE_2D);
2037	}	2122	}
2038		2123
2039	void	2124	void
2040	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2125	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041	PPCODE:	2126	PPCODE:
2042	{	2127	{
2043	int x, y;	2128	int x, y;
2044	int sw1 = sw + 2;	2129	int sw1 = sw + 2;
2045	int sh1 = sh + 2;	2130	int sh1 = sh + 2;
…		…
2116	PUSHs (sv_2mortal (newSViv (sh3)));	2201	PUSHs (sv_2mortal (newSViv (sh3)));
2117	PUSHs (darkness3_sv);	2202	PUSHs (darkness3_sv);
2118	}	2203	}
2119		2204
2120	SV *	2205	SV *
2121	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2206	get_rect (DC::Map self, int x0, int y0, int w, int h)
2122	CODE:	2207	CODE:
2123	{	2208	{
2124	int x, y, x1, y1;	2209	int x, y, x1, y1;
2125	SV data_sv = newSV (w h * 7 + 5);	2210	SV data_sv = newSV (w h * 7 + 5);
2126	uint8_t data = (uint8_t )SvPVX (data_sv);	2211	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2191	}	2276	}
2192	OUTPUT:	2277	OUTPUT:
2193	RETVAL	2278	RETVAL
2194		2279
2195	void	2280	void
2196	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2281	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2197	PPCODE:	2282	PPCODE:
2198	{	2283	{
2199	int x, y, z;	2284	int x, y, z;
2200	int w, h;	2285	int w, h;
2201	int x1, y1;	2286	int x1, y1;
2202		2287
2203	if (*data++ != 0)	2288	if (*data++ != 0)
2204	return; /* version mismatch */	2289	XSRETURN_EMPTY; /* version mismatch */
2205		2290
2206	w = data++ << 8; w \|= data++;	2291	w = data++ << 8; w \|= data++;
2207	h = data++ << 8; h \|= data++;	2292	h = data++ << 8; h \|= data++;
2208		2293
2209	// we need to do this 'cause we don't keep an absolute coord system for rows	2294	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2254	}	2339	}
2255	}	2340	}
2256	}	2341	}
2257	}	2342	}
2258		2343
2259	MODULE = CFPlus PACKAGE = CFPlus::RW	2344	MODULE = Deliantra::Client PACKAGE = DC::RW
2260		2345
2261	CFPlus::RW	2346	DC::RW
2262	new (SV class, SV data_sv)	2347	new (SV class, SV data_sv)
2263	CODE:	2348	CODE:
2264	{	2349	{
2265	STRLEN datalen;	2350	STRLEN datalen;
2266	char *data = SvPVbyte (data_sv, datalen);	2351	char *data = SvPVbyte (data_sv, datalen);
…		…
2268	RETVAL = SDL_RWFromConstMem (data, datalen);	2353	RETVAL = SDL_RWFromConstMem (data, datalen);
2269	}	2354	}
2270	OUTPUT:	2355	OUTPUT:
2271	RETVAL	2356	RETVAL
2272		2357
2273	CFPlus::RW	2358	DC::RW
2274	new_from_file (SV class, const char path, const char *mode = "rb")	2359	new_from_file (SV class, const char path, const char *mode = "rb")
2275	CODE:	2360	CODE:
2276	RETVAL = SDL_RWFromFile (path, mode);	2361	RETVAL = SDL_RWFromFile (path, mode);
2277	OUTPUT:	2362	OUTPUT:
2278	RETVAL	2363	RETVAL
2279		2364
2280	# fails on win32:	2365	# fails on win32:
2281	# CFPlus.xs(2268) : error C2059: syntax error : '('	2366	# dc.xs(2268) : error C2059: syntax error : '('
2282	#void	2367	#void
2283	#close (CFPlus::RW self)	2368	#close (DC::RW self)
2284	# CODE:	2369	# CODE:
2285	# (self->(close)) (self);	2370	# (self->(close)) (self);
2286		2371
2287	MODULE = CFPlus PACKAGE = CFPlus::Channel	2372	MODULE = Deliantra::Client PACKAGE = DC::Channel
2288		2373
2289	PROTOTYPES: DISABLE	2374	PROTOTYPES: DISABLE
2290		2375
2291	CFPlus::Channel	2376	DC::Channel
2292	find ()	2377	find ()
2293	CODE:	2378	CODE:
2294	{	2379	{
2295	RETVAL = Mix_GroupAvailable (-1);	2380	RETVAL = Mix_GroupAvailable (-1);
2296		2381
…		…
2309	}	2394	}
2310	OUTPUT:	2395	OUTPUT:
2311	RETVAL	2396	RETVAL
2312		2397
2313	void	2398	void
2314	halt (CFPlus::Channel self)	2399	halt (DC::Channel self)
2315	CODE:	2400	CODE:
2316	Mix_HaltChannel (self);	2401	Mix_HaltChannel (self);
2317		2402
2318	void	2403	void
2319	expire (CFPlus::Channel self, int ticks = -1)	2404	expire (DC::Channel self, int ticks = -1)
2320	CODE:	2405	CODE:
2321	Mix_ExpireChannel (self, ticks);	2406	Mix_ExpireChannel (self, ticks);
2322		2407
2323	void	2408	void
2324	fade_out (CFPlus::Channel self, int ticks = -1)	2409	fade_out (DC::Channel self, int ticks = -1)
2325	CODE:	2410	CODE:
2326	Mix_FadeOutChannel (self, ticks);	2411	Mix_FadeOutChannel (self, ticks);
2327		2412
2328	int	2413	int
2329	volume (CFPlus::Channel self, int volume)	2414	volume (DC::Channel self, int volume)
2330	CODE:	2415	CODE:
2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2416	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332	OUTPUT:	2417	OUTPUT:
2333	RETVAL	2418	RETVAL
2334		2419
2335	void	2420	void
2336	unregister_all_effects (CFPlus::Channel self)	2421	unregister_all_effects (DC::Channel self)
2337	CODE:	2422	CODE:
2338	Mix_UnregisterAllEffects (self);	2423	Mix_UnregisterAllEffects (self);
2339		2424
2340	void	2425	void
2341	set_panning (CFPlus::Channel self, int left, int right)	2426	set_panning (DC::Channel self, int left, int right)
2342	CODE:	2427	CODE:
2343	left = CLAMP (left , 0, 255);	2428	left = CLAMP (left , 0, 255);
2344	right = CLAMP (right, 0, 255);	2429	right = CLAMP (right, 0, 255);
2345	Mix_SetPanning (self, left, right);	2430	Mix_SetPanning (self, left, right);
2346		2431
2347	void	2432	void
2348	set_distance (CFPlus::Channel self, int distance)	2433	set_distance (DC::Channel self, int distance)
2349	CODE:	2434	CODE:
2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2435	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351		2436
2352	void	2437	void
2353	set_position (CFPlus::Channel self, int angle, int distance)	2438	set_position (DC::Channel self, int angle, int distance)
2354	CODE:	2439	CODE:
2355		2440
2356	void	2441	void
2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2442	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358	CODE:	2443	CODE:
2359	{	2444	{
2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2445	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2446	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2447	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363	}	2448	}
2364		2449
2365	void	2450	void
2366	set_reverse_stereo (CFPlus::Channel self, int flip)	2451	set_reverse_stereo (DC::Channel self, int flip)
2367	CODE:	2452	CODE:
2368	Mix_SetReverseStereo (self, flip);	2453	Mix_SetReverseStereo (self, flip);
2369		2454
2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2455	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371		2456
2372	PROTOTYPES: DISABLE	2457	PROTOTYPES: DISABLE
2373		2458
2374	CFPlus::MixChunk	2459	DC::MixChunk
2375	new (SV *class, CFPlus::RW rwops)	2460	new (SV *class, DC::RW rwops)
2376	CODE:	2461	CODE:
2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2462	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378	OUTPUT:	2463	OUTPUT:
2379	RETVAL	2464	RETVAL
2380		2465
2381	void	2466	void
2382	DESTROY (CFPlus::MixChunk self)	2467	DESTROY (DC::MixChunk self)
2383	CODE:	2468	CODE:
2384	Mix_FreeChunk (self);	2469	Mix_FreeChunk (self);
2385		2470
2386	int	2471	int
2387	volume (CFPlus::MixChunk self, int volume = -1)	2472	volume (DC::MixChunk self, int volume = -1)
2388	CODE:	2473	CODE:
2389	if (items > 1)	2474	if (items > 1)
2390	volume = CLAMP (volume, 0, 128);	2475	volume = CLAMP (volume, 0, 128);
2391	RETVAL = Mix_VolumeChunk (self, volume);	2476	RETVAL = Mix_VolumeChunk (self, volume);
2392	OUTPUT:	2477	OUTPUT:
2393	RETVAL	2478	RETVAL
2394		2479
2395	CFPlus::Channel	2480	DC::Channel
2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2481	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397	CODE:	2482	CODE:
2398	{	2483	{
2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2484	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400		2485
2401	if (RETVAL < 0)	2486	if (RETVAL < 0)
…		…
2408	}	2493	}
2409	}	2494	}
2410	OUTPUT:	2495	OUTPUT:
2411	RETVAL	2496	RETVAL
2412		2497
2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2498	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414		2499
2415	int	2500	int
2416	volume (int volume = -1)	2501	volume (int volume = -1)
2417	PROTOTYPE: ;$	2502	PROTOTYPE: ;$
2418	CODE:	2503	CODE:
…		…
2430	void	2515	void
2431	halt ()	2516	halt ()
2432	CODE:	2517	CODE:
2433	Mix_HaltMusic ();	2518	Mix_HaltMusic ();
2434		2519
2435	CFPlus::MixMusic	2520	DC::MixMusic
2436	new (SV *class, CFPlus::RW rwops)	2521	new (SV *class, DC::RW rwops)
2437	CODE:	2522	CODE:
2438	RETVAL = Mix_LoadMUS_RW (rwops);	2523	RETVAL = Mix_LoadMUS_RW (rwops);
2439	OUTPUT:	2524	OUTPUT:
2440	RETVAL	2525	RETVAL
2441		2526
2442	void	2527	void
2443	DESTROY (CFPlus::MixMusic self)	2528	DESTROY (DC::MixMusic self)
2444	CODE:	2529	CODE:
2445	Mix_FreeMusic (self);	2530	Mix_FreeMusic (self);
2446		2531
2447	int	2532	int
2448	play (CFPlus::MixMusic self, int loops = -1)	2533	play (DC::MixMusic self, int loops = -1)
2449	CODE:	2534	CODE:
2450	RETVAL = Mix_PlayMusic (self, loops);	2535	RETVAL = Mix_PlayMusic (self, loops);
2451	OUTPUT:	2536	OUTPUT:
2452	RETVAL	2537	RETVAL
2453		2538
2454	void	2539	void
2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2540	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456	CODE:	2541	CODE:
2457	Mix_FadeInMusicPos (self, loops, ms, position);	2542	Mix_FadeInMusicPos (self, loops, ms, position);
2458		2543
2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2544	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460		2545
2461	PROTOTYPES: ENABLE	2546	PROTOTYPES: ENABLE
2462		2547
2463	BOOT:	2548	BOOT:
2464	{	2549	{
2465	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2550	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466	static const struct {	2551	static const struct {
2467	const char *name;	2552	const char *name;
2468	IV iv;	2553	IV iv;
2469	} *civ, const_iv[] = {	2554	} *civ, const_iv[] = {
2470	# define const_iv(name) { # name, (IV)name }	2555	# define const_iv(name) { # name, (IV)name }
…		…
2505	const_iv (GL_INTENSITY),	2590	const_iv (GL_INTENSITY),
2506	const_iv (GL_LUMINANCE),	2591	const_iv (GL_LUMINANCE),
2507	const_iv (GL_LUMINANCE_ALPHA),	2592	const_iv (GL_LUMINANCE_ALPHA),
2508	const_iv (GL_FLOAT),	2593	const_iv (GL_FLOAT),
2509	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2594	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2595	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2596	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2597	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2598	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2599	const_iv (GL_COMPRESSED_RGB_ARB),
		2600	const_iv (GL_COMPRESSED_RGBA_ARB),
2510	const_iv (GL_COMPILE),	2601	const_iv (GL_COMPILE),
2511	const_iv (GL_PROXY_TEXTURE_1D),	2602	const_iv (GL_PROXY_TEXTURE_1D),
2512	const_iv (GL_PROXY_TEXTURE_2D),	2603	const_iv (GL_PROXY_TEXTURE_2D),
2513	const_iv (GL_TEXTURE_1D),	2604	const_iv (GL_TEXTURE_1D),
2514	const_iv (GL_TEXTURE_2D),	2605	const_iv (GL_TEXTURE_2D),
…		…
2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2644	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554	const_iv (GL_POINT_SMOOTH_HINT),	2645	const_iv (GL_POINT_SMOOTH_HINT),
2555	const_iv (GL_LINE_SMOOTH_HINT),	2646	const_iv (GL_LINE_SMOOTH_HINT),
2556	const_iv (GL_POLYGON_SMOOTH_HINT),	2647	const_iv (GL_POLYGON_SMOOTH_HINT),
2557	const_iv (GL_GENERATE_MIPMAP_HINT),	2648	const_iv (GL_GENERATE_MIPMAP_HINT),
		2649	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558	const_iv (GL_FASTEST),	2650	const_iv (GL_FASTEST),
2559	const_iv (GL_DONT_CARE),	2651	const_iv (GL_DONT_CARE),
2560	const_iv (GL_NICEST),	2652	const_iv (GL_NICEST),
2561	const_iv (GL_V2F),	2653	const_iv (GL_V2F),
2562	const_iv (GL_V3F),	2654	const_iv (GL_V3F),
…		…
2570		2662
2571	texture_av = newAV ();	2663	texture_av = newAV ();
2572	AvREAL_off (texture_av);	2664	AvREAL_off (texture_av);
2573	}	2665	}
2574		2666
		2667	void
		2668	disable_GL_EXT_blend_func_separate ()
		2669	CODE:
		2670	gl.BlendFuncSeparate = 0;
		2671	gl.BlendFuncSeparateEXT = 0;
		2672
2575	char *	2673	char *
2576	gl_vendor ()	2674	gl_vendor ()
2577	CODE:	2675	CODE:
2578	RETVAL = (char *)glGetString (GL_VENDOR);	2676	RETVAL = (char *)glGetString (GL_VENDOR);
2579	OUTPUT:	2677	OUTPUT:
…		…
2700		2798
2701	void glRect (float x1, float y1, float x2, float y2)	2799	void glRect (float x1, float y1, float x2, float y2)
2702	CODE:	2800	CODE:
2703	glRectf (x1, y1, x2, y2);	2801	glRectf (x1, y1, x2, y2);
2704		2802
		2803	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2804	CODE:
		2805	glBegin (GL_LINE_LOOP);
		2806	glVertex2f (x1, y1);
		2807	glVertex2f (x2, y1);
		2808	glVertex2f (x2, y2);
		2809	glVertex2f (x1, y2);
		2810	glEnd ();
		2811
2705	PROTOTYPES: ENABLE	2812	PROTOTYPES: ENABLE
2706		2813
2707	void glBegin (int mode)	2814	void glBegin (int mode)
2708		2815
2709	void glEnd ()	2816	void glEnd ()
…		…
2741	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2848	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2742	CODE:	2849	CODE:
2743	if (gl.SeparableFilter2D)	2850	if (gl.SeparableFilter2D)
2744	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2851	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745		2852
2746	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2853	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747		2854
2748	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2855	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749		2856
2750	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2857	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751		2858
…		…
2777		2884
2778	void glEndList ()	2885	void glEndList ()
2779		2886
2780	void glCallList (int list)	2887	void glCallList (int list)
2781		2888
2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2889	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783		2890
2784	PROTOTYPES: DISABLE	2891	PROTOTYPES: DISABLE
2785		2892
2786	void	2893	void
2787	find_widget (SV *self, NV x, NV y)	2894	find_widget (SV *self, NV x, NV y)
…		…
2791	XPUSHs (self);	2898	XPUSHs (self);
2792	}	2899	}
2793		2900
2794	BOOT:	2901	BOOT:
2795	{	2902	{
2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2903	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797		2904
2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2905	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2906	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2907	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2908	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802	}	2909	}
2803		2910
2804	void	2911	void
2805	draw (SV *self)	2912	draw (SV *self)
2806	CODE:	2913	CODE:
…		…
2810	NV x, y, w, h;	2917	NV x, y, w, h;
2811	SV *draw_x_sv = GvSV (draw_x_gv);	2918	SV *draw_x_sv = GvSV (draw_x_gv);
2812	SV *draw_y_sv = GvSV (draw_y_gv);	2919	SV *draw_y_sv = GvSV (draw_y_gv);
2813	SV *draw_w_sv = GvSV (draw_w_gv);	2920	SV *draw_w_sv = GvSV (draw_w_gv);
2814	SV *draw_h_sv = GvSV (draw_h_gv);	2921	SV *draw_h_sv = GvSV (draw_h_gv);
2815	SV *hover;
2816	double draw_x, draw_y, draw_w, draw_h;	2922	double draw_x, draw_y;
2817		2923
2818	if (!SvROK (self))	2924	if (!SvROK (self))
2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2925	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820		2926
2821	hv = (HV *)SvRV (self);	2927	hv = (HV *)SvRV (self);
2822		2928
2823	if (SvTYPE (hv) != SVt_PVHV)	2929	if (SvTYPE (hv) != SVt_PVHV)
2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2930	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825		2931
2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2932	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2933	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828		2934
2829	if (!h \|\| !w)	2935	if (!h \|\| !w)
…		…
2849	{	2955	{
2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2956	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851		2957
2852	if (svp && SvTRUE (*svp))	2958	if (svp && SvTRUE (*svp))
2853	{	2959	{
2854	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2960	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855	glEnable (GL_BLEND);	2961	glEnable (GL_BLEND);
2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2962	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857	glBegin (GL_QUADS);	2963	glBegin (GL_QUADS);
2858	glVertex2f (0, 0);	2964	glVertex2f (0, 0);
2859	glVertex2f (w, 0);	2965	glVertex2f (w, 0);
…		…
2862	glEnd ();	2968	glEnd ();
2863	glDisable (GL_BLEND);	2969	glDisable (GL_BLEND);
2864	}	2970	}
2865	}	2971	}
2866	#if 0	2972	#if 0
2867	if ($ENV{CFPLUS_DEBUG} & 1) {	2973	// draw borders, for debugging
2868	glPushMatrix;	2974	glPushMatrix ();
2869	glColor 1, 1, 0, 1;	2975	glColor4f (1., 1., 0., 1.);
2870	glTranslate 0.375, 0.375;	2976	glTranslatef (.5, .5, 0.);
2871	glBegin GL_LINE_LOOP;	2977	glBegin (GL_LINE_LOOP);
2872	glVertex 0 , 0;	2978	glVertex2f (0 , 0);
2873	glVertex $self->{w} - 1, 0;	2979	glVertex2f (w - 1, 0);
2874	glVertex $self->{w} - 1, $self->{h} - 1;	2980	glVertex2f (w - 1, h - 1);
2875	glVertex 0 , $self->{h} - 1;	2981	glVertex2f (0 , h - 1);
2876	glEnd;	2982	glEnd ();
2877	glPopMatrix;	2983	glPopMatrix ();
2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879	}
2880	#endif	2984	#endif
2881	PUSHMARK (SP);	2985	PUSHMARK (SP);
2882	XPUSHs (self);	2986	XPUSHs (self);
2883	PUTBACK;	2987	PUTBACK;
2884	call_method ("_draw", G_VOID \| G_DISCARD);	2988	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.222 by root, Sat Aug 11 06:34:26 2007 UTC vs. Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.222 by root, Sat Aug 11 06:34:26 2007 UTC vs.
Revision 1.248 by root, Fri Dec 28 15:27:39 2007 UTC