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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
15	#include <stdlib.h>	20	#include <stdlib.h>
16		21
18	#include <SDL_endian.h>	23	#include <SDL_endian.h>
19	#include <SDL_image.h>	24	#include <SDL_image.h>
20	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
22		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
23	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
24		32
25	#include <pango/pango.h>	33	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		34
30	#ifndef _WIN32	35	#ifndef _WIN32
31	# include <sys/types.h>	36	# include <sys/types.h>
32	# include <sys/socket.h>	37	# include <sys/socket.h>
33	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
40	typedef signed char int8_t;	45	typedef signed char int8_t;
41	typedef signed short int16_t;	46	typedef signed short int16_t;
42	typedef signed int int32_t;	47	typedef signed int int32_t;
43	#endif	48	#endif
44		49
45	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
46		51
47	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
48		53
49	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
51		56
52	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
53		64
54	static struct	65	static struct
55	{	66	{
56	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	68	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	78	else
68	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
69	}	80	}
70		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
71	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
73		90
74	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
75		110
76	typedef struct cf_layout {	111	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
80	int base_height;	114	int base_height;
81	CFClient__Font font;	115	CFPlus__Font font;
82	} *CFClient__Layout;	116	} *CFPlus__Layout;
83		117
84	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
85	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
87		121
88	static void	122	static void
89	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
90	{	124	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	126	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	128	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	130	}
101		131
102	static void	132	static void
103	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
104	{	134	{
105	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
106	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
107	*/	137	*/
108	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
112		142
113	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
114	}	144	}
115		145
116	static void	146	static void
117	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
118	{	148	{
119	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
120		150
121	if (!w) w = 1;	151	if (!w) w = 1;
122	if (!h) h = 1;	152	if (!h) h = 1;
…		…
152	int texs;	182	int texs;
153	maptex *tex;	183	maptex *tex;
154		184
155	int32_t rows;	185	int32_t rows;
156	maprow *row;	186	maprow *row;
157	} *CFClient__Map;	187	} *CFPlus__Map;
158		188
159	static char *	189	static char *
160	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
161	{	191	{
162	char *p;	192	char *p;
…		…
180		210
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	211	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	212	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		213
184	static maprow *	214	static maprow *
185	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
186	{	216	{
187	if (0 > y)	217	if (0 > y)
188	{	218	{
189	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
228		258
229	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
230	}	260	}
231		261
232	static mapcell *	262	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
234	{	264	{
235	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
236	}	266	}
237		267
238	static void	268	static void
239	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
240	{	270	{
241	int r;	271	int r;
242		272
243	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
252	self->row = 0;	282	self->row = 0;
253	self->rows = 0;	283	self->rows = 0;
254	}	284	}
255		285
256	static void	286	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	287	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	288	{
259	int x, y;	289	int x, y;
260	maprow *row;	290	maprow *row;
261		291
262	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
302	ev.data2 = 0;	332	ev.data2 = 0;
303		333
304	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
305	}	335	}
306		336
		337	static unsigned int
		338	minpot (unsigned int n)
		339	{
		340	if (!n)
		341	return 0;
		342
		343	--n;
		344
		345	n \|= n >> 1;
		346	n \|= n >> 2;
		347	n \|= n >> 4;
		348	n \|= n >> 8;
		349	n \|= n >> 16;
		350
		351	return n + 1;
		352	}
		353
307	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
308		355
309	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
310		357
311	BOOT:	358	BOOT:
312	{	359	{
313	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
314	static const struct {	361	static const struct {
315	const char *name;	362	const char *name;
316	IV iv;	363	IV iv;
317	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
318	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
419		466
420	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422	}	469	}
423		470
		471	int
		472	in_destruct ()
		473	CODE:
		474	RETVAL = PL_main_cv == Nullcv;
		475	OUTPUT:
		476	RETVAL
		477
		478	NV floor (NV x)
		479
		480	NV ceil (NV x)
		481
424	void	482	void
425	pango_init ()	483	pango_init ()
426	CODE:	484	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	485	{
429	{
430	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
431	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	487	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	488	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433	}
434	{
435	cairo_font_options_t *fopt = cairo_font_options_create ();
436	cairo_fontmap = pango_cairo_font_map_get_default ();
437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438	#ifdef _WIN32
439	// cairo looks like shit eaten twice on windows
440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441	#else
442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443	#endif
444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446	pango_cairo_context_set_font_options (cairo_context, fopt);
447	cairo_font_options_destroy (fopt);
448	}
449	}	489	}
450		490
451	int	491	int
452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
453		493
454	void	494	void
455	SDL_Quit ()	495	SDL_Quit ()
456		496
457	void	497	void
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		507
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		510
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
475		515
476	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		517	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
477		519
478	SDL_EnableUNICODE (1);	520	SDL_EnableUNICODE (1);
479	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
480		522
481	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
568	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
569	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
570	break;	612	break;
571	}	613	}
572		614
573	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
574	}	616	}
575	}	617	}
576		618
577	int	619	int
578	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
594	#endif	636	#endif
595		637
596	void	638	void
597	add_font (char *file)	639	add_font (char *file)
598	CODE:	640	CODE:
599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
600	#ifdef _WIN32
601	// cairo... sigh... requires win2000
602	AddFontResourceEx (file, FR_PRIVATE, 0);
603	#endif
604		642
605	void	643	void
606	load_image_inline (SV *image_)	644	load_image_inline (SV *image_)
607	ALIAS:	645	ALIAS:
608	load_image_file = 1	646	load_image_file = 1
…		…
650		688
651	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	689	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
652		690
653	assert (surface2->pitch == surface2->w * 4);	691	assert (surface2->pitch == surface2->w * 4);
654		692
		693	SDL_LockSurface (surface2);
655	EXTEND (SP, 5);	694	EXTEND (SP, 6);
656	PUSHs (sv_2mortal (newSViv (surface2->w)));	695	PUSHs (sv_2mortal (newSViv (surface2->w)));
657	PUSHs (sv_2mortal (newSViv (surface2->h)));	696	PUSHs (sv_2mortal (newSViv (surface2->h)));
658	SDL_LockSurface (surface2);
659	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	697	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
660	SDL_UnlockSurface (surface2);
661	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	698	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
662	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	699	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
663	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	700	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		701	SDL_UnlockSurface (surface2);
664		702
665	SDL_FreeSurface (surface);	703	SDL_FreeSurface (surface);
666	SDL_FreeSurface (surface2);	704	SDL_FreeSurface (surface2);
667	}	705	}
668		706
…		…
704	CODE:	742	CODE:
705	fprintf (stderr, "FATAL: %s\n", message);	743	fprintf (stderr, "FATAL: %s\n", message);
706	#ifdef _WIN32	744	#ifdef _WIN32
707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	745	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
708	#endif	746	#endif
709	_Exit (1);	747	_exit (1);
710		748
711	void	749	void
712	_exit (int retval)	750	_exit (int retval)
713	CODE:	751	CODE:
714	_Exit (retval);	752	_exit (retval);
715		753
716	MODULE = CFClient PACKAGE = CFClient::Font	754	MODULE = CFPlus PACKAGE = CFPlus::Font
717		755
718	CFClient::Font	756	CFPlus::Font
719	new_from_file (SV class, char path, int id = 0)	757	new_from_file (SV class, char path, int id = 0)
720	CODE:	758	CODE:
721	{	759	{
722	int count;	760	int count;
723	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
726	}	764	}
727	OUTPUT:	765	OUTPUT:
728	RETVAL	766	RETVAL
729		767
730	void	768	void
731	DESTROY (CFClient::Font self)	769	DESTROY (CFPlus::Font self)
732	CODE:	770	CODE:
733	pango_font_description_free (self);	771	pango_font_description_free (self);
734		772
735	void	773	void
736	make_default (CFClient::Font self)	774	make_default (CFPlus::Font self)
737	CODE:	775	CODE:
738	default_font = self;	776	default_font = self;
739		777
740	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFPlus PACKAGE = CFPlus::Layout
741		779
742	CFClient::Layout	780	void
743	new (SV *class, int rgba = 0)	781	reset_glyph_cache ()
		782	CODE:
		783	tc_clear ();
		784
		785	CFPlus::Layout
		786	new (SV *class)
744	CODE:	787	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
746		789
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	790	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	791	RETVAL->r = 1.;
750	RETVAL->g = 1.;	792	RETVAL->g = 1.;
751	RETVAL->b = 1.;	793	RETVAL->b = 1.;
752	RETVAL->a = 1.;	794	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	795	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
757	layout_update_font (RETVAL);	799	layout_update_font (RETVAL);
758	OUTPUT:	800	OUTPUT:
759	RETVAL	801	RETVAL
760		802
761	void	803	void
762	DESTROY (CFClient::Layout self)	804	DESTROY (CFPlus::Layout self)
763	CODE:	805	CODE:
764	g_object_unref (self->pl);	806	g_object_unref (self->pl);
765	Safefree (self);	807	Safefree (self);
766		808
767	int
768	is_rgba (CFClient::Layout self)
769	CODE:
770	RETVAL = self->rgba;
771	OUTPUT:
772	RETVAL
773
774	void	809	void
775	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFPlus::Layout self, SV *text_)
776	CODE:	811	CODE:
777	{	812	{
778	STRLEN textlen;	813	STRLEN textlen;
779	char *text = SvPVutf8 (text_, textlen);	814	char *text = SvPVutf8 (text_, textlen);
780		815
781	pango_layout_set_text (self->pl, text, textlen);	816	pango_layout_set_text (self->pl, text, textlen);
782	}	817	}
783		818
784	void	819	void
785	set_markup (CFClient::Layout self, SV *text_)	820	set_markup (CFPlus::Layout self, SV *text_)
786	CODE:	821	CODE:
787	{	822	{
788	STRLEN textlen;	823	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
790		825
791	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
792	}	827	}
793		828
		829	void
		830	set_shapes (CFPlus::Layout self, ...)
		831	CODE:
		832	{
		833	PangoAttrList *attrs = 0;
		834	const char *text = pango_layout_get_text (self->pl);
		835	const char *pos = text;
		836	int arg = 4;
		837
		838	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		839	{
		840	PangoRectangle inkrect, rect;
		841	PangoAttribute *attr;
		842
		843	int x = SvIV (ST (arg - 3));
		844	int y = SvIV (ST (arg - 2));
		845	int w = SvIV (ST (arg - 1));
		846	int h = SvIV (ST (arg ));
		847
		848	inkrect.x = 0;
		849	inkrect.y = 0;
		850	inkrect.width = 0;
		851	inkrect.height = 0;
		852
		853	rect.x = x * PANGO_SCALE;
		854	rect.y = y * PANGO_SCALE;
		855	rect.width = w * PANGO_SCALE;
		856	rect.height = h * PANGO_SCALE;
		857
		858	if (!attrs)
		859	attrs = pango_layout_get_attributes (self->pl);
		860
		861	attr = pango_attr_shape_new (&inkrect, &rect);
		862	attr->start_index = pos - text;
		863	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		864	pango_attr_list_insert (attrs, attr);
		865
		866	arg += 4;
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFPlus::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	EXTEND (SP, 2);
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		891	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		892	}
		893	}
		894	while (pango_layout_iter_next_run (iter));
		895
		896	pango_layout_iter_free (iter);
		897	}
		898
		899	int
		900	has_wrapped (CFPlus::Layout self)
		901	CODE:
		902	{
		903	int lines = 1;
		904	const char *text = pango_layout_get_text (self->pl);
		905
		906	while (*text)
		907	lines += *text++ == '\n';
		908
		909	RETVAL = lines < pango_layout_get_line_count (self->pl);
		910	}
		911	OUTPUT:
		912	RETVAL
		913
794	SV *	914	SV *
795	get_text (CFClient::Layout self)	915	get_text (CFPlus::Layout self)
796	CODE:	916	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
798	sv_utf8_decode (RETVAL);	918	sv_utf8_decode (RETVAL);
799	OUTPUT:	919	OUTPUT:
800	RETVAL	920	RETVAL
801		921
802	void	922	void
803	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	923	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
804	CODE:	924	CODE:
805	self->r = r;	925	self->r = r;
806	self->g = g;	926	self->g = g;
807	self->b = b;	927	self->b = b;
808	self->a = a;	928	self->a = a;
809		929
810	void	930	void
811	set_font (CFClient::Layout self, CFClient::Font font = 0)	931	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
812	CODE:	932	CODE:
813	if (self->font != font)	933	if (self->font != font)
814	{	934	{
815	self->font = font;	935	self->font = font;
816	layout_update_font (self);	936	layout_update_font (self);
817	}	937	}
818		938
819	void	939	void
820	set_height (CFClient::Layout self, int base_height)	940	set_height (CFPlus::Layout self, int base_height)
821	CODE:	941	CODE:
822	if (self->base_height != base_height)	942	if (self->base_height != base_height)
823	{	943	{
824	self->base_height = base_height;	944	self->base_height = base_height;
825	layout_update_font (self);	945	layout_update_font (self);
826	}	946	}
827		947
828	void	948	void
829	set_width (CFClient::Layout self, int max_width = -1)	949	set_width (CFPlus::Layout self, int max_width = -1)
830	CODE:	950	CODE:
831	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
832		952
833	void	953	void
834	set_indent (CFClient::Layout self, int indent)	954	set_indent (CFPlus::Layout self, int indent)
835	CODE:	955	CODE:
836	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
837		957
838	void	958	void
839	set_spacing (CFClient::Layout self, int spacing)	959	set_spacing (CFPlus::Layout self, int spacing)
840	CODE:	960	CODE:
841	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
842		962
843	void	963	void
844	set_ellipsise (CFClient::Layout self, int ellipsise)	964	set_ellipsise (CFPlus::Layout self, int ellipsise)
845	CODE:	965	CODE:
846	pango_layout_set_ellipsize (self->pl,	966	pango_layout_set_ellipsize (self->pl,
847	ellipsise == 1 ? PANGO_ELLIPSIZE_START	967	ellipsise == 1 ? PANGO_ELLIPSIZE_START
848	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
849	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
850	: PANGO_ELLIPSIZE_NONE	970	: PANGO_ELLIPSIZE_NONE
851	);	971	);
852		972
853	void	973	void
854	set_single_paragraph_mode (CFClient::Layout self, int spm)	974	set_single_paragraph_mode (CFPlus::Layout self, int spm)
855	CODE:	975	CODE:
856	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
857		977
858	void	978	void
859	size (CFClient::Layout self)	979	size (CFPlus::Layout self)
860	PPCODE:	980	PPCODE:
861	{	981	{
862	int w, h;	982	int w, h;
863		983
864	layout_get_pixel_size (self, &w, &h);	984	layout_get_pixel_size (self, &w, &h);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
869	}	989	}
870		990
871	int	991	int
		992	descent (CFPlus::Layout self)
		993	CODE:
		994	{
		995	PangoRectangle rect;
		996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		997	pango_layout_line_get_pixel_extents (line, 0, &rect);
		998	RETVAL = PANGO_DESCENT (rect);
		999	}
		1000	OUTPUT:
		1001	RETVAL
		1002
		1003	int
872	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFPlus::Layout self, int x, int y)
873	CODE:	1005	CODE:
874	{	1006	{
875	int index, trailing;	1007	int index, trailing;
876	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
877	RETVAL = index;	1009	RETVAL = index;
878	}	1010	}
879	OUTPUT:	1011	OUTPUT:
880	RETVAL	1012	RETVAL
881		1013
882	void	1014	void
883	cursor_pos (CFClient::Layout self, int index)	1015	cursor_pos (CFPlus::Layout self, int index)
884	PPCODE:	1016	PPCODE:
885	{	1017	{
886	PangoRectangle strong_pos;	1018	PangoRectangle strong_pos;
887	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
888		1020
…		…
891	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1025	}
894		1026
895	void	1027	void
896	render (CFClient::Layout self)	1028	render (CFPlus::Layout self, float x, float y)
897	PPCODE:	1029	PPCODE:
898	{	1030	pango_opengl_render_layout_subpixel (
899	SV *retval;	1031	self->pl,
900	int w, h;	1032	x * PANGO_SCALE, y * PANGO_SCALE,
		1033	self->r, self->g, self->b, self->a
		1034	);
901		1035
902	layout_get_pixel_size (self, &w, &h);	1036	MODULE = CFPlus PACKAGE = CFPlus::Texture
903		1037
904	if (self->rgba)	1038	void
		1039	pad2pot (SV data_, SV w_, SV *h_)
		1040	CODE:
		1041	{
		1042	int ow = SvIV (w_);
		1043	int oh = SvIV (h_);
		1044
		1045	if (ow && oh)
905	{	1046	{
906	cairo_surface_t *surface;	1047	int nw = minpot (ow);
907	cairo_t *cairo;	1048	int nh = minpot (oh);
908		1049
909	retval = newSV (w * h * 4);	1050	if (nw != ow \|\| nh != oh)
910	SvPOK_only (retval);
911	SvCUR_set (retval, w * h * 4);
912
913	memset (SvPVX (retval), 0, w * h * 4);
914
915	surface = cairo_image_surface_create_for_data (
916	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
917	cairo = cairo_create (surface);
918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920	pango_cairo_show_layout (cairo, self->pl);
921
922	cairo_destroy (cairo);
923	cairo_surface_destroy (surface);
924
925	// what a mess, and its premultiplied, too :(
926	{	1051	{
927	uint32_t p = (uint32_t )SvPVX (retval);	1052	if (SvOK (data_))
928	uint32_t e = p + w h;
929
930	while (p < e)
931	{	1053	{
932	uint32_t rgba = *p;	1054	STRLEN datalen;
933	rgba = (rgba >> 24) \| (rgba << 8);	1055	char *data = SvPVbyte (data_, datalen);
934	#if 0	1056	int bpp = datalen / (ow * oh);
935	#ifdef _WIN32	1057	SV result_ = sv_2mortal (newSV (nw nh * bpp));
936	{//D
937	uint8_t r = rgba >> 24;
938	uint8_t g = rgba >> 16;
939	uint8_t b = rgba >> 8;
940	uint8_t a = rgba >> 0;
941		1058
942	rgba = (rgba & 0xffffff00) \| a;	1059	SvPOK_only (result_);
		1060	SvCUR_set (result_, nw * nh * bpp);
		1061
		1062	memset (SvPVX (result_), 0, nw * nh * bpp);
		1063	while (oh--)
		1064	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1065
		1066	sv_setsv (data_, result_);
943	}	1067	}
944	#endif	1068
945	#endif	1069	sv_setiv (w_, nw);
946	rgba = SDL_SwapBE32 (rgba);	1070	sv_setiv (h_, nh);
947	*p++ = rgba;
948	}	1071	}
949	}
950
951	EXTEND (SP, 5);
952	PUSHs (sv_2mortal (newSViv (w)));
953	PUSHs (sv_2mortal (newSViv (h)));
954	PUSHs (sv_2mortal (retval));
955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957	}	1072	}
958	else
959	{
960	FT_Bitmap bitmap;
961
962	retval = newSV (w * h);
963	SvPOK_only (retval);
964	SvCUR_set (retval, w * h);
965
966	bitmap.rows = h;
967	bitmap.width = w;
968	bitmap.pitch = w;
969	bitmap.buffer = (unsigned char*)SvPVX (retval);
970	bitmap.num_grays = 256;
971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973	memset (bitmap.buffer, 0, w * h);
974
975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977	EXTEND (SP, 5);
978	PUSHs (sv_2mortal (newSViv (w)));
979	PUSHs (sv_2mortal (newSViv (h)));
980	PUSHs (sv_2mortal (retval));
981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983	}
984	}	1073	}
985		1074
986	MODULE = CFClient PACKAGE = CFClient::Texture
987
988	void	1075	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1076	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1077	PROTOTYPE: $$$;$$
991	ALIAS:	1078	ALIAS:
992	draw_quad_alpha = 1	1079	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1080	draw_quad_alpha_premultiplied = 2
994	CODE:	1081	CODE:
…		…
1032	glDisable (GL_ALPHA_TEST);	1119	glDisable (GL_ALPHA_TEST);
1033	glDisable (GL_BLEND);	1120	glDisable (GL_BLEND);
1034	}	1121	}
1035	}	1122	}
1036		1123
1037	MODULE = CFClient PACKAGE = CFClient::Map	1124	MODULE = CFPlus PACKAGE = CFPlus::Map
1038		1125
1039	CFClient::Map	1126	CFPlus::Map
1040	new (SV *class, int map_width, int map_height)	1127	new (SV *class, int map_width, int map_height)
1041	CODE:	1128	CODE:
1042	New (0, RETVAL, 1, struct map);	1129	New (0, RETVAL, 1, struct map);
1043	RETVAL->x = 0;	1130	RETVAL->x = 0;
1044	RETVAL->y = 0;	1131	RETVAL->y = 0;
…		…
1054	RETVAL->row = 0;	1141	RETVAL->row = 0;
1055	OUTPUT:	1142	OUTPUT:
1056	RETVAL	1143	RETVAL
1057		1144
1058	void	1145	void
1059	DESTROY (CFClient::Map self)	1146	DESTROY (CFPlus::Map self)
1060	CODE:	1147	CODE:
1061	{	1148	{
1062	map_clear (self);	1149	map_clear (self);
1063	Safefree (self->face);	1150	Safefree (self->face);
1064	Safefree (self->tex);	1151	Safefree (self->tex);
1065	Safefree (self);	1152	Safefree (self);
1066	}	1153	}
1067		1154
1068	void	1155	void
1069	clear (CFClient::Map self)	1156	clear (CFPlus::Map self)
1070	CODE:	1157	CODE:
1071	map_clear (self);	1158	map_clear (self);
1072		1159
1073	void	1160	void
1074	set_face (CFClient::Map self, int face, int texid)	1161	set_face (CFPlus::Map self, int face, int texid)
1075	CODE:	1162	CODE:
1076	{	1163	{
1077	while (self->faces <= face)	1164	while (self->faces <= face)
1078	{	1165	{
1079	Append (mapface, self->face, self->faces, self->faces);	1166	Append (mapface, self->face, self->faces, self->faces);
…		…
1082		1169
1083	self->face [face] = texid;	1170	self->face [face] = texid;
1084	}	1171	}
1085		1172
1086	void	1173	void
1087	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1174	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1088	CODE:	1175	CODE:
1089	{	1176	{
1090	while (self->texs <= texid)	1177	while (self->texs <= texid)
1091	{	1178	{
1092	Append (maptex, self->tex, self->texs, self->texs);	1179	Append (maptex, self->tex, self->texs, self->texs);
…		…
1116	// from transparent color bleeding and ugly wrapping effects.	1203	// from transparent color bleeding and ugly wrapping effects.
1117	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1118	}	1205	}
1119		1206
1120	int	1207	int
1121	ox (CFClient::Map self)	1208	ox (CFPlus::Map self)
1122	ALIAS:	1209	ALIAS:
1123	oy = 1	1210	oy = 1
1124	x = 2	1211	x = 2
1125	y = 3	1212	y = 3
1126	w = 4	1213	w = 4
…		…
1137	}	1224	}
1138	OUTPUT:	1225	OUTPUT:
1139	RETVAL	1226	RETVAL
1140		1227
1141	void	1228	void
1142	scroll (CFClient::Map self, int dx, int dy)	1229	scroll (CFPlus::Map self, int dx, int dy)
1143	CODE:	1230	CODE:
1144	{	1231	{
1145	if (dx > 0)	1232	if (dx > 0)
1146	map_blank (self, self->x, self->y, dx - 1, self->h);	1233	map_blank (self, self->x, self->y, dx - 1, self->h);
1147	else if (dx < 0)	1234	else if (dx < 0)
…		…
1163	self->y += MAP_EXTEND_Y;	1250	self->y += MAP_EXTEND_Y;
1164	}	1251	}
1165	}	1252	}
1166		1253
1167	void	1254	void
1168	map1a_update (CFClient::Map self, SV *data_)	1255	map1a_update (CFPlus::Map self, SV *data_)
1169	CODE:	1256	CODE:
1170	{	1257	{
1171	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1172	uint8_t data_end = (uint8_t )SvEND (data_);	1259	uint8_t data_end = (uint8_t )SvEND (data_);
1173	mapcell *cell;	1260	mapcell *cell;
…		…
1175		1262
1176	while (data < data_end)	1263	while (data < data_end)
1177	{	1264	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1265	flags = (data [0] << 8) + data [1]; data += 2;
1179		1266
1180	x = ((flags >> 10) & 63) + self->x;	1267	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1268	y = self->y + ((flags >> 4) & 63);
1182		1269
1183	cell = map_get_cell (self, x, y);	1270	cell = map_get_cell (self, x, y);
1184		1271
1185	if (flags & 15)	1272	if (flags & 15)
1186	{	1273	{
…		…
1215	cell->darkness = -1;	1302	cell->darkness = -1;
1216	}	1303	}
1217	}	1304	}
1218		1305
1219	SV *	1306	SV *
1220	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1307	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1221	CODE:	1308	CODE:
1222	{	1309	{
1223	int x1, x;	1310	int x1, x;
1224	int y1, y;	1311	int y1, y;
1225	int z;	1312	int z;
…		…
1275	}	1362	}
1276	OUTPUT:	1363	OUTPUT:
1277	RETVAL	1364	RETVAL
1278		1365
1279	void	1366	void
1280	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1367	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1281	PPCODE:	1368	CODE:
1282	{	1369	{
1283	int vx, vy;	1370	int vx, vy;
1284	int x, y, z;	1371	int x, y, z;
1285	int last_name;	1372	int last_name;
1286	mapface face;	1373	mapface face;
1287	int sw4 = (sw + 3) & ~3;
1288	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1289	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1290		1374
1291	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);
1294
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297		1377
1298	/*	1378	/*
1299	int vx = self->vx = self->w >= sw	1379	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1380	? self->x + (self->w - sw) / 2
1301	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1381	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1305	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1385	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306	*/	1386	*/
1307		1387
1308	glColor4ub (255, 255, 255, 255);	1388	glColor4ub (255, 255, 255, 255);
1309		1389
		1390	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1391	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1392	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1393	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1394
1315	glBegin (GL_QUADS);	1395	glBegin (GL_QUADS);
1316		1396
…		…
1324		1404
1325	for (x = 0; x < sw; x++)	1405	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1406	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1407	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1408	mapcell *cell = row->col + (x + vx - row->c0);
1329
1330	darkness[y * sw4 + x] = cell->darkness < 0
1331	? 255 - FOW_DARKNESS
1332	: 255 - cell->darkness;
1333		1409
1334	face = cell->face [z];	1410	face = cell->face [z];
1335		1411
1336	if (face)	1412	if (face)
1337	{	1413	{
…		…
1358		1434
1359	glEnd ();	1435	glEnd ();
1360		1436
1361	glDisable (GL_TEXTURE_2D);	1437	glDisable (GL_TEXTURE_2D);
1362	glDisable (GL_BLEND);	1438	glDisable (GL_BLEND);
		1439	}
		1440
		1441	void
		1442	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1443	CODE:
		1444	{
		1445	static float color[16][3] = {
		1446	{ 0.00F, 0.00F, 0.00F },
		1447	{ 1.00F, 1.00F, 1.00F },
		1448	{ 0.00F, 0.00F, 0.55F },
		1449	{ 1.00F, 0.00F, 0.00F },
		1450
		1451	{ 1.00F, 0.54F, 0.00F },
		1452	{ 0.11F, 0.56F, 1.00F },
		1453	{ 0.93F, 0.46F, 0.00F },
		1454	{ 0.18F, 0.54F, 0.34F },
		1455
		1456	{ 0.56F, 0.73F, 0.56F },
		1457	{ 0.80F, 0.80F, 0.80F },
		1458	{ 0.55F, 0.41F, 0.13F },
		1459	{ 0.99F, 0.77F, 0.26F },
		1460
		1461	{ 0.74F, 0.65F, 0.41F },
		1462
		1463	{ 0.00F, 1.00F, 1.00F },
		1464	{ 1.00F, 0.00F, 1.00F },
		1465	{ 1.00F, 1.00F, 0.00F },
		1466	};
		1467
		1468	int x, y;
		1469
		1470	glEnable (GL_TEXTURE_2D);
		1471	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1472	glEnable (GL_BLEND);
		1473	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1474	glBegin (GL_QUADS);
		1475
		1476	for (y = 0; y < h; y++)
		1477	for (x = 0; x < w; x++)
		1478	{
		1479	unsigned char m = data [x + y * w];
		1480
		1481	if (m)
		1482	{
		1483	float *c = color [m & 15];
		1484
		1485	float tx1 = m & 0x40 ? 0.5 : 0.;
		1486	float tx2 = tx1 + 0.5;
		1487
		1488	glColor4f (c[0], c[1], c[2], 0.75);
		1489	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1490	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1491	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1492	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1493	}
		1494	}
		1495
		1496	glEnd ();
		1497	glDisable (GL_BLEND);
		1498	glDisable (GL_TEXTURE_2D);
		1499	}
		1500
		1501	void
		1502	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1503	PPCODE:
		1504	{
		1505	int vx, vy;
		1506	int x, y;
		1507	int sw4 = (sw + 3) & ~3;
		1508	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1509	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1510
		1511	memset (darkness, 255, sw4 * sh);
		1512	SvPOK_only (darkness_sv);
		1513	SvCUR_set (darkness_sv, sw4 * sh);
		1514
		1515	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1516	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1517
		1518	for (y = 0; y < sh; y++)
		1519	if (0 <= y + vy && y + vy < self->rows)
		1520	{
		1521	maprow *row = self->row + (y + vy);
		1522
		1523	for (x = 0; x < sw; x++)
		1524	if (row->c0 <= x + vx && x + vx < row->c1)
		1525	{
		1526	mapcell *cell = row->col + (x + vx - row->c0);
		1527
		1528	darkness[y * sw4 + x] = cell->darkness < 0
		1529	? 255 - FOW_DARKNESS
		1530	: 255 - cell->darkness;
		1531	}
		1532	}
1363		1533
1364	EXTEND (SP, 3);	1534	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1535	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1536	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1537	PUSHs (darkness_sv);
1368	}	1538	}
1369		1539
1370	SV *	1540	SV *
1371	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1541	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1372	CODE:	1542	CODE:
1373	{	1543	{
1374	int x, y, x1, y1;	1544	int x, y, x1, y1;
1375	SV data_sv = newSV (w h * 7 + 5);	1545	SV data_sv = newSV (w h * 7 + 5);
1376	uint8_t data = (uint8_t )SvPVX (data_sv);	1546	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1438	}	1608	}
1439	OUTPUT:	1609	OUTPUT:
1440	RETVAL	1610	RETVAL
1441		1611
1442	void	1612	void
1443	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1613	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1444	PPCODE:	1614	PPCODE:
1445	{	1615	{
1446	int x, y, z;	1616	int x, y, z;
1447	int w, h;	1617	int w, h;
1448	int x1, y1;	1618	int x1, y1;
…		…
1497	}	1667	}
1498	}	1668	}
1499	}	1669	}
1500	}	1670	}
1501		1671
1502	MODULE = CFClient PACKAGE = CFClient::MixChunk	1672	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1503		1673
1504	CFClient::MixChunk	1674	CFPlus::MixChunk
1505	new_from_file (SV class, char path)	1675	new_from_file (SV class, char path)
1506	CODE:	1676	CODE:
1507	RETVAL = Mix_LoadWAV (path);	1677	RETVAL = Mix_LoadWAV (path);
1508	OUTPUT:	1678	OUTPUT:
1509	RETVAL	1679	RETVAL
1510		1680
1511	void	1681	void
1512	DESTROY (CFClient::MixChunk self)	1682	DESTROY (CFPlus::MixChunk self)
1513	CODE:	1683	CODE:
1514	Mix_FreeChunk (self);	1684	Mix_FreeChunk (self);
1515		1685
1516	int	1686	int
1517	volume (CFClient::MixChunk self, int volume = -1)	1687	volume (CFPlus::MixChunk self, int volume = -1)
1518	CODE:	1688	CODE:
1519	RETVAL = Mix_VolumeChunk (self, volume);	1689	RETVAL = Mix_VolumeChunk (self, volume);
1520	OUTPUT:	1690	OUTPUT:
1521	RETVAL	1691	RETVAL
1522		1692
1523	int	1693	int
1524	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1694	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1525	CODE:	1695	CODE:
1526	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1527	OUTPUT:	1697	OUTPUT:
1528	RETVAL	1698	RETVAL
1529		1699
1530	MODULE = CFClient PACKAGE = CFClient::MixMusic	1700	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1531		1701
1532	int	1702	int
1533	volume (int volume = -1)	1703	volume (int volume = -1)
1534	CODE:	1704	CODE:
1535	RETVAL = Mix_VolumeMusic (volume);	1705	RETVAL = Mix_VolumeMusic (volume);
1536	OUTPUT:	1706	OUTPUT:
1537	RETVAL	1707	RETVAL
1538		1708
1539	CFClient::MixMusic	1709	CFPlus::MixMusic
1540	new_from_file (SV class, char path)	1710	new_from_file (SV class, char path)
1541	CODE:	1711	CODE:
1542	RETVAL = Mix_LoadMUS (path);	1712	RETVAL = Mix_LoadMUS (path);
1543	OUTPUT:	1713	OUTPUT:
1544	RETVAL	1714	RETVAL
1545		1715
1546	void	1716	void
1547	DESTROY (CFClient::MixMusic self)	1717	DESTROY (CFPlus::MixMusic self)
1548	CODE:	1718	CODE:
1549	Mix_FreeMusic (self);	1719	Mix_FreeMusic (self);
1550		1720
1551	int	1721	int
1552	play (CFClient::MixMusic self, int loops = -1)	1722	play (CFPlus::MixMusic self, int loops = -1)
1553	CODE:	1723	CODE:
1554	RETVAL = Mix_PlayMusic (self, loops);	1724	RETVAL = Mix_PlayMusic (self, loops);
1555	OUTPUT:	1725	OUTPUT:
1556	RETVAL	1726	RETVAL
1557		1727
1558	MODULE = CFClient PACKAGE = CFClient::OpenGL	1728	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1559		1729
1560	BOOT:	1730	BOOT:
1561	{	1731	{
1562	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1732	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1563	static const struct {	1733	static const struct {
1564	const char *name;	1734	const char *name;
1565	IV iv;	1735	IV iv;
1566	} *civ, const_iv[] = {	1736	} *civ, const_iv[] = {
1567	# define const_iv(name) { # name, (IV)name }	1737	# define const_iv(name) { # name, (IV)name }
…		…
1574	const_iv (GL_SCISSOR_TEST),	1744	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1745	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1746	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1747	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1748	const_iv (GL_RESCALE_NORMAL),
		1749	const_iv (GL_FRONT),
		1750	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1751	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1752	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1753	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1754	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1755	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1756	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1757	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1758	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1759	const_iv (GL_RGB),
1588	const_iv (GL_RGBA),	1760	const_iv (GL_RGBA),
		1761	const_iv (GL_RGBA4),
		1762	const_iv (GL_RGBA8),
		1763	const_iv (GL_RGB5_A1),
1589	const_iv (GL_UNSIGNED_BYTE),	1764	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1765	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1766	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1767	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1768	const_iv (GL_INTENSITY),
…		…
1667	OUTPUT:	1842	OUTPUT:
1668	RETVAL	1843	RETVAL
1669		1844
1670	int glGetError ()	1845	int glGetError ()
1671		1846
		1847	void glFinish ()
		1848
1672	void glClear (int mask)	1849	void glClear (int mask)
1673		1850
1674	void glClearColor (float r, float g, float b, float a = 1.0)	1851	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	1852	PROTOTYPE: @
1676		1853
…		…
1699	void glPushMatrix ()	1876	void glPushMatrix ()
1700		1877
1701	void glPopMatrix ()	1878	void glPopMatrix ()
1702		1879
1703	void glLoadIdentity ()	1880	void glLoadIdentity ()
		1881
		1882	void glDrawBuffer (int buffer)
		1883
		1884	void glReadBuffer (int buffer)
1704		1885
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1886	# near_ and far_ are due to microsofts buggy "c" compiler
1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1887	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707		1888
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1889	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1738	r *= a;	1919	r *= a;
1739	g *= a;	1920	g *= a;
1740	b *= a;	1921	b *= a;
1741	}	1922	}
1742	// microsoft visual "c" rounds instead of truncating...	1923	// microsoft visual "c" rounds instead of truncating...
1743	glColor4ub (MIN ((int)(r * 256.f), 255),	1924	glColor4f (r, g, b, a);
1744	MIN ((int)(g * 256.f), 255),
1745	MIN ((int)(b * 256.f), 255),
1746	MIN ((int)(a * 256.f), 255));
1747		1925
1748	void glInterleavedArrays (int format, int stride, char *data)	1926	void glInterleavedArrays (int format, int stride, char *data)
1749		1927
1750	void glDrawElements (int mode, int count, int type, char *indices)	1928	void glDrawElements (int mode, int count, int type, char *indices)
1751		1929

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs. Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC