[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.147 by root, Sat Aug 19 03:57:08 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_width, 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;
		299	mapcell *cell;
257		300
258	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
259	if (y >= 0)	302	if (y >= 0)
260	{	303	{
261	if (y >= self->rows)	304	if (y >= self->rows)
…		…
267	if (x >= row->c0)	310	if (x >= row->c0)
268	{	311	{
269	if (x >= row->c1)	312	if (x >= row->c1)
270	break;	313	break;
271		314
272	row->col[x - row->c0].darkness = -1;	315	cell = row->col + x - row->c0;
		316
		317	cell->darkness = 0;
		318	cell->stat_hp = 0;
273	}	319	}
274	}	320	}
275	}	321	}
276		322
277	static void	323	static void
…		…
298	ev.data2 = 0;	344	ev.data2 = 0;
299		345
300	SDL_PushEvent ((SDL_Event *)&ev);	346	SDL_PushEvent ((SDL_Event *)&ev);
301	}	347	}
302		348
		349	static unsigned int
		350	minpot (unsigned int n)
		351	{
		352	if (!n)
		353	return 0;
		354
		355	--n;
		356
		357	n \|= n >> 1;
		358	n \|= n >> 2;
		359	n \|= n >> 4;
		360	n \|= n >> 8;
		361	n \|= n >> 16;
		362
		363	return n + 1;
		364	}
		365
303	MODULE = CFClient PACKAGE = CFClient	366	MODULE = CFPlus PACKAGE = CFPlus
304		367
305	PROTOTYPES: ENABLE	368	PROTOTYPES: ENABLE
306		369
307	BOOT:	370	BOOT:
308	{	371	{
309	HV *stash = gv_stashpv ("CFClient", 1);	372	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	373	static const struct {
311	const char *name;	374	const char *name;
312	IV iv;	375	IV iv;
313	} *civ, const_iv[] = {	376	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	377	# define const_iv(name) { # name, (IV)name }
…		…
415		478
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	479	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	480	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	481	}
419		482
		483	int
		484	in_destruct ()
		485	CODE:
		486	RETVAL = PL_main_cv == Nullcv;
		487	OUTPUT:
		488	RETVAL
		489
		490	NV floor (NV x)
		491
		492	NV ceil (NV x)
		493
420	void	494	void
421	pango_init ()	495	pango_init ()
422	CODE:	496	CODE:
423	{	497	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	498	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	499	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);	500	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	}	501	}
432		502
433	int	503	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	504	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		505
436	void	506	void
437	SDL_Quit ()	507	SDL_Quit ()
438		508
439	void	509	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	516	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	517	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	518	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		519
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	520	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	521	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		522
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		527
458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	528	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		529	#if SDL_VERSION_ATLEAST(1,2,10)
		530	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		531	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		532	#endif
459		533
460	SDL_EnableUNICODE (1);	534	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	535	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		536
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	537	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	624	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	625	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	626	break;
553	}	627	}
554		628
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	629	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	630	}
557	}	631	}
558		632
559	int	633	int
560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	634	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
576	#endif	650	#endif
577		651
578	void	652	void
579	add_font (char *file)	653	add_font (char *file)
580	CODE:	654	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	655	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		656
587	void	657	void
588	load_image_inline (SV *image_)	658	load_image_inline (SV *image_)
589	ALIAS:	659	ALIAS:
590	load_image_file = 1	660	load_image_file = 1
…		…
632		702
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	703	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		704
635	assert (surface2->pitch == surface2->w * 4);	705	assert (surface2->pitch == surface2->w * 4);
636		706
		707	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	708	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	709	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	710	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	711	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)));	712	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	713	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	714	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		715	SDL_UnlockSurface (surface2);
646		716
647	SDL_FreeSurface (surface);	717	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	718	SDL_FreeSurface (surface2);
649	}	719	}
650		720
…		…
686	CODE:	756	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	757	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	758	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	759	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	760	#endif
691	exit (1);	761	_exit (1);
692		762
		763	void
		764	_exit (int retval)
		765	CODE:
		766	_exit (retval);
		767
693	MODULE = CFClient PACKAGE = CFClient::Font	768	MODULE = CFPlus PACKAGE = CFPlus::Font
694		769
695	CFClient::Font	770	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	771	new_from_file (SV class, char path, int id = 0)
697	CODE:	772	CODE:
698	{	773	{
699	int count;	774	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	775	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	778	}
704	OUTPUT:	779	OUTPUT:
705	RETVAL	780	RETVAL
706		781
707	void	782	void
708	DESTROY (CFClient::Font self)	783	DESTROY (CFPlus::Font self)
709	CODE:	784	CODE:
710	pango_font_description_free (self);	785	pango_font_description_free (self);
711		786
712	void	787	void
713	make_default (CFClient::Font self)	788	make_default (CFPlus::Font self)
714	CODE:	789	CODE:
715	default_font = self;	790	default_font = self;
716		791
717	MODULE = CFClient PACKAGE = CFClient::Layout	792	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		793
719	CFClient::Layout	794	void
720	new (SV *class, int rgba = 0)	795	reset_glyph_cache ()
721	CODE:	796	CODE:
722	#if _WIN32	797	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	798
724	#endif	799	CFPlus::Layout
		800	new (SV *class)
		801	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
726		803
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	805	RETVAL->r = 1.;
730	RETVAL->g = 1.;	806	RETVAL->g = 1.;
731	RETVAL->b = 1.;	807	RETVAL->b = 1.;
732	RETVAL->a = 1.;	808	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
738	OUTPUT:	814	OUTPUT:
739	RETVAL	815	RETVAL
740		816
741	void	817	void
742	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
743	CODE:	819	CODE:
744	g_object_unref (self->pl);	820	g_object_unref (self->pl);
745	Safefree (self);	821	Safefree (self);
746		822
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	823	void
755	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	825	CODE:
757	{	826	{
758	STRLEN textlen;	827	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
760		829
761	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
762	}	831	}
763		832
764	void	833	void
765	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	835	CODE:
767	{	836	{
768	STRLEN textlen;	837	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
770		839
771	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
772	}	841	}
773		842
		843	void
		844	set_shapes (CFPlus::Layout self, ...)
		845	CODE:
		846	{
		847	PangoAttrList *attrs = 0;
		848	const char *text = pango_layout_get_text (self->pl);
		849	const char *pos = text;
		850	int arg = 4;
		851
		852	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		853	{
		854	PangoRectangle inkrect, rect;
		855	PangoAttribute *attr;
		856
		857	int x = SvIV (ST (arg - 3));
		858	int y = SvIV (ST (arg - 2));
		859	int w = SvIV (ST (arg - 1));
		860	int h = SvIV (ST (arg ));
		861
		862	inkrect.x = 0;
		863	inkrect.y = 0;
		864	inkrect.width = 0;
		865	inkrect.height = 0;
		866
		867	rect.x = x * PANGO_SCALE;
		868	rect.y = y * PANGO_SCALE;
		869	rect.width = w * PANGO_SCALE;
		870	rect.height = h * PANGO_SCALE;
		871
		872	if (!attrs)
		873	attrs = pango_layout_get_attributes (self->pl);
		874
		875	attr = pango_attr_shape_new (&inkrect, &rect);
		876	attr->start_index = pos - text;
		877	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		878	pango_attr_list_insert (attrs, attr);
		879
		880	arg += 4;
		881	pos += sizeof (OBJ_STR) - 1;
		882	}
		883
		884	if (attrs)
		885	pango_layout_set_attributes (self->pl, attrs);
		886	}
		887
		888	void
		889	get_shapes (CFPlus::Layout self)
		890	PPCODE:
		891	{
		892	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		893
		894	do
		895	{
		896	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		897
		898	if (run && shape_attr_p (run))
		899	{
		900	PangoRectangle extents;
		901	pango_layout_iter_get_run_extents (iter, 0, &extents);
		902
		903	EXTEND (SP, 2);
		904	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		906	}
		907	}
		908	while (pango_layout_iter_next_run (iter));
		909
		910	pango_layout_iter_free (iter);
		911	}
		912
		913	int
		914	has_wrapped (CFPlus::Layout self)
		915	CODE:
		916	{
		917	int lines = 1;
		918	const char *text = pango_layout_get_text (self->pl);
		919
		920	while (*text)
		921	lines += *text++ == '\n';
		922
		923	RETVAL = lines < pango_layout_get_line_count (self->pl);
		924	}
		925	OUTPUT:
		926	RETVAL
		927
774	SV *	928	SV *
775	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
776	CODE:	930	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
779	OUTPUT:	933	OUTPUT:
780	RETVAL	934	RETVAL
781		935
782	void	936	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	937	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784	CODE:	938	CODE:
785	self->r = r;	939	self->r = r;
786	self->g = g;	940	self->g = g;
787	self->b = b;	941	self->b = b;
788	self->a = a;	942	self->a = a;
789		943
790	void	944	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	946	CODE:
793	if (self->font != font)	947	if (self->font != font)
794	{	948	{
795	self->font = font;	949	self->font = font;
796	layout_update_font (self);	950	layout_update_font (self);
797	}	951	}
798		952
799	void	953	void
800	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
801	CODE:	955	CODE:
802	if (self->base_height != base_height)	956	if (self->base_height != base_height)
803	{	957	{
804	self->base_height = base_height;	958	self->base_height = base_height;
805	layout_update_font (self);	959	layout_update_font (self);
806	}	960	}
807		961
808	void	962	void
809	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	964	CODE:
811	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	965	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812		966
813	void	967	void
814	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
815	CODE:	969	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		971
818	void	972	void
819	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	974	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		976
823	void	977	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	979	CODE:
826	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
831	);	985	);
832		986
833	void	987	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	989	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		991
838	void	992	void
839	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
840	PPCODE:	994	PPCODE:
841	{	995	{
842	int w, h;	996	int w, h;
843		997
844	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
849	}	1003	}
850		1004
851	int	1005	int
		1006	descent (CFPlus::Layout self)
		1007	CODE:
		1008	{
		1009	PangoRectangle rect;
		1010	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1011	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1012	RETVAL = PANGO_DESCENT (rect);
		1013	}
		1014	OUTPUT:
		1015	RETVAL
		1016
		1017	int
852	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1019	CODE:
854	{	1020	{
855	int index, trailing;	1021	int index, trailing;
856	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1022	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857	RETVAL = index;	1023	RETVAL = index;
858	}	1024	}
859	OUTPUT:	1025	OUTPUT:
860	RETVAL	1026	RETVAL
861		1027
862	void	1028	void
863	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1030	PPCODE:
865	{	1031	{
866	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1034
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1039	}
874		1040
875	void	1041	void
876	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1043	PPCODE:
878	{	1044	pango_opengl_render_layout_subpixel (
879	SV *retval;	1045	self->pl,
880	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
		1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
881		1050
882	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1052
884	if (self->rgba)	1053	void
		1054	pad2pot (SV data_, SV w_, SV *h_)
		1055	CODE:
		1056	{
		1057	int ow = SvIV (w_);
		1058	int oh = SvIV (h_);
		1059
		1060	if (ow && oh)
885	{	1061	{
886	cairo_surface_t *surface;	1062	int nw = minpot (ow);
887	cairo_t *cairo;	1063	int nh = minpot (oh);
888		1064
889	retval = newSV (w * h * 4);	1065	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	{	1066	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1067	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1068	{
912	uint32_t rgba = *p;	1069	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1070	char *data = SvPVbyte (data_, datalen);
914	#if 0	1071	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1072	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		1073
922	rgba = (rgba & 0xffffff00) \| a;	1074	SvPOK_only (result_);
		1075	SvCUR_set (result_, nw * nh * bpp);
		1076
		1077	memset (SvPVX (result_), 0, nw * nh * bpp);
		1078	while (oh--)
		1079	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1080
		1081	sv_setsv (data_, result_);
923	}	1082	}
924	#endif	1083
925	#endif	1084	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1085	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1086	}
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	}	1087	}
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	}	1088	}
965		1089
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1090	void
969	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1091	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
971	ALIAS:	1093	ALIAS:
972	draw_quad_alpha = 1	1094	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1095	draw_quad_alpha_premultiplied = 2
974	CODE:	1096	CODE:
…		…
990		1112
991	if (ix == 2)	1113	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1114	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1115	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1116	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1117	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1118
997	glEnable (GL_ALPHA_TEST);	1119	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1120	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1121	}
1000		1122
…		…
1012	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1014	}	1136	}
1015	}	1137	}
1016		1138
1017	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1140
1019	CFClient::Map	1141	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1021	CODE:	1143	CODE:
1022	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1145	RETVAL->x = 0;
1024	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1156	RETVAL->row = 0;
1035	OUTPUT:	1157	OUTPUT:
1036	RETVAL	1158	RETVAL
1037		1159
1038	void	1160	void
1039	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1040	CODE:	1162	CODE:
1041	{	1163	{
1042	map_clear (self);	1164	map_clear (self);
1043	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
1044	Safefree (self);	1167	Safefree (self);
1045	}	1168	}
1046		1169
1047	void	1170	void
1048	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1049	CODE:	1172	CODE:
1050	map_clear (self);	1173	map_clear (self);
1051		1174
1052	void	1175	void
1053	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1177	CODE:
1055	{	1178	{
1056	while (self->faces <= face)	1179	while (self->faces <= face)
1057	{	1180	{
1058	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1184
1062	self->face [face] = texid;	1185	self->face [face] = texid;
1063	}	1186	}
1064		1187
1065	void	1188	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)	1189	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:	1190	CODE:
1068	{	1191	{
1069	while (self->texs <= texid)	1192	while (self->texs <= texid)
1070	{	1193	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1218	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1220	}
1098		1221
1099	int	1222	int
1100	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1101	ALIAS:	1224	ALIAS:
1102	oy = 1	1225	oy = 1
1103	x = 2	1226	x = 2
1104	y = 3	1227	y = 3
1105	w = 4	1228	w = 4
…		…
1116	}	1239	}
1117	OUTPUT:	1240	OUTPUT:
1118	RETVAL	1241	RETVAL
1119		1242
1120	void	1243	void
1121	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1245	CODE:
1123	{	1246	{
1124	if (dx > 0)	1247	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1126	else if (dx < 0)	1249	else if (dx < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1143	}	1266	}
1144	}	1267	}
1145		1268
1146	void	1269	void
1147	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1148	CODE:	1271	CODE:
1149	{	1272	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1275	mapcell *cell;
…		…
1154		1277
1155	while (data < data_end)	1278	while (data < data_end)
1156	{	1279	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1158		1281
1159	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1161		1284
1162	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1163		1286
1164	if (flags & 15)	1287	if (flags & 15)
1165	{	1288	{
1166	if (cell->darkness < 0)	1289	if (!cell->darkness)
1167	{	1290	{
1168	cell->darkness = 0;	1291	cell->darkness = 256;
1169	cell->face [0] = 0;	1292	cell->face [0] = 0;
1170	cell->face [1] = 0;	1293	cell->face [1] = 0;
1171	cell->face [2] = 0;	1294	cell->face [2] = 0;
1172	}	1295	}
1173		1296
1174	cell->darkness = flags & 8 ? *data++ : 255;
1175
1176	//TODO: don't trust server data to be in-range(!)	1297	//TODO: don't trust server data to be in-range(!)
		1298
		1299	if (flags & 8)
		1300	{
		1301	if (extmap)
		1302	{
		1303	uint8_t ext, cmd;
		1304
		1305	do
		1306	{
		1307	ext = *data++;
		1308	cmd = ext & 0x3f;
		1309
		1310	if (cmd < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (cmd == 5) // health
		1313	{
		1314	cell->stat_width = 1;
		1315	cell->stat_hp = *data++;
		1316	}
		1317	else if (cmd == 6) // monster width
		1318	cell->stat_width = *data++ + 1;
		1319	else if (ext & 0x40) // unknown, multibyte => skip
		1320	data += *data + 1;
		1321	else
		1322	data++;
		1323	}
		1324	while (ext & 0x80);
		1325	}
		1326	else
		1327	cell->darkness = *data++ + 1;
		1328	}
1177		1329
1178	if (flags & 4)	1330	if (flags & 4)
1179	{	1331	{
1180	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1332	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181	}	1333	}
…		…
1189	{	1341	{
1190	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1191	}	1343	}
1192	}	1344	}
1193	else	1345	else
		1346	{
1194	cell->darkness = -1;	1347	cell->darkness = 0;
		1348	cell->stat_hp = 0;
		1349	}
1195	}	1350	}
1196	}	1351	}
1197		1352
1198	SV *	1353	SV *
1199	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1354	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200	CODE:	1355	CODE:
1201	{	1356	{
1202	int x1, x;	1357	int x1, x;
1203	int y1, y;	1358	int y1, y;
1204	int z;	1359	int z;
…		…
1254	}	1409	}
1255	OUTPUT:	1410	OUTPUT:
1256	RETVAL	1411	RETVAL
1257		1412
1258	void	1413	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1414	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1415	CODE:
1261	{	1416	{
1262	int vx, vy;	1417	int vx, vy;
1263	int x, y, z;	1418	int x, y, z;
1264	int last_name;	1419	int last_name;
1265	mapface face;	1420	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		1421
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;	1422	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1423	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1424
1277	/*	1425	/*
1278	int vx = self->vx = self->w >= sw	1426	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1427	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1428	: 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));	1432	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1433	*/
1286		1434
1287	glColor4ub (255, 255, 255, 255);	1435	glColor4ub (255, 255, 255, 255);
1288		1436
		1437	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1438	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1439	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1440	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1441
1294	glBegin (GL_QUADS);	1442	glBegin (GL_QUADS);
1295		1443
…		…
1304	for (x = 0; x < sw; x++)	1452	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1453	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1454	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1455	mapcell *cell = row->col + (x + vx - row->c0);
1308		1456
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312
1313	face = cell->face [z];	1457	face = cell->face [z];
1314		1458
1315	if (face)	1459	if (face && face < self->texs)
1316	{	1460	{
1317	maptex tex = self->tex [face];	1461	maptex tex = self->tex [face];
1318		1462
1319	int px = (x + 1) * 32 - tex.w;	1463	int px = (x + 1) * 32 - tex.w;
1320	int py = (y + 1) * 32 - tex.h;	1464	int py = (y + 1) * 32 - tex.h;
…		…
1336	}	1480	}
1337		1481
1338	glEnd ();	1482	glEnd ();
1339		1483
1340	glDisable (GL_TEXTURE_2D);	1484	glDisable (GL_TEXTURE_2D);
		1485
		1486	// top layer: overlays such as the health bar
		1487	for (y = 0; y < sh; y++)
		1488	if (0 <= y + vy && y + vy < self->rows)
		1489	{
		1490	maprow *row = self->row + (y + vy);
		1491
		1492	for (x = 0; x < sw; x++)
		1493	if (row->c0 <= x + vx && x + vx < row->c1)
		1494	{
		1495	mapcell *cell = row->col + (x + vx - row->c0);
		1496
		1497	int px = x * 32;
		1498	int py = y * 32;
		1499
		1500	if (cell->stat_hp)
		1501	{
		1502	int width = cell->stat_width * 32;
		1503	int thick = sh / 28 + 1 + cell->stat_width;
		1504
		1505	glColor4ub (0, 0, 0, 128);
		1506	glRectf (px + 1, py,
		1507	px + width - 1, py + thick + 2);
		1508
		1509	glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 192);
		1510	glRectf (px + 2,
		1511	py + 1,
		1512	px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
		1513	}
		1514	}
		1515	}
		1516
1341	glDisable (GL_BLEND);	1517	glDisable (GL_BLEND);
		1518	}
		1519
		1520	void
		1521	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1522	CODE:
		1523	{
		1524	static float color[16][3] = {
		1525	{ 0.00F, 0.00F, 0.00F },
		1526	{ 1.00F, 1.00F, 1.00F },
		1527	{ 0.00F, 0.00F, 0.55F },
		1528	{ 1.00F, 0.00F, 0.00F },
		1529
		1530	{ 1.00F, 0.54F, 0.00F },
		1531	{ 0.11F, 0.56F, 1.00F },
		1532	{ 0.93F, 0.46F, 0.00F },
		1533	{ 0.18F, 0.54F, 0.34F },
		1534
		1535	{ 0.56F, 0.73F, 0.56F },
		1536	{ 0.80F, 0.80F, 0.80F },
		1537	{ 0.55F, 0.41F, 0.13F },
		1538	{ 0.99F, 0.77F, 0.26F },
		1539
		1540	{ 0.74F, 0.65F, 0.41F },
		1541
		1542	{ 0.00F, 1.00F, 1.00F },
		1543	{ 1.00F, 0.00F, 1.00F },
		1544	{ 1.00F, 1.00F, 0.00F },
		1545	};
		1546
		1547	int x, y;
		1548
		1549	glEnable (GL_TEXTURE_2D);
		1550	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1551	glEnable (GL_BLEND);
		1552	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1553	glBegin (GL_QUADS);
		1554
		1555	for (y = 0; y < h; y++)
		1556	for (x = 0; x < w; x++)
		1557	{
		1558	unsigned char m = data [x + y * w];
		1559
		1560	if (m)
		1561	{
		1562	float *c = color [m & 15];
		1563
		1564	float tx1 = m & 0x40 ? 0.5 : 0.;
		1565	float tx2 = tx1 + 0.5;
		1566
		1567	glColor4f (c[0], c[1], c[2], 0.75);
		1568	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1569	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1570	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1571	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1572	}
		1573	}
		1574
		1575	glEnd ();
		1576	glDisable (GL_BLEND);
		1577	glDisable (GL_TEXTURE_2D);
		1578	}
		1579
		1580	void
		1581	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1582	PPCODE:
		1583	{
		1584	int vx, vy;
		1585	int x, y;
		1586	int sw4 = (sw + 3) & ~3;
		1587	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1588	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1589
		1590	memset (darkness, 255, sw4 * sh);
		1591	SvPOK_only (darkness_sv);
		1592	SvCUR_set (darkness_sv, sw4 * sh);
		1593
		1594	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1595	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1596
		1597	for (y = 0; y < sh; y++)
		1598	if (0 <= y + vy && y + vy < self->rows)
		1599	{
		1600	maprow *row = self->row + (y + vy);
		1601
		1602	for (x = 0; x < sw; x++)
		1603	if (row->c0 <= x + vx && x + vx < row->c1)
		1604	{
		1605	mapcell *cell = row->col + (x + vx - row->c0);
		1606
		1607	darkness[y * sw4 + x] = cell->darkness
		1608	? 255 - (cell->darkness - 1)
		1609	: 255 - FOW_DARKNESS;
		1610	}
		1611	}
1342		1612
1343	EXTEND (SP, 3);	1613	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1614	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1615	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1616	PUSHs (darkness_sv);
1347	}	1617	}
1348		1618
1349	SV *	1619	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1620	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1621	CODE:
1352	{	1622	{
1353	int x, y, x1, y1;	1623	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1624	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1625	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1687	}
1418	OUTPUT:	1688	OUTPUT:
1419	RETVAL	1689	RETVAL
1420		1690
1421	void	1691	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1692	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1693	PPCODE:
1424	{	1694	{
1425	int x, y, z;	1695	int x, y, z;
1426	int w, h;	1696	int w, h;
1427	int x1, y1;	1697	int x1, y1;
…		…
1459		1729
1460	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1730	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1461	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1731	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1462	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1732	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1463		1733
1464	if (cell->darkness <= 0)	1734	if (cell->darkness == 0)
1465	{	1735	{
1466	cell->darkness = -1;	1736	cell->darkness = 0;
1467		1737
1468	for (z = 0; z <= 2; z++)	1738	for (z = 0; z <= 2; z++)
1469	{	1739	{
1470	cell->face[z] = face[z];	1740	cell->face[z] = face[z];
1471		1741
…		…
1476	}	1746	}
1477	}	1747	}
1478	}	1748	}
1479	}	1749	}
1480		1750
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1751	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1752
1483	CFClient::MixChunk	1753	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1754	new_from_file (SV class, char path)
1485	CODE:	1755	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1756	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1757	OUTPUT:
1488	RETVAL	1758	RETVAL
1489		1759
1490	void	1760	void
1491	DESTROY (CFClient::MixChunk self)	1761	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1762	CODE:
1493	Mix_FreeChunk (self);	1763	Mix_FreeChunk (self);
1494		1764
1495	int	1765	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1766	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1767	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1768	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1769	OUTPUT:
1500	RETVAL	1770	RETVAL
1501		1771
1502	int	1772	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1773	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	1774	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1775	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1776	OUTPUT:
1507	RETVAL	1777	RETVAL
1508		1778
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1779	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1780
1511	int	1781	int
1512	volume (int volume = -1)	1782	volume (int volume = -1)
1513	CODE:	1783	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1784	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1785	OUTPUT:
1516	RETVAL	1786	RETVAL
1517		1787
1518	CFClient::MixMusic	1788	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1789	new_from_file (SV class, char path)
1520	CODE:	1790	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1791	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1792	OUTPUT:
1523	RETVAL	1793	RETVAL
1524		1794
1525	void	1795	void
1526	DESTROY (CFClient::MixMusic self)	1796	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1797	CODE:
1528	Mix_FreeMusic (self);	1798	Mix_FreeMusic (self);
1529		1799
1530	int	1800	int
1531	play (CFClient::MixMusic self, int loops = -1)	1801	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1802	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1803	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1804	OUTPUT:
1535	RETVAL	1805	RETVAL
1536		1806
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1807	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1808
1539	BOOT:	1809	BOOT:
1540	{	1810	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1811	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1812	static const struct {
1543	const char *name;	1813	const char *name;
1544	IV iv;	1814	IV iv;
1545	} *civ, const_iv[] = {	1815	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1816	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1823	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1824	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1825	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1826	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1827	const_iv (GL_RESCALE_NORMAL),
		1828	const_iv (GL_FRONT),
		1829	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1830	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1831	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1832	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1833	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1834	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1835	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1836	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1837	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1838	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1839	const_iv (GL_RGBA),
		1840	const_iv (GL_RGBA4),
		1841	const_iv (GL_RGBA8),
		1842	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1843	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1844	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1845	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1846	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1847	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1879	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1880	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1881	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1882	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1883	const_iv (GL_LINES),
		1884	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1885	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1886	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1887	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1888	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1889	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1922	OUTPUT:
1646	RETVAL	1923	RETVAL
1647		1924
1648	int glGetError ()	1925	int glGetError ()
1649		1926
		1927	void glFinish ()
		1928
1650	void glClear (int mask)	1929	void glClear (int mask)
1651		1930
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1931	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1932	PROTOTYPE: @
1654		1933
…		…
1677	void glPushMatrix ()	1956	void glPushMatrix ()
1678		1957
1679	void glPopMatrix ()	1958	void glPopMatrix ()
1680		1959
1681	void glLoadIdentity ()	1960	void glLoadIdentity ()
		1961
		1962	void glDrawBuffer (int buffer)
		1963
		1964	void glReadBuffer (int buffer)
1682		1965
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1966	# 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_)	1967	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		1968
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1969	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	1999	r *= a;
1717	g *= a;	2000	g *= a;
1718	b *= a;	2001	b *= a;
1719	}	2002	}
1720	// microsoft visual "c" rounds instead of truncating...	2003	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	2004	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		2005
1726	void glInterleavedArrays (int format, int stride, char *data)	2006	void glInterleavedArrays (int format, int stride, char *data)
1727		2007
1728	void glDrawElements (int mode, int count, int type, char *indices)	2008	void glDrawElements (int mode, int count, int type, char *indices)
1729		2009
…		…
1806		2086
1807	void glEndList ()	2087	void glEndList ()
1808		2088
1809	void glCallList (int list)	2089	void glCallList (int list)
1810		2090
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.147 by root, Sat Aug 19 03:57:08 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.147 by root, Sat Aug 19 03:57:08 2006 UTC