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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 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>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#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
52		64
53	static struct	65	static struct
54	{	66	{
55	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	68	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	78	else
67	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
68	}	80	}
69		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
70	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
72		90
73	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	}
74		110
75	typedef struct cf_layout {	111	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
79	int base_height;	114	int base_height;
80	CFClient__Font font;	115	CFPlus__Font font;
81	} *CFClient__Layout;	116	} *CFPlus__Layout;
82		117
83	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
86		121
87	static void	122	static void
88	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
89	{	124	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	128	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	130	}
97		131
98	static void	132	static void
99	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
100	{	134	{
101	/* 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
102	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
103	*/	137	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		142
109	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
110	}	144	}
111		145
112	static void	146	static void
113	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
114	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
116		153
117	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		156
120	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;
121	}	162	}
122		163
123	typedef uint16_t mapface;	164	typedef uint16_t mapface;
124		165
125	typedef struct {	166	typedef struct {
…		…
128	float s, t;	169	float s, t;
129	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
130	} maptex;	171	} maptex;
131		172
132	typedef struct {	173	typedef struct {
133	int16_t darkness;	174	uint16_t darkness;
134	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
135	} mapcell;	177	} mapcell;
136		178
137	typedef struct {	179	typedef struct {
138	int32_t c0, c1;	180	int32_t c0, c1;
139	mapcell *col;	181	mapcell *col;
…		…
148	int texs;	190	int texs;
149	maptex *tex;	191	maptex *tex;
150		192
151	int32_t rows;	193	int32_t rows;
152	maprow *row;	194	maprow *row;
153	} *CFClient__Map;	195	} *CFPlus__Map;
154		196
155	static char *	197	static char *
156	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
157	{	199	{
158	char *p;	200	char *p;
…		…
176		218
177	#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))
178	#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))
179		221
180	static maprow *	222	static maprow *
181	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
182	{	224	{
183	if (0 > y)	225	if (0 > y)
184	{	226	{
185	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
224		266
225	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
226	}	268	}
227		269
228	static mapcell *	270	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
230	{	272	{
231	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
232	}	274	}
233		275
234	static void	276	static void
235	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
236	{	278	{
237	int r;	279	int r;
238		280
239	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
248	self->row = 0;	290	self->row = 0;
249	self->rows = 0;	291	self->rows = 0;
250	}	292	}
251		293
252	static void	294	static void
253	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)
254	{	296	{
255	int x, y;	297	int x, y;
256	maprow *row;	298	maprow *row;
257		299
258	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
267	if (x >= row->c0)	309	if (x >= row->c0)
268	{	310	{
269	if (x >= row->c1)	311	if (x >= row->c1)
270	break;	312	break;
271		313
272	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
273	}	315	}
274	}	316	}
275	}	317	}
276		318
277	static void	319	static void
…		…
298	ev.data2 = 0;	340	ev.data2 = 0;
299		341
300	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
301	}	343	}
302		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
303	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
304		363
305	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
306		365
307	BOOT:	366	BOOT:
308	{	367	{
309	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	369	static const struct {
311	const char *name;	370	const char *name;
312	IV iv;	371	IV iv;
313	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
415		474
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	477	}
419		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
420	void	490	void
421	pango_init ()	491	pango_init ()
422	CODE:	492	CODE:
423	{	493	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	497	}
432		498
433	int	499	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		501
436	void	502	void
437	SDL_Quit ()	503	SDL_Quit ()
438		504
439	void	505	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		515
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		518
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		523
458	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
459		529
460	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		532
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	622	break;
553	}	623	}
554		624
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	626	}
557	}	627	}
558		628
559	int	629	int
560	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)
…		…
576	#endif	646	#endif
577		647
578	void	648	void
579	add_font (char *file)	649	add_font (char *file)
580	CODE:	650	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		652
587	void	653	void
588	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
589	ALIAS:	655	ALIAS:
590	load_image_file = 1	656	load_image_file = 1
…		…
632		698
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		700
635	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
636		702
		703	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	704	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	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)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
646		712
647	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
649	}	715	}
650		716
…		…
686	CODE:	752	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	753	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	754	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	756	#endif
691	exit (1);	757	_exit (1);
692		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
693	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
694		765
695	CFClient::Font	766	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
697	CODE:	768	CODE:
698	{	769	{
699	int count;	770	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	774	}
704	OUTPUT:	775	OUTPUT:
705	RETVAL	776	RETVAL
706		777
707	void	778	void
708	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
709	CODE:	780	CODE:
710	pango_font_description_free (self);	781	pango_font_description_free (self);
711		782
712	void	783	void
713	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
714	CODE:	785	CODE:
715	default_font = self;	786	default_font = self;
716		787
717	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		789
719	CFClient::Layout	790	void
720	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
721	CODE:	792	CODE:
722	#if _WIN32	793	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	794
724	#endif	795	CFPlus::Layout
		796	new (SV *class)
		797	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
726		799
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	801	RETVAL->r = 1.;
730	RETVAL->g = 1.;	802	RETVAL->g = 1.;
731	RETVAL->b = 1.;	803	RETVAL->b = 1.;
732	RETVAL->a = 1.;	804	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
738	OUTPUT:	810	OUTPUT:
739	RETVAL	811	RETVAL
740		812
741	void	813	void
742	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
743	CODE:	815	CODE:
744	g_object_unref (self->pl);	816	g_object_unref (self->pl);
745	Safefree (self);	817	Safefree (self);
746		818
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	819	void
755	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	821	CODE:
757	{	822	{
758	STRLEN textlen;	823	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
760		825
761	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
762	}	827	}
763		828
764	void	829	void
765	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	831	CODE:
767	{	832	{
768	STRLEN textlen;	833	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
770		835
771	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
772	}	837	}
773		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
774	SV *	924	SV *
775	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
776	CODE:	926	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
779	OUTPUT:	929	OUTPUT:
780	RETVAL	930	RETVAL
781		931
782	void	932	void
783	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.)
784	CODE:	934	CODE:
785	self->r = r;	935	self->r = r;
786	self->g = g;	936	self->g = g;
787	self->b = b;	937	self->b = b;
788	self->a = a;	938	self->a = a;
789		939
790	void	940	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	942	CODE:
793	if (self->font != font)	943	if (self->font != font)
794	{	944	{
795	self->font = font;	945	self->font = font;
796	layout_update_font (self);	946	layout_update_font (self);
797	}	947	}
798		948
799	void	949	void
800	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
801	CODE:	951	CODE:
802	if (self->base_height != base_height)	952	if (self->base_height != base_height)
803	{	953	{
804	self->base_height = base_height;	954	self->base_height = base_height;
805	layout_update_font (self);	955	layout_update_font (self);
806	}	956	}
807		957
808	void	958	void
809	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	960	CODE:
811	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);
812		962
813	void	963	void
814	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
815	CODE:	965	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		967
818	void	968	void
819	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	970	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		972
823	void	973	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	975	CODE:
826	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
831	);	981	);
832		982
833	void	983	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	985	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		987
838	void	988	void
839	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
840	PPCODE:	990	PPCODE:
841	{	991	{
842	int w, h;	992	int w, h;
843		993
844	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
849	}	999	}
850		1000
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1015	CODE:
854	{	1016	{
855	int index, trailing;	1017	int index, trailing;
856	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);
857	RETVAL = index;	1019	RETVAL = index;
858	}	1020	}
859	OUTPUT:	1021	OUTPUT:
860	RETVAL	1022	RETVAL
861		1023
862	void	1024	void
863	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1026	PPCODE:
865	{	1027	{
866	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1030
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1035	}
874		1036
875	void	1037	void
876	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1039	PPCODE:
878	{	1040	pango_opengl_render_layout_subpixel (
879	SV *retval;	1041	self->pl,
880	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
		1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
881		1046
882	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1048
884	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)
885	{	1057	{
886	cairo_surface_t *surface;	1058	int nw = minpot (ow);
887	cairo_t *cairo;	1059	int nh = minpot (oh);
888		1060
889	retval = newSV (w * h * 4);	1061	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1062	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1063	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1064	{
912	uint32_t rgba = *p;	1065	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1066	char *data = SvPVbyte (data_, datalen);
914	#if 0	1067	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1068	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1069
922	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_);
923	}	1078	}
924	#endif	1079
925	#endif	1080	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1081	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1082	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1083	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1084	}
965		1085
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1086	void
969	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.)
970	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
971	ALIAS:	1089	ALIAS:
972	draw_quad_alpha = 1	1090	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1091	draw_quad_alpha_premultiplied = 2
974	CODE:	1092	CODE:
…		…
990		1108
991	if (ix == 2)	1109	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1110	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1111	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1112	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1113	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1114
997	glEnable (GL_ALPHA_TEST);	1115	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1116	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1117	}
1000		1118
…		…
1012	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1014	}	1132	}
1015	}	1133	}
1016		1134
1017	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1136
1019	CFClient::Map	1137	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1021	CODE:	1139	CODE:
1022	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1141	RETVAL->x = 0;
1024	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1152	RETVAL->row = 0;
1035	OUTPUT:	1153	OUTPUT:
1036	RETVAL	1154	RETVAL
1037		1155
1038	void	1156	void
1039	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1040	CODE:	1158	CODE:
1041	{	1159	{
1042	map_clear (self);	1160	map_clear (self);
1043	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
1044	Safefree (self);	1163	Safefree (self);
1045	}	1164	}
1046		1165
1047	void	1166	void
1048	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1049	CODE:	1168	CODE:
1050	map_clear (self);	1169	map_clear (self);
1051		1170
1052	void	1171	void
1053	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1173	CODE:
1055	{	1174	{
1056	while (self->faces <= face)	1175	while (self->faces <= face)
1057	{	1176	{
1058	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1180
1062	self->face [face] = texid;	1181	self->face [face] = texid;
1063	}	1182	}
1064		1183
1065	void	1184	void
1066	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)
1067	CODE:	1186	CODE:
1068	{	1187	{
1069	while (self->texs <= texid)	1188	while (self->texs <= texid)
1070	{	1189	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1214	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1216	}
1098		1217
1099	int	1218	int
1100	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1101	ALIAS:	1220	ALIAS:
1102	oy = 1	1221	oy = 1
1103	x = 2	1222	x = 2
1104	y = 3	1223	y = 3
1105	w = 4	1224	w = 4
…		…
1116	}	1235	}
1117	OUTPUT:	1236	OUTPUT:
1118	RETVAL	1237	RETVAL
1119		1238
1120	void	1239	void
1121	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1241	CODE:
1123	{	1242	{
1124	if (dx > 0)	1243	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1126	else if (dx < 0)	1245	else if (dx < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1143	}	1262	}
1144	}	1263	}
1145		1264
1146	void	1265	void
1147	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1267	CODE:
1149	{	1268	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1271	mapcell *cell;
…		…
1154		1273
1155	while (data < data_end)	1274	while (data < data_end)
1156	{	1275	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1158		1277
1159	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1161		1280
1162	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1163		1282
1164	if (flags & 15)	1283	if (flags & 15)
1165	{	1284	{
1166	if (cell->darkness < 0)	1285	if (!cell->darkness)
1167	{	1286	{
1168	cell->darkness = 0;	1287	cell->darkness = 256;
1169	cell->face [0] = 0;	1288	cell->face [0] = 0;
1170	cell->face [1] = 0;	1289	cell->face [1] = 0;
1171	cell->face [2] = 0;	1290	cell->face [2] = 0;
1172	}	1291	}
1173		1292
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//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	}
1177		1316
1178	if (flags & 4)	1317	if (flags & 4)
1179	{	1318	{
1180	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;
1181	}	1320	}
…		…
1189	{	1328	{
1190	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;
1191	}	1330	}
1192	}	1331	}
1193	else	1332	else
1194	cell->darkness = -1;	1333	cell->darkness = 0;
1195	}	1334	}
1196	}	1335	}
1197		1336
1198	SV *	1337	SV *
1199	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)
1200	CODE:	1339	CODE:
1201	{	1340	{
1202	int x1, x;	1341	int x1, x;
1203	int y1, y;	1342	int y1, y;
1204	int z;	1343	int z;
…		…
1254	}	1393	}
1255	OUTPUT:	1394	OUTPUT:
1256	RETVAL	1395	RETVAL
1257		1396
1258	void	1397	void
1259	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)
1260	PPCODE:	1399	CODE:
1261	{	1400	{
1262	int vx, vy;	1401	int vx, vy;
1263	int x, y, z;	1402	int x, y, z;
1264	int last_name;	1403	int last_name;
1265	mapface face;	1404	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1405
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1406	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1407	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1408
1277	/*	1409	/*
1278	int vx = self->vx = self->w >= sw	1410	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1411	? self->x + (self->w - sw) / 2
1280	: 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));
…		…
1284	: 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));
1285	*/	1417	*/
1286		1418
1287	glColor4ub (255, 255, 255, 255);	1419	glColor4ub (255, 255, 255, 255);
1288		1420
		1421	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1422	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1423	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1424	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1425
1294	glBegin (GL_QUADS);	1426	glBegin (GL_QUADS);
1295		1427
…		…
1303		1435
1304	for (x = 0; x < sw; x++)	1436	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1437	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1438	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1439	mapcell *cell = row->col + (x + vx - row->c0);
1308
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312		1440
1313	face = cell->face [z];	1441	face = cell->face [z];
1314		1442
1315	if (face)	1443	if (face)
1316	{	1444	{
…		…
1337		1465
1338	glEnd ();	1466	glEnd ();
1339		1467
1340	glDisable (GL_TEXTURE_2D);	1468	glDisable (GL_TEXTURE_2D);
1341	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	}
1342		1564
1343	EXTEND (SP, 3);	1565	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1566	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1567	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1568	PUSHs (darkness_sv);
1347	}	1569	}
1348		1570
1349	SV *	1571	SV *
1350	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)
1351	CODE:	1573	CODE:
1352	{	1574	{
1353	int x, y, x1, y1;	1575	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1576	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1577	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1639	}
1418	OUTPUT:	1640	OUTPUT:
1419	RETVAL	1641	RETVAL
1420		1642
1421	void	1643	void
1422	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)
1423	PPCODE:	1645	PPCODE:
1424	{	1646	{
1425	int x, y, z;	1647	int x, y, z;
1426	int w, h;	1648	int w, h;
1427	int x1, y1;	1649	int x1, y1;
…		…
1459		1681
1460	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1682	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1461	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1683	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1462	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1684	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1463		1685
1464	if (cell->darkness <= 0)	1686	if (cell->darkness <= 1)
1465	{	1687	{
1466	cell->darkness = -1;	1688	cell->darkness = 0;
1467		1689
1468	for (z = 0; z <= 2; z++)	1690	for (z = 0; z <= 2; z++)
1469	{	1691	{
1470	cell->face[z] = face[z];	1692	cell->face[z] = face[z];
1471		1693
…		…
1476	}	1698	}
1477	}	1699	}
1478	}	1700	}
1479	}	1701	}
1480		1702
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1703	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1704
1483	CFClient::MixChunk	1705	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1706	new_from_file (SV class, char path)
1485	CODE:	1707	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1708	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1709	OUTPUT:
1488	RETVAL	1710	RETVAL
1489		1711
1490	void	1712	void
1491	DESTROY (CFClient::MixChunk self)	1713	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1714	CODE:
1493	Mix_FreeChunk (self);	1715	Mix_FreeChunk (self);
1494		1716
1495	int	1717	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1718	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1719	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1720	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1721	OUTPUT:
1500	RETVAL	1722	RETVAL
1501		1723
1502	int	1724	int
1503	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)
1504	CODE:	1726	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1727	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1728	OUTPUT:
1507	RETVAL	1729	RETVAL
1508		1730
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1731	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1732
1511	int	1733	int
1512	volume (int volume = -1)	1734	volume (int volume = -1)
1513	CODE:	1735	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1736	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1737	OUTPUT:
1516	RETVAL	1738	RETVAL
1517		1739
1518	CFClient::MixMusic	1740	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1741	new_from_file (SV class, char path)
1520	CODE:	1742	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1743	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1744	OUTPUT:
1523	RETVAL	1745	RETVAL
1524		1746
1525	void	1747	void
1526	DESTROY (CFClient::MixMusic self)	1748	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1749	CODE:
1528	Mix_FreeMusic (self);	1750	Mix_FreeMusic (self);
1529		1751
1530	int	1752	int
1531	play (CFClient::MixMusic self, int loops = -1)	1753	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1754	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1755	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1756	OUTPUT:
1535	RETVAL	1757	RETVAL
1536		1758
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1759	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1760
1539	BOOT:	1761	BOOT:
1540	{	1762	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1763	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1764	static const struct {
1543	const char *name;	1765	const char *name;
1544	IV iv;	1766	IV iv;
1545	} *civ, const_iv[] = {	1767	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1768	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1775	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1776	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1777	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1778	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1779	const_iv (GL_RESCALE_NORMAL),
		1780	const_iv (GL_FRONT),
		1781	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1782	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1783	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1784	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1785	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1786	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1787	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1788	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1789	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1790	const_iv (GL_RGB),
1566	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),
1567	const_iv (GL_UNSIGNED_BYTE),	1795	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1796	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1797	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1798	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1799	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1831	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1832	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1833	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1834	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1835	const_iv (GL_LINES),
		1836	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1837	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1838	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1839	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1840	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1841	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1874	OUTPUT:
1646	RETVAL	1875	RETVAL
1647		1876
1648	int glGetError ()	1877	int glGetError ()
1649		1878
		1879	void glFinish ()
		1880
1650	void glClear (int mask)	1881	void glClear (int mask)
1651		1882
1652	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)
1653	PROTOTYPE: @	1884	PROTOTYPE: @
1654		1885
…		…
1677	void glPushMatrix ()	1908	void glPushMatrix ()
1678		1909
1679	void glPopMatrix ()	1910	void glPopMatrix ()
1680		1911
1681	void glLoadIdentity ()	1912	void glLoadIdentity ()
		1913
		1914	void glDrawBuffer (int buffer)
		1915
		1916	void glReadBuffer (int buffer)
1682		1917
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1918	# near_ and far_ are due to microsofts buggy "c" compiler
1684	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_)
1685		1920
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1921	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	1951	r *= a;
1717	g *= a;	1952	g *= a;
1718	b *= a;	1953	b *= a;
1719	}	1954	}
1720	// microsoft visual "c" rounds instead of truncating...	1955	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	1956	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		1957
1726	void glInterleavedArrays (int format, int stride, char *data)	1958	void glInterleavedArrays (int format, int stride, char *data)
1727		1959
1728	void glDrawElements (int mode, int count, int type, char *indices)	1960	void glDrawElements (int mode, int count, int type, char *indices)
1729		1961
…		…
1806		2038
1807	void glEndList ()	2039	void glEndList ()
1808		2040
1809	void glCallList (int list)	2041	void glCallList (int list)
1810		2042
1811

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 2006 UTC