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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 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	rect.width = (rect.width + 3) & ~3;
		161
		162	*w = rect.width;
		163	*h = rect.height;
121	}	164	}
122		165
123	typedef uint16_t mapface;	166	typedef uint16_t mapface;
124		167
125	typedef struct {	168	typedef struct {
…		…
148	int texs;	191	int texs;
149	maptex *tex;	192	maptex *tex;
150		193
151	int32_t rows;	194	int32_t rows;
152	maprow *row;	195	maprow *row;
153	} *CFClient__Map;	196	} *CFPlus__Map;
154		197
155	static char *	198	static char *
156	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
157	{	200	{
158	char *p;	201	char *p;
…		…
176		219
177	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#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))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
179		222
180	static maprow *	223	static maprow *
181	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
182	{	225	{
183	if (0 > y)	226	if (0 > y)
184	{	227	{
185	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
186	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
224		267
225	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
226	}	269	}
227		270
228	static mapcell *	271	static mapcell *
229	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
230	{	273	{
231	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
232	}	275	}
233		276
234	static void	277	static void
235	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
236	{	279	{
237	int r;	280	int r;
238		281
239	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
240	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
248	self->row = 0;	291	self->row = 0;
249	self->rows = 0;	292	self->rows = 0;
250	}	293	}
251		294
252	static void	295	static void
253	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
254	{	297	{
255	int x, y;	298	int x, y;
256	maprow *row;	299	maprow *row;
257		300
258	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
…		…
298	ev.data2 = 0;	341	ev.data2 = 0;
299		342
300	SDL_PushEvent ((SDL_Event *)&ev);	343	SDL_PushEvent ((SDL_Event *)&ev);
301	}	344	}
302		345
		346	static unsigned int
		347	minpot (unsigned int n)
		348	{
		349	if (!n)
		350	return 0;
		351
		352	--n;
		353
		354	n \|= n >> 1;
		355	n \|= n >> 2;
		356	n \|= n >> 4;
		357	n \|= n >> 8;
		358	n \|= n >> 16;
		359
		360	return n + 1;
		361	}
		362
303	MODULE = CFClient PACKAGE = CFClient	363	MODULE = CFPlus PACKAGE = CFPlus
304		364
305	PROTOTYPES: ENABLE	365	PROTOTYPES: ENABLE
306		366
307	BOOT:	367	BOOT:
308	{	368	{
309	HV *stash = gv_stashpv ("CFClient", 1);	369	HV *stash = gv_stashpv ("CFPlus", 1);
310	static const struct {	370	static const struct {
311	const char *name;	371	const char *name;
312	IV iv;	372	IV iv;
313	} *civ, const_iv[] = {	373	} *civ, const_iv[] = {
314	# define const_iv(name) { # name, (IV)name }	374	# define const_iv(name) { # name, (IV)name }
…		…
415		475
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	476	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	477	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	478	}
419		479
		480	int
		481	in_destruct ()
		482	CODE:
		483	RETVAL = PL_main_cv == Nullcv;
		484	OUTPUT:
		485	RETVAL
		486
		487	NV floor (NV x)
		488
		489	NV ceil (NV x)
		490
420	void	491	void
421	pango_init ()	492	pango_init ()
422	CODE:	493	CODE:
423	{	494	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	495	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	496	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);	497	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	}	498	}
432		499
433	int	500	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	501	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		502
436	void	503	void
437	SDL_Quit ()	504	SDL_Quit ()
438		505
439	void	506	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	515	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		516
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	517	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	518	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		519
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
457		524
458	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	525	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		526	#if SDL_VERSION_ATLEAST(1,2,10)
		527	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		528	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		529	#endif
459		530
460	SDL_EnableUNICODE (1);	531	SDL_EnableUNICODE (1);
461	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	532	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
462		533
463	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	534	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
550	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	621	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
551	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	622	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
552	break;	623	break;
553	}	624	}
554		625
555	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	626	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
556	}	627	}
557	}	628	}
558		629
559	int	630	int
560	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	631	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
576	#endif	647	#endif
577		648
578	void	649	void
579	add_font (char *file)	650	add_font (char *file)
580	CODE:	651	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		653
587	void	654	void
588	load_image_inline (SV *image_)	655	load_image_inline (SV *image_)
589	ALIAS:	656	ALIAS:
590	load_image_file = 1	657	load_image_file = 1
…		…
632		699
633	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	700	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
634		701
635	assert (surface2->pitch == surface2->w * 4);	702	assert (surface2->pitch == surface2->w * 4);
636		703
		704	SDL_LockSurface (surface2);
637	EXTEND (SP, 5);	705	EXTEND (SP, 6);
638	PUSHs (sv_2mortal (newSViv (surface2->w)));	706	PUSHs (sv_2mortal (newSViv (surface2->w)));
639	PUSHs (sv_2mortal (newSViv (surface2->h)));	707	PUSHs (sv_2mortal (newSViv (surface2->h)));
640	SDL_LockSurface (surface2);
641	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	708	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)));	709	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
644	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	710	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
645	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	711	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		712	SDL_UnlockSurface (surface2);
646		713
647	SDL_FreeSurface (surface);	714	SDL_FreeSurface (surface);
648	SDL_FreeSurface (surface2);	715	SDL_FreeSurface (surface2);
649	}	716	}
650		717
…		…
686	CODE:	753	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	754	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	755	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	756	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	757	#endif
691	exit (1);	758	_exit (1);
692		759
		760	void
		761	_exit (int retval)
		762	CODE:
		763	_exit (retval);
		764
693	MODULE = CFClient PACKAGE = CFClient::Font	765	MODULE = CFPlus PACKAGE = CFPlus::Font
694		766
695	CFClient::Font	767	CFPlus::Font
696	new_from_file (SV class, char path, int id = 0)	768	new_from_file (SV class, char path, int id = 0)
697	CODE:	769	CODE:
698	{	770	{
699	int count;	771	int count;
700	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	772	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
703	}	775	}
704	OUTPUT:	776	OUTPUT:
705	RETVAL	777	RETVAL
706		778
707	void	779	void
708	DESTROY (CFClient::Font self)	780	DESTROY (CFPlus::Font self)
709	CODE:	781	CODE:
710	pango_font_description_free (self);	782	pango_font_description_free (self);
711		783
712	void	784	void
713	make_default (CFClient::Font self)	785	make_default (CFPlus::Font self)
714	CODE:	786	CODE:
715	default_font = self;	787	default_font = self;
716		788
717	MODULE = CFClient PACKAGE = CFClient::Layout	789	MODULE = CFPlus PACKAGE = CFPlus::Layout
718		790
719	CFClient::Layout	791	void
720	new (SV *class, int rgba = 0)	792	reset_glyph_cache ()
721	CODE:	793	CODE:
722	#if _WIN32	794	tc_clear ();
723	//rgba = 0;//D makes text nicer, breaks TextView	795
724	#endif	796	CFPlus::Layout
		797	new (SV *class)
		798	CODE:
725	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
726		800
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	801	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	802	RETVAL->r = 1.;
730	RETVAL->g = 1.;	803	RETVAL->g = 1.;
731	RETVAL->b = 1.;	804	RETVAL->b = 1.;
732	RETVAL->a = 1.;	805	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	806	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
737	layout_update_font (RETVAL);	810	layout_update_font (RETVAL);
738	OUTPUT:	811	OUTPUT:
739	RETVAL	812	RETVAL
740		813
741	void	814	void
742	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
743	CODE:	816	CODE:
744	g_object_unref (self->pl);	817	g_object_unref (self->pl);
745	Safefree (self);	818	Safefree (self);
746		819
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	820	void
755	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
756	CODE:	822	CODE:
757	{	823	{
758	STRLEN textlen;	824	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
760		826
761	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
762	}	828	}
763		829
764	void	830	void
765	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
766	CODE:	832	CODE:
767	{	833	{
768	STRLEN textlen;	834	STRLEN textlen;
769	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
770		836
771	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
772	}	838	}
773		839
		840	void
		841	set_shapes (CFPlus::Layout self, ...)
		842	CODE:
		843	{
		844	PangoAttrList *attrs = 0;
		845	const char *text = pango_layout_get_text (self->pl);
		846	const char *pos = text;
		847	int arg = 4;
		848
		849	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		850	{
		851	PangoRectangle inkrect, rect;
		852	PangoAttribute *attr;
		853
		854	int x = SvIV (ST (arg - 3));
		855	int y = SvIV (ST (arg - 2));
		856	int w = SvIV (ST (arg - 1));
		857	int h = SvIV (ST (arg ));
		858
		859	inkrect.x = 0;
		860	inkrect.y = 0;
		861	inkrect.width = 0;
		862	inkrect.height = 0;
		863
		864	rect.x = x * PANGO_SCALE;
		865	rect.y = y * PANGO_SCALE;
		866	rect.width = w * PANGO_SCALE;
		867	rect.height = h * PANGO_SCALE;
		868
		869	if (!attrs)
		870	attrs = pango_layout_get_attributes (self->pl);
		871
		872	attr = pango_attr_shape_new (&inkrect, &rect);
		873	attr->start_index = pos - text;
		874	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		875	pango_attr_list_insert (attrs, attr);
		876
		877	arg += 4;
		878	pos += sizeof (OBJ_STR) - 1;
		879	}
		880
		881	if (attrs)
		882	pango_layout_set_attributes (self->pl, attrs);
		883	}
		884
		885	void
		886	get_shapes (CFPlus::Layout self)
		887	PPCODE:
		888	{
		889	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		890
		891	do
		892	{
		893	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		894
		895	if (run && shape_attr_p (run))
		896	{
		897	PangoRectangle extents;
		898	pango_layout_iter_get_run_extents (iter, 0, &extents);
		899
		900	EXTEND (SP, 2);
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		902	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		903	}
		904	}
		905	while (pango_layout_iter_next_run (iter));
		906
		907	pango_layout_iter_free (iter);
		908	}
		909
		910	int
		911	has_wrapped (CFPlus::Layout self)
		912	CODE:
		913	{
		914	int lines = 1;
		915	const char *text = pango_layout_get_text (self->pl);
		916
		917	while (*text)
		918	lines += *text++ == '\n';
		919
		920	RETVAL = lines < pango_layout_get_line_count (self->pl);
		921	}
		922	OUTPUT:
		923	RETVAL
		924
774	SV *	925	SV *
775	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
776	CODE:	927	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	929	sv_utf8_decode (RETVAL);
779	OUTPUT:	930	OUTPUT:
780	RETVAL	931	RETVAL
781		932
782	void	933	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	934	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
784	CODE:	935	CODE:
785	self->r = r;	936	self->r = r;
786	self->g = g;	937	self->g = g;
787	self->b = b;	938	self->b = b;
788	self->a = a;	939	self->a = a;
789		940
790	void	941	void
791	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
792	CODE:	943	CODE:
793	if (self->font != font)	944	if (self->font != font)
794	{	945	{
795	self->font = font;	946	self->font = font;
796	layout_update_font (self);	947	layout_update_font (self);
797	}	948	}
798		949
799	void	950	void
800	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
801	CODE:	952	CODE:
802	if (self->base_height != base_height)	953	if (self->base_height != base_height)
803	{	954	{
804	self->base_height = base_height;	955	self->base_height = base_height;
805	layout_update_font (self);	956	layout_update_font (self);
806	}	957	}
807		958
808	void	959	void
809	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
810	CODE:	961	CODE:
811	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	962	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
812		963
813	void	964	void
814	set_indent (CFClient::Layout self, int indent)	965	set_indent (CFPlus::Layout self, int indent)
815	CODE:	966	CODE:
816	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
817		968
818	void	969	void
819	set_spacing (CFClient::Layout self, int spacing)	970	set_spacing (CFPlus::Layout self, int spacing)
820	CODE:	971	CODE:
821	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
822		973
823	void	974	void
824	set_ellipsise (CFClient::Layout self, int ellipsise)	975	set_ellipsise (CFPlus::Layout self, int ellipsise)
825	CODE:	976	CODE:
826	pango_layout_set_ellipsize (self->pl,	977	pango_layout_set_ellipsize (self->pl,
827	ellipsise == 1 ? PANGO_ELLIPSIZE_START	978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
828	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
829	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
830	: PANGO_ELLIPSIZE_NONE	981	: PANGO_ELLIPSIZE_NONE
831	);	982	);
832		983
833	void	984	void
834	set_single_paragraph_mode (CFClient::Layout self, int spm)	985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
835	CODE:	986	CODE:
836	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
837		988
838	void	989	void
839	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
840	PPCODE:	991	PPCODE:
841	{	992	{
842	int w, h;	993	int w, h;
843		994
844	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
849	}	1000	}
850		1001
851	int	1002	int
		1003	descent (CFPlus::Layout self)
		1004	CODE:
		1005	{
		1006	PangoRectangle rect;
		1007	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1008	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1009	RETVAL = PANGO_DESCENT (rect);
		1010	}
		1011	OUTPUT:
		1012	RETVAL
		1013
		1014	int
852	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
853	CODE:	1016	CODE:
854	{	1017	{
855	int index, trailing;	1018	int index, trailing;
856	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1019	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
857	RETVAL = index;	1020	RETVAL = index;
858	}	1021	}
859	OUTPUT:	1022	OUTPUT:
860	RETVAL	1023	RETVAL
861		1024
862	void	1025	void
863	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
864	PPCODE:	1027	PPCODE:
865	{	1028	{
866	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
867	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
868		1031
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1036	}
874		1037
875	void	1038	void
876	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
877	PPCODE:	1040	PPCODE:
878	{	1041	pango_opengl_render_layout_subpixel (
879	SV *retval;	1042	self->pl,
880	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
		1044	self->r, self->g, self->b, self->a,
		1045	flags
		1046	);
881		1047
882	layout_get_pixel_size (self, &w, &h);	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
883		1049
884	if (self->rgba)	1050	void
		1051	pad2pot (SV data_, SV w_, SV *h_)
		1052	CODE:
		1053	{
		1054	int ow = SvIV (w_);
		1055	int oh = SvIV (h_);
		1056
		1057	if (ow && oh)
885	{	1058	{
886	cairo_surface_t *surface;	1059	int nw = minpot (ow);
887	cairo_t *cairo;	1060	int nh = minpot (oh);
888		1061
889	retval = newSV (w * h * 4);	1062	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1063	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1064	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1065	{
912	uint32_t rgba = *p;	1066	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1067	char *data = SvPVbyte (data_, datalen);
914	#if 0	1068	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1069	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1070
922	rgba = (rgba & 0xffffff00) \| a;	1071	SvPOK_only (result_);
		1072	SvCUR_set (result_, nw * nh * bpp);
		1073
		1074	memset (SvPVX (result_), 0, nw * nh * bpp);
		1075	while (oh--)
		1076	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1077
		1078	sv_setsv (data_, result_);
923	}	1079	}
924	#endif	1080
925	#endif	1081	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1082	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1083	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1084	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1085	}
965		1086
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1087	void
969	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1088	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970	PROTOTYPE: $$$;$$	1089	PROTOTYPE: $$$;$$
971	ALIAS:	1090	ALIAS:
972	draw_quad_alpha = 1	1091	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1092	draw_quad_alpha_premultiplied = 2
974	CODE:	1093	CODE:
…		…
990		1109
991	if (ix == 2)	1110	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1111	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1112	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1113	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1114	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1115
997	glEnable (GL_ALPHA_TEST);	1116	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1117	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1118	}
1000		1119
…		…
1012	glDisable (GL_ALPHA_TEST);	1131	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1132	glDisable (GL_BLEND);
1014	}	1133	}
1015	}	1134	}
1016		1135
1017	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1137
1019	CFClient::Map	1138	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
1021	CODE:	1140	CODE:
1022	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1142	RETVAL->x = 0;
1024	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
1034	RETVAL->row = 0;	1153	RETVAL->row = 0;
1035	OUTPUT:	1154	OUTPUT:
1036	RETVAL	1155	RETVAL
1037		1156
1038	void	1157	void
1039	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
1040	CODE:	1159	CODE:
1041	{	1160	{
1042	map_clear (self);	1161	map_clear (self);
1043	Safefree (self->face);	1162	Safefree (self->face);
		1163	Safefree (self->tex);
1044	Safefree (self);	1164	Safefree (self);
1045	}	1165	}
1046		1166
1047	void	1167	void
1048	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
1049	CODE:	1169	CODE:
1050	map_clear (self);	1170	map_clear (self);
1051		1171
1052	void	1172	void
1053	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
1054	CODE:	1174	CODE:
1055	{	1175	{
1056	while (self->faces <= face)	1176	while (self->faces <= face)
1057	{	1177	{
1058	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
1061		1181
1062	self->face [face] = texid;	1182	self->face [face] = texid;
1063	}	1183	}
1064		1184
1065	void	1185	void
1066	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1186	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1067	CODE:	1187	CODE:
1068	{	1188	{
1069	while (self->texs <= texid)	1189	while (self->texs <= texid)
1070	{	1190	{
1071	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
1095	// from transparent color bleeding and ugly wrapping effects.	1215	// from transparent color bleeding and ugly wrapping effects.
1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1216	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1097	}	1217	}
1098		1218
1099	int	1219	int
1100	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
1101	ALIAS:	1221	ALIAS:
1102	oy = 1	1222	oy = 1
1103	x = 2	1223	x = 2
1104	y = 3	1224	y = 3
1105	w = 4	1225	w = 4
…		…
1116	}	1236	}
1117	OUTPUT:	1237	OUTPUT:
1118	RETVAL	1238	RETVAL
1119		1239
1120	void	1240	void
1121	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
1122	CODE:	1242	CODE:
1123	{	1243	{
1124	if (dx > 0)	1244	if (dx > 0)
1125	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
1126	else if (dx < 0)	1246	else if (dx < 0)
…		…
1142	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
1143	}	1263	}
1144	}	1264	}
1145		1265
1146	void	1266	void
1147	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
1148	CODE:	1268	CODE:
1149	{	1269	{
1150	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1270	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1151	uint8_t data_end = (uint8_t )SvEND (data_);	1271	uint8_t data_end = (uint8_t )SvEND (data_);
1152	mapcell *cell;	1272	mapcell *cell;
…		…
1154		1274
1155	while (data < data_end)	1275	while (data < data_end)
1156	{	1276	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1277	flags = (data [0] << 8) + data [1]; data += 2;
1158		1278
1159	x = ((flags >> 10) & 63) + self->x;	1279	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1280	y = self->y + ((flags >> 4) & 63);
1161		1281
1162	cell = map_get_cell (self, x, y);	1282	cell = map_get_cell (self, x, y);
1163		1283
1164	if (flags & 15)	1284	if (flags & 15)
1165	{	1285	{
…		…
1194	cell->darkness = -1;	1314	cell->darkness = -1;
1195	}	1315	}
1196	}	1316	}
1197		1317
1198	SV *	1318	SV *
1199	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1319	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1200	CODE:	1320	CODE:
1201	{	1321	{
1202	int x1, x;	1322	int x1, x;
1203	int y1, y;	1323	int y1, y;
1204	int z;	1324	int z;
…		…
1254	}	1374	}
1255	OUTPUT:	1375	OUTPUT:
1256	RETVAL	1376	RETVAL
1257		1377
1258	void	1378	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1379	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1380	CODE:
1261	{	1381	{
1262	int vx, vy;	1382	int vx, vy;
1263	int x, y, z;	1383	int x, y, z;
1264	int last_name;	1384	int last_name;
1265	mapface face;	1385	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1386
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1389
1277	/*	1390	/*
1278	int vx = self->vx = self->w >= sw	1391	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1392	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1393	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1284	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1397	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1398	*/
1286		1399
1287	glColor4ub (255, 255, 255, 255);	1400	glColor4ub (255, 255, 255, 255);
1288		1401
		1402	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1403	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1404	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1405	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1406
1294	glBegin (GL_QUADS);	1407	glBegin (GL_QUADS);
1295		1408
…		…
1303		1416
1304	for (x = 0; x < sw; x++)	1417	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1418	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1419	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1420	mapcell *cell = row->col + (x + vx - row->c0);
1308
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312		1421
1313	face = cell->face [z];	1422	face = cell->face [z];
1314		1423
1315	if (face)	1424	if (face)
1316	{	1425	{
…		…
1337		1446
1338	glEnd ();	1447	glEnd ();
1339		1448
1340	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);	1450	glDisable (GL_BLEND);
		1451	}
		1452
		1453	void
		1454	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1455	CODE:
		1456	{
		1457	static float color[16][3] = {
		1458	{ 0.00F, 0.00F, 0.00F },
		1459	{ 1.00F, 1.00F, 1.00F },
		1460	{ 0.00F, 0.00F, 0.55F },
		1461	{ 1.00F, 0.00F, 0.00F },
		1462
		1463	{ 1.00F, 0.54F, 0.00F },
		1464	{ 0.11F, 0.56F, 1.00F },
		1465	{ 0.93F, 0.46F, 0.00F },
		1466	{ 0.18F, 0.54F, 0.34F },
		1467
		1468	{ 0.56F, 0.73F, 0.56F },
		1469	{ 0.80F, 0.80F, 0.80F },
		1470	{ 0.55F, 0.41F, 0.13F },
		1471	{ 0.99F, 0.77F, 0.26F },
		1472
		1473	{ 0.74F, 0.65F, 0.41F },
		1474
		1475	{ 0.00F, 1.00F, 1.00F },
		1476	{ 1.00F, 0.00F, 1.00F },
		1477	{ 1.00F, 1.00F, 0.00F },
		1478	};
		1479
		1480	int x, y;
		1481
		1482	glEnable (GL_TEXTURE_2D);
		1483	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1484	glEnable (GL_BLEND);
		1485	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1486	glBegin (GL_QUADS);
		1487
		1488	for (y = 0; y < h; y++)
		1489	for (x = 0; x < w; x++)
		1490	{
		1491	unsigned char m = data [x + y * w];
		1492
		1493	if (m)
		1494	{
		1495	float *c = color [m & 15];
		1496
		1497	float tx1 = m & 0x40 ? 0.5 : 0.;
		1498	float tx2 = tx1 + 0.5;
		1499
		1500	glColor4f (c[0], c[1], c[2], 0.75);
		1501	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1502	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1503	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1504	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1505	}
		1506	}
		1507
		1508	glEnd ();
		1509	glDisable (GL_BLEND);
		1510	glDisable (GL_TEXTURE_2D);
		1511	}
		1512
		1513	void
		1514	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1515	PPCODE:
		1516	{
		1517	int vx, vy;
		1518	int x, y;
		1519	int sw4 = (sw + 3) & ~3;
		1520	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1521	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1522
		1523	memset (darkness, 255, sw4 * sh);
		1524	SvPOK_only (darkness_sv);
		1525	SvCUR_set (darkness_sv, sw4 * sh);
		1526
		1527	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1528	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1529
		1530	for (y = 0; y < sh; y++)
		1531	if (0 <= y + vy && y + vy < self->rows)
		1532	{
		1533	maprow *row = self->row + (y + vy);
		1534
		1535	for (x = 0; x < sw; x++)
		1536	if (row->c0 <= x + vx && x + vx < row->c1)
		1537	{
		1538	mapcell *cell = row->col + (x + vx - row->c0);
		1539
		1540	darkness[y * sw4 + x] = cell->darkness < 0
		1541	? 255 - FOW_DARKNESS
		1542	: 255 - cell->darkness;
		1543	}
		1544	}
1342		1545
1343	EXTEND (SP, 3);	1546	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1547	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1347	}	1550	}
1348		1551
1349	SV *	1552	SV *
1350	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1553	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1351	CODE:	1554	CODE:
1352	{	1555	{
1353	int x, y, x1, y1;	1556	int x, y, x1, y1;
1354	SV data_sv = newSV (w h * 7 + 5);	1557	SV data_sv = newSV (w h * 7 + 5);
1355	uint8_t data = (uint8_t )SvPVX (data_sv);	1558	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1417	}	1620	}
1418	OUTPUT:	1621	OUTPUT:
1419	RETVAL	1622	RETVAL
1420		1623
1421	void	1624	void
1422	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1625	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1423	PPCODE:	1626	PPCODE:
1424	{	1627	{
1425	int x, y, z;	1628	int x, y, z;
1426	int w, h;	1629	int w, h;
1427	int x1, y1;	1630	int x1, y1;
…		…
1476	}	1679	}
1477	}	1680	}
1478	}	1681	}
1479	}	1682	}
1480		1683
1481	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1482		1685
1483	CFClient::MixChunk	1686	CFPlus::MixChunk
1484	new_from_file (SV class, char path)	1687	new_from_file (SV class, char path)
1485	CODE:	1688	CODE:
1486	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1487	OUTPUT:	1690	OUTPUT:
1488	RETVAL	1691	RETVAL
1489		1692
1490	void	1693	void
1491	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1492	CODE:	1695	CODE:
1493	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1494		1697
1495	int	1698	int
1496	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1497	CODE:	1700	CODE:
1498	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1499	OUTPUT:	1702	OUTPUT:
1500	RETVAL	1703	RETVAL
1501		1704
1502	int	1705	int
1503	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1706	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1504	CODE:	1707	CODE:
1505	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1506	OUTPUT:	1709	OUTPUT:
1507	RETVAL	1710	RETVAL
1508		1711
1509	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1510		1713
1511	int	1714	int
1512	volume (int volume = -1)	1715	volume (int volume = -1)
1513	CODE:	1716	CODE:
1514	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1515	OUTPUT:	1718	OUTPUT:
1516	RETVAL	1719	RETVAL
1517		1720
1518	CFClient::MixMusic	1721	CFPlus::MixMusic
1519	new_from_file (SV class, char path)	1722	new_from_file (SV class, char path)
1520	CODE:	1723	CODE:
1521	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1522	OUTPUT:	1725	OUTPUT:
1523	RETVAL	1726	RETVAL
1524		1727
1525	void	1728	void
1526	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1527	CODE:	1730	CODE:
1528	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1529		1732
1530	int	1733	int
1531	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1532	CODE:	1735	CODE:
1533	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1534	OUTPUT:	1737	OUTPUT:
1535	RETVAL	1738	RETVAL
1536		1739
1537	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1538		1741
1539	BOOT:	1742	BOOT:
1540	{	1743	{
1541	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1542	static const struct {	1745	static const struct {
1543	const char *name;	1746	const char *name;
1544	IV iv;	1747	IV iv;
1545	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1546	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
…		…
1553	const_iv (GL_SCISSOR_TEST),	1756	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1757	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1758	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1759	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1760	const_iv (GL_RESCALE_NORMAL),
		1761	const_iv (GL_FRONT),
		1762	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1763	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1764	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1765	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1766	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1767	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1768	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1769	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1770	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1771	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1772	const_iv (GL_RGBA),
		1773	const_iv (GL_RGBA4),
		1774	const_iv (GL_RGBA8),
		1775	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1776	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1777	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1778	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1779	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1780	const_iv (GL_INTENSITY),
…		…
1603	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1604	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1605	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1606	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1607	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
1608	const_iv (GL_LINE_LOOP),	1818	const_iv (GL_LINE_LOOP),
1609	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1610	const_iv (GL_QUAD_STRIP),	1820	const_iv (GL_QUAD_STRIP),
1611	const_iv (GL_TRIANGLES),	1821	const_iv (GL_TRIANGLES),
1612	const_iv (GL_TRIANGLE_STRIP),	1822	const_iv (GL_TRIANGLE_STRIP),
…		…
1645	OUTPUT:	1855	OUTPUT:
1646	RETVAL	1856	RETVAL
1647		1857
1648	int glGetError ()	1858	int glGetError ()
1649		1859
		1860	void glFinish ()
		1861
1650	void glClear (int mask)	1862	void glClear (int mask)
1651		1863
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1864	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1865	PROTOTYPE: @
1654		1866
…		…
1677	void glPushMatrix ()	1889	void glPushMatrix ()
1678		1890
1679	void glPopMatrix ()	1891	void glPopMatrix ()
1680		1892
1681	void glLoadIdentity ()	1893	void glLoadIdentity ()
		1894
		1895	void glDrawBuffer (int buffer)
		1896
		1897	void glReadBuffer (int buffer)
1682		1898
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1899	# near_ and far_ are due to microsofts buggy "c" compiler
1684	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1900	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		1901
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1902	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1716	r *= a;	1932	r *= a;
1717	g *= a;	1933	g *= a;
1718	b *= a;	1934	b *= a;
1719	}	1935	}
1720	// microsoft visual "c" rounds instead of truncating...	1936	// microsoft visual "c" rounds instead of truncating...
1721	glColor4ub (MIN ((int)(r * 256.f), 255),	1937	glColor4f (r, g, b, a);
1722	MIN ((int)(g * 256.f), 255),
1723	MIN ((int)(b * 256.f), 255),
1724	MIN ((int)(a * 256.f), 255));
1725		1938
1726	void glInterleavedArrays (int format, int stride, char *data)	1939	void glInterleavedArrays (int format, int stride, char *data)
1727		1940
1728	void glDrawElements (int mode, int count, int type, char *indices)	1941	void glDrawElements (int mode, int count, int type, char *indices)
1729		1942
…		…
1806		2019
1807	void glEndList ()	2020	void glEndList ()
1808		2021
1809	void glCallList (int list)	2022	void glCallList (int list)
1810		2023
1811

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC