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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC vs.
Revision 1.243 by root, Thu Dec 27 06:54:36 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);
…		…
1275	PUSHs (sv_2mortal (newSViv (line - 1)));	1325	PUSHs (sv_2mortal (newSViv (line - 1)));
1276	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));	1326	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1277	}	1327	}
1278		1328
1279	void	1329	void
1280	line_x_to_index (CFPlus::Layout self, int line, int x)	1330	line_x_to_index (DC::Layout self, int line, int x)
1281	PPCODE:	1331	PPCODE:
1282	{	1332	{
1283	PangoLayoutLine *lp;	1333	PangoLayoutLine *lp;
1284	int index, trailing;	1334	int index, trailing;
1285		1335
…		…
1300	PUSHs (sv_2mortal (newSViv (trailing)));	1350	PUSHs (sv_2mortal (newSViv (trailing)));
1301	}	1351	}
1302	}	1352	}
1303		1353
1304	void	1354	void
1305	render (CFPlus::Layout self, float x, float y, int flags = 0)	1355	render (DC::Layout self, float x, float y, int flags = 0)
1306	PPCODE:	1356	CODE:
		1357	rc_clear (self->rc);
1307	pango_opengl_render_layout_subpixel (	1358	pango_opengl_render_layout_subpixel (
1308	self->pl,	1359	self->pl,
		1360	self->rc,
1309	x * PANGO_SCALE, y * PANGO_SCALE,	1361	x * PANGO_SCALE, y * PANGO_SCALE,
1310	self->r, self->g, self->b, self->a,	1362	self->r, self->g, self->b, self->a,
1311	flags	1363	flags
1312	);	1364	);
		1365	// we assume that context_change actually clears/frees stuff
		1366	// and does not do any recomputation...
		1367	pango_layout_context_changed (self->pl);
1313		1368
1314	MODULE = CFPlus PACKAGE = CFPlus::Texture	1369	void
		1370	draw (DC::Layout self)
		1371	CODE:
		1372	{
		1373	glEnable (GL_TEXTURE_2D);
		1374	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1375	glEnable (GL_BLEND);
		1376	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1377	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1378	glEnable (GL_ALPHA_TEST);
		1379	glAlphaFunc (GL_GREATER, 7.f / 255.f);
		1380
		1381	rc_draw (self->rc);
		1382
		1383	glDisable (GL_ALPHA_TEST);
		1384	glDisable (GL_BLEND);
		1385	glDisable (GL_TEXTURE_2D);
		1386	}
		1387
		1388	MODULE = Deliantra::Client PACKAGE = DC::Texture
1315		1389
1316	PROTOTYPES: ENABLE	1390	PROTOTYPES: ENABLE
1317
1318	int minpot (int n)
1319		1391
1320	void	1392	void
1321	pad (SV *data_, int ow, int oh, int nw, int nh)	1393	pad (SV *data_, int ow, int oh, int nw, int nh)
1322	CODE:	1394	CODE:
1323	{	1395	{
…		…
1350	HV hv = (HV )SvRV (self);	1422	HV hv = (HV )SvRV (self);
1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1423	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1424	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1425	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1354		1426
		1427	if (name <= 0)
		1428	XSRETURN_EMPTY;
		1429
1355	if (items < 5)	1430	if (items < 5)
1356	{	1431	{
1357	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1432	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1358	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1433	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1359	}	1434	}
…		…
1397	RETVAL = width > 0;	1472	RETVAL = width > 0;
1398	}	1473	}
1399	OUTPUT:	1474	OUTPUT:
1400	RETVAL	1475	RETVAL
1401		1476
1402	MODULE = CFPlus PACKAGE = CFPlus::Map	1477	MODULE = Deliantra::Client PACKAGE = DC::Map
1403		1478
1404	PROTOTYPES: DISABLE	1479	PROTOTYPES: DISABLE
1405		1480
1406	CFPlus::Map	1481	DC::Map
1407	new (SV *class)	1482	new (SV *class)
1408	CODE:	1483	CODE:
1409	New (0, RETVAL, 1, struct map);	1484	New (0, RETVAL, 1, struct map);
1410	RETVAL->x = 0;	1485	RETVAL->x = 0;
1411	RETVAL->y = 0;	1486	RETVAL->y = 0;
…		…
1419	RETVAL->row = 0;	1494	RETVAL->row = 0;
1420	OUTPUT:	1495	OUTPUT:
1421	RETVAL	1496	RETVAL
1422		1497
1423	void	1498	void
1424	DESTROY (CFPlus::Map self)	1499	DESTROY (DC::Map self)
1425	CODE:	1500	CODE:
1426	{	1501	{
1427	map_clear (self);	1502	map_clear (self);
1428	Safefree (self->face2tile);	1503	Safefree (self->face2tile);
1429	Safefree (self->tex);	1504	Safefree (self->tex);
1430	Safefree (self);	1505	Safefree (self);
1431	}	1506	}
1432		1507
1433	void	1508	void
1434	resize (CFPlus::Map self, int map_width, int map_height)	1509	resize (DC::Map self, int map_width, int map_height)
1435	CODE:	1510	CODE:
1436	self->w = map_width;	1511	self->w = map_width;
1437	self->h = map_height;	1512	self->h = map_height;
1438		1513
1439	void	1514	void
1440	clear (CFPlus::Map self)	1515	clear (DC::Map self)
1441	CODE:	1516	CODE:
1442	map_clear (self);	1517	map_clear (self);
1443		1518
1444	void	1519	void
1445	set_tileid (CFPlus::Map self, int face, int tile)	1520	set_tileid (DC::Map self, int face, int tile)
1446	CODE:	1521	CODE:
1447	{	1522	{
1448	need_facenum (self, face); self->face2tile [face] = tile;	1523	need_facenum (self, face); self->face2tile [face] = tile;
1449	need_texid (self, tile);	1524	need_texid (self, tile);
1450	}	1525	}
1451		1526
1452	void	1527	void
1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)	1528	set_smooth (DC::Map self, int face, int smooth, int level)
1454	CODE:	1529	CODE:
1455	{	1530	{
1456	tileid texid;	1531	tileid texid;
1457	maptex *tex;	1532	maptex *tex;
1458		1533
…		…
1471	tex->smoothtile = self->face2tile [smooth];	1546	tex->smoothtile = self->face2tile [smooth];
1472	tex->smoothlevel = level;	1547	tex->smoothlevel = level;
1473	}	1548	}
1474		1549
1475	void	1550	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)	1551	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:	1552	CODE:
1478	{	1553	{
1479	need_texid (self, texid);	1554	need_texid (self, texid);
1480		1555
1481	{	1556	{
…		…
1501	// from transparent color bleeding and ugly wrapping effects.	1576	// from transparent color bleeding and ugly wrapping effects.
1502	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1577	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1503	}	1578	}
1504		1579
1505	int	1580	int
1506	ox (CFPlus::Map self)	1581	ox (DC::Map self)
1507	ALIAS:	1582	ALIAS:
1508	oy = 1	1583	oy = 1
1509	x = 2	1584	x = 2
1510	y = 3	1585	y = 3
1511	w = 4	1586	w = 4
…		…
1522	}	1597	}
1523	OUTPUT:	1598	OUTPUT:
1524	RETVAL	1599	RETVAL
1525		1600
1526	void	1601	void
1527	scroll (CFPlus::Map self, int dx, int dy)	1602	scroll (DC::Map self, int dx, int dy)
1528	CODE:	1603	CODE:
1529	{	1604	{
1530	if (dx > 0)	1605	if (dx > 0)
1531	map_blank (self, self->x, self->y, dx, self->h);	1606	map_blank (self, self->x, self->y, dx, self->h);
1532	else if (dx < 0)	1607	else if (dx < 0)
…		…
1547	self->rows += MAP_EXTEND_Y;	1622	self->rows += MAP_EXTEND_Y;
1548	self->y += MAP_EXTEND_Y;	1623	self->y += MAP_EXTEND_Y;
1549	}	1624	}
1550	}	1625	}
1551		1626
1552	void	1627	SV *
1553	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1628	map1a_update (DC::Map self, SV *data_, int extmap)
1554	CODE:	1629	CODE:
1555	{	1630	{
1556	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1631	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1557	uint8_t data_end = (uint8_t )SvEND (data_);	1632	uint8_t data_end = (uint8_t )SvEND (data_);
1558	mapcell *cell;	1633	mapcell *cell;
1559	int x, y, flags;	1634	int x, y, z, flags;
		1635	AV *missing = newAV ();
		1636	RETVAL = newRV_noinc ((SV *)missing);
1560		1637
1561	while (data < data_end - 1)	1638	while (data < data_end - 1)
1562	{	1639	{
1563	flags = (data [0] << 8) + data [1]; data += 2;	1640	flags = (data [0] << 8) + data [1]; data += 2;
1564		1641
…		…
1615	}	1692	}
1616	else	1693	else
1617	cell->darkness = *data++ + 1;	1694	cell->darkness = *data++ + 1;
1618	}	1695	}
1619		1696
		1697	for (z = 0; z <= 2; ++z)
1620	if (flags & 4)	1698	if (flags & (4 >> z))
1621	{	1699	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;	1700	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);	1701	need_facenum (self, face);
1624	cell->tile [0] = self->face2tile [face];	1702	cell->tile [z] = self->face2tile [face];
		1703
		1704	if (cell->tile [z])
		1705	{
		1706	maptex *tex = self->tex + cell->tile [z];
		1707	if (!tex->name)
		1708	av_push (missing, newSViv (cell->tile [z]));
		1709
		1710	if (tex->smoothtile)
		1711	{
		1712	maptex *smooth = self->tex + tex->smoothtile;
		1713	if (!smooth->name)
		1714	av_push (missing, newSViv (tex->smoothtile));
		1715	}
		1716	}
1625	}	1717	}
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	}	1718	}
1641	else	1719	else
1642	cell->darkness = 0;	1720	cell->darkness = 0;
1643	}	1721	}
1644	}	1722	}
		1723	OUTPUT:
		1724	RETVAL
1645		1725
1646	SV *	1726	SV *
1647	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1727	mapmap (DC::Map self, int x0, int y0, int w, int h)
1648	CODE:	1728	CODE:
1649	{	1729	{
1650	int x1, x;	1730	int x1, x;
1651	int y1, y;	1731	int y1, y;
1652	int z;	1732	int z;
…		…
1697	}	1777	}
1698	OUTPUT:	1778	OUTPUT:
1699	RETVAL	1779	RETVAL
1700		1780
1701	void	1781	void
1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1782	draw (DC::Map self, int mx, int my, int sw, int sh, int T)
1703	CODE:	1783	CODE:
1704	{	1784	{
		1785	int x, y, z;
		1786
1705	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1787	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1788	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)	1789	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1708	smooth_key skey;	1790	smooth_key skey;
1709	int x, y, z;	1791
1710	int last_name;	1792	rc_t *rc = rc_alloc ();
		1793	rc_key_t key;
		1794	rc_array_t *arr;
1711		1795
1712	// thats current max. sorry.	1796	// thats current max. sorry.
1713	if (sw > 255) sw = 255;	1797	if (sw > 255) sw = 255;
1714	if (sh > 255) sh = 255;	1798	if (sh > 255) sh = 255;
1715		1799
1716	// clear key, in case of extra padding	1800	// clear key, in case of extra padding
1717	memset (&skey, 0, sizeof (skey));	1801	memset (&skey, 0, sizeof (skey));
1718		1802
1719	glColor4ub (255, 255, 255, 255);	1803	memset (&key, 0, sizeof (key));
1720		1804	key.r = 255;
1721	glEnable (GL_BLEND);	1805	key.g = 255;
1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1806	key.b = 255;
1723	glEnable (GL_TEXTURE_2D);	1807	key.a = 255;
1724	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1808	key.mode = GL_QUADS;
1725		1809	key.format = GL_T2F_V3F;
1726	glBegin (GL_QUADS);	1810	key.texname = -1;
1727
1728	last_name = 0;
1729		1811
1730	mx += self->x;	1812	mx += self->x;
1731	my += self->y;	1813	my += self->y;
1732		1814
1733	// first pass: determine smooth_max	1815	// first pass: determine smooth_max
…		…
1749	MAX (self->tex [cell->tile [0]].smoothlevel,	1831	MAX (self->tex [cell->tile [0]].smoothlevel,
1750	MAX (self->tex [cell->tile [1]].smoothlevel,	1832	MAX (self->tex [cell->tile [1]].smoothlevel,
1751	self->tex [cell->tile [2]].smoothlevel));	1833	self->tex [cell->tile [2]].smoothlevel));
1752	}	1834	}
1753	}	1835	}
		1836
		1837	glEnable (GL_BLEND);
		1838	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1839	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1754		1840
1755	for (z = 0; z <= 2; z++)	1841	for (z = 0; z <= 2; z++)
1756	{	1842	{
1757	memset (smooth_level, 0, sizeof (smooth_level));	1843	memset (smooth_level, 0, sizeof (smooth_level));
1758		1844
…		…
1768	tileid tile = cell->tile [z];	1854	tileid tile = cell->tile [z];
1769		1855
1770	if (tile)	1856	if (tile)
1771	{	1857	{
1772	maptex tex = self->tex [tile];	1858	maptex tex = self->tex [tile];
1773	int px = (x + 1) * T - tex.w;	1859	int px, py;
1774	int py = (y + 1) * T - tex.h;
1775		1860
1776	// suppressing texture state switches here
1777	// is only moderately effective, but worth the extra effort
1778	if (last_name != tex.name)	1861	if (key.texname != tex.name)
1779	{	1862	{
1780	if (!tex.name)	1863	if (!tex.name)
1781	tex = self->tex [2]; /* missing, replace by noface */	1864	tex = self->tex [2]; /* missing, replace by noface */
1782		1865
1783	glEnd ();	1866	key.texname = tex.name;
1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1867	arr = rc_array (rc, &key);
1785	glBegin (GL_QUADS);
1786	}	1868	}
1787		1869
1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1870	px = (x + 1) * T - tex.w;
		1871	py = (y + 1) * T - tex.h;
		1872
		1873	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1874	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);	1875	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 );	1876	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1792		1877
1793	if (cell->flags && z == 2)	1878	if (cell->flags && z == 2)
1794	{	1879	{
		1880	// overlays such as the speech bubble, probably more to come
1795	if (cell->flags & 1)	1881	if (cell->flags & 1)
1796	{	1882	{
1797	maptex tex = self->tex [1];	1883	maptex tex = self->tex [1];
1798	int px = x * T + T * 2 / 32;	1884	int px = x * T + T * 2 / 32;
1799	int py = y * T - T * 6 / 32;	1885	int py = y * T - T * 6 / 32;
1800		1886
		1887	if (tex.name)
1801	glEnd ();	1888	{
1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1889	if (key.texname != tex.name)
		1890	{
		1891	key.texname = tex.name;
		1892	arr = rc_array (rc, &key);
		1893	}
		1894
		1895	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		1896	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		1897	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		1898	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1803	glBegin (GL_QUADS);	1899	}
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	}	1900	}
1810	}	1901	}
1811		1902
1812	// update smooth hash	1903	// update smooth hash
1813	if (tex.smoothtile)	1904	if (tex.smoothtile)
…		…
1849	}	1940	}
1850	}	1941	}
1851	}	1942	}
1852	}	1943	}
1853		1944
		1945	rc_draw (rc);
		1946	rc_clear (rc);
		1947
1854	// go through all smoothlevels, lowest to highest, then draw.	1948	// go through all smoothlevels, lowest to highest, then draw.
1855	// this is basically counting sort	1949	// this is basically counting sort
1856	{	1950	{
1857	int w, b;	1951	int w, b;
1858		1952
		1953	glEnable (GL_TEXTURE_2D);
		1954	glBegin (GL_QUADS);
1859	for (w = 0; w < 256 / 32; ++w)	1955	for (w = 0; w < 256 / 32; ++w)
1860	{	1956	{
1861	uint32_t smask = smooth_level [w];	1957	uint32_t smask = smooth_level [w];
1862	if (smask)	1958	if (smask)
1863	for (b = 0; b < 32; ++b)	1959	for (b = 0; b < 32; ++b)
…		…
1882	int border = bits & 15;	1978	int border = bits & 15;
1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;	1979	int corner = (bits >> 8) & ~(bits >> 4) & 15;
1884	float dx = tex.s * .0625f; // 16 images/row	1980	float dx = tex.s * .0625f; // 16 images/row
1885	float dy = tex.t * .5f ; // 2 images/column	1981	float dy = tex.t * .5f ; // 2 images/column
1886		1982
1887	// this time naively avoiding texture state changes
1888	// save gobs of state changes.
1889	if (last_name != tex.name)	1983	if (tex.name)
1890	{	1984	{
		1985	// this time avoiding texture state changes
		1986	// save gobs of state changes.
1891	if (!tex.name)	1987	if (key.texname != tex.name)
1892	continue; // smoothing not yet available	1988	{
1893
1894	glEnd ();	1989	glEnd ();
1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1990	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
1896	glBegin (GL_QUADS);	1991	glBegin (GL_QUADS);
1897	}	1992	}
1898		1993
1899	if (border)	1994	if (border)
1900	{	1995	{
1901	float ox = border * dx;	1996	float ox = border * dx;
1902		1997
1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );	1998	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);	1999	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);
1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);	2000	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);
1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );	2001	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );
1907	}	2002	}
1908		2003
1909	if (corner)	2004	if (corner)
1910	{	2005	{
1911	float ox = corner * dx;	2006	float ox = corner * dx;
1912		2007
1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );	2008	glTexCoord2f (ox , dy ); glVertex2i (px , py );
1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);	2009	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);
1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);	2010	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);
1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );	2011	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );
		2012	}
1917	}	2013	}
1918	}	2014	}
1919	}	2015	}
1920	}	2016	}
1921	}	2017	}
		2018
		2019	glEnd ();
		2020	glDisable (GL_TEXTURE_2D);
		2021	key.texname = -1;
1922	}	2022	}
1923		2023
1924	hv_clear (smooth);	2024	hv_clear (smooth);
1925	}	2025	}
1926		2026
1927	glEnd ();
1928
1929	glDisable (GL_TEXTURE_2D);
1930	glDisable (GL_BLEND);	2027	glDisable (GL_BLEND);
		2028	rc_free (rc);
1931		2029
1932	// top layer: overlays such as the health bar	2030	// top layer: overlays such as the health bar
1933	for (y = 0; y < sh; y++)	2031	for (y = 0; y < sh; y++)
1934	if (0 <= y + my && y + my < self->rows)	2032	if (0 <= y + my && y + my < self->rows)
1935	{	2033	{
…		…
1960	}	2058	}
1961	}	2059	}
1962	}	2060	}
1963		2061
1964	void	2062	void
1965	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	2063	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)
1966	CODE:	2064	CODE:
1967	{	2065	{
1968	static float color[16][3] = {	2066	static float color[16][3] = {
1969	{ 0.00F, 0.00F, 0.00F },	2067	{ 0.00F, 0.00F, 0.00F },
1970	{ 1.00F, 1.00F, 1.00F },	2068	{ 1.00F, 1.00F, 1.00F },
…		…
2020	glDisable (GL_BLEND);	2118	glDisable (GL_BLEND);
2021	glDisable (GL_TEXTURE_2D);	2119	glDisable (GL_TEXTURE_2D);
2022	}	2120	}
2023		2121
2024	void	2122	void
2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2123	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2026	PPCODE:	2124	PPCODE:
2027	{	2125	{
2028	int x, y;	2126	int x, y;
2029	int sw1 = sw + 2;	2127	int sw1 = sw + 2;
2030	int sh1 = sh + 2;	2128	int sh1 = sh + 2;
…		…
2101	PUSHs (sv_2mortal (newSViv (sh3)));	2199	PUSHs (sv_2mortal (newSViv (sh3)));
2102	PUSHs (darkness3_sv);	2200	PUSHs (darkness3_sv);
2103	}	2201	}
2104		2202
2105	SV *	2203	SV *
2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2204	get_rect (DC::Map self, int x0, int y0, int w, int h)
2107	CODE:	2205	CODE:
2108	{	2206	{
2109	int x, y, x1, y1;	2207	int x, y, x1, y1;
2110	SV data_sv = newSV (w h * 7 + 5);	2208	SV data_sv = newSV (w h * 7 + 5);
2111	uint8_t data = (uint8_t )SvPVX (data_sv);	2209	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
2176	}	2274	}
2177	OUTPUT:	2275	OUTPUT:
2178	RETVAL	2276	RETVAL
2179		2277
2180	void	2278	void
2181	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)	2279	set_rect (DC::Map self, int x0, int y0, uint8_t *data)
2182	PPCODE:	2280	PPCODE:
2183	{	2281	{
2184	int x, y, z;	2282	int x, y, z;
2185	int w, h;	2283	int w, h;
2186	int x1, y1;	2284	int x1, y1;
2187		2285
2188	if (*data++ != 0)	2286	if (*data++ != 0)
2189	return; /* version mismatch */	2287	XSRETURN_EMPTY; /* version mismatch */
2190		2288
2191	w = data++ << 8; w \|= data++;	2289	w = data++ << 8; w \|= data++;
2192	h = data++ << 8; h \|= data++;	2290	h = data++ << 8; h \|= data++;
2193		2291
2194	// we need to do this 'cause we don't keep an absolute coord system for rows	2292	// we need to do this 'cause we don't keep an absolute coord system for rows
…		…
2239	}	2337	}
2240	}	2338	}
2241	}	2339	}
2242	}	2340	}
2243		2341
2244	MODULE = CFPlus PACKAGE = CFPlus::RW	2342	MODULE = Deliantra::Client PACKAGE = DC::RW
2245		2343
2246	CFPlus::RW	2344	DC::RW
2247	new (SV class, SV data_sv)	2345	new (SV class, SV data_sv)
2248	CODE:	2346	CODE:
2249	{	2347	{
2250	STRLEN datalen;	2348	STRLEN datalen;
2251	char *data = SvPVbyte (data_sv, datalen);	2349	char *data = SvPVbyte (data_sv, datalen);
…		…
2253	RETVAL = SDL_RWFromConstMem (data, datalen);	2351	RETVAL = SDL_RWFromConstMem (data, datalen);
2254	}	2352	}
2255	OUTPUT:	2353	OUTPUT:
2256	RETVAL	2354	RETVAL
2257		2355
2258	CFPlus::RW	2356	DC::RW
2259	new_from_file (SV class, const char path, const char *mode = "rb")	2357	new_from_file (SV class, const char path, const char *mode = "rb")
2260	CODE:	2358	CODE:
2261	RETVAL = SDL_RWFromFile (path, mode);	2359	RETVAL = SDL_RWFromFile (path, mode);
2262	OUTPUT:	2360	OUTPUT:
2263	RETVAL	2361	RETVAL
2264		2362
		2363	# fails on win32:
		2364	# dc.xs(2268) : error C2059: syntax error : '('
2265	void	2365	#void
2266	close (CFPlus::RW self)	2366	#close (DC::RW self)
2267	CODE:	2367	# CODE:
2268	SDL_RWclose (self);	2368	# (self->(close)) (self);
2269		2369
2270	MODULE = CFPlus PACKAGE = CFPlus::Channel	2370	MODULE = Deliantra::Client PACKAGE = DC::Channel
2271		2371
2272	PROTOTYPES: DISABLE	2372	PROTOTYPES: DISABLE
2273		2373
		2374	DC::Channel
		2375	find ()
		2376	CODE:
		2377	{
		2378	RETVAL = Mix_GroupAvailable (-1);
		2379
		2380	if (RETVAL < 0)
		2381	{
		2382	RETVAL = Mix_GroupOldest (-1);
		2383
		2384	if (RETVAL < 0)
		2385	XSRETURN_UNDEF;
		2386
		2387	Mix_HaltChannel (RETVAL);
		2388	}
		2389
		2390	Mix_UnregisterAllEffects (RETVAL);
		2391	Mix_Volume (RETVAL, 128);
		2392	}
		2393	OUTPUT:
		2394	RETVAL
		2395
2274	void	2396	void
2275	halt (CFPlus::Channel self)	2397	halt (DC::Channel self)
2276	CODE:	2398	CODE:
2277	Mix_HaltChannel (self);	2399	Mix_HaltChannel (self);
2278		2400
2279	void	2401	void
2280	expire (CFPlus::Channel self, int ticks = -1)	2402	expire (DC::Channel self, int ticks = -1)
2281	CODE:	2403	CODE:
2282	Mix_ExpireChannel (self, ticks);	2404	Mix_ExpireChannel (self, ticks);
2283		2405
2284	void	2406	void
2285	fade_out (CFPlus::Channel self, int ticks = -1)	2407	fade_out (DC::Channel self, int ticks = -1)
2286	CODE:	2408	CODE:
2287	Mix_FadeOutChannel (self, ticks);	2409	Mix_FadeOutChannel (self, ticks);
2288		2410
2289	int	2411	int
2290	volume (CFPlus::Channel self, int volume)	2412	volume (DC::Channel self, int volume)
2291	CODE:	2413	CODE:
2292	RETVAL = Mix_Volume (self, volume);	2414	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
2293	OUTPUT:	2415	OUTPUT:
2294	RETVAL	2416	RETVAL
2295		2417
2296	void	2418	void
2297	unregister_all_effects (CFPlus::Channel self)	2419	unregister_all_effects (DC::Channel self)
2298	CODE:	2420	CODE:
2299	Mix_UnregisterAllEffects (self);	2421	Mix_UnregisterAllEffects (self);
2300		2422
2301	void	2423	void
2302	set_panning (CFPlus::Channel self, int left, int right)	2424	set_panning (DC::Channel self, int left, int right)
2303	CODE:	2425	CODE:
		2426	left = CLAMP (left , 0, 255);
		2427	right = CLAMP (right, 0, 255);
2304	Mix_SetPanning (self, left, right);	2428	Mix_SetPanning (self, left, right);
2305		2429
2306	void	2430	void
2307	set_distance (CFPlus::Channel self, int distance)	2431	set_distance (DC::Channel self, int distance)
2308	CODE:	2432	CODE:
2309	Mix_SetDistance (self, distance);	2433	Mix_SetDistance (self, CLAMP (distance, 0, 255));
2310		2434
2311	void	2435	void
2312	set_position (CFPlus::Channel self, int angle, int distance)	2436	set_position (DC::Channel self, int angle, int distance)
2313	CODE:	2437	CODE:
		2438
		2439	void
		2440	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
		2441	CODE:
		2442	{
		2443	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2444	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
2314	Mix_SetPosition (self, angle, distance);	2445	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2446	}
2315		2447
2316	void	2448	void
2317	set_reverse_stereo (CFPlus::Channel self, int flip)	2449	set_reverse_stereo (DC::Channel self, int flip)
2318	CODE:	2450	CODE:
2319	Mix_SetReverseStereo (self, flip);	2451	Mix_SetReverseStereo (self, flip);
2320		2452
2321	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2453	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2322		2454
2323	PROTOTYPES: DISABLE	2455	PROTOTYPES: DISABLE
2324		2456
2325	CFPlus::MixChunk	2457	DC::MixChunk
2326	new (SV *class, CFPlus::RW rwops)	2458	new (SV *class, DC::RW rwops)
2327	CODE:	2459	CODE:
2328	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2460	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2329	OUTPUT:	2461	OUTPUT:
2330	RETVAL	2462	RETVAL
2331		2463
2332	void	2464	void
2333	DESTROY (CFPlus::MixChunk self)	2465	DESTROY (DC::MixChunk self)
2334	CODE:	2466	CODE:
2335	Mix_FreeChunk (self);	2467	Mix_FreeChunk (self);
2336		2468
2337	int	2469	int
2338	volume (CFPlus::MixChunk self, int volume = -1)	2470	volume (DC::MixChunk self, int volume = -1)
2339	CODE:	2471	CODE:
		2472	if (items > 1)
		2473	volume = CLAMP (volume, 0, 128);
2340	RETVAL = Mix_VolumeChunk (self, volume);	2474	RETVAL = Mix_VolumeChunk (self, volume);
2341	OUTPUT:	2475	OUTPUT:
2342	RETVAL	2476	RETVAL
2343		2477
2344	CFPlus::Channel	2478	DC::Channel
2345	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2479	play (DC::MixChunk self, DC::Channel channel = -1, int loops = 0, int ticks = -1)
2346	CODE:	2480	CODE:
		2481	{
2347	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2482	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2483
		2484	if (RETVAL < 0)
		2485	XSRETURN_UNDEF;
		2486
		2487	if (channel < 0)
		2488	{
2348	Mix_UnregisterAllEffects (RETVAL);	2489	Mix_UnregisterAllEffects (RETVAL);
		2490	Mix_Volume (RETVAL, 128);
		2491	}
		2492	}
2349	OUTPUT:	2493	OUTPUT:
2350	RETVAL	2494	RETVAL
2351		2495
2352	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2496	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2353		2497
2354	int	2498	int
2355	volume (int volume = -1)	2499	volume (int volume = -1)
2356	PROTOTYPE: ;$	2500	PROTOTYPE: ;$
2357	CODE:	2501	CODE:
		2502	if (items > 0)
		2503	volume = CLAMP (volume, 0, 128);
2358	RETVAL = Mix_VolumeMusic (volume);	2504	RETVAL = Mix_VolumeMusic (volume);
2359	OUTPUT:	2505	OUTPUT:
2360	RETVAL	2506	RETVAL
2361		2507
2362	void	2508	void
…		…
2367	void	2513	void
2368	halt ()	2514	halt ()
2369	CODE:	2515	CODE:
2370	Mix_HaltMusic ();	2516	Mix_HaltMusic ();
2371		2517
2372	CFPlus::MixMusic	2518	DC::MixMusic
2373	new (SV *class, CFPlus::RW rwops)	2519	new (SV *class, DC::RW rwops)
2374	CODE:	2520	CODE:
2375	RETVAL = Mix_LoadMUS_RW (rwops);	2521	RETVAL = Mix_LoadMUS_RW (rwops);
2376	OUTPUT:	2522	OUTPUT:
2377	RETVAL	2523	RETVAL
2378		2524
2379	void	2525	void
2380	DESTROY (CFPlus::MixMusic self)	2526	DESTROY (DC::MixMusic self)
2381	CODE:	2527	CODE:
2382	Mix_FreeMusic (self);	2528	Mix_FreeMusic (self);
2383		2529
2384	int	2530	int
2385	play (CFPlus::MixMusic self, int loops = -1)	2531	play (DC::MixMusic self, int loops = -1)
2386	CODE:	2532	CODE:
2387	RETVAL = Mix_PlayMusic (self, loops);	2533	RETVAL = Mix_PlayMusic (self, loops);
2388	OUTPUT:	2534	OUTPUT:
2389	RETVAL	2535	RETVAL
2390		2536
2391	void	2537	void
2392	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2538	fade_in_pos (DC::MixMusic self, int loops, int ms, double position)
2393	CODE:	2539	CODE:
2394	Mix_FadeInMusicPos (self, loops, ms, position);	2540	Mix_FadeInMusicPos (self, loops, ms, position);
2395		2541
2396	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2542	MODULE = Deliantra::Client PACKAGE = DC::OpenGL
2397		2543
2398	PROTOTYPES: ENABLE	2544	PROTOTYPES: ENABLE
2399		2545
2400	BOOT:	2546	BOOT:
2401	{	2547	{
2402	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2548	HV *stash = gv_stashpv ("DC::OpenGL", 1);
2403	static const struct {	2549	static const struct {
2404	const char *name;	2550	const char *name;
2405	IV iv;	2551	IV iv;
2406	} *civ, const_iv[] = {	2552	} *civ, const_iv[] = {
2407	# define const_iv(name) { # name, (IV)name }	2553	# define const_iv(name) { # name, (IV)name }
…		…
2442	const_iv (GL_INTENSITY),	2588	const_iv (GL_INTENSITY),
2443	const_iv (GL_LUMINANCE),	2589	const_iv (GL_LUMINANCE),
2444	const_iv (GL_LUMINANCE_ALPHA),	2590	const_iv (GL_LUMINANCE_ALPHA),
2445	const_iv (GL_FLOAT),	2591	const_iv (GL_FLOAT),
2446	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2592	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		2593	const_iv (GL_COMPRESSED_ALPHA_ARB),
		2594	const_iv (GL_COMPRESSED_LUMINANCE_ARB),
		2595	const_iv (GL_COMPRESSED_LUMINANCE_ALPHA_ARB),
		2596	const_iv (GL_COMPRESSED_INTENSITY_ARB),
		2597	const_iv (GL_COMPRESSED_RGB_ARB),
		2598	const_iv (GL_COMPRESSED_RGBA_ARB),
2447	const_iv (GL_COMPILE),	2599	const_iv (GL_COMPILE),
2448	const_iv (GL_PROXY_TEXTURE_1D),	2600	const_iv (GL_PROXY_TEXTURE_1D),
2449	const_iv (GL_PROXY_TEXTURE_2D),	2601	const_iv (GL_PROXY_TEXTURE_2D),
2450	const_iv (GL_TEXTURE_1D),	2602	const_iv (GL_TEXTURE_1D),
2451	const_iv (GL_TEXTURE_2D),	2603	const_iv (GL_TEXTURE_2D),
…		…
2490	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2642	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2491	const_iv (GL_POINT_SMOOTH_HINT),	2643	const_iv (GL_POINT_SMOOTH_HINT),
2492	const_iv (GL_LINE_SMOOTH_HINT),	2644	const_iv (GL_LINE_SMOOTH_HINT),
2493	const_iv (GL_POLYGON_SMOOTH_HINT),	2645	const_iv (GL_POLYGON_SMOOTH_HINT),
2494	const_iv (GL_GENERATE_MIPMAP_HINT),	2646	const_iv (GL_GENERATE_MIPMAP_HINT),
		2647	const_iv (GL_TEXTURE_COMPRESSION_HINT),
2495	const_iv (GL_FASTEST),	2648	const_iv (GL_FASTEST),
2496	const_iv (GL_DONT_CARE),	2649	const_iv (GL_DONT_CARE),
2497	const_iv (GL_NICEST),	2650	const_iv (GL_NICEST),
2498	const_iv (GL_V2F),	2651	const_iv (GL_V2F),
2499	const_iv (GL_V3F),	2652	const_iv (GL_V3F),
…		…
2507		2660
2508	texture_av = newAV ();	2661	texture_av = newAV ();
2509	AvREAL_off (texture_av);	2662	AvREAL_off (texture_av);
2510	}	2663	}
2511		2664
		2665	void
		2666	disable_GL_EXT_blend_func_separate ()
		2667	CODE:
		2668	gl.BlendFuncSeparate = 0;
		2669	gl.BlendFuncSeparateEXT = 0;
		2670
2512	char *	2671	char *
2513	gl_vendor ()	2672	gl_vendor ()
2514	CODE:	2673	CODE:
2515	RETVAL = (char *)glGetString (GL_VENDOR);	2674	RETVAL = (char *)glGetString (GL_VENDOR);
2516	OUTPUT:	2675	OUTPUT:
…		…
2637		2796
2638	void glRect (float x1, float y1, float x2, float y2)	2797	void glRect (float x1, float y1, float x2, float y2)
2639	CODE:	2798	CODE:
2640	glRectf (x1, y1, x2, y2);	2799	glRectf (x1, y1, x2, y2);
2641		2800
		2801	void glRect_lineloop (float x1, float y1, float x2, float y2)
		2802	CODE:
		2803	glBegin (GL_LINE_LOOP);
		2804	glVertex2f (x1, y1);
		2805	glVertex2f (x2, y1);
		2806	glVertex2f (x2, y2);
		2807	glVertex2f (x1, y2);
		2808	glEnd ();
		2809
2642	PROTOTYPES: ENABLE	2810	PROTOTYPES: ENABLE
2643		2811
2644	void glBegin (int mode)	2812	void glBegin (int mode)
2645		2813
2646	void glEnd ()	2814	void glEnd ()
…		…
2714		2882
2715	void glEndList ()	2883	void glEndList ()
2716		2884
2717	void glCallList (int list)	2885	void glCallList (int list)
2718		2886
2719	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2887	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2720		2888
2721	PROTOTYPES: DISABLE	2889	PROTOTYPES: DISABLE
2722		2890
2723	void	2891	void
2724	find_widget (SV *self, NV x, NV y)	2892	find_widget (SV *self, NV x, NV y)
…		…
2728	XPUSHs (self);	2896	XPUSHs (self);
2729	}	2897	}
2730		2898
2731	BOOT:	2899	BOOT:
2732	{	2900	{
2733	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);	2901	hover_gv = gv_fetchpv ("DC::UI::HOVER", 1, SVt_NV);
2734		2902
2735	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);	2903	draw_x_gv = gv_fetchpv ("DC::UI::Base::draw_x", 1, SVt_NV);
2736	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);	2904	draw_y_gv = gv_fetchpv ("DC::UI::Base::draw_y", 1, SVt_NV);
2737	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);	2905	draw_w_gv = gv_fetchpv ("DC::UI::Base::draw_w", 1, SVt_NV);
2738	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);	2906	draw_h_gv = gv_fetchpv ("DC::UI::Base::draw_h", 1, SVt_NV);
2739	}	2907	}
2740		2908
2741	void	2909	void
2742	draw (SV *self)	2910	draw (SV *self)
2743	CODE:	2911	CODE:
…		…
2747	NV x, y, w, h;	2915	NV x, y, w, h;
2748	SV *draw_x_sv = GvSV (draw_x_gv);	2916	SV *draw_x_sv = GvSV (draw_x_gv);
2749	SV *draw_y_sv = GvSV (draw_y_gv);	2917	SV *draw_y_sv = GvSV (draw_y_gv);
2750	SV *draw_w_sv = GvSV (draw_w_gv);	2918	SV *draw_w_sv = GvSV (draw_w_gv);
2751	SV *draw_h_sv = GvSV (draw_h_gv);	2919	SV *draw_h_sv = GvSV (draw_h_gv);
2752	SV *hover;
2753	double draw_x, draw_y, draw_w, draw_h;	2920	double draw_x, draw_y;
2754		2921
2755	if (!SvROK (self))	2922	if (!SvROK (self))
2756	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));	2923	croak ("DC::Base::draw: %s not a reference", SvPV_nolen (self));
2757		2924
2758	hv = (HV *)SvRV (self);	2925	hv = (HV *)SvRV (self);
2759		2926
2760	if (SvTYPE (hv) != SVt_PVHV)	2927	if (SvTYPE (hv) != SVt_PVHV)
2761	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));	2928	croak ("DC::Base::draw: %s not a hashref", SvPV_nolen (self));
2762		2929
2763	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;	2930	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
2764	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;	2931	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
2765		2932
2766	if (!h \|\| !w)	2933	if (!h \|\| !w)
…		…
2786	{	2953	{
2787	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);	2954	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
2788		2955
2789	if (svp && SvTRUE (*svp))	2956	if (svp && SvTRUE (*svp))
2790	{	2957	{
2791	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);	2958	glColor4f (1.0f * 0.2f, 0.8f * 0.2f, 0.5f * 0.2f, 0.2f);
2792	glEnable (GL_BLEND);	2959	glEnable (GL_BLEND);
2793	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	2960	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
2794	glBegin (GL_QUADS);	2961	glBegin (GL_QUADS);
2795	glVertex2f (0, 0);	2962	glVertex2f (0, 0);
2796	glVertex2f (w, 0);	2963	glVertex2f (w, 0);
…		…
2799	glEnd ();	2966	glEnd ();
2800	glDisable (GL_BLEND);	2967	glDisable (GL_BLEND);
2801	}	2968	}
2802	}	2969	}
2803	#if 0	2970	#if 0
2804	if ($ENV{CFPLUS_DEBUG} & 1) {	2971	// draw borders, for debugging
2805	glPushMatrix;	2972	glPushMatrix ();
2806	glColor 1, 1, 0, 1;	2973	glColor4f (1., 1., 0., 1.);
2807	glTranslate 0.375, 0.375;	2974	glTranslatef (.5, .5, 0.);
2808	glBegin GL_LINE_LOOP;	2975	glBegin (GL_LINE_LOOP);
2809	glVertex 0 , 0;	2976	glVertex2f (0 , 0);
2810	glVertex $self->{w} - 1, 0;	2977	glVertex2f (w - 1, 0);
2811	glVertex $self->{w} - 1, $self->{h} - 1;	2978	glVertex2f (w - 1, h - 1);
2812	glVertex 0 , $self->{h} - 1;	2979	glVertex2f (0 , h - 1);
2813	glEnd;	2980	glEnd ();
2814	glPopMatrix;	2981	glPopMatrix ();
2815	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
2816	}
2817	#endif	2982	#endif
2818	PUSHMARK (SP);	2983	PUSHMARK (SP);
2819	XPUSHs (self);	2984	XPUSHs (self);
2820	PUTBACK;	2985	PUTBACK;
2821	call_method ("_draw", G_VOID \| G_DISCARD);	2986	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.214 by root, Sun Jul 29 18:56:02 2007 UTC vs. Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC vs.
Revision 1.243 by root, Thu Dec 27 06:54:36 2007 UTC