[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.153 by root, Tue Sep 19 22:02:38 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	uint32_t player;
158	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
159	} mapcell;	178	} mapcell;
160		179
161	typedef struct {	180	typedef struct {
162	int32_t c0, c1;	181	int32_t c0, c1;
163	mapcell *col;	182	mapcell *col;
…		…
172	int texs;	191	int texs;
173	maptex *tex;	192	maptex *tex;
174		193
175	int32_t rows;	194	int32_t rows;
176	maprow *row;	195	maprow *row;
177	} *CFClient__Map;	196	} *CFPlus__Map;
178		197
179	static char *	198	static char *
180	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
181	{	200	{
182	char *p;	201	char *p;
…		…
200		219
201	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
203		222
204	static maprow *	223	static maprow *
205	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
206	{	225	{
207	if (0 > y)	226	if (0 > y)
208	{	227	{
209	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
248		267
249	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
250	}	269	}
251		270
252	static mapcell *	271	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
254	{	273	{
255	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
256	}	275	}
257		276
258	static void	277	static void
259	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
260	{	279	{
261	int r;	280	int r;
262		281
263	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
272	self->row = 0;	291	self->row = 0;
273	self->rows = 0;	292	self->rows = 0;
274	}	293	}
275		294
276	static void	295	static void
277	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
278	{	297	{
279	int x, y;	298	int x, y;
280	maprow *row;	299	maprow *row;
		300	mapcell *cell;
281		301
282	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	303	if (y >= 0)
284	{	304	{
285	if (y >= self->rows)	305	if (y >= self->rows)
…		…
291	if (x >= row->c0)	311	if (x >= row->c0)
292	{	312	{
293	if (x >= row->c1)	313	if (x >= row->c1)
294	break;	314	break;
295		315
296	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
297	}	320	}
298	}	321	}
299	}	322	}
300		323
301	static void	324	static void
…		…
339	n \|= n >> 16;	362	n \|= n >> 16;
340		363
341	return n + 1;	364	return n + 1;
342	}	365	}
343		366
344	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
345		368
346	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
347		370
348	BOOT:	371	BOOT:
349	{	372	{
350	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	374	static const struct {
352	const char *name;	375	const char *name;
353	IV iv;	376	IV iv;
354	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
456		479
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	482	}
460		483
		484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
461	NV floor (NV x)	491	NV floor (NV x)
462		492
463	NV ceil (NV x)	493	NV ceil (NV x)
464		494
465	void	495	void
466	pango_init ()	496	pango_init ()
467	CODE:	497	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	498	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	500	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);	501	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	}	502	}
491		503
492	int	504	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		506
495	void	507	void
496	SDL_Quit ()	508	SDL_Quit ()
497		509
498	void	510	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		528
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
		531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
518		534
519	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		537
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	627	break;
612	}	628	}
613		629
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	631	}
616	}	632	}
617		633
618	int	634	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	651	#endif
636		652
637	void	653	void
638	add_font (char *file)	654	add_font (char *file)
639	CODE:	655	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		657
646	void	658	void
647	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
648	ALIAS:	660	ALIAS:
649	load_image_file = 1	661	load_image_file = 1
…		…
691		703
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		705
694	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
695		707
		708	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	709	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	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)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
705		717
706	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
708	}	720	}
709		721
…		…
752	void	764	void
753	_exit (int retval)	765	_exit (int retval)
754	CODE:	766	CODE:
755	_exit (retval);	767	_exit (retval);
756		768
757	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
758		770
759	CFClient::Font	771	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	772	new_from_file (SV class, char path, int id = 0)
761	CODE:	773	CODE:
762	{	774	{
763	int count;	775	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	776	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	779	}
768	OUTPUT:	780	OUTPUT:
769	RETVAL	781	RETVAL
770		782
771	void	783	void
772	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
773	CODE:	785	CODE:
774	pango_font_description_free (self);	786	pango_font_description_free (self);
775		787
776	void	788	void
777	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
778	CODE:	790	CODE:
779	default_font = self;	791	default_font = self;
780		792
781	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		794
783	CFClient::Layout	795	void
784	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
		797	CODE:
		798	tc_clear ();
		799
		800	CFPlus::Layout
		801	new (SV *class)
785	CODE:	802	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
787		804
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	806	RETVAL->r = 1.;
791	RETVAL->g = 1.;	807	RETVAL->g = 1.;
792	RETVAL->b = 1.;	808	RETVAL->b = 1.;
793	RETVAL->a = 1.;	809	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
799	OUTPUT:	815	OUTPUT:
800	RETVAL	816	RETVAL
801		817
802	void	818	void
803	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
804	CODE:	820	CODE:
805	g_object_unref (self->pl);	821	g_object_unref (self->pl);
806	Safefree (self);	822	Safefree (self);
807		823
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	824	void
816	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	826	CODE:
818	{	827	{
819	STRLEN textlen;	828	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
821		830
822	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
823	}	832	}
824		833
825	void	834	void
826	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	836	CODE:
828	{	837	{
829	STRLEN textlen;	838	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
831		840
832	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
833	}	842	}
834		843
835	void	844	void
836	set_shapes (CFClient::Layout self, ...)	845	set_shapes (CFPlus::Layout self, ...)
837	CODE:	846	CODE:
838	{	847	{
839	PangoAttrList *attrs = 0;	848	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	849	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	850	const char *pos = text;
842	int arg = 2;	851	int arg = 4;
843		852
844	while (arg < items && (pos = strstr (pos, OBJ_STR)))	853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
845	{	854	{
846	PangoRectangle rect;	855	PangoRectangle inkrect, rect;
847	PangoAttribute *attr;	856	PangoAttribute *attr;
848		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
849	int w = SvIV (ST (arg - 1));	860	int w = SvIV (ST (arg - 1));
850	int h = SvIV (ST (arg));	861	int h = SvIV (ST (arg ));
851		862
852	arg += 2;
853
854	rect.x = 0;	863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
855	rect.y = -h * PANGO_SCALE;	869	rect.y = y * PANGO_SCALE;
856	rect.width = w * PANGO_SCALE;	870	rect.width = w * PANGO_SCALE;
857	rect.height = h * PANGO_SCALE;	871	rect.height = h * PANGO_SCALE;
858		872
859	if (!attrs)	873	if (!attrs)
860	attrs = pango_layout_get_attributes (self->pl);	874	attrs = pango_layout_get_attributes (self->pl);
861		875
862	attr = pango_attr_shape_new (&rect, &rect);	876	attr = pango_attr_shape_new (&inkrect, &rect);
863	attr->start_index = pos - text;	877	attr->start_index = pos - text;
864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;	878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
865	pango_attr_list_insert (attrs, attr);	879	pango_attr_list_insert (attrs, attr);
866		880
		881	arg += 4;
867	pos += sizeof (OBJ_STR) - 1;	882	pos += sizeof (OBJ_STR) - 1;
868	}	883	}
869		884
870	if (attrs)	885	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	886	pango_layout_set_attributes (self->pl, attrs);
872	}	887	}
873		888
874	void	889	void
875	get_shapes (CFClient::Layout self)	890	get_shapes (CFPlus::Layout self)
876	PPCODE:	891	PPCODE:
877	{	892	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		894
880	do	895	do
…		…
884	if (run && shape_attr_p (run))	899	if (run && shape_attr_p (run))
885	{	900	{
886	PangoRectangle extents;	901	PangoRectangle extents;
887	pango_layout_iter_get_run_extents (iter, 0, &extents);	902	pango_layout_iter_get_run_extents (iter, 0, &extents);
888		903
		904	EXTEND (SP, 2);
889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
891	}	907	}
892	}	908	}
893	while (pango_layout_iter_next_run (iter));	909	while (pango_layout_iter_next_run (iter));
894		910
895	pango_layout_iter_free (iter);	911	pango_layout_iter_free (iter);
896	}	912	}
897		913
898	int	914	int
899	has_wrapped (CFClient::Layout self)	915	has_wrapped (CFPlus::Layout self)
900	CODE:	916	CODE:
901	{	917	{
902	int lines = 1;	918	int lines = 1;
903	const char *text = pango_layout_get_text (self->pl);	919	const char *text = pango_layout_get_text (self->pl);
904		920
…		…
909	}	925	}
910	OUTPUT:	926	OUTPUT:
911	RETVAL	927	RETVAL
912		928
913	SV *	929	SV *
914	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
915	CODE:	931	CODE:
916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
917	sv_utf8_decode (RETVAL);	933	sv_utf8_decode (RETVAL);
918	OUTPUT:	934	OUTPUT:
919	RETVAL	935	RETVAL
920		936
921	void	937	void
922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
923	CODE:	939	CODE:
924	self->r = r;	940	self->r = r;
925	self->g = g;	941	self->g = g;
926	self->b = b;	942	self->b = b;
927	self->a = a;	943	self->a = a;
928		944
929	void	945	void
930	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
931	CODE:	947	CODE:
932	if (self->font != font)	948	if (self->font != font)
933	{	949	{
934	self->font = font;	950	self->font = font;
935	layout_update_font (self);	951	layout_update_font (self);
936	}	952	}
937		953
938	void	954	void
939	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
940	CODE:	956	CODE:
941	if (self->base_height != base_height)	957	if (self->base_height != base_height)
942	{	958	{
943	self->base_height = base_height;	959	self->base_height = base_height;
944	layout_update_font (self);	960	layout_update_font (self);
945	}	961	}
946		962
947	void	963	void
948	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
949	CODE:	965	CODE:
950	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
951		967
952	void	968	void
953	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
954	CODE:	970	CODE:
955	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
956		972
957	void	973	void
958	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
959	CODE:	975	CODE:
960	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
961		977
962	void	978	void
963	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
964	CODE:	980	CODE:
965	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
966	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
967	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
968	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
969	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
970	);	986	);
971		987
972	void	988	void
973	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
974	CODE:	990	CODE:
975	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
976		992
977	void	993	void
978	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
979	PPCODE:	995	PPCODE:
980	{	996	{
981	int w, h;	997	int w, h;
982		998
983	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
986	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
987	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
988	}	1004	}
989		1005
990	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
991	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
992	CODE:	1020	CODE:
993	{	1021	{
994	int index, trailing;	1022	int index, trailing;
995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
996	RETVAL = index;	1024	RETVAL = index;
997	}	1025	}
998	OUTPUT:	1026	OUTPUT:
999	RETVAL	1027	RETVAL
1000		1028
1001	void	1029	void
1002	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
1003	PPCODE:	1031	PPCODE:
1004	{	1032	{
1005	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
1006	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1007		1035
…		…
1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1012	}	1040	}
1013		1041
1014	void	1042	void
1015	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
1016	PPCODE:	1044	PPCODE:
1017	{	1045	pango_opengl_render_layout_subpixel (
1018	SV *retval;	1046	self->pl,
1019	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
1020		1048	self->r, self->g, self->b, self->a,
1021	layout_get_pixel_size (self, &w, &h);
1022
1023	if (self->rgba)
1024	{	1049	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	}	1050	);
1077	else
1078	{
1079	FT_Bitmap bitmap;
1080		1051
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	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
1106		1053
1107	void	1054	void
1108	pad2pot (SV data_, SV w_, SV *h_)	1055	pad2pot (SV data_, SV w_, SV *h_)
1109	CODE:	1056	CODE:
1110	{	1057	{
…		…
1188	glDisable (GL_ALPHA_TEST);	1135	glDisable (GL_ALPHA_TEST);
1189	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
1190	}	1137	}
1191	}	1138	}
1192		1139
1193	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
1194		1141
1195	CFClient::Map	1142	CFPlus::Map
1196	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1197	CODE:	1144	CODE:
1198	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1199	RETVAL->x = 0;	1146	RETVAL->x = 0;
1200	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1210	RETVAL->row = 0;	1157	RETVAL->row = 0;
1211	OUTPUT:	1158	OUTPUT:
1212	RETVAL	1159	RETVAL
1213		1160
1214	void	1161	void
1215	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1216	CODE:	1163	CODE:
1217	{	1164	{
1218	map_clear (self);	1165	map_clear (self);
1219	Safefree (self->face);	1166	Safefree (self->face);
1220	Safefree (self->tex);	1167	Safefree (self->tex);
1221	Safefree (self);	1168	Safefree (self);
1222	}	1169	}
1223		1170
1224	void	1171	void
1225	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1226	CODE:	1173	CODE:
1227	map_clear (self);	1174	map_clear (self);
1228		1175
1229	void	1176	void
1230	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1231	CODE:	1178	CODE:
1232	{	1179	{
1233	while (self->faces <= face)	1180	while (self->faces <= face)
1234	{	1181	{
1235	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1238		1185
1239	self->face [face] = texid;	1186	self->face [face] = texid;
1240	}	1187	}
1241		1188
1242	void	1189	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)	1190	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:	1191	CODE:
1245	{	1192	{
1246	while (self->texs <= texid)	1193	while (self->texs <= texid)
1247	{	1194	{
1248	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1272	// from transparent color bleeding and ugly wrapping effects.	1219	// from transparent color bleeding and ugly wrapping effects.
1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1274	}	1221	}
1275		1222
1276	int	1223	int
1277	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1278	ALIAS:	1225	ALIAS:
1279	oy = 1	1226	oy = 1
1280	x = 2	1227	x = 2
1281	y = 3	1228	y = 3
1282	w = 4	1229	w = 4
…		…
1293	}	1240	}
1294	OUTPUT:	1241	OUTPUT:
1295	RETVAL	1242	RETVAL
1296		1243
1297	void	1244	void
1298	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1299	CODE:	1246	CODE:
1300	{	1247	{
1301	if (dx > 0)	1248	if (dx > 0)
1302	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1303	else if (dx < 0)	1250	else if (dx < 0)
…		…
1319	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1320	}	1267	}
1321	}	1268	}
1322		1269
1323	void	1270	void
1324	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1325	CODE:	1272	CODE:
1326	{	1273	{
1327	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1274	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1328	uint8_t data_end = (uint8_t )SvEND (data_);	1275	uint8_t data_end = (uint8_t )SvEND (data_);
1329	mapcell *cell;	1276	mapcell *cell;
1330	int x, y, flags;	1277	int x, y, flags;
1331		1278
1332	while (data < data_end)	1279	while (data < data_end - 1)
1333	{	1280	{
1334	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1335		1282
1336	x = self->x + ((flags >> 10) & 63);	1283	x = self->x + ((flags >> 10) & 63);
1337	y = self->y + ((flags >> 4) & 63);	1284	y = self->y + ((flags >> 4) & 63);
1338		1285
1339	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1340		1287
1341	if (flags & 15)	1288	if (flags & 15)
1342	{	1289	{
1343	if (cell->darkness < 0)	1290	if (!cell->darkness)
1344	{	1291	{
1345	cell->darkness = 0;	1292	cell->darkness = 256;
1346	cell->face [0] = 0;	1293	cell->face [0] = 0;
1347	cell->face [1] = 0;	1294	cell->face [1] = 0;
1348	cell->face [2] = 0;	1295	cell->face [2] = 0;
1349	}	1296	}
1350		1297
1351	cell->darkness = flags & 8 ? *data++ : 255;
1352
1353	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1354		1339
1355	if (flags & 4)	1340	if (flags & 4)
1356	{	1341	{
1357	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1358	}	1343	}
…		…
1366	{	1351	{
1367	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1368	}	1353	}
1369	}	1354	}
1370	else	1355	else
		1356	{
1371	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1372	}	1360	}
1373	}	1361	}
1374		1362
1375	SV *	1363	SV *
1376	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1377	CODE:	1365	CODE:
1378	{	1366	{
1379	int x1, x;	1367	int x1, x;
1380	int y1, y;	1368	int y1, y;
1381	int z;	1369	int z;
…		…
1431	}	1419	}
1432	OUTPUT:	1420	OUTPUT:
1433	RETVAL	1421	RETVAL
1434		1422
1435	void	1423	void
1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1437	CODE:	1425	CODE:
1438	{	1426	{
1439	int vx, vy;	1427	int vx, vy;
1440	int x, y, z;	1428	int x, y, z;
1441	int last_name;	1429	int last_name;
…		…
1476	{	1464	{
1477	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1478		1466
1479	face = cell->face [z];	1467	face = cell->face [z];
1480		1468
1481	if (face)	1469	if (face && face < self->texs)
1482	{	1470	{
1483	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1484
1485	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1486	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1487		1474
1488	if (last_name != tex.name)	1475	if (last_name != tex.name)
1489	{	1476	{
1490	glEnd ();	1477	glEnd ();
1491	last_name = tex.name;
1492	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1493	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1494	}	1480	}
1495		1481
1496	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1497	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1498	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1499	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1500	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1501	}	1506	}
1502	}	1507	}
1503		1508
1504	glEnd ();	1509	glEnd ();
1505		1510
1506	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1507	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
1508	}
1509		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
1510	void	1546	void
1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1512	CODE:	1548	CODE:
1513	{	1549	{
1514	static float color[16][3] = {	1550	static float color[16][3] = {
1515	{ 0.00, 0.00, 0.00 },	1551	{ 0.00F, 0.00F, 0.00F },
1516	{ 1.00, 1.00, 1.00 },	1552	{ 1.00F, 1.00F, 1.00F },
1517	{ 0.00, 0.00, 0.55 },	1553	{ 0.00F, 0.00F, 0.55F },
1518	{ 1.00, 0.00, 0.00 },	1554	{ 1.00F, 0.00F, 0.00F },
1519		1555
1520	{ 1.00, 0.54, 0.00 },	1556	{ 1.00F, 0.54F, 0.00F },
1521	{ 0.11, 0.56, 1.00 },	1557	{ 0.11F, 0.56F, 1.00F },
1522	{ 0.93, 0.46, 0.00 },	1558	{ 0.93F, 0.46F, 0.00F },
1523	{ 0.18, 0.54, 0.34 },	1559	{ 0.18F, 0.54F, 0.34F },
1524		1560
1525	{ 0.56, 0.73, 0.56 },	1561	{ 0.56F, 0.73F, 0.56F },
1526	{ 0.80, 0.80, 0.80 },	1562	{ 0.80F, 0.80F, 0.80F },
1527	{ 0.55, 0.41, 0.13 },	1563	{ 0.55F, 0.41F, 0.13F },
1528	{ 0.99, 0.77, 0.26 },	1564	{ 0.99F, 0.77F, 0.26F },
1529		1565
1530	{ 0.74, 0.65, 0.41 },	1566	{ 0.74F, 0.65F, 0.41F },
1531		1567
1532	{ 0.00, 1.00, 1.00 },	1568	{ 0.00F, 1.00F, 1.00F },
1533	{ 1.00, 0.00, 1.00 },	1569	{ 1.00F, 0.00F, 1.00F },
1534	{ 1.00, 1.00, 0.00 },	1570	{ 1.00F, 1.00F, 0.00F },
1535	};	1571	};
1536		1572
1537	int x, y;	1573	int x, y;
1538		1574
1539	glEnable (GL_TEXTURE_2D);	1575	glEnable (GL_TEXTURE_2D);
…		…
1566	glDisable (GL_BLEND);	1602	glDisable (GL_BLEND);
1567	glDisable (GL_TEXTURE_2D);	1603	glDisable (GL_TEXTURE_2D);
1568	}	1604	}
1569		1605
1570	void	1606	void
1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1572	PPCODE:	1608	PPCODE:
1573	{	1609	{
1574	int vx, vy;	1610	int vx, vy;
1575	int x, y;	1611	int x, y;
1576	int sw4 = (sw + 3) & ~3;	1612	int sw4 = (sw + 3) & ~3;
…		…
1592	for (x = 0; x < sw; x++)	1628	for (x = 0; x < sw; x++)
1593	if (row->c0 <= x + vx && x + vx < row->c1)	1629	if (row->c0 <= x + vx && x + vx < row->c1)
1594	{	1630	{
1595	mapcell *cell = row->col + (x + vx - row->c0);	1631	mapcell *cell = row->col + (x + vx - row->c0);
1596		1632
1597	darkness[y * sw4 + x] = cell->darkness < 0	1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
1598	? 255 - FOW_DARKNESS	1635	: 255 - FOW_DARKNESS;
1599	: 255 - cell->darkness;
1600	}	1636	}
1601	}	1637	}
1602		1638
1603	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1604	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1605	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1606	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1607	}	1643	}
1608		1644
1609	SV *	1645	SV *
1610	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1611	CODE:	1647	CODE:
1612	{	1648	{
1613	int x, y, x1, y1;	1649	int x, y, x1, y1;
1614	SV data_sv = newSV (w h * 7 + 5);	1650	SV data_sv = newSV (w h * 7 + 5);
1615	uint8_t data = (uint8_t )SvPVX (data_sv);	1651	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1677	}	1713	}
1678	OUTPUT:	1714	OUTPUT:
1679	RETVAL	1715	RETVAL
1680		1716
1681	void	1717	void
1682	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1683	PPCODE:	1719	PPCODE:
1684	{	1720	{
1685	int x, y, z;	1721	int x, y, z;
1686	int w, h;	1722	int w, h;
1687	int x1, y1;	1723	int x1, y1;
…		…
1719		1755
1720	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1756	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1721	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1757	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1722	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1758	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1723		1759
1724	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1725	{	1761	{
1726	cell->darkness = -1;	1762	cell->darkness = 0;
1727		1763
1728	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1729	{	1765	{
1730	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1731		1767
…		…
1736	}	1772	}
1737	}	1773	}
1738	}	1774	}
1739	}	1775	}
1740		1776
1741	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1742		1778
1743	CFClient::MixChunk	1779	CFPlus::MixChunk
1744	new_from_file (SV class, char path)	1780	new_from_file (SV class, char path)
1745	CODE:	1781	CODE:
1746	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1747	OUTPUT:	1783	OUTPUT:
1748	RETVAL	1784	RETVAL
1749		1785
1750	void	1786	void
1751	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1752	CODE:	1788	CODE:
1753	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1754		1790
1755	int	1791	int
1756	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1757	CODE:	1793	CODE:
1758	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1759	OUTPUT:	1795	OUTPUT:
1760	RETVAL	1796	RETVAL
1761		1797
1762	int	1798	int
1763	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1764	CODE:	1800	CODE:
1765	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1766	OUTPUT:	1802	OUTPUT:
1767	RETVAL	1803	RETVAL
1768		1804
1769	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1770		1806
1771	int	1807	int
1772	volume (int volume = -1)	1808	volume (int volume = -1)
1773	CODE:	1809	CODE:
1774	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1775	OUTPUT:	1811	OUTPUT:
1776	RETVAL	1812	RETVAL
1777		1813
1778	CFClient::MixMusic	1814	CFPlus::MixMusic
1779	new_from_file (SV class, char path)	1815	new_from_file (SV class, char path)
1780	CODE:	1816	CODE:
1781	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1782	OUTPUT:	1818	OUTPUT:
1783	RETVAL	1819	RETVAL
1784		1820
1785	void	1821	void
1786	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1787	CODE:	1823	CODE:
1788	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1789		1825
1790	int	1826	int
1791	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1792	CODE:	1828	CODE:
1793	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1794	OUTPUT:	1830	OUTPUT:
1795	RETVAL	1831	RETVAL
1796		1832
1797	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1798		1834
1799	BOOT:	1835	BOOT:
1800	{	1836	{
1801	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1802	static const struct {	1838	static const struct {
1803	const char *name;	1839	const char *name;
1804	IV iv;	1840	IV iv;
1805	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1806	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
…		…
1869	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1870	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1871	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1872	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1873	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
1874	const_iv (GL_LINE_LOOP),	1911	const_iv (GL_LINE_LOOP),
1875	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1876	const_iv (GL_QUAD_STRIP),	1913	const_iv (GL_QUAD_STRIP),
1877	const_iv (GL_TRIANGLES),	1914	const_iv (GL_TRIANGLES),
1878	const_iv (GL_TRIANGLE_STRIP),	1915	const_iv (GL_TRIANGLE_STRIP),
…		…
1988	r *= a;	2025	r *= a;
1989	g *= a;	2026	g *= a;
1990	b *= a;	2027	b *= a;
1991	}	2028	}
1992	// microsoft visual "c" rounds instead of truncating...	2029	// microsoft visual "c" rounds instead of truncating...
1993	glColor4ub (MIN ((int)(r * 256.f), 255),	2030	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		2031
1998	void glInterleavedArrays (int format, int stride, char *data)	2032	void glInterleavedArrays (int format, int stride, char *data)
1999		2033
2000	void glDrawElements (int mode, int count, int type, char *indices)	2034	void glDrawElements (int mode, int count, int type, char *indices)
2001		2035
…		…
2078		2112
2079	void glEndList ()	2113	void glEndList ()
2080		2114
2081	void glCallList (int list)	2115	void glCallList (int list)
2082		2116
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.153 by root, Tue Sep 19 22:02:38 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.153 by root, Tue Sep 19 22:02:38 2006 UTC