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

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

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.221 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC