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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.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>
		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	{
115	pango_layout_get_pixel_size (self->pl, w, h);	149	pango_layout_get_pixel_size (self->pl, w, h);
116		150
117	if (!w) w = 1;	151	if (!w) w = 1;
118	if (!h) h = 1;	152	if (!h) h = 1;
…		…
148	int texs;	182	int texs;
149	maptex *tex;	183	maptex *tex;
150		184
151	int32_t rows;	185	int32_t rows;
152	maprow *row;	186	maprow *row;
153	} *CFClient__Map;	187	} *CFPlus__Map;
154		188
155	static char *	189	static char *
156	prepend (char *ptr, int sze, int inc)	190	prepend (char *ptr, int sze, int inc)
157	{	191	{
158	char *p;	192	char *p;
…		…
176		210
177	#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))
178	#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))
179		213
180	static maprow *	214	static maprow *
181	map_get_row (CFClient__Map self, int y)	215	map_get_row (CFPlus__Map self, int y)
182	{	216	{
183	if (0 > y)	217	if (0 > y)
184	{	218	{
185	int extend = - y + MAP_EXTEND_Y;	219	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	220	Prepend (maprow, self->row, self->rows, extend);
…		…
224		258
225	return row->col + (x - row->c0);	259	return row->col + (x - row->c0);
226	}	260	}
227		261
228	static mapcell *	262	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	263	map_get_cell (CFPlus__Map self, int x, int y)
230	{	264	{
231	return row_get_cell (map_get_row (self, y), x);	265	return row_get_cell (map_get_row (self, y), x);
232	}	266	}
233		267
234	static void	268	static void
235	map_clear (CFClient__Map self)	269	map_clear (CFPlus__Map self)
236	{	270	{
237	int r;	271	int r;
238		272
239	for (r = 0; r < self->rows; r++)	273	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	274	Safefree (self->row[r].col);
…		…
248	self->row = 0;	282	self->row = 0;
249	self->rows = 0;	283	self->rows = 0;
250	}	284	}
251		285
252	static void	286	static void
253	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)
254	{	288	{
255	int x, y;	289	int x, y;
256	maprow *row;	290	maprow *row;
257		291
258	for (y = y0; y < y0 + h; y++)	292	for (y = y0; y < y0 + h; y++)
…		…
298	ev.data2 = 0;	332	ev.data2 = 0;
299		333
300	SDL_PushEvent ((SDL_Event *)&ev);	334	SDL_PushEvent ((SDL_Event *)&ev);
301	}	335	}
302		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
303	MODULE = CFClient PACKAGE = CFClient	354	MODULE = CFPlus PACKAGE = CFPlus
304		355
305	PROTOTYPES: ENABLE	356	PROTOTYPES: ENABLE
306		357
307	BOOT:	358	BOOT:
308	{	359	{
309	HV *stash = gv_stashpv ("CFClient", 1);	360	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	361	static const struct {
311	const char *name;	362	const char *name;
312	IV iv;	363	IV iv;
313	} *civ, const_iv[] = {	364	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	365	# define const_iv(name) { # name, (IV)name }
…		…
415		466
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	469	}
419		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
420	void	482	void
421	pango_init ()	483	pango_init ()
422	CODE:	484	CODE:
423	{	485	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	486	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	488	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	}	489	}
432		490
433	int	491	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	492	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		493
436	void	494	void
437	SDL_Quit ()	495	SDL_Quit ()
438		496
439	void	497	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	504	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	506	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		507
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	508	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	509	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		510
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	511	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		515
458	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);
459		519
460	SDL_EnableUNICODE (1);	520	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		522
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	523	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	612	break;
553	}	613	}
554		614
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	615	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	616	}
557	}	617	}
558		618
559	int	619	int
560	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)
…		…
576	#endif	636	#endif
577		637
578	void	638	void
579	add_font (char *file)	639	add_font (char *file)
580	CODE:	640	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		642
587	void	643	void
588	load_image_inline (SV *image_)	644	load_image_inline (SV *image_)
589	ALIAS:	645	ALIAS:
590	load_image_file = 1	646	load_image_file = 1
…		…
632		688
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	689	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		690
635	assert (surface2->pitch == surface2->w * 4);	691	assert (surface2->pitch == surface2->w * 4);
636		692
		693	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	694	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	695	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	696	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	697	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)));	698	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	699	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	700	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		701	SDL_UnlockSurface (surface2);
646		702
647	SDL_FreeSurface (surface);	703	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	704	SDL_FreeSurface (surface2);
649	}	705	}
650		706
…		…
686	CODE:	742	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	743	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	744	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	745	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	746	#endif
691	exit (1);	747	_exit (1);
692		748
		749	void
		750	_exit (int retval)
		751	CODE:
		752	_exit (retval);
		753
693	MODULE = CFClient PACKAGE = CFClient::Font	754	MODULE = CFPlus PACKAGE = CFPlus::Font
694		755
695	CFClient::Font	756	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	757	new_from_file (SV class, char path, int id = 0)
697	CODE:	758	CODE:
698	{	759	{
699	int count;	760	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	761	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	764	}
704	OUTPUT:	765	OUTPUT:
705	RETVAL	766	RETVAL
706		767
707	void	768	void
708	DESTROY (CFClient::Font self)	769	DESTROY (CFPlus::Font self)
709	CODE:	770	CODE:
710	pango_font_description_free (self);	771	pango_font_description_free (self);
711		772
712	void	773	void
713	make_default (CFClient::Font self)	774	make_default (CFPlus::Font self)
714	CODE:	775	CODE:
715	default_font = self;	776	default_font = self;
716		777
717	MODULE = CFClient PACKAGE = CFClient::Layout	778	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		779
719	CFClient::Layout	780	void
720	new (SV *class, int rgba = 0)	781	reset_glyph_cache ()
721	CODE:	782	CODE:
722	#if _WIN32	783	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	784
724	#endif	785	CFPlus::Layout
		786	new (SV *class)
		787	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	788	New (0, RETVAL, 1, struct cf_layout);
726		789
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	790	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	791	RETVAL->r = 1.;
730	RETVAL->g = 1.;	792	RETVAL->g = 1.;
731	RETVAL->b = 1.;	793	RETVAL->b = 1.;
732	RETVAL->a = 1.;	794	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	795	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	799	layout_update_font (RETVAL);
738	OUTPUT:	800	OUTPUT:
739	RETVAL	801	RETVAL
740		802
741	void	803	void
742	DESTROY (CFClient::Layout self)	804	DESTROY (CFPlus::Layout self)
743	CODE:	805	CODE:
744	g_object_unref (self->pl);	806	g_object_unref (self->pl);
745	Safefree (self);	807	Safefree (self);
746		808
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	809	void
755	set_text (CFClient::Layout self, SV *text_)	810	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	811	CODE:
757	{	812	{
758	STRLEN textlen;	813	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	814	char *text = SvPVutf8 (text_, textlen);
760		815
761	pango_layout_set_text (self->pl, text, textlen);	816	pango_layout_set_text (self->pl, text, textlen);
762	}	817	}
763		818
764	void	819	void
765	set_markup (CFClient::Layout self, SV *text_)	820	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	821	CODE:
767	{	822	{
768	STRLEN textlen;	823	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
770		825
771	pango_layout_set_markup (self->pl, text, textlen);	826	pango_layout_set_markup (self->pl, text, textlen);
772	}	827	}
773		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
774	SV *	914	SV *
775	get_text (CFClient::Layout self)	915	get_text (CFPlus::Layout self)
776	CODE:	916	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	918	sv_utf8_decode (RETVAL);
779	OUTPUT:	919	OUTPUT:
780	RETVAL	920	RETVAL
781		921
782	void	922	void
783	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.)
784	CODE:	924	CODE:
785	self->r = r;	925	self->r = r;
786	self->g = g;	926	self->g = g;
787	self->b = b;	927	self->b = b;
788	self->a = a;	928	self->a = a;
789		929
790	void	930	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	931	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	932	CODE:
793	if (self->font != font)	933	if (self->font != font)
794	{	934	{
795	self->font = font;	935	self->font = font;
796	layout_update_font (self);	936	layout_update_font (self);
797	}	937	}
798		938
799	void	939	void
800	set_height (CFClient::Layout self, int base_height)	940	set_height (CFPlus::Layout self, int base_height)
801	CODE:	941	CODE:
802	if (self->base_height != base_height)	942	if (self->base_height != base_height)
803	{	943	{
804	self->base_height = base_height;	944	self->base_height = base_height;
805	layout_update_font (self);	945	layout_update_font (self);
806	}	946	}
807		947
808	void	948	void
809	set_width (CFClient::Layout self, int max_width = -1)	949	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	950	CODE:
811	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);
812		952
813	void	953	void
814	set_indent (CFClient::Layout self, int indent)	954	set_indent (CFPlus::Layout self, int indent)
815	CODE:	955	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		957
818	void	958	void
819	set_spacing (CFClient::Layout self, int spacing)	959	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	960	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		962
823	void	963	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	964	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	965	CODE:
826	pango_layout_set_ellipsize (self->pl,	966	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	967	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	970	: PANGO_ELLIPSIZE_NONE
831	);	971	);
832		972
833	void	973	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	974	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	975	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		977
838	void	978	void
839	size (CFClient::Layout self)	979	size (CFPlus::Layout self)
840	PPCODE:	980	PPCODE:
841	{	981	{
842	int w, h;	982	int w, h;
843		983
844	layout_get_pixel_size (self, &w, &h);	984	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	987	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	988	PUSHs (sv_2mortal (newSViv (h)));
849	}	989	}
850		990
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	1004	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1005	CODE:
854	{	1006	{
855	int index, trailing;	1007	int index, trailing;
856	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);
857	RETVAL = index;	1009	RETVAL = index;
858	}	1010	}
859	OUTPUT:	1011	OUTPUT:
860	RETVAL	1012	RETVAL
861		1013
862	void	1014	void
863	cursor_pos (CFClient::Layout self, int index)	1015	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1016	PPCODE:
865	{	1017	{
866	PangoRectangle strong_pos;	1018	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1020
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1025	}
874		1026
875	void	1027	void
876	render (CFClient::Layout self)	1028	render (CFPlus::Layout self, float x, float y)
877	PPCODE:	1029	PPCODE:
878	{	1030	pango_opengl_render_layout_subpixel (
879	SV *retval;	1031	self->pl,
880	int w, h;	1032	x * PANGO_SCALE, y * PANGO_SCALE,
		1033	self->r, self->g, self->b, self->a
		1034	);
881		1035
882	layout_get_pixel_size (self, &w, &h);	1036	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1037
884	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)
885	{	1046	{
886	cairo_surface_t *surface;	1047	int nw = minpot (ow);
887	cairo_t *cairo;	1048	int nh = minpot (oh);
888		1049
889	retval = newSV (w * h * 4);	1050	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1051	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1052	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1053	{
912	uint32_t rgba = *p;	1054	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1055	char *data = SvPVbyte (data_, datalen);
914	#if 0	1056	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1057	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1058
922	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_);
923	}	1067	}
924	#endif	1068
925	#endif	1069	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1070	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1071	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1072	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1073	}
965		1074
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1075	void
969	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.)
970	PROTOTYPE: $$$;$$	1077	PROTOTYPE: $$$;$$
971	ALIAS:	1078	ALIAS:
972	draw_quad_alpha = 1	1079	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1080	draw_quad_alpha_premultiplied = 2
974	CODE:	1081	CODE:
…		…
990		1097
991	if (ix == 2)	1098	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1099	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1100	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1101	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1102	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1103
997	glEnable (GL_ALPHA_TEST);	1104	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1105	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1106	}
1000		1107
…		…
1012	glDisable (GL_ALPHA_TEST);	1119	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1120	glDisable (GL_BLEND);
1014	}	1121	}
1015	}	1122	}
1016		1123
1017	MODULE = CFClient PACKAGE = CFClient::Map	1124	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1125
1019	CFClient::Map	1126	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1127	new (SV *class, int map_width, int map_height)
1021	CODE:	1128	CODE:
1022	New (0, RETVAL, 1, struct map);	1129	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1130	RETVAL->x = 0;
1024	RETVAL->y = 0;	1131	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1141	RETVAL->row = 0;
1035	OUTPUT:	1142	OUTPUT:
1036	RETVAL	1143	RETVAL
1037		1144
1038	void	1145	void
1039	DESTROY (CFClient::Map self)	1146	DESTROY (CFPlus::Map self)
1040	CODE:	1147	CODE:
1041	{	1148	{
1042	map_clear (self);	1149	map_clear (self);
1043	Safefree (self->face);	1150	Safefree (self->face);
		1151	Safefree (self->tex);
1044	Safefree (self);	1152	Safefree (self);
1045	}	1153	}
1046		1154
1047	void	1155	void
1048	clear (CFClient::Map self)	1156	clear (CFPlus::Map self)
1049	CODE:	1157	CODE:
1050	map_clear (self);	1158	map_clear (self);
1051		1159
1052	void	1160	void
1053	set_face (CFClient::Map self, int face, int texid)	1161	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1162	CODE:
1055	{	1163	{
1056	while (self->faces <= face)	1164	while (self->faces <= face)
1057	{	1165	{
1058	Append (mapface, self->face, self->faces, self->faces);	1166	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1169
1062	self->face [face] = texid;	1170	self->face [face] = texid;
1063	}	1171	}
1064		1172
1065	void	1173	void
1066	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1067	CODE:	1175	CODE:
1068	{	1176	{
1069	while (self->texs <= texid)	1177	while (self->texs <= texid)
1070	{	1178	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1179	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1203	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1205	}
1098		1206
1099	int	1207	int
1100	ox (CFClient::Map self)	1208	ox (CFPlus::Map self)
1101	ALIAS:	1209	ALIAS:
1102	oy = 1	1210	oy = 1
1103	x = 2	1211	x = 2
1104	y = 3	1212	y = 3
1105	w = 4	1213	w = 4
…		…
1116	}	1224	}
1117	OUTPUT:	1225	OUTPUT:
1118	RETVAL	1226	RETVAL
1119		1227
1120	void	1228	void
1121	scroll (CFClient::Map self, int dx, int dy)	1229	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1230	CODE:
1123	{	1231	{
1124	if (dx > 0)	1232	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1233	map_blank (self, self->x, self->y, dx - 1, self->h);
1126	else if (dx < 0)	1234	else if (dx < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1250	self->y += MAP_EXTEND_Y;
1143	}	1251	}
1144	}	1252	}
1145		1253
1146	void	1254	void
1147	map1a_update (CFClient::Map self, SV *data_)	1255	map1a_update (CFPlus::Map self, SV *data_)
1148	CODE:	1256	CODE:
1149	{	1257	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1258	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1259	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1260	mapcell *cell;
…		…
1154		1262
1155	while (data < data_end)	1263	while (data < data_end)
1156	{	1264	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1265	flags = (data [0] << 8) + data [1]; data += 2;
1158		1266
1159	x = ((flags >> 10) & 63) + self->x;	1267	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1268	y = self->y + ((flags >> 4) & 63);
1161		1269
1162	cell = map_get_cell (self, x, y);	1270	cell = map_get_cell (self, x, y);
1163		1271
1164	if (flags & 15)	1272	if (flags & 15)
1165	{	1273	{
…		…
1194	cell->darkness = -1;	1302	cell->darkness = -1;
1195	}	1303	}
1196	}	1304	}
1197		1305
1198	SV *	1306	SV *
1199	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)
1200	CODE:	1308	CODE:
1201	{	1309	{
1202	int x1, x;	1310	int x1, x;
1203	int y1, y;	1311	int y1, y;
1204	int z;	1312	int z;
…		…
1254	}	1362	}
1255	OUTPUT:	1363	OUTPUT:
1256	RETVAL	1364	RETVAL
1257		1365
1258	void	1366	void
1259	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)
1260	PPCODE:	1368	CODE:
1261	{	1369	{
1262	int vx, vy;	1370	int vx, vy;
1263	int x, y, z;	1371	int x, y, z;
1264	int last_name;	1372	int last_name;
1265	mapface face;	1373	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1374
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1377
1277	/*	1378	/*
1278	int vx = self->vx = self->w >= sw	1379	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1380	? self->x + (self->w - sw) / 2
1280	: 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));
…		…
1284	: 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));
1285	*/	1386	*/
1286		1387
1287	glColor4ub (255, 255, 255, 255);	1388	glColor4ub (255, 255, 255, 255);
1288		1389
		1390	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1391	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1392	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1393	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1394
1294	glBegin (GL_QUADS);	1395	glBegin (GL_QUADS);
1295		1396
…		…
1303		1404
1304	for (x = 0; x < sw; x++)	1405	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1406	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1407	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1408	mapcell *cell = row->col + (x + vx - row->c0);
1308
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312		1409
1313	face = cell->face [z];	1410	face = cell->face [z];
1314		1411
1315	if (face)	1412	if (face)
1316	{	1413	{
…		…
1337		1434
1338	glEnd ();	1435	glEnd ();
1339		1436
1340	glDisable (GL_TEXTURE_2D);	1437	glDisable (GL_TEXTURE_2D);
1341	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	}
1342		1533
1343	EXTEND (SP, 3);	1534	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1535	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1536	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1537	PUSHs (darkness_sv);
1347	}	1538	}
1348		1539
1349	SV *	1540	SV *
1350	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)
1351	CODE:	1542	CODE:
1352	{	1543	{
1353	int x, y, x1, y1;	1544	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1545	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1546	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1608	}
1418	OUTPUT:	1609	OUTPUT:
1419	RETVAL	1610	RETVAL
1420		1611
1421	void	1612	void
1422	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)
1423	PPCODE:	1614	PPCODE:
1424	{	1615	{
1425	int x, y, z;	1616	int x, y, z;
1426	int w, h;	1617	int w, h;
1427	int x1, y1;	1618	int x1, y1;
…		…
1476	}	1667	}
1477	}	1668	}
1478	}	1669	}
1479	}	1670	}
1480		1671
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1672	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1673
1483	CFClient::MixChunk	1674	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1675	new_from_file (SV class, char path)
1485	CODE:	1676	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1677	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1678	OUTPUT:
1488	RETVAL	1679	RETVAL
1489		1680
1490	void	1681	void
1491	DESTROY (CFClient::MixChunk self)	1682	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1683	CODE:
1493	Mix_FreeChunk (self);	1684	Mix_FreeChunk (self);
1494		1685
1495	int	1686	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1687	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1688	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1689	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1690	OUTPUT:
1500	RETVAL	1691	RETVAL
1501		1692
1502	int	1693	int
1503	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)
1504	CODE:	1695	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1697	OUTPUT:
1507	RETVAL	1698	RETVAL
1508		1699
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1700	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1701
1511	int	1702	int
1512	volume (int volume = -1)	1703	volume (int volume = -1)
1513	CODE:	1704	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1705	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1706	OUTPUT:
1516	RETVAL	1707	RETVAL
1517		1708
1518	CFClient::MixMusic	1709	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1710	new_from_file (SV class, char path)
1520	CODE:	1711	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1712	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1713	OUTPUT:
1523	RETVAL	1714	RETVAL
1524		1715
1525	void	1716	void
1526	DESTROY (CFClient::MixMusic self)	1717	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1718	CODE:
1528	Mix_FreeMusic (self);	1719	Mix_FreeMusic (self);
1529		1720
1530	int	1721	int
1531	play (CFClient::MixMusic self, int loops = -1)	1722	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1723	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1724	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1725	OUTPUT:
1535	RETVAL	1726	RETVAL
1536		1727
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1728	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1729
1539	BOOT:	1730	BOOT:
1540	{	1731	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1732	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1733	static const struct {
1543	const char *name;	1734	const char *name;
1544	IV iv;	1735	IV iv;
1545	} *civ, const_iv[] = {	1736	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1737	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1744	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1745	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1746	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1747	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1748	const_iv (GL_RESCALE_NORMAL),
		1749	const_iv (GL_FRONT),
		1750	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1751	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1752	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1753	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1754	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1755	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1756	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1757	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1758	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1759	const_iv (GL_RGB),
1566	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),
1567	const_iv (GL_UNSIGNED_BYTE),	1764	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1765	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1766	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1767	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1768	const_iv (GL_INTENSITY),
…		…
1645	OUTPUT:	1842	OUTPUT:
1646	RETVAL	1843	RETVAL
1647		1844
1648	int glGetError ()	1845	int glGetError ()
1649		1846
		1847	void glFinish ()
		1848
1650	void glClear (int mask)	1849	void glClear (int mask)
1651		1850
1652	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)
1653	PROTOTYPE: @	1852	PROTOTYPE: @
1654		1853
…		…
1677	void glPushMatrix ()	1876	void glPushMatrix ()
1678		1877
1679	void glPopMatrix ()	1878	void glPopMatrix ()
1680		1879
1681	void glLoadIdentity ()	1880	void glLoadIdentity ()
		1881
		1882	void glDrawBuffer (int buffer)
		1883
		1884	void glReadBuffer (int buffer)
1682		1885
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1886	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1887	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		1888
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1889	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	1919	r *= a;
1717	g *= a;	1920	g *= a;
1718	b *= a;	1921	b *= a;
1719	}	1922	}
1720	// microsoft visual "c" rounds instead of truncating...	1923	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	1924	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		1925
1726	void glInterleavedArrays (int format, int stride, char *data)	1926	void glInterleavedArrays (int format, int stride, char *data)
1727		1927
1728	void glDrawElements (int mode, int count, int type, char *indices)	1928	void glDrawElements (int mode, int count, int type, char *indices)
1729		1929

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC