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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
125	}	162	}
126		163
127	typedef uint16_t mapface;	164	typedef uint16_t mapface;
128		165
129	typedef struct {	166	typedef struct {
…		…
132	float s, t;	169	float s, t;
133	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
134	} maptex;	171	} maptex;
135		172
136	typedef struct {	173	typedef struct {
137	int16_t darkness;	174	uint16_t darkness;
138	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
139	} mapcell;	177	} mapcell;
140		178
141	typedef struct {	179	typedef struct {
142	int32_t c0, c1;	180	int32_t c0, c1;
143	mapcell *col;	181	mapcell *col;
…		…
152	int texs;	190	int texs;
153	maptex *tex;	191	maptex *tex;
154		192
155	int32_t rows;	193	int32_t rows;
156	maprow *row;	194	maprow *row;
157	} *CFClient__Map;	195	} *CFPlus__Map;
158		196
159	static char *	197	static char *
160	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
161	{	199	{
162	char *p;	200	char *p;
…		…
180		218
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		221
184	static maprow *	222	static maprow *
185	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
186	{	224	{
187	if (0 > y)	225	if (0 > y)
188	{	226	{
189	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
228		266
229	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
230	}	268	}
231		269
232	static mapcell *	270	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
234	{	272	{
235	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
236	}	274	}
237		275
238	static void	276	static void
239	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
240	{	278	{
241	int r;	279	int r;
242		280
243	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
252	self->row = 0;	290	self->row = 0;
253	self->rows = 0;	291	self->rows = 0;
254	}	292	}
255		293
256	static void	294	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	296	{
259	int x, y;	297	int x, y;
260	maprow *row;	298	maprow *row;
261		299
262	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
271	if (x >= row->c0)	309	if (x >= row->c0)
272	{	310	{
273	if (x >= row->c1)	311	if (x >= row->c1)
274	break;	312	break;
275		313
276	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
277	}	315	}
278	}	316	}
279	}	317	}
280		318
281	static void	319	static void
…		…
319	n \|= n >> 16;	357	n \|= n >> 16;
320		358
321	return n + 1;	359	return n + 1;
322	}	360	}
323		361
324	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
325		363
326	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
327		365
328	BOOT:	366	BOOT:
329	{	367	{
330	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	369	static const struct {
332	const char *name;	370	const char *name;
333	IV iv;	371	IV iv;
334	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
436		474
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	477	}
440		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
		486	NV floor (NV x)
		487
		488	NV ceil (NV x)
		489
441	void	490	void
442	pango_init ()	491	pango_init ()
443	CODE:	492	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	493	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
448	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	497	}
467		498
468	int	499	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		501
471	void	502	void
472	SDL_Quit ()	503	SDL_Quit ()
473		504
474	void	505	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		515
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		518
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492		523
493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
494		529
495	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497		532
498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
585	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587	break;	622	break;
588	}	623	}
589		624
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591	}	626	}
592	}	627	}
593		628
594	int	629	int
595	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
611	#endif	646	#endif
612		647
613	void	648	void
614	add_font (char *file)	649	add_font (char *file)
615	CODE:	650	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		652
622	void	653	void
623	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
624	ALIAS:	655	ALIAS:
625	load_image_file = 1	656	load_image_file = 1
…		…
667		698
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		700
670	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
671		702
		703	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	704	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
681		712
682	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
684	}	715	}
685		716
…		…
728	void	759	void
729	_exit (int retval)	760	_exit (int retval)
730	CODE:	761	CODE:
731	_exit (retval);	762	_exit (retval);
732		763
733	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
734		765
735	CFClient::Font	766	CFPlus::Font
736	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
737	CODE:	768	CODE:
738	{	769	{
739	int count;	770	int count;
740	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
743	}	774	}
744	OUTPUT:	775	OUTPUT:
745	RETVAL	776	RETVAL
746		777
747	void	778	void
748	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
749	CODE:	780	CODE:
750	pango_font_description_free (self);	781	pango_font_description_free (self);
751		782
752	void	783	void
753	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
754	CODE:	785	CODE:
755	default_font = self;	786	default_font = self;
756		787
757	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
758		789
759	CFClient::Layout	790	void
760	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
761	CODE:	797	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
763		799
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	801	RETVAL->r = 1.;
767	RETVAL->g = 1.;	802	RETVAL->g = 1.;
768	RETVAL->b = 1.;	803	RETVAL->b = 1.;
769	RETVAL->a = 1.;	804	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
774	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
775	OUTPUT:	810	OUTPUT:
776	RETVAL	811	RETVAL
777		812
778	void	813	void
779	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
780	CODE:	815	CODE:
781	g_object_unref (self->pl);	816	g_object_unref (self->pl);
782	Safefree (self);	817	Safefree (self);
783		818
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	819	void
792	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
793	CODE:	821	CODE:
794	{	822	{
795	STRLEN textlen;	823	STRLEN textlen;
796	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
797		825
798	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
799	}	827	}
800		828
801	void	829	void
802	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
803	CODE:	831	CODE:
804	{	832	{
805	STRLEN textlen;	833	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
807		835
808	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
809	}	837	}
810		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
811	SV *	924	SV *
812	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
813	CODE:	926	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815	sv_utf8_decode (RETVAL);	928	sv_utf8_decode (RETVAL);
816	OUTPUT:	929	OUTPUT:
817	RETVAL	930	RETVAL
818		931
819	void	932	void
820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821	CODE:	934	CODE:
822	self->r = r;	935	self->r = r;
823	self->g = g;	936	self->g = g;
824	self->b = b;	937	self->b = b;
825	self->a = a;	938	self->a = a;
826		939
827	void	940	void
828	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829	CODE:	942	CODE:
830	if (self->font != font)	943	if (self->font != font)
831	{	944	{
832	self->font = font;	945	self->font = font;
833	layout_update_font (self);	946	layout_update_font (self);
834	}	947	}
835		948
836	void	949	void
837	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
838	CODE:	951	CODE:
839	if (self->base_height != base_height)	952	if (self->base_height != base_height)
840	{	953	{
841	self->base_height = base_height;	954	self->base_height = base_height;
842	layout_update_font (self);	955	layout_update_font (self);
843	}	956	}
844		957
845	void	958	void
846	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
847	CODE:	960	CODE:
848	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849		962
850	void	963	void
851	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
852	CODE:	965	CODE:
853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854		967
855	void	968	void
856	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
857	CODE:	970	CODE:
858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859		972
860	void	973	void
861	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
862	CODE:	975	CODE:
863	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
864	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
867	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
868	);	981	);
869		982
870	void	983	void
871	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
872	CODE:	985	CODE:
873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874		987
875	void	988	void
876	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
877	PPCODE:	990	PPCODE:
878	{	991	{
879	int w, h;	992	int w, h;
880		993
881	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
886	}	999	}
887		1000
888	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
889	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
890	CODE:	1015	CODE:
891	{	1016	{
892	int index, trailing;	1017	int index, trailing;
893	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894	RETVAL = index;	1019	RETVAL = index;
895	}	1020	}
896	OUTPUT:	1021	OUTPUT:
897	RETVAL	1022	RETVAL
898		1023
899	void	1024	void
900	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
901	PPCODE:	1026	PPCODE:
902	{	1027	{
903	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
904	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905		1030
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1035	}
911		1036
912	void	1037	void
913	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
914	PPCODE:	1039	PPCODE:
915	{	1040	pango_opengl_render_layout_subpixel (
916	SV *retval;	1041	self->pl,
917	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
918		1043	self->r, self->g, self->b, self->a,
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1044	flags
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t p = (uint32_t )SvPVX (retval);
945	uint32_t e = p + w h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) \| (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) \| a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));
970	PUSHs (sv_2mortal (newSViv (h)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}	1045	);
975	else
976	{
977	FT_Bitmap bitmap;
978		1046
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));
996	PUSHs (sv_2mortal (newSViv (h)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}
1001	}
1002
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
1004		1048
1005	void	1049	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1050	pad2pot (SV data_, SV w_, SV *h_)
1007	CODE:	1051	CODE:
1008	{	1052	{
…		…
1086	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1087	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1088	}	1132	}
1089	}	1133	}
1090		1134
1091	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1092		1136
1093	CFClient::Map	1137	CFPlus::Map
1094	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1095	CODE:	1139	CODE:
1096	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1097	RETVAL->x = 0;	1141	RETVAL->x = 0;
1098	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1108	RETVAL->row = 0;	1152	RETVAL->row = 0;
1109	OUTPUT:	1153	OUTPUT:
1110	RETVAL	1154	RETVAL
1111		1155
1112	void	1156	void
1113	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1114	CODE:	1158	CODE:
1115	{	1159	{
1116	map_clear (self);	1160	map_clear (self);
1117	Safefree (self->face);	1161	Safefree (self->face);
1118	Safefree (self->tex);	1162	Safefree (self->tex);
1119	Safefree (self);	1163	Safefree (self);
1120	}	1164	}
1121		1165
1122	void	1166	void
1123	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1124	CODE:	1168	CODE:
1125	map_clear (self);	1169	map_clear (self);
1126		1170
1127	void	1171	void
1128	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1129	CODE:	1173	CODE:
1130	{	1174	{
1131	while (self->faces <= face)	1175	while (self->faces <= face)
1132	{	1176	{
1133	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1136		1180
1137	self->face [face] = texid;	1181	self->face [face] = texid;
1138	}	1182	}
1139		1183
1140	void	1184	void
1141	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)	1185	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)
1142	CODE:	1186	CODE:
1143	{	1187	{
1144	while (self->texs <= texid)	1188	while (self->texs <= texid)
1145	{	1189	{
1146	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1170	// from transparent color bleeding and ugly wrapping effects.	1214	// from transparent color bleeding and ugly wrapping effects.
1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172	}	1216	}
1173		1217
1174	int	1218	int
1175	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1176	ALIAS:	1220	ALIAS:
1177	oy = 1	1221	oy = 1
1178	x = 2	1222	x = 2
1179	y = 3	1223	y = 3
1180	w = 4	1224	w = 4
…		…
1191	}	1235	}
1192	OUTPUT:	1236	OUTPUT:
1193	RETVAL	1237	RETVAL
1194		1238
1195	void	1239	void
1196	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1197	CODE:	1241	CODE:
1198	{	1242	{
1199	if (dx > 0)	1243	if (dx > 0)
1200	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1201	else if (dx < 0)	1245	else if (dx < 0)
…		…
1217	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1218	}	1262	}
1219	}	1263	}
1220		1264
1221	void	1265	void
1222	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223	CODE:	1267	CODE:
1224	{	1268	{
1225	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1226	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1227	mapcell *cell;	1271	mapcell *cell;
…		…
1229		1273
1230	while (data < data_end)	1274	while (data < data_end)
1231	{	1275	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1233		1277
1234	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1236		1280
1237	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1238		1282
1239	if (flags & 15)	1283	if (flags & 15)
1240	{	1284	{
1241	if (cell->darkness < 0)	1285	if (!cell->darkness)
1242	{	1286	{
1243	cell->darkness = 0;	1287	cell->darkness = 256;
1244	cell->face [0] = 0;	1288	cell->face [0] = 0;
1245	cell->face [1] = 0;	1289	cell->face [1] = 0;
1246	cell->face [2] = 0;	1290	cell->face [2] = 0;
1247	}	1291	}
1248		1292
1249	cell->darkness = flags & 8 ? *data++ : 255;
1250
1251	//TODO: don't trust server data to be in-range(!)	1293	//TODO: don't trust server data to be in-range(!)
		1294
		1295	if (flags & 8)
		1296	{
		1297	if (extmap)
		1298	{
		1299	uint8_t ext, cmd;
		1300
		1301	do
		1302	{
		1303	ext = *data++;
		1304	cmd = ext & 0x7f;
		1305
		1306	if (ext < 4)
		1307	cell->darkness = 255 - ext * 64 + 1;
		1308	else if (ext == 5) // health
		1309	cell->stat_hp = *data++;
		1310	}
		1311	while (cmd & 0x80);
		1312	}
		1313	else
		1314	cell->darkness = *data++ + 1;
		1315	}
1252		1316
1253	if (flags & 4)	1317	if (flags & 4)
1254	{	1318	{
1255	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1319	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1256	}	1320	}
…		…
1264	{	1328	{
1265	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1329	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1266	}	1330	}
1267	}	1331	}
1268	else	1332	else
1269	cell->darkness = -1;	1333	cell->darkness = 0;
1270	}	1334	}
1271	}	1335	}
1272		1336
1273	SV *	1337	SV *
1274	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1338	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275	CODE:	1339	CODE:
1276	{	1340	{
1277	int x1, x;	1341	int x1, x;
1278	int y1, y;	1342	int y1, y;
1279	int z;	1343	int z;
…		…
1329	}	1393	}
1330	OUTPUT:	1394	OUTPUT:
1331	RETVAL	1395	RETVAL
1332		1396
1333	void	1397	void
1334	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1398	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335	PPCODE:	1399	CODE:
1336	{	1400	{
1337	int vx, vy;	1401	int vx, vy;
1338	int x, y, z;	1402	int x, y, z;
1339	int last_name;	1403	int last_name;
1340	mapface face;	1404	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1343	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1344		1405
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1408
1352	/*	1409	/*
1353	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1412	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1359	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1416	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/	1417	*/
1361		1418
1362	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1363		1420
		1421	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1425
1369	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1370		1427
…		…
1378		1435
1379	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1438	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1383
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387		1440
1388	face = cell->face [z];	1441	face = cell->face [z];
1389		1442
1390	if (face)	1443	if (face)
1391	{	1444	{
…		…
1412		1465
1413	glEnd ();	1466	glEnd ();
1414		1467
1415	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1416	glDisable (GL_BLEND);	1469	glDisable (GL_BLEND);
		1470	}
		1471
		1472	void
		1473	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1474	CODE:
		1475	{
		1476	static float color[16][3] = {
		1477	{ 0.00F, 0.00F, 0.00F },
		1478	{ 1.00F, 1.00F, 1.00F },
		1479	{ 0.00F, 0.00F, 0.55F },
		1480	{ 1.00F, 0.00F, 0.00F },
		1481
		1482	{ 1.00F, 0.54F, 0.00F },
		1483	{ 0.11F, 0.56F, 1.00F },
		1484	{ 0.93F, 0.46F, 0.00F },
		1485	{ 0.18F, 0.54F, 0.34F },
		1486
		1487	{ 0.56F, 0.73F, 0.56F },
		1488	{ 0.80F, 0.80F, 0.80F },
		1489	{ 0.55F, 0.41F, 0.13F },
		1490	{ 0.99F, 0.77F, 0.26F },
		1491
		1492	{ 0.74F, 0.65F, 0.41F },
		1493
		1494	{ 0.00F, 1.00F, 1.00F },
		1495	{ 1.00F, 0.00F, 1.00F },
		1496	{ 1.00F, 1.00F, 0.00F },
		1497	};
		1498
		1499	int x, y;
		1500
		1501	glEnable (GL_TEXTURE_2D);
		1502	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1503	glEnable (GL_BLEND);
		1504	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1505	glBegin (GL_QUADS);
		1506
		1507	for (y = 0; y < h; y++)
		1508	for (x = 0; x < w; x++)
		1509	{
		1510	unsigned char m = data [x + y * w];
		1511
		1512	if (m)
		1513	{
		1514	float *c = color [m & 15];
		1515
		1516	float tx1 = m & 0x40 ? 0.5 : 0.;
		1517	float tx2 = tx1 + 0.5;
		1518
		1519	glColor4f (c[0], c[1], c[2], 0.75);
		1520	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1521	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1522	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1523	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1524	}
		1525	}
		1526
		1527	glEnd ();
		1528	glDisable (GL_BLEND);
		1529	glDisable (GL_TEXTURE_2D);
		1530	}
		1531
		1532	void
		1533	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1534	PPCODE:
		1535	{
		1536	int vx, vy;
		1537	int x, y;
		1538	int sw4 = (sw + 3) & ~3;
		1539	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1540	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1541
		1542	memset (darkness, 255, sw4 * sh);
		1543	SvPOK_only (darkness_sv);
		1544	SvCUR_set (darkness_sv, sw4 * sh);
		1545
		1546	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1547	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1548
		1549	for (y = 0; y < sh; y++)
		1550	if (0 <= y + vy && y + vy < self->rows)
		1551	{
		1552	maprow *row = self->row + (y + vy);
		1553
		1554	for (x = 0; x < sw; x++)
		1555	if (row->c0 <= x + vx && x + vx < row->c1)
		1556	{
		1557	mapcell *cell = row->col + (x + vx - row->c0);
		1558
		1559	darkness[y * sw4 + x] = cell->darkness
		1560	? 255 - cell->darkness + 1
		1561	: 255 - FOW_DARKNESS;
		1562	}
		1563	}
1417		1564
1418	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1422	}	1569	}
1423		1570
1424	SV *	1571	SV *
1425	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1572	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426	CODE:	1573	CODE:
1427	{	1574	{
1428	int x, y, x1, y1;	1575	int x, y, x1, y1;
1429	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1430	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1492	}	1639	}
1493	OUTPUT:	1640	OUTPUT:
1494	RETVAL	1641	RETVAL
1495		1642
1496	void	1643	void
1497	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1644	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498	PPCODE:	1645	PPCODE:
1499	{	1646	{
1500	int x, y, z;	1647	int x, y, z;
1501	int w, h;	1648	int w, h;
1502	int x1, y1;	1649	int x1, y1;
…		…
1534		1681
1535	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1536	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1537	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1538		1685
1539	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1540	{	1687	{
1541	cell->darkness = -1;	1688	cell->darkness = 0;
1542		1689
1543	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1544	{	1691	{
1545	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1546		1693
…		…
1551	}	1698	}
1552	}	1699	}
1553	}	1700	}
1554	}	1701	}
1555		1702
1556	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557		1704
1558	CFClient::MixChunk	1705	CFPlus::MixChunk
1559	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1560	CODE:	1707	CODE:
1561	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1562	OUTPUT:	1709	OUTPUT:
1563	RETVAL	1710	RETVAL
1564		1711
1565	void	1712	void
1566	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1567	CODE:	1714	CODE:
1568	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1569		1716
1570	int	1717	int
1571	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1572	CODE:	1719	CODE:
1573	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1574	OUTPUT:	1721	OUTPUT:
1575	RETVAL	1722	RETVAL
1576		1723
1577	int	1724	int
1578	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1725	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579	CODE:	1726	CODE:
1580	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581	OUTPUT:	1728	OUTPUT:
1582	RETVAL	1729	RETVAL
1583		1730
1584	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585		1732
1586	int	1733	int
1587	volume (int volume = -1)	1734	volume (int volume = -1)
1588	CODE:	1735	CODE:
1589	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1590	OUTPUT:	1737	OUTPUT:
1591	RETVAL	1738	RETVAL
1592		1739
1593	CFClient::MixMusic	1740	CFPlus::MixMusic
1594	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1595	CODE:	1742	CODE:
1596	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1597	OUTPUT:	1744	OUTPUT:
1598	RETVAL	1745	RETVAL
1599		1746
1600	void	1747	void
1601	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1602	CODE:	1749	CODE:
1603	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1604		1751
1605	int	1752	int
1606	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1607	CODE:	1754	CODE:
1608	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1609	OUTPUT:	1756	OUTPUT:
1610	RETVAL	1757	RETVAL
1611		1758
1612	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613		1760
1614	BOOT:	1761	BOOT:
1615	{	1762	{
1616	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617	static const struct {	1764	static const struct {
1618	const char *name;	1765	const char *name;
1619	IV iv;	1766	IV iv;
1620	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1621	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
…		…
1628	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1776	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1777	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1778	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1782	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1786	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1789	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1642	const_iv (GL_RGBA),	1791	const_iv (GL_RGBA),
		1792	const_iv (GL_RGBA4),
		1793	const_iv (GL_RGBA8),
		1794	const_iv (GL_RGB5_A1),
1643	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1796	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1797	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1799	const_iv (GL_INTENSITY),
…		…
1679	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1680	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1681	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1682	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1683	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
1684	const_iv (GL_LINE_LOOP),	1837	const_iv (GL_LINE_LOOP),
1685	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1686	const_iv (GL_QUAD_STRIP),	1839	const_iv (GL_QUAD_STRIP),
1687	const_iv (GL_TRIANGLES),	1840	const_iv (GL_TRIANGLES),
1688	const_iv (GL_TRIANGLE_STRIP),	1841	const_iv (GL_TRIANGLE_STRIP),
…		…
1756		1909
1757	void glPopMatrix ()	1910	void glPopMatrix ()
1758		1911
1759	void glLoadIdentity ()	1912	void glLoadIdentity ()
1760		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
		1917
1761	# near_ and far_ are due to microsofts buggy "c" compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
1762	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1919	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1763		1920
1764	# near_ and far_ are due to microsofts buggy "c" compiler	1921	# near_ and far_ are due to microsofts buggy "c" compiler
1765	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1922	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1794	r *= a;	1951	r *= a;
1795	g *= a;	1952	g *= a;
1796	b *= a;	1953	b *= a;
1797	}	1954	}
1798	// microsoft visual "c" rounds instead of truncating...	1955	// microsoft visual "c" rounds instead of truncating...
1799	glColor4ub (MIN ((int)(r * 256.f), 255),	1956	glColor4f (r, g, b, a);
1800	MIN ((int)(g * 256.f), 255),
1801	MIN ((int)(b * 256.f), 255),
1802	MIN ((int)(a * 256.f), 255));
1803		1957
1804	void glInterleavedArrays (int format, int stride, char *data)	1958	void glInterleavedArrays (int format, int stride, char *data)
1805		1959
1806	void glDrawElements (int mode, int count, int type, char *indices)	1960	void glDrawElements (int mode, int count, int type, char *indices)
1807		1961
…		…
1884		2038
1885	void glEndList ()	2039	void glEndList ()
1886		2040
1887	void glCallList (int list)	2041	void glCallList (int list)
1888		2042
1889

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC vs. Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC