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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 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	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
		664
		665	EXTEND (SP, 3);
		666
		667	buflen = sizeof (buffer);
		668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
		685
		686	void
638	add_font (char *file)	687	add_font (char *file)
639	CODE:	688	CODE:
640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
641	#ifdef _WIN32
642	// cairo... sigh... requires win2000
643	AddFontResourceEx (file, FR_PRIVATE, 0);
644	#endif
645		690
646	void	691	void
647	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
648	ALIAS:	693	ALIAS:
649	load_image_file = 1	694	load_image_file = 1
…		…
691		736
692	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
693		738
694	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
695		740
		741	SDL_LockSurface (surface2);
696	EXTEND (SP, 5);	742	EXTEND (SP, 6);
697	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
698	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
699	SDL_LockSurface (surface2);
700	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	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)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
703	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
704	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
705		750
706	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
707	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
708	}	753	}
709		754
…		…
748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
749	#endif	794	#endif
750	_exit (1);	795	_exit (1);
751		796
752	void	797	void
753	_exit (int retval)	798	_exit (int retval = 0)
754	CODE:	799	CODE:
755	_exit (retval);	800	_exit (retval);
756		801
757	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
758		803
759	CFClient::Font	804	CFPlus::Font
760	new_from_file (SV class, char path, int id = 0)	805	new_from_file (SV class, char path, int id = 0)
761	CODE:	806	CODE:
762	{	807	{
763	int count;	808	int count;
764	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
767	}	812	}
768	OUTPUT:	813	OUTPUT:
769	RETVAL	814	RETVAL
770		815
771	void	816	void
772	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
773	CODE:	818	CODE:
774	pango_font_description_free (self);	819	pango_font_description_free (self);
775		820
776	void	821	void
777	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
778	CODE:	823	CODE:
779	default_font = self;	824	default_font = self;
780		825
781	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
782		827
783	CFClient::Layout	828	void
784	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
785	CODE:	835	CODE:
786	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
787		837
788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
789	RETVAL->rgba = rgba;
790	RETVAL->r = 1.;	839	RETVAL->r = 1.;
791	RETVAL->g = 1.;	840	RETVAL->g = 1.;
792	RETVAL->b = 1.;	841	RETVAL->b = 1.;
793	RETVAL->a = 1.;	842	RETVAL->a = 1.;
794	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
798	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
799	OUTPUT:	848	OUTPUT:
800	RETVAL	849	RETVAL
801		850
802	void	851	void
803	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
804	CODE:	853	CODE:
805	g_object_unref (self->pl);	854	g_object_unref (self->pl);
806	Safefree (self);	855	Safefree (self);
807		856
808	int
809	is_rgba (CFClient::Layout self)
810	CODE:
811	RETVAL = self->rgba;
812	OUTPUT:
813	RETVAL
814
815	void	857	void
816	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
817	CODE:	859	CODE:
818	{	860	{
819	STRLEN textlen;	861	STRLEN textlen;
820	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
821		863
822	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
823	}	865	}
824		866
825	void	867	void
826	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
827	CODE:	869	CODE:
828	{	870	{
829	STRLEN textlen;	871	STRLEN textlen;
830	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
831		873
832	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
833	}	875	}
834		876
835	void	877	void
836	set_shapes (CFClient::Layout self, ...)	878	set_shapes (CFPlus::Layout self, ...)
837	CODE:	879	CODE:
838	{	880	{
839	PangoAttrList *attrs = 0;	881	PangoAttrList *attrs = 0;
840	const char *text = pango_layout_get_text (self->pl);	882	const char *text = pango_layout_get_text (self->pl);
841	const char *pos = text;	883	const char *pos = text;
…		…
876	if (attrs)	918	if (attrs)
877	pango_layout_set_attributes (self->pl, attrs);	919	pango_layout_set_attributes (self->pl, attrs);
878	}	920	}
879		921
880	void	922	void
881	get_shapes (CFClient::Layout self)	923	get_shapes (CFPlus::Layout self)
882	PPCODE:	924	PPCODE:
883	{	925	{
884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
885		927
886	do	928	do
…		…
890	if (run && shape_attr_p (run))	932	if (run && shape_attr_p (run))
891	{	933	{
892	PangoRectangle extents;	934	PangoRectangle extents;
893	pango_layout_iter_get_run_extents (iter, 0, &extents);	935	pango_layout_iter_get_run_extents (iter, 0, &extents);
894		936
		937	EXTEND (SP, 2);
895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));	938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));	939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
897	}	940	}
898	}	941	}
899	while (pango_layout_iter_next_run (iter));	942	while (pango_layout_iter_next_run (iter));
900		943
901	pango_layout_iter_free (iter);	944	pango_layout_iter_free (iter);
902	}	945	}
903		946
904	int	947	int
905	has_wrapped (CFClient::Layout self)	948	has_wrapped (CFPlus::Layout self)
906	CODE:	949	CODE:
907	{	950	{
908	int lines = 1;	951	int lines = 1;
909	const char *text = pango_layout_get_text (self->pl);	952	const char *text = pango_layout_get_text (self->pl);
910		953
…		…
915	}	958	}
916	OUTPUT:	959	OUTPUT:
917	RETVAL	960	RETVAL
918		961
919	SV *	962	SV *
920	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
921	CODE:	964	CODE:
922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
923	sv_utf8_decode (RETVAL);	966	sv_utf8_decode (RETVAL);
924	OUTPUT:	967	OUTPUT:
925	RETVAL	968	RETVAL
926		969
927	void	970	void
928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
929	CODE:	972	CODE:
930	self->r = r;	973	self->r = r;
931	self->g = g;	974	self->g = g;
932	self->b = b;	975	self->b = b;
933	self->a = a;	976	self->a = a;
934		977
935	void	978	void
936	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
937	CODE:	980	CODE:
938	if (self->font != font)	981	if (self->font != font)
939	{	982	{
940	self->font = font;	983	self->font = font;
941	layout_update_font (self);	984	layout_update_font (self);
942	}	985	}
943		986
944	void	987	void
945	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
946	CODE:	989	CODE:
947	if (self->base_height != base_height)	990	if (self->base_height != base_height)
948	{	991	{
949	self->base_height = base_height;	992	self->base_height = base_height;
950	layout_update_font (self);	993	layout_update_font (self);
951	}	994	}
952		995
953	void	996	void
954	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
955	CODE:	998	CODE:
956	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
957		1000
958	void	1001	void
959	set_indent (CFClient::Layout self, int indent)	1002	set_indent (CFPlus::Layout self, int indent)
960	CODE:	1003	CODE:
961	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
962		1005
963	void	1006	void
964	set_spacing (CFClient::Layout self, int spacing)	1007	set_spacing (CFPlus::Layout self, int spacing)
965	CODE:	1008	CODE:
966	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
967		1010
968	void	1011	void
969	set_ellipsise (CFClient::Layout self, int ellipsise)	1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
970	CODE:	1013	CODE:
971	pango_layout_set_ellipsize (self->pl,	1014	pango_layout_set_ellipsize (self->pl,
972	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
973	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
974	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
975	: PANGO_ELLIPSIZE_NONE	1018	: PANGO_ELLIPSIZE_NONE
976	);	1019	);
977		1020
978	void	1021	void
979	set_single_paragraph_mode (CFClient::Layout self, int spm)	1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
980	CODE:	1023	CODE:
981	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
982		1025
983	void	1026	void
984	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
985	PPCODE:	1028	PPCODE:
986	{	1029	{
987	int w, h;	1030	int w, h;
988		1031
989	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
992	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
993	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
994	}	1037	}
995		1038
996	int	1039	int
997	descent (CFClient::Layout self)	1040	descent (CFPlus::Layout self)
998	CODE:	1041	CODE:
999	{	1042	{
1000	PangoRectangle rect;	1043	PangoRectangle rect;
1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
1002	pango_layout_line_get_pixel_extents (line, 0, &rect);	1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
1004	}	1047	}
1005	OUTPUT:	1048	OUTPUT:
1006	RETVAL	1049	RETVAL
1007		1050
1008	int	1051	int
1009	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
1010	CODE:	1053	CODE:
1011	{	1054	{
1012	int index, trailing;	1055	int index, trailing;
1013	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1014	RETVAL = index;	1057	RETVAL = index;
1015	}	1058	}
1016	OUTPUT:	1059	OUTPUT:
1017	RETVAL	1060	RETVAL
1018		1061
1019	void	1062	void
1020	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
1021	PPCODE:	1064	PPCODE:
1022	{	1065	{
1023	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
1024	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1025		1068
…		…
1028	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1029	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1030	}	1073	}
1031		1074
1032	void	1075	void
1033	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
1034	PPCODE:	1077	PPCODE:
1035	{	1078	pango_opengl_render_layout_subpixel (
1036	SV *retval;	1079	self->pl,
1037	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
1038		1081	self->r, self->g, self->b, self->a,
1039	layout_get_pixel_size (self, &w, &h);
1040
1041	if (self->rgba)
1042	{	1082	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	}	1083	);
1095	else
1096	{
1097	FT_Bitmap bitmap;
1098		1084
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	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
1124		1086
1125	void	1087	void
1126	pad2pot (SV data_, SV w_, SV *h_)	1088	pad2pot (SV data_, SV w_, SV *h_)
1127	CODE:	1089	CODE:
1128	{	1090	{
…		…
1206	glDisable (GL_ALPHA_TEST);	1168	glDisable (GL_ALPHA_TEST);
1207	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
1208	}	1170	}
1209	}	1171	}
1210		1172
1211	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
1212		1174
1213	CFClient::Map	1175	CFPlus::Map
1214	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
1215	CODE:	1177	CODE:
1216	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
1217	RETVAL->x = 0;	1179	RETVAL->x = 0;
1218	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
1228	RETVAL->row = 0;	1190	RETVAL->row = 0;
1229	OUTPUT:	1191	OUTPUT:
1230	RETVAL	1192	RETVAL
1231		1193
1232	void	1194	void
1233	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
1234	CODE:	1196	CODE:
1235	{	1197	{
1236	map_clear (self);	1198	map_clear (self);
1237	Safefree (self->face);	1199	Safefree (self->face);
1238	Safefree (self->tex);	1200	Safefree (self->tex);
1239	Safefree (self);	1201	Safefree (self);
1240	}	1202	}
1241		1203
1242	void	1204	void
1243	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
1244	CODE:	1206	CODE:
1245	map_clear (self);	1207	map_clear (self);
1246		1208
1247	void	1209	void
1248	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1249	CODE:	1211	CODE:
1250	{	1212	{
1251	while (self->faces <= face)	1213	while (self->faces <= face)
1252	{	1214	{
1253	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1256		1218
1257	self->face [face] = texid;	1219	self->face [face] = texid;
1258	}	1220	}
1259		1221
1260	void	1222	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)	1223	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:	1224	CODE:
1263	{	1225	{
1264	while (self->texs <= texid)	1226	while (self->texs <= texid)
1265	{	1227	{
1266	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1290	// from transparent color bleeding and ugly wrapping effects.	1252	// from transparent color bleeding and ugly wrapping effects.
1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1292	}	1254	}
1293		1255
1294	int	1256	int
1295	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1296	ALIAS:	1258	ALIAS:
1297	oy = 1	1259	oy = 1
1298	x = 2	1260	x = 2
1299	y = 3	1261	y = 3
1300	w = 4	1262	w = 4
…		…
1311	}	1273	}
1312	OUTPUT:	1274	OUTPUT:
1313	RETVAL	1275	RETVAL
1314		1276
1315	void	1277	void
1316	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1317	CODE:	1279	CODE:
1318	{	1280	{
1319	if (dx > 0)	1281	if (dx > 0)
1320	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1321	else if (dx < 0)	1283	else if (dx < 0)
1322	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1323		1285
1324	if (dy > 0)	1286	if (dy > 0)
1325	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1326	else if (dy < 0)	1288	else if (dy < 0)
1327	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1328		1290
1329	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1330	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1331		1293
1332	while (self->y < 0)	1294	while (self->y < 0)
…		…
1337	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1338	}	1300	}
1339	}	1301	}
1340		1302
1341	void	1303	void
1342	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1343	CODE:	1305	CODE:
1344	{	1306	{
1345	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1346	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
1347	mapcell *cell;	1309	mapcell *cell;
1348	int x, y, flags;	1310	int x, y, flags;
1349		1311
1350	while (data < data_end)	1312	while (data < data_end - 1)
1351	{	1313	{
1352	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1353		1315
1354	x = self->x + ((flags >> 10) & 63);	1316	x = self->x + ((flags >> 10) & 63);
1355	y = self->y + ((flags >> 4) & 63);	1317	y = self->y + ((flags >> 4) & 63);
1356		1318
1357	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1358		1320
1359	if (flags & 15)	1321	if (flags & 15)
1360	{	1322	{
1361	if (cell->darkness < 0)	1323	if (!cell->darkness)
1362	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1363	cell->darkness = 0;	1326	cell->darkness = 256;
1364	cell->face [0] = 0;
1365	cell->face [1] = 0;
1366	cell->face [2] = 0;
1367	}	1327	}
1368		1328
1369	cell->darkness = flags & 8 ? *data++ : 255;
1370
1371	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
1372		1370
1373	if (flags & 4)	1371	if (flags & 4)
1374	{	1372	{
1375	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1376	}	1374	}
…		…
1384	{	1382	{
1385	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1386	}	1384	}
1387	}	1385	}
1388	else	1386	else
1389	cell->darkness = -1;	1387	cell->darkness = 0;
1390	}	1388	}
1391	}	1389	}
1392		1390
1393	SV *	1391	SV *
1394	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1395	CODE:	1393	CODE:
1396	{	1394	{
1397	int x1, x;	1395	int x1, x;
1398	int y1, y;	1396	int y1, y;
1399	int z;	1397	int z;
…		…
1449	}	1447	}
1450	OUTPUT:	1448	OUTPUT:
1451	RETVAL	1449	RETVAL
1452		1450
1453	void	1451	void
1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1455	CODE:	1453	CODE:
1456	{	1454	{
1457	int vx, vy;	1455	int vx, vy;
1458	int x, y, z;	1456	int x, y, z;
1459	int last_name;	1457	int last_name;
…		…
1494	{	1492	{
1495	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1496		1494
1497	face = cell->face [z];	1495	face = cell->face [z];
1498		1496
1499	if (face)	1497	if (face && face < self->texs)
1500	{	1498	{
1501	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1502
1503	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1504	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1505		1502
1506	if (last_name != tex.name)	1503	if (last_name != tex.name)
1507	{	1504	{
1508	glEnd ();	1505	glEnd ();
1509	last_name = tex.name;
1510	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1511	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1512	}	1508	}
1513		1509
1514	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1515	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1516	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1517	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1518	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1519	}	1534	}
1520	}	1535	}
1521		1536
1522	glEnd ();	1537	glEnd ();
1523		1538
1524	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1525	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
1526	}
1527		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
1528	void	1574	void
1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1530	CODE:	1576	CODE:
1531	{	1577	{
1532	static float color[16][3] = {	1578	static float color[16][3] = {
1533	{ 0.00, 0.00, 0.00 },	1579	{ 0.00F, 0.00F, 0.00F },
1534	{ 1.00, 1.00, 1.00 },	1580	{ 1.00F, 1.00F, 1.00F },
1535	{ 0.00, 0.00, 0.55 },	1581	{ 0.00F, 0.00F, 0.55F },
1536	{ 1.00, 0.00, 0.00 },	1582	{ 1.00F, 0.00F, 0.00F },
1537		1583
1538	{ 1.00, 0.54, 0.00 },	1584	{ 1.00F, 0.54F, 0.00F },
1539	{ 0.11, 0.56, 1.00 },	1585	{ 0.11F, 0.56F, 1.00F },
1540	{ 0.93, 0.46, 0.00 },	1586	{ 0.93F, 0.46F, 0.00F },
1541	{ 0.18, 0.54, 0.34 },	1587	{ 0.18F, 0.54F, 0.34F },
1542		1588
1543	{ 0.56, 0.73, 0.56 },	1589	{ 0.56F, 0.73F, 0.56F },
1544	{ 0.80, 0.80, 0.80 },	1590	{ 0.80F, 0.80F, 0.80F },
1545	{ 0.55, 0.41, 0.13 },	1591	{ 0.55F, 0.41F, 0.13F },
1546	{ 0.99, 0.77, 0.26 },	1592	{ 0.99F, 0.77F, 0.26F },
1547		1593
1548	{ 0.74, 0.65, 0.41 },	1594	{ 0.74F, 0.65F, 0.41F },
1549		1595
1550	{ 0.00, 1.00, 1.00 },	1596	{ 0.00F, 1.00F, 1.00F },
1551	{ 1.00, 0.00, 1.00 },	1597	{ 1.00F, 0.00F, 1.00F },
1552	{ 1.00, 1.00, 0.00 },	1598	{ 1.00F, 1.00F, 0.00F },
1553	};	1599	};
1554		1600
1555	int x, y;	1601	int x, y;
1556		1602
1557	glEnable (GL_TEXTURE_2D);	1603	glEnable (GL_TEXTURE_2D);
…		…
1584	glDisable (GL_BLEND);	1630	glDisable (GL_BLEND);
1585	glDisable (GL_TEXTURE_2D);	1631	glDisable (GL_TEXTURE_2D);
1586	}	1632	}
1587		1633
1588	void	1634	void
1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1590	PPCODE:	1636	PPCODE:
1591	{	1637	{
1592	int vx, vy;	1638	int vx, vy;
1593	int x, y;	1639	int x, y;
1594	int sw4 = (sw + 3) & ~3;	1640	int sw4 = (sw + 3) & ~3;
…		…
1610	for (x = 0; x < sw; x++)	1656	for (x = 0; x < sw; x++)
1611	if (row->c0 <= x + vx && x + vx < row->c1)	1657	if (row->c0 <= x + vx && x + vx < row->c1)
1612	{	1658	{
1613	mapcell *cell = row->col + (x + vx - row->c0);	1659	mapcell *cell = row->col + (x + vx - row->c0);
1614		1660
1615	darkness[y * sw4 + x] = cell->darkness < 0	1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
1616	? 255 - FOW_DARKNESS	1663	: 255 - FOW_DARKNESS;
1617	: 255 - cell->darkness;
1618	}	1664	}
1619	}	1665	}
1620		1666
1621	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1622	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1623	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1624	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1625	}	1671	}
1626		1672
1627	SV *	1673	SV *
1628	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1629	CODE:	1675	CODE:
1630	{	1676	{
1631	int x, y, x1, y1;	1677	int x, y, x1, y1;
1632	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1633	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1695	}	1741	}
1696	OUTPUT:	1742	OUTPUT:
1697	RETVAL	1743	RETVAL
1698		1744
1699	void	1745	void
1700	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1701	PPCODE:	1747	PPCODE:
1702	{	1748	{
1703	int x, y, z;	1749	int x, y, z;
1704	int w, h;	1750	int w, h;
1705	int x1, y1;	1751	int x1, y1;
…		…
1737		1783
1738	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1739	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1740	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1741		1787
1742	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1743	{	1789	{
1744	cell->darkness = -1;	1790	cell->darkness = 0;
1745		1791
1746	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1747	{	1793	{
1748	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1749		1795
…		…
1754	}	1800	}
1755	}	1801	}
1756	}	1802	}
1757	}	1803	}
1758		1804
1759	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1760		1806
1761	CFClient::MixChunk	1807	CFPlus::MixChunk
1762	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1763	CODE:	1809	CODE:
1764	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1765	OUTPUT:	1811	OUTPUT:
1766	RETVAL	1812	RETVAL
1767		1813
1768	void	1814	void
1769	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1770	CODE:	1816	CODE:
1771	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1772		1818
1773	int	1819	int
1774	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1775	CODE:	1821	CODE:
1776	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1777	OUTPUT:	1823	OUTPUT:
1778	RETVAL	1824	RETVAL
1779		1825
1780	int	1826	int
1781	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1782	CODE:	1828	CODE:
1783	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1784	OUTPUT:	1830	OUTPUT:
1785	RETVAL	1831	RETVAL
1786		1832
1787	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1788		1834
1789	int	1835	int
1790	volume (int volume = -1)	1836	volume (int volume = -1)
1791	CODE:	1837	CODE:
1792	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1793	OUTPUT:	1839	OUTPUT:
1794	RETVAL	1840	RETVAL
1795		1841
1796	CFClient::MixMusic	1842	CFPlus::MixMusic
1797	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1798	CODE:	1844	CODE:
1799	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1800	OUTPUT:	1846	OUTPUT:
1801	RETVAL	1847	RETVAL
1802		1848
1803	void	1849	void
1804	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1805	CODE:	1851	CODE:
1806	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1807		1853
1808	int	1854	int
1809	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1810	CODE:	1856	CODE:
1811	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1812	OUTPUT:	1858	OUTPUT:
1813	RETVAL	1859	RETVAL
1814		1860
1815	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1816		1862
1817	BOOT:	1863	BOOT:
1818	{	1864	{
1819	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1820	static const struct {	1866	static const struct {
1821	const char *name;	1867	const char *name;
1822	IV iv;	1868	IV iv;
1823	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1824	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
…		…
1887	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1888	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1889	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1890	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1891	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
1892	const_iv (GL_LINE_LOOP),	1939	const_iv (GL_LINE_LOOP),
1893	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1894	const_iv (GL_QUAD_STRIP),	1941	const_iv (GL_QUAD_STRIP),
1895	const_iv (GL_TRIANGLES),	1942	const_iv (GL_TRIANGLES),
1896	const_iv (GL_TRIANGLE_STRIP),	1943	const_iv (GL_TRIANGLE_STRIP),
…		…
2006	r *= a;	2053	r *= a;
2007	g *= a;	2054	g *= a;
2008	b *= a;	2055	b *= a;
2009	}	2056	}
2010	// microsoft visual "c" rounds instead of truncating...	2057	// microsoft visual "c" rounds instead of truncating...
2011	glColor4ub (MIN ((int)(r * 256.f), 255),	2058	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		2059
2016	void glInterleavedArrays (int format, int stride, char *data)	2060	void glInterleavedArrays (int format, int stride, char *data)
2017		2061
2018	void glDrawElements (int mode, int count, int type, char *indices)	2062	void glDrawElements (int mode, int count, int type, char *indices)
2019		2063
…		…
2096		2140
2097	void glEndList ()	2141	void glEndList ()
2098		2142
2099	void glCallList (int list)	2143	void glCallList (int list)
2100		2144
2101

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs. Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.122 by root, Fri Jun 23 22:35:15 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC