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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 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_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;
281		299
282	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
291	if (x >= row->c0)	309	if (x >= row->c0)
292	{	310	{
293	if (x >= row->c1)	311	if (x >= row->c1)
294	break;	312	break;
295		313
296	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
297	}	315	}
298	}	316	}
299	}	317	}
300		318
301	static void	319	static void
…		…
339	n \|= n >> 16;	357	n \|= n >> 16;
340		358
341	return n + 1;	359	return n + 1;
342	}	360	}
343		361
344	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
345		363
346	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
347		365
348	BOOT:	366	BOOT:
349	{	367	{
350	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	369	static const struct {
352	const char *name;	370	const char *name;
353	IV iv;	371	IV iv;
354	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
456		474
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	477	}
460		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
461	NV floor (NV x)	486	NV floor (NV x)
462		487
463	NV ceil (NV x)	488	NV ceil (NV x)
464		489
465	void	490	void
466	pango_init ()	491	pango_init ()
467	CODE:	492	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	493	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	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);	496	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	}	497	}
491		498
492	int	499	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		501
495	void	502	void
496	SDL_Quit ()	503	SDL_Quit ()
497		504
498	void	505	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		523
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
518		529
519	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		532
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	622	break;
612	}	623	}
613		624
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	626	}
616	}	627	}
617		628
618	int	629	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	646	#endif
636		647
637	void	648	void
638	add_font (char *file)	649	add_font (char *file)
639	CODE:	650	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		652
646	void	653	void
647	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
648	ALIAS:	655	ALIAS:
649	load_image_file = 1	656	load_image_file = 1
…		…
691		698
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		700
694	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
695		702
		703	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	704	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	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)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
705		712
706	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
708	}	715	}
709		716
…		…
752	void	759	void
753	_exit (int retval)	760	_exit (int retval)
754	CODE:	761	CODE:
755	_exit (retval);	762	_exit (retval);
756		763
757	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
758		765
759	CFClient::Font	766	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
761	CODE:	768	CODE:
762	{	769	{
763	int count;	770	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	774	}
768	OUTPUT:	775	OUTPUT:
769	RETVAL	776	RETVAL
770		777
771	void	778	void
772	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
773	CODE:	780	CODE:
774	pango_font_description_free (self);	781	pango_font_description_free (self);
775		782
776	void	783	void
777	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
778	CODE:	785	CODE:
779	default_font = self;	786	default_font = self;
780		787
781	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		789
783	CFClient::Layout	790	void
784	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
785	CODE:	797	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
787		799
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	801	RETVAL->r = 1.;
791	RETVAL->g = 1.;	802	RETVAL->g = 1.;
792	RETVAL->b = 1.;	803	RETVAL->b = 1.;
793	RETVAL->a = 1.;	804	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
799	OUTPUT:	810	OUTPUT:
800	RETVAL	811	RETVAL
801		812
802	void	813	void
803	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
804	CODE:	815	CODE:
805	g_object_unref (self->pl);	816	g_object_unref (self->pl);
806	Safefree (self);	817	Safefree (self);
807		818
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	819	void
816	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	821	CODE:
818	{	822	{
819	STRLEN textlen;	823	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
821		825
822	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
823	}	827	}
824		828
825	void	829	void
826	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	831	CODE:
828	{	832	{
829	STRLEN textlen;	833	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
831		835
832	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
833	}	837	}
834		838
835	void	839	void
836	set_shapes (CFClient::Layout self, ...)	840	set_shapes (CFPlus::Layout self, ...)
837	CODE:	841	CODE:
838	{	842	{
839	PangoAttrList *attrs = 0;	843	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	844	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	845	const char *pos = text;
842	int arg = 2;	846	int arg = 4;
843		847
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	849	{
846	PangoRectangle rect;	850	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	851	PangoAttribute *attr;
848		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	855	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	856	int h = SvIV (ST (arg ));
851		857
852	arg += 2;
853
854	rect.x = 0;	858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	864	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	865	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	866	rect.height = h * PANGO_SCALE;
858		867
859	if (!attrs)	868	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	869	attrs = pango_layout_get_attributes (self->pl);
861		870
862	attr = pango_attr_shape_new (&rect, &rect);	871	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	872	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	874	pango_attr_list_insert (attrs, attr);
866		875
		876	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	877	pos += sizeof (OBJ_STR) - 1;
868	}	878	}
869		879
870	if (attrs)	880	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	881	pango_layout_set_attributes (self->pl, attrs);
872	}	882	}
873		883
874	void	884	void
875	get_shapes (CFClient::Layout self)	885	get_shapes (CFPlus::Layout self)
876	PPCODE:	886	PPCODE:
877	{	887	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		889
880	do	890	do
…		…
884	if (run && shape_attr_p (run))	894	if (run && shape_attr_p (run))
885	{	895	{
886	PangoRectangle extents;	896	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	897	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		898
		899	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	902	}
892	}	903	}
893	while (pango_layout_iter_next_run (iter));	904	while (pango_layout_iter_next_run (iter));
894		905
895	pango_layout_iter_free (iter);	906	pango_layout_iter_free (iter);
896	}	907	}
897		908
898	int	909	int
899	has_wrapped (CFClient::Layout self)	910	has_wrapped (CFPlus::Layout self)
900	CODE:	911	CODE:
901	{	912	{
902	int lines = 1;	913	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	914	const char *text = pango_layout_get_text (self->pl);
904		915
…		…
909	}	920	}
910	OUTPUT:	921	OUTPUT:
911	RETVAL	922	RETVAL
912		923
913	SV *	924	SV *
914	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
915	CODE:	926	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	928	sv_utf8_decode (RETVAL);
918	OUTPUT:	929	OUTPUT:
919	RETVAL	930	RETVAL
920		931
921	void	932	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	934	CODE:
924	self->r = r;	935	self->r = r;
925	self->g = g;	936	self->g = g;
926	self->b = b;	937	self->b = b;
927	self->a = a;	938	self->a = a;
928		939
929	void	940	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	942	CODE:
932	if (self->font != font)	943	if (self->font != font)
933	{	944	{
934	self->font = font;	945	self->font = font;
935	layout_update_font (self);	946	layout_update_font (self);
936	}	947	}
937		948
938	void	949	void
939	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
940	CODE:	951	CODE:
941	if (self->base_height != base_height)	952	if (self->base_height != base_height)
942	{	953	{
943	self->base_height = base_height;	954	self->base_height = base_height;
944	layout_update_font (self);	955	layout_update_font (self);
945	}	956	}
946		957
947	void	958	void
948	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	960	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		962
952	void	963	void
953	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
954	CODE:	965	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		967
957	void	968	void
958	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	970	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		972
962	void	973	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	975	CODE:
965	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
970	);	981	);
971		982
972	void	983	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	985	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		987
977	void	988	void
978	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
979	PPCODE:	990	PPCODE:
980	{	991	{
981	int w, h;	992	int w, h;
982		993
983	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
988	}	999	}
989		1000
990	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1015	CODE:
993	{	1016	{
994	int index, trailing;	1017	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1019	RETVAL = index;
997	}	1020	}
998	OUTPUT:	1021	OUTPUT:
999	RETVAL	1022	RETVAL
1000		1023
1001	void	1024	void
1002	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1026	PPCODE:
1004	{	1027	{
1005	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1030
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1035	}
1013		1036
1014	void	1037	void
1015	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1039	PPCODE:
1017	{	1040	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1041	self->pl,
1019	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1043	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1044	flags
1025	cairo_surface_t *surface;
1026	cairo_t *cairo;
1027
1028	retval = newSV (w * h * 4);
1029	SvPOK_only (retval);
1030	SvCUR_set (retval, w * h * 4);
1031
1032	memset (SvPVX (retval), 0, w * h * 4);
1033
1034	surface = cairo_image_surface_create_for_data (
1035	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1036	cairo = cairo_create (surface);
1037	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1038
1039	pango_cairo_show_layout (cairo, self->pl);
1040
1041	cairo_destroy (cairo);
1042	cairo_surface_destroy (surface);
1043
1044	// what a mess, and its premultiplied, too :(
1045	{
1046	uint32_t p = (uint32_t )SvPVX (retval);
1047	uint32_t e = p + w h;
1048
1049	while (p < e)
1050	{
1051	uint32_t rgba = *p;
1052	rgba = (rgba >> 24) \| (rgba << 8);
1053	#if 0
1054	#ifdef _WIN32
1055	{//D
1056	uint8_t r = rgba >> 24;
1057	uint8_t g = rgba >> 16;
1058	uint8_t b = rgba >> 8;
1059	uint8_t a = rgba >> 0;
1060
1061	rgba = (rgba & 0xffffff00) \| a;
1062	}
1063	#endif
1064	#endif
1065	rgba = SDL_SwapBE32 (rgba);
1066	*p++ = rgba;
1067	}
1068	}
1069
1070	EXTEND (SP, 5);
1071	PUSHs (sv_2mortal (newSViv (w)));
1072	PUSHs (sv_2mortal (newSViv (h)));
1073	PUSHs (sv_2mortal (retval));
1074	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1075	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1076	}	1045	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1046
1081	retval = newSV (w * h);
1082	SvPOK_only (retval);
1083	SvCUR_set (retval, w * h);
1084
1085	bitmap.rows = h;
1086	bitmap.width = w;
1087	bitmap.pitch = w;
1088	bitmap.buffer = (unsigned char*)SvPVX (retval);
1089	bitmap.num_grays = 256;
1090	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1091
1092	memset (bitmap.buffer, 0, w * h);
1093
1094	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1095
1096	EXTEND (SP, 5);
1097	PUSHs (sv_2mortal (newSViv (w)));
1098	PUSHs (sv_2mortal (newSViv (h)));
1099	PUSHs (sv_2mortal (retval));
1100	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1101	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1102	}
1103	}
1104
1105	MODULE = CFClient PACKAGE = CFClient::Texture	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1048
1107	void	1049	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1050	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1051	CODE:
1110	{	1052	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1190	}	1132	}
1191	}	1133	}
1192		1134
1193	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1136
1195	CFClient::Map	1137	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1197	CODE:	1139	CODE:
1198	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1141	RETVAL->x = 0;
1200	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1152	RETVAL->row = 0;
1211	OUTPUT:	1153	OUTPUT:
1212	RETVAL	1154	RETVAL
1213		1155
1214	void	1156	void
1215	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1216	CODE:	1158	CODE:
1217	{	1159	{
1218	map_clear (self);	1160	map_clear (self);
1219	Safefree (self->face);	1161	Safefree (self->face);
1220	Safefree (self->tex);	1162	Safefree (self->tex);
1221	Safefree (self);	1163	Safefree (self);
1222	}	1164	}
1223		1165
1224	void	1166	void
1225	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1226	CODE:	1168	CODE:
1227	map_clear (self);	1169	map_clear (self);
1228		1170
1229	void	1171	void
1230	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1173	CODE:
1232	{	1174	{
1233	while (self->faces <= face)	1175	while (self->faces <= face)
1234	{	1176	{
1235	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1180
1239	self->face [face] = texid;	1181	self->face [face] = texid;
1240	}	1182	}
1241		1183
1242	void	1184	void
1243	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)	1185	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)
1244	CODE:	1186	CODE:
1245	{	1187	{
1246	while (self->texs <= texid)	1188	while (self->texs <= texid)
1247	{	1189	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1214	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1216	}
1275		1217
1276	int	1218	int
1277	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1278	ALIAS:	1220	ALIAS:
1279	oy = 1	1221	oy = 1
1280	x = 2	1222	x = 2
1281	y = 3	1223	y = 3
1282	w = 4	1224	w = 4
…		…
1293	}	1235	}
1294	OUTPUT:	1236	OUTPUT:
1295	RETVAL	1237	RETVAL
1296		1238
1297	void	1239	void
1298	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1241	CODE:
1300	{	1242	{
1301	if (dx > 0)	1243	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1303	else if (dx < 0)	1245	else if (dx < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1320	}	1262	}
1321	}	1263	}
1322		1264
1323	void	1265	void
1324	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1267	CODE:
1326	{	1268	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1271	mapcell *cell;
…		…
1338		1280
1339	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1340		1282
1341	if (flags & 15)	1283	if (flags & 15)
1342	{	1284	{
1343	if (cell->darkness < 0)	1285	if (!cell->darkness)
1344	{	1286	{
1345	cell->darkness = 0;	1287	cell->darkness = 256;
1346	cell->face [0] = 0;	1288	cell->face [0] = 0;
1347	cell->face [1] = 0;	1289	cell->face [1] = 0;
1348	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
1349	}	1292	}
1350		1293
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//TODO: don't trust server data to be in-range(!)	1294	//TODO: don't trust server data to be in-range(!)
		1295
		1296	if (flags & 8)
		1297	{
		1298	if (extmap)
		1299	{
		1300	uint8_t ext, cmd;
		1301
		1302	do
		1303	{
		1304	ext = *data++;
		1305	cmd = ext & 0x3f;
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64 + 1;
		1309	else if (ext == 5) // health
		1310	cell->stat_hp = *data++;
		1311	else if (ext & 0x40) // unknown, multibyte => skip
		1312	data += *data + 1;
		1313	}
		1314	while (cmd & 0x80);
		1315	}
		1316	else
		1317	cell->darkness = *data++ + 1;
		1318	}
1354		1319
1355	if (flags & 4)	1320	if (flags & 4)
1356	{	1321	{
1357	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1322	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1358	}	1323	}
…		…
1366	{	1331	{
1367	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1368	}	1333	}
1369	}	1334	}
1370	else	1335	else
1371	cell->darkness = -1;	1336	cell->darkness = 0;
1372	}	1337	}
1373	}	1338	}
1374		1339
1375	SV *	1340	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1341	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1342	CODE:
1378	{	1343	{
1379	int x1, x;	1344	int x1, x;
1380	int y1, y;	1345	int y1, y;
1381	int z;	1346	int z;
…		…
1431	}	1396	}
1432	OUTPUT:	1397	OUTPUT:
1433	RETVAL	1398	RETVAL
1434		1399
1435	void	1400	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1401	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1402	CODE:
1438	{	1403	{
1439	int vx, vy;	1404	int vx, vy;
1440	int x, y, z;	1405	int x, y, z;
1441	int last_name;	1406	int last_name;
…		…
1476	{	1441	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1442	mapcell *cell = row->col + (x + vx - row->c0);
1478		1443
1479	face = cell->face [z];	1444	face = cell->face [z];
1480		1445
1481	if (face)	1446	if (face && face < self->texs)
1482	{	1447	{
1483	maptex tex = self->tex [face];	1448	maptex tex = self->tex [face];
1484		1449
1485	int px = (x + 1) * 32 - tex.w;	1450	int px = (x + 1) * 32 - tex.w;
1486	int py = (y + 1) * 32 - tex.h;	1451	int py = (y + 1) * 32 - tex.h;
…		…
1503		1468
1504	glEnd ();	1469	glEnd ();
1505		1470
1506	glDisable (GL_TEXTURE_2D);	1471	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1472	glDisable (GL_BLEND);
1508	}
1509		1473
		1474	// top layer: overlays such as the health bar
		1475	for (y = 0; y < sh; y++)
		1476	if (0 <= y + vy && y + vy < self->rows)
		1477	{
		1478	maprow *row = self->row + (y + vy);
		1479
		1480	for (x = 0; x < sw; x++)
		1481	if (row->c0 <= x + vx && x + vx < row->c1)
		1482	{
		1483	mapcell *cell = row->col + (x + vx - row->c0);
		1484
		1485	int px = x * 32;
		1486	int py = y * 32;
		1487
		1488	if (cell->stat_hp)
		1489	{
		1490	int width = sh / 28 + 1;
		1491
		1492	glColor3ub (0, 0, 0);
		1493	glRectf (px + 1, py, px + 31, py + width + 2);
		1494
		1495	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1496	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1497	}
		1498	}
		1499	}
		1500	}
		1501
1510	void	1502	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1503	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1504	CODE:
1513	{	1505	{
1514	static float color[16][3] = {	1506	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1507	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1508	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1509	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1510	{ 1.00F, 0.00F, 0.00F },
1519		1511
1520	{ 1.00, 0.54, 0.00 },	1512	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1513	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1514	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1515	{ 0.18F, 0.54F, 0.34F },
1524		1516
1525	{ 0.56, 0.73, 0.56 },	1517	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1518	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1519	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1520	{ 0.99F, 0.77F, 0.26F },
1529		1521
1530	{ 0.74, 0.65, 0.41 },	1522	{ 0.74F, 0.65F, 0.41F },
1531		1523
1532	{ 0.00, 1.00, 1.00 },	1524	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1525	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1526	{ 1.00F, 1.00F, 0.00F },
1535	};	1527	};
1536		1528
1537	int x, y;	1529	int x, y;
1538		1530
1539	glEnable (GL_TEXTURE_2D);	1531	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1558	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1559	glDisable (GL_TEXTURE_2D);
1568	}	1560	}
1569		1561
1570	void	1562	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1563	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1564	PPCODE:
1573	{	1565	{
1574	int vx, vy;	1566	int vx, vy;
1575	int x, y;	1567	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1568	int sw4 = (sw + 3) & ~3;
…		…
1592	for (x = 0; x < sw; x++)	1584	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1585	if (row->c0 <= x + vx && x + vx < row->c1)
1594	{	1586	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1587	mapcell *cell = row->col + (x + vx - row->c0);
1596		1588
1597	darkness[y * sw4 + x] = cell->darkness < 0	1589	darkness[y * sw4 + x] = cell->darkness
		1590	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1591	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1592	}
1601	}	1593	}
1602		1594
1603	EXTEND (SP, 3);	1595	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1596	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1597	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1598	PUSHs (darkness_sv);
1607	}	1599	}
1608		1600
1609	SV *	1601	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1602	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1603	CODE:
1612	{	1604	{
1613	int x, y, x1, y1;	1605	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1606	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1607	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1669	}
1678	OUTPUT:	1670	OUTPUT:
1679	RETVAL	1671	RETVAL
1680		1672
1681	void	1673	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1674	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1675	PPCODE:
1684	{	1676	{
1685	int x, y, z;	1677	int x, y, z;
1686	int w, h;	1678	int w, h;
1687	int x1, y1;	1679	int x1, y1;
…		…
1719		1711
1720	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1712	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1721	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1713	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1722	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1714	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1723		1715
1724	if (cell->darkness <= 0)	1716	if (cell->darkness == 0)
1725	{	1717	{
1726	cell->darkness = -1;	1718	cell->darkness = 0;
1727		1719
1728	for (z = 0; z <= 2; z++)	1720	for (z = 0; z <= 2; z++)
1729	{	1721	{
1730	cell->face[z] = face[z];	1722	cell->face[z] = face[z];
1731		1723
…		…
1736	}	1728	}
1737	}	1729	}
1738	}	1730	}
1739	}	1731	}
1740		1732
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1733	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1734
1743	CFClient::MixChunk	1735	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1736	new_from_file (SV class, char path)
1745	CODE:	1737	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1738	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1739	OUTPUT:
1748	RETVAL	1740	RETVAL
1749		1741
1750	void	1742	void
1751	DESTROY (CFClient::MixChunk self)	1743	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1744	CODE:
1753	Mix_FreeChunk (self);	1745	Mix_FreeChunk (self);
1754		1746
1755	int	1747	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1748	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1749	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1750	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1751	OUTPUT:
1760	RETVAL	1752	RETVAL
1761		1753
1762	int	1754	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1755	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1756	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1757	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1758	OUTPUT:
1767	RETVAL	1759	RETVAL
1768		1760
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1761	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1762
1771	int	1763	int
1772	volume (int volume = -1)	1764	volume (int volume = -1)
1773	CODE:	1765	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1766	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1767	OUTPUT:
1776	RETVAL	1768	RETVAL
1777		1769
1778	CFClient::MixMusic	1770	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1771	new_from_file (SV class, char path)
1780	CODE:	1772	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1773	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1774	OUTPUT:
1783	RETVAL	1775	RETVAL
1784		1776
1785	void	1777	void
1786	DESTROY (CFClient::MixMusic self)	1778	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1779	CODE:
1788	Mix_FreeMusic (self);	1780	Mix_FreeMusic (self);
1789		1781
1790	int	1782	int
1791	play (CFClient::MixMusic self, int loops = -1)	1783	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1784	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1785	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1786	OUTPUT:
1795	RETVAL	1787	RETVAL
1796		1788
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1789	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1790
1799	BOOT:	1791	BOOT:
1800	{	1792	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1793	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1794	static const struct {
1803	const char *name;	1795	const char *name;
1804	IV iv;	1796	IV iv;
1805	} *civ, const_iv[] = {	1797	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1798	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	1861	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	1862	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	1863	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	1864	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	1865	const_iv (GL_LINES),
		1866	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	1867	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	1868	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	1869	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	1870	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	1871	const_iv (GL_TRIANGLE_STRIP),
…		…
1988	r *= a;	1981	r *= a;
1989	g *= a;	1982	g *= a;
1990	b *= a;	1983	b *= a;
1991	}	1984	}
1992	// microsoft visual "c" rounds instead of truncating...	1985	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	1986	glColor4f (r, g, b, a);
1994	MIN ((int)(g * 256.f), 255),
1995	MIN ((int)(b * 256.f), 255),
1996	MIN ((int)(a * 256.f), 255));
1997		1987
1998	void glInterleavedArrays (int format, int stride, char *data)	1988	void glInterleavedArrays (int format, int stride, char *data)
1999		1989
2000	void glDrawElements (int mode, int count, int type, char *indices)	1990	void glDrawElements (int mode, int count, int type, char *indices)
2001		1991
…		…
2078		2068
2079	void glEndList ()	2069	void glEndList ()
2080		2070
2081	void glCallList (int list)	2071	void glCallList (int list)
2082		2072
2083

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs. Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC