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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 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"
46
47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
48		52
49	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
50		54
51	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
52	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
53		57
54	#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
55		65
56	static struct	66	static struct
57	{	67	{
58	#define GL_FUNC(ptr,name) ptr name;	68	#define GL_FUNC(ptr,name) ptr name;
59	#include "glfunc.h"	69	#include "glfunc.h"
…		…
68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
69	else	79	else
70	glBlendFunc (sa, da);	80	glBlendFunc (sa, da);
71	}	81	}
72		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
73	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
74	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
75		91
76	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
77		93
78	static int	94	static int
79	shape_attr_p (PangoLayoutRun *run)	95	shape_attr_p (PangoLayoutRun *run)
80	{	96	{
81	GSList *attrs = run->item->analysis.extra_attrs;	97	GSList *attrs = run->item->analysis.extra_attrs;
…		…
92		108
93	return 0;	109	return 0;
94	}	110	}
95		111
96	typedef struct cf_layout {	112	typedef struct cf_layout {
97	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
99	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
100	int base_height;	115	int base_height;
101	CFClient__Font font;	116	CFPlus__Font font;
102	} *CFClient__Layout;	117	} *CFPlus__Layout;
103		118
104	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
105	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
106	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
107		122
108	static void	123	static void
109	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
110	{	125	{
111	FcPatternAddBool (pattern, FC_HINTING, 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
112	#ifdef FC_HINT_STYLE	127	#ifdef FC_HINT_STYLE
113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
114	#endif	129	#endif
115	#ifdef _WIN32
116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
117	#else
118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
119	#endif
120	}	131	}
121		132
122	static void	133	static void
123	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
124	{	135	{
125	/* 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
126	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
127	*/	138	*/
128	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
132		143
133	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
134	}	145	}
135		146
136	static void	147	static void
137	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
138	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
139	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
140		154
141	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
142	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
143		157
144	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;
145	}	163	}
146		164
147	typedef uint16_t mapface;	165	typedef uint16_t mapface;
148		166
149	typedef struct {	167	typedef struct {
…		…
152	float s, t;	170	float s, t;
153	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
154	} maptex;	172	} maptex;
155		173
156	typedef struct {	174	typedef struct {
157	int16_t darkness;	175	uint32_t player;
158	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
159	} mapcell;	179	} mapcell;
160		180
161	typedef struct {	181	typedef struct {
162	int32_t c0, c1;	182	int32_t c0, c1;
163	mapcell *col;	183	mapcell *col;
…		…
172	int texs;	192	int texs;
173	maptex *tex;	193	maptex *tex;
174		194
175	int32_t rows;	195	int32_t rows;
176	maprow *row;	196	maprow *row;
177	} *CFClient__Map;	197	} *CFPlus__Map;
178		198
179	static char *	199	static char *
180	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
181	{	201	{
182	char *p;	202	char *p;
…		…
200		220
201	#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))
202	#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))
203		223
204	static maprow *	224	static maprow *
205	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
206	{	226	{
207	if (0 > y)	227	if (0 > y)
208	{	228	{
209	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
210	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
248		268
249	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
250	}	270	}
251		271
252	static mapcell *	272	static mapcell *
253	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
254	{	274	{
255	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
256	}	276	}
257		277
258	static void	278	static void
259	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
260	{	280	{
261	int r;	281	int r;
262		282
263	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
264	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
272	self->row = 0;	292	self->row = 0;
273	self->rows = 0;	293	self->rows = 0;
274	}	294	}
275		295
276	static void	296	static void
277	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)
278	{	298	{
279	int x, y;	299	int x, y;
280	maprow *row;	300	maprow *row;
		301	mapcell *cell;
281		302
282	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
283	if (y >= 0)	304	if (y >= 0)
284	{	305	{
285	if (y >= self->rows)	306	if (y >= self->rows)
…		…
291	if (x >= row->c0)	312	if (x >= row->c0)
292	{	313	{
293	if (x >= row->c1)	314	if (x >= row->c1)
294	break;	315	break;
295		316
296	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;
297	}	323	}
298	}	324	}
299	}	325	}
300		326
301	static void	327	static void
…		…
339	n \|= n >> 16;	365	n \|= n >> 16;
340		366
341	return n + 1;	367	return n + 1;
342	}	368	}
343		369
344	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
345		371
346	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
347		373
348	BOOT:	374	BOOT:
349	{	375	{
350	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
351	static const struct {	377	static const struct {
352	const char *name;	378	const char *name;
353	IV iv;	379	IV iv;
354	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
355	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
456		482
457	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; )
458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
459	}	485	}
460		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
461	NV floor (NV x)	494	NV floor (NV x)
462		495
463	NV ceil (NV x)	496	NV ceil (NV x)
464		497
465	void	498	void
466	pango_init ()	499	pango_init ()
467	CODE:	500	CODE:
468	// delayed, so it can pick up new fonts added by AddFontResourceEx
469	{	501	{
470	{
471	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
472	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);
473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	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	}	505	}
491		506
492	int	507	int
493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
494		509
495	void	510	void
496	SDL_Quit ()	511	SDL_Quit ()
497		512
498	void	513	void
…		…
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
516		531
517	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
518		537
519	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
520	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
521		540
522	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
609	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
610	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
611	break;	630	break;
612	}	631	}
613		632
614	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
615	}	634	}
616	}	635	}
617		636
618	int	637	int
619	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)
…		…
633	#ifndef _WIN32	652	#ifndef _WIN32
634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
635	#endif	654	#endif
636		655
637	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
638	add_font (char *file)	686	add_font (char *file)
639	CODE:	687	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		689
646	void	690	void
647	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
648	ALIAS:	692	ALIAS:
649	load_image_file = 1	693	load_image_file = 1
…		…
691		735
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		737
694	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
695		739
		740	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	741	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	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)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
705		749
706	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
708	}	752	}
709		753
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
749	#endif	793	#endif
750	_exit (1);	794	_exit (1);
751		795
752	void	796	void
753	_exit (int retval)	797	_exit (int retval = 0)
754	CODE:	798	CODE:
		799	#ifdef WIN32
		800	ExitThread (retval); // unclean, please beam me up
		801	#else
755	_exit (retval);	802	_exit (retval);
		803	#endif
756		804
757	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
758		806
759	CFClient::Font	807	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	808	new_from_file (SV class, char path, int id = 0)
761	CODE:	809	CODE:
762	{	810	{
763	int count;	811	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	812	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	815	}
768	OUTPUT:	816	OUTPUT:
769	RETVAL	817	RETVAL
770		818
771	void	819	void
772	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
773	CODE:	821	CODE:
774	pango_font_description_free (self);	822	pango_font_description_free (self);
775		823
776	void	824	void
777	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
778	CODE:	826	CODE:
779	default_font = self;	827	default_font = self;
780		828
781	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		830
783	CFClient::Layout	831	void
784	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
		833	CODE:
		834	tc_clear ();
		835
		836	CFPlus::Layout
		837	new (SV *class)
785	CODE:	838	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
787		840
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	842	RETVAL->r = 1.;
791	RETVAL->g = 1.;	843	RETVAL->g = 1.;
792	RETVAL->b = 1.;	844	RETVAL->b = 1.;
793	RETVAL->a = 1.;	845	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
799	OUTPUT:	851	OUTPUT:
800	RETVAL	852	RETVAL
801		853
802	void	854	void
803	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
804	CODE:	856	CODE:
805	g_object_unref (self->pl);	857	g_object_unref (self->pl);
806	Safefree (self);	858	Safefree (self);
807		859
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	860	void
816	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	862	CODE:
818	{	863	{
819	STRLEN textlen;	864	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
821		866
822	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
823	}	868	}
824		869
825	void	870	void
826	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	872	CODE:
828	{	873	{
829	STRLEN textlen;	874	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
831		876
832	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
833	}	878	}
834		879
835	void	880	void
836	set_shapes (CFClient::Layout self, ...)	881	set_shapes (CFPlus::Layout self, ...)
837	CODE:	882	CODE:
838	{	883	{
839	PangoAttrList *attrs = 0;	884	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	885	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	886	const char *pos = text;
…		…
876	if (attrs)	921	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	922	pango_layout_set_attributes (self->pl, attrs);
878	}	923	}
879		924
880	void	925	void
881	get_shapes (CFClient::Layout self)	926	get_shapes (CFPlus::Layout self)
882	PPCODE:	927	PPCODE:
883	{	928	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	929	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		930
886	do	931	do
…		…
890	if (run && shape_attr_p (run))	935	if (run && shape_attr_p (run))
891	{	936	{
892	PangoRectangle extents;	937	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	938	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		939
		940	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	941	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	942	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	943	}
898	}	944	}
899	while (pango_layout_iter_next_run (iter));	945	while (pango_layout_iter_next_run (iter));
900		946
901	pango_layout_iter_free (iter);	947	pango_layout_iter_free (iter);
902	}	948	}
903		949
904	int	950	int
905	has_wrapped (CFClient::Layout self)	951	has_wrapped (CFPlus::Layout self)
906	CODE:	952	CODE:
907	{	953	{
908	int lines = 1;	954	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	955	const char *text = pango_layout_get_text (self->pl);
910		956
…		…
915	}	961	}
916	OUTPUT:	962	OUTPUT:
917	RETVAL	963	RETVAL
918		964
919	SV *	965	SV *
920	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
921	CODE:	967	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	969	sv_utf8_decode (RETVAL);
924	OUTPUT:	970	OUTPUT:
925	RETVAL	971	RETVAL
926		972
927	void	973	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	974	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	975	CODE:
930	self->r = r;	976	self->r = r;
931	self->g = g;	977	self->g = g;
932	self->b = b;	978	self->b = b;
933	self->a = a;	979	self->a = a;
934		980
935	void	981	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	983	CODE:
938	if (self->font != font)	984	if (self->font != font)
939	{	985	{
940	self->font = font;	986	self->font = font;
941	layout_update_font (self);	987	layout_update_font (self);
942	}	988	}
943		989
944	void	990	void
945	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
946	CODE:	992	CODE:
947	if (self->base_height != base_height)	993	if (self->base_height != base_height)
948	{	994	{
949	self->base_height = base_height;	995	self->base_height = base_height;
950	layout_update_font (self);	996	layout_update_font (self);
951	}	997	}
952		998
953	void	999	void
954	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	1001	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1002	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		1003
958	void	1004	void
959	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1006	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1008
963	void	1009	void
964	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1011	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1013
968	void	1014	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1016	CODE:
971	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
976	);	1022	);
977		1023
978	void	1024	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1026	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1028
983	void	1029	void
984	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
985	PPCODE:	1031	PPCODE:
986	{	1032	{
987	int w, h;	1033	int w, h;
988		1034
989	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
994	}	1040	}
995		1041
996	int	1042	int
997	descent (CFClient::Layout self)	1043	descent (CFPlus::Layout self)
998	CODE:	1044	CODE:
999	{	1045	{
1000	PangoRectangle rect;	1046	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1047	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1048	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1050	}
1005	OUTPUT:	1051	OUTPUT:
1006	RETVAL	1052	RETVAL
1007		1053
1008	int	1054	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1056	CODE:
1011	{	1057	{
1012	int index, trailing;	1058	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1059	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1060	RETVAL = index;
1015	}	1061	}
1016	OUTPUT:	1062	OUTPUT:
1017	RETVAL	1063	RETVAL
1018		1064
1019	void	1065	void
1020	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1067	PPCODE:
1022	{	1068	{
1023	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1071
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1076	}
1031		1077
1032	void	1078	void
1033	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1080	PPCODE:
1035	{	1081	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1082	self->pl,
1037	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1084	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1085	flags
1043	cairo_surface_t *surface;
1044	cairo_t *cairo;
1045
1046	retval = newSV (w * h * 4);
1047	SvPOK_only (retval);
1048	SvCUR_set (retval, w * h * 4);
1049
1050	memset (SvPVX (retval), 0, w * h * 4);
1051
1052	surface = cairo_image_surface_create_for_data (
1053	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
1054	cairo = cairo_create (surface);
1055	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
1056
1057	pango_cairo_show_layout (cairo, self->pl);
1058
1059	cairo_destroy (cairo);
1060	cairo_surface_destroy (surface);
1061
1062	// what a mess, and its premultiplied, too :(
1063	{
1064	uint32_t p = (uint32_t )SvPVX (retval);
1065	uint32_t e = p + w h;
1066
1067	while (p < e)
1068	{
1069	uint32_t rgba = *p;
1070	rgba = (rgba >> 24) \| (rgba << 8);
1071	#if 0
1072	#ifdef _WIN32
1073	{//D
1074	uint8_t r = rgba >> 24;
1075	uint8_t g = rgba >> 16;
1076	uint8_t b = rgba >> 8;
1077	uint8_t a = rgba >> 0;
1078
1079	rgba = (rgba & 0xffffff00) \| a;
1080	}
1081	#endif
1082	#endif
1083	rgba = SDL_SwapBE32 (rgba);
1084	*p++ = rgba;
1085	}
1086	}
1087
1088	EXTEND (SP, 5);
1089	PUSHs (sv_2mortal (newSViv (w)));
1090	PUSHs (sv_2mortal (newSViv (h)));
1091	PUSHs (sv_2mortal (retval));
1092	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1093	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1094	}	1086	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1087
1099	retval = newSV (w * h);
1100	SvPOK_only (retval);
1101	SvCUR_set (retval, w * h);
1102
1103	bitmap.rows = h;
1104	bitmap.width = w;
1105	bitmap.pitch = w;
1106	bitmap.buffer = (unsigned char*)SvPVX (retval);
1107	bitmap.num_grays = 256;
1108	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
1109
1110	memset (bitmap.buffer, 0, w * h);
1111
1112	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
1113
1114	EXTEND (SP, 5);
1115	PUSHs (sv_2mortal (newSViv (w)));
1116	PUSHs (sv_2mortal (newSViv (h)));
1117	PUSHs (sv_2mortal (retval));
1118	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1119	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1120	}
1121	}
1122
1123	MODULE = CFClient PACKAGE = CFClient::Texture	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1089
1125	void	1090	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1091	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1092	CODE:
1128	{	1093	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1208	}	1173	}
1209	}	1174	}
1210		1175
1211	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1177
1213	CFClient::Map	1178	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1215	CODE:	1180	CODE:
1216	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1182	RETVAL->x = 0;
1218	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1193	RETVAL->row = 0;
1229	OUTPUT:	1194	OUTPUT:
1230	RETVAL	1195	RETVAL
1231		1196
1232	void	1197	void
1233	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1234	CODE:	1199	CODE:
1235	{	1200	{
1236	map_clear (self);	1201	map_clear (self);
1237	Safefree (self->face);	1202	Safefree (self->face);
1238	Safefree (self->tex);	1203	Safefree (self->tex);
1239	Safefree (self);	1204	Safefree (self);
1240	}	1205	}
1241		1206
1242	void	1207	void
1243	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1244	CODE:	1209	CODE:
1245	map_clear (self);	1210	map_clear (self);
1246		1211
1247	void	1212	void
1248	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1214	CODE:
1250	{	1215	{
1251	while (self->faces <= face)	1216	while (self->faces <= face)
1252	{	1217	{
1253	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1221
1257	self->face [face] = texid;	1222	self->face [face] = texid;
1258	}	1223	}
1259		1224
1260	void	1225	void
1261	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1226	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1262	CODE:	1227	CODE:
1263	{	1228	{
1264	while (self->texs <= texid)	1229	while (self->texs <= texid)
1265	{	1230	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1255	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1257	}
1293		1258
1294	int	1259	int
1295	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1296	ALIAS:	1261	ALIAS:
1297	oy = 1	1262	oy = 1
1298	x = 2	1263	x = 2
1299	y = 3	1264	y = 3
1300	w = 4	1265	w = 4
…		…
1311	}	1276	}
1312	OUTPUT:	1277	OUTPUT:
1313	RETVAL	1278	RETVAL
1314		1279
1315	void	1280	void
1316	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1282	CODE:
1318	{	1283	{
1319	if (dx > 0)	1284	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1286	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1323		1288
1324	if (dy > 0)	1289	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1291	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1328		1293
1329	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1331		1296
1332	while (self->y < 0)	1297	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1338	}	1303	}
1339	}	1304	}
1340		1305
1341	void	1306	void
1342	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1308	CODE:
1344	{	1309	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1312	mapcell *cell;
1348	int x, y, flags;	1313	int x, y, flags;
1349		1314
1350	while (data < data_end)	1315	while (data < data_end - 1)
1351	{	1316	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1353		1318
1354	x = self->x + ((flags >> 10) & 63);	1319	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1320	y = self->y + ((flags >> 4) & 63);
1356		1321
1357	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1358		1323
1359	if (flags & 15)	1324	if (flags & 15)
1360	{	1325	{
1361	if (cell->darkness < 0)	1326	if (!cell->darkness)
1362	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1329	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1330	}
1368		1331
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1372		1373
1373	if (flags & 4)	1374	if (flags & 4)
1374	{	1375	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376	}	1377	}
…		…
1384	{	1385	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386	}	1387	}
1387	}	1388	}
1388	else	1389	else
1389	cell->darkness = -1;	1390	cell->darkness = 0;
1390	}	1391	}
1391	}	1392	}
1392		1393
1393	SV *	1394	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1396	CODE:
1396	{	1397	{
1397	int x1, x;	1398	int x1, x;
1398	int y1, y;	1399	int y1, y;
1399	int z;	1400	int z;
…		…
1449	}	1450	}
1450	OUTPUT:	1451	OUTPUT:
1451	RETVAL	1452	RETVAL
1452		1453
1453	void	1454	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1456	CODE:
1456	{	1457	{
1457	int vx, vy;	1458	int vx, vy;
1458	int x, y, z;	1459	int x, y, z;
1459	int last_name;	1460	int last_name;
…		…
1494	{	1495	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1496		1497
1497	face = cell->face [z];	1498	face = cell->face [z];
1498		1499
1499	if (face)	1500	if (face && face < self->texs)
1500	{	1501	{
1501	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1502
1503	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1505		1505
1506	if (last_name != tex.name)	1506	if (last_name != tex.name)
1507	{	1507	{
1508	glEnd ();	1508	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1512	}	1511	}
1513		1512
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1515	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1517	}
		1518
		1519	if (cell->flags && z == 2)
		1520	{
		1521	if (cell->flags & 1)
		1522	{
		1523	maptex tex = self->tex [1];
		1524	int px = (x + 1) * 32 - tex.w + 2;
		1525	int py = (y + 1) * 32 - tex.h - 6;
		1526
		1527	glEnd ();
		1528	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1529	glBegin (GL_QUADS);
		1530
		1531	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1532	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1533	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1534	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1535	}
		1536	}
1519	}	1537	}
1520	}	1538	}
1521		1539
1522	glEnd ();	1540	glEnd ();
1523		1541
1524	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1543	glDisable (GL_BLEND);
1526	}
1527		1544
		1545	// top layer: overlays such as the health bar
		1546	for (y = 0; y < sh; y++)
		1547	if (0 <= y + vy && y + vy < self->rows)
		1548	{
		1549	maprow *row = self->row + (y + vy);
		1550
		1551	for (x = 0; x < sw; x++)
		1552	if (row->c0 <= x + vx && x + vx < row->c1)
		1553	{
		1554	mapcell *cell = row->col + (x + vx - row->c0);
		1555
		1556	int px = x * 32;
		1557	int py = y * 32;
		1558
		1559	if (cell->stat_hp)
		1560	{
		1561	int width = cell->stat_width * 32;
		1562	int thick = sh / 28 + 1 + cell->stat_width;
		1563
		1564	glColor3ub (0, 0, 0);
		1565	glRectf (px + 1, py - thick - 2,
		1566	px + width - 1, py);
		1567
		1568	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1569	glRectf (px + 2,
		1570	py - thick - 1,
		1571	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1572	}
		1573	}
		1574	}
		1575	}
		1576
1528	void	1577	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1578	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1579	CODE:
1531	{	1580	{
1532	static float color[16][3] = {	1581	static float color[16][3] = {
1533	{ 0.00F, 0.00F, 0.00F },	1582	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00F, 1.00F, 1.00F },	1583	{ 1.00F, 1.00F, 1.00F },
…		…
1584	glDisable (GL_BLEND);	1633	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1634	glDisable (GL_TEXTURE_2D);
1586	}	1635	}
1587		1636
1588	void	1637	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1638	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1639	PPCODE:
1591	{	1640	{
1592	int vx, vy;	1641	int vx, vy;
1593	int x, y;	1642	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1643	int sw4 = (sw + 3) & ~3;
…		…
1610	for (x = 0; x < sw; x++)	1659	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1660	if (row->c0 <= x + vx && x + vx < row->c1)
1612	{	1661	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1662	mapcell *cell = row->col + (x + vx - row->c0);
1614		1663
1615	darkness[y * sw4 + x] = cell->darkness < 0	1664	darkness[y * sw4 + x] = cell->darkness
		1665	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1666	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1667	}
1619	}	1668	}
1620		1669
1621	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1625	}	1674	}
1626		1675
1627	SV *	1676	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1677	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1678	CODE:
1630	{	1679	{
1631	int x, y, x1, y1;	1680	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1681	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1682	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1744	}
1696	OUTPUT:	1745	OUTPUT:
1697	RETVAL	1746	RETVAL
1698		1747
1699	void	1748	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1749	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1750	PPCODE:
1702	{	1751	{
1703	int x, y, z;	1752	int x, y, z;
1704	int w, h;	1753	int w, h;
1705	int x1, y1;	1754	int x1, y1;
…		…
1737		1786
1738	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1739	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1740	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1741		1790
1742	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1743	{	1792	{
1744	cell->darkness = -1;	1793	cell->darkness = 0;
1745		1794
1746	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1747	{	1796	{
1748	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1749		1798
…		…
1754	}	1803	}
1755	}	1804	}
1756	}	1805	}
1757	}	1806	}
1758		1807
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1809
1761	CFClient::MixChunk	1810	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1811	new_from_file (SV class, char path)
1763	CODE:	1812	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1814	OUTPUT:
1766	RETVAL	1815	RETVAL
1767		1816
1768	void	1817	void
1769	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1819	CODE:
1771	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1772		1821
1773	int	1822	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1824	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1826	OUTPUT:
1778	RETVAL	1827	RETVAL
1779		1828
1780	int	1829	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1830	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1831	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1833	OUTPUT:
1785	RETVAL	1834	RETVAL
1786		1835
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1837
1789	int	1838	int
1790	volume (int volume = -1)	1839	volume (int volume = -1)
1791	CODE:	1840	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1842	OUTPUT:
1794	RETVAL	1843	RETVAL
1795		1844
1796	CFClient::MixMusic	1845	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1846	new_from_file (SV class, char path)
1798	CODE:	1847	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1849	OUTPUT:
1801	RETVAL	1850	RETVAL
1802		1851
1803	void	1852	void
1804	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1854	CODE:
1806	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1807		1856
1808	int	1857	int
1809	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1859	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1861	OUTPUT:
1813	RETVAL	1862	RETVAL
1814		1863
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1865
1817	BOOT:	1866	BOOT:
1818	{	1867	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1869	static const struct {
1821	const char *name;	1870	const char *name;
1822	IV iv;	1871	IV iv;
1823	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	2056	r *= a;
2007	g *= a;	2057	g *= a;
2008	b *= a;	2058	b *= a;
2009	}	2059	}
2010	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2061	glColor4f (r, g, b, a);
2012	MIN ((int)(g * 256.f), 255),
2013	MIN ((int)(b * 256.f), 255),
2014	MIN ((int)(a * 256.f), 255));
2015		2062
2016	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
2017		2064
2018	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
2019		2066
…		…
2096		2143
2097	void glEndList ()	2144	void glEndList ()
2098		2145
2099	void glCallList (int list)	2146	void glCallList (int list)
2100		2147
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC