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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.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>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
52		64
53	static struct	65	static struct
54	{	66	{
55	#define GL_FUNC(ptr,name) ptr name;	67	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	68	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	78	else
67	glBlendFunc (sa, da);	79	glBlendFunc (sa, da);
68	}	80	}
69		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
70	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
72		90
73	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
74		110
75	typedef struct cf_layout {	111	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
79	int base_height;	114	int base_height;
80	CFClient__Font font;	115	CFPlus__Font font;
81	} *CFClient__Layout;	116	} *CFPlus__Layout;
82		117
83	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
84	static PangoContext ft2_context, cairo_context;	119	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
86		121
87	static void	122	static void
88	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
89	{	124	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	128	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	130	}
97		131
98	static void	132	static void
99	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
100	{	134	{
101	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
102	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
103	*/	137	*/
104	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
108		142
109	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
110	}	144	}
111		145
112	static void	146	static void
113	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
114	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
115	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
116		153
117	if (!w) w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
118	if (!h) h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
119		156
120	w = (w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
121	}	162	}
122		163
123	typedef uint16_t mapface;	164	typedef uint16_t mapface;
124		165
125	typedef struct {	166	typedef struct {
…		…
148	int texs;	189	int texs;
149	maptex *tex;	190	maptex *tex;
150		191
151	int32_t rows;	192	int32_t rows;
152	maprow *row;	193	maprow *row;
153	} *CFClient__Map;	194	} *CFPlus__Map;
154		195
155	static char *	196	static char *
156	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
157	{	198	{
158	char *p;	199	char *p;
…		…
176		217
177	#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))
178	#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))
179		220
180	static maprow *	221	static maprow *
181	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
182	{	223	{
183	if (0 > y)	224	if (0 > y)
184	{	225	{
185	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
224		265
225	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
226	}	267	}
227		268
228	static mapcell *	269	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
230	{	271	{
231	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
232	}	273	}
233		274
234	static void	275	static void
235	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
236	{	277	{
237	int r;	278	int r;
238		279
239	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
248	self->row = 0;	289	self->row = 0;
249	self->rows = 0;	290	self->rows = 0;
250	}	291	}
251		292
252	static void	293	static void
253	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)
254	{	295	{
255	int x, y;	296	int x, y;
256	maprow *row;	297	maprow *row;
257		298
258	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
298	ev.data2 = 0;	339	ev.data2 = 0;
299		340
300	SDL_PushEvent ((SDL_Event *)&ev);	341	SDL_PushEvent ((SDL_Event *)&ev);
301	}	342	}
302		343
		344	static unsigned int
		345	minpot (unsigned int n)
		346	{
		347	if (!n)
		348	return 0;
		349
		350	--n;
		351
		352	n \|= n >> 1;
		353	n \|= n >> 2;
		354	n \|= n >> 4;
		355	n \|= n >> 8;
		356	n \|= n >> 16;
		357
		358	return n + 1;
		359	}
		360
303	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
304		362
305	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
306		364
307	BOOT:	365	BOOT:
308	{	366	{
309	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	368	static const struct {
311	const char *name;	369	const char *name;
312	IV iv;	370	IV iv;
313	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
415		473
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	476	}
419		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
420	void	489	void
421	pango_init ()	490	pango_init ()
422	CODE:	491	CODE:
423	{	492	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	495	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	496	}
432		497
433	int	498	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		500
436	void	501	void
437	SDL_Quit ()	502	SDL_Quit ()
438		503
439	void	504	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		514
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		517
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		522
458	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
459		528
460	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		531
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	621	break;
553	}	622	}
554		623
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	625	}
557	}	626	}
558		627
559	int	628	int
560	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)
…		…
576	#endif	645	#endif
577		646
578	void	647	void
579	add_font (char *file)	648	add_font (char *file)
580	CODE:	649	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		651
587	void	652	void
588	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
589	ALIAS:	654	ALIAS:
590	load_image_file = 1	655	load_image_file = 1
…		…
632		697
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		699
635	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
636		701
		702	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	703	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
642	SDL_UnlockSurface (surface2);
643	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
646		711
647	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
649	}	714	}
650		715
…		…
686	CODE:	751	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	752	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	753	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	755	#endif
691	exit (1);	756	_exit (1);
692		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
693	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
694		764
695	CFClient::Font	765	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	766	new_from_file (SV class, char path, int id = 0)
697	CODE:	767	CODE:
698	{	768	{
699	int count;	769	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	770	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	773	}
704	OUTPUT:	774	OUTPUT:
705	RETVAL	775	RETVAL
706		776
707	void	777	void
708	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
709	CODE:	779	CODE:
710	pango_font_description_free (self);	780	pango_font_description_free (self);
711		781
712	void	782	void
713	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
714	CODE:	784	CODE:
715	default_font = self;	785	default_font = self;
716		786
717	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		788
719	CFClient::Layout	789	void
720	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
721	CODE:	791	CODE:
722	#if _WIN32	792	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	793
724	#endif	794	CFPlus::Layout
725	rgba=1;//D	795	new (SV *class)
		796	CODE:
726	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
727		798
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	800	RETVAL->r = 1.;
731	RETVAL->g = 1.;	801	RETVAL->g = 1.;
732	RETVAL->b = 1.;	802	RETVAL->b = 1.;
733	RETVAL->a = 1.;	803	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
738	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
739	OUTPUT:	809	OUTPUT:
740	RETVAL	810	RETVAL
741		811
742	void	812	void
743	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
744	CODE:	814	CODE:
745	g_object_unref (self->pl);	815	g_object_unref (self->pl);
746	Safefree (self);	816	Safefree (self);
747		817
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	818	void
756	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
757	CODE:	820	CODE:
758	{	821	{
759	STRLEN textlen;	822	STRLEN textlen;
760	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
761		824
762	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
763	}	826	}
764		827
765	void	828	void
766	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
767	CODE:	830	CODE:
768	{	831	{
769	STRLEN textlen;	832	STRLEN textlen;
770	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
771		834
772	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
773	}	836	}
774		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
775	SV *	923	SV *
776	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
777	CODE:	925	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
780	OUTPUT:	928	OUTPUT:
781	RETVAL	929	RETVAL
782		930
783	void	931	void
784	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.)
785	CODE:	933	CODE:
786	self->r = r;	934	self->r = r;
787	self->g = g;	935	self->g = g;
788	self->b = b;	936	self->b = b;
789	self->a = a;	937	self->a = a;
790		938
791	void	939	void
792	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
793	CODE:	941	CODE:
794	if (self->font != font)	942	if (self->font != font)
795	{	943	{
796	self->font = font;	944	self->font = font;
797	layout_update_font (self);	945	layout_update_font (self);
798	}	946	}
799		947
800	void	948	void
801	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
802	CODE:	950	CODE:
803	if (self->base_height != base_height)	951	if (self->base_height != base_height)
804	{	952	{
805	self->base_height = base_height;	953	self->base_height = base_height;
806	layout_update_font (self);	954	layout_update_font (self);
807	}	955	}
808		956
809	void	957	void
810	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
811	CODE:	959	CODE:
812	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);
813		961
814	void	962	void
815	set_indent (CFClient::Layout self, int indent)	963	set_indent (CFPlus::Layout self, int indent)
816	CODE:	964	CODE:
817	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
818		966
819	void	967	void
820	set_spacing (CFClient::Layout self, int spacing)	968	set_spacing (CFPlus::Layout self, int spacing)
821	CODE:	969	CODE:
822	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
823		971
824	void	972	void
825	set_ellipsise (CFClient::Layout self, int ellipsise)	973	set_ellipsise (CFPlus::Layout self, int ellipsise)
826	CODE:	974	CODE:
827	pango_layout_set_ellipsize (self->pl,	975	pango_layout_set_ellipsize (self->pl,
828	ellipsise == 1 ? PANGO_ELLIPSIZE_START	976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
829	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
830	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
831	: PANGO_ELLIPSIZE_NONE	979	: PANGO_ELLIPSIZE_NONE
832	);	980	);
833		981
834	void	982	void
835	set_single_paragraph_mode (CFClient::Layout self, int spm)	983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
836	CODE:	984	CODE:
837	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
838		986
839	void	987	void
840	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
841	PPCODE:	989	PPCODE:
842	{	990	{
843	int w, h;	991	int w, h;
844		992
845	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
850	}	998	}
851		999
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
854	CODE:	1014	CODE:
855	{	1015	{
856	int index, trailing;	1016	int index, trailing;
857	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);
858	RETVAL = index;	1018	RETVAL = index;
859	}	1019	}
860	OUTPUT:	1020	OUTPUT:
861	RETVAL	1021	RETVAL
862		1022
863	void	1023	void
864	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
865	PPCODE:	1025	PPCODE:
866	{	1026	{
867	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
868	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
869		1029
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1034	}
875		1035
876	void	1036	void
877	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
878	PPCODE:	1038	PPCODE:
879	{	1039	pango_opengl_render_layout_subpixel (
880	SV *retval;	1040	self->pl,
881	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
		1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
882		1045
883	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
884		1047
885	if (self->rgba)	1048	void
		1049	pad2pot (SV data_, SV w_, SV *h_)
		1050	CODE:
		1051	{
		1052	int ow = SvIV (w_);
		1053	int oh = SvIV (h_);
		1054
		1055	if (ow && oh)
886	{	1056	{
887	cairo_surface_t *surface;	1057	int nw = minpot (ow);
888	cairo_t *cairo;	1058	int nh = minpot (oh);
889		1059
890	retval = newSV (w * h * 4);	1060	if (nw != ow \|\| nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1061	{
908	uint32_t p = (uint32_t )SvPVX (retval);	1062	if (SvOK (data_))
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{	1063	{
913	uint32_t rgba = *p;	1064	STRLEN datalen;
914	rgba = (rgba >> 24) \| (rgba << 8);	1065	char *data = SvPVbyte (data_, datalen);
915	#if 0	1066	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1067	SV result_ = sv_2mortal (newSV (nw nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1068
923	rgba = (rgba & 0xffffff00) \| a;	1069	SvPOK_only (result_);
		1070	SvCUR_set (result_, nw * nh * bpp);
		1071
		1072	memset (SvPVX (result_), 0, nw * nh * bpp);
		1073	while (oh--)
		1074	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1075
		1076	sv_setsv (data_, result_);
924	}	1077	}
925	#endif	1078
926	#endif	1079	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1080	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1081	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1082	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1083	}
966		1084
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1085	void
970	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.)
971	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
972	ALIAS:	1088	ALIAS:
973	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
975	CODE:	1091	CODE:
…		…
1013	glDisable (GL_ALPHA_TEST);	1129	glDisable (GL_ALPHA_TEST);
1014	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
1015	}	1131	}
1016	}	1132	}
1017		1133
1018	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
1019		1135
1020	CFClient::Map	1136	CFPlus::Map
1021	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
1022	CODE:	1138	CODE:
1023	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
1024	RETVAL->x = 0;	1140	RETVAL->x = 0;
1025	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
1035	RETVAL->row = 0;	1151	RETVAL->row = 0;
1036	OUTPUT:	1152	OUTPUT:
1037	RETVAL	1153	RETVAL
1038		1154
1039	void	1155	void
1040	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
1041	CODE:	1157	CODE:
1042	{	1158	{
1043	map_clear (self);	1159	map_clear (self);
1044	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
1045	Safefree (self);	1162	Safefree (self);
1046	}	1163	}
1047		1164
1048	void	1165	void
1049	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1050	CODE:	1167	CODE:
1051	map_clear (self);	1168	map_clear (self);
1052		1169
1053	void	1170	void
1054	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1055	CODE:	1172	CODE:
1056	{	1173	{
1057	while (self->faces <= face)	1174	while (self->faces <= face)
1058	{	1175	{
1059	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1062		1179
1063	self->face [face] = texid;	1180	self->face [face] = texid;
1064	}	1181	}
1065		1182
1066	void	1183	void
1067	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1068	CODE:	1185	CODE:
1069	{	1186	{
1070	while (self->texs <= texid)	1187	while (self->texs <= texid)
1071	{	1188	{
1072	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1096	// from transparent color bleeding and ugly wrapping effects.	1213	// from transparent color bleeding and ugly wrapping effects.
1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1214	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1098	}	1215	}
1099		1216
1100	int	1217	int
1101	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1102	ALIAS:	1219	ALIAS:
1103	oy = 1	1220	oy = 1
1104	x = 2	1221	x = 2
1105	y = 3	1222	y = 3
1106	w = 4	1223	w = 4
…		…
1117	}	1234	}
1118	OUTPUT:	1235	OUTPUT:
1119	RETVAL	1236	RETVAL
1120		1237
1121	void	1238	void
1122	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1123	CODE:	1240	CODE:
1124	{	1241	{
1125	if (dx > 0)	1242	if (dx > 0)
1126	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1127	else if (dx < 0)	1244	else if (dx < 0)
…		…
1143	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1144	}	1261	}
1145	}	1262	}
1146		1263
1147	void	1264	void
1148	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1149	CODE:	1266	CODE:
1150	{	1267	{
1151	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1268	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1152	uint8_t data_end = (uint8_t )SvEND (data_);	1269	uint8_t data_end = (uint8_t )SvEND (data_);
1153	mapcell *cell;	1270	mapcell *cell;
…		…
1155		1272
1156	while (data < data_end)	1273	while (data < data_end)
1157	{	1274	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1159		1276
1160	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1162		1279
1163	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1164		1281
1165	if (flags & 15)	1282	if (flags & 15)
1166	{	1283	{
…		…
1170	cell->face [0] = 0;	1287	cell->face [0] = 0;
1171	cell->face [1] = 0;	1288	cell->face [1] = 0;
1172	cell->face [2] = 0;	1289	cell->face [2] = 0;
1173	}	1290	}
1174		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
1175	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1176		1315
1177	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1178		1317
1179	if (flags & 4)	1318	if (flags & 4)
1180	{	1319	{
…		…
1195	cell->darkness = -1;	1334	cell->darkness = -1;
1196	}	1335	}
1197	}	1336	}
1198		1337
1199	SV *	1338	SV *
1200	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)
1201	CODE:	1340	CODE:
1202	{	1341	{
1203	int x1, x;	1342	int x1, x;
1204	int y1, y;	1343	int y1, y;
1205	int z;	1344	int z;
…		…
1255	}	1394	}
1256	OUTPUT:	1395	OUTPUT:
1257	RETVAL	1396	RETVAL
1258		1397
1259	void	1398	void
1260	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)
1261	PPCODE:	1400	CODE:
1262	{	1401	{
1263	int vx, vy;	1402	int vx, vy;
1264	int x, y, z;	1403	int x, y, z;
1265	int last_name;	1404	int last_name;
1266	mapface face;	1405	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270		1406
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277		1409
1278	/*	1410	/*
1279	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1281	: 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));
…		…
1285	: 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));
1286	*/	1418	*/
1287		1419
1288	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1289		1421
		1422	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1426
1295	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1296		1428
…		…
1304		1436
1305	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1307	{	1439	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1309
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313		1441
1314	face = cell->face [z];	1442	face = cell->face [z];
1315		1443
1316	if (face)	1444	if (face)
1317	{	1445	{
…		…
1338		1466
1339	glEnd ();	1467	glEnd ();
1340		1468
1341	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1342	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	}
1343		1565
1344	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1348	}	1570	}
1349		1571
1350	SV *	1572	SV *
1351	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)
1352	CODE:	1574	CODE:
1353	{	1575	{
1354	int x, y, x1, y1;	1576	int x, y, x1, y1;
1355	SV data_sv = newSV (w h * 7 + 5);	1577	SV data_sv = newSV (w h * 7 + 5);
1356	uint8_t data = (uint8_t )SvPVX (data_sv);	1578	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1418	}	1640	}
1419	OUTPUT:	1641	OUTPUT:
1420	RETVAL	1642	RETVAL
1421		1643
1422	void	1644	void
1423	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)
1424	PPCODE:	1646	PPCODE:
1425	{	1647	{
1426	int x, y, z;	1648	int x, y, z;
1427	int w, h;	1649	int w, h;
1428	int x1, y1;	1650	int x1, y1;
…		…
1477	}	1699	}
1478	}	1700	}
1479	}	1701	}
1480	}	1702	}
1481		1703
1482	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1483		1705
1484	CFClient::MixChunk	1706	CFPlus::MixChunk
1485	new_from_file (SV class, char path)	1707	new_from_file (SV class, char path)
1486	CODE:	1708	CODE:
1487	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1488	OUTPUT:	1710	OUTPUT:
1489	RETVAL	1711	RETVAL
1490		1712
1491	void	1713	void
1492	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1493	CODE:	1715	CODE:
1494	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1495		1717
1496	int	1718	int
1497	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1498	CODE:	1720	CODE:
1499	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1500	OUTPUT:	1722	OUTPUT:
1501	RETVAL	1723	RETVAL
1502		1724
1503	int	1725	int
1504	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)
1505	CODE:	1727	CODE:
1506	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1507	OUTPUT:	1729	OUTPUT:
1508	RETVAL	1730	RETVAL
1509		1731
1510	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1511		1733
1512	int	1734	int
1513	volume (int volume = -1)	1735	volume (int volume = -1)
1514	CODE:	1736	CODE:
1515	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1516	OUTPUT:	1738	OUTPUT:
1517	RETVAL	1739	RETVAL
1518		1740
1519	CFClient::MixMusic	1741	CFPlus::MixMusic
1520	new_from_file (SV class, char path)	1742	new_from_file (SV class, char path)
1521	CODE:	1743	CODE:
1522	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1523	OUTPUT:	1745	OUTPUT:
1524	RETVAL	1746	RETVAL
1525		1747
1526	void	1748	void
1527	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1528	CODE:	1750	CODE:
1529	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1530		1752
1531	int	1753	int
1532	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1533	CODE:	1755	CODE:
1534	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1535	OUTPUT:	1757	OUTPUT:
1536	RETVAL	1758	RETVAL
1537		1759
1538	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1539		1761
1540	BOOT:	1762	BOOT:
1541	{	1763	{
1542	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1543	static const struct {	1765	static const struct {
1544	const char *name;	1766	const char *name;
1545	IV iv;	1767	IV iv;
1546	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1547	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
…		…
1554	const_iv (GL_SCISSOR_TEST),	1776	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1777	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1778	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1779	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1780	const_iv (GL_RESCALE_NORMAL),
		1781	const_iv (GL_FRONT),
		1782	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1783	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1787	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1790	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1568	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),
1569	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1797	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1798	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1800	const_iv (GL_INTENSITY),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1838	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1840	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1841	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1842	const_iv (GL_TRIANGLE_STRIP),
…		…
1647	OUTPUT:	1875	OUTPUT:
1648	RETVAL	1876	RETVAL
1649		1877
1650	int glGetError ()	1878	int glGetError ()
1651		1879
		1880	void glFinish ()
		1881
1652	void glClear (int mask)	1882	void glClear (int mask)
1653		1883
1654	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)
1655	PROTOTYPE: @	1885	PROTOTYPE: @
1656		1886
…		…
1679	void glPushMatrix ()	1909	void glPushMatrix ()
1680		1910
1681	void glPopMatrix ()	1911	void glPopMatrix ()
1682		1912
1683	void glLoadIdentity ()	1913	void glLoadIdentity ()
		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
1684		1918
1685	# near_ and far_ are due to microsofts buggy "c" compiler	1919	# near_ and far_ are due to microsofts buggy "c" compiler
1686	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1920	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1687		1921
1688	# near_ and far_ are due to microsofts buggy "c" compiler	1922	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1718	r *= a;	1952	r *= a;
1719	g *= a;	1953	g *= a;
1720	b *= a;	1954	b *= a;
1721	}	1955	}
1722	// microsoft visual "c" rounds instead of truncating...	1956	// microsoft visual "c" rounds instead of truncating...
1723	glColor4ub (MIN ((int)(r * 256.f), 255),	1957	glColor4f (r, g, b, a);
1724	MIN ((int)(g * 256.f), 255),
1725	MIN ((int)(b * 256.f), 255),
1726	MIN ((int)(a * 256.f), 255));
1727		1958
1728	void glInterleavedArrays (int format, int stride, char *data)	1959	void glInterleavedArrays (int format, int stride, char *data)
1729		1960
1730	void glDrawElements (int mode, int count, int type, char *indices)	1961	void glDrawElements (int mode, int count, int type, char *indices)
1731		1962
…		…
1808		2039
1809	void glEndList ()	2040	void glEndList ()
1810		2041
1811	void glCallList (int list)	2042	void glCallList (int list)
1812		2043
1813

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs. Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC