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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 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;
		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
725	rgba=1;//D	800	new (SV *class)
		801	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	802	New (0, RETVAL, 1, struct cf_layout);
727		803
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	804	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	805	RETVAL->r = 1.;
731	RETVAL->g = 1.;	806	RETVAL->g = 1.;
732	RETVAL->b = 1.;	807	RETVAL->b = 1.;
733	RETVAL->a = 1.;	808	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	809	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	813	layout_update_font (RETVAL);
739	OUTPUT:	814	OUTPUT:
740	RETVAL	815	RETVAL
741		816
742	void	817	void
743	DESTROY (CFClient::Layout self)	818	DESTROY (CFPlus::Layout self)
744	CODE:	819	CODE:
745	g_object_unref (self->pl);	820	g_object_unref (self->pl);
746	Safefree (self);	821	Safefree (self);
747		822
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	823	void
756	set_text (CFClient::Layout self, SV *text_)	824	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	825	CODE:
758	{	826	{
759	STRLEN textlen;	827	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	828	char *text = SvPVutf8 (text_, textlen);
761		829
762	pango_layout_set_text (self->pl, text, textlen);	830	pango_layout_set_text (self->pl, text, textlen);
763	}	831	}
764		832
765	void	833	void
766	set_markup (CFClient::Layout self, SV *text_)	834	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	835	CODE:
768	{	836	{
769	STRLEN textlen;	837	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	838	char *text = SvPVutf8 (text_, textlen);
771		839
772	pango_layout_set_markup (self->pl, text, textlen);	840	pango_layout_set_markup (self->pl, text, textlen);
773	}	841	}
774		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
775	SV *	928	SV *
776	get_text (CFClient::Layout self)	929	get_text (CFPlus::Layout self)
777	CODE:	930	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	931	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	932	sv_utf8_decode (RETVAL);
780	OUTPUT:	933	OUTPUT:
781	RETVAL	934	RETVAL
782		935
783	void	936	void
784	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.)
785	CODE:	938	CODE:
786	self->r = r;	939	self->r = r;
787	self->g = g;	940	self->g = g;
788	self->b = b;	941	self->b = b;
789	self->a = a;	942	self->a = a;
790		943
791	void	944	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	945	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	946	CODE:
794	if (self->font != font)	947	if (self->font != font)
795	{	948	{
796	self->font = font;	949	self->font = font;
797	layout_update_font (self);	950	layout_update_font (self);
798	}	951	}
799		952
800	void	953	void
801	set_height (CFClient::Layout self, int base_height)	954	set_height (CFPlus::Layout self, int base_height)
802	CODE:	955	CODE:
803	if (self->base_height != base_height)	956	if (self->base_height != base_height)
804	{	957	{
805	self->base_height = base_height;	958	self->base_height = base_height;
806	layout_update_font (self);	959	layout_update_font (self);
807	}	960	}
808		961
809	void	962	void
810	set_width (CFClient::Layout self, int max_width = -1)	963	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	964	CODE:
812	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);
813		966
814	void	967	void
815	set_indent (CFClient::Layout self, int indent)	968	set_indent (CFPlus::Layout self, int indent)
816	CODE:	969	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	970	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		971
819	void	972	void
820	set_spacing (CFClient::Layout self, int spacing)	973	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	974	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	975	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		976
824	void	977	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	978	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	979	CODE:
827	pango_layout_set_ellipsize (self->pl,	980	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	981	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	982	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	983	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	984	: PANGO_ELLIPSIZE_NONE
832	);	985	);
833		986
834	void	987	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	988	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	989	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	990	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		991
839	void	992	void
840	size (CFClient::Layout self)	993	size (CFPlus::Layout self)
841	PPCODE:	994	PPCODE:
842	{	995	{
843	int w, h;	996	int w, h;
844		997
845	layout_get_pixel_size (self, &w, &h);	998	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	1001	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	1002	PUSHs (sv_2mortal (newSViv (h)));
850	}	1003	}
851		1004
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	1018	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1019	CODE:
855	{	1020	{
856	int index, trailing;	1021	int index, trailing;
857	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);
858	RETVAL = index;	1023	RETVAL = index;
859	}	1024	}
860	OUTPUT:	1025	OUTPUT:
861	RETVAL	1026	RETVAL
862		1027
863	void	1028	void
864	cursor_pos (CFClient::Layout self, int index)	1029	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1030	PPCODE:
866	{	1031	{
867	PangoRectangle strong_pos;	1032	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1033	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1034
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1037	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1039	}
875		1040
876	void	1041	void
877	render (CFClient::Layout self)	1042	render (CFPlus::Layout self, float x, float y, int flags = 0)
878	PPCODE:	1043	PPCODE:
879	{	1044	pango_opengl_render_layout_subpixel (
880	SV *retval;	1045	self->pl,
881	int w, h;	1046	x * PANGO_SCALE, y * PANGO_SCALE,
		1047	self->r, self->g, self->b, self->a,
		1048	flags
		1049	);
882		1050
883	layout_get_pixel_size (self, &w, &h);	1051	MODULE = CFPlus PACKAGE = CFPlus::Texture
884		1052
885	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)
886	{	1061	{
887	cairo_surface_t *surface;	1062	int nw = minpot (ow);
888	cairo_t *cairo;	1063	int nh = minpot (oh);
889		1064
890	retval = newSV (w * h * 4);	1065	if (nw != ow \|\| nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1066	{
908	uint32_t p = (uint32_t )SvPVX (retval);	1067	if (SvOK (data_))
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{	1068	{
913	uint32_t rgba = *p;	1069	STRLEN datalen;
914	rgba = (rgba >> 24) \| (rgba << 8);	1070	char *data = SvPVbyte (data_, datalen);
915	#if 0	1071	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1072	SV result_ = sv_2mortal (newSV (nw nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1073
923	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_);
924	}	1082	}
925	#endif	1083
926	#endif	1084	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1085	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1086	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1087	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1088	}
966		1089
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1090	void
970	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.)
971	PROTOTYPE: $$$;$$	1092	PROTOTYPE: $$$;$$
972	ALIAS:	1093	ALIAS:
973	draw_quad_alpha = 1	1094	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1095	draw_quad_alpha_premultiplied = 2
975	CODE:	1096	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1134	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1135	glDisable (GL_BLEND);
1015	}	1136	}
1016	}	1137	}
1017		1138
1018	MODULE = CFClient PACKAGE = CFClient::Map	1139	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1140
1020	CFClient::Map	1141	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1142	new (SV *class, int map_width, int map_height)
1022	CODE:	1143	CODE:
1023	New (0, RETVAL, 1, struct map);	1144	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1145	RETVAL->x = 0;
1025	RETVAL->y = 0;	1146	RETVAL->y = 0;
…		…
1035	RETVAL->row = 0;	1156	RETVAL->row = 0;
1036	OUTPUT:	1157	OUTPUT:
1037	RETVAL	1158	RETVAL
1038		1159
1039	void	1160	void
1040	DESTROY (CFClient::Map self)	1161	DESTROY (CFPlus::Map self)
1041	CODE:	1162	CODE:
1042	{	1163	{
1043	map_clear (self);	1164	map_clear (self);
1044	Safefree (self->face);	1165	Safefree (self->face);
		1166	Safefree (self->tex);
1045	Safefree (self);	1167	Safefree (self);
1046	}	1168	}
1047		1169
1048	void	1170	void
1049	clear (CFClient::Map self)	1171	clear (CFPlus::Map self)
1050	CODE:	1172	CODE:
1051	map_clear (self);	1173	map_clear (self);
1052		1174
1053	void	1175	void
1054	set_face (CFClient::Map self, int face, int texid)	1176	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1177	CODE:
1056	{	1178	{
1057	while (self->faces <= face)	1179	while (self->faces <= face)
1058	{	1180	{
1059	Append (mapface, self->face, self->faces, self->faces);	1181	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1184
1063	self->face [face] = texid;	1185	self->face [face] = texid;
1064	}	1186	}
1065		1187
1066	void	1188	void
1067	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)
1068	CODE:	1190	CODE:
1069	{	1191	{
1070	while (self->texs <= texid)	1192	while (self->texs <= texid)
1071	{	1193	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1194	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1218	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1219	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1220	}
1099		1221
1100	int	1222	int
1101	ox (CFClient::Map self)	1223	ox (CFPlus::Map self)
1102	ALIAS:	1224	ALIAS:
1103	oy = 1	1225	oy = 1
1104	x = 2	1226	x = 2
1105	y = 3	1227	y = 3
1106	w = 4	1228	w = 4
…		…
1117	}	1239	}
1118	OUTPUT:	1240	OUTPUT:
1119	RETVAL	1241	RETVAL
1120		1242
1121	void	1243	void
1122	scroll (CFClient::Map self, int dx, int dy)	1244	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1245	CODE:
1124	{	1246	{
1125	if (dx > 0)	1247	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1248	map_blank (self, self->x, self->y, dx - 1, self->h);
1127	else if (dx < 0)	1249	else if (dx < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1265	self->y += MAP_EXTEND_Y;
1144	}	1266	}
1145	}	1267	}
1146		1268
1147	void	1269	void
1148	map1a_update (CFClient::Map self, SV *data_)	1270	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1271	CODE:
1150	{	1272	{
1151	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1273	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1152	uint8_t data_end = (uint8_t )SvEND (data_);	1274	uint8_t data_end = (uint8_t )SvEND (data_);
1153	mapcell *cell;	1275	mapcell *cell;
…		…
1155		1277
1156	while (data < data_end)	1278	while (data < data_end)
1157	{	1279	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1280	flags = (data [0] << 8) + data [1]; data += 2;
1159		1281
1160	x = ((flags >> 10) & 63) + self->x;	1282	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1283	y = self->y + ((flags >> 4) & 63);
1162		1284
1163	cell = map_get_cell (self, x, y);	1285	cell = map_get_cell (self, x, y);
1164		1286
1165	if (flags & 15)	1287	if (flags & 15)
1166	{	1288	{
1167	if (cell->darkness < 0)	1289	if (!cell->darkness)
1168	{	1290	{
1169	cell->darkness = 0;	1291	cell->darkness = 256;
1170	cell->face [0] = 0;	1292	cell->face [0] = 0;
1171	cell->face [1] = 0;	1293	cell->face [1] = 0;
1172	cell->face [2] = 0;	1294	cell->face [2] = 0;
1173	}	1295	}
1174		1296
1175	cell->darkness = flags & 8 ? *data++ : 255;
1176
1177	//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 (ext < 4)
		1311	cell->darkness = 255 - ext * 64 + 1;
		1312	else if (ext == 5) // health
		1313	cell->stat_hp = *data++;
		1314	else if (ext & 0x40) // unknown, multibyte => skip
		1315	data += *data + 1;
		1316	}
		1317	while (cmd & 0x80);
		1318	}
		1319	else
		1320	cell->darkness = *data++ + 1;
		1321	}
1178		1322
1179	if (flags & 4)	1323	if (flags & 4)
1180	{	1324	{
1181	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1325	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1182	}	1326	}
…		…
1190	{	1334	{
1191	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1335	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1192	}	1336	}
1193	}	1337	}
1194	else	1338	else
		1339	{
1195	cell->darkness = -1;	1340	cell->darkness = 0;
		1341	cell->stat_hp = 0;
		1342	}
1196	}	1343	}
1197	}	1344	}
1198		1345
1199	SV *	1346	SV *
1200	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1347	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1201	CODE:	1348	CODE:
1202	{	1349	{
1203	int x1, x;	1350	int x1, x;
1204	int y1, y;	1351	int y1, y;
1205	int z;	1352	int z;
…		…
1255	}	1402	}
1256	OUTPUT:	1403	OUTPUT:
1257	RETVAL	1404	RETVAL
1258		1405
1259	void	1406	void
1260	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1407	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1261	PPCODE:	1408	CODE:
1262	{	1409	{
1263	int vx, vy;	1410	int vx, vy;
1264	int x, y, z;	1411	int x, y, z;
1265	int last_name;	1412	int last_name;
1266	mapface face;	1413	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270		1414
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;	1415	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;	1416	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277		1417
1278	/*	1418	/*
1279	int vx = self->vx = self->w >= sw	1419	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2	1420	? self->x + (self->w - sw) / 2
1281	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1421	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1285	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1425	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1286	*/	1426	*/
1287		1427
1288	glColor4ub (255, 255, 255, 255);	1428	glColor4ub (255, 255, 255, 255);
1289		1429
		1430	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1431	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1432	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1433	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1434
1295	glBegin (GL_QUADS);	1435	glBegin (GL_QUADS);
1296		1436
…		…
1305	for (x = 0; x < sw; x++)	1445	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1446	if (row->c0 <= x + vx && x + vx < row->c1)
1307	{	1447	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1448	mapcell *cell = row->col + (x + vx - row->c0);
1309		1449
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313
1314	face = cell->face [z];	1450	face = cell->face [z];
1315		1451
1316	if (face)	1452	if (face && face < self->texs)
1317	{	1453	{
1318	maptex tex = self->tex [face];	1454	maptex tex = self->tex [face];
1319		1455
1320	int px = (x + 1) * 32 - tex.w;	1456	int px = (x + 1) * 32 - tex.w;
1321	int py = (y + 1) * 32 - tex.h;	1457	int py = (y + 1) * 32 - tex.h;
…		…
1339	glEnd ();	1475	glEnd ();
1340		1476
1341	glDisable (GL_TEXTURE_2D);	1477	glDisable (GL_TEXTURE_2D);
1342	glDisable (GL_BLEND);	1478	glDisable (GL_BLEND);
1343		1479
		1480	// top layer: overlays such as the health bar
		1481	for (y = 0; y < sh; y++)
		1482	if (0 <= y + vy && y + vy < self->rows)
		1483	{
		1484	maprow *row = self->row + (y + vy);
		1485
		1486	for (x = 0; x < sw; x++)
		1487	if (row->c0 <= x + vx && x + vx < row->c1)
		1488	{
		1489	mapcell *cell = row->col + (x + vx - row->c0);
		1490
		1491	int px = x * 32;
		1492	int py = y * 32;
		1493
		1494	if (cell->stat_hp)
		1495	{
		1496	int width = sh / 28 + 1;
		1497
		1498	glColor3ub (0, 0, 0);
		1499	glRectf (px + 1, py, px + 31, py + width + 2);
		1500
		1501	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1502	glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
		1503	}
		1504	}
		1505	}
		1506	}
		1507
		1508	void
		1509	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1510	CODE:
		1511	{
		1512	static float color[16][3] = {
		1513	{ 0.00F, 0.00F, 0.00F },
		1514	{ 1.00F, 1.00F, 1.00F },
		1515	{ 0.00F, 0.00F, 0.55F },
		1516	{ 1.00F, 0.00F, 0.00F },
		1517
		1518	{ 1.00F, 0.54F, 0.00F },
		1519	{ 0.11F, 0.56F, 1.00F },
		1520	{ 0.93F, 0.46F, 0.00F },
		1521	{ 0.18F, 0.54F, 0.34F },
		1522
		1523	{ 0.56F, 0.73F, 0.56F },
		1524	{ 0.80F, 0.80F, 0.80F },
		1525	{ 0.55F, 0.41F, 0.13F },
		1526	{ 0.99F, 0.77F, 0.26F },
		1527
		1528	{ 0.74F, 0.65F, 0.41F },
		1529
		1530	{ 0.00F, 1.00F, 1.00F },
		1531	{ 1.00F, 0.00F, 1.00F },
		1532	{ 1.00F, 1.00F, 0.00F },
		1533	};
		1534
		1535	int x, y;
		1536
		1537	glEnable (GL_TEXTURE_2D);
		1538	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1539	glEnable (GL_BLEND);
		1540	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1541	glBegin (GL_QUADS);
		1542
		1543	for (y = 0; y < h; y++)
		1544	for (x = 0; x < w; x++)
		1545	{
		1546	unsigned char m = data [x + y * w];
		1547
		1548	if (m)
		1549	{
		1550	float *c = color [m & 15];
		1551
		1552	float tx1 = m & 0x40 ? 0.5 : 0.;
		1553	float tx2 = tx1 + 0.5;
		1554
		1555	glColor4f (c[0], c[1], c[2], 0.75);
		1556	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1557	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1558	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1559	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1560	}
		1561	}
		1562
		1563	glEnd ();
		1564	glDisable (GL_BLEND);
		1565	glDisable (GL_TEXTURE_2D);
		1566	}
		1567
		1568	void
		1569	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1570	PPCODE:
		1571	{
		1572	int vx, vy;
		1573	int x, y;
		1574	int sw4 = (sw + 3) & ~3;
		1575	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1576	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1577
		1578	memset (darkness, 255, sw4 * sh);
		1579	SvPOK_only (darkness_sv);
		1580	SvCUR_set (darkness_sv, sw4 * sh);
		1581
		1582	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1583	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1584
		1585	for (y = 0; y < sh; y++)
		1586	if (0 <= y + vy && y + vy < self->rows)
		1587	{
		1588	maprow *row = self->row + (y + vy);
		1589
		1590	for (x = 0; x < sw; x++)
		1591	if (row->c0 <= x + vx && x + vx < row->c1)
		1592	{
		1593	mapcell *cell = row->col + (x + vx - row->c0);
		1594
		1595	darkness[y * sw4 + x] = cell->darkness
		1596	? 255 - (cell->darkness - 1)
		1597	: 255 - FOW_DARKNESS;
		1598	}
		1599	}
		1600
1344	EXTEND (SP, 3);	1601	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1602	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1603	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1604	PUSHs (darkness_sv);
1348	}	1605	}
1349		1606
1350	SV *	1607	SV *
1351	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1608	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1352	CODE:	1609	CODE:
1353	{	1610	{
1354	int x, y, x1, y1;	1611	int x, y, x1, y1;
1355	SV data_sv = newSV (w h * 7 + 5);	1612	SV data_sv = newSV (w h * 7 + 5);
1356	uint8_t data = (uint8_t )SvPVX (data_sv);	1613	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1418	}	1675	}
1419	OUTPUT:	1676	OUTPUT:
1420	RETVAL	1677	RETVAL
1421		1678
1422	void	1679	void
1423	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1680	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1424	PPCODE:	1681	PPCODE:
1425	{	1682	{
1426	int x, y, z;	1683	int x, y, z;
1427	int w, h;	1684	int w, h;
1428	int x1, y1;	1685	int x1, y1;
…		…
1460		1717
1461	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1718	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1462	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1719	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1463	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1720	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1464		1721
1465	if (cell->darkness <= 0)	1722	if (cell->darkness == 0)
1466	{	1723	{
1467	cell->darkness = -1;	1724	cell->darkness = 0;
1468		1725
1469	for (z = 0; z <= 2; z++)	1726	for (z = 0; z <= 2; z++)
1470	{	1727	{
1471	cell->face[z] = face[z];	1728	cell->face[z] = face[z];
1472		1729
…		…
1477	}	1734	}
1478	}	1735	}
1479	}	1736	}
1480	}	1737	}
1481		1738
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1739	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1740
1484	CFClient::MixChunk	1741	CFPlus::MixChunk
1485	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1486	CODE:	1743	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1744	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1745	OUTPUT:
1489	RETVAL	1746	RETVAL
1490		1747
1491	void	1748	void
1492	DESTROY (CFClient::MixChunk self)	1749	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1750	CODE:
1494	Mix_FreeChunk (self);	1751	Mix_FreeChunk (self);
1495		1752
1496	int	1753	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1754	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1755	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1756	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1757	OUTPUT:
1501	RETVAL	1758	RETVAL
1502		1759
1503	int	1760	int
1504	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1761	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1505	CODE:	1762	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1763	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1764	OUTPUT:
1508	RETVAL	1765	RETVAL
1509		1766
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1767	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1768
1512	int	1769	int
1513	volume (int volume = -1)	1770	volume (int volume = -1)
1514	CODE:	1771	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1772	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1773	OUTPUT:
1517	RETVAL	1774	RETVAL
1518		1775
1519	CFClient::MixMusic	1776	CFPlus::MixMusic
1520	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1521	CODE:	1778	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1779	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1780	OUTPUT:
1524	RETVAL	1781	RETVAL
1525		1782
1526	void	1783	void
1527	DESTROY (CFClient::MixMusic self)	1784	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1785	CODE:
1529	Mix_FreeMusic (self);	1786	Mix_FreeMusic (self);
1530		1787
1531	int	1788	int
1532	play (CFClient::MixMusic self, int loops = -1)	1789	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1790	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1791	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1792	OUTPUT:
1536	RETVAL	1793	RETVAL
1537		1794
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1795	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1796
1540	BOOT:	1797	BOOT:
1541	{	1798	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1799	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1800	static const struct {
1544	const char *name;	1801	const char *name;
1545	IV iv;	1802	IV iv;
1546	} *civ, const_iv[] = {	1803	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1804	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1811	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1812	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1813	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1814	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1815	const_iv (GL_RESCALE_NORMAL),
		1816	const_iv (GL_FRONT),
		1817	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1818	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1819	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1820	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1821	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1822	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1823	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1824	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1825	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1826	const_iv (GL_RGB),
1568	const_iv (GL_RGBA),	1827	const_iv (GL_RGBA),
		1828	const_iv (GL_RGBA4),
		1829	const_iv (GL_RGBA8),
		1830	const_iv (GL_RGB5_A1),
1569	const_iv (GL_UNSIGNED_BYTE),	1831	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1832	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1833	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1834	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1835	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1867	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1868	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1869	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1870	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1871	const_iv (GL_LINES),
		1872	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1873	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1874	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1875	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1876	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1877	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	1910	OUTPUT:
1648	RETVAL	1911	RETVAL
1649		1912
1650	int glGetError ()	1913	int glGetError ()
1651		1914
		1915	void glFinish ()
		1916
1652	void glClear (int mask)	1917	void glClear (int mask)
1653		1918
1654	void glClearColor (float r, float g, float b, float a = 1.0)	1919	void glClearColor (float r, float g, float b, float a = 1.0)
1655	PROTOTYPE: @	1920	PROTOTYPE: @
1656		1921
…		…
1679	void glPushMatrix ()	1944	void glPushMatrix ()
1680		1945
1681	void glPopMatrix ()	1946	void glPopMatrix ()
1682		1947
1683	void glLoadIdentity ()	1948	void glLoadIdentity ()
		1949
		1950	void glDrawBuffer (int buffer)
		1951
		1952	void glReadBuffer (int buffer)
1684		1953
1685	# near_ and far_ are due to microsofts buggy "c" compiler	1954	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1955	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		1956
1688	# near_ and far_ are due to microsofts buggy "c" compiler	1957	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	1987	r *= a;
1719	g *= a;	1988	g *= a;
1720	b *= a;	1989	b *= a;
1721	}	1990	}
1722	// microsoft visual "c" rounds instead of truncating...	1991	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	1992	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		1993
1728	void glInterleavedArrays (int format, int stride, char *data)	1994	void glInterleavedArrays (int format, int stride, char *data)
1729		1995
1730	void glDrawElements (int mode, int count, int type, char *indices)	1996	void glDrawElements (int mode, int count, int type, char *indices)
1731		1997
…		…
1808		2074
1809	void glEndList ()	2075	void glEndList ()
1810		2076
1811	void glCallList (int list)	2077	void glCallList (int list)
1812		2078
1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.146 by root, Sat Aug 19 02:49:53 2006 UTC