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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48		51
49	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
50		53
51	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
53		56
54	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
55		64
56	static struct	65	static struct
57	{	66	{
58	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	68	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	78	else
70	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
71	}	80	}
72		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
73	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
75		90
76	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
77		92
78	static int	93	static int
79	shape_attr_p (PangoLayoutRun *run)	94	shape_attr_p (PangoLayoutRun *run)
80	{	95	{
81	GSList *attrs = run->item->analysis.extra_attrs;	96	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		107
93	return 0;	108	return 0;
94	}	109	}
95		110
96	typedef struct cf_layout {	111	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
100	int base_height;	114	int base_height;
101	CFClient__Font font;	115	CFPlus__Font font;
102	} *CFClient__Layout;	116	} *CFPlus__Layout;
103		117
104	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
105	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
106	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
107		121
108	static void	122	static void
109	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
110	{	124	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	128	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	130	}
121		131
122	static void	132	static void
123	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
124	{	134	{
125	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
126	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
127	*/	137	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		142
133	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
134	}	144	}
135		145
136	static void	146	static void
137	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
138	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
140		153
141	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		156
144	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
145	}	162	}
146		163
147	typedef uint16_t mapface;	164	typedef uint16_t mapface;
148		165
149	typedef struct {	166	typedef struct {
…		…
152	float s, t;	169	float s, t;
153	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
154	} maptex;	171	} maptex;
155		172
156	typedef struct {	173	typedef struct {
157	int16_t darkness;	174	uint16_t darkness;
158	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_width, stat_hp;
159	} mapcell;	177	} mapcell;
160		178
161	typedef struct {	179	typedef struct {
162	int32_t c0, c1;	180	int32_t c0, c1;
163	mapcell *col;	181	mapcell *col;
…		…
172	int texs;	190	int texs;
173	maptex *tex;	191	maptex *tex;
174		192
175	int32_t rows;	193	int32_t rows;
176	maprow *row;	194	maprow *row;
177	} *CFClient__Map;	195	} *CFPlus__Map;
178		196
179	static char *	197	static char *
180	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
181	{	199	{
182	char *p;	200	char *p;
…		…
200		218
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
202	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		221
204	static maprow *	222	static maprow *
205	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
206	{	224	{
207	if (0 > y)	225	if (0 > y)
208	{	226	{
209	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
248		266
249	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
250	}	268	}
251		269
252	static mapcell *	270	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
254	{	272	{
255	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
256	}	274	}
257		275
258	static void	276	static void
259	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
260	{	278	{
261	int r;	279	int r;
262		280
263	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
272	self->row = 0;	290	self->row = 0;
273	self->rows = 0;	291	self->rows = 0;
274	}	292	}
275		293
276	static void	294	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	296	{
279	int x, y;	297	int x, y;
280	maprow *row;	298	maprow *row;
		299	mapcell *cell;
281		300
282	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	302	if (y >= 0)
284	{	303	{
285	if (y >= self->rows)	304	if (y >= self->rows)
…		…
291	if (x >= row->c0)	310	if (x >= row->c0)
292	{	311	{
293	if (x >= row->c1)	312	if (x >= row->c1)
294	break;	313	break;
295		314
296	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
297	}	319	}
298	}	320	}
299	}	321	}
300		322
301	static void	323	static void
…		…
339	n \|= n >> 16;	361	n \|= n >> 16;
340		362
341	return n + 1;	363	return n + 1;
342	}	364	}
343		365
344	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
345		367
346	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
347		369
348	BOOT:	370	BOOT:
349	{	371	{
350	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	373	static const struct {
352	const char *name;	374	const char *name;
353	IV iv;	375	IV iv;
354	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
456		478
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	481	}
460		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
461	NV floor (NV x)	490	NV floor (NV x)
462		491
463	NV ceil (NV x)	492	NV ceil (NV x)
464		493
465	void	494	void
466	pango_init ()	495	pango_init ()
467	CODE:	496	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	497	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	500	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
474	}
475	{
476	cairo_font_options_t *fopt = cairo_font_options_create ();
477	cairo_fontmap = pango_cairo_font_map_get_default ();
478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
479	#ifdef _WIN32
480	// cairo looks like shit eaten twice on windows
481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
482	#else
483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
484	#endif
485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
487	pango_cairo_context_set_font_options (cairo_context, fopt);
488	cairo_font_options_destroy (fopt);
489	}
490	}	501	}
491		502
492	int	503	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		505
495	void	506	void
496	SDL_Quit ()	507	SDL_Quit ()
497		508
498	void	509	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		527
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
518		533
519	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		536
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	626	break;
612	}	627	}
613		628
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	630	}
616	}	631	}
617		632
618	int	633	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	650	#endif
636		651
637	void	652	void
638	add_font (char *file)	653	add_font (char *file)
639	CODE:	654	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		656
646	void	657	void
647	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
648	ALIAS:	659	ALIAS:
649	load_image_file = 1	660	load_image_file = 1
…		…
691		702
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		704
694	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
695		706
		707	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	708	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
701	SDL_UnlockSurface (surface2);
702	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
705		716
706	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
708	}	719	}
709		720
…		…
752	void	763	void
753	_exit (int retval)	764	_exit (int retval)
754	CODE:	765	CODE:
755	_exit (retval);	766	_exit (retval);
756		767
757	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
758		769
759	CFClient::Font	770	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
761	CODE:	772	CODE:
762	{	773	{
763	int count;	774	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	778	}
768	OUTPUT:	779	OUTPUT:
769	RETVAL	780	RETVAL
770		781
771	void	782	void
772	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
773	CODE:	784	CODE:
774	pango_font_description_free (self);	785	pango_font_description_free (self);
775		786
776	void	787	void
777	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
778	CODE:	789	CODE:
779	default_font = self;	790	default_font = self;
780		791
781	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		793
783	CFClient::Layout	794	void
784	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
		796	CODE:
		797	tc_clear ();
		798
		799	CFPlus::Layout
		800	new (SV *class)
785	CODE:	801	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
787		803
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	805	RETVAL->r = 1.;
791	RETVAL->g = 1.;	806	RETVAL->g = 1.;
792	RETVAL->b = 1.;	807	RETVAL->b = 1.;
793	RETVAL->a = 1.;	808	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
799	OUTPUT:	814	OUTPUT:
800	RETVAL	815	RETVAL
801		816
802	void	817	void
803	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
804	CODE:	819	CODE:
805	g_object_unref (self->pl);	820	g_object_unref (self->pl);
806	Safefree (self);	821	Safefree (self);
807		822
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	823	void
816	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	825	CODE:
818	{	826	{
819	STRLEN textlen;	827	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
821		829
822	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
823	}	831	}
824		832
825	void	833	void
826	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	835	CODE:
828	{	836	{
829	STRLEN textlen;	837	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
831		839
832	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
833	}	841	}
834		842
835	void	843	void
836	set_shapes (CFClient::Layout self, ...)	844	set_shapes (CFPlus::Layout self, ...)
837	CODE:	845	CODE:
838	{	846	{
839	PangoAttrList *attrs = 0;	847	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	848	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	849	const char *pos = text;
…		…
876	if (attrs)	884	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	885	pango_layout_set_attributes (self->pl, attrs);
878	}	886	}
879		887
880	void	888	void
881	get_shapes (CFClient::Layout self)	889	get_shapes (CFPlus::Layout self)
882	PPCODE:	890	PPCODE:
883	{	891	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		893
886	do	894	do
…		…
890	if (run && shape_attr_p (run))	898	if (run && shape_attr_p (run))
891	{	899	{
892	PangoRectangle extents;	900	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	901	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		902
		903	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	906	}
898	}	907	}
899	while (pango_layout_iter_next_run (iter));	908	while (pango_layout_iter_next_run (iter));
900		909
901	pango_layout_iter_free (iter);	910	pango_layout_iter_free (iter);
902	}	911	}
903		912
904	int	913	int
905	has_wrapped (CFClient::Layout self)	914	has_wrapped (CFPlus::Layout self)
906	CODE:	915	CODE:
907	{	916	{
908	int lines = 1;	917	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	918	const char *text = pango_layout_get_text (self->pl);
910		919
…		…
915	}	924	}
916	OUTPUT:	925	OUTPUT:
917	RETVAL	926	RETVAL
918		927
919	SV *	928	SV *
920	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
921	CODE:	930	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	932	sv_utf8_decode (RETVAL);
924	OUTPUT:	933	OUTPUT:
925	RETVAL	934	RETVAL
926		935
927	void	936	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	938	CODE:
930	self->r = r;	939	self->r = r;
931	self->g = g;	940	self->g = g;
932	self->b = b;	941	self->b = b;
933	self->a = a;	942	self->a = a;
934		943
935	void	944	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	946	CODE:
938	if (self->font != font)	947	if (self->font != font)
939	{	948	{
940	self->font = font;	949	self->font = font;
941	layout_update_font (self);	950	layout_update_font (self);
942	}	951	}
943		952
944	void	953	void
945	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
946	CODE:	955	CODE:
947	if (self->base_height != base_height)	956	if (self->base_height != base_height)
948	{	957	{
949	self->base_height = base_height;	958	self->base_height = base_height;
950	layout_update_font (self);	959	layout_update_font (self);
951	}	960	}
952		961
953	void	962	void
954	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	964	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		966
958	void	967	void
959	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
960	CODE:	969	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		971
963	void	972	void
964	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	974	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		976
968	void	977	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	979	CODE:
971	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
976	);	985	);
977		986
978	void	987	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	989	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		991
983	void	992	void
984	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
985	PPCODE:	994	PPCODE:
986	{	995	{
987	int w, h;	996	int w, h;
988		997
989	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
994	}	1003	}
995		1004
996	int	1005	int
997	descent (CFClient::Layout self)	1006	descent (CFPlus::Layout self)
998	CODE:	1007	CODE:
999	{	1008	{
1000	PangoRectangle rect;	1009	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1013	}
1005	OUTPUT:	1014	OUTPUT:
1006	RETVAL	1015	RETVAL
1007		1016
1008	int	1017	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1019	CODE:
1011	{	1020	{
1012	int index, trailing;	1021	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1023	RETVAL = index;
1015	}	1024	}
1016	OUTPUT:	1025	OUTPUT:
1017	RETVAL	1026	RETVAL
1018		1027
1019	void	1028	void
1020	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1030	PPCODE:
1022	{	1031	{
1023	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1034
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1039	}
1031		1040
1032	void	1041	void
1033	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1043	PPCODE:
1035	{	1044	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1045	self->pl,
1037	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1047	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1048	flags
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t p = (uint32_t )SvPVX (retval);
1065	uint32_t e = p + w h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) \| (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) \| a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);
1089	PUSHs (sv_2mortal (newSViv (w)));
1090	PUSHs (sv_2mortal (newSViv (h)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}	1049	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1050
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));
1116	PUSHs (sv_2mortal (newSViv (h)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}
1121	}
1122
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1052
1125	void	1053	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1054	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1055	CODE:
1128	{	1056	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1208	}	1136	}
1209	}	1137	}
1210		1138
1211	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1140
1213	CFClient::Map	1141	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1215	CODE:	1143	CODE:
1216	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1145	RETVAL->x = 0;
1218	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1156	RETVAL->row = 0;
1229	OUTPUT:	1157	OUTPUT:
1230	RETVAL	1158	RETVAL
1231		1159
1232	void	1160	void
1233	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1234	CODE:	1162	CODE:
1235	{	1163	{
1236	map_clear (self);	1164	map_clear (self);
1237	Safefree (self->face);	1165	Safefree (self->face);
1238	Safefree (self->tex);	1166	Safefree (self->tex);
1239	Safefree (self);	1167	Safefree (self);
1240	}	1168	}
1241		1169
1242	void	1170	void
1243	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1244	CODE:	1172	CODE:
1245	map_clear (self);	1173	map_clear (self);
1246		1174
1247	void	1175	void
1248	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1177	CODE:
1250	{	1178	{
1251	while (self->faces <= face)	1179	while (self->faces <= face)
1252	{	1180	{
1253	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1184
1257	self->face [face] = texid;	1185	self->face [face] = texid;
1258	}	1186	}
1259		1187
1260	void	1188	void
1261	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1189	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)
1262	CODE:	1190	CODE:
1263	{	1191	{
1264	while (self->texs <= texid)	1192	while (self->texs <= texid)
1265	{	1193	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1218	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1220	}
1293		1221
1294	int	1222	int
1295	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1296	ALIAS:	1224	ALIAS:
1297	oy = 1	1225	oy = 1
1298	x = 2	1226	x = 2
1299	y = 3	1227	y = 3
1300	w = 4	1228	w = 4
…		…
1311	}	1239	}
1312	OUTPUT:	1240	OUTPUT:
1313	RETVAL	1241	RETVAL
1314		1242
1315	void	1243	void
1316	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1245	CODE:
1318	{	1246	{
1319	if (dx > 0)	1247	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1321	else if (dx < 0)	1249	else if (dx < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1338	}	1266	}
1339	}	1267	}
1340		1268
1341	void	1269	void
1342	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1271	CODE:
1344	{	1272	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1275	mapcell *cell;
1348	int x, y, flags;	1276	int x, y, flags;
1349		1277
1350	while (data < data_end)	1278	while (data < data_end - 1)
1351	{	1279	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1353		1281
1354	x = self->x + ((flags >> 10) & 63);	1282	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1283	y = self->y + ((flags >> 4) & 63);
1356		1284
1357	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1358		1286
1359	if (flags & 15)	1287	if (flags & 15)
1360	{	1288	{
1361	if (cell->darkness < 0)	1289	if (!cell->darkness)
1362	{	1290	{
1363	cell->darkness = 0;	1291	cell->darkness = 256;
1364	cell->face [0] = 0;	1292	cell->face [0] = 0;
1365	cell->face [1] = 0;	1293	cell->face [1] = 0;
1366	cell->face [2] = 0;	1294	cell->face [2] = 0;
1367	}	1295	}
1368		1296
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (cmd < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (cmd == 5) // health
		1313	{
		1314	cell->stat_width = 1;
		1315	cell->stat_hp = *data++;
		1316	}
		1317	else if (cmd == 6) // monster width
		1318	cell->stat_width = *data++ + 1;
		1319	else if (ext & 0x40) // unknown, multibyte => skip
		1320	data += *data + 1;
		1321	else
		1322	data++;
		1323	}
		1324	while (ext & 0x80);
		1325	}
		1326	else
		1327	cell->darkness = *data++ + 1;
		1328	}
1372		1329
1373	if (flags & 4)	1330	if (flags & 4)
1374	{	1331	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376	}	1333	}
…		…
1384	{	1341	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386	}	1343	}
1387	}	1344	}
1388	else	1345	else
		1346	{
1389	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1390	}	1350	}
1391	}	1351	}
1392		1352
1393	SV *	1353	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1354	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1355	CODE:
1396	{	1356	{
1397	int x1, x;	1357	int x1, x;
1398	int y1, y;	1358	int y1, y;
1399	int z;	1359	int z;
…		…
1449	}	1409	}
1450	OUTPUT:	1410	OUTPUT:
1451	RETVAL	1411	RETVAL
1452		1412
1453	void	1413	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1414	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1415	CODE:
1456	{	1416	{
1457	int vx, vy;	1417	int vx, vy;
1458	int x, y, z;	1418	int x, y, z;
1459	int last_name;	1419	int last_name;
…		…
1494	{	1454	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1496		1456
1497	face = cell->face [z];	1457	face = cell->face [z];
1498		1458
1499	if (face)	1459	if (face && face < self->texs)
1500	{	1460	{
1501	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1502		1462
1503	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1521		1481
1522	glEnd ();	1482	glEnd ();
1523		1483
1524	glDisable (GL_TEXTURE_2D);	1484	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1485	glDisable (GL_BLEND);
1526	}
1527		1486
		1487	// top layer: overlays such as the health bar
		1488	for (y = 0; y < sh; y++)
		1489	if (0 <= y + vy && y + vy < self->rows)
		1490	{
		1491	maprow *row = self->row + (y + vy);
		1492
		1493	for (x = 0; x < sw; x++)
		1494	if (row->c0 <= x + vx && x + vx < row->c1)
		1495	{
		1496	mapcell *cell = row->col + (x + vx - row->c0);
		1497
		1498	int px = x * 32;
		1499	int py = y * 32;
		1500
		1501	if (cell->stat_hp)
		1502	{
		1503	int width = cell->stat_width * 32;
		1504	int thick = sh / 28 + 1 + cell->stat_width;
		1505
		1506	glColor3ub (0, 0, 0);
		1507	glRectf (px + 1, py - thick - 2,
		1508	px + width - 1, py);
		1509
		1510	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1511	glRectf (px + 2,
		1512	py - thick - 1,
		1513	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1514	}
		1515	}
		1516	}
		1517	}
		1518
1528	void	1519	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1520	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1521	CODE:
1531	{	1522	{
1532	static float color[16][3] = {	1523	static float color[16][3] = {
1533	{ 0.00F, 0.00F, 0.00F },	1524	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00F, 1.00F, 1.00F },	1525	{ 1.00F, 1.00F, 1.00F },
…		…
1584	glDisable (GL_BLEND);	1575	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1576	glDisable (GL_TEXTURE_2D);
1586	}	1577	}
1587		1578
1588	void	1579	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1580	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1581	PPCODE:
1591	{	1582	{
1592	int vx, vy;	1583	int vx, vy;
1593	int x, y;	1584	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1585	int sw4 = (sw + 3) & ~3;
…		…
1610	for (x = 0; x < sw; x++)	1601	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1602	if (row->c0 <= x + vx && x + vx < row->c1)
1612	{	1603	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1604	mapcell *cell = row->col + (x + vx - row->c0);
1614		1605
1615	darkness[y * sw4 + x] = cell->darkness < 0	1606	darkness[y * sw4 + x] = cell->darkness
		1607	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1608	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1609	}
1619	}	1610	}
1620		1611
1621	EXTEND (SP, 3);	1612	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1613	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1614	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1615	PUSHs (darkness_sv);
1625	}	1616	}
1626		1617
1627	SV *	1618	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1619	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1620	CODE:
1630	{	1621	{
1631	int x, y, x1, y1;	1622	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1623	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1624	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1686	}
1696	OUTPUT:	1687	OUTPUT:
1697	RETVAL	1688	RETVAL
1698		1689
1699	void	1690	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1691	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1692	PPCODE:
1702	{	1693	{
1703	int x, y, z;	1694	int x, y, z;
1704	int w, h;	1695	int w, h;
1705	int x1, y1;	1696	int x1, y1;
…		…
1737		1728
1738	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1729	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1739	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1730	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1740	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1731	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1741		1732
1742	if (cell->darkness <= 0)	1733	if (cell->darkness == 0)
1743	{	1734	{
1744	cell->darkness = -1;	1735	cell->darkness = 0;
1745		1736
1746	for (z = 0; z <= 2; z++)	1737	for (z = 0; z <= 2; z++)
1747	{	1738	{
1748	cell->face[z] = face[z];	1739	cell->face[z] = face[z];
1749		1740
…		…
1754	}	1745	}
1755	}	1746	}
1756	}	1747	}
1757	}	1748	}
1758		1749
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1750	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1751
1761	CFClient::MixChunk	1752	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1753	new_from_file (SV class, char path)
1763	CODE:	1754	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1755	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1756	OUTPUT:
1766	RETVAL	1757	RETVAL
1767		1758
1768	void	1759	void
1769	DESTROY (CFClient::MixChunk self)	1760	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1761	CODE:
1771	Mix_FreeChunk (self);	1762	Mix_FreeChunk (self);
1772		1763
1773	int	1764	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1765	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1766	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1767	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1768	OUTPUT:
1778	RETVAL	1769	RETVAL
1779		1770
1780	int	1771	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1772	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1773	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1774	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1775	OUTPUT:
1785	RETVAL	1776	RETVAL
1786		1777
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1778	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1779
1789	int	1780	int
1790	volume (int volume = -1)	1781	volume (int volume = -1)
1791	CODE:	1782	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1783	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1784	OUTPUT:
1794	RETVAL	1785	RETVAL
1795		1786
1796	CFClient::MixMusic	1787	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1788	new_from_file (SV class, char path)
1798	CODE:	1789	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1790	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1791	OUTPUT:
1801	RETVAL	1792	RETVAL
1802		1793
1803	void	1794	void
1804	DESTROY (CFClient::MixMusic self)	1795	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1796	CODE:
1806	Mix_FreeMusic (self);	1797	Mix_FreeMusic (self);
1807		1798
1808	int	1799	int
1809	play (CFClient::MixMusic self, int loops = -1)	1800	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1801	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1802	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1803	OUTPUT:
1813	RETVAL	1804	RETVAL
1814		1805
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1806	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1807
1817	BOOT:	1808	BOOT:
1818	{	1809	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1810	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1811	static const struct {
1821	const char *name;	1812	const char *name;
1822	IV iv;	1813	IV iv;
1823	} *civ, const_iv[] = {	1814	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1815	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1878	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1879	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1880	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1881	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1882	const_iv (GL_LINES),
		1883	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1884	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1885	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1886	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1887	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1888	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	1998	r *= a;
2007	g *= a;	1999	g *= a;
2008	b *= a;	2000	b *= a;
2009	}	2001	}
2010	// microsoft visual "c" rounds instead of truncating...	2002	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2003	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2004
2016	void glInterleavedArrays (int format, int stride, char *data)	2005	void glInterleavedArrays (int format, int stride, char *data)
2017		2006
2018	void glDrawElements (int mode, int count, int type, char *indices)	2007	void glDrawElements (int mode, int count, int type, char *indices)
2019		2008
…		…
2096		2085
2097	void glEndList ()	2086	void glEndList ()
2098		2087
2099	void glCallList (int list)	2088	void glCallList (int list)
2100		2089
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs. Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.152 by root, Sat Aug 19 18:18:36 2006 UTC