[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.151 by root, Sat Aug 19 18:17:18 2006 UTC

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