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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 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;
		320	cell->flags = 0;
		321	cell->player = 0;
297	}	322	}
298	}	323	}
299	}	324	}
300		325
301	static void	326	static void
…		…
339	n \|= n >> 16;	364	n \|= n >> 16;
340		365
341	return n + 1;	366	return n + 1;
342	}	367	}
343		368
344	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
345		370
346	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
347		372
348	BOOT:	373	BOOT:
349	{	374	{
350	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	376	static const struct {
352	const char *name;	377	const char *name;
353	IV iv;	378	IV iv;
354	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
456		481
457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	484	}
460		485
		486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
461	NV floor (NV x)	493	NV floor (NV x)
462		494
463	NV ceil (NV x)	495	NV ceil (NV x)
464		496
465	void	497	void
466	pango_init ()	498	pango_init ()
467	CODE:	499	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	500	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	501	opengl_fontmap = pango_opengl_font_map_new ();
472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	502	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);	503	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	}	504	}
491		505
492	int	506	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		508
495	void	509	void
496	SDL_Quit ()	510	SDL_Quit ()
497		511
498	void	512	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		530
517	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
		533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
518		536
519	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		539
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	629	break;
612	}	630	}
613		631
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	633	}
616	}	634	}
617		635
618	int	636	int
619	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
635	#endif	653	#endif
636		654
637	void	655	void
638	add_font (char *file)	656	add_font (char *file)
639	CODE:	657	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		659
646	void	660	void
647	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
648	ALIAS:	662	ALIAS:
649	load_image_file = 1	663	load_image_file = 1
…		…
691		705
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		707
694	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
695		709
		710	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	711	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	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)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
705		719
706	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
708	}	722	}
709		723
…		…
752	void	766	void
753	_exit (int retval)	767	_exit (int retval)
754	CODE:	768	CODE:
755	_exit (retval);	769	_exit (retval);
756		770
757	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
758		772
759	CFClient::Font	773	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	774	new_from_file (SV class, char path, int id = 0)
761	CODE:	775	CODE:
762	{	776	{
763	int count;	777	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	781	}
768	OUTPUT:	782	OUTPUT:
769	RETVAL	783	RETVAL
770		784
771	void	785	void
772	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
773	CODE:	787	CODE:
774	pango_font_description_free (self);	788	pango_font_description_free (self);
775		789
776	void	790	void
777	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
778	CODE:	792	CODE:
779	default_font = self;	793	default_font = self;
780		794
781	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		796
783	CFClient::Layout	797	void
784	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
785	CODE:	804	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
787		806
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	808	RETVAL->r = 1.;
791	RETVAL->g = 1.;	809	RETVAL->g = 1.;
792	RETVAL->b = 1.;	810	RETVAL->b = 1.;
793	RETVAL->a = 1.;	811	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
799	OUTPUT:	817	OUTPUT:
800	RETVAL	818	RETVAL
801		819
802	void	820	void
803	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
804	CODE:	822	CODE:
805	g_object_unref (self->pl);	823	g_object_unref (self->pl);
806	Safefree (self);	824	Safefree (self);
807		825
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	826	void
816	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	828	CODE:
818	{	829	{
819	STRLEN textlen;	830	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
821		832
822	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
823	}	834	}
824		835
825	void	836	void
826	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	838	CODE:
828	{	839	{
829	STRLEN textlen;	840	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
831		842
832	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
833	}	844	}
834		845
835	void	846	void
836	set_shapes (CFClient::Layout self, ...)	847	set_shapes (CFPlus::Layout self, ...)
837	CODE:	848	CODE:
838	{	849	{
839	PangoAttrList *attrs = 0;	850	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	851	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	852	const char *pos = text;
…		…
876	if (attrs)	887	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	888	pango_layout_set_attributes (self->pl, attrs);
878	}	889	}
879		890
880	void	891	void
881	get_shapes (CFClient::Layout self)	892	get_shapes (CFPlus::Layout self)
882	PPCODE:	893	PPCODE:
883	{	894	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		896
886	do	897	do
…		…
890	if (run && shape_attr_p (run))	901	if (run && shape_attr_p (run))
891	{	902	{
892	PangoRectangle extents;	903	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	904	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		905
		906	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	909	}
898	}	910	}
899	while (pango_layout_iter_next_run (iter));	911	while (pango_layout_iter_next_run (iter));
900		912
901	pango_layout_iter_free (iter);	913	pango_layout_iter_free (iter);
902	}	914	}
903		915
904	int	916	int
905	has_wrapped (CFClient::Layout self)	917	has_wrapped (CFPlus::Layout self)
906	CODE:	918	CODE:
907	{	919	{
908	int lines = 1;	920	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	921	const char *text = pango_layout_get_text (self->pl);
910		922
…		…
915	}	927	}
916	OUTPUT:	928	OUTPUT:
917	RETVAL	929	RETVAL
918		930
919	SV *	931	SV *
920	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
921	CODE:	933	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	935	sv_utf8_decode (RETVAL);
924	OUTPUT:	936	OUTPUT:
925	RETVAL	937	RETVAL
926		938
927	void	939	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	941	CODE:
930	self->r = r;	942	self->r = r;
931	self->g = g;	943	self->g = g;
932	self->b = b;	944	self->b = b;
933	self->a = a;	945	self->a = a;
934		946
935	void	947	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	949	CODE:
938	if (self->font != font)	950	if (self->font != font)
939	{	951	{
940	self->font = font;	952	self->font = font;
941	layout_update_font (self);	953	layout_update_font (self);
942	}	954	}
943		955
944	void	956	void
945	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
946	CODE:	958	CODE:
947	if (self->base_height != base_height)	959	if (self->base_height != base_height)
948	{	960	{
949	self->base_height = base_height;	961	self->base_height = base_height;
950	layout_update_font (self);	962	layout_update_font (self);
951	}	963	}
952		964
953	void	965	void
954	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	967	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		969
958	void	970	void
959	set_indent (CFClient::Layout self, int indent)	971	set_indent (CFPlus::Layout self, int indent)
960	CODE:	972	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		974
963	void	975	void
964	set_spacing (CFClient::Layout self, int spacing)	976	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	977	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		979
968	void	980	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	981	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	982	CODE:
971	pango_layout_set_ellipsize (self->pl,	983	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	987	: PANGO_ELLIPSIZE_NONE
976	);	988	);
977		989
978	void	990	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	992	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		994
983	void	995	void
984	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
985	PPCODE:	997	PPCODE:
986	{	998	{
987	int w, h;	999	int w, h;
988		1000
989	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
994	}	1006	}
995		1007
996	int	1008	int
997	descent (CFClient::Layout self)	1009	descent (CFPlus::Layout self)
998	CODE:	1010	CODE:
999	{	1011	{
1000	PangoRectangle rect;	1012	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1016	}
1005	OUTPUT:	1017	OUTPUT:
1006	RETVAL	1018	RETVAL
1007		1019
1008	int	1020	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1022	CODE:
1011	{	1023	{
1012	int index, trailing;	1024	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1026	RETVAL = index;
1015	}	1027	}
1016	OUTPUT:	1028	OUTPUT:
1017	RETVAL	1029	RETVAL
1018		1030
1019	void	1031	void
1020	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1033	PPCODE:
1022	{	1034	{
1023	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1037
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1042	}
1031		1043
1032	void	1044	void
1033	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1046	PPCODE:
1035	{	1047	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1048	self->pl,
1037	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1050	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1051	flags
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t p = (uint32_t )SvPVX (retval);
1065	uint32_t e = p + w h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) \| (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) \| a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);
1089	PUSHs (sv_2mortal (newSViv (w)));
1090	PUSHs (sv_2mortal (newSViv (h)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}	1052	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1053
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));
1116	PUSHs (sv_2mortal (newSViv (h)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}
1121	}
1122
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1055
1125	void	1056	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1057	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1058	CODE:
1128	{	1059	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1137	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
1208	}	1139	}
1209	}	1140	}
1210		1141
1211	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1143
1213	CFClient::Map	1144	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
1215	CODE:	1146	CODE:
1216	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1148	RETVAL->x = 0;
1218	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1159	RETVAL->row = 0;
1229	OUTPUT:	1160	OUTPUT:
1230	RETVAL	1161	RETVAL
1231		1162
1232	void	1163	void
1233	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
1234	CODE:	1165	CODE:
1235	{	1166	{
1236	map_clear (self);	1167	map_clear (self);
1237	Safefree (self->face);	1168	Safefree (self->face);
1238	Safefree (self->tex);	1169	Safefree (self->tex);
1239	Safefree (self);	1170	Safefree (self);
1240	}	1171	}
1241		1172
1242	void	1173	void
1243	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
1244	CODE:	1175	CODE:
1245	map_clear (self);	1176	map_clear (self);
1246		1177
1247	void	1178	void
1248	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1180	CODE:
1250	{	1181	{
1251	while (self->faces <= face)	1182	while (self->faces <= face)
1252	{	1183	{
1253	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1187
1257	self->face [face] = texid;	1188	self->face [face] = texid;
1258	}	1189	}
1259		1190
1260	void	1191	void
1261	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1192	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1262	CODE:	1193	CODE:
1263	{	1194	{
1264	while (self->texs <= texid)	1195	while (self->texs <= texid)
1265	{	1196	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1221	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1223	}
1293		1224
1294	int	1225	int
1295	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1296	ALIAS:	1227	ALIAS:
1297	oy = 1	1228	oy = 1
1298	x = 2	1229	x = 2
1299	y = 3	1230	y = 3
1300	w = 4	1231	w = 4
…		…
1311	}	1242	}
1312	OUTPUT:	1243	OUTPUT:
1313	RETVAL	1244	RETVAL
1314		1245
1315	void	1246	void
1316	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1248	CODE:
1318	{	1249	{
1319	if (dx > 0)	1250	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1252	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1323		1254
1324	if (dy > 0)	1255	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1257	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1328		1259
1329	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1331		1262
1332	while (self->y < 0)	1263	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1338	}	1269	}
1339	}	1270	}
1340		1271
1341	void	1272	void
1342	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1274	CODE:
1344	{	1275	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1278	mapcell *cell;
1348	int x, y, flags;	1279	int x, y, flags;
1349		1280
1350	while (data < data_end)	1281	while (data < data_end - 1)
1351	{	1282	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1353		1284
1354	x = self->x + ((flags >> 10) & 63);	1285	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1286	y = self->y + ((flags >> 4) & 63);
1356		1287
1357	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1358		1289
1359	if (flags & 15)	1290	if (flags & 15)
1360	{	1291	{
1361	if (cell->darkness < 0)	1292	if (!cell->darkness)
1362	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1295	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1296	}
1368		1297
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//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
		1339	}
1372		1340
1373	if (flags & 4)	1341	if (flags & 4)
1374	{	1342	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1343	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376	}	1344	}
…		…
1384	{	1352	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1353	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386	}	1354	}
1387	}	1355	}
1388	else	1356	else
		1357	{
1389	cell->darkness = -1;	1358	cell->darkness = 0;
		1359	cell->stat_hp = 0;
		1360	cell->flags = 0;
		1361	cell->player = 0;
		1362	}
1390	}	1363	}
1391	}	1364	}
1392		1365
1393	SV *	1366	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1367	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1368	CODE:
1396	{	1369	{
1397	int x1, x;	1370	int x1, x;
1398	int y1, y;	1371	int y1, y;
1399	int z;	1372	int z;
…		…
1449	}	1422	}
1450	OUTPUT:	1423	OUTPUT:
1451	RETVAL	1424	RETVAL
1452		1425
1453	void	1426	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1427	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1428	CODE:
1456	{	1429	{
1457	int vx, vy;	1430	int vx, vy;
1458	int x, y, z;	1431	int x, y, z;
1459	int last_name;	1432	int last_name;
…		…
1494	{	1467	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1468	mapcell *cell = row->col + (x + vx - row->c0);
1496		1469
1497	face = cell->face [z];	1470	face = cell->face [z];
1498		1471
1499	if (face)	1472	if (face && face < self->texs)
1500	{	1473	{
1501	maptex tex = self->tex [face];	1474	maptex tex = self->tex [face];
1502
1503	int px = (x + 1) * 32 - tex.w;	1475	int px = (x + 1) * 32 - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1476	int py = (y + 1) * 32 - tex.h;
1505		1477
1506	if (last_name != tex.name)	1478	if (last_name != tex.name)
1507	{	1479	{
1508	glEnd ();	1480	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1481	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1482	glBegin (GL_QUADS);
1512	}	1483	}
1513		1484
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1485	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1486	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1487	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1488	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1489	}
		1490
		1491	if (cell->flags && z == 2)
		1492	{
		1493	if (cell->flags & 1)
		1494	{
		1495	maptex tex = self->tex [1];
		1496	int px = (x + 1) * 32 - tex.w + 2;
		1497	int py = (y + 1) * 32 - tex.h - 6;
		1498
		1499	glEnd ();
		1500	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1501	glBegin (GL_QUADS);
		1502
		1503	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1504	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1505	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1506	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1507	}
		1508	}
1519	}	1509	}
1520	}	1510	}
1521		1511
1522	glEnd ();	1512	glEnd ();
1523		1513
1524	glDisable (GL_TEXTURE_2D);	1514	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1515	glDisable (GL_BLEND);
1526	}
1527		1516
		1517	// top layer: overlays such as the health bar
		1518	for (y = 0; y < sh; y++)
		1519	if (0 <= y + vy && y + vy < self->rows)
		1520	{
		1521	maprow *row = self->row + (y + vy);
		1522
		1523	for (x = 0; x < sw; x++)
		1524	if (row->c0 <= x + vx && x + vx < row->c1)
		1525	{
		1526	mapcell *cell = row->col + (x + vx - row->c0);
		1527
		1528	int px = x * 32;
		1529	int py = y * 32;
		1530
		1531	if (cell->stat_hp)
		1532	{
		1533	int width = cell->stat_width * 32;
		1534	int thick = sh / 28 + 1 + cell->stat_width;
		1535
		1536	glColor3ub (0, 0, 0);
		1537	glRectf (px + 1, py - thick - 2,
		1538	px + width - 1, py);
		1539
		1540	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1541	glRectf (px + 2,
		1542	py - thick - 1,
		1543	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1544	}
		1545	}
		1546	}
		1547	}
		1548
1528	void	1549	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1550	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1551	CODE:
1531	{	1552	{
1532	static float color[16][3] = {	1553	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1554	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1555	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1556	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1557	{ 1.00F, 0.00F, 0.00F },
1537		1558
1538	{ 1.00, 0.54, 0.00 },	1559	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1560	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1561	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1562	{ 0.18F, 0.54F, 0.34F },
1542		1563
1543	{ 0.56, 0.73, 0.56 },	1564	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1565	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1566	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1567	{ 0.99F, 0.77F, 0.26F },
1547		1568
1548	{ 0.74, 0.65, 0.41 },	1569	{ 0.74F, 0.65F, 0.41F },
1549		1570
1550	{ 0.00, 1.00, 1.00 },	1571	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1572	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1573	{ 1.00F, 1.00F, 0.00F },
1553	};	1574	};
1554		1575
1555	int x, y;	1576	int x, y;
1556		1577
1557	glEnable (GL_TEXTURE_2D);	1578	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1605	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1606	glDisable (GL_TEXTURE_2D);
1586	}	1607	}
1587		1608
1588	void	1609	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1610	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1611	PPCODE:
1591	{	1612	{
1592	int vx, vy;	1613	int vx, vy;
1593	int x, y;	1614	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1615	int sw4 = (sw + 3) & ~3;
…		…
1610	for (x = 0; x < sw; x++)	1631	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1632	if (row->c0 <= x + vx && x + vx < row->c1)
1612	{	1633	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1634	mapcell *cell = row->col + (x + vx - row->c0);
1614		1635
1615	darkness[y * sw4 + x] = cell->darkness < 0	1636	darkness[y * sw4 + x] = cell->darkness
		1637	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1638	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1639	}
1619	}	1640	}
1620		1641
1621	EXTEND (SP, 3);	1642	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1643	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1644	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1645	PUSHs (darkness_sv);
1625	}	1646	}
1626		1647
1627	SV *	1648	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1649	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1650	CODE:
1630	{	1651	{
1631	int x, y, x1, y1;	1652	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1653	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1654	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1716	}
1696	OUTPUT:	1717	OUTPUT:
1697	RETVAL	1718	RETVAL
1698		1719
1699	void	1720	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1721	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1722	PPCODE:
1702	{	1723	{
1703	int x, y, z;	1724	int x, y, z;
1704	int w, h;	1725	int w, h;
1705	int x1, y1;	1726	int x1, y1;
…		…
1737		1758
1738	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1759	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1739	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1760	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1740	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1761	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1741		1762
1742	if (cell->darkness <= 0)	1763	if (cell->darkness == 0)
1743	{	1764	{
1744	cell->darkness = -1;	1765	cell->darkness = 0;
1745		1766
1746	for (z = 0; z <= 2; z++)	1767	for (z = 0; z <= 2; z++)
1747	{	1768	{
1748	cell->face[z] = face[z];	1769	cell->face[z] = face[z];
1749		1770
…		…
1754	}	1775	}
1755	}	1776	}
1756	}	1777	}
1757	}	1778	}
1758		1779
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1780	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1781
1761	CFClient::MixChunk	1782	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1783	new_from_file (SV class, char path)
1763	CODE:	1784	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1785	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1786	OUTPUT:
1766	RETVAL	1787	RETVAL
1767		1788
1768	void	1789	void
1769	DESTROY (CFClient::MixChunk self)	1790	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1791	CODE:
1771	Mix_FreeChunk (self);	1792	Mix_FreeChunk (self);
1772		1793
1773	int	1794	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1795	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1796	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1797	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1798	OUTPUT:
1778	RETVAL	1799	RETVAL
1779		1800
1780	int	1801	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1802	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1803	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1804	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1805	OUTPUT:
1785	RETVAL	1806	RETVAL
1786		1807
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1808	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1809
1789	int	1810	int
1790	volume (int volume = -1)	1811	volume (int volume = -1)
1791	CODE:	1812	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1813	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1814	OUTPUT:
1794	RETVAL	1815	RETVAL
1795		1816
1796	CFClient::MixMusic	1817	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1818	new_from_file (SV class, char path)
1798	CODE:	1819	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1820	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1821	OUTPUT:
1801	RETVAL	1822	RETVAL
1802		1823
1803	void	1824	void
1804	DESTROY (CFClient::MixMusic self)	1825	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1826	CODE:
1806	Mix_FreeMusic (self);	1827	Mix_FreeMusic (self);
1807		1828
1808	int	1829	int
1809	play (CFClient::MixMusic self, int loops = -1)	1830	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1831	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1832	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1833	OUTPUT:
1813	RETVAL	1834	RETVAL
1814		1835
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1836	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1837
1817	BOOT:	1838	BOOT:
1818	{	1839	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1840	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1841	static const struct {
1821	const char *name;	1842	const char *name;
1822	IV iv;	1843	IV iv;
1823	} *civ, const_iv[] = {	1844	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1845	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1908	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1909	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1910	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1911	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1912	const_iv (GL_LINES),
		1913	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1914	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1915	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1916	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1917	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1918	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	2028	r *= a;
2007	g *= a;	2029	g *= a;
2008	b *= a;	2030	b *= a;
2009	}	2031	}
2010	// microsoft visual "c" rounds instead of truncating...	2032	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2033	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2034
2016	void glInterleavedArrays (int format, int stride, char *data)	2035	void glInterleavedArrays (int format, int stride, char *data)
2017		2036
2018	void glDrawElements (int mode, int count, int type, char *indices)	2037	void glDrawElements (int mode, int count, int type, char *indices)
2019		2038
…		…
2096		2115
2097	void glEndList ()	2116	void glEndList ()
2098		2117
2099	void glCallList (int list)	2118	void glCallList (int list)
2100		2119
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs. Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC