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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 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
…		…
302	ev.data2 = 0;	340	ev.data2 = 0;
303		341
304	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
305	}	343	}
306		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n \|= n >> 1;
		354	n \|= n >> 2;
		355	n \|= n >> 4;
		356	n \|= n >> 8;
		357	n \|= n >> 16;
		358
		359	return n + 1;
		360	}
		361
307	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
308		363
309	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
310		365
311	BOOT:	366	BOOT:
312	{	367	{
313	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
314	static const struct {	369	static const struct {
315	const char *name;	370	const char *name;
316	IV iv;	371	IV iv;
317	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
318	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
419		474
420	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; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422	}	477	}
423		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
424	void	490	void
425	pango_init ()	491	pango_init ()
426	CODE:	492	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	493	{
429	{
430	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
431	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);
432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433	}
434	{
435	cairo_font_options_t *fopt = cairo_font_options_create ();
436	cairo_fontmap = pango_cairo_font_map_get_default ();
437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438	#ifdef _WIN32
439	// cairo looks like shit eaten twice on windows
440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441	#else
442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443	#endif
444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446	pango_cairo_context_set_font_options (cairo_context, fopt);
447	cairo_font_options_destroy (fopt);
448	}
449	}	497	}
450		498
451	int	499	int
452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
453		501
454	void	502	void
455	SDL_Quit ()	503	SDL_Quit ()
456		504
457	void	505	void
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		515
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		518
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475		523
476	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
477		529
478	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480		532
481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
568	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570	break;	622	break;
571	}	623	}
572		624
573	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574	}	626	}
575	}	627	}
576		628
577	int	629	int
578	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)
…		…
594	#endif	646	#endif
595		647
596	void	648	void
597	add_font (char *file)	649	add_font (char *file)
598	CODE:	650	CODE:
599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600	#ifdef _WIN32
601	// cairo... sigh... requires win2000
602	AddFontResourceEx (file, FR_PRIVATE, 0);
603	#endif
604		652
605	void	653	void
606	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
607	ALIAS:	655	ALIAS:
608	load_image_file = 1	656	load_image_file = 1
…		…
650		698
651	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652		700
653	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
654		702
		703	SDL_LockSurface (surface2);
655	EXTEND (SP, 5);	704	EXTEND (SP, 6);
656	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
657	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
658	SDL_LockSurface (surface2);
659	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660	SDL_UnlockSurface (surface2);
661	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)));
662	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
664		712
665	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
666	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
667	}	715	}
668		716
…		…
711	void	759	void
712	_exit (int retval)	760	_exit (int retval)
713	CODE:	761	CODE:
714	_exit (retval);	762	_exit (retval);
715		763
716	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
717		765
718	CFClient::Font	766	CFPlus::Font
719	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
720	CODE:	768	CODE:
721	{	769	{
722	int count;	770	int count;
723	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
726	}	774	}
727	OUTPUT:	775	OUTPUT:
728	RETVAL	776	RETVAL
729		777
730	void	778	void
731	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
732	CODE:	780	CODE:
733	pango_font_description_free (self);	781	pango_font_description_free (self);
734		782
735	void	783	void
736	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
737	CODE:	785	CODE:
738	default_font = self;	786	default_font = self;
739		787
740	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
741		789
742	CFClient::Layout	790	void
743	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
744	CODE:	797	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
746		799
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	801	RETVAL->r = 1.;
750	RETVAL->g = 1.;	802	RETVAL->g = 1.;
751	RETVAL->b = 1.;	803	RETVAL->b = 1.;
752	RETVAL->a = 1.;	804	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
757	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
758	OUTPUT:	810	OUTPUT:
759	RETVAL	811	RETVAL
760		812
761	void	813	void
762	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
763	CODE:	815	CODE:
764	g_object_unref (self->pl);	816	g_object_unref (self->pl);
765	Safefree (self);	817	Safefree (self);
766		818
767	int
768	is_rgba (CFClient::Layout self)
769	CODE:
770	RETVAL = self->rgba;
771	OUTPUT:
772	RETVAL
773
774	void	819	void
775	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
776	CODE:	821	CODE:
777	{	822	{
778	STRLEN textlen;	823	STRLEN textlen;
779	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
780		825
781	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
782	}	827	}
783		828
784	void	829	void
785	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
786	CODE:	831	CODE:
787	{	832	{
788	STRLEN textlen;	833	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
790		835
791	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
792	}	837	}
793		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
794	SV *	924	SV *
795	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
796	CODE:	926	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798	sv_utf8_decode (RETVAL);	928	sv_utf8_decode (RETVAL);
799	OUTPUT:	929	OUTPUT:
800	RETVAL	930	RETVAL
801		931
802	void	932	void
803	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.)
804	CODE:	934	CODE:
805	self->r = r;	935	self->r = r;
806	self->g = g;	936	self->g = g;
807	self->b = b;	937	self->b = b;
808	self->a = a;	938	self->a = a;
809		939
810	void	940	void
811	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812	CODE:	942	CODE:
813	if (self->font != font)	943	if (self->font != font)
814	{	944	{
815	self->font = font;	945	self->font = font;
816	layout_update_font (self);	946	layout_update_font (self);
817	}	947	}
818		948
819	void	949	void
820	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
821	CODE:	951	CODE:
822	if (self->base_height != base_height)	952	if (self->base_height != base_height)
823	{	953	{
824	self->base_height = base_height;	954	self->base_height = base_height;
825	layout_update_font (self);	955	layout_update_font (self);
826	}	956	}
827		957
828	void	958	void
829	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
830	CODE:	960	CODE:
831	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);
832		962
833	void	963	void
834	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
835	CODE:	965	CODE:
836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837		967
838	void	968	void
839	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
840	CODE:	970	CODE:
841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842		972
843	void	973	void
844	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
845	CODE:	975	CODE:
846	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
847	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
850	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
851	);	981	);
852		982
853	void	983	void
854	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
855	CODE:	985	CODE:
856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857		987
858	void	988	void
859	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
860	PPCODE:	990	PPCODE:
861	{	991	{
862	int w, h;	992	int w, h;
863		993
864	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
869	}	999	}
870		1000
871	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
872	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
873	CODE:	1015	CODE:
874	{	1016	{
875	int index, trailing;	1017	int index, trailing;
876	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);
877	RETVAL = index;	1019	RETVAL = index;
878	}	1020	}
879	OUTPUT:	1021	OUTPUT:
880	RETVAL	1022	RETVAL
881		1023
882	void	1024	void
883	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
884	PPCODE:	1026	PPCODE:
885	{	1027	{
886	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
887	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888		1030
…		…
891	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1035	}
894		1036
895	void	1037	void
896	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
897	PPCODE:	1039	PPCODE:
898	{	1040	pango_opengl_render_layout_subpixel (
899	SV *retval;	1041	self->pl,
900	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
		1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
901		1046
902	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
903		1048
904	if (self->rgba)	1049	void
		1050	pad2pot (SV data_, SV w_, SV *h_)
		1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
		1055
		1056	if (ow && oh)
905	{	1057	{
906	cairo_surface_t *surface;	1058	int nw = minpot (ow);
907	cairo_t *cairo;	1059	int nh = minpot (oh);
908		1060
909	retval = newSV (w * h * 4);	1061	if (nw != ow \|\| nh != oh)
910	SvPOK_only (retval);
911	SvCUR_set (retval, w * h * 4);
912
913	memset (SvPVX (retval), 0, w * h * 4);
914
915	surface = cairo_image_surface_create_for_data (
916	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
917	cairo = cairo_create (surface);
918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920	pango_cairo_show_layout (cairo, self->pl);
921
922	cairo_destroy (cairo);
923	cairo_surface_destroy (surface);
924
925	// what a mess, and its premultiplied, too :(
926	{	1062	{
927	uint32_t p = (uint32_t )SvPVX (retval);	1063	if (SvOK (data_))
928	uint32_t e = p + w h;
929
930	while (p < e)
931	{	1064	{
932	uint32_t rgba = *p;	1065	STRLEN datalen;
933	rgba = (rgba >> 24) \| (rgba << 8);	1066	char *data = SvPVbyte (data_, datalen);
934	#if 0	1067	int bpp = datalen / (ow * oh);
935	#ifdef _WIN32	1068	SV result_ = sv_2mortal (newSV (nw nh * bpp));
936	{//D
937	uint8_t r = rgba >> 24;
938	uint8_t g = rgba >> 16;
939	uint8_t b = rgba >> 8;
940	uint8_t a = rgba >> 0;
941		1069
942	rgba = (rgba & 0xffffff00) \| a;	1070	SvPOK_only (result_);
		1071	SvCUR_set (result_, nw * nh * bpp);
		1072
		1073	memset (SvPVX (result_), 0, nw * nh * bpp);
		1074	while (oh--)
		1075	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1076
		1077	sv_setsv (data_, result_);
943	}	1078	}
944	#endif	1079
945	#endif	1080	sv_setiv (w_, nw);
946	rgba = SDL_SwapBE32 (rgba);	1081	sv_setiv (h_, nh);
947	*p++ = rgba;
948	}	1082	}
949	}
950
951	EXTEND (SP, 5);
952	PUSHs (sv_2mortal (newSViv (w)));
953	PUSHs (sv_2mortal (newSViv (h)));
954	PUSHs (sv_2mortal (retval));
955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957	}	1083	}
958	else
959	{
960	FT_Bitmap bitmap;
961
962	retval = newSV (w * h);
963	SvPOK_only (retval);
964	SvCUR_set (retval, w * h);
965
966	bitmap.rows = h;
967	bitmap.width = w;
968	bitmap.pitch = w;
969	bitmap.buffer = (unsigned char*)SvPVX (retval);
970	bitmap.num_grays = 256;
971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973	memset (bitmap.buffer, 0, w * h);
974
975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977	EXTEND (SP, 5);
978	PUSHs (sv_2mortal (newSViv (w)));
979	PUSHs (sv_2mortal (newSViv (h)));
980	PUSHs (sv_2mortal (retval));
981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983	}
984	}	1084	}
985		1085
986	MODULE = CFClient PACKAGE = CFClient::Texture
987
988	void	1086	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1087	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
991	ALIAS:	1089	ALIAS:
992	draw_quad_alpha = 1	1090	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1091	draw_quad_alpha_premultiplied = 2
994	CODE:	1092	CODE:
…		…
1032	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1033	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1034	}	1132	}
1035	}	1133	}
1036		1134
1037	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1038		1136
1039	CFClient::Map	1137	CFPlus::Map
1040	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1041	CODE:	1139	CODE:
1042	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1043	RETVAL->x = 0;	1141	RETVAL->x = 0;
1044	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1054	RETVAL->row = 0;	1152	RETVAL->row = 0;
1055	OUTPUT:	1153	OUTPUT:
1056	RETVAL	1154	RETVAL
1057		1155
1058	void	1156	void
1059	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1060	CODE:	1158	CODE:
1061	{	1159	{
1062	map_clear (self);	1160	map_clear (self);
1063	Safefree (self->face);	1161	Safefree (self->face);
1064	Safefree (self->tex);	1162	Safefree (self->tex);
1065	Safefree (self);	1163	Safefree (self);
1066	}	1164	}
1067		1165
1068	void	1166	void
1069	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1070	CODE:	1168	CODE:
1071	map_clear (self);	1169	map_clear (self);
1072		1170
1073	void	1171	void
1074	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1075	CODE:	1173	CODE:
1076	{	1174	{
1077	while (self->faces <= face)	1175	while (self->faces <= face)
1078	{	1176	{
1079	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1082		1180
1083	self->face [face] = texid;	1181	self->face [face] = texid;
1084	}	1182	}
1085		1183
1086	void	1184	void
1087	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)
1088	CODE:	1186	CODE:
1089	{	1187	{
1090	while (self->texs <= texid)	1188	while (self->texs <= texid)
1091	{	1189	{
1092	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1116	// from transparent color bleeding and ugly wrapping effects.	1214	// from transparent color bleeding and ugly wrapping effects.
1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118	}	1216	}
1119		1217
1120	int	1218	int
1121	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1122	ALIAS:	1220	ALIAS:
1123	oy = 1	1221	oy = 1
1124	x = 2	1222	x = 2
1125	y = 3	1223	y = 3
1126	w = 4	1224	w = 4
…		…
1137	}	1235	}
1138	OUTPUT:	1236	OUTPUT:
1139	RETVAL	1237	RETVAL
1140		1238
1141	void	1239	void
1142	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1143	CODE:	1241	CODE:
1144	{	1242	{
1145	if (dx > 0)	1243	if (dx > 0)
1146	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1147	else if (dx < 0)	1245	else if (dx < 0)
…		…
1163	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1164	}	1262	}
1165	}	1263	}
1166		1264
1167	void	1265	void
1168	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1169	CODE:	1267	CODE:
1170	{	1268	{
1171	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1172	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1173	mapcell *cell;	1271	mapcell *cell;
…		…
1175		1273
1176	while (data < data_end)	1274	while (data < data_end)
1177	{	1275	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1179		1277
1180	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1182		1280
1183	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1184		1282
1185	if (flags & 15)	1283	if (flags & 15)
1186	{	1284	{
1187	if (cell->darkness < 0)	1285	if (!cell->darkness)
1188	{	1286	{
1189	cell->darkness = 0;	1287	cell->darkness = 256;
1190	cell->face [0] = 0;	1288	cell->face [0] = 0;
1191	cell->face [1] = 0;	1289	cell->face [1] = 0;
1192	cell->face [2] = 0;	1290	cell->face [2] = 0;
1193	}	1291	}
1194		1292
1195	cell->darkness = flags & 8 ? *data++ : 255;
1196
1197	//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	}
1198		1316
1199	if (flags & 4)	1317	if (flags & 4)
1200	{	1318	{
1201	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;
1202	}	1320	}
…		…
1210	{	1328	{
1211	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;
1212	}	1330	}
1213	}	1331	}
1214	else	1332	else
1215	cell->darkness = -1;	1333	cell->darkness = 0;
1216	}	1334	}
1217	}	1335	}
1218		1336
1219	SV *	1337	SV *
1220	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)
1221	CODE:	1339	CODE:
1222	{	1340	{
1223	int x1, x;	1341	int x1, x;
1224	int y1, y;	1342	int y1, y;
1225	int z;	1343	int z;
…		…
1275	}	1393	}
1276	OUTPUT:	1394	OUTPUT:
1277	RETVAL	1395	RETVAL
1278		1396
1279	void	1397	void
1280	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)
1281	PPCODE:	1399	CODE:
1282	{	1400	{
1283	int vx, vy;	1401	int vx, vy;
1284	int x, y, z;	1402	int x, y, z;
1285	int last_name;	1403	int last_name;
1286	mapface face;	1404	mapface face;
1287	int sw4 = (sw + 3) & ~3;
1288	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1289	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1290		1405
1291	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);
1294
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297		1408
1298	/*	1409	/*
1299	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1301	: 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));
…		…
1305	: 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));
1306	*/	1417	*/
1307		1418
1308	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1309		1420
		1421	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1425
1315	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1316		1427
…		…
1324		1435
1325	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1438	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1329
1330	darkness[y * sw4 + x] = cell->darkness < 0
1331	? 255 - FOW_DARKNESS
1332	: 255 - cell->darkness;
1333		1440
1334	face = cell->face [z];	1441	face = cell->face [z];
1335		1442
1336	if (face)	1443	if (face)
1337	{	1444	{
…		…
1358		1465
1359	glEnd ();	1466	glEnd ();
1360		1467
1361	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1362	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	}
1363		1564
1364	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1368	}	1569	}
1369		1570
1370	SV *	1571	SV *
1371	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)
1372	CODE:	1573	CODE:
1373	{	1574	{
1374	int x, y, x1, y1;	1575	int x, y, x1, y1;
1375	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1376	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1438	}	1639	}
1439	OUTPUT:	1640	OUTPUT:
1440	RETVAL	1641	RETVAL
1441		1642
1442	void	1643	void
1443	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)
1444	PPCODE:	1645	PPCODE:
1445	{	1646	{
1446	int x, y, z;	1647	int x, y, z;
1447	int w, h;	1648	int w, h;
1448	int x1, y1;	1649	int x1, y1;
…		…
1480		1681
1481	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1482	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1483	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1484		1685
1485	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1486	{	1687	{
1487	cell->darkness = -1;	1688	cell->darkness = 0;
1488		1689
1489	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1490	{	1691	{
1491	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1492		1693
…		…
1497	}	1698	}
1498	}	1699	}
1499	}	1700	}
1500	}	1701	}
1501		1702
1502	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503		1704
1504	CFClient::MixChunk	1705	CFPlus::MixChunk
1505	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1506	CODE:	1707	CODE:
1507	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1508	OUTPUT:	1709	OUTPUT:
1509	RETVAL	1710	RETVAL
1510		1711
1511	void	1712	void
1512	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1513	CODE:	1714	CODE:
1514	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1515		1716
1516	int	1717	int
1517	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1518	CODE:	1719	CODE:
1519	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1520	OUTPUT:	1721	OUTPUT:
1521	RETVAL	1722	RETVAL
1522		1723
1523	int	1724	int
1524	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)
1525	CODE:	1726	CODE:
1526	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527	OUTPUT:	1728	OUTPUT:
1528	RETVAL	1729	RETVAL
1529		1730
1530	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531		1732
1532	int	1733	int
1533	volume (int volume = -1)	1734	volume (int volume = -1)
1534	CODE:	1735	CODE:
1535	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1536	OUTPUT:	1737	OUTPUT:
1537	RETVAL	1738	RETVAL
1538		1739
1539	CFClient::MixMusic	1740	CFPlus::MixMusic
1540	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1541	CODE:	1742	CODE:
1542	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1543	OUTPUT:	1744	OUTPUT:
1544	RETVAL	1745	RETVAL
1545		1746
1546	void	1747	void
1547	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1548	CODE:	1749	CODE:
1549	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1550		1751
1551	int	1752	int
1552	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1553	CODE:	1754	CODE:
1554	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1555	OUTPUT:	1756	OUTPUT:
1556	RETVAL	1757	RETVAL
1557		1758
1558	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559		1760
1560	BOOT:	1761	BOOT:
1561	{	1762	{
1562	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563	static const struct {	1764	static const struct {
1564	const char *name;	1765	const char *name;
1565	IV iv;	1766	IV iv;
1566	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1567	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
…		…
1574	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1776	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1777	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1778	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1782	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1786	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1789	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1588	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),
1589	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1796	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1797	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1799	const_iv (GL_INTENSITY),
…		…
1625	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1626	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1627	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1628	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1629	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
1630	const_iv (GL_LINE_LOOP),	1837	const_iv (GL_LINE_LOOP),
1631	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1632	const_iv (GL_QUAD_STRIP),	1839	const_iv (GL_QUAD_STRIP),
1633	const_iv (GL_TRIANGLES),	1840	const_iv (GL_TRIANGLES),
1634	const_iv (GL_TRIANGLE_STRIP),	1841	const_iv (GL_TRIANGLE_STRIP),
…		…
1667	OUTPUT:	1874	OUTPUT:
1668	RETVAL	1875	RETVAL
1669		1876
1670	int glGetError ()	1877	int glGetError ()
1671		1878
		1879	void glFinish ()
		1880
1672	void glClear (int mask)	1881	void glClear (int mask)
1673		1882
1674	void glClearColor (float r, float g, float b, float a = 1.0)	1883	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	1884	PROTOTYPE: @
1676		1885
…		…
1699	void glPushMatrix ()	1908	void glPushMatrix ()
1700		1909
1701	void glPopMatrix ()	1910	void glPopMatrix ()
1702		1911
1703	void glLoadIdentity ()	1912	void glLoadIdentity ()
		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
1704		1917
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
1706	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_)
1707		1920
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1921	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1738	r *= a;	1951	r *= a;
1739	g *= a;	1952	g *= a;
1740	b *= a;	1953	b *= a;
1741	}	1954	}
1742	// microsoft visual "c" rounds instead of truncating...	1955	// microsoft visual "c" rounds instead of truncating...
1743	glColor4ub (MIN ((int)(r * 256.f), 255),	1956	glColor4f (r, g, b, a);
1744	MIN ((int)(g * 256.f), 255),
1745	MIN ((int)(b * 256.f), 255),
1746	MIN ((int)(a * 256.f), 255));
1747		1957
1748	void glInterleavedArrays (int format, int stride, char *data)	1958	void glInterleavedArrays (int format, int stride, char *data)
1749		1959
1750	void glDrawElements (int mode, int count, int type, char *indices)	1960	void glDrawElements (int mode, int count, int type, char *indices)
1751		1961
…		…
1828		2038
1829	void glEndList ()	2039	void glEndList ()
1830		2040
1831	void glCallList (int list)	2041	void glCallList (int list)
1832		2042
1833

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.112 by root, Mon Jun 12 14:55:41 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.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC