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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 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 {
…		…
132	float s, t;	169	float s, t;
133	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
134	} maptex;	171	} maptex;
135		172
136	typedef struct {	173	typedef struct {
137	int16_t darkness;	174	uint16_t darkness;
138	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
139	} mapcell;	177	} mapcell;
140		178
141	typedef struct {	179	typedef struct {
142	int32_t c0, c1;	180	int32_t c0, c1;
143	mapcell *col;	181	mapcell *col;
…		…
152	int texs;	190	int texs;
153	maptex *tex;	191	maptex *tex;
154		192
155	int32_t rows;	193	int32_t rows;
156	maprow *row;	194	maprow *row;
157	} *CFClient__Map;	195	} *CFPlus__Map;
158		196
159	static char *	197	static char *
160	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
161	{	199	{
162	char *p;	200	char *p;
…		…
180		218
181	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
182	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
183		221
184	static maprow *	222	static maprow *
185	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
186	{	224	{
187	if (0 > y)	225	if (0 > y)
188	{	226	{
189	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
190	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
228		266
229	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
230	}	268	}
231		269
232	static mapcell *	270	static mapcell *
233	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
234	{	272	{
235	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
236	}	274	}
237		275
238	static void	276	static void
239	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
240	{	278	{
241	int r;	279	int r;
242		280
243	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
244	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
252	self->row = 0;	290	self->row = 0;
253	self->rows = 0;	291	self->rows = 0;
254	}	292	}
255		293
256	static void	294	static void
257	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
258	{	296	{
259	int x, y;	297	int x, y;
260	maprow *row;	298	maprow *row;
261		299
262	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
271	if (x >= row->c0)	309	if (x >= row->c0)
272	{	310	{
273	if (x >= row->c1)	311	if (x >= row->c1)
274	break;	312	break;
275		313
276	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
277	}	315	}
278	}	316	}
279	}	317	}
280		318
281	static void	319	static void
…		…
319	n \|= n >> 16;	357	n \|= n >> 16;
320		358
321	return n + 1;	359	return n + 1;
322	}	360	}
323		361
324	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
325		363
326	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
327		365
328	BOOT:	366	BOOT:
329	{	367	{
330	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
331	static const struct {	369	static const struct {
332	const char *name;	370	const char *name;
333	IV iv;	371	IV iv;
334	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
335	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
436		474
437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	477	}
440		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
441	NV floor (NV x)	486	NV floor (NV x)
442		487
443	NV ceil (NV x)	488	NV ceil (NV x)
444		489
445	void	490	void
446	pango_init ()	491	pango_init ()
447	CODE:	492	CODE:
448	// delayed, so it can pick up new fonts added by AddFontResourceEx
449	{	493	{
450	{
451	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	496	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
454	}
455	{
456	cairo_font_options_t *fopt = cairo_font_options_create ();
457	cairo_fontmap = pango_cairo_font_map_get_default ();
458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
459	#ifdef _WIN32
460	// cairo looks like shit eaten twice on windows
461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
462	#else
463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
464	#endif
465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
467	pango_cairo_context_set_font_options (cairo_context, fopt);
468	cairo_font_options_destroy (fopt);
469	}
470	}	497	}
471		498
472	int	499	int
473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
474		501
475	void	502	void
476	SDL_Quit ()	503	SDL_Quit ()
477		504
478	void	505	void
…		…
493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
496		523
497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
498		529
499	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
501		532
502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
589	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
590	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
591	break;	622	break;
592	}	623	}
593		624
594	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
595	}	626	}
596	}	627	}
597		628
598	int	629	int
599	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
615	#endif	646	#endif
616		647
617	void	648	void
618	add_font (char *file)	649	add_font (char *file)
619	CODE:	650	CODE:
620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
621	#ifdef _WIN32
622	// cairo... sigh... requires win2000
623	AddFontResourceEx (file, FR_PRIVATE, 0);
624	#endif
625		652
626	void	653	void
627	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
628	ALIAS:	655	ALIAS:
629	load_image_file = 1	656	load_image_file = 1
…		…
671		698
672	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
673		700
674	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
675		702
		703	SDL_LockSurface (surface2);
676	EXTEND (SP, 5);	704	EXTEND (SP, 6);
677	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
678	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
679	SDL_LockSurface (surface2);
680	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
681	SDL_UnlockSurface (surface2);
682	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
683	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
684	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
685		712
686	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
687	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
688	}	715	}
689		716
…		…
732	void	759	void
733	_exit (int retval)	760	_exit (int retval)
734	CODE:	761	CODE:
735	_exit (retval);	762	_exit (retval);
736		763
737	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
738		765
739	CFClient::Font	766	CFPlus::Font
740	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
741	CODE:	768	CODE:
742	{	769	{
743	int count;	770	int count;
744	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
747	}	774	}
748	OUTPUT:	775	OUTPUT:
749	RETVAL	776	RETVAL
750		777
751	void	778	void
752	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
753	CODE:	780	CODE:
754	pango_font_description_free (self);	781	pango_font_description_free (self);
755		782
756	void	783	void
757	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
758	CODE:	785	CODE:
759	default_font = self;	786	default_font = self;
760		787
761	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
762		789
763	CFClient::Layout	790	void
764	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
		792	CODE:
		793	tc_clear ();
		794
		795	CFPlus::Layout
		796	new (SV *class)
765	CODE:	797	CODE:
766	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
767		799
768	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
769	RETVAL->rgba = rgba;
770	RETVAL->r = 1.;	801	RETVAL->r = 1.;
771	RETVAL->g = 1.;	802	RETVAL->g = 1.;
772	RETVAL->b = 1.;	803	RETVAL->b = 1.;
773	RETVAL->a = 1.;	804	RETVAL->a = 1.;
774	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
778	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
779	OUTPUT:	810	OUTPUT:
780	RETVAL	811	RETVAL
781		812
782	void	813	void
783	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
784	CODE:	815	CODE:
785	g_object_unref (self->pl);	816	g_object_unref (self->pl);
786	Safefree (self);	817	Safefree (self);
787		818
788	int
789	is_rgba (CFClient::Layout self)
790	CODE:
791	RETVAL = self->rgba;
792	OUTPUT:
793	RETVAL
794
795	void	819	void
796	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
797	CODE:	821	CODE:
798	{	822	{
799	STRLEN textlen;	823	STRLEN textlen;
800	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
801		825
802	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
803	}	827	}
804		828
805	void	829	void
806	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
807	CODE:	831	CODE:
808	{	832	{
809	STRLEN textlen;	833	STRLEN textlen;
810	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
811		835
812	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
813	}	837	}
814		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
815	SV *	924	SV *
816	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
817	CODE:	926	CODE:
818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
819	sv_utf8_decode (RETVAL);	928	sv_utf8_decode (RETVAL);
820	OUTPUT:	929	OUTPUT:
821	RETVAL	930	RETVAL
822		931
823	void	932	void
824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
825	CODE:	934	CODE:
826	self->r = r;	935	self->r = r;
827	self->g = g;	936	self->g = g;
828	self->b = b;	937	self->b = b;
829	self->a = a;	938	self->a = a;
830		939
831	void	940	void
832	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
833	CODE:	942	CODE:
834	if (self->font != font)	943	if (self->font != font)
835	{	944	{
836	self->font = font;	945	self->font = font;
837	layout_update_font (self);	946	layout_update_font (self);
838	}	947	}
839		948
840	void	949	void
841	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
842	CODE:	951	CODE:
843	if (self->base_height != base_height)	952	if (self->base_height != base_height)
844	{	953	{
845	self->base_height = base_height;	954	self->base_height = base_height;
846	layout_update_font (self);	955	layout_update_font (self);
847	}	956	}
848		957
849	void	958	void
850	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
851	CODE:	960	CODE:
852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
853		962
854	void	963	void
855	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
856	CODE:	965	CODE:
857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
858		967
859	void	968	void
860	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
861	CODE:	970	CODE:
862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
863		972
864	void	973	void
865	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
866	CODE:	975	CODE:
867	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
868	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
871	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
872	);	981	);
873		982
874	void	983	void
875	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
876	CODE:	985	CODE:
877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
878		987
879	void	988	void
880	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
881	PPCODE:	990	PPCODE:
882	{	991	{
883	int w, h;	992	int w, h;
884		993
885	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
888	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
889	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
890	}	999	}
891		1000
892	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
893	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
894	CODE:	1015	CODE:
895	{	1016	{
896	int index, trailing;	1017	int index, trailing;
897	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
898	RETVAL = index;	1019	RETVAL = index;
899	}	1020	}
900	OUTPUT:	1021	OUTPUT:
901	RETVAL	1022	RETVAL
902		1023
903	void	1024	void
904	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
905	PPCODE:	1026	PPCODE:
906	{	1027	{
907	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
908	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
909		1030
…		…
912	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
913	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
914	}	1035	}
915		1036
916	void	1037	void
917	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
918	PPCODE:	1039	PPCODE:
919	{	1040	pango_opengl_render_layout_subpixel (
920	SV *retval;	1041	self->pl,
921	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
922		1043	self->r, self->g, self->b, self->a,
923	layout_get_pixel_size (self, &w, &h);
924
925	if (self->rgba)
926	{	1044	flags
927	cairo_surface_t *surface;
928	cairo_t *cairo;
929
930	retval = newSV (w * h * 4);
931	SvPOK_only (retval);
932	SvCUR_set (retval, w * h * 4);
933
934	memset (SvPVX (retval), 0, w * h * 4);
935
936	surface = cairo_image_surface_create_for_data (
937	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
938	cairo = cairo_create (surface);
939	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
940
941	pango_cairo_show_layout (cairo, self->pl);
942
943	cairo_destroy (cairo);
944	cairo_surface_destroy (surface);
945
946	// what a mess, and its premultiplied, too :(
947	{
948	uint32_t p = (uint32_t )SvPVX (retval);
949	uint32_t e = p + w h;
950
951	while (p < e)
952	{
953	uint32_t rgba = *p;
954	rgba = (rgba >> 24) \| (rgba << 8);
955	#if 0
956	#ifdef _WIN32
957	{//D
958	uint8_t r = rgba >> 24;
959	uint8_t g = rgba >> 16;
960	uint8_t b = rgba >> 8;
961	uint8_t a = rgba >> 0;
962
963	rgba = (rgba & 0xffffff00) \| a;
964	}
965	#endif
966	#endif
967	rgba = SDL_SwapBE32 (rgba);
968	*p++ = rgba;
969	}
970	}
971
972	EXTEND (SP, 5);
973	PUSHs (sv_2mortal (newSViv (w)));
974	PUSHs (sv_2mortal (newSViv (h)));
975	PUSHs (sv_2mortal (retval));
976	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
977	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
978	}	1045	);
979	else
980	{
981	FT_Bitmap bitmap;
982		1046
983	retval = newSV (w * h);
984	SvPOK_only (retval);
985	SvCUR_set (retval, w * h);
986
987	bitmap.rows = h;
988	bitmap.width = w;
989	bitmap.pitch = w;
990	bitmap.buffer = (unsigned char*)SvPVX (retval);
991	bitmap.num_grays = 256;
992	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
993
994	memset (bitmap.buffer, 0, w * h);
995
996	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
997
998	EXTEND (SP, 5);
999	PUSHs (sv_2mortal (newSViv (w)));
1000	PUSHs (sv_2mortal (newSViv (h)));
1001	PUSHs (sv_2mortal (retval));
1002	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1003	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1004	}
1005	}
1006
1007	MODULE = CFClient PACKAGE = CFClient::Texture	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
1008		1048
1009	void	1049	void
1010	pad2pot (SV data_, SV w_, SV *h_)	1050	pad2pot (SV data_, SV w_, SV *h_)
1011	CODE:	1051	CODE:
1012	{	1052	{
…		…
1090	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1091	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1092	}	1132	}
1093	}	1133	}
1094		1134
1095	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1096		1136
1097	CFClient::Map	1137	CFPlus::Map
1098	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1099	CODE:	1139	CODE:
1100	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1101	RETVAL->x = 0;	1141	RETVAL->x = 0;
1102	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1112	RETVAL->row = 0;	1152	RETVAL->row = 0;
1113	OUTPUT:	1153	OUTPUT:
1114	RETVAL	1154	RETVAL
1115		1155
1116	void	1156	void
1117	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1118	CODE:	1158	CODE:
1119	{	1159	{
1120	map_clear (self);	1160	map_clear (self);
1121	Safefree (self->face);	1161	Safefree (self->face);
1122	Safefree (self->tex);	1162	Safefree (self->tex);
1123	Safefree (self);	1163	Safefree (self);
1124	}	1164	}
1125		1165
1126	void	1166	void
1127	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1128	CODE:	1168	CODE:
1129	map_clear (self);	1169	map_clear (self);
1130		1170
1131	void	1171	void
1132	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1133	CODE:	1173	CODE:
1134	{	1174	{
1135	while (self->faces <= face)	1175	while (self->faces <= face)
1136	{	1176	{
1137	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1140		1180
1141	self->face [face] = texid;	1181	self->face [face] = texid;
1142	}	1182	}
1143		1183
1144	void	1184	void
1145	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)	1185	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)
1146	CODE:	1186	CODE:
1147	{	1187	{
1148	while (self->texs <= texid)	1188	while (self->texs <= texid)
1149	{	1189	{
1150	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1174	// from transparent color bleeding and ugly wrapping effects.	1214	// from transparent color bleeding and ugly wrapping effects.
1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1176	}	1216	}
1177		1217
1178	int	1218	int
1179	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1180	ALIAS:	1220	ALIAS:
1181	oy = 1	1221	oy = 1
1182	x = 2	1222	x = 2
1183	y = 3	1223	y = 3
1184	w = 4	1224	w = 4
…		…
1195	}	1235	}
1196	OUTPUT:	1236	OUTPUT:
1197	RETVAL	1237	RETVAL
1198		1238
1199	void	1239	void
1200	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1201	CODE:	1241	CODE:
1202	{	1242	{
1203	if (dx > 0)	1243	if (dx > 0)
1204	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1205	else if (dx < 0)	1245	else if (dx < 0)
…		…
1221	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1222	}	1262	}
1223	}	1263	}
1224		1264
1225	void	1265	void
1226	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1227	CODE:	1267	CODE:
1228	{	1268	{
1229	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1230	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1231	mapcell *cell;	1271	mapcell *cell;
…		…
1233		1273
1234	while (data < data_end)	1274	while (data < data_end)
1235	{	1275	{
1236	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1237		1277
1238	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1239	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1240		1280
1241	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1242		1282
1243	if (flags & 15)	1283	if (flags & 15)
1244	{	1284	{
1245	if (cell->darkness < 0)	1285	if (!cell->darkness)
1246	{	1286	{
1247	cell->darkness = 0;	1287	cell->darkness = 256;
1248	cell->face [0] = 0;	1288	cell->face [0] = 0;
1249	cell->face [1] = 0;	1289	cell->face [1] = 0;
1250	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
1251	}	1292	}
1252		1293
1253	cell->darkness = flags & 8 ? *data++ : 255;
1254
1255	//TODO: don't trust server data to be in-range(!)	1294	//TODO: don't trust server data to be in-range(!)
		1295
		1296	if (flags & 8)
		1297	{
		1298	if (extmap)
		1299	{
		1300	uint8_t ext, cmd;
		1301
		1302	do
		1303	{
		1304	ext = *data++;
		1305	cmd = ext & 0x7f;
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64 + 1;
		1309	else if (ext == 5) // health
		1310	cell->stat_hp = *data++;
		1311	}
		1312	while (cmd & 0x80);
		1313	}
		1314	else
		1315	cell->darkness = *data++ + 1;
		1316	}
1256		1317
1257	if (flags & 4)	1318	if (flags & 4)
1258	{	1319	{
1259	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1320	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1260	}	1321	}
…		…
1268	{	1329	{
1269	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1330	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1270	}	1331	}
1271	}	1332	}
1272	else	1333	else
1273	cell->darkness = -1;	1334	cell->darkness = 0;
1274	}	1335	}
1275	}	1336	}
1276		1337
1277	SV *	1338	SV *
1278	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)
1279	CODE:	1340	CODE:
1280	{	1341	{
1281	int x1, x;	1342	int x1, x;
1282	int y1, y;	1343	int y1, y;
1283	int z;	1344	int z;
…		…
1333	}	1394	}
1334	OUTPUT:	1395	OUTPUT:
1335	RETVAL	1396	RETVAL
1336		1397
1337	void	1398	void
1338	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)
1339	CODE:	1400	CODE:
1340	{	1401	{
1341	int vx, vy;	1402	int vx, vy;
1342	int x, y, z;	1403	int x, y, z;
1343	int last_name;	1404	int last_name;
1344	mapface face;	1405	mapface face;
1345		1406
1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1348		1409
1349	/*	1410	/*
1350	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1351	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1352	: 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));
…		…
1405		1466
1406	glEnd ();	1467	glEnd ();
1407		1468
1408	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1409	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
1410	}
1411		1471
		1472	for (y = 0; y < sh; y++)
		1473	if (0 <= y + vy && y + vy < self->rows)
		1474	{
		1475	maprow *row = self->row + (y + vy);
		1476
		1477	for (x = 0; x < sw; x++)
		1478	if (row->c0 <= x + vx && x + vx < row->c1)
		1479	{
		1480	mapcell *cell = row->col + (x + vx - row->c0);
		1481
		1482	int px = x * 32;
		1483	int py = y * 32;
		1484
		1485	if (cell->stat_hp)
		1486	{
		1487	glColor3ub (0, 0, 0);
		1488	glRectf (px + 1, py + 1, px + 31, py + 4);
		1489
		1490	glColor3ub (0, 255, 0);
		1491	glBegin (GL_LINES);
		1492	glVertex2f (px + 2, py + 2.5f);
		1493	glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
		1494	glEnd ();
		1495	}
		1496	}
		1497	}
		1498	}
		1499
1412	void	1500	void
1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1501	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1414	CODE:	1502	CODE:
1415	{	1503	{
1416	static float color[16][3] = {	1504	static float color[16][3] = {
1417	{ 0.00, 0.00, 0.00 },	1505	{ 0.00F, 0.00F, 0.00F },
1418	{ 1.00, 1.00, 1.00 },	1506	{ 1.00F, 1.00F, 1.00F },
1419	{ 0.00, 0.00, 0.55 },	1507	{ 0.00F, 0.00F, 0.55F },
1420	{ 1.00, 0.00, 0.00 },	1508	{ 1.00F, 0.00F, 0.00F },
1421		1509
1422	{ 1.00, 0.54, 0.00 },	1510	{ 1.00F, 0.54F, 0.00F },
1423	{ 0.11, 0.56, 1.00 },	1511	{ 0.11F, 0.56F, 1.00F },
1424	{ 0.93, 0.46, 0.00 },	1512	{ 0.93F, 0.46F, 0.00F },
1425	{ 0.18, 0.54, 0.34 },	1513	{ 0.18F, 0.54F, 0.34F },
1426		1514
1427	{ 0.56, 0.73, 0.56 },	1515	{ 0.56F, 0.73F, 0.56F },
1428	{ 0.80, 0.80, 0.80 },	1516	{ 0.80F, 0.80F, 0.80F },
1429	{ 0.55, 0.41, 0.13 },	1517	{ 0.55F, 0.41F, 0.13F },
1430	{ 0.99, 0.77, 0.26 },	1518	{ 0.99F, 0.77F, 0.26F },
1431		1519
1432	{ 0.74, 0.65, 0.41 },	1520	{ 0.74F, 0.65F, 0.41F },
1433		1521
1434	{ 0.00, 1.00, 1.00 },	1522	{ 0.00F, 1.00F, 1.00F },
1435	{ 1.00, 0.00, 1.00 },	1523	{ 1.00F, 0.00F, 1.00F },
1436	{ 1.00, 1.00, 0.00 },	1524	{ 1.00F, 1.00F, 0.00F },
1437	};	1525	};
1438		1526
1439	int x, y;	1527	int x, y;
1440		1528
1441	glEnable (GL_TEXTURE_2D);	1529	glEnable (GL_TEXTURE_2D);
…		…
1468	glDisable (GL_BLEND);	1556	glDisable (GL_BLEND);
1469	glDisable (GL_TEXTURE_2D);	1557	glDisable (GL_TEXTURE_2D);
1470	}	1558	}
1471		1559
1472	void	1560	void
1473	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1561	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1474	PPCODE:	1562	PPCODE:
1475	{	1563	{
1476	int vx, vy;	1564	int vx, vy;
1477	int x, y;	1565	int x, y;
1478	int sw4 = (sw + 3) & ~3;	1566	int sw4 = (sw + 3) & ~3;
…		…
1494	for (x = 0; x < sw; x++)	1582	for (x = 0; x < sw; x++)
1495	if (row->c0 <= x + vx && x + vx < row->c1)	1583	if (row->c0 <= x + vx && x + vx < row->c1)
1496	{	1584	{
1497	mapcell *cell = row->col + (x + vx - row->c0);	1585	mapcell *cell = row->col + (x + vx - row->c0);
1498		1586
1499	darkness[y * sw4 + x] = cell->darkness < 0	1587	darkness[y * sw4 + x] = cell->darkness
		1588	? 255 - (cell->darkness - 1)
1500	? 255 - FOW_DARKNESS	1589	: 255 - FOW_DARKNESS;
1501	: 255 - cell->darkness;
1502	}	1590	}
1503	}	1591	}
1504		1592
1505	EXTEND (SP, 3);	1593	EXTEND (SP, 3);
1506	PUSHs (sv_2mortal (newSViv (sw4)));	1594	PUSHs (sv_2mortal (newSViv (sw4)));
1507	PUSHs (sv_2mortal (newSViv (sh)));	1595	PUSHs (sv_2mortal (newSViv (sh)));
1508	PUSHs (darkness_sv);	1596	PUSHs (darkness_sv);
1509	}	1597	}
1510		1598
1511	SV *	1599	SV *
1512	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1600	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1513	CODE:	1601	CODE:
1514	{	1602	{
1515	int x, y, x1, y1;	1603	int x, y, x1, y1;
1516	SV data_sv = newSV (w h * 7 + 5);	1604	SV data_sv = newSV (w h * 7 + 5);
1517	uint8_t data = (uint8_t )SvPVX (data_sv);	1605	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1579	}	1667	}
1580	OUTPUT:	1668	OUTPUT:
1581	RETVAL	1669	RETVAL
1582		1670
1583	void	1671	void
1584	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1672	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1585	PPCODE:	1673	PPCODE:
1586	{	1674	{
1587	int x, y, z;	1675	int x, y, z;
1588	int w, h;	1676	int w, h;
1589	int x1, y1;	1677	int x1, y1;
…		…
1621		1709
1622	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1710	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1623	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1711	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1624	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1712	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1625		1713
1626	if (cell->darkness <= 0)	1714	if (cell->darkness == 0)
1627	{	1715	{
1628	cell->darkness = -1;	1716	cell->darkness = 0;
1629		1717
1630	for (z = 0; z <= 2; z++)	1718	for (z = 0; z <= 2; z++)
1631	{	1719	{
1632	cell->face[z] = face[z];	1720	cell->face[z] = face[z];
1633		1721
…		…
1638	}	1726	}
1639	}	1727	}
1640	}	1728	}
1641	}	1729	}
1642		1730
1643	MODULE = CFClient PACKAGE = CFClient::MixChunk	1731	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1644		1732
1645	CFClient::MixChunk	1733	CFPlus::MixChunk
1646	new_from_file (SV class, char path)	1734	new_from_file (SV class, char path)
1647	CODE:	1735	CODE:
1648	RETVAL = Mix_LoadWAV (path);	1736	RETVAL = Mix_LoadWAV (path);
1649	OUTPUT:	1737	OUTPUT:
1650	RETVAL	1738	RETVAL
1651		1739
1652	void	1740	void
1653	DESTROY (CFClient::MixChunk self)	1741	DESTROY (CFPlus::MixChunk self)
1654	CODE:	1742	CODE:
1655	Mix_FreeChunk (self);	1743	Mix_FreeChunk (self);
1656		1744
1657	int	1745	int
1658	volume (CFClient::MixChunk self, int volume = -1)	1746	volume (CFPlus::MixChunk self, int volume = -1)
1659	CODE:	1747	CODE:
1660	RETVAL = Mix_VolumeChunk (self, volume);	1748	RETVAL = Mix_VolumeChunk (self, volume);
1661	OUTPUT:	1749	OUTPUT:
1662	RETVAL	1750	RETVAL
1663		1751
1664	int	1752	int
1665	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1753	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1666	CODE:	1754	CODE:
1667	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1755	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1668	OUTPUT:	1756	OUTPUT:
1669	RETVAL	1757	RETVAL
1670		1758
1671	MODULE = CFClient PACKAGE = CFClient::MixMusic	1759	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1672		1760
1673	int	1761	int
1674	volume (int volume = -1)	1762	volume (int volume = -1)
1675	CODE:	1763	CODE:
1676	RETVAL = Mix_VolumeMusic (volume);	1764	RETVAL = Mix_VolumeMusic (volume);
1677	OUTPUT:	1765	OUTPUT:
1678	RETVAL	1766	RETVAL
1679		1767
1680	CFClient::MixMusic	1768	CFPlus::MixMusic
1681	new_from_file (SV class, char path)	1769	new_from_file (SV class, char path)
1682	CODE:	1770	CODE:
1683	RETVAL = Mix_LoadMUS (path);	1771	RETVAL = Mix_LoadMUS (path);
1684	OUTPUT:	1772	OUTPUT:
1685	RETVAL	1773	RETVAL
1686		1774
1687	void	1775	void
1688	DESTROY (CFClient::MixMusic self)	1776	DESTROY (CFPlus::MixMusic self)
1689	CODE:	1777	CODE:
1690	Mix_FreeMusic (self);	1778	Mix_FreeMusic (self);
1691		1779
1692	int	1780	int
1693	play (CFClient::MixMusic self, int loops = -1)	1781	play (CFPlus::MixMusic self, int loops = -1)
1694	CODE:	1782	CODE:
1695	RETVAL = Mix_PlayMusic (self, loops);	1783	RETVAL = Mix_PlayMusic (self, loops);
1696	OUTPUT:	1784	OUTPUT:
1697	RETVAL	1785	RETVAL
1698		1786
1699	MODULE = CFClient PACKAGE = CFClient::OpenGL	1787	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1700		1788
1701	BOOT:	1789	BOOT:
1702	{	1790	{
1703	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1791	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1704	static const struct {	1792	static const struct {
1705	const char *name;	1793	const char *name;
1706	IV iv;	1794	IV iv;
1707	} *civ, const_iv[] = {	1795	} *civ, const_iv[] = {
1708	# define const_iv(name) { # name, (IV)name }	1796	# define const_iv(name) { # name, (IV)name }
…		…
1715	const_iv (GL_SCISSOR_TEST),	1803	const_iv (GL_SCISSOR_TEST),
1716	const_iv (GL_DEPTH_TEST),	1804	const_iv (GL_DEPTH_TEST),
1717	const_iv (GL_ALPHA_TEST),	1805	const_iv (GL_ALPHA_TEST),
1718	const_iv (GL_NORMALIZE),	1806	const_iv (GL_NORMALIZE),
1719	const_iv (GL_RESCALE_NORMAL),	1807	const_iv (GL_RESCALE_NORMAL),
		1808	const_iv (GL_FRONT),
		1809	const_iv (GL_BACK),
1720	const_iv (GL_AND),	1810	const_iv (GL_AND),
1721	const_iv (GL_ONE),	1811	const_iv (GL_ONE),
1722	const_iv (GL_ZERO),	1812	const_iv (GL_ZERO),
1723	const_iv (GL_SRC_ALPHA),	1813	const_iv (GL_SRC_ALPHA),
1724	const_iv (GL_DST_ALPHA),	1814	const_iv (GL_DST_ALPHA),
…		…
1769	const_iv (GL_SEPARABLE_2D),	1859	const_iv (GL_SEPARABLE_2D),
1770	const_iv (GL_CONVOLUTION_2D),	1860	const_iv (GL_CONVOLUTION_2D),
1771	const_iv (GL_CONVOLUTION_BORDER_MODE),	1861	const_iv (GL_CONVOLUTION_BORDER_MODE),
1772	const_iv (GL_CONSTANT_BORDER),	1862	const_iv (GL_CONSTANT_BORDER),
1773	const_iv (GL_LINES),	1863	const_iv (GL_LINES),
		1864	const_iv (GL_LINE_STRIP),
1774	const_iv (GL_LINE_LOOP),	1865	const_iv (GL_LINE_LOOP),
1775	const_iv (GL_QUADS),	1866	const_iv (GL_QUADS),
1776	const_iv (GL_QUAD_STRIP),	1867	const_iv (GL_QUAD_STRIP),
1777	const_iv (GL_TRIANGLES),	1868	const_iv (GL_TRIANGLES),
1778	const_iv (GL_TRIANGLE_STRIP),	1869	const_iv (GL_TRIANGLE_STRIP),
…		…
1846		1937
1847	void glPopMatrix ()	1938	void glPopMatrix ()
1848		1939
1849	void glLoadIdentity ()	1940	void glLoadIdentity ()
1850		1941
		1942	void glDrawBuffer (int buffer)
		1943
		1944	void glReadBuffer (int buffer)
		1945
1851	# near_ and far_ are due to microsofts buggy "c" compiler	1946	# near_ and far_ are due to microsofts buggy "c" compiler
1852	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1947	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1853		1948
1854	# near_ and far_ are due to microsofts buggy "c" compiler	1949	# near_ and far_ are due to microsofts buggy "c" compiler
1855	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1950	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1884	r *= a;	1979	r *= a;
1885	g *= a;	1980	g *= a;
1886	b *= a;	1981	b *= a;
1887	}	1982	}
1888	// microsoft visual "c" rounds instead of truncating...	1983	// microsoft visual "c" rounds instead of truncating...
1889	glColor4ub (MIN ((int)(r * 256.f), 255),	1984	glColor4f (r, g, b, a);
1890	MIN ((int)(g * 256.f), 255),
1891	MIN ((int)(b * 256.f), 255),
1892	MIN ((int)(a * 256.f), 255));
1893		1985
1894	void glInterleavedArrays (int format, int stride, char *data)	1986	void glInterleavedArrays (int format, int stride, char *data)
1895		1987
1896	void glDrawElements (int mode, int count, int type, char *indices)	1988	void glDrawElements (int mode, int count, int type, char *indices)
1897		1989
…		…
1974		2066
1975	void glEndList ()	2067	void glEndList ()
1976		2068
1977	void glCallList (int list)	2069	void glCallList (int list)
1978		2070
1979

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC vs. Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.118 by root, Thu Jun 15 15:47:35 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC