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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 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>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
11		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
15	#include <stdlib.h>	21	#include <stdlib.h>
18	#include <SDL_endian.h>	24	#include <SDL_endian.h>
19	#include <SDL_image.h>	25	#include <SDL_image.h>
20	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
22		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
23	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
24		33
25	#include <pango/pango.h>	34	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		35
30	#ifndef _WIN32	36	#ifndef _WIN32
31	# include <sys/types.h>	37	# include <sys/types.h>
32	# include <sys/socket.h>	38	# include <sys/socket.h>
33	# include <netinet/in.h>	39	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	46	typedef signed char int8_t;
41	typedef signed short int16_t;	47	typedef signed short int16_t;
42	typedef signed int int32_t;	48	typedef signed int int32_t;
43	#endif	49	#endif
44		50
45	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		52
47	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
48		54
49	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
51		57
52	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
53		65
54	static struct	66	static struct
55	{	67	{
56	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	69	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	79	else
68	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
69	}	81	}
70		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
71	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
73		91
74	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
75		111
76	typedef struct cf_layout {	112	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
80	int base_height;	115	int base_height;
81	CFClient__Font font;	116	CFPlus__Font font;
82	} *CFClient__Layout;	117	} *CFPlus__Layout;
83		118
84	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
87		122
88	static void	123	static void
89	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
90	{	125	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	127	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	129	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	131	}
101		132
102	static void	133	static void
103	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
104	{	135	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
107	*/	138	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		143
113	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
114	}	145	}
115		146
116	static void	147	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
120		154
121	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		157
124	w = (w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
125	}	163	}
126		164
127	typedef uint16_t mapface;	165	typedef uint16_t mapface;
128		166
129	typedef struct {	167	typedef struct {
…		…
132	float s, t;	170	float s, t;
133	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
134	} maptex;	172	} maptex;
135		173
136	typedef struct {	174	typedef struct {
137	int16_t darkness;	175	uint32_t player;
138	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
139	} mapcell;	179	} mapcell;
140		180
141	typedef struct {	181	typedef struct {
142	int32_t c0, c1;	182	int32_t c0, c1;
143	mapcell *col;	183	mapcell *col;
…		…
152	int texs;	192	int texs;
153	maptex *tex;	193	maptex *tex;
154		194
155	int32_t rows;	195	int32_t rows;
156	maprow *row;	196	maprow *row;
157	} *CFClient__Map;	197	} *CFPlus__Map;
158		198
159	static char *	199	static char *
160	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
161	{	201	{
162	char *p;	202	char *p;
…		…
180		220
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		223
184	static maprow *	224	static maprow *
185	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
186	{	226	{
187	if (0 > y)	227	if (0 > y)
188	{	228	{
189	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
228		268
229	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
230	}	270	}
231		271
232	static mapcell *	272	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
234	{	274	{
235	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
236	}	276	}
237		277
238	static void	278	static void
239	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
240	{	280	{
241	int r;	281	int r;
242		282
243	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
252	self->row = 0;	292	self->row = 0;
253	self->rows = 0;	293	self->rows = 0;
254	}	294	}
255		295
256	static void	296	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	298	{
259	int x, y;	299	int x, y;
260	maprow *row;	300	maprow *row;
		301	mapcell *cell;
261		302
262	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
263	if (y >= 0)	304	if (y >= 0)
264	{	305	{
265	if (y >= self->rows)	306	if (y >= self->rows)
…		…
271	if (x >= row->c0)	312	if (x >= row->c0)
272	{	313	{
273	if (x >= row->c1)	314	if (x >= row->c1)
274	break;	315	break;
275		316
276	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
277	}	323	}
278	}	324	}
279	}	325	}
280		326
281	static void	327	static void
…		…
319	n \|= n >> 16;	365	n \|= n >> 16;
320		366
321	return n + 1;	367	return n + 1;
322	}	368	}
323		369
324	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
325		371
326	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
327		373
328	BOOT:	374	BOOT:
329	{	375	{
330	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	377	static const struct {
332	const char *name;	378	const char *name;
333	IV iv;	379	IV iv;
334	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
436		482
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	485	}
440		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
441	NV floor (NV x)	494	NV floor (NV x)
442		495
443	NV ceil (NV x)	496	NV ceil (NV x)
444		497
445	void	498	void
446	pango_init ()	499	pango_init ()
447	CODE:	500	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	501	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	505	}
471		506
472	int	507	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		509
475	void	510	void
476	SDL_Quit ()	511	SDL_Quit ()
477		512
478	void	513	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		531
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
498		537
499	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		540
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	630	break;
592	}	631	}
593		632
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	634	}
596	}	635	}
597		636
598	int	637	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
613	#ifndef _WIN32	652	#ifndef _WIN32
614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
615	#endif	654	#endif
616		655
617	void	656	void
		657	win32_proxy_info ()
		658	PPCODE:
		659	{
		660	#ifdef _WIN32
		661	char buffer[2048];
		662	DWORD buflen;
		663
		664	EXTEND (SP, 3);
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		669	{
		670	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		671
		672	buflen = sizeof (buffer);
		673	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		674	{
		675	PUSHs (newSVpv (buffer, 0));
		676
		677	buflen = sizeof (buffer);
		678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		679	PUSHs (newSVpv (buffer, 0));
		680	}
		681	}
		682	#endif
		683	}
		684
		685	void
618	add_font (char *file)	686	add_font (char *file)
619	CODE:	687	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		689
626	void	690	void
627	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
628	ALIAS:	692	ALIAS:
629	load_image_file = 1	693	load_image_file = 1
…		…
671		735
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		737
674	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
675		739
		740	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	741	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
685		749
686	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
688	}	752	}
689		753
…		…
728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
729	#endif	793	#endif
730	_exit (1);	794	_exit (1);
731		795
732	void	796	void
733	_exit (int retval)	797	_exit (int retval = 0)
734	CODE:	798	CODE:
735	_exit (retval);	799	_exit (retval);
736		800
737	MODULE = CFClient PACKAGE = CFClient::Font	801	MODULE = CFPlus PACKAGE = CFPlus::Font
738		802
739	CFClient::Font	803	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	804	new_from_file (SV class, char path, int id = 0)
741	CODE:	805	CODE:
742	{	806	{
743	int count;	807	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	808	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	811	}
748	OUTPUT:	812	OUTPUT:
749	RETVAL	813	RETVAL
750		814
751	void	815	void
752	DESTROY (CFClient::Font self)	816	DESTROY (CFPlus::Font self)
753	CODE:	817	CODE:
754	pango_font_description_free (self);	818	pango_font_description_free (self);
755		819
756	void	820	void
757	make_default (CFClient::Font self)	821	make_default (CFPlus::Font self)
758	CODE:	822	CODE:
759	default_font = self;	823	default_font = self;
760		824
761	MODULE = CFClient PACKAGE = CFClient::Layout	825	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		826
763	CFClient::Layout	827	void
764	new (SV *class, int rgba = 0)	828	reset_glyph_cache ()
		829	CODE:
		830	tc_clear ();
		831
		832	CFPlus::Layout
		833	new (SV *class)
765	CODE:	834	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	835	New (0, RETVAL, 1, struct cf_layout);
767		836
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	837	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	838	RETVAL->r = 1.;
771	RETVAL->g = 1.;	839	RETVAL->g = 1.;
772	RETVAL->b = 1.;	840	RETVAL->b = 1.;
773	RETVAL->a = 1.;	841	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	842	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	846	layout_update_font (RETVAL);
779	OUTPUT:	847	OUTPUT:
780	RETVAL	848	RETVAL
781		849
782	void	850	void
783	DESTROY (CFClient::Layout self)	851	DESTROY (CFPlus::Layout self)
784	CODE:	852	CODE:
785	g_object_unref (self->pl);	853	g_object_unref (self->pl);
786	Safefree (self);	854	Safefree (self);
787		855
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	856	void
796	set_text (CFClient::Layout self, SV *text_)	857	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	858	CODE:
798	{	859	{
799	STRLEN textlen;	860	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	861	char *text = SvPVutf8 (text_, textlen);
801		862
802	pango_layout_set_text (self->pl, text, textlen);	863	pango_layout_set_text (self->pl, text, textlen);
803	}	864	}
804		865
805	void	866	void
806	set_markup (CFClient::Layout self, SV *text_)	867	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	868	CODE:
808	{	869	{
809	STRLEN textlen;	870	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	871	char *text = SvPVutf8 (text_, textlen);
811		872
812	pango_layout_set_markup (self->pl, text, textlen);	873	pango_layout_set_markup (self->pl, text, textlen);
813	}	874	}
814		875
		876	void
		877	set_shapes (CFPlus::Layout self, ...)
		878	CODE:
		879	{
		880	PangoAttrList *attrs = 0;
		881	const char *text = pango_layout_get_text (self->pl);
		882	const char *pos = text;
		883	int arg = 4;
		884
		885	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		886	{
		887	PangoRectangle inkrect, rect;
		888	PangoAttribute *attr;
		889
		890	int x = SvIV (ST (arg - 3));
		891	int y = SvIV (ST (arg - 2));
		892	int w = SvIV (ST (arg - 1));
		893	int h = SvIV (ST (arg ));
		894
		895	inkrect.x = 0;
		896	inkrect.y = 0;
		897	inkrect.width = 0;
		898	inkrect.height = 0;
		899
		900	rect.x = x * PANGO_SCALE;
		901	rect.y = y * PANGO_SCALE;
		902	rect.width = w * PANGO_SCALE;
		903	rect.height = h * PANGO_SCALE;
		904
		905	if (!attrs)
		906	attrs = pango_layout_get_attributes (self->pl);
		907
		908	attr = pango_attr_shape_new (&inkrect, &rect);
		909	attr->start_index = pos - text;
		910	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		911	pango_attr_list_insert (attrs, attr);
		912
		913	arg += 4;
		914	pos += sizeof (OBJ_STR) - 1;
		915	}
		916
		917	if (attrs)
		918	pango_layout_set_attributes (self->pl, attrs);
		919	}
		920
		921	void
		922	get_shapes (CFPlus::Layout self)
		923	PPCODE:
		924	{
		925	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		926
		927	do
		928	{
		929	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		930
		931	if (run && shape_attr_p (run))
		932	{
		933	PangoRectangle extents;
		934	pango_layout_iter_get_run_extents (iter, 0, &extents);
		935
		936	EXTEND (SP, 2);
		937	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		939	}
		940	}
		941	while (pango_layout_iter_next_run (iter));
		942
		943	pango_layout_iter_free (iter);
		944	}
		945
		946	int
		947	has_wrapped (CFPlus::Layout self)
		948	CODE:
		949	{
		950	int lines = 1;
		951	const char *text = pango_layout_get_text (self->pl);
		952
		953	while (*text)
		954	lines += *text++ == '\n';
		955
		956	RETVAL = lines < pango_layout_get_line_count (self->pl);
		957	}
		958	OUTPUT:
		959	RETVAL
		960
815	SV *	961	SV *
816	get_text (CFClient::Layout self)	962	get_text (CFPlus::Layout self)
817	CODE:	963	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	964	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	965	sv_utf8_decode (RETVAL);
820	OUTPUT:	966	OUTPUT:
821	RETVAL	967	RETVAL
822		968
823	void	969	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	970	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	971	CODE:
826	self->r = r;	972	self->r = r;
827	self->g = g;	973	self->g = g;
828	self->b = b;	974	self->b = b;
829	self->a = a;	975	self->a = a;
830		976
831	void	977	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	978	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	979	CODE:
834	if (self->font != font)	980	if (self->font != font)
835	{	981	{
836	self->font = font;	982	self->font = font;
837	layout_update_font (self);	983	layout_update_font (self);
838	}	984	}
839		985
840	void	986	void
841	set_height (CFClient::Layout self, int base_height)	987	set_height (CFPlus::Layout self, int base_height)
842	CODE:	988	CODE:
843	if (self->base_height != base_height)	989	if (self->base_height != base_height)
844	{	990	{
845	self->base_height = base_height;	991	self->base_height = base_height;
846	layout_update_font (self);	992	layout_update_font (self);
847	}	993	}
848		994
849	void	995	void
850	set_width (CFClient::Layout self, int max_width = -1)	996	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	997	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	998	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		999
854	void	1000	void
855	set_indent (CFClient::Layout self, int indent)	1001	set_indent (CFPlus::Layout self, int indent)
856	CODE:	1002	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1003	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		1004
859	void	1005	void
860	set_spacing (CFClient::Layout self, int spacing)	1006	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	1007	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1008	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		1009
864	void	1010	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	1011	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	1012	CODE:
867	pango_layout_set_ellipsize (self->pl,	1013	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1014	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1015	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1016	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	1017	: PANGO_ELLIPSIZE_NONE
872	);	1018	);
873		1019
874	void	1020	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	1021	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	1022	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1023	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		1024
879	void	1025	void
880	size (CFClient::Layout self)	1026	size (CFPlus::Layout self)
881	PPCODE:	1027	PPCODE:
882	{	1028	{
883	int w, h;	1029	int w, h;
884		1030
885	layout_get_pixel_size (self, &w, &h);	1031	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	1034	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	1035	PUSHs (sv_2mortal (newSViv (h)));
890	}	1036	}
891		1037
892	int	1038	int
		1039	descent (CFPlus::Layout self)
		1040	CODE:
		1041	{
		1042	PangoRectangle rect;
		1043	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1044	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1045	RETVAL = PANGO_DESCENT (rect);
		1046	}
		1047	OUTPUT:
		1048	RETVAL
		1049
		1050	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1051	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1052	CODE:
895	{	1053	{
896	int index, trailing;	1054	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1055	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1056	RETVAL = index;
899	}	1057	}
900	OUTPUT:	1058	OUTPUT:
901	RETVAL	1059	RETVAL
902		1060
903	void	1061	void
904	cursor_pos (CFClient::Layout self, int index)	1062	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1063	PPCODE:
906	{	1064	{
907	PangoRectangle strong_pos;	1065	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1066	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1067
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1070	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1072	}
915		1073
916	void	1074	void
917	render (CFClient::Layout self)	1075	render (CFPlus::Layout self, float x, float y, int flags = 0)
918	PPCODE:	1076	PPCODE:
919	{	1077	pango_opengl_render_layout_subpixel (
920	SV *retval;	1078	self->pl,
921	int w, h;	1079	x * PANGO_SCALE, y * PANGO_SCALE,
922		1080	self->r, self->g, self->b, self->a,
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1081	flags
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t p = (uint32_t )SvPVX (retval);
949	uint32_t e = p + w h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) \| (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) \| a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);
973	PUSHs (sv_2mortal (newSViv (w)));
974	PUSHs (sv_2mortal (newSViv (h)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}	1082	);
979	else
980	{
981	FT_Bitmap bitmap;
982		1083
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));
1000	PUSHs (sv_2mortal (newSViv (h)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}
1005	}
1006
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1084	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1085
1009	void	1086	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1087	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1088	CODE:
1012	{	1089	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1167	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1168	glDisable (GL_BLEND);
1092	}	1169	}
1093	}	1170	}
1094		1171
1095	MODULE = CFClient PACKAGE = CFClient::Map	1172	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1173
1097	CFClient::Map	1174	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1175	new (SV *class, int map_width, int map_height)
1099	CODE:	1176	CODE:
1100	New (0, RETVAL, 1, struct map);	1177	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1178	RETVAL->x = 0;
1102	RETVAL->y = 0;	1179	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1189	RETVAL->row = 0;
1113	OUTPUT:	1190	OUTPUT:
1114	RETVAL	1191	RETVAL
1115		1192
1116	void	1193	void
1117	DESTROY (CFClient::Map self)	1194	DESTROY (CFPlus::Map self)
1118	CODE:	1195	CODE:
1119	{	1196	{
1120	map_clear (self);	1197	map_clear (self);
1121	Safefree (self->face);	1198	Safefree (self->face);
1122	Safefree (self->tex);	1199	Safefree (self->tex);
1123	Safefree (self);	1200	Safefree (self);
1124	}	1201	}
1125		1202
1126	void	1203	void
1127	clear (CFClient::Map self)	1204	clear (CFPlus::Map self)
1128	CODE:	1205	CODE:
1129	map_clear (self);	1206	map_clear (self);
1130		1207
1131	void	1208	void
1132	set_face (CFClient::Map self, int face, int texid)	1209	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1210	CODE:
1134	{	1211	{
1135	while (self->faces <= face)	1212	while (self->faces <= face)
1136	{	1213	{
1137	Append (mapface, self->face, self->faces, self->faces);	1214	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1217
1141	self->face [face] = texid;	1218	self->face [face] = texid;
1142	}	1219	}
1143		1220
1144	void	1221	void
1145	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)	1222	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)
1146	CODE:	1223	CODE:
1147	{	1224	{
1148	while (self->texs <= texid)	1225	while (self->texs <= texid)
1149	{	1226	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1227	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1251	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1252	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1253	}
1177		1254
1178	int	1255	int
1179	ox (CFClient::Map self)	1256	ox (CFPlus::Map self)
1180	ALIAS:	1257	ALIAS:
1181	oy = 1	1258	oy = 1
1182	x = 2	1259	x = 2
1183	y = 3	1260	y = 3
1184	w = 4	1261	w = 4
…		…
1195	}	1272	}
1196	OUTPUT:	1273	OUTPUT:
1197	RETVAL	1274	RETVAL
1198		1275
1199	void	1276	void
1200	scroll (CFClient::Map self, int dx, int dy)	1277	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1278	CODE:
1202	{	1279	{
1203	if (dx > 0)	1280	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1281	map_blank (self, self->x, self->y, dx, self->h);
1205	else if (dx < 0)	1282	else if (dx < 0)
1206	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1283	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1207		1284
1208	if (dy > 0)	1285	if (dy > 0)
1209	map_blank (self, self->x, self->y, self->w, dy - 1);	1286	map_blank (self, self->x, self->y, self->w, dy);
1210	else if (dy < 0)	1287	else if (dy < 0)
1211	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1288	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1212		1289
1213	self->ox += dx; self->x += dx;	1290	self->ox += dx; self->x += dx;
1214	self->oy += dy; self->y += dy;	1291	self->oy += dy; self->y += dy;
1215		1292
1216	while (self->y < 0)	1293	while (self->y < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1298	self->y += MAP_EXTEND_Y;
1222	}	1299	}
1223	}	1300	}
1224		1301
1225	void	1302	void
1226	map1a_update (CFClient::Map self, SV *data_)	1303	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227	CODE:	1304	CODE:
1228	{	1305	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1306	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1307	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1308	mapcell *cell;
1232	int x, y, flags;	1309	int x, y, flags;
1233		1310
1234	while (data < data_end)	1311	while (data < data_end - 1)
1235	{	1312	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1313	flags = (data [0] << 8) + data [1]; data += 2;
1237		1314
1238	x = self->x + ((flags >> 10) & 63);	1315	x = self->x + ((flags >> 10) & 63);
1239	y = self->y + ((flags >> 4) & 63);	1316	y = self->y + ((flags >> 4) & 63);
1240		1317
1241	cell = map_get_cell (self, x, y);	1318	cell = map_get_cell (self, x, y);
1242		1319
1243	if (flags & 15)	1320	if (flags & 15)
1244	{	1321	{
1245	if (cell->darkness < 0)	1322	if (!cell->darkness)
1246	{	1323	{
		1324	memset (cell, 0, sizeof (*cell));
1247	cell->darkness = 0;	1325	cell->darkness = 256;
1248	cell->face [0] = 0;
1249	cell->face [1] = 0;
1250	cell->face [2] = 0;
1251	}	1326	}
1252		1327
1253	cell->darkness = flags & 8 ? *data++ : 255;
1254
1255	//TODO: don't trust server data to be in-range(!)	1328	//TODO: don't trust server data to be in-range(!)
		1329
		1330	if (flags & 8)
		1331	{
		1332	if (extmap)
		1333	{
		1334	uint8_t ext, cmd;
		1335
		1336	do
		1337	{
		1338	ext = *data++;
		1339	cmd = ext & 0x3f;
		1340
		1341	if (cmd < 4)
		1342	cell->darkness = 255 - ext * 64 + 1;
		1343	else if (cmd == 5) // health
		1344	{
		1345	cell->stat_width = 1;
		1346	cell->stat_hp = *data++;
		1347	}
		1348	else if (cmd == 6) // monster width
		1349	cell->stat_width = *data++ + 1;
		1350	else if (cmd == 0x47) // monster width
		1351	{
		1352	if (*data == 4)
		1353	; // decode player tag
		1354
		1355	data += *data + 1;
		1356	}
		1357	else if (cmd == 8) // cell flags
		1358	cell->flags = *data++;
		1359	else if (ext & 0x40) // unknown, multibyte => skip
		1360	data += *data + 1;
		1361	else
		1362	data++;
		1363	}
		1364	while (ext & 0x80);
		1365	}
		1366	else
		1367	cell->darkness = *data++ + 1;
		1368	}
1256		1369
1257	if (flags & 4)	1370	if (flags & 4)
1258	{	1371	{
1259	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1372	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1260	}	1373	}
…		…
1268	{	1381	{
1269	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1382	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1270	}	1383	}
1271	}	1384	}
1272	else	1385	else
1273	cell->darkness = -1;	1386	cell->darkness = 0;
1274	}	1387	}
1275	}	1388	}
1276		1389
1277	SV *	1390	SV *
1278	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1391	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1279	CODE:	1392	CODE:
1280	{	1393	{
1281	int x1, x;	1394	int x1, x;
1282	int y1, y;	1395	int y1, y;
1283	int z;	1396	int z;
…		…
1333	}	1446	}
1334	OUTPUT:	1447	OUTPUT:
1335	RETVAL	1448	RETVAL
1336		1449
1337	void	1450	void
1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1451	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1339	CODE:	1452	CODE:
1340	{	1453	{
1341	int vx, vy;	1454	int vx, vy;
1342	int x, y, z;	1455	int x, y, z;
1343	int last_name;	1456	int last_name;
…		…
1378	{	1491	{
1379	mapcell *cell = row->col + (x + vx - row->c0);	1492	mapcell *cell = row->col + (x + vx - row->c0);
1380		1493
1381	face = cell->face [z];	1494	face = cell->face [z];
1382		1495
1383	if (face)	1496	if (face && face < self->texs)
1384	{	1497	{
1385	maptex tex = self->tex [face];	1498	maptex tex = self->tex [face];
1386
1387	int px = (x + 1) * 32 - tex.w;	1499	int px = (x + 1) * 32 - tex.w;
1388	int py = (y + 1) * 32 - tex.h;	1500	int py = (y + 1) * 32 - tex.h;
1389		1501
1390	if (last_name != tex.name)	1502	if (last_name != tex.name)
1391	{	1503	{
1392	glEnd ();	1504	glEnd ();
1393	last_name = tex.name;
1394	glBindTexture (GL_TEXTURE_2D, last_name);	1505	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1395	glBegin (GL_QUADS);	1506	glBegin (GL_QUADS);
1396	}	1507	}
1397		1508
1398	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1509	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1399	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1510	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1400	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1511	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1401	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1512	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1402	}	1513	}
		1514
		1515	if (cell->flags && z == 2)
		1516	{
		1517	if (cell->flags & 1)
		1518	{
		1519	maptex tex = self->tex [1];
		1520	int px = (x + 1) * 32 - tex.w + 2;
		1521	int py = (y + 1) * 32 - tex.h - 6;
		1522
		1523	glEnd ();
		1524	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1525	glBegin (GL_QUADS);
		1526
		1527	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1528	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1529	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1530	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1531	}
		1532	}
1403	}	1533	}
1404	}	1534	}
1405		1535
1406	glEnd ();	1536	glEnd ();
1407		1537
1408	glDisable (GL_TEXTURE_2D);	1538	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1539	glDisable (GL_BLEND);
1410	}
1411		1540
		1541	// top layer: overlays such as the health bar
		1542	for (y = 0; y < sh; y++)
		1543	if (0 <= y + vy && y + vy < self->rows)
		1544	{
		1545	maprow *row = self->row + (y + vy);
		1546
		1547	for (x = 0; x < sw; x++)
		1548	if (row->c0 <= x + vx && x + vx < row->c1)
		1549	{
		1550	mapcell *cell = row->col + (x + vx - row->c0);
		1551
		1552	int px = x * 32;
		1553	int py = y * 32;
		1554
		1555	if (cell->stat_hp)
		1556	{
		1557	int width = cell->stat_width * 32;
		1558	int thick = sh / 28 + 1 + cell->stat_width;
		1559
		1560	glColor3ub (0, 0, 0);
		1561	glRectf (px + 1, py - thick - 2,
		1562	px + width - 1, py);
		1563
		1564	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1565	glRectf (px + 2,
		1566	py - thick - 1,
		1567	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1568	}
		1569	}
		1570	}
		1571	}
		1572
1412	void	1573	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1574	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1575	CODE:
1415	{	1576	{
1416	static float color[16][3] = {	1577	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1578	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1579	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1580	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1581	{ 1.00F, 0.00F, 0.00F },
1421		1582
1422	{ 1.00, 0.54, 0.00 },	1583	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1584	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1585	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1586	{ 0.18F, 0.54F, 0.34F },
1426		1587
1427	{ 0.56, 0.73, 0.56 },	1588	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1589	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1590	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1591	{ 0.99F, 0.77F, 0.26F },
1431		1592
1432	{ 0.74, 0.65, 0.41 },	1593	{ 0.74F, 0.65F, 0.41F },
1433		1594
1434	{ 0.00, 1.00, 1.00 },	1595	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1596	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1597	{ 1.00F, 1.00F, 0.00F },
1437	};	1598	};
1438		1599
1439	int x, y;	1600	int x, y;
1440		1601
1441	glEnable (GL_TEXTURE_2D);	1602	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1629	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1630	glDisable (GL_TEXTURE_2D);
1470	}	1631	}
1471		1632
1472	void	1633	void
1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1634	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474	PPCODE:	1635	PPCODE:
1475	{	1636	{
1476	int vx, vy;	1637	int vx, vy;
1477	int x, y;	1638	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1639	int sw4 = (sw + 3) & ~3;
…		…
1494	for (x = 0; x < sw; x++)	1655	for (x = 0; x < sw; x++)
1495	if (row->c0 <= x + vx && x + vx < row->c1)	1656	if (row->c0 <= x + vx && x + vx < row->c1)
1496	{	1657	{
1497	mapcell *cell = row->col + (x + vx - row->c0);	1658	mapcell *cell = row->col + (x + vx - row->c0);
1498		1659
1499	darkness[y * sw4 + x] = cell->darkness < 0	1660	darkness[y * sw4 + x] = cell->darkness
		1661	? 255 - (cell->darkness - 1)
1500	? 255 - FOW_DARKNESS	1662	: 255 - FOW_DARKNESS;
1501	: 255 - cell->darkness;
1502	}	1663	}
1503	}	1664	}
1504		1665
1505	EXTEND (SP, 3);	1666	EXTEND (SP, 3);
1506	PUSHs (sv_2mortal (newSViv (sw4)));	1667	PUSHs (sv_2mortal (newSViv (sw4)));
1507	PUSHs (sv_2mortal (newSViv (sh)));	1668	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1669	PUSHs (darkness_sv);
1509	}	1670	}
1510		1671
1511	SV *	1672	SV *
1512	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1673	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513	CODE:	1674	CODE:
1514	{	1675	{
1515	int x, y, x1, y1;	1676	int x, y, x1, y1;
1516	SV data_sv = newSV (w h * 7 + 5);	1677	SV data_sv = newSV (w h * 7 + 5);
1517	uint8_t data = (uint8_t )SvPVX (data_sv);	1678	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1579	}	1740	}
1580	OUTPUT:	1741	OUTPUT:
1581	RETVAL	1742	RETVAL
1582		1743
1583	void	1744	void
1584	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1745	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585	PPCODE:	1746	PPCODE:
1586	{	1747	{
1587	int x, y, z;	1748	int x, y, z;
1588	int w, h;	1749	int w, h;
1589	int x1, y1;	1750	int x1, y1;
…		…
1621		1782
1622	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1783	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1623	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1784	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1624	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1785	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1625		1786
1626	if (cell->darkness <= 0)	1787	if (cell->darkness == 0)
1627	{	1788	{
1628	cell->darkness = -1;	1789	cell->darkness = 0;
1629		1790
1630	for (z = 0; z <= 2; z++)	1791	for (z = 0; z <= 2; z++)
1631	{	1792	{
1632	cell->face[z] = face[z];	1793	cell->face[z] = face[z];
1633		1794
…		…
1638	}	1799	}
1639	}	1800	}
1640	}	1801	}
1641	}	1802	}
1642		1803
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	1804	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		1805
1645	CFClient::MixChunk	1806	CFPlus::MixChunk
1646	new_from_file (SV class, char path)	1807	new_from_file (SV class, char path)
1647	CODE:	1808	CODE:
1648	RETVAL = Mix_LoadWAV (path);	1809	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	1810	OUTPUT:
1650	RETVAL	1811	RETVAL
1651		1812
1652	void	1813	void
1653	DESTROY (CFClient::MixChunk self)	1814	DESTROY (CFPlus::MixChunk self)
1654	CODE:	1815	CODE:
1655	Mix_FreeChunk (self);	1816	Mix_FreeChunk (self);
1656		1817
1657	int	1818	int
1658	volume (CFClient::MixChunk self, int volume = -1)	1819	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	1820	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	1821	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	1822	OUTPUT:
1662	RETVAL	1823	RETVAL
1663		1824
1664	int	1825	int
1665	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1826	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666	CODE:	1827	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1828	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	1829	OUTPUT:
1669	RETVAL	1830	RETVAL
1670		1831
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	1832	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		1833
1673	int	1834	int
1674	volume (int volume = -1)	1835	volume (int volume = -1)
1675	CODE:	1836	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	1837	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	1838	OUTPUT:
1678	RETVAL	1839	RETVAL
1679		1840
1680	CFClient::MixMusic	1841	CFPlus::MixMusic
1681	new_from_file (SV class, char path)	1842	new_from_file (SV class, char path)
1682	CODE:	1843	CODE:
1683	RETVAL = Mix_LoadMUS (path);	1844	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	1845	OUTPUT:
1685	RETVAL	1846	RETVAL
1686		1847
1687	void	1848	void
1688	DESTROY (CFClient::MixMusic self)	1849	DESTROY (CFPlus::MixMusic self)
1689	CODE:	1850	CODE:
1690	Mix_FreeMusic (self);	1851	Mix_FreeMusic (self);
1691		1852
1692	int	1853	int
1693	play (CFClient::MixMusic self, int loops = -1)	1854	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	1855	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	1856	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	1857	OUTPUT:
1697	RETVAL	1858	RETVAL
1698		1859
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	1860	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		1861
1701	BOOT:	1862	BOOT:
1702	{	1863	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1864	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	1865	static const struct {
1705	const char *name;	1866	const char *name;
1706	IV iv;	1867	IV iv;
1707	} *civ, const_iv[] = {	1868	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	1869	# define const_iv(name) { # name, (IV)name }
…		…
1771	const_iv (GL_SEPARABLE_2D),	1932	const_iv (GL_SEPARABLE_2D),
1772	const_iv (GL_CONVOLUTION_2D),	1933	const_iv (GL_CONVOLUTION_2D),
1773	const_iv (GL_CONVOLUTION_BORDER_MODE),	1934	const_iv (GL_CONVOLUTION_BORDER_MODE),
1774	const_iv (GL_CONSTANT_BORDER),	1935	const_iv (GL_CONSTANT_BORDER),
1775	const_iv (GL_LINES),	1936	const_iv (GL_LINES),
		1937	const_iv (GL_LINE_STRIP),
1776	const_iv (GL_LINE_LOOP),	1938	const_iv (GL_LINE_LOOP),
1777	const_iv (GL_QUADS),	1939	const_iv (GL_QUADS),
1778	const_iv (GL_QUAD_STRIP),	1940	const_iv (GL_QUAD_STRIP),
1779	const_iv (GL_TRIANGLES),	1941	const_iv (GL_TRIANGLES),
1780	const_iv (GL_TRIANGLE_STRIP),	1942	const_iv (GL_TRIANGLE_STRIP),
…		…
1890	r *= a;	2052	r *= a;
1891	g *= a;	2053	g *= a;
1892	b *= a;	2054	b *= a;
1893	}	2055	}
1894	// microsoft visual "c" rounds instead of truncating...	2056	// microsoft visual "c" rounds instead of truncating...
1895	glColor4ub (MIN ((int)(r * 256.f), 255),	2057	glColor4f (r, g, b, a);
1896	MIN ((int)(g * 256.f), 255),
1897	MIN ((int)(b * 256.f), 255),
1898	MIN ((int)(a * 256.f), 255));
1899		2058
1900	void glInterleavedArrays (int format, int stride, char *data)	2059	void glInterleavedArrays (int format, int stride, char *data)
1901		2060
1902	void glDrawElements (int mode, int count, int type, char *indices)	2061	void glDrawElements (int mode, int count, int type, char *indices)
1903		2062
…		…
1980		2139
1981	void glEndList ()	2140	void glEndList ()
1982		2141
1983	void glCallList (int list)	2142	void glCallList (int list)
1984		2143
1985

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs. Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.120 by root, Sun Jun 18 19:13:19 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC