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

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

…		…
46		46
47	#include <glib/gmacros.h>	47	#include <glib/gmacros.h>
48		48
49	#include <pango/pango.h>	49	#include <pango/pango.h>
50		50
		51	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))
		52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly
		53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly
		54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly
		55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly
		56	#endif
		57
51	#ifndef _WIN32	58	#ifndef _WIN32
52	# include <sys/types.h>	59	# include <sys/types.h>
53	# include <sys/socket.h>	60	# include <sys/socket.h>
54	# include <netinet/in.h>	61	# include <netinet/in.h>
55	# include <netinet/tcp.h>	62	# include <netinet/tcp.h>
…		…
114	av_push (texture_av, (SV *)(size_t)name);	121	av_push (texture_av, (SV *)(size_t)name);
115	glDeleteTextures (1, &name);	122	glDeleteTextures (1, &name);
116	}	123	}
117		124
118	#include "texcache.c"	125	#include "texcache.c"
		126	#include "rendercache.c"
119		127
120	#include "pango-font.c"	128	#include "pango-font.c"
121	#include "pango-fontmap.c"	129	#include "pango-fontmap.c"
122	#include "pango-render.c"	130	#include "pango-render.c"
123		131
124	typedef IV CFPlus__Channel;	132	typedef IV DC__Channel;
125	typedef SDL_RWops *CFPlus__RW;	133	typedef SDL_RWops *DC__RW;
126	typedef Mix_Chunk *CFPlus__MixChunk;	134	typedef Mix_Chunk *DC__MixChunk;
127	typedef Mix_Music *CFPlus__MixMusic;	135	typedef Mix_Music *DC__MixMusic;
128		136
129	typedef PangoFontDescription *CFPlus__Font;	137	typedef PangoFontDescription *DC__Font;
130		138
131	static int	139	static int
132	shape_attr_p (PangoLayoutRun *run)	140	shape_attr_p (PangoLayoutRun *run)
133	{	141	{
134	GSList *attrs = run->item->analysis.extra_attrs;	142	GSList *attrs = run->item->analysis.extra_attrs;
…		…
148		156
149	typedef struct cf_layout {	157	typedef struct cf_layout {
150	PangoLayout *pl;	158	PangoLayout *pl;
151	float r, g, b, a; // default color for rgba mode	159	float r, g, b, a; // default color for rgba mode
152	int base_height;	160	int base_height;
153	CFPlus__Font font;	161	DC__Font font;
		162	rc_t *rc;
154	} *CFPlus__Layout;	163	} *DC__Layout;
155		164
156	static CFPlus__Font default_font;	165	static DC__Font default_font;
157	static PangoContext *opengl_context;	166	static PangoContext *opengl_context;
158	static PangoFontMap *opengl_fontmap;	167	static PangoFontMap *opengl_fontmap;
159		168
160	static void	169	static void
161	substitute_func (FcPattern *pattern, gpointer data)	170	substitute_func (FcPattern *pattern, gpointer data)
…		…
166	#endif	175	#endif
167	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	176	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
168	}	177	}
169		178
170	static void	179	static void
171	layout_update_font (CFPlus__Layout self)	180	layout_update_font (DC__Layout self)
172	{	181	{
173	/* use a random scale factor to account for unknown descenders, 0.8 works	182	/* use a random scale factor to account for unknown descenders, 0.8 works
174	* reasonably well with bitstream vera	183	* reasonably well with bitstream vera
175	*/	184	*/
176	PangoFontDescription *font = self->font ? self->font : default_font;	185	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
180		189
181	pango_layout_set_font_description (self->pl, font);	190	pango_layout_set_font_description (self->pl, font);
182	}	191	}
183		192
184	static void	193	static void
185	layout_get_pixel_size (CFPlus__Layout self, int w, int h)	194	layout_get_pixel_size (DC__Layout self, int w, int h)
186	{	195	{
187	PangoRectangle rect;	196	PangoRectangle rect;
188		197
189	// get_pixel_* wrongly rounds down	198	// get_pixel_* wrongly rounds down
190	pango_layout_get_extents (self->pl, 0, &rect);	199	pango_layout_get_extents (self->pl, 0, &rect);
…		…
201		210
202	typedef uint16_t tileid;	211	typedef uint16_t tileid;
203	typedef uint16_t faceid;	212	typedef uint16_t faceid;
204		213
205	typedef struct {	214	typedef struct {
206	int name;	215	GLuint name;
207	int w, h;	216	int w, h;
208	float s, t;	217	float s, t;
209	uint8_t r, g, b, a;	218	uint8_t r, g, b, a;
210	tileid smoothtile;	219	tileid smoothtile;
211	uint8_t smoothlevel;	220	uint8_t smoothlevel;
…		…
229	int faces; tileid *face2tile; // [faceid]	238	int faces; tileid *face2tile; // [faceid]
230	int texs; maptex *tex; // [tileid]	239	int texs; maptex *tex; // [tileid]
231		240
232	int32_t rows;	241	int32_t rows;
233	maprow *row;	242	maprow *row;
234	} *CFPlus__Map;	243	} *DC__Map;
235		244
236	static char *	245	static char *
237	prepend (char *ptr, int sze, int inc)	246	prepend (char *ptr, int sze, int inc)
238	{	247	{
239	char *p;	248	char *p;
…		…
277	self->texs *= 2;	286	self->texs *= 2;
278	}	287	}
279	}	288	}
280		289
281	static maprow *	290	static maprow *
282	map_get_row (CFPlus__Map self, int y)	291	map_get_row (DC__Map self, int y)
283	{	292	{
284	if (0 > y)	293	if (0 > y)
285	{	294	{
286	int extend = - y + MAP_EXTEND_Y;	295	int extend = - y + MAP_EXTEND_Y;
287	Prepend (maprow, self->row, self->rows, extend);	296	Prepend (maprow, self->row, self->rows, extend);
…		…
325		334
326	return row->col + (x - row->c0);	335	return row->col + (x - row->c0);
327	}	336	}
328		337
329	static mapcell *	338	static mapcell *
330	map_get_cell (CFPlus__Map self, int x, int y)	339	map_get_cell (DC__Map self, int x, int y)
331	{	340	{
332	return row_get_cell (map_get_row (self, y), x);	341	return row_get_cell (map_get_row (self, y), x);
333	}	342	}
334		343
335	static void	344	static void
336	map_clear (CFPlus__Map self)	345	map_clear (DC__Map self)
337	{	346	{
338	int r;	347	int r;
339		348
340	for (r = 0; r < self->rows; r++)	349	for (r = 0; r < self->rows; r++)
341	Safefree (self->row[r].col);	350	Safefree (self->row[r].col);
…		…
349	self->row = 0;	358	self->row = 0;
350	self->rows = 0;	359	self->rows = 0;
351	}	360	}
352		361
353	static void	362	static void
354	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	363	map_blank (DC__Map self, int x0, int y0, int w, int h)
355	{	364	{
356	int x, y;	365	int x, y;
357	maprow *row;	366	maprow *row;
358	mapcell *cell;	367	mapcell *cell;
359		368
…		…
438	n \|= n >> 16;	447	n \|= n >> 16;
439		448
440	return n + 1;	449	return n + 1;
441	}	450	}
442		451
		452	static unsigned int
		453	popcount (unsigned int n)
		454	{
		455	n -= (n >> 1) & 0x55555555U;
		456	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
		457	n = ((n >> 4) + n) & 0x0f0f0f0fU;
		458	n *= 0x01010101U;
		459
		460	return n >> 24;
		461	}
		462
443	/* SDL should provide this, really. */	463	/* SDL should provide this, really. */
444	#define SDLK_MODIFIER_MIN 300	464	#define SDLK_MODIFIER_MIN 300
445	#define SDLK_MODIFIER_MAX 314	465	#define SDLK_MODIFIER_MAX 314
446		466
447	/******************************************************************************/	467	/******************************************************************************/
…		…
485	return 0;	505	return 0;
486		506
487	return 1;	507	return 1;
488	}	508	}
489		509
490	MODULE = CFPlus PACKAGE = CFPlus	510	MODULE = Deliantra::Client PACKAGE = DC
491		511
492	PROTOTYPES: ENABLE	512	PROTOTYPES: ENABLE
493		513
494	BOOT:	514	BOOT:
495	{	515	{
496	HV *stash = gv_stashpv ("CFPlus", 1);	516	HV *stash = gv_stashpv ("DC", 1);
497	static const struct {	517	static const struct {
498	const char *name;	518	const char *name;
499	IV iv;	519	IV iv;
500	} *civ, const_iv[] = {	520	} *civ, const_iv[] = {
501	# define const_iv(name) { # name, (IV)name }	521	# define const_iv(name) { # name, (IV)name }
…		…
523		543
524	const_iv (SDL_APPINPUTFOCUS),	544	const_iv (SDL_APPINPUTFOCUS),
525	const_iv (SDL_APPMOUSEFOCUS),	545	const_iv (SDL_APPMOUSEFOCUS),
526	const_iv (SDL_APPACTIVE),	546	const_iv (SDL_APPACTIVE),
527		547
		548	const_iv (SDLK_FIRST),
		549	const_iv (SDLK_LAST),
528	const_iv (SDLK_KP0),	550	const_iv (SDLK_KP0),
529	const_iv (SDLK_KP1),	551	const_iv (SDLK_KP1),
530	const_iv (SDLK_KP2),	552	const_iv (SDLK_KP2),
531	const_iv (SDLK_KP3),	553	const_iv (SDLK_KP3),
532	const_iv (SDLK_KP4),	554	const_iv (SDLK_KP4),
…		…
604	const_iv (KMOD_LMETA),	626	const_iv (KMOD_LMETA),
605	const_iv (KMOD_RMETA),	627	const_iv (KMOD_RMETA),
606	const_iv (KMOD_NUM),	628	const_iv (KMOD_NUM),
607	const_iv (KMOD_CAPS),	629	const_iv (KMOD_CAPS),
608	const_iv (KMOD_MODE),	630	const_iv (KMOD_MODE),
		631
		632	const_iv (MIX_DEFAULT_FORMAT),
609	# undef const_iv	633	# undef const_iv
610	};	634	};
611		635
612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
631		655
632	NV floor (NV x)	656	NV floor (NV x)
633		657
634	NV ceil (NV x)	658	NV ceil (NV x)
635		659
		660	IV minpot (UV n)
		661
		662	IV popcount (UV n)
		663
636	void	664	void
637	pango_init ()	665	pango_init ()
638	CODE:	666	CODE:
639	{	667	{
640	opengl_fontmap = pango_opengl_font_map_new ();	668	opengl_fontmap = pango_opengl_font_map_new ();
641	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	669	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
642	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	670	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		671	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)
		672	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
		673	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
		674	#endif
643	}	675	}
644		676
645	char *	677	char *
646	SDL_GetError ()	678	SDL_GetError ()
647		679
…		…
679	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	711	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
680		712
681	if (m && m != (SDL_Rect **)-1)	713	if (m && m != (SDL_Rect **)-1)
682	while (*m)	714	while (*m)
683	{	715	{
684	if ((m)->w >= 640 && (m)->h >= 480)	716	if ((m)->w >= 800 && (m)->h >= 480)
685	{	717	{
686	AV *av = newAV ();	718	AV *av = newAV ();
687	av_push (av, newSViv ((*m)->w));	719	av_push (av, newSViv ((*m)->w));
688	av_push (av, newSViv ((*m)->h));	720	av_push (av, newSViv ((*m)->h));
689	av_push (av, newSViv (rgb));	721	av_push (av, newSViv (rgb));
…		…
713		745
714	if (RETVAL)	746	if (RETVAL)
715	{	747	{
716	av_clear (texture_av);	748	av_clear (texture_av);
717		749
718	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	750	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
719	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	751	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
720	#include "glfunc.h"	752	#include "glfunc.h"
721	#undef GL_FUNC	753	#undef GL_FUNC
722	}	754	}
723	}	755	}
…		…
804	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	836	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
805	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	837	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
806	break;	838	break;
807	}	839	}
808		840
809	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	841	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
810	}	842	}
811	}	843	}
812		844
813	int	845	int
814	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)	846	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
815	POSTCALL:	847	POSTCALL:
816	Mix_HookMusicFinished (music_finished);	848	Mix_HookMusicFinished (music_finished);
817	Mix_ChannelFinished (channel_finished);	849	Mix_ChannelFinished (channel_finished);
		850
		851	void
		852	Mix_QuerySpec ()
		853	PPCODE:
		854	{
		855	int freq, channels;
		856	Uint16 format;
		857
		858	if (Mix_QuerySpec (&freq, &format, &channels))
		859	{
		860	EXTEND (SP, 3);
		861	PUSHs (sv_2mortal (newSViv (freq)));
		862	PUSHs (sv_2mortal (newSViv (format)));
		863	PUSHs (sv_2mortal (newSViv (channels)));
		864	}
		865	}
818		866
819	void	867	void
820	Mix_CloseAudio ()	868	Mix_CloseAudio ()
821		869
822	int	870	int
…		…
956	void	1004	void
957	error (char *message)	1005	error (char *message)
958	CODE:	1006	CODE:
959	fprintf (stderr, "ERROR: %s\n", message);	1007	fprintf (stderr, "ERROR: %s\n", message);
960	#ifdef _WIN32	1008	#ifdef _WIN32
961	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);	1009	MessageBox (0, message, "Deliantra Client Error", MB_OK \| MB_ICONERROR);
962	#endif	1010	#endif
963		1011
964	void	1012	void
965	fatal (char *message)	1013	fatal (char *message)
966	CODE:	1014	CODE:
967	fprintf (stderr, "FATAL: %s\n", message);	1015	fprintf (stderr, "FATAL: %s\n", message);
968	#ifdef _WIN32	1016	#ifdef _WIN32
969	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	1017	MessageBox (0, message, "Deliantra Client Fatal Error", MB_OK \| MB_ICONERROR);
970	#endif	1018	#endif
971	_exit (1);	1019	_exit (1);
972		1020
973	void	1021	void
974	_exit (int retval = 0)	1022	_exit (int retval = 0)
…		…
986	#if DEBUG	1034	#if DEBUG
987	VALGRIND_DO_LEAK_CHECK;	1035	VALGRIND_DO_LEAK_CHECK;
988	#endif	1036	#endif
989	}	1037	}
990		1038
991	MODULE = CFPlus PACKAGE = CFPlus::Font	1039	MODULE = Deliantra::Client PACKAGE = DC::Font
992		1040
993	PROTOTYPES: DISABLE	1041	PROTOTYPES: DISABLE
994		1042
995	CFPlus::Font	1043	DC::Font
996	new_from_file (SV class, char path, int id = 0)	1044	new_from_file (SV class, char path, int id = 0)
997	CODE:	1045	CODE:
998	{	1046	{
999	int count;	1047	int count;
1000	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1048	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
1003	}	1051	}
1004	OUTPUT:	1052	OUTPUT:
1005	RETVAL	1053	RETVAL
1006		1054
1007	void	1055	void
1008	DESTROY (CFPlus::Font self)	1056	DESTROY (DC::Font self)
1009	CODE:	1057	CODE:
1010	pango_font_description_free (self);	1058	pango_font_description_free (self);
1011		1059
1012	void	1060	void
1013	make_default (CFPlus::Font self)	1061	make_default (DC::Font self)
1014	PROTOTYPE: $	1062	PROTOTYPE: $
1015	CODE:	1063	CODE:
1016	default_font = self;	1064	default_font = self;
1017		1065
1018	MODULE = CFPlus PACKAGE = CFPlus::Layout	1066	MODULE = Deliantra::Client PACKAGE = DC::Layout
1019		1067
1020	PROTOTYPES: DISABLE	1068	PROTOTYPES: DISABLE
1021		1069
1022	void	1070	void
1023	reset_glyph_cache ()	1071	glyph_cache_backup ()
1024	PROTOTYPE:	1072	PROTOTYPE:
1025	CODE:	1073	CODE:
		1074	tc_backup ();
		1075
		1076	void
		1077	glyph_cache_restore ()
		1078	PROTOTYPE:
		1079	CODE:
1026	tc_clear ();	1080	tc_restore ();
1027		1081
1028	CFPlus::Layout	1082	DC::Layout
1029	new (SV *class)	1083	new (SV *class)
1030	CODE:	1084	CODE:
1031	New (0, RETVAL, 1, struct cf_layout);	1085	New (0, RETVAL, 1, struct cf_layout);
1032		1086
1033	RETVAL->pl = pango_layout_new (opengl_context);	1087	RETVAL->pl = pango_layout_new (opengl_context);
…		…
1035	RETVAL->g = 1.;	1089	RETVAL->g = 1.;
1036	RETVAL->b = 1.;	1090	RETVAL->b = 1.;
1037	RETVAL->a = 1.;	1091	RETVAL->a = 1.;
1038	RETVAL->base_height = MIN_FONT_HEIGHT;	1092	RETVAL->base_height = MIN_FONT_HEIGHT;
1039	RETVAL->font = 0;	1093	RETVAL->font = 0;
		1094	RETVAL->rc = rc_alloc ();
1040		1095
1041	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1096	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1042	layout_update_font (RETVAL);	1097	layout_update_font (RETVAL);
1043	OUTPUT:	1098	OUTPUT:
1044	RETVAL	1099	RETVAL
1045		1100
1046	void	1101	void
1047	DESTROY (CFPlus::Layout self)	1102	DESTROY (DC::Layout self)
1048	CODE:	1103	CODE:
1049	g_object_unref (self->pl);	1104	g_object_unref (self->pl);
		1105	rc_free (self->rc);
1050	Safefree (self);	1106	Safefree (self);
1051		1107
1052	void	1108	void
1053	set_text (CFPlus::Layout self, SV *text_)	1109	set_text (DC::Layout self, SV *text_)
1054	CODE:	1110	CODE:
1055	{	1111	{
1056	STRLEN textlen;	1112	STRLEN textlen;
1057	char *text = SvPVutf8 (text_, textlen);	1113	char *text = SvPVutf8 (text_, textlen);
1058		1114
1059	pango_layout_set_text (self->pl, text, textlen);	1115	pango_layout_set_text (self->pl, text, textlen);
1060	}	1116	}
1061		1117
1062	void	1118	void
1063	set_markup (CFPlus::Layout self, SV *text_)	1119	set_markup (DC::Layout self, SV *text_)
1064	CODE:	1120	CODE:
1065	{	1121	{
1066	STRLEN textlen;	1122	STRLEN textlen;
1067	char *text = SvPVutf8 (text_, textlen);	1123	char *text = SvPVutf8 (text_, textlen);
1068		1124
1069	pango_layout_set_markup (self->pl, text, textlen);	1125	pango_layout_set_markup (self->pl, text, textlen);
1070	}	1126	}
1071		1127
1072	void	1128	void
1073	set_shapes (CFPlus::Layout self, ...)	1129	set_shapes (DC::Layout self, ...)
1074	CODE:	1130	CODE:
1075	{	1131	{
1076	PangoAttrList *attrs = 0;	1132	PangoAttrList *attrs = 0;
1077	const char *text = pango_layout_get_text (self->pl);	1133	const char *text = pango_layout_get_text (self->pl);
1078	const char *pos = text;	1134	const char *pos = text;
…		…
1113	if (attrs)	1169	if (attrs)
1114	pango_layout_set_attributes (self->pl, attrs);	1170	pango_layout_set_attributes (self->pl, attrs);
1115	}	1171	}
1116		1172
1117	void	1173	void
1118	get_shapes (CFPlus::Layout self)	1174	get_shapes (DC::Layout self)
1119	PPCODE:	1175	PPCODE:
1120	{	1176	{
1121	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	1177	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1122		1178
1123	do	1179	do
1124	{	1180	{
1125	PangoLayoutRun *run = pango_layout_iter_get_run (iter);	1181	PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1126		1182
1127	if (run && shape_attr_p (run))	1183	if (run && shape_attr_p (run))
1128	{	1184	{
1129	PangoRectangle extents;	1185	PangoRectangle extents;
1130	pango_layout_iter_get_run_extents (iter, 0, &extents);	1186	pango_layout_iter_get_run_extents (iter, 0, &extents);
…		…
1138		1194
1139	pango_layout_iter_free (iter);	1195	pango_layout_iter_free (iter);
1140	}	1196	}
1141		1197
1142	int	1198	int
1143	has_wrapped (CFPlus::Layout self)	1199	has_wrapped (DC::Layout self)
1144	CODE:	1200	CODE:
1145	{	1201	{
1146	int lines = 1;	1202	int lines = 1;
1147	const char *text = pango_layout_get_text (self->pl);	1203	const char *text = pango_layout_get_text (self->pl);
1148		1204
…		…
1153	}	1209	}
1154	OUTPUT:	1210	OUTPUT:
1155	RETVAL	1211	RETVAL
1156		1212
1157	SV *	1213	SV *
1158	get_text (CFPlus::Layout self)	1214	get_text (DC::Layout self)
1159	CODE:	1215	CODE:
1160	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1216	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
1161	sv_utf8_decode (RETVAL);	1217	sv_utf8_decode (RETVAL);
1162	OUTPUT:	1218	OUTPUT:
1163	RETVAL	1219	RETVAL
1164		1220
1165	void	1221	void
1166	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)	1222	set_foreground (DC::Layout self, float r, float g, float b, float a = 1.)
1167	CODE:	1223	CODE:
1168	self->r = r;	1224	self->r = r;
1169	self->g = g;	1225	self->g = g;
1170	self->b = b;	1226	self->b = b;
1171	self->a = a;	1227	self->a = a;
1172		1228
1173	void	1229	void
1174	set_font (CFPlus::Layout self, CFPlus::Font font = 0)	1230	set_font (DC::Layout self, DC::Font font = 0)
1175	CODE:	1231	CODE:
1176	if (self->font != font)	1232	if (self->font != font)
1177	{	1233	{
1178	self->font = font;	1234	self->font = font;
1179	layout_update_font (self);	1235	layout_update_font (self);
1180	}	1236	}
1181		1237
1182	void	1238	void
1183	set_height (CFPlus::Layout self, int base_height)	1239	set_height (DC::Layout self, int base_height)
1184	CODE:	1240	CODE:
1185	if (self->base_height != base_height)	1241	if (self->base_height != base_height)
1186	{	1242	{
1187	self->base_height = base_height;	1243	self->base_height = base_height;
1188	layout_update_font (self);	1244	layout_update_font (self);
1189	}	1245	}
1190		1246
1191	void	1247	void
1192	set_width (CFPlus::Layout self, int max_width = -1)	1248	set_width (DC::Layout self, int max_width = -1)
1193	CODE:	1249	CODE:
1194	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1250	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
1195		1251
1196	void	1252	void
1197	set_indent (CFPlus::Layout self, int indent)	1253	set_indent (DC::Layout self, int indent)
1198	CODE:	1254	CODE:
1199	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1255	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
1200		1256
1201	void	1257	void
1202	set_spacing (CFPlus::Layout self, int spacing)	1258	set_spacing (DC::Layout self, int spacing)
1203	CODE:	1259	CODE:
1204	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1260	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
1205		1261
1206	void	1262	void
1207	set_ellipsise (CFPlus::Layout self, int ellipsise)	1263	set_ellipsise (DC::Layout self, int ellipsise)
1208	CODE:	1264	CODE:
1209	pango_layout_set_ellipsize (self->pl,	1265	pango_layout_set_ellipsize (self->pl,
1210	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1266	ellipsise == 1 ? PANGO_ELLIPSIZE_START
1211	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1267	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
1212	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1268	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
1213	: PANGO_ELLIPSIZE_NONE	1269	: PANGO_ELLIPSIZE_NONE
1214	);	1270	);
1215		1271
1216	void	1272	void
1217	set_single_paragraph_mode (CFPlus::Layout self, int spm)	1273	set_single_paragraph_mode (DC::Layout self, int spm)
1218	CODE:	1274	CODE:
1219	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1275	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
1220		1276
1221	void	1277	void
1222	size (CFPlus::Layout self)	1278	size (DC::Layout self)
1223	PPCODE:	1279	PPCODE:
1224	{	1280	{
1225	int w, h;	1281	int w, h;
1226		1282
1227	layout_get_pixel_size (self, &w, &h);	1283	layout_get_pixel_size (self, &w, &h);
…		…
1230	PUSHs (sv_2mortal (newSViv (w)));	1286	PUSHs (sv_2mortal (newSViv (w)));
1231	PUSHs (sv_2mortal (newSViv (h)));	1287	PUSHs (sv_2mortal (newSViv (h)));
1232	}	1288	}
1233		1289
1234	int	1290	int
1235	descent (CFPlus::Layout self)	1291	descent (DC::Layout self)
1236	CODE:	1292	CODE:
1237	{	1293	{
1238	PangoRectangle rect;	1294	PangoRectangle rect;
1239	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1295	PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1240	pango_layout_line_get_pixel_extents (line, 0, &rect);	1296	pango_layout_line_get_pixel_extents (line, 0, &rect);
1241	RETVAL = PANGO_DESCENT (rect);	1297	RETVAL = PANGO_DESCENT (rect);
1242	}	1298	}
1243	OUTPUT:	1299	OUTPUT:
1244	RETVAL	1300	RETVAL
1245		1301
1246	int	1302	int
1247	xy_to_index (CFPlus::Layout self, int x, int y)	1303	xy_to_index (DC::Layout self, int x, int y)
1248	CODE:	1304	CODE:
1249	{	1305	{
1250	int index, trailing;	1306	int index, trailing;
1251	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1307	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1252	RETVAL = index + trailing;	1308	RETVAL = index + trailing;
1253	}	1309	}
1254	OUTPUT:	1310	OUTPUT:
1255	RETVAL	1311	RETVAL
1256		1312
1257	void	1313	void
1258	cursor_pos (CFPlus::Layout self, int index)	1314	cursor_pos (DC::Layout self, int index)
1259	PPCODE:	1315	PPCODE:
1260	{	1316	{
1261	PangoRectangle strong_pos;	1317	PangoRectangle pos;
1262	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1318	pango_layout_get_cursor_pos (self->pl, index, 0, &pos);
1263		1319
1264	EXTEND (SP, 3);	1320	EXTEND (SP, 3);
1265	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1321	PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1266	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1322	PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1267	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1323	PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1268	}	1324	}
1269		1325
1270	void	1326	void
1271	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)	1327	index_to_line_x (DC::Layout self, int index, int trailing = 0)
1272	PPCODE:	1328	PPCODE:
1273	{	1329	{
1274	int line, x;	1330	int line, x;
1275		1331
1276	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1332	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1333	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))
1277	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1334	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1278		1335	--line;
		1336	#endif
1279	EXTEND (SP, 2);	1337	EXTEND (SP, 2);
1280	PUSHs (sv_2mortal (newSViv (line - 1)));	1338	PUSHs (sv_2mortal (newSViv (line)));
1281	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1339	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1282	}	1340	}
1283		1341
1284	void	1342	void
1285	line_x_to_index (CFPlus::Layout self, int line, int x)	1343	line_x_to_index (DC::Layout self, int line, int x)
1286	PPCODE:	1344	PPCODE:
1287	{	1345	{
1288	PangoLayoutLine *lp;	1346	PangoLayoutLine *lp;
1289	int index, trailing;	1347	int index, trailing;
1290		1348
1291	if (line < 0)	1349	if (line < 0)
1292	XSRETURN_EMPTY;	1350	XSRETURN_EMPTY;
1293		1351
1294	if (!(lp = pango_layout_get_line (self->pl, line)))	1352	if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1295	XSRETURN_EMPTY; /* do better */	1353	XSRETURN_EMPTY; /* do better */
1296		1354
1297	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);	1355	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1298		1356
1299	EXTEND (SP, 2);	1357	EXTEND (SP, 2);
…		…
1305	PUSHs (sv_2mortal (newSViv (trailing)));	1363	PUSHs (sv_2mortal (newSViv (trailing)));
1306	}	1364	}
1307	}	1365	}
1308		1366
1309	void	1367	void
1310	render (CFPlus::Layout self, float x, float y, int flags = 0)	1368	render (DC::Layout self, float x, float y, int flags = 0)
1311	PPCODE:	1369	CODE:
		1370	rc_clear (self->rc);
1312	pango_opengl_render_layout_subpixel (	1371	pango_opengl_render_layout_subpixel (
1313	self->pl,	1372	self->pl,
		1373	self->rc,
1314	x * PANGO_SCALE, y * PANGO_SCALE,	1374	x * PANGO_SCALE, y * PANGO_SCALE,
1315	self->r, self->g, self->b, self->a,	1375	self->r, self->g, self->b, self->a,
1316	flags	1376	flags
1317	);	1377	);
		1378	// we assume that context_change actually clears/frees stuff
		1379	// and does not do any recomputation...
		1380	pango_layout_context_changed (self->pl);
1318		1381
1319	MODULE = CFPlus PACKAGE = CFPlus::Texture	1382	void
		1383	draw (DC::Layout self)
		1384	CODE:
		1385	{
		1386	glEnable (GL_TEXTURE_2D);
		1387	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1388	glEnable (GL_BLEND);
		1389	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1390	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1391	glEnable (GL_ALPHA_TEST);
		1392	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1393
		1394	rc_draw (self->rc);
		1395
		1396	glDisable (GL_ALPHA_TEST);
		1397	glDisable (GL_BLEND);
		1398	glDisable (GL_TEXTURE_2D);
		1399	}
		1400
		1401	MODULE = Deliantra::Client PACKAGE = DC::Texture
1320		1402
1321	PROTOTYPES: ENABLE	1403	PROTOTYPES: ENABLE
1322
1323	int minpot (int n)
1324		1404
1325	void	1405	void
1326	pad (SV *data_, int ow, int oh, int nw, int nh)	1406	pad (SV *data_, int ow, int oh, int nw, int nh)
1327	CODE:	1407	CODE:
1328	{	1408	{
…		…
1405	RETVAL = width > 0;	1485	RETVAL = width > 0;
1406	}	1486	}
1407	OUTPUT:	1487	OUTPUT:
1408	RETVAL	1488	RETVAL
1409		1489
1410	MODULE = CFPlus PACKAGE = CFPlus::Map	1490	MODULE = Deliantra::Client PACKAGE = DC::Map
1411		1491
1412	PROTOTYPES: DISABLE	1492	PROTOTYPES: DISABLE
1413		1493
1414	CFPlus::Map	1494	DC::Map
1415	new (SV *class)	1495	new (SV *class)
1416	CODE:	1496	CODE:
1417	New (0, RETVAL, 1, struct map);	1497	New (0, RETVAL, 1, struct map);
1418	RETVAL->x = 0;	1498	RETVAL->x = 0;
1419	RETVAL->y = 0;	1499	RETVAL->y = 0;
…		…
1427	RETVAL->row = 0;	1507	RETVAL->row = 0;
1428	OUTPUT:	1508	OUTPUT:
1429	RETVAL	1509	RETVAL
1430		1510
1431	void	1511	void
1432	DESTROY (CFPlus::Map self)	1512	DESTROY (DC::Map self)
1433	CODE:	1513	CODE:
1434	{	1514	{
1435	map_clear (self);	1515	map_clear (self);
1436	Safefree (self->face2tile);	1516	Safefree (self->face2tile);
1437	Safefree (self->tex);	1517	Safefree (self->tex);
1438	Safefree (self);	1518	Safefree (self);
1439	}	1519	}
1440		1520
1441	void	1521	void
1442	resize (CFPlus::Map self, int map_width, int map_height)	1522	resize (DC::Map self, int map_width, int map_height)
1443	CODE:	1523	CODE:
1444	self->w = map_width;	1524	self->w = map_width;
1445	self->h = map_height;	1525	self->h = map_height;
1446		1526
1447	void	1527	void
1448	clear (CFPlus::Map self)	1528	clear (DC::Map self)
1449	CODE:	1529	CODE:
1450	map_clear (self);	1530	map_clear (self);
1451		1531
1452	void	1532	void
1453	set_tileid (CFPlus::Map self, int face, int tile)	1533	set_tileid (DC::Map self, int face, int tile)
1454	CODE:	1534	CODE:
1455	{	1535	{
1456	need_facenum (self, face); self->face2tile [face] = tile;	1536	need_facenum (self, face); self->face2tile [face] = tile;
1457	need_texid (self, tile);	1537	need_texid (self, tile);
1458	}	1538	}
1459		1539
1460	void	1540	void
1461	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1541	set_smooth (DC::Map self, int face, int smooth, int level)
1462	CODE:	1542	CODE:
1463	{	1543	{
1464	tileid texid;	1544	tileid texid;
1465	maptex *tex;	1545	maptex *tex;
1466		1546
…		…
1479	tex->smoothtile = self->face2tile [smooth];	1559	tex->smoothtile = self->face2tile [smooth];
1480	tex->smoothlevel = level;	1560	tex->smoothlevel = level;
1481	}	1561	}
1482		1562
1483	void	1563	void
1484	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1564	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1485	CODE:	1565	CODE:
1486	{	1566	{
1487	need_texid (self, texid);	1567	need_texid (self, texid);
1488		1568
1489	{	1569	{
…		…
1509	// from transparent color bleeding and ugly wrapping effects.	1589	// from transparent color bleeding and ugly wrapping effects.
1510	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1590	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1511	}	1591	}
1512		1592
1513	int	1593	int
1514	ox (CFPlus::Map self)	1594	ox (DC::Map self)
1515	ALIAS:	1595	ALIAS:
1516	oy = 1	1596	oy = 1
1517	x = 2	1597	x = 2
1518	y = 3	1598	y = 3
1519	w = 4	1599	w = 4
…		…
1530	}	1610	}
1531	OUTPUT:	1611	OUTPUT:
1532	RETVAL	1612	RETVAL
1533		1613
1534	void	1614	void
1535	scroll (CFPlus::Map self, int dx, int dy)	1615	scroll (DC::Map self, int dx, int dy)
1536	CODE:	1616	CODE:
1537	{	1617	{
1538	if (dx > 0)	1618	if (dx > 0)
1539	map_blank (self, self->x, self->y, dx, self->h);	1619	map_blank (self, self->x, self->y, dx, self->h);
1540	else if (dx < 0)	1620	else if (dx < 0)
…		…
1556	self->y += MAP_EXTEND_Y;	1636	self->y += MAP_EXTEND_Y;
1557	}	1637	}
1558	}	1638	}
1559		1639
1560	SV *	1640	SV *
1561	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1641	map1a_update (DC::Map self, SV *data_, int extmap)
1562	CODE:	1642	CODE:
1563	{	1643	{
1564	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1644	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1565	uint8_t data_end = (uint8_t )SvEND (data_);	1645	uint8_t data_end = (uint8_t )SvEND (data_);
1566	mapcell *cell;	1646	mapcell *cell;
…		…
1655	}	1735	}
1656	OUTPUT:	1736	OUTPUT:
1657	RETVAL	1737	RETVAL
1658		1738
1659	SV *	1739	SV *
1660	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1740	mapmap (DC::Map self, int x0, int y0, int w, int h)
1661	CODE:	1741	CODE:
1662	{	1742	{
1663	int x1, x;	1743	int x1, x;
1664	int y1, y;	1744	int y1, y;
1665	int z;	1745	int z;
…		…
1710	}	1790	}
1711	OUTPUT:	1791	OUTPUT:
1712	RETVAL	1792	RETVAL
1713		1793
1714	void	1794	void
1715	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1795	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1716	CODE:	1796	CODE:
1717	{	1797	{
		1798	int x, y, z;
		1799
1718	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1800	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1719	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1801	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1720	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1802	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1721	smooth_key skey;	1803	smooth_key skey;
1722	int x, y, z;	1804
1723	int last_name;	1805	rc_t *rc = rc_alloc ();
		1806	rc_key_t key;
		1807	rc_array_t *arr;
1724		1808
1725	// thats current max. sorry.	1809	// thats current max. sorry.
1726	if (sw > 255) sw = 255;	1810	if (sw > 255) sw = 255;
1727	if (sh > 255) sh = 255;	1811	if (sh > 255) sh = 255;
1728		1812
1729	// clear key, in case of extra padding	1813	// clear key, in case of extra padding
1730	memset (&skey, 0, sizeof (skey));	1814	memset (&skey, 0, sizeof (skey));
1731		1815
1732	glColor4ub (255, 255, 255, 255);	1816	memset (&key, 0, sizeof (key));
1733		1817	key.r = 255;
1734	glEnable (GL_BLEND);	1818	key.g = 255;
1735	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1819	key.b = 255;
1736	glEnable (GL_TEXTURE_2D);	1820	key.a = 255;
1737	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1821	key.mode = GL_QUADS;
1738		1822	key.format = GL_T2F_V3F;
1739	glBegin (GL_QUADS);
1740
1741	last_name = -1;	1823	key.texname = -1;
1742		1824
1743	mx += self->x;	1825	mx += self->x;
1744	my += self->y;	1826	my += self->y;
1745		1827
1746	// first pass: determine smooth_max	1828	// first pass: determine smooth_max
…		…
1762	MAX (self->tex [cell->tile [0]].smoothlevel,	1844	MAX (self->tex [cell->tile [0]].smoothlevel,
1763	MAX (self->tex [cell->tile [1]].smoothlevel,	1845	MAX (self->tex [cell->tile [1]].smoothlevel,
1764	self->tex [cell->tile [2]].smoothlevel));	1846	self->tex [cell->tile [2]].smoothlevel));
1765	}	1847	}
1766	}	1848	}
		1849
		1850	glEnable (GL_BLEND);
		1851	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1852	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1767		1853
1768	for (z = 0; z <= 2; z++)	1854	for (z = 0; z <= 2; z++)
1769	{	1855	{
1770	memset (smooth_level, 0, sizeof (smooth_level));	1856	memset (smooth_level, 0, sizeof (smooth_level));
1771		1857
…		…
1783	if (tile)	1869	if (tile)
1784	{	1870	{
1785	maptex tex = self->tex [tile];	1871	maptex tex = self->tex [tile];
1786	int px, py;	1872	int px, py;
1787		1873
1788	// suppressing texture state switches here
1789	// is only moderately effective, but worth the extra effort
1790	if (last_name != tex.name)	1874	if (key.texname != tex.name)
1791	{	1875	{
1792	if (!tex.name)	1876	if (!tex.name)
1793	tex = self->tex [2]; /* missing, replace by noface */	1877	tex = self->tex [2]; /* missing, replace by noface */
1794		1878
1795	glEnd ();	1879	key.texname = tex.name;
1796	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1880	arr = rc_array (rc, &key);
1797	glBegin (GL_QUADS);
1798	}	1881	}
1799		1882
1800	px = (x + 1) * T - tex.w;	1883	px = (x + 1) * T - tex.w;
1801	py = (y + 1) * T - tex.h;	1884	py = (y + 1) * T - tex.h;
1802		1885
1803	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1886	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1804	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1887	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1805	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1888	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1806	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1889	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1807		1890
1808	if (cell->flags && z == 2)	1891	if (cell->flags && z == 2)
1809	{	1892	{
		1893	// overlays such as the speech bubble, probably more to come
1810	if (cell->flags & 1)	1894	if (cell->flags & 1)
1811	{	1895	{
1812	maptex tex = self->tex [1];	1896	maptex tex = self->tex [1];
1813	int px = x * T + T * 2 / 32;	1897	int px = x * T + T * 2 / 32;
1814	int py = y * T - T * 6 / 32;	1898	int py = y * T - T * 6 / 32;
1815		1899
		1900	if (tex.name)
1816	glEnd ();	1901	{
1817	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1902	if (key.texname != tex.name)
		1903	{
		1904	key.texname = tex.name;
		1905	arr = rc_array (rc, &key);
		1906	}
		1907
		1908	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1909	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1910	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1911	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1818	glBegin (GL_QUADS);	1912	}
1819
1820	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1821	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
1822	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
1823	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
1824	}	1913	}
1825	}	1914	}
1826		1915
1827	// update smooth hash	1916	// update smooth hash
1828	if (tex.smoothtile)	1917	if (tex.smoothtile)
…		…
1864	}	1953	}
1865	}	1954	}
1866	}	1955	}
1867	}	1956	}
1868		1957
		1958	rc_draw (rc);
		1959	rc_clear (rc);
		1960
1869	// go through all smoothlevels, lowest to highest, then draw.	1961	// go through all smoothlevels, lowest to highest, then draw.
1870	// this is basically counting sort	1962	// this is basically counting sort
1871	{	1963	{
1872	int w, b;	1964	int w, b;
1873		1965
		1966	glEnable (GL_TEXTURE_2D);
		1967	glBegin (GL_QUADS);
1874	for (w = 0; w < 256 / 32; ++w)	1968	for (w = 0; w < 256 / 32; ++w)
1875	{	1969	{
1876	uint32_t smask = smooth_level [w];	1970	uint32_t smask = smooth_level [w];
1877	if (smask)	1971	if (smask)
1878	for (b = 0; b < 32; ++b)	1972	for (b = 0; b < 32; ++b)
…		…
1897	int border = bits & 15;	1991	int border = bits & 15;
1898	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1992	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1899	float dx = tex.s * .0625f; // 16 images/row	1993	float dx = tex.s * .0625f; // 16 images/row
1900	float dy = tex.t * .5f ; // 2 images/column	1994	float dy = tex.t * .5f ; // 2 images/column
1901		1995
1902	// this time naively avoiding texture state changes
1903	// save gobs of state changes.
1904	if (last_name != tex.name)	1996	if (tex.name)
1905	{	1997	{
		1998	// this time avoiding texture state changes
		1999	// save gobs of state changes.
1906	if (!tex.name)	2000	if (key.texname != tex.name)
1907	continue; // smoothing not yet available	2001	{
1908
1909	glEnd ();	2002	glEnd ();
1910	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	2003	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1911	glBegin (GL_QUADS);	2004	glBegin (GL_QUADS);
1912	}	2005	}
1913		2006
1914	if (border)	2007	if (border)
1915	{	2008	{
1916	float ox = border * dx;	2009	float ox = border * dx;
1917		2010
1918	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	2011	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1919	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	2012	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1920	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2013	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1921	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2014	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1922	}	2015	}
1923		2016
1924	if (corner)	2017	if (corner)
1925	{	2018	{
1926	float ox = corner * dx;	2019	float ox = corner * dx;
1927		2020
1928	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2021	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1929	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2022	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1930	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2023	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1931	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2024	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2025	}
1932	}	2026	}
1933	}	2027	}
1934	}	2028	}
1935	}	2029	}
1936	}	2030	}
		2031
		2032	glEnd ();
		2033	glDisable (GL_TEXTURE_2D);
		2034	key.texname = -1;
1937	}	2035	}
1938		2036
1939	hv_clear (smooth);	2037	hv_clear (smooth);
1940	}	2038	}
1941		2039
1942	glEnd ();
1943
1944	glDisable (GL_TEXTURE_2D);
1945	glDisable (GL_BLEND);	2040	glDisable (GL_BLEND);
		2041	rc_free (rc);
1946		2042
1947	// top layer: overlays such as the health bar	2043	// top layer: overlays such as the health bar
1948	for (y = 0; y < sh; y++)	2044	for (y = 0; y < sh; y++)
1949	if (0 <= y + my && y + my < self->rows)	2045	if (0 <= y + my && y + my < self->rows)
1950	{	2046	{
…		…
1975	}	2071	}
1976	}	2072	}
1977	}	2073	}
1978		2074
1979	void	2075	void
1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2076	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1981	CODE:	2077	CODE:
1982	{	2078	{
1983	static float color[16][3] = {	2079	static float color[16][3] = {
1984	{ 0.00F, 0.00F, 0.00F },	2080	{ 0.00F, 0.00F, 0.00F },
1985	{ 1.00F, 1.00F, 1.00F },	2081	{ 1.00F, 1.00F, 1.00F },
…		…
2035	glDisable (GL_BLEND);	2131	glDisable (GL_BLEND);
2036	glDisable (GL_TEXTURE_2D);	2132	glDisable (GL_TEXTURE_2D);
2037	}	2133	}
2038		2134
2039	void	2135	void
2040	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2136	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2041	PPCODE:	2137	PPCODE:
2042	{	2138	{
2043	int x, y;	2139	int x, y;
2044	int sw1 = sw + 2;	2140	int sw1 = sw + 2;
2045	int sh1 = sh + 2;	2141	int sh1 = sh + 2;
…		…
2116	PUSHs (sv_2mortal (newSViv (sh3)));	2212	PUSHs (sv_2mortal (newSViv (sh3)));
2117	PUSHs (darkness3_sv);	2213	PUSHs (darkness3_sv);
2118	}	2214	}
2119		2215
2120	SV *	2216	SV *
2121	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2217	get_rect (DC::Map self, int x0, int y0, int w, int h)
2122	CODE:	2218	CODE:
2123	{	2219	{
2124	int x, y, x1, y1;	2220	int x, y, x1, y1;
2125	SV data_sv = newSV (w h * 7 + 5);	2221	SV data_sv = newSV (w h * 7 + 5);
2126	uint8_t data = (uint8_t )SvPVX (data_sv);	2222	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2191	}	2287	}
2192	OUTPUT:	2288	OUTPUT:
2193	RETVAL	2289	RETVAL
2194		2290
2195	void	2291	void
2196	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2292	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2197	PPCODE:	2293	PPCODE:
2198	{	2294	{
2199	int x, y, z;	2295	int x, y, z;
2200	int w, h;	2296	int w, h;
2201	int x1, y1;	2297	int x1, y1;
2202		2298
2203	if (*data++ != 0)	2299	if (*data++ != 0)
2204	return; /* version mismatch */	2300	XSRETURN_EMPTY; /* version mismatch */
2205		2301
2206	w = data++ << 8; w \|= data++;	2302	w = data++ << 8; w \|= data++;
2207	h = data++ << 8; h \|= data++;	2303	h = data++ << 8; h \|= data++;
2208		2304
2209	// we need to do this 'cause we don't keep an absolute coord system for rows	2305	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2254	}	2350	}
2255	}	2351	}
2256	}	2352	}
2257	}	2353	}
2258		2354
2259	MODULE = CFPlus PACKAGE = CFPlus::RW	2355	MODULE = Deliantra::Client PACKAGE = DC::RW
2260		2356
2261	CFPlus::RW	2357	DC::RW
2262	new (SV class, SV data_sv)	2358	new (SV class, SV data_sv)
2263	CODE:	2359	CODE:
2264	{	2360	{
2265	STRLEN datalen;	2361	STRLEN datalen;
2266	char *data = SvPVbyte (data_sv, datalen);	2362	char *data = SvPVbyte (data_sv, datalen);
…		…
2268	RETVAL = SDL_RWFromConstMem (data, datalen);	2364	RETVAL = SDL_RWFromConstMem (data, datalen);
2269	}	2365	}
2270	OUTPUT:	2366	OUTPUT:
2271	RETVAL	2367	RETVAL
2272		2368
2273	CFPlus::RW	2369	DC::RW
2274	new_from_file (SV class, const char path, const char *mode = "rb")	2370	new_from_file (SV class, const char path, const char *mode = "rb")
2275	CODE:	2371	CODE:
2276	RETVAL = SDL_RWFromFile (path, mode);	2372	RETVAL = SDL_RWFromFile (path, mode);
2277	OUTPUT:	2373	OUTPUT:
2278	RETVAL	2374	RETVAL
2279		2375
2280	# fails on win32:	2376	# fails on win32:
2281	# CFPlus.xs(2268) : error C2059: syntax error : '('	2377	# dc.xs(2268) : error C2059: syntax error : '('
2282	#void	2378	#void
2283	#close (CFPlus::RW self)	2379	#close (DC::RW self)
2284	# CODE:	2380	# CODE:
2285	# (self->(close)) (self);	2381	# (self->(close)) (self);
2286		2382
2287	MODULE = CFPlus PACKAGE = CFPlus::Channel	2383	MODULE = Deliantra::Client PACKAGE = DC::Channel
2288		2384
2289	PROTOTYPES: DISABLE	2385	PROTOTYPES: DISABLE
2290		2386
2291	CFPlus::Channel	2387	DC::Channel
2292	find ()	2388	find ()
2293	CODE:	2389	CODE:
2294	{	2390	{
2295	RETVAL = Mix_GroupAvailable (-1);	2391	RETVAL = Mix_GroupAvailable (-1);
2296		2392
…		…
2309	}	2405	}
2310	OUTPUT:	2406	OUTPUT:
2311	RETVAL	2407	RETVAL
2312		2408
2313	void	2409	void
2314	halt (CFPlus::Channel self)	2410	halt (DC::Channel self)
2315	CODE:	2411	CODE:
2316	Mix_HaltChannel (self);	2412	Mix_HaltChannel (self);
2317		2413
2318	void	2414	void
2319	expire (CFPlus::Channel self, int ticks = -1)	2415	expire (DC::Channel self, int ticks = -1)
2320	CODE:	2416	CODE:
2321	Mix_ExpireChannel (self, ticks);	2417	Mix_ExpireChannel (self, ticks);
2322		2418
2323	void	2419	void
2324	fade_out (CFPlus::Channel self, int ticks = -1)	2420	fade_out (DC::Channel self, int ticks = -1)
2325	CODE:	2421	CODE:
2326	Mix_FadeOutChannel (self, ticks);	2422	Mix_FadeOutChannel (self, ticks);
2327		2423
2328	int	2424	int
2329	volume (CFPlus::Channel self, int volume)	2425	volume (DC::Channel self, int volume)
2330	CODE:	2426	CODE:
2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));	2427	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2332	OUTPUT:	2428	OUTPUT:
2333	RETVAL	2429	RETVAL
2334		2430
2335	void	2431	void
2336	unregister_all_effects (CFPlus::Channel self)	2432	unregister_all_effects (DC::Channel self)
2337	CODE:	2433	CODE:
2338	Mix_UnregisterAllEffects (self);	2434	Mix_UnregisterAllEffects (self);
2339		2435
2340	void	2436	void
2341	set_panning (CFPlus::Channel self, int left, int right)	2437	set_panning (DC::Channel self, int left, int right)
2342	CODE:	2438	CODE:
2343	left = CLAMP (left , 0, 255);	2439	left = CLAMP (left , 0, 255);
2344	right = CLAMP (right, 0, 255);	2440	right = CLAMP (right, 0, 255);
2345	Mix_SetPanning (self, left, right);	2441	Mix_SetPanning (self, left, right);
2346		2442
2347	void	2443	void
2348	set_distance (CFPlus::Channel self, int distance)	2444	set_distance (DC::Channel self, int distance)
2349	CODE:	2445	CODE:
2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));	2446	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2351		2447
2352	void	2448	void
2353	set_position (CFPlus::Channel self, int angle, int distance)	2449	set_position (DC::Channel self, int angle, int distance)
2354	CODE:	2450	CODE:
2355		2451
2356	void	2452	void
2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)	2453	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2358	CODE:	2454	CODE:
2359	{	2455	{
2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2456	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2457	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2458	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2363	}	2459	}
2364		2460
2365	void	2461	void
2366	set_reverse_stereo (CFPlus::Channel self, int flip)	2462	set_reverse_stereo (DC::Channel self, int flip)
2367	CODE:	2463	CODE:
2368	Mix_SetReverseStereo (self, flip);	2464	Mix_SetReverseStereo (self, flip);
2369		2465
2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2466	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2371		2467
2372	PROTOTYPES: DISABLE	2468	PROTOTYPES: DISABLE
2373		2469
2374	CFPlus::MixChunk	2470	DC::MixChunk
2375	new (SV *class, CFPlus::RW rwops)	2471	new (SV *class, DC::RW rwops)
2376	CODE:	2472	CODE:
2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2473	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2378	OUTPUT:	2474	OUTPUT:
2379	RETVAL	2475	RETVAL
2380		2476
2381	void	2477	void
2382	DESTROY (CFPlus::MixChunk self)	2478	DESTROY (DC::MixChunk self)
2383	CODE:	2479	CODE:
2384	Mix_FreeChunk (self);	2480	Mix_FreeChunk (self);
2385		2481
2386	int	2482	int
2387	volume (CFPlus::MixChunk self, int volume = -1)	2483	volume (DC::MixChunk self, int volume = -1)
2388	CODE:	2484	CODE:
2389	if (items > 1)	2485	if (items > 1)
2390	volume = CLAMP (volume, 0, 128);	2486	volume = CLAMP (volume, 0, 128);
2391	RETVAL = Mix_VolumeChunk (self, volume);	2487	RETVAL = Mix_VolumeChunk (self, volume);
2392	OUTPUT:	2488	OUTPUT:
2393	RETVAL	2489	RETVAL
2394		2490
2395	CFPlus::Channel	2491	DC::Channel
2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)	2492	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2397	CODE:	2493	CODE:
2398	{	2494	{
2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2495	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
2400		2496
2401	if (RETVAL < 0)	2497	if (RETVAL < 0)
…		…
2408	}	2504	}
2409	}	2505	}
2410	OUTPUT:	2506	OUTPUT:
2411	RETVAL	2507	RETVAL
2412		2508
2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2509	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2414		2510
2415	int	2511	int
2416	volume (int volume = -1)	2512	volume (int volume = -1)
2417	PROTOTYPE: ;$	2513	PROTOTYPE: ;$
2418	CODE:	2514	CODE:
…		…
2430	void	2526	void
2431	halt ()	2527	halt ()
2432	CODE:	2528	CODE:
2433	Mix_HaltMusic ();	2529	Mix_HaltMusic ();
2434		2530
2435	CFPlus::MixMusic	2531	DC::MixMusic
2436	new (SV *class, CFPlus::RW rwops)	2532	new (SV *class, DC::RW rwops)
2437	CODE:	2533	CODE:
2438	RETVAL = Mix_LoadMUS_RW (rwops);	2534	RETVAL = Mix_LoadMUS_RW (rwops);
2439	OUTPUT:	2535	OUTPUT:
2440	RETVAL	2536	RETVAL
2441		2537
2442	void	2538	void
2443	DESTROY (CFPlus::MixMusic self)	2539	DESTROY (DC::MixMusic self)
2444	CODE:	2540	CODE:
2445	Mix_FreeMusic (self);	2541	Mix_FreeMusic (self);
2446		2542
2447	int	2543	int
2448	play (CFPlus::MixMusic self, int loops = -1)	2544	play (DC::MixMusic self, int loops = -1)
2449	CODE:	2545	CODE:
2450	RETVAL = Mix_PlayMusic (self, loops);	2546	RETVAL = Mix_PlayMusic (self, loops);
2451	OUTPUT:	2547	OUTPUT:
2452	RETVAL	2548	RETVAL
2453		2549
2454	void	2550	void
2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2551	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2456	CODE:	2552	CODE:
2457	Mix_FadeInMusicPos (self, loops, ms, position);	2553	Mix_FadeInMusicPos (self, loops, ms, position);
2458		2554
2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2555	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2460		2556
2461	PROTOTYPES: ENABLE	2557	PROTOTYPES: ENABLE
2462		2558
2463	BOOT:	2559	BOOT:
2464	{	2560	{
2465	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2561	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2466	static const struct {	2562	static const struct {
2467	const char *name;	2563	const char *name;
2468	IV iv;	2564	IV iv;
2469	} *civ, const_iv[] = {	2565	} *civ, const_iv[] = {
2470	# define const_iv(name) { # name, (IV)name }	2566	# define const_iv(name) { # name, (IV)name }
…		…
2505	const_iv (GL_INTENSITY),	2601	const_iv (GL_INTENSITY),
2506	const_iv (GL_LUMINANCE),	2602	const_iv (GL_LUMINANCE),
2507	const_iv (GL_LUMINANCE_ALPHA),	2603	const_iv (GL_LUMINANCE_ALPHA),
2508	const_iv (GL_FLOAT),	2604	const_iv (GL_FLOAT),
2509	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2605	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2606	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2607	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2608	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2609	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2610	const_iv (GL_COMPRESSED_RGB_ARB),
		2611	const_iv (GL_COMPRESSED_RGBA_ARB),
2510	const_iv (GL_COMPILE),	2612	const_iv (GL_COMPILE),
2511	const_iv (GL_PROXY_TEXTURE_1D),	2613	const_iv (GL_PROXY_TEXTURE_1D),
2512	const_iv (GL_PROXY_TEXTURE_2D),	2614	const_iv (GL_PROXY_TEXTURE_2D),
2513	const_iv (GL_TEXTURE_1D),	2615	const_iv (GL_TEXTURE_1D),
2514	const_iv (GL_TEXTURE_2D),	2616	const_iv (GL_TEXTURE_2D),
…		…
2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2655	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2554	const_iv (GL_POINT_SMOOTH_HINT),	2656	const_iv (GL_POINT_SMOOTH_HINT),
2555	const_iv (GL_LINE_SMOOTH_HINT),	2657	const_iv (GL_LINE_SMOOTH_HINT),
2556	const_iv (GL_POLYGON_SMOOTH_HINT),	2658	const_iv (GL_POLYGON_SMOOTH_HINT),
2557	const_iv (GL_GENERATE_MIPMAP_HINT),	2659	const_iv (GL_GENERATE_MIPMAP_HINT),
		2660	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2558	const_iv (GL_FASTEST),	2661	const_iv (GL_FASTEST),
2559	const_iv (GL_DONT_CARE),	2662	const_iv (GL_DONT_CARE),
2560	const_iv (GL_NICEST),	2663	const_iv (GL_NICEST),
2561	const_iv (GL_V2F),	2664	const_iv (GL_V2F),
2562	const_iv (GL_V3F),	2665	const_iv (GL_V3F),
…		…
2570		2673
2571	texture_av = newAV ();	2674	texture_av = newAV ();
2572	AvREAL_off (texture_av);	2675	AvREAL_off (texture_av);
2573	}	2676	}
2574		2677
		2678	void
		2679	disable_GL_EXT_blend_func_separate ()
		2680	CODE:
		2681	gl.BlendFuncSeparate = 0;
		2682	gl.BlendFuncSeparateEXT = 0;
		2683
2575	char *	2684	char *
2576	gl_vendor ()	2685	gl_vendor ()
2577	CODE:	2686	CODE:
2578	RETVAL = (char *)glGetString (GL_VENDOR);	2687	RETVAL = (char *)glGetString (GL_VENDOR);
2579	OUTPUT:	2688	OUTPUT:
…		…
2700		2809
2701	void glRect (float x1, float y1, float x2, float y2)	2810	void glRect (float x1, float y1, float x2, float y2)
2702	CODE:	2811	CODE:
2703	glRectf (x1, y1, x2, y2);	2812	glRectf (x1, y1, x2, y2);
2704		2813
		2814	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2815	CODE:
		2816	glBegin (GL_LINE_LOOP);
		2817	glVertex2f (x1, y1);
		2818	glVertex2f (x2, y1);
		2819	glVertex2f (x2, y2);
		2820	glVertex2f (x1, y2);
		2821	glEnd ();
		2822
2705	PROTOTYPES: ENABLE	2823	PROTOTYPES: ENABLE
2706		2824
2707	void glBegin (int mode)	2825	void glBegin (int mode)
2708		2826
2709	void glEnd ()	2827	void glEnd ()
…		…
2741	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2859	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
2742	CODE:	2860	CODE:
2743	if (gl.SeparableFilter2D)	2861	if (gl.SeparableFilter2D)
2744	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);	2862	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2745		2863
2746	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2864	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2747		2865
2748	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2866	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2749		2867
2750	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2868	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2751		2869
…		…
2777		2895
2778	void glEndList ()	2896	void glEndList ()
2779		2897
2780	void glCallList (int list)	2898	void glCallList (int list)
2781		2899
2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2900	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2783		2901
2784	PROTOTYPES: DISABLE	2902	PROTOTYPES: DISABLE
2785		2903
2786	void	2904	void
2787	find_widget (SV *self, NV x, NV y)	2905	find_widget (SV *self, NV x, NV y)
…		…
2791	XPUSHs (self);	2909	XPUSHs (self);
2792	}	2910	}
2793		2911
2794	BOOT:	2912	BOOT:
2795	{	2913	{
2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2914	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2797		2915
2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2916	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2917	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2918	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2919	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2802	}	2920	}
2803		2921
2804	void	2922	void
2805	draw (SV *self)	2923	draw (SV *self)
2806	CODE:	2924	CODE:
…		…
2810	NV x, y, w, h;	2928	NV x, y, w, h;
2811	SV *draw_x_sv = GvSV (draw_x_gv);	2929	SV *draw_x_sv = GvSV (draw_x_gv);
2812	SV *draw_y_sv = GvSV (draw_y_gv);	2930	SV *draw_y_sv = GvSV (draw_y_gv);
2813	SV *draw_w_sv = GvSV (draw_w_gv);	2931	SV *draw_w_sv = GvSV (draw_w_gv);
2814	SV *draw_h_sv = GvSV (draw_h_gv);	2932	SV *draw_h_sv = GvSV (draw_h_gv);
2815	SV *hover;
2816	double draw_x, draw_y, draw_w, draw_h;	2933	double draw_x, draw_y;
2817		2934
2818	if (!SvROK (self))	2935	if (!SvROK (self))
2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2936	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2820		2937
2821	hv = (HV *)SvRV (self);	2938	hv = (HV *)SvRV (self);
2822		2939
2823	if (SvTYPE (hv) != SVt_PVHV)	2940	if (SvTYPE (hv) != SVt_PVHV)
2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2941	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2825		2942
2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2943	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2944	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2828		2945
2829	if (!h \|\| !w)	2946	if (!h \|\| !w)
…		…
2849	{	2966	{
2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2967	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2851		2968
2852	if (svp && SvTRUE (*svp))	2969	if (svp && SvTRUE (*svp))
2853	{	2970	{
2854	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2971	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2855	glEnable (GL_BLEND);	2972	glEnable (GL_BLEND);
2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2973	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2857	glBegin (GL_QUADS);	2974	glBegin (GL_QUADS);
2858	glVertex2f (0, 0);	2975	glVertex2f (0, 0);
2859	glVertex2f (w, 0);	2976	glVertex2f (w, 0);
…		…
2862	glEnd ();	2979	glEnd ();
2863	glDisable (GL_BLEND);	2980	glDisable (GL_BLEND);
2864	}	2981	}
2865	}	2982	}
2866	#if 0	2983	#if 0
2867	if ($ENV{CFPLUS_DEBUG} & 1) {	2984	// draw borders, for debugging
2868	glPushMatrix;	2985	glPushMatrix ();
2869	glColor 1, 1, 0, 1;	2986	glColor4f (1., 1., 0., 1.);
2870	glTranslate 0.375, 0.375;	2987	glTranslatef (.5, .5, 0.);
2871	glBegin GL_LINE_LOOP;	2988	glBegin (GL_LINE_LOOP);
2872	glVertex 0 , 0;	2989	glVertex2f (0 , 0);
2873	glVertex $self->{w} - 1, 0;	2990	glVertex2f (w - 1, 0);
2874	glVertex $self->{w} - 1, $self->{h} - 1;	2991	glVertex2f (w - 1, h - 1);
2875	glVertex 0 , $self->{h} - 1;	2992	glVertex2f (0 , h - 1);
2876	glEnd;	2993	glEnd ();
2877	glPopMatrix;	2994	glPopMatrix ();
2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2879	}
2880	#endif	2995	#endif
2881	PUSHMARK (SP);	2996	PUSHMARK (SP);
2882	XPUSHs (self);	2997	XPUSHs (self);
2883	PUTBACK;	2998	PUTBACK;
2884	call_method ("_draw", G_VOID \| G_DISCARD);	2999	call_method ("_draw", G_VOID \| G_DISCARD);

Diff Legend

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

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

Diff Legend

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