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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.215 by root, Tue Jul 31 00:50:04 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 = 4096)	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	{
…		…
1350	HV hv = (HV )SvRV (self);	1426	HV hv = (HV )SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1427	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1428	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1429	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1430
		1431	if (name <= 0)
		1432	XSRETURN_EMPTY;
		1433
1355	if (items < 5)	1434	if (items < 5)
1356	{	1435	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1436	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1437	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1438	}
…		…
1397	RETVAL = width > 0;	1476	RETVAL = width > 0;
1398	}	1477	}
1399	OUTPUT:	1478	OUTPUT:
1400	RETVAL	1479	RETVAL
1401		1480
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1481	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1482
1404	PROTOTYPES: DISABLE	1483	PROTOTYPES: DISABLE
1405		1484
1406	CFPlus::Map	1485	DC::Map
1407	new (SV *class)	1486	new (SV *class)
1408	CODE:	1487	CODE:
1409	New (0, RETVAL, 1, struct map);	1488	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1489	RETVAL->x = 0;
1411	RETVAL->y = 0;	1490	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1498	RETVAL->row = 0;
1420	OUTPUT:	1499	OUTPUT:
1421	RETVAL	1500	RETVAL
1422		1501
1423	void	1502	void
1424	DESTROY (CFPlus::Map self)	1503	DESTROY (DC::Map self)
1425	CODE:	1504	CODE:
1426	{	1505	{
1427	map_clear (self);	1506	map_clear (self);
1428	Safefree (self->face2tile);	1507	Safefree (self->face2tile);
1429	Safefree (self->tex);	1508	Safefree (self->tex);
1430	Safefree (self);	1509	Safefree (self);
1431	}	1510	}
1432		1511
1433	void	1512	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1513	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1514	CODE:
1436	self->w = map_width;	1515	self->w = map_width;
1437	self->h = map_height;	1516	self->h = map_height;
1438		1517
1439	void	1518	void
1440	clear (CFPlus::Map self)	1519	clear (DC::Map self)
1441	CODE:	1520	CODE:
1442	map_clear (self);	1521	map_clear (self);
1443		1522
1444	void	1523	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1524	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1525	CODE:
1447	{	1526	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1527	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1528	need_texid (self, tile);
1450	}	1529	}
1451		1530
1452	void	1531	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1532	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1533	CODE:
1455	{	1534	{
1456	tileid texid;	1535	tileid texid;
1457	maptex *tex;	1536	maptex *tex;
1458		1537
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1550	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1551	tex->smoothlevel = level;
1473	}	1552	}
1474		1553
1475	void	1554	void
1476	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)
1477	CODE:	1556	CODE:
1478	{	1557	{
1479	need_texid (self, texid);	1558	need_texid (self, texid);
1480		1559
1481	{	1560	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1580	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1581	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1582	}
1504		1583
1505	int	1584	int
1506	ox (CFPlus::Map self)	1585	ox (DC::Map self)
1507	ALIAS:	1586	ALIAS:
1508	oy = 1	1587	oy = 1
1509	x = 2	1588	x = 2
1510	y = 3	1589	y = 3
1511	w = 4	1590	w = 4
…		…
1522	}	1601	}
1523	OUTPUT:	1602	OUTPUT:
1524	RETVAL	1603	RETVAL
1525		1604
1526	void	1605	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1606	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1607	CODE:
1529	{	1608	{
1530	if (dx > 0)	1609	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1610	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1611	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1626	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1627	self->y += MAP_EXTEND_Y;
1549	}	1628	}
1550	}	1629	}
1551		1630
1552	void	1631	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1632	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1633	CODE:
1555	{	1634	{
1556	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1635	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1557	uint8_t data_end = (uint8_t )SvEND (data_);	1636	uint8_t data_end = (uint8_t )SvEND (data_);
1558	mapcell *cell;	1637	mapcell *cell;
1559	int x, y, flags;	1638	int x, y, z, flags;
		1639	AV *missing = newAV ();
		1640	RETVAL = newRV_noinc ((SV *)missing);
1560		1641
1561	while (data < data_end - 1)	1642	while (data < data_end - 1)
1562	{	1643	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1644	flags = (data [0] << 8) + data [1]; data += 2;
1564		1645
…		…
1615	}	1696	}
1616	else	1697	else
1617	cell->darkness = *data++ + 1;	1698	cell->darkness = *data++ + 1;
1618	}	1699	}
1619		1700
		1701	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1702	if (flags & (4 >> z))
1621	{	1703	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1704	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1705	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1706	cell->tile [z] = self->face2tile [face];
		1707
		1708	if (cell->tile [z])
		1709	{
		1710	maptex *tex = self->tex + cell->tile [z];
		1711	if (!tex->name)
		1712	av_push (missing, newSViv (cell->tile [z]));
		1713
		1714	if (tex->smoothtile)
		1715	{
		1716	maptex *smooth = self->tex + tex->smoothtile;
		1717	if (!smooth->name)
		1718	av_push (missing, newSViv (tex->smoothtile));
		1719	}
		1720	}
1625	}	1721	}
1626
1627	if (flags & 2)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [1] = self->face2tile [face];
1632	}
1633
1634	if (flags & 1)
1635	{
1636	faceid face = (data [0] << 8) + data [1]; data += 2;
1637	need_facenum (self, face);
1638	cell->tile [2] = self->face2tile [face];
1639	}
1640	}	1722	}
1641	else	1723	else
1642	cell->darkness = 0;	1724	cell->darkness = 0;
1643	}	1725	}
1644	}	1726	}
		1727	OUTPUT:
		1728	RETVAL
1645		1729
1646	SV *	1730	SV *
1647	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)
1648	CODE:	1732	CODE:
1649	{	1733	{
1650	int x1, x;	1734	int x1, x;
1651	int y1, y;	1735	int y1, y;
1652	int z;	1736	int z;
…		…
1697	}	1781	}
1698	OUTPUT:	1782	OUTPUT:
1699	RETVAL	1783	RETVAL
1700		1784
1701	void	1785	void
1702	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)
1703	CODE:	1787	CODE:
1704	{	1788	{
		1789	int x, y, z;
		1790
1705	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1791	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1706	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
1707	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)
1708	smooth_key skey;	1794	smooth_key skey;
1709	int x, y, z;	1795
1710	int last_name;	1796	rc_t *rc = rc_alloc ();
		1797	rc_key_t key;
		1798	rc_array_t *arr;
1711		1799
1712	// thats current max. sorry.	1800	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1801	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1802	if (sh > 255) sh = 255;
1715		1803
1716	// clear key, in case of extra padding	1804	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1805	memset (&skey, 0, sizeof (skey));
1718		1806
1719	glColor4ub (255, 255, 255, 255);	1807	memset (&key, 0, sizeof (key));
1720		1808	key.r = 255;
1721	glEnable (GL_BLEND);	1809	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1810	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1811	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1812	key.mode = GL_QUADS;
1725		1813	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1814	key.texname = -1;
1727
1728	last_name = 0;
1729		1815
1730	mx += self->x;	1816	mx += self->x;
1731	my += self->y;	1817	my += self->y;
1732		1818
1733	// first pass: determine smooth_max	1819	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1835	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1836	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1837	self->tex [cell->tile [2]].smoothlevel));
1752	}	1838	}
1753	}	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);
1754		1844
1755	for (z = 0; z <= 2; z++)	1845	for (z = 0; z <= 2; z++)
1756	{	1846	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1847	memset (smooth_level, 0, sizeof (smooth_level));
1758		1848
…		…
1768	tileid tile = cell->tile [z];	1858	tileid tile = cell->tile [z];
1769		1859
1770	if (tile)	1860	if (tile)
1771	{	1861	{
1772	maptex tex = self->tex [tile];	1862	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1863	int px, py;
1774	int py = (y + 1) * T - tex.h;
1775		1864
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1865	if (key.texname != tex.name)
1779	{	1866	{
1780	if (!tex.name)	1867	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1868	tex = self->tex [2]; /* missing, replace by noface */
1782		1869
1783	glEnd ();	1870	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1871	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1872	}
1787		1873
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1874	px = (x + 1) * T - tex.w;
		1875	py = (y + 1) * T - tex.h;
		1876
		1877	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1878	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1790	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);
1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1880	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792		1881
1793	if (cell->flags && z == 2)	1882	if (cell->flags && z == 2)
1794	{	1883	{
		1884	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	1885	if (cell->flags & 1)
1796	{	1886	{
1797	maptex tex = self->tex [1];	1887	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1888	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1889	int py = y * T - T * 6 / 32;
1800		1890
		1891	if (tex.name)
1801	glEnd ();	1892	{
1802	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);
1803	glBegin (GL_QUADS);	1903	}
1804
1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1809	}	1904	}
1810	}	1905	}
1811		1906
1812	// update smooth hash	1907	// update smooth hash
1813	if (tex.smoothtile)	1908	if (tex.smoothtile)
…		…
1849	}	1944	}
1850	}	1945	}
1851	}	1946	}
1852	}	1947	}
1853		1948
		1949	rc_draw (rc);
		1950	rc_clear (rc);
		1951
1854	// go through all smoothlevels, lowest to highest, then draw.	1952	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	1953	// this is basically counting sort
1856	{	1954	{
1857	int w, b;	1955	int w, b;
1858		1956
		1957	glEnable (GL_TEXTURE_2D);
		1958	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	1959	for (w = 0; w < 256 / 32; ++w)
1860	{	1960	{
1861	uint32_t smask = smooth_level [w];	1961	uint32_t smask = smooth_level [w];
1862	if (smask)	1962	if (smask)
1863	for (b = 0; b < 32; ++b)	1963	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	1982	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1983	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	1984	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	1985	float dy = tex.t * .5f ; // 2 images/column
1886		1986
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	1987	if (tex.name)
1890	{	1988	{
		1989	// this time avoiding texture state changes
		1990	// save gobs of state changes.
1891	if (!tex.name)	1991	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	1992	{
1893
1894	glEnd ();	1993	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1994	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	1995	glBegin (GL_QUADS);
1897	}	1996	}
1898		1997
1899	if (border)	1998	if (border)
1900	{	1999	{
1901	float ox = border * dx;	2000	float ox = border * dx;
1902		2001
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2002	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2003	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2004	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2005	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2006	}
1908		2007
1909	if (corner)	2008	if (corner)
1910	{	2009	{
1911	float ox = corner * dx;	2010	float ox = corner * dx;
1912		2011
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2012	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2013	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2014	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2015	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2016	}
1917	}	2017	}
1918	}	2018	}
1919	}	2019	}
1920	}	2020	}
1921	}	2021	}
		2022
		2023	glEnd ();
		2024	glDisable (GL_TEXTURE_2D);
		2025	key.texname = -1;
1922	}	2026	}
1923		2027
1924	hv_clear (smooth);	2028	hv_clear (smooth);
1925	}	2029	}
1926		2030
1927	glEnd ();
1928
1929	glDisable (GL_TEXTURE_2D);
1930	glDisable (GL_BLEND);	2031	glDisable (GL_BLEND);
		2032	rc_free (rc);
1931		2033
1932	// top layer: overlays such as the health bar	2034	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2035	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2036	if (0 <= y + my && y + my < self->rows)
1935	{	2037	{
…		…
1960	}	2062	}
1961	}	2063	}
1962	}	2064	}
1963		2065
1964	void	2066	void
1965	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)
1966	CODE:	2068	CODE:
1967	{	2069	{
1968	static float color[16][3] = {	2070	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2071	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2072	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2122	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2123	glDisable (GL_TEXTURE_2D);
2022	}	2124	}
2023		2125
2024	void	2126	void
2025	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)
2026	PPCODE:	2128	PPCODE:
2027	{	2129	{
2028	int x, y;	2130	int x, y;
2029	int sw1 = sw + 2;	2131	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2132	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2203	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2204	PUSHs (darkness3_sv);
2103	}	2205	}
2104		2206
2105	SV *	2207	SV *
2106	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)
2107	CODE:	2209	CODE:
2108	{	2210	{
2109	int x, y, x1, y1;	2211	int x, y, x1, y1;
2110	SV data_sv = newSV (w h * 7 + 5);	2212	SV data_sv = newSV (w h * 7 + 5);
2111	uint8_t data = (uint8_t )SvPVX (data_sv);	2213	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2176	}	2278	}
2177	OUTPUT:	2279	OUTPUT:
2178	RETVAL	2280	RETVAL
2179		2281
2180	void	2282	void
2181	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)
2182	PPCODE:	2284	PPCODE:
2183	{	2285	{
2184	int x, y, z;	2286	int x, y, z;
2185	int w, h;	2287	int w, h;
2186	int x1, y1;	2288	int x1, y1;
2187		2289
2188	if (*data++ != 0)	2290	if (*data++ != 0)
2189	return; /* version mismatch */	2291	XSRETURN_EMPTY; /* version mismatch */
2190		2292
2191	w = data++ << 8; w \|= data++;	2293	w = data++ << 8; w \|= data++;
2192	h = data++ << 8; h \|= data++;	2294	h = data++ << 8; h \|= data++;
2193		2295
2194	// 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
…		…
2239	}	2341	}
2240	}	2342	}
2241	}	2343	}
2242	}	2344	}
2243		2345
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2346	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2347
2246	CFPlus::RW	2348	DC::RW
2247	new (SV class, SV data_sv)	2349	new (SV class, SV data_sv)
2248	CODE:	2350	CODE:
2249	{	2351	{
2250	STRLEN datalen;	2352	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2353	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2355	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2356	}
2255	OUTPUT:	2357	OUTPUT:
2256	RETVAL	2358	RETVAL
2257		2359
2258	CFPlus::RW	2360	DC::RW
2259	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")
2260	CODE:	2362	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2363	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2364	OUTPUT:
2263	RETVAL	2365	RETVAL
2264		2366
		2367	# fails on win32:
		2368	# dc.xs(2268) : error C2059: syntax error : '('
2265	void	2369	#void
2266	close (CFPlus::RW self)	2370	#close (DC::RW self)
2267	CODE:	2371	# CODE:
2268	SDL_RWclose (self);	2372	# (self->(close)) (self);
2269		2373
2270	MODULE = CFPlus PACKAGE = CFPlus::Channel	2374	MODULE = Deliantra::Client PACKAGE = DC::Channel
2271		2375
2272	PROTOTYPES: DISABLE	2376	PROTOTYPES: DISABLE
2273		2377
2274	CFPlus::Channel	2378	DC::Channel
2275	find ()	2379	find ()
2276	CODE:	2380	CODE:
2277	{	2381	{
2278	RETVAL = Mix_GroupAvailable (-1);	2382	RETVAL = Mix_GroupAvailable (-1);
2279		2383
…		…
2292	}	2396	}
2293	OUTPUT:	2397	OUTPUT:
2294	RETVAL	2398	RETVAL
2295		2399
2296	void	2400	void
2297	halt (CFPlus::Channel self)	2401	halt (DC::Channel self)
2298	CODE:	2402	CODE:
2299	Mix_HaltChannel (self);	2403	Mix_HaltChannel (self);
2300		2404
2301	void	2405	void
2302	expire (CFPlus::Channel self, int ticks = -1)	2406	expire (DC::Channel self, int ticks = -1)
2303	CODE:	2407	CODE:
2304	Mix_ExpireChannel (self, ticks);	2408	Mix_ExpireChannel (self, ticks);
2305		2409
2306	void	2410	void
2307	fade_out (CFPlus::Channel self, int ticks = -1)	2411	fade_out (DC::Channel self, int ticks = -1)
2308	CODE:	2412	CODE:
2309	Mix_FadeOutChannel (self, ticks);	2413	Mix_FadeOutChannel (self, ticks);
2310		2414
2311	int	2415	int
2312	volume (CFPlus::Channel self, int volume)	2416	volume (DC::Channel self, int volume)
2313	CODE:	2417	CODE:
2314	RETVAL = Mix_Volume (self, volume);	2418	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2315	OUTPUT:	2419	OUTPUT:
2316	RETVAL	2420	RETVAL
2317		2421
2318	void	2422	void
2319	unregister_all_effects (CFPlus::Channel self)	2423	unregister_all_effects (DC::Channel self)
2320	CODE:	2424	CODE:
2321	Mix_UnregisterAllEffects (self);	2425	Mix_UnregisterAllEffects (self);
2322		2426
2323	void	2427	void
2324	set_panning (CFPlus::Channel self, int left, int right)	2428	set_panning (DC::Channel self, int left, int right)
2325	CODE:	2429	CODE:
		2430	left = CLAMP (left , 0, 255);
		2431	right = CLAMP (right, 0, 255);
2326	Mix_SetPanning (self, left, right);	2432	Mix_SetPanning (self, left, right);
2327		2433
2328	void	2434	void
2329	set_distance (CFPlus::Channel self, int distance)	2435	set_distance (DC::Channel self, int distance)
2330	CODE:	2436	CODE:
2331	Mix_SetDistance (self, distance);	2437	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2332		2438
2333	void	2439	void
2334	set_position (CFPlus::Channel self, int angle, int distance)	2440	set_position (DC::Channel self, int angle, int distance)
2335	CODE:	2441	CODE:
		2442
		2443	void
		2444	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2445	CODE:
		2446	{
		2447	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2448	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2336	Mix_SetPosition (self, angle, distance);	2449	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2450	}
2337		2451
2338	void	2452	void
2339	set_reverse_stereo (CFPlus::Channel self, int flip)	2453	set_reverse_stereo (DC::Channel self, int flip)
2340	CODE:	2454	CODE:
2341	Mix_SetReverseStereo (self, flip);	2455	Mix_SetReverseStereo (self, flip);
2342		2456
2343	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2457	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2344		2458
2345	PROTOTYPES: DISABLE	2459	PROTOTYPES: DISABLE
2346		2460
2347	CFPlus::MixChunk	2461	DC::MixChunk
2348	new (SV *class, CFPlus::RW rwops)	2462	new (SV *class, DC::RW rwops)
2349	CODE:	2463	CODE:
2350	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2464	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2351	OUTPUT:	2465	OUTPUT:
2352	RETVAL	2466	RETVAL
2353		2467
2354	void	2468	void
2355	DESTROY (CFPlus::MixChunk self)	2469	DESTROY (DC::MixChunk self)
2356	CODE:	2470	CODE:
2357	Mix_FreeChunk (self);	2471	Mix_FreeChunk (self);
2358		2472
2359	int	2473	int
2360	volume (CFPlus::MixChunk self, int volume = -1)	2474	volume (DC::MixChunk self, int volume = -1)
2361	CODE:	2475	CODE:
		2476	if (items > 1)
		2477	volume = CLAMP (volume, 0, 128);
2362	RETVAL = Mix_VolumeChunk (self, volume);	2478	RETVAL = Mix_VolumeChunk (self, volume);
2363	OUTPUT:	2479	OUTPUT:
2364	RETVAL	2480	RETVAL
2365		2481
2366	CFPlus::Channel	2482	DC::Channel
2367	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)
2368	CODE:	2484	CODE:
2369	{	2485	{
2370	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2486	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2371		2487
2372	if (RETVAL < 0)	2488	if (RETVAL < 0)
…		…
2379	}	2495	}
2380	}	2496	}
2381	OUTPUT:	2497	OUTPUT:
2382	RETVAL	2498	RETVAL
2383		2499
2384	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2500	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2385		2501
2386	int	2502	int
2387	volume (int volume = -1)	2503	volume (int volume = -1)
2388	PROTOTYPE: ;$	2504	PROTOTYPE: ;$
2389	CODE:	2505	CODE:
		2506	if (items > 0)
		2507	volume = CLAMP (volume, 0, 128);
2390	RETVAL = Mix_VolumeMusic (volume);	2508	RETVAL = Mix_VolumeMusic (volume);
2391	OUTPUT:	2509	OUTPUT:
2392	RETVAL	2510	RETVAL
2393		2511
2394	void	2512	void
…		…
2399	void	2517	void
2400	halt ()	2518	halt ()
2401	CODE:	2519	CODE:
2402	Mix_HaltMusic ();	2520	Mix_HaltMusic ();
2403		2521
2404	CFPlus::MixMusic	2522	DC::MixMusic
2405	new (SV *class, CFPlus::RW rwops)	2523	new (SV *class, DC::RW rwops)
2406	CODE:	2524	CODE:
2407	RETVAL = Mix_LoadMUS_RW (rwops);	2525	RETVAL = Mix_LoadMUS_RW (rwops);
2408	OUTPUT:	2526	OUTPUT:
2409	RETVAL	2527	RETVAL
2410		2528
2411	void	2529	void
2412	DESTROY (CFPlus::MixMusic self)	2530	DESTROY (DC::MixMusic self)
2413	CODE:	2531	CODE:
2414	Mix_FreeMusic (self);	2532	Mix_FreeMusic (self);
2415		2533
2416	int	2534	int
2417	play (CFPlus::MixMusic self, int loops = -1)	2535	play (DC::MixMusic self, int loops = -1)
2418	CODE:	2536	CODE:
2419	RETVAL = Mix_PlayMusic (self, loops);	2537	RETVAL = Mix_PlayMusic (self, loops);
2420	OUTPUT:	2538	OUTPUT:
2421	RETVAL	2539	RETVAL
2422		2540
2423	void	2541	void
2424	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)
2425	CODE:	2543	CODE:
2426	Mix_FadeInMusicPos (self, loops, ms, position);	2544	Mix_FadeInMusicPos (self, loops, ms, position);
2427		2545
2428	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2546	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2429		2547
2430	PROTOTYPES: ENABLE	2548	PROTOTYPES: ENABLE
2431		2549
2432	BOOT:	2550	BOOT:
2433	{	2551	{
2434	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2552	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2435	static const struct {	2553	static const struct {
2436	const char *name;	2554	const char *name;
2437	IV iv;	2555	IV iv;
2438	} *civ, const_iv[] = {	2556	} *civ, const_iv[] = {
2439	# define const_iv(name) { # name, (IV)name }	2557	# define const_iv(name) { # name, (IV)name }
…		…
2474	const_iv (GL_INTENSITY),	2592	const_iv (GL_INTENSITY),
2475	const_iv (GL_LUMINANCE),	2593	const_iv (GL_LUMINANCE),
2476	const_iv (GL_LUMINANCE_ALPHA),	2594	const_iv (GL_LUMINANCE_ALPHA),
2477	const_iv (GL_FLOAT),	2595	const_iv (GL_FLOAT),
2478	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),
2479	const_iv (GL_COMPILE),	2603	const_iv (GL_COMPILE),
2480	const_iv (GL_PROXY_TEXTURE_1D),	2604	const_iv (GL_PROXY_TEXTURE_1D),
2481	const_iv (GL_PROXY_TEXTURE_2D),	2605	const_iv (GL_PROXY_TEXTURE_2D),
2482	const_iv (GL_TEXTURE_1D),	2606	const_iv (GL_TEXTURE_1D),
2483	const_iv (GL_TEXTURE_2D),	2607	const_iv (GL_TEXTURE_2D),
…		…
2522	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2646	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2523	const_iv (GL_POINT_SMOOTH_HINT),	2647	const_iv (GL_POINT_SMOOTH_HINT),
2524	const_iv (GL_LINE_SMOOTH_HINT),	2648	const_iv (GL_LINE_SMOOTH_HINT),
2525	const_iv (GL_POLYGON_SMOOTH_HINT),	2649	const_iv (GL_POLYGON_SMOOTH_HINT),
2526	const_iv (GL_GENERATE_MIPMAP_HINT),	2650	const_iv (GL_GENERATE_MIPMAP_HINT),
		2651	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2527	const_iv (GL_FASTEST),	2652	const_iv (GL_FASTEST),
2528	const_iv (GL_DONT_CARE),	2653	const_iv (GL_DONT_CARE),
2529	const_iv (GL_NICEST),	2654	const_iv (GL_NICEST),
2530	const_iv (GL_V2F),	2655	const_iv (GL_V2F),
2531	const_iv (GL_V3F),	2656	const_iv (GL_V3F),
…		…
2539		2664
2540	texture_av = newAV ();	2665	texture_av = newAV ();
2541	AvREAL_off (texture_av);	2666	AvREAL_off (texture_av);
2542	}	2667	}
2543		2668
		2669	void
		2670	disable_GL_EXT_blend_func_separate ()
		2671	CODE:
		2672	gl.BlendFuncSeparate = 0;
		2673	gl.BlendFuncSeparateEXT = 0;
		2674
2544	char *	2675	char *
2545	gl_vendor ()	2676	gl_vendor ()
2546	CODE:	2677	CODE:
2547	RETVAL = (char *)glGetString (GL_VENDOR);	2678	RETVAL = (char *)glGetString (GL_VENDOR);
2548	OUTPUT:	2679	OUTPUT:
…		…
2669		2800
2670	void glRect (float x1, float y1, float x2, float y2)	2801	void glRect (float x1, float y1, float x2, float y2)
2671	CODE:	2802	CODE:
2672	glRectf (x1, y1, x2, y2);	2803	glRectf (x1, y1, x2, y2);
2673		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
2674	PROTOTYPES: ENABLE	2814	PROTOTYPES: ENABLE
2675		2815
2676	void glBegin (int mode)	2816	void glBegin (int mode)
2677		2817
2678	void glEnd ()	2818	void glEnd ()
…		…
2710	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)
2711	CODE:	2851	CODE:
2712	if (gl.SeparableFilter2D)	2852	if (gl.SeparableFilter2D)
2713	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2853	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2714		2854
2715	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)
2716		2856
2717	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)
2718		2858
2719	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)
2720		2860
…		…
2746		2886
2747	void glEndList ()	2887	void glEndList ()
2748		2888
2749	void glCallList (int list)	2889	void glCallList (int list)
2750		2890
2751	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2891	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2752		2892
2753	PROTOTYPES: DISABLE	2893	PROTOTYPES: DISABLE
2754		2894
2755	void	2895	void
2756	find_widget (SV *self, NV x, NV y)	2896	find_widget (SV *self, NV x, NV y)
…		…
2760	XPUSHs (self);	2900	XPUSHs (self);
2761	}	2901	}
2762		2902
2763	BOOT:	2903	BOOT:
2764	{	2904	{
2765	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2905	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2766		2906
2767	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);
2768	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);
2769	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);
2770	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);
2771	}	2911	}
2772		2912
2773	void	2913	void
2774	draw (SV *self)	2914	draw (SV *self)
2775	CODE:	2915	CODE:
…		…
2779	NV x, y, w, h;	2919	NV x, y, w, h;
2780	SV *draw_x_sv = GvSV (draw_x_gv);	2920	SV *draw_x_sv = GvSV (draw_x_gv);
2781	SV *draw_y_sv = GvSV (draw_y_gv);	2921	SV *draw_y_sv = GvSV (draw_y_gv);
2782	SV *draw_w_sv = GvSV (draw_w_gv);	2922	SV *draw_w_sv = GvSV (draw_w_gv);
2783	SV *draw_h_sv = GvSV (draw_h_gv);	2923	SV *draw_h_sv = GvSV (draw_h_gv);
2784	SV *hover;
2785	double draw_x, draw_y, draw_w, draw_h;	2924	double draw_x, draw_y;
2786		2925
2787	if (!SvROK (self))	2926	if (!SvROK (self))
2788	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2927	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2789		2928
2790	hv = (HV *)SvRV (self);	2929	hv = (HV *)SvRV (self);
2791		2930
2792	if (SvTYPE (hv) != SVt_PVHV)	2931	if (SvTYPE (hv) != SVt_PVHV)
2793	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2932	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2794		2933
2795	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.;
2796	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.;
2797		2936
2798	if (!h \|\| !w)	2937	if (!h \|\| !w)
…		…
2818	{	2957	{
2819	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2958	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2820		2959
2821	if (svp && SvTRUE (*svp))	2960	if (svp && SvTRUE (*svp))
2822	{	2961	{
2823	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);
2824	glEnable (GL_BLEND);	2963	glEnable (GL_BLEND);
2825	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2964	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2826	glBegin (GL_QUADS);	2965	glBegin (GL_QUADS);
2827	glVertex2f (0, 0);	2966	glVertex2f (0, 0);
2828	glVertex2f (w, 0);	2967	glVertex2f (w, 0);
…		…
2831	glEnd ();	2970	glEnd ();
2832	glDisable (GL_BLEND);	2971	glDisable (GL_BLEND);
2833	}	2972	}
2834	}	2973	}
2835	#if 0	2974	#if 0
2836	if ($ENV{CFPLUS_DEBUG} & 1) {	2975	// draw borders, for debugging
2837	glPushMatrix;	2976	glPushMatrix ();
2838	glColor 1, 1, 0, 1;	2977	glColor4f (1., 1., 0., 1.);
2839	glTranslate 0.375, 0.375;	2978	glTranslatef (.5, .5, 0.);
2840	glBegin GL_LINE_LOOP;	2979	glBegin (GL_LINE_LOOP);
2841	glVertex 0 , 0;	2980	glVertex2f (0 , 0);
2842	glVertex $self->{w} - 1, 0;	2981	glVertex2f (w - 1, 0);
2843	glVertex $self->{w} - 1, $self->{h} - 1;	2982	glVertex2f (w - 1, h - 1);
2844	glVertex 0 , $self->{h} - 1;	2983	glVertex2f (0 , h - 1);
2845	glEnd;	2984	glEnd ();
2846	glPopMatrix;	2985	glPopMatrix ();
2847	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2848	}
2849	#endif	2986	#endif
2850	PUSHMARK (SP);	2987	PUSHMARK (SP);
2851	XPUSHs (self);	2988	XPUSHs (self);
2852	PUTBACK;	2989	PUTBACK;
2853	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.215 by root, Tue Jul 31 00:50:04 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.215 by root, Tue Jul 31 00:50:04 2007 UTC vs.
Revision 1.245 by root, Fri Dec 28 15:05:20 2007 UTC