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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 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	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
119	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
120		153
121	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
122	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
123		156
124	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
125	}	162	}
126		163
127	typedef uint16_t mapface;	164	typedef uint16_t mapface;
128		165
129	typedef struct {	166	typedef struct {
…		…
152	int texs;	189	int texs;
153	maptex *tex;	190	maptex *tex;
154		191
155	int32_t rows;	192	int32_t rows;
156	maprow *row;	193	maprow *row;
157	} *CFClient__Map;	194	} *CFPlus__Map;
158		195
159	static char *	196	static char *
160	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
161	{	198	{
162	char *p;	199	char *p;
…		…
180		217
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	218	#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))	219	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		220
184	static maprow *	221	static maprow *
185	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
186	{	223	{
187	if (0 > y)	224	if (0 > y)
188	{	225	{
189	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
228		265
229	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
230	}	267	}
231		268
232	static mapcell *	269	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
234	{	271	{
235	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
236	}	273	}
237		274
238	static void	275	static void
239	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
240	{	277	{
241	int r;	278	int r;
242		279
243	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
252	self->row = 0;	289	self->row = 0;
253	self->rows = 0;	290	self->rows = 0;
254	}	291	}
255		292
256	static void	293	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	294	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	295	{
259	int x, y;	296	int x, y;
260	maprow *row;	297	maprow *row;
261		298
262	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
319	n \|= n >> 16;	356	n \|= n >> 16;
320		357
321	return n + 1;	358	return n + 1;
322	}	359	}
323		360
324	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
325		362
326	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
327		364
328	BOOT:	365	BOOT:
329	{	366	{
330	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	368	static const struct {
332	const char *name;	369	const char *name;
333	IV iv;	370	IV iv;
334	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
436		473
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	474	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	476	}
440		477
		478	int
		479	in_destruct ()
		480	CODE:
		481	RETVAL = PL_main_cv == Nullcv;
		482	OUTPUT:
		483	RETVAL
		484
		485	NV floor (NV x)
		486
		487	NV ceil (NV x)
		488
441	void	489	void
442	pango_init ()	490	pango_init ()
443	CODE:	491	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	492	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
448	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	494	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	495	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	496	}
467		497
468	int	498	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		500
471	void	501	void
472	SDL_Quit ()	502	SDL_Quit ()
473		503
474	void	504	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		514
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		517
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
492		522
493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
		525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
494		528
495	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
497		531
498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
585	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
586	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
587	break;	621	break;
588	}	622	}
589		623
590	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
591	}	625	}
592	}	626	}
593		627
594	int	628	int
595	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	629	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
611	#endif	645	#endif
612		646
613	void	647	void
614	add_font (char *file)	648	add_font (char *file)
615	CODE:	649	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		651
622	void	652	void
623	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
624	ALIAS:	654	ALIAS:
625	load_image_file = 1	655	load_image_file = 1
…		…
667		697
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		699
670	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
671		701
		702	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	703	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
681		711
682	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
684	}	714	}
685		715
…		…
728	void	758	void
729	_exit (int retval)	759	_exit (int retval)
730	CODE:	760	CODE:
731	_exit (retval);	761	_exit (retval);
732		762
733	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
734		764
735	CFClient::Font	765	CFPlus::Font
736	new_from_file (SV class, char path, int id = 0)	766	new_from_file (SV class, char path, int id = 0)
737	CODE:	767	CODE:
738	{	768	{
739	int count;	769	int count;
740	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
743	}	773	}
744	OUTPUT:	774	OUTPUT:
745	RETVAL	775	RETVAL
746		776
747	void	777	void
748	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
749	CODE:	779	CODE:
750	pango_font_description_free (self);	780	pango_font_description_free (self);
751		781
752	void	782	void
753	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
754	CODE:	784	CODE:
755	default_font = self;	785	default_font = self;
756		786
757	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
758		788
759	CFClient::Layout	789	void
760	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
		791	CODE:
		792	tc_clear ();
		793
		794	CFPlus::Layout
		795	new (SV *class)
761	CODE:	796	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
763		798
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	800	RETVAL->r = 1.;
767	RETVAL->g = 1.;	801	RETVAL->g = 1.;
768	RETVAL->b = 1.;	802	RETVAL->b = 1.;
769	RETVAL->a = 1.;	803	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
774	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
775	OUTPUT:	809	OUTPUT:
776	RETVAL	810	RETVAL
777		811
778	void	812	void
779	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
780	CODE:	814	CODE:
781	g_object_unref (self->pl);	815	g_object_unref (self->pl);
782	Safefree (self);	816	Safefree (self);
783		817
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	818	void
792	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
793	CODE:	820	CODE:
794	{	821	{
795	STRLEN textlen;	822	STRLEN textlen;
796	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
797		824
798	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
799	}	826	}
800		827
801	void	828	void
802	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
803	CODE:	830	CODE:
804	{	831	{
805	STRLEN textlen;	832	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
807		834
808	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
809	}	836	}
810		837
		838	void
		839	set_shapes (CFPlus::Layout self, ...)
		840	CODE:
		841	{
		842	PangoAttrList *attrs = 0;
		843	const char *text = pango_layout_get_text (self->pl);
		844	const char *pos = text;
		845	int arg = 4;
		846
		847	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		848	{
		849	PangoRectangle inkrect, rect;
		850	PangoAttribute *attr;
		851
		852	int x = SvIV (ST (arg - 3));
		853	int y = SvIV (ST (arg - 2));
		854	int w = SvIV (ST (arg - 1));
		855	int h = SvIV (ST (arg ));
		856
		857	inkrect.x = 0;
		858	inkrect.y = 0;
		859	inkrect.width = 0;
		860	inkrect.height = 0;
		861
		862	rect.x = x * PANGO_SCALE;
		863	rect.y = y * PANGO_SCALE;
		864	rect.width = w * PANGO_SCALE;
		865	rect.height = h * PANGO_SCALE;
		866
		867	if (!attrs)
		868	attrs = pango_layout_get_attributes (self->pl);
		869
		870	attr = pango_attr_shape_new (&inkrect, &rect);
		871	attr->start_index = pos - text;
		872	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		873	pango_attr_list_insert (attrs, attr);
		874
		875	arg += 4;
		876	pos += sizeof (OBJ_STR) - 1;
		877	}
		878
		879	if (attrs)
		880	pango_layout_set_attributes (self->pl, attrs);
		881	}
		882
		883	void
		884	get_shapes (CFPlus::Layout self)
		885	PPCODE:
		886	{
		887	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		888
		889	do
		890	{
		891	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		892
		893	if (run && shape_attr_p (run))
		894	{
		895	PangoRectangle extents;
		896	pango_layout_iter_get_run_extents (iter, 0, &extents);
		897
		898	EXTEND (SP, 2);
		899	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		901	}
		902	}
		903	while (pango_layout_iter_next_run (iter));
		904
		905	pango_layout_iter_free (iter);
		906	}
		907
		908	int
		909	has_wrapped (CFPlus::Layout self)
		910	CODE:
		911	{
		912	int lines = 1;
		913	const char *text = pango_layout_get_text (self->pl);
		914
		915	while (*text)
		916	lines += *text++ == '\n';
		917
		918	RETVAL = lines < pango_layout_get_line_count (self->pl);
		919	}
		920	OUTPUT:
		921	RETVAL
		922
811	SV *	923	SV *
812	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
813	CODE:	925	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
815	sv_utf8_decode (RETVAL);	927	sv_utf8_decode (RETVAL);
816	OUTPUT:	928	OUTPUT:
817	RETVAL	929	RETVAL
818		930
819	void	931	void
820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	932	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
821	CODE:	933	CODE:
822	self->r = r;	934	self->r = r;
823	self->g = g;	935	self->g = g;
824	self->b = b;	936	self->b = b;
825	self->a = a;	937	self->a = a;
826		938
827	void	939	void
828	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
829	CODE:	941	CODE:
830	if (self->font != font)	942	if (self->font != font)
831	{	943	{
832	self->font = font;	944	self->font = font;
833	layout_update_font (self);	945	layout_update_font (self);
834	}	946	}
835		947
836	void	948	void
837	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
838	CODE:	950	CODE:
839	if (self->base_height != base_height)	951	if (self->base_height != base_height)
840	{	952	{
841	self->base_height = base_height;	953	self->base_height = base_height;
842	layout_update_font (self);	954	layout_update_font (self);
843	}	955	}
844		956
845	void	957	void
846	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
847	CODE:	959	CODE:
848	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	960	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
849		961
850	void	962	void
851	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
852	CODE:	964	CODE:
853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
854		966
855	void	967	void
856	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
857	CODE:	969	CODE:
858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
859		971
860	void	972	void
861	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
862	CODE:	974	CODE:
863	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
864	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
867	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
868	);	980	);
869		981
870	void	982	void
871	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
872	CODE:	984	CODE:
873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
874		986
875	void	987	void
876	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
877	PPCODE:	989	PPCODE:
878	{	990	{
879	int w, h;	991	int w, h;
880		992
881	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
886	}	998	}
887		999
888	int	1000	int
		1001	descent (CFPlus::Layout self)
		1002	CODE:
		1003	{
		1004	PangoRectangle rect;
		1005	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1006	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1007	RETVAL = PANGO_DESCENT (rect);
		1008	}
		1009	OUTPUT:
		1010	RETVAL
		1011
		1012	int
889	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
890	CODE:	1014	CODE:
891	{	1015	{
892	int index, trailing;	1016	int index, trailing;
893	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1017	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
894	RETVAL = index;	1018	RETVAL = index;
895	}	1019	}
896	OUTPUT:	1020	OUTPUT:
897	RETVAL	1021	RETVAL
898		1022
899	void	1023	void
900	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
901	PPCODE:	1025	PPCODE:
902	{	1026	{
903	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
904	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
905		1029
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1034	}
911		1035
912	void	1036	void
913	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
914	PPCODE:	1038	PPCODE:
915	{	1039	pango_opengl_render_layout_subpixel (
916	SV *retval;	1040	self->pl,
917	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
918		1042	self->r, self->g, self->b, self->a,
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1043	flags
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t p = (uint32_t )SvPVX (retval);
945	uint32_t e = p + w h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) \| (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) \| a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));
970	PUSHs (sv_2mortal (newSViv (h)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}	1044	);
975	else
976	{
977	FT_Bitmap bitmap;
978		1045
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));
996	PUSHs (sv_2mortal (newSViv (h)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}
1001	}
1002
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
1004		1047
1005	void	1048	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1049	pad2pot (SV data_, SV w_, SV *h_)
1007	CODE:	1050	CODE:
1008	{	1051	{
…		…
1038	}	1081	}
1039	}	1082	}
1040	}	1083	}
1041		1084
1042	void	1085	void
1043	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1086	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1044	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
1045	ALIAS:	1088	ALIAS:
1046	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
1047	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
1048	CODE:	1091	CODE:
…		…
1086	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
1087	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1088	}	1131	}
1089	}	1132	}
1090		1133
1091	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1092		1135
1093	CFClient::Map	1136	CFPlus::Map
1094	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1095	CODE:	1138	CODE:
1096	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1097	RETVAL->x = 0;	1140	RETVAL->x = 0;
1098	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1108	RETVAL->row = 0;	1151	RETVAL->row = 0;
1109	OUTPUT:	1152	OUTPUT:
1110	RETVAL	1153	RETVAL
1111		1154
1112	void	1155	void
1113	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1114	CODE:	1157	CODE:
1115	{	1158	{
1116	map_clear (self);	1159	map_clear (self);
1117	Safefree (self->face);	1160	Safefree (self->face);
1118	Safefree (self->tex);	1161	Safefree (self->tex);
1119	Safefree (self);	1162	Safefree (self);
1120	}	1163	}
1121		1164
1122	void	1165	void
1123	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1124	CODE:	1167	CODE:
1125	map_clear (self);	1168	map_clear (self);
1126		1169
1127	void	1170	void
1128	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1129	CODE:	1172	CODE:
1130	{	1173	{
1131	while (self->faces <= face)	1174	while (self->faces <= face)
1132	{	1175	{
1133	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1136		1179
1137	self->face [face] = texid;	1180	self->face [face] = texid;
1138	}	1181	}
1139		1182
1140	void	1183	void
1141	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)	1184	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)
1142	CODE:	1185	CODE:
1143	{	1186	{
1144	while (self->texs <= texid)	1187	while (self->texs <= texid)
1145	{	1188	{
1146	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1170	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1172	}	1215	}
1173		1216
1174	int	1217	int
1175	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1176	ALIAS:	1219	ALIAS:
1177	oy = 1	1220	oy = 1
1178	x = 2	1221	x = 2
1179	y = 3	1222	y = 3
1180	w = 4	1223	w = 4
…		…
1191	}	1234	}
1192	OUTPUT:	1235	OUTPUT:
1193	RETVAL	1236	RETVAL
1194		1237
1195	void	1238	void
1196	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1197	CODE:	1240	CODE:
1198	{	1241	{
1199	if (dx > 0)	1242	if (dx > 0)
1200	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1201	else if (dx < 0)	1244	else if (dx < 0)
…		…
1217	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1218	}	1261	}
1219	}	1262	}
1220		1263
1221	void	1264	void
1222	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1223	CODE:	1266	CODE:
1224	{	1267	{
1225	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1226	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1227	mapcell *cell;	1270	mapcell *cell;
…		…
1229		1272
1230	while (data < data_end)	1273	while (data < data_end)
1231	{	1274	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1233		1276
1234	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1236		1279
1237	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1238		1281
1239	if (flags & 15)	1282	if (flags & 15)
1240	{	1283	{
…		…
1244	cell->face [0] = 0;	1287	cell->face [0] = 0;
1245	cell->face [1] = 0;	1288	cell->face [1] = 0;
1246	cell->face [2] = 0;	1289	cell->face [2] = 0;
1247	}	1290	}
1248		1291
		1292	if (flags & 8)
		1293	{
		1294	fprintf (stderr, "oi\n");//D
		1295	if (extmap)
		1296	{
		1297	uint8_t ext, cmd;
		1298
		1299	do
		1300	{
		1301
		1302	ext = *data++;
		1303	cmd = ext & 0x7f;
		1304
		1305	fprintf (stderr, "extcmd = %x\n", ext);//D
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64;
		1309	}
		1310	while (cmd & 0x80);
		1311	}
		1312	else
1249	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1250		1315
1251	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1252		1317
1253	if (flags & 4)	1318	if (flags & 4)
1254	{	1319	{
…		…
1269	cell->darkness = -1;	1334	cell->darkness = -1;
1270	}	1335	}
1271	}	1336	}
1272		1337
1273	SV *	1338	SV *
1274	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1275	CODE:	1340	CODE:
1276	{	1341	{
1277	int x1, x;	1342	int x1, x;
1278	int y1, y;	1343	int y1, y;
1279	int z;	1344	int z;
…		…
1329	}	1394	}
1330	OUTPUT:	1395	OUTPUT:
1331	RETVAL	1396	RETVAL
1332		1397
1333	void	1398	void
1334	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335	PPCODE:	1400	CODE:
1336	{	1401	{
1337	int vx, vy;	1402	int vx, vy;
1338	int x, y, z;	1403	int x, y, z;
1339	int last_name;	1404	int last_name;
1340	mapface face;	1405	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1343	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1344		1406
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1409
1352	/*	1410	/*
1353	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1359	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/	1418	*/
1361		1419
1362	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1363		1421
		1422	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1426
1369	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1370		1428
…		…
1378		1436
1379	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1439	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1383
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387		1441
1388	face = cell->face [z];	1442	face = cell->face [z];
1389		1443
1390	if (face)	1444	if (face)
1391	{	1445	{
…		…
1412		1466
1413	glEnd ();	1467	glEnd ();
1414		1468
1415	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1416	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
		1471	}
		1472
		1473	void
		1474	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1475	CODE:
		1476	{
		1477	static float color[16][3] = {
		1478	{ 0.00F, 0.00F, 0.00F },
		1479	{ 1.00F, 1.00F, 1.00F },
		1480	{ 0.00F, 0.00F, 0.55F },
		1481	{ 1.00F, 0.00F, 0.00F },
		1482
		1483	{ 1.00F, 0.54F, 0.00F },
		1484	{ 0.11F, 0.56F, 1.00F },
		1485	{ 0.93F, 0.46F, 0.00F },
		1486	{ 0.18F, 0.54F, 0.34F },
		1487
		1488	{ 0.56F, 0.73F, 0.56F },
		1489	{ 0.80F, 0.80F, 0.80F },
		1490	{ 0.55F, 0.41F, 0.13F },
		1491	{ 0.99F, 0.77F, 0.26F },
		1492
		1493	{ 0.74F, 0.65F, 0.41F },
		1494
		1495	{ 0.00F, 1.00F, 1.00F },
		1496	{ 1.00F, 0.00F, 1.00F },
		1497	{ 1.00F, 1.00F, 0.00F },
		1498	};
		1499
		1500	int x, y;
		1501
		1502	glEnable (GL_TEXTURE_2D);
		1503	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1504	glEnable (GL_BLEND);
		1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1506	glBegin (GL_QUADS);
		1507
		1508	for (y = 0; y < h; y++)
		1509	for (x = 0; x < w; x++)
		1510	{
		1511	unsigned char m = data [x + y * w];
		1512
		1513	if (m)
		1514	{
		1515	float *c = color [m & 15];
		1516
		1517	float tx1 = m & 0x40 ? 0.5 : 0.;
		1518	float tx2 = tx1 + 0.5;
		1519
		1520	glColor4f (c[0], c[1], c[2], 0.75);
		1521	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1522	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1523	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1524	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1525	}
		1526	}
		1527
		1528	glEnd ();
		1529	glDisable (GL_BLEND);
		1530	glDisable (GL_TEXTURE_2D);
		1531	}
		1532
		1533	void
		1534	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1535	PPCODE:
		1536	{
		1537	int vx, vy;
		1538	int x, y;
		1539	int sw4 = (sw + 3) & ~3;
		1540	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1541	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1542
		1543	memset (darkness, 255, sw4 * sh);
		1544	SvPOK_only (darkness_sv);
		1545	SvCUR_set (darkness_sv, sw4 * sh);
		1546
		1547	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1548	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1549
		1550	for (y = 0; y < sh; y++)
		1551	if (0 <= y + vy && y + vy < self->rows)
		1552	{
		1553	maprow *row = self->row + (y + vy);
		1554
		1555	for (x = 0; x < sw; x++)
		1556	if (row->c0 <= x + vx && x + vx < row->c1)
		1557	{
		1558	mapcell *cell = row->col + (x + vx - row->c0);
		1559
		1560	darkness[y * sw4 + x] = cell->darkness < 0
		1561	? 255 - FOW_DARKNESS
		1562	: 255 - cell->darkness;
		1563	}
		1564	}
1417		1565
1418	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1422	}	1570	}
1423		1571
1424	SV *	1572	SV *
1425	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1573	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1426	CODE:	1574	CODE:
1427	{	1575	{
1428	int x, y, x1, y1;	1576	int x, y, x1, y1;
1429	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1430	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1492	}	1640	}
1493	OUTPUT:	1641	OUTPUT:
1494	RETVAL	1642	RETVAL
1495		1643
1496	void	1644	void
1497	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1645	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1498	PPCODE:	1646	PPCODE:
1499	{	1647	{
1500	int x, y, z;	1648	int x, y, z;
1501	int w, h;	1649	int w, h;
1502	int x1, y1;	1650	int x1, y1;
…		…
1551	}	1699	}
1552	}	1700	}
1553	}	1701	}
1554	}	1702	}
1555		1703
1556	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1557		1705
1558	CFClient::MixChunk	1706	CFPlus::MixChunk
1559	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1560	CODE:	1708	CODE:
1561	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1562	OUTPUT:	1710	OUTPUT:
1563	RETVAL	1711	RETVAL
1564		1712
1565	void	1713	void
1566	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1567	CODE:	1715	CODE:
1568	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1569		1717
1570	int	1718	int
1571	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1572	CODE:	1720	CODE:
1573	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1574	OUTPUT:	1722	OUTPUT:
1575	RETVAL	1723	RETVAL
1576		1724
1577	int	1725	int
1578	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1726	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1579	CODE:	1727	CODE:
1580	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1581	OUTPUT:	1729	OUTPUT:
1582	RETVAL	1730	RETVAL
1583		1731
1584	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1585		1733
1586	int	1734	int
1587	volume (int volume = -1)	1735	volume (int volume = -1)
1588	CODE:	1736	CODE:
1589	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1590	OUTPUT:	1738	OUTPUT:
1591	RETVAL	1739	RETVAL
1592		1740
1593	CFClient::MixMusic	1741	CFPlus::MixMusic
1594	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1595	CODE:	1743	CODE:
1596	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1597	OUTPUT:	1745	OUTPUT:
1598	RETVAL	1746	RETVAL
1599		1747
1600	void	1748	void
1601	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1602	CODE:	1750	CODE:
1603	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1604		1752
1605	int	1753	int
1606	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1607	CODE:	1755	CODE:
1608	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1609	OUTPUT:	1757	OUTPUT:
1610	RETVAL	1758	RETVAL
1611		1759
1612	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1613		1761
1614	BOOT:	1762	BOOT:
1615	{	1763	{
1616	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1617	static const struct {	1765	static const struct {
1618	const char *name;	1766	const char *name;
1619	IV iv;	1767	IV iv;
1620	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1621	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
…		…
1628	const_iv (GL_SCISSOR_TEST),	1776	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1777	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1778	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1779	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1780	const_iv (GL_RESCALE_NORMAL),
		1781	const_iv (GL_FRONT),
		1782	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1783	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1787	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1790	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1642	const_iv (GL_RGBA),	1792	const_iv (GL_RGBA),
		1793	const_iv (GL_RGBA4),
		1794	const_iv (GL_RGBA8),
		1795	const_iv (GL_RGB5_A1),
1643	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1797	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1798	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1800	const_iv (GL_INTENSITY),
…		…
1679	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1680	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1681	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1682	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1683	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
1684	const_iv (GL_LINE_LOOP),	1838	const_iv (GL_LINE_LOOP),
1685	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1686	const_iv (GL_QUAD_STRIP),	1840	const_iv (GL_QUAD_STRIP),
1687	const_iv (GL_TRIANGLES),	1841	const_iv (GL_TRIANGLES),
1688	const_iv (GL_TRIANGLE_STRIP),	1842	const_iv (GL_TRIANGLE_STRIP),
…		…
1721	OUTPUT:	1875	OUTPUT:
1722	RETVAL	1876	RETVAL
1723		1877
1724	int glGetError ()	1878	int glGetError ()
1725		1879
		1880	void glFinish ()
		1881
1726	void glClear (int mask)	1882	void glClear (int mask)
1727		1883
1728	void glClearColor (float r, float g, float b, float a = 1.0)	1884	void glClearColor (float r, float g, float b, float a = 1.0)
1729	PROTOTYPE: @	1885	PROTOTYPE: @
1730		1886
…		…
1753	void glPushMatrix ()	1909	void glPushMatrix ()
1754		1910
1755	void glPopMatrix ()	1911	void glPopMatrix ()
1756		1912
1757	void glLoadIdentity ()	1913	void glLoadIdentity ()
		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
1758		1918
1759	# near_ and far_ are due to microsofts buggy "c" compiler	1919	# near_ and far_ are due to microsofts buggy "c" compiler
1760	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1920	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761		1921
1762	# near_ and far_ are due to microsofts buggy "c" compiler	1922	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1792	r *= a;	1952	r *= a;
1793	g *= a;	1953	g *= a;
1794	b *= a;	1954	b *= a;
1795	}	1955	}
1796	// microsoft visual "c" rounds instead of truncating...	1956	// microsoft visual "c" rounds instead of truncating...
1797	glColor4ub (MIN ((int)(r * 256.f), 255),	1957	glColor4f (r, g, b, a);
1798	MIN ((int)(g * 256.f), 255),
1799	MIN ((int)(b * 256.f), 255),
1800	MIN ((int)(a * 256.f), 255));
1801		1958
1802	void glInterleavedArrays (int format, int stride, char *data)	1959	void glInterleavedArrays (int format, int stride, char *data)
1803		1960
1804	void glDrawElements (int mode, int count, int type, char *indices)	1961	void glDrawElements (int mode, int count, int type, char *indices)
1805		1962
…		…
1882		2039
1883	void glEndList ()	2040	void glEndList ()
1884		2041
1885	void glCallList (int list)	2042	void glCallList (int list)
1886		2043
1887

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs. Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC