ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.95 by root, Wed May 24 01:46:53 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 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>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
6	#endif	9	#endif
7		10
8	#include "EXTERN.h"	11	#include "EXTERN.h"
9	#include "perl.h"	12	#include "perl.h"
10	#include "XSUB.h"	13	#include "XSUB.h"
11		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
12	#include <math.h>	19	#include <math.h>
13	#include <string.h>	20	#include <string.h>
14	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
15		23
16	#include <SDL.h>	24	#include <SDL.h>
17	#include <SDL_endian.h>	25	#include <SDL_endian.h>
18	#include <SDL_image.h>	26	#include <SDL_image.h>
19	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
21		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
22	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
23		34
24	#include <pango/pango.h>	35	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		36
29	#ifndef _WIN32	37	#ifndef _WIN32
30	# include <sys/types.h>	38	# include <sys/types.h>
31	# include <sys/socket.h>	39	# include <sys/socket.h>
32	# include <netinet/in.h>	40	# include <netinet/in.h>
33	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
34	# include <inttypes.h>	42	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		46
46	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
47		48
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	#if 0
54	{ \	55	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	56	#else
56	static type fptr_; \	57	# define PARACHUTE 0
57	\	58	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		59
		60	static struct
		61	{
		62	#define GL_FUNC(ptr,name) ptr name;
		63	#include "glfunc.h"
		64	#undef GL_FUNC
		65	} gl;
		66
		67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		68	{
		69	if (gl.BlendFuncSeparate)
		70	gl.BlendFuncSeparate (sa, da, saa, daa);
		71	else if (gl.BlendFuncSeparateEXT)
		72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		73	else
		74	glBlendFunc (sa, da);
		75	}
		76
		77	#include "texcache.c"
		78
		79	#include "pango-font.c"
		80	#include "pango-fontmap.c"
		81	#include "pango-render.c"
		82
68	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
70		85
71	typedef PangoFontDescription *CFClient__Font;	86	typedef PangoFontDescription *CFPlus__Font;
		87
		88	static int
		89	shape_attr_p (PangoLayoutRun *run)
		90	{
		91	GSList *attrs = run->item->analysis.extra_attrs;
		92
		93	while (attrs)
		94	{
		95	PangoAttribute *attr = attrs->data;
		96
		97	if (attr->klass->type == PANGO_ATTR_SHAPE)
		98	return 1;
		99
		100	attrs = attrs->next;
		101	}
		102
		103	return 0;
		104	}
72		105
73	typedef struct cf_layout {	106	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	107	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	108	float r, g, b, a; // default color for rgba mode
77	int base_height;	109	int base_height;
78	CFClient__Font font;	110	CFPlus__Font font;
79	} *CFClient__Layout;	111	} *CFPlus__Layout;
80		112
81	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
82	static PangoContext *ft2_context, *cairo_context;	114	static PangoContext *opengl_context;
83	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	115	static PangoFontMap *opengl_fontmap;
84		116
85	static void	117	static void
86	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
87	{	119	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	121	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	123	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	125	}
95		126
96	static void	127	static void
97	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
98	{	129	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	130	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
101	*/	132	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		137
107	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
108	}	139	}
109		140
110	static void	141	static void
111	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	142	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
114		148
115	if (!*w) *w = 1;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!*h) *h = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		151
118	*w = (*w + 3) & ~3;	152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
119	}	157	}
120		158
121	typedef uint16_t mapface;	159	typedef uint16_t mapface;
122		160
123	typedef struct {	161	typedef struct {
…		…
126	float s, t;	164	float s, t;
127	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
128	} maptex;	166	} maptex;
129		167
130	typedef struct {	168	typedef struct {
131	int16_t darkness;	169	uint32_t player;
132	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	173	} mapcell;
134		174
135	typedef struct {	175	typedef struct {
136	int32_t c0, c1;	176	int32_t c0, c1;
137	mapcell *col;	177	mapcell *col;
…		…
146	int texs;	186	int texs;
147	maptex *tex;	187	maptex *tex;
148		188
149	int32_t rows;	189	int32_t rows;
150	maprow *row;	190	maprow *row;
151	} *CFClient__Map;	191	} *CFPlus__Map;
152		192
153	static char *	193	static char *
154	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
155	{	195	{
156	char *p;	196	char *p;
…		…
174		214
175	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	215	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		217
178	static maprow *	218	static maprow *
179	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
180	{	220	{
181	if (0 > y)	221	if (0 > y)
182	{	222	{
183	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
222		262
223	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
224	}	264	}
225		265
226	static mapcell *	266	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
228	{	268	{
229	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
230	}	270	}
231		271
232	static void	272	static void
233	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
234	{	274	{
235	int r;	275	int r;
236		276
237	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
246	self->row = 0;	286	self->row = 0;
247	self->rows = 0;	287	self->rows = 0;
248	}	288	}
249		289
250	static void	290	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	291	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	292	{
253	int x, y;	293	int x, y;
254	maprow *row;	294	maprow *row;
		295	mapcell *cell;
255		296
256	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	298	if (y >= 0)
258	{	299	{
259	if (y >= self->rows)	300	if (y >= self->rows)
…		…
265	if (x >= row->c0)	306	if (x >= row->c0)
266	{	307	{
267	if (x >= row->c1)	308	if (x >= row->c1)
268	break;	309	break;
269		310
270	row->col[x - row->c0].darkness = -1;	311	cell = row->col + x - row->c0;
		312
		313	cell->darkness = 0;
		314	cell->stat_hp = 0;
		315	cell->flags = 0;
		316	cell->player = 0;
271	}	317	}
272	}	318	}
273	}	319	}
274		320
275	static void	321	static void
…		…
296	ev.data2 = 0;	342	ev.data2 = 0;
297		343
298	SDL_PushEvent ((SDL_Event *)&ev);	344	SDL_PushEvent ((SDL_Event *)&ev);
299	}	345	}
300		346
		347	static unsigned int
		348	minpot (unsigned int n)
		349	{
		350	if (!n)
		351	return 0;
		352
		353	--n;
		354
		355	n |= n >> 1;
		356	n |= n >> 2;
		357	n |= n >> 4;
		358	n |= n >> 8;
		359	n |= n >> 16;
		360
		361	return n + 1;
		362	}
		363
301	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
302		365
303	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
304		367
305	BOOT:	368	BOOT:
306	{	369	{
307	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	371	static const struct {
309	const char *name;	372	const char *name;
310	IV iv;	373	IV iv;
311	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
413		476
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	477	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	479	}
417		480
		481	int
		482	in_destruct ()
		483	CODE:
		484	RETVAL = PL_main_cv == Nullcv;
		485	OUTPUT:
		486	RETVAL
		487
		488	NV floor (NV x)
		489
		490	NV ceil (NV x)
		491
418	void	492	void
419	pango_init ()	493	pango_init ()
420	CODE:	494	CODE:
421	{	495	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	496	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	499	}
430		500
431	int	501	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		503
434	void	504	void
435	SDL_Quit ()	505	SDL_Quit ()
436		506
437	void	507	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		517
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		520
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		525
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
		528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
457		531
458	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		534
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	553	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	554	CODE:
481	RETVAL = !!SDL_SetVideoMode (	555	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	556	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483	);	557	);
		558	if (RETVAL)
		559	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	560	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		561	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		562	# include "glfunc.h"
		563	# undef GL_FUNC
		564	}
485	OUTPUT:	565	OUTPUT:
486	RETVAL	566	RETVAL
487		567
488	void	568	void
489	SDL_GL_SwapBuffers ()	569	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	624	break;
545	}	625	}
546		626
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	628	}
549	}	629	}
550		630
551	int	631	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
565	CODE:	645	CODE:
566	#ifndef _WIN32	646	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	648	#endif
569		649
570	char *	650	void
571	gl_vendor ()	651	win32_proxy_info ()
572	CODE:	652	PPCODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);	653	{
574	OUTPUT:	654	#ifdef _WIN32
575	RETVAL	655	char buffer[2048];
		656	DWORD buflen;
576		657
577	char *	658	EXTEND (SP, 3);
578	gl_version ()	659
579	CODE:	660	buflen = sizeof (buffer);
580	RETVAL = (char *)glGetString (GL_VERSION);	661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
581	OUTPUT:	662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
582	RETVAL	663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
583		665
584	char *	666	buflen = sizeof (buffer);
585	gl_extensions ()	667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
586	CODE:	668	{
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);	669	PUSHs (newSVpv (buffer, 0));
588	OUTPUT:	670
589	RETVAL	671	buflen = sizeof (buffer);
		672	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		673	PUSHs (newSVpv (buffer, 0));
		674	}
		675	}
		676	#endif
		677	}
590		678
591	void	679	void
592	add_font (char *file)	680	add_font (char *file)
593	CODE:	681	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		683
600	void	684	void
601	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
602	ALIAS:	686	ALIAS:
603	load_image_file = 1	687	load_image_file = 1
…		…
645		729
646	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647		731
648	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
649		733
		734	SDL_LockSurface (surface2);
650	EXTEND (SP, 5);	735	EXTEND (SP, 6);
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	739	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
659		743
660	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
662	}	746	}
663		747
…		…
699	CODE:	783	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	784	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	785	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
703	#endif	787	#endif
704	exit (1);	788	_exit (1);
705		789
		790	void
		791	_exit (int retval = 0)
		792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
		795	#else
		796	_exit (retval);
		797	#endif
		798
706	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
707		800
708	CFClient::Font	801	CFPlus::Font
709	new_from_file (SV *class, char *path, int id = 0)	802	new_from_file (SV *class, char *path, int id = 0)
710	CODE:	803	CODE:
711	{	804	{
712	int count;	805	int count;
713	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
716	}	809	}
717	OUTPUT:	810	OUTPUT:
718	RETVAL	811	RETVAL
719		812
720	void	813	void
721	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
722	CODE:	815	CODE:
723	pango_font_description_free (self);	816	pango_font_description_free (self);
724		817
725	void	818	void
726	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
727	CODE:	820	CODE:
728	default_font = self;	821	default_font = self;
729		822
730	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
731		824
732	CFClient::Layout	825	void
733	new (SV *class, int rgba = 0)	826	reset_glyph_cache ()
734	CODE:	827	CODE:
735	#if _WIN32	828	tc_clear ();
736	rgba = 0;//D	829
737	#endif	830	CFPlus::Layout
		831	new (SV *class)
		832	CODE:
738	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
739		834
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	835	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	836	RETVAL->r = 1.;
743	RETVAL->g = 1.;	837	RETVAL->g = 1.;
744	RETVAL->b = 1.;	838	RETVAL->b = 1.;
745	RETVAL->a = 1.;	839	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	840	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
750	layout_update_font (RETVAL);	844	layout_update_font (RETVAL);
751	OUTPUT:	845	OUTPUT:
752	RETVAL	846	RETVAL
753		847
754	void	848	void
755	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
756	CODE:	850	CODE:
757	g_object_unref (self->pl);	851	g_object_unref (self->pl);
758	Safefree (self);	852	Safefree (self);
759		853
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	854	void
768	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
769	CODE:	856	CODE:
770	{	857	{
771	STRLEN textlen;	858	STRLEN textlen;
772	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
773		860
774	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
775	}	862	}
776		863
777	void	864	void
778	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
779	CODE:	866	CODE:
780	{	867	{
781	STRLEN textlen;	868	STRLEN textlen;
782	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
783		870
784	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
785	}	872	}
786		873
		874	void
		875	set_shapes (CFPlus::Layout self, ...)
		876	CODE:
		877	{
		878	PangoAttrList *attrs = 0;
		879	const char *text = pango_layout_get_text (self->pl);
		880	const char *pos = text;
		881	int arg = 4;
		882
		883	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		884	{
		885	PangoRectangle inkrect, rect;
		886	PangoAttribute *attr;
		887
		888	int x = SvIV (ST (arg - 3));
		889	int y = SvIV (ST (arg - 2));
		890	int w = SvIV (ST (arg - 1));
		891	int h = SvIV (ST (arg ));
		892
		893	inkrect.x = 0;
		894	inkrect.y = 0;
		895	inkrect.width = 0;
		896	inkrect.height = 0;
		897
		898	rect.x = x * PANGO_SCALE;
		899	rect.y = y * PANGO_SCALE;
		900	rect.width = w * PANGO_SCALE;
		901	rect.height = h * PANGO_SCALE;
		902
		903	if (!attrs)
		904	attrs = pango_layout_get_attributes (self->pl);
		905
		906	attr = pango_attr_shape_new (&inkrect, &rect);
		907	attr->start_index = pos - text;
		908	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		909	pango_attr_list_insert (attrs, attr);
		910
		911	arg += 4;
		912	pos += sizeof (OBJ_STR) - 1;
		913	}
		914
		915	if (attrs)
		916	pango_layout_set_attributes (self->pl, attrs);
		917	}
		918
		919	void
		920	get_shapes (CFPlus::Layout self)
		921	PPCODE:
		922	{
		923	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		924
		925	do
		926	{
		927	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		928
		929	if (run && shape_attr_p (run))
		930	{
		931	PangoRectangle extents;
		932	pango_layout_iter_get_run_extents (iter, 0, &extents);
		933
		934	EXTEND (SP, 2);
		935	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		936	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		937	}
		938	}
		939	while (pango_layout_iter_next_run (iter));
		940
		941	pango_layout_iter_free (iter);
		942	}
		943
		944	int
		945	has_wrapped (CFPlus::Layout self)
		946	CODE:
		947	{
		948	int lines = 1;
		949	const char *text = pango_layout_get_text (self->pl);
		950
		951	while (*text)
		952	lines += *text++ == '\n';
		953
		954	RETVAL = lines < pango_layout_get_line_count (self->pl);
		955	}
		956	OUTPUT:
		957	RETVAL
		958
787	SV *	959	SV *
788	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
789	CODE:	961	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
792	OUTPUT:	964	OUTPUT:
793	RETVAL	965	RETVAL
794		966
795	void	967	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797	CODE:	969	CODE:
798	self->r = r;	970	self->r = r;
799	self->g = g;	971	self->g = g;
800	self->b = b;	972	self->b = b;
801	self->a = a;	973	self->a = a;
802		974
803	void	975	void
804	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805	CODE:	977	CODE:
806	if (self->font != font)	978	if (self->font != font)
807	{	979	{
808	self->font = font;	980	self->font = font;
809	layout_update_font (self);	981	layout_update_font (self);
810	}	982	}
811		983
812	void	984	void
813	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
814	CODE:	986	CODE:
815	if (self->base_height != base_height)	987	if (self->base_height != base_height)
816	{	988	{
817	self->base_height = base_height;	989	self->base_height = base_height;
818	layout_update_font (self);	990	layout_update_font (self);
819	}	991	}
820		992
821	void	993	void
822	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
823	CODE:	995	CODE:
824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	996	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825		997
826	void	998	void
827	set_indent (CFClient::Layout self, int indent)	999	set_indent (CFPlus::Layout self, int indent)
828	CODE:	1000	CODE:
829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830		1002
831	void	1003	void
832	set_spacing (CFClient::Layout self, int spacing)	1004	set_spacing (CFPlus::Layout self, int spacing)
833	CODE:	1005	CODE:
834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835		1007
836	void	1008	void
837	set_ellipsise (CFClient::Layout self, int ellipsise)	1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
838	CODE:	1010	CODE:
839	pango_layout_set_ellipsize (self->pl,	1011	pango_layout_set_ellipsize (self->pl,
840	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
843	: PANGO_ELLIPSIZE_NONE	1015	: PANGO_ELLIPSIZE_NONE
844	);	1016	);
845		1017
846	void	1018	void
847	set_single_paragraph_mode (CFClient::Layout self, int spm)	1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
848	CODE:	1020	CODE:
849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850		1022
851	void	1023	void
852	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
853	PPCODE:	1025	PPCODE:
854	{	1026	{
855	int w, h;	1027	int w, h;
856		1028
857	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
862	}	1034	}
863		1035
864	int	1036	int
		1037	descent (CFPlus::Layout self)
		1038	CODE:
		1039	{
		1040	PangoRectangle rect;
		1041	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1042	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1043	RETVAL = PANGO_DESCENT (rect);
		1044	}
		1045	OUTPUT:
		1046	RETVAL
		1047
		1048	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
866	CODE:	1050	CODE:
867	{	1051	{
868	int index, trailing;	1052	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1053	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870	RETVAL = index;	1054	RETVAL = index + trailing;
871	}	1055	}
872	OUTPUT:	1056	OUTPUT:
873	RETVAL	1057	RETVAL
874		1058
875	void	1059	void
876	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
877	PPCODE:	1061	PPCODE:
878	{	1062	{
879	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
880	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881		1065
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1070	}
887		1071
888	void	1072	void
889	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
890	PPCODE:	1074	PPCODE:
891	{	1075	{
892	SV *retval;	1076	int line, x;
893	int w, h;
894		1077
895	layout_get_pixel_size (self, &w, &h);	1078	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1079	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
896		1080
897	if (self->rgba)
898	{
899	cairo_surface_t *surface;
900	cairo_t *cairo;
901
902	retval = newSV (w * h * 4);
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{
920	uint32_t *p = (uint32_t *)SvPVX (retval);
921	uint32_t *e = p + w * h;
922
923	while (p < e)
924	{
925	uint32_t rgba = *p;
926	rgba = (rgba >> 24) | (rgba << 8);
927	#if 0
928	#ifdef _WIN32
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934
935	rgba = (rgba & 0xffffff00) | a;
936	}
937	#endif
938	#endif
939	rgba = SDL_SwapBE32 (rgba);
940	*p++ = rgba;
941	}
942	}
943
944	EXTEND (SP, 5);	1081	EXTEND (SP, 2);
945	PUSHs (sv_2mortal (newSViv (w)));	1082	PUSHs (sv_2mortal (newSViv (line - 1)));
		1083	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1084	}
		1085
		1086	void
		1087	line_x_to_index (CFPlus::Layout self, int line, int x)
		1088	PPCODE:
		1089	{
		1090	PangoLayoutLine *lp;
		1091	int index, trailing;
		1092
		1093	if (line < 0)
		1094	XSRETURN_EMPTY;
		1095
		1096	if (!(lp = pango_layout_get_line (self->pl, line)))
		1097	XSRETURN_EMPTY; /* do better */
		1098
		1099	if (!pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing))
		1100	XSRETURN_EMPTY; /* do better */
		1101
		1102	EXTEND (SP, 2);
		1103	if (GIMME_V == G_SCALAR)
946	PUSHs (sv_2mortal (newSViv (h)));	1104	PUSHs (sv_2mortal (newSViv (index + trailing)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}
951	else	1105	else
952	{	1106	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));	1107	PUSHs (sv_2mortal (newSViv (index)));
972	PUSHs (sv_2mortal (newSViv (h)));	1108	PUSHs (sv_2mortal (newSViv (trailing)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}	1109	}
977	}	1110	}
978		1111
		1112	void
		1113	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1114	PPCODE:
		1115	pango_opengl_render_layout_subpixel (
		1116	self->pl,
		1117	x * PANGO_SCALE, y * PANGO_SCALE,
		1118	self->r, self->g, self->b, self->a,
		1119	flags
		1120	);
		1121
979	MODULE = CFClient PACKAGE = CFClient::Texture	1122	MODULE = CFPlus PACKAGE = CFPlus::Texture
980		1123
981	void	1124	void
		1125	pad2pot (SV *data_, SV *w_, SV *h_)
		1126	CODE:
		1127	{
		1128	int ow = SvIV (w_);
		1129	int oh = SvIV (h_);
		1130
		1131	if (ow && oh)
		1132	{
		1133	int nw = minpot (ow);
		1134	int nh = minpot (oh);
		1135
		1136	if (nw != ow || nh != oh)
		1137	{
		1138	if (SvOK (data_))
		1139	{
		1140	STRLEN datalen;
		1141	char *data = SvPVbyte (data_, datalen);
		1142	int bpp = datalen / (ow * oh);
		1143	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1144
		1145	SvPOK_only (result_);
		1146	SvCUR_set (result_, nw * nh * bpp);
		1147
		1148	memset (SvPVX (result_), 0, nw * nh * bpp);
		1149	while (oh--)
		1150	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1151
		1152	sv_setsv (data_, result_);
		1153	}
		1154
		1155	sv_setiv (w_, nw);
		1156	sv_setiv (h_, nh);
		1157	}
		1158	}
		1159	}
		1160
		1161	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1162	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1163	PROTOTYPE: $$$;$$
984	ALIAS:	1164	ALIAS:
985	draw_quad_alpha = 1	1165	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1166	draw_quad_alpha_premultiplied = 2
987	CODE:	1167	CODE:
988	{	1168	{
989	HV *hv = (HV *)SvRV (self);	1169	HV *hv = (HV *)SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1170	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1171	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1172	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1173
995	if (items < 5)	1174	if (items < 5)
996	{	1175	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1176	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1177	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1178	}
1000		1179
1001	if (ix)	1180	if (ix)
1002	{	1181	{
1003	glEnable (GL_BLEND);	1182	glEnable (GL_BLEND);
		1183
		1184	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1185	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1186	else
		1187	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1188	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1189
1005	glEnable (GL_ALPHA_TEST);	1190	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1191	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1192	}
1008		1193
1009	glBindTexture (GL_TEXTURE_2D, name);	1194	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1195
1017	glBegin (GL_QUADS);	1196	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1197	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1198	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1199	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1026	glDisable (GL_ALPHA_TEST);	1205	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1206	glDisable (GL_BLEND);
1028	}	1207	}
1029	}	1208	}
1030		1209
1031	MODULE = CFClient PACKAGE = CFClient::Map	1210	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1211
1033	CFClient::Map	1212	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1213	new (SV *class)
1035	CODE:	1214	CODE:
1036	New (0, RETVAL, 1, struct map);	1215	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1216	RETVAL->x = 0;
1038	RETVAL->y = 0;	1217	RETVAL->y = 0;
1039	RETVAL->w = map_width;	1218	RETVAL->w = 0;
1040	RETVAL->h = map_height;	1219	RETVAL->h = 0;
1041	RETVAL->ox = 0;	1220	RETVAL->ox = 0;
1042	RETVAL->oy = 0;	1221	RETVAL->oy = 0;
1043	RETVAL->faces = 8192;	1222	RETVAL->faces = 8192;
1044	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1223	Newz (0, RETVAL->face, RETVAL->faces, mapface);
1045	RETVAL->texs = 8192;	1224	RETVAL->texs = 8192;
…		…
1048	RETVAL->row = 0;	1227	RETVAL->row = 0;
1049	OUTPUT:	1228	OUTPUT:
1050	RETVAL	1229	RETVAL
1051		1230
1052	void	1231	void
1053	DESTROY (CFClient::Map self)	1232	DESTROY (CFPlus::Map self)
1054	CODE:	1233	CODE:
1055	{	1234	{
1056	map_clear (self);	1235	map_clear (self);
1057	Safefree (self->face);	1236	Safefree (self->face);
		1237	Safefree (self->tex);
1058	Safefree (self);	1238	Safefree (self);
1059	}	1239	}
1060		1240
1061	void	1241	void
		1242	resize (CFPlus::Map self, int map_width, int map_height)
		1243	CODE:
		1244	self->w = map_width;
		1245	self->h = map_height;
		1246
		1247	void
1062	clear (CFClient::Map self)	1248	clear (CFPlus::Map self)
1063	CODE:	1249	CODE:
1064	map_clear (self);	1250	map_clear (self);
1065		1251
1066	void	1252	void
1067	set_face (CFClient::Map self, int face, int texid)	1253	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1254	CODE:
1069	{	1255	{
1070	while (self->faces <= face)	1256	while (self->faces <= face)
1071	{	1257	{
1072	Append (mapface, self->face, self->faces, self->faces);	1258	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1261
1076	self->face [face] = texid;	1262	self->face [face] = texid;
1077	}	1263	}
1078		1264
1079	void	1265	void
1080	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)	1266	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)
1081	CODE:	1267	CODE:
1082	{	1268	{
1083	while (self->texs <= texid)	1269	while (self->texs <= texid)
1084	{	1270	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1271	Append (maptex, self->tex, self->texs, self->texs);
…		…
1101	}	1287	}
1102		1288
1103	// somewhat hackish, but for textures that require it, it really	1289	// somewhat hackish, but for textures that require it, it really
1104	// improves the look, and most others don't suffer.	1290	// improves the look, and most others don't suffer.
1105	glBindTexture (GL_TEXTURE_2D, name);	1291	glBindTexture (GL_TEXTURE_2D, name);
1106	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1292	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1293	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1294	// use uglier nearest interpolation because linear suffers
		1295	// from transparent color bleeding and ugly wrapping effects.
		1296	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1297	}
1109		1298
1110	int	1299	int
1111	ox (CFClient::Map self)	1300	ox (CFPlus::Map self)
1112	ALIAS:	1301	ALIAS:
1113	oy = 1	1302	oy = 1
		1303	x = 2
		1304	y = 3
		1305	w = 4
		1306	h = 5
1114	CODE:	1307	CODE:
1115	switch (ix)	1308	switch (ix)
1116	{	1309	{
1117	case 0: RETVAL = self->ox; break;	1310	case 0: RETVAL = self->ox; break;
1118	case 1: RETVAL = self->oy; break;	1311	case 1: RETVAL = self->oy; break;
		1312	case 2: RETVAL = self->x; break;
		1313	case 3: RETVAL = self->y; break;
		1314	case 4: RETVAL = self->w; break;
		1315	case 5: RETVAL = self->h; break;
1119	}	1316	}
1120	OUTPUT:	1317	OUTPUT:
1121	RETVAL	1318	RETVAL
1122		1319
1123	void	1320	void
1124	scroll (CFClient::Map self, int dx, int dy)	1321	scroll (CFPlus::Map self, int dx, int dy)
1125	CODE:	1322	CODE:
1126	{	1323	{
1127	if (dx > 0)	1324	if (dx > 0)
1128	map_blank (self, self->x, self->y, dx - 1, self->h);	1325	map_blank (self, self->x, self->y, dx, self->h);
1129	else if (dx < 0)	1326	else if (dx < 0)
1130	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1327	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1131		1328
1132	if (dy > 0)	1329	if (dy > 0)
1133	map_blank (self, self->x, self->y, self->w, dy - 1);	1330	map_blank (self, self->x, self->y, self->w, dy);
1134	else if (dy < 0)	1331	else if (dy < 0)
1135	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1332	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1136		1333
1137	self->ox += dx; self->x += dx;	1334	self->ox += dx; self->x += dx;
1138	self->oy += dy; self->y += dy;	1335	self->oy += dy; self->y += dy;
1139		1336
1140	while (self->y < 0)	1337	while (self->y < 0)
…		…
1145	self->y += MAP_EXTEND_Y;	1342	self->y += MAP_EXTEND_Y;
1146	}	1343	}
1147	}	1344	}
1148		1345
1149	void	1346	void
1150	map1a_update (CFClient::Map self, SV *data_)	1347	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1151	CODE:	1348	CODE:
1152	{	1349	{
1153	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1350	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1154	uint8_t *data_end = (uint8_t *)SvEND (data_);	1351	uint8_t *data_end = (uint8_t *)SvEND (data_);
1155	mapcell *cell;	1352	mapcell *cell;
1156	int x, y, flags;	1353	int x, y, flags;
1157		1354
1158	while (data < data_end)	1355	while (data < data_end - 1)
1159	{	1356	{
1160	flags = (data [0] << 8) + data [1]; data += 2;	1357	flags = (data [0] << 8) + data [1]; data += 2;
1161		1358
1162	x = ((flags >> 10) & 63) + self->x;	1359	x = self->x + ((flags >> 10) & 63);
1163	y = ((flags >> 4) & 63) + self->y;	1360	y = self->y + ((flags >> 4) & 63);
1164		1361
1165	cell = map_get_cell (self, x, y);	1362	cell = map_get_cell (self, x, y);
1166		1363
1167	if (flags & 15)	1364	if (flags & 15)
1168	{	1365	{
1169	if (cell->darkness < 0)	1366	if (!cell->darkness)
1170	{	1367	{
		1368	memset (cell, 0, sizeof (*cell));
1171	cell->darkness = 0;	1369	cell->darkness = 256;
1172	cell->face [0] = 0;
1173	cell->face [1] = 0;
1174	cell->face [2] = 0;
1175	}	1370	}
1176		1371
1177	cell->darkness = flags & 8 ? *data++ : 255;
1178
1179	//TODO: don't trust server data to be in-range(!)	1372	//TODO: don't trust server data to be in-range(!)
		1373
		1374	if (flags & 8)
		1375	{
		1376	if (extmap)
		1377	{
		1378	uint8_t ext, cmd;
		1379
		1380	do
		1381	{
		1382	ext = *data++;
		1383	cmd = ext & 0x3f;
		1384
		1385	if (cmd < 4)
		1386	cell->darkness = 255 - ext * 64 + 1;
		1387	else if (cmd == 5) // health
		1388	{
		1389	cell->stat_width = 1;
		1390	cell->stat_hp = *data++;
		1391	}
		1392	else if (cmd == 6) // monster width
		1393	cell->stat_width = *data++ + 1;
		1394	else if (cmd == 0x47) // monster width
		1395	{
		1396	if (*data == 4)
		1397	; // decode player tag
		1398
		1399	data += *data + 1;
		1400	}
		1401	else if (cmd == 8) // cell flags
		1402	cell->flags = *data++;
		1403	else if (ext & 0x40) // unknown, multibyte => skip
		1404	data += *data + 1;
		1405	else
		1406	data++;
		1407	}
		1408	while (ext & 0x80);
		1409	}
		1410	else
		1411	cell->darkness = *data++ + 1;
		1412	}
1180		1413
1181	if (flags & 4)	1414	if (flags & 4)
1182	{	1415	{
1183	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1416	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1184	}	1417	}
…		…
1192	{	1425	{
1193	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1426	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1194	}	1427	}
1195	}	1428	}
1196	else	1429	else
1197	cell->darkness = -1;	1430	cell->darkness = 0;
1198	}	1431	}
1199	}	1432	}
1200		1433
1201	SV *	1434	SV *
1202	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1435	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1203	CODE:	1436	CODE:
1204	{	1437	{
1205	int x1, x;	1438	int x1, x;
1206	int y1, y;	1439	int y1, y;
1207	int z;	1440	int z;
…		…
1257	}	1490	}
1258	OUTPUT:	1491	OUTPUT:
1259	RETVAL	1492	RETVAL
1260		1493
1261	void	1494	void
1262	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1495	draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1263	PPCODE:	1496	CODE:
1264	{	1497	{
1265	int vx, vy;
1266	int x, y, z;	1498	int x, y, z;
1267	int last_name;	1499	int last_name;
1268	mapface face;	1500	mapface face;
1269	int sw4 = (sw + 3) & ~3;
1270	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1271	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1272
1273	memset (darkness, 255, sw4 * sh);
1274	SvPOK_only (darkness_sv);
1275	SvCUR_set (darkness_sv, sw4 * sh);
1276
1277	vx = self->x + (self->w - sw) / 2 - shift_x;
1278	vy = self->y + (self->h - sh) / 2 - shift_y;
1279
1280	/*
1281	int vx = self->vx = self->w >= sw
1282	? self->x + (self->w - sw) / 2
1283	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1284
1285	int vy = self->vy = self->h >= sh
1286	? self->y + (self->h - sh) / 2
1287	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288	*/
1289		1501
1290	glColor4ub (255, 255, 255, 255);	1502	glColor4ub (255, 255, 255, 255);
1291		1503
		1504	glEnable (GL_BLEND);
1292	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293	glEnable (GL_BLEND);
1294	glEnable (GL_TEXTURE_2D);	1506	glEnable (GL_TEXTURE_2D);
1295	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296		1508
1297	glBegin (GL_QUADS);	1509	glBegin (GL_QUADS);
1298		1510
1299	last_name = 0;	1511	last_name = 0;
1300		1512
		1513	mx += self->x;
		1514	my += self->y;
		1515
1301	for (z = 0; z < 3; z++)	1516	for (z = 0; z < 3; z++)
1302	for (y = 0; y < sh; y++)	1517	for (y = 0; y < sh; y++)
1303	if (0 <= y + vy && y + vy < self->rows)	1518	if (0 <= y + my && y + my < self->rows)
1304	{	1519	{
1305	maprow *row = self->row + (y + vy);	1520	maprow *row = self->row + (y + my);
1306		1521
1307	for (x = 0; x < sw; x++)	1522	for (x = 0; x < sw; x++)
1308	if (row->c0 <= x + vx && x + vx < row->c1)	1523	if (row->c0 <= x + mx && x + mx < row->c1)
1309	{	1524	{
1310	mapcell *cell = row->col + (x + vx - row->c0);	1525	mapcell *cell = row->col + (x + mx - row->c0);
1311
1312	darkness[y * sw4 + x] = cell->darkness < 0
1313	? 255 - FOW_DARKNESS
1314	: 255 - cell->darkness;
1315		1526
1316	face = cell->face [z];	1527	face = cell->face [z];
1317		1528
1318	if (face)	1529	if (face && face < self->texs)
1319	{	1530	{
1320	maptex tex = self->tex [face];	1531	maptex tex = self->tex [face];
1321
1322	int px = (x + 1) * 32 - tex.w;	1532	int px = (x + 1) * 32 - tex.w;
1323	int py = (y + 1) * 32 - tex.h;	1533	int py = (y + 1) * 32 - tex.h;
1324		1534
1325	if (last_name != tex.name)	1535	if (last_name != tex.name)
1326	{	1536	{
1327	glEnd ();	1537	glEnd ();
1328	last_name = tex.name;
1329	glBindTexture (GL_TEXTURE_2D, last_name);	1538	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1330	glBegin (GL_QUADS);	1539	glBegin (GL_QUADS);
1331	}	1540	}
1332		1541
1333	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1542	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1334	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1543	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1335	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1544	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1336	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1545	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1337	}	1546	}
		1547
		1548	if (cell->flags && z == 2)
		1549	{
		1550	if (cell->flags & 1)
		1551	{
		1552	maptex tex = self->tex [1];
		1553	int px = (x + 1) * 32 - tex.w + 2;
		1554	int py = (y + 1) * 32 - tex.h - 6;
		1555
		1556	glEnd ();
		1557	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1558	glBegin (GL_QUADS);
		1559
		1560	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1561	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1562	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1563	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1564	}
		1565	}
1338	}	1566	}
1339	}	1567	}
1340		1568
1341	glEnd ();	1569	glEnd ();
1342		1570
1343	glDisable (GL_TEXTURE_2D);	1571	glDisable (GL_TEXTURE_2D);
1344	glDisable (GL_BLEND);	1572	glDisable (GL_BLEND);
		1573
		1574	// top layer: overlays such as the health bar
		1575	for (y = 0; y < sh; y++)
		1576	if (0 <= y + my && y + my < self->rows)
		1577	{
		1578	maprow *row = self->row + (y + my);
		1579
		1580	for (x = 0; x < sw; x++)
		1581	if (row->c0 <= x + mx && x + mx < row->c1)
		1582	{
		1583	mapcell *cell = row->col + (x + mx - row->c0);
		1584
		1585	int px = x * 32;
		1586	int py = y * 32;
		1587
		1588	if (cell->stat_hp)
		1589	{
		1590	int width = cell->stat_width * 32;
		1591	int thick = sh / 28 + 1 + cell->stat_width;
		1592
		1593	glColor3ub (0, 0, 0);
		1594	glRectf (px + 1, py - thick - 2,
		1595	px + width - 1, py);
		1596
		1597	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1598	glRectf (px + 2,
		1599	py - thick - 1,
		1600	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1601	}
		1602	}
		1603	}
		1604	}
		1605
		1606	void
		1607	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1608	CODE:
		1609	{
		1610	static float color[16][3] = {
		1611	{ 0.00F, 0.00F, 0.00F },
		1612	{ 1.00F, 1.00F, 1.00F },
		1613	{ 0.00F, 0.00F, 0.55F },
		1614	{ 1.00F, 0.00F, 0.00F },
		1615
		1616	{ 1.00F, 0.54F, 0.00F },
		1617	{ 0.11F, 0.56F, 1.00F },
		1618	{ 0.93F, 0.46F, 0.00F },
		1619	{ 0.18F, 0.54F, 0.34F },
		1620
		1621	{ 0.56F, 0.73F, 0.56F },
		1622	{ 0.80F, 0.80F, 0.80F },
		1623	{ 0.55F, 0.41F, 0.13F },
		1624	{ 0.99F, 0.77F, 0.26F },
		1625
		1626	{ 0.74F, 0.65F, 0.41F },
		1627
		1628	{ 0.00F, 1.00F, 1.00F },
		1629	{ 1.00F, 0.00F, 1.00F },
		1630	{ 1.00F, 1.00F, 0.00F },
		1631	};
		1632
		1633	int x, y;
		1634
		1635	glEnable (GL_TEXTURE_2D);
		1636	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1637	glEnable (GL_BLEND);
		1638	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1639	glBegin (GL_QUADS);
		1640
		1641	for (y = 0; y < h; y++)
		1642	for (x = 0; x < w; x++)
		1643	{
		1644	unsigned char m = data [x + y * w];
		1645
		1646	if (m)
		1647	{
		1648	float *c = color [m & 15];
		1649
		1650	float tx1 = m & 0x40 ? 0.5 : 0.;
		1651	float tx2 = tx1 + 0.5;
		1652
		1653	glColor4f (c[0], c[1], c[2], 0.75);
		1654	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1655	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1656	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1657	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1658	}
		1659	}
		1660
		1661	glEnd ();
		1662	glDisable (GL_BLEND);
		1663	glDisable (GL_TEXTURE_2D);
		1664	}
		1665
		1666	void
		1667	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1668	PPCODE:
		1669	{
		1670	int x, y;
		1671	int sw4 = (sw + 3) & ~3;
		1672	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1673	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1674
		1675	memset (darkness, 255, sw4 * sh);
		1676	SvPOK_only (darkness_sv);
		1677	SvCUR_set (darkness_sv, sw4 * sh);
		1678
		1679	mx += self->x;
		1680	my += self->y;
		1681
		1682	for (y = 0; y < sh; y++)
		1683	if (0 <= y + my && y + my < self->rows)
		1684	{
		1685	maprow *row = self->row + (y + my);
		1686
		1687	for (x = 0; x < sw; x++)
		1688	if (row->c0 <= x + mx && x + mx < row->c1)
		1689	{
		1690	mapcell *cell = row->col + (x + mx - row->c0);
		1691
		1692	darkness[y * sw4 + x] = cell->darkness
		1693	? 255 - (cell->darkness - 1)
		1694	: 255 - FOW_DARKNESS;
		1695	}
		1696	}
1345		1697
1346	EXTEND (SP, 3);	1698	EXTEND (SP, 3);
1347	PUSHs (sv_2mortal (newSViv (sw4)));	1699	PUSHs (sv_2mortal (newSViv (sw4)));
1348	PUSHs (sv_2mortal (newSViv (sh)));	1700	PUSHs (sv_2mortal (newSViv (sh)));
1349	PUSHs (darkness_sv);	1701	PUSHs (darkness_sv);
1350	}	1702	}
1351		1703
1352	SV *	1704	SV *
1353	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1705	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1354	CODE:	1706	CODE:
1355	{	1707	{
1356	int x, y, x1, y1;	1708	int x, y, x1, y1;
1357	SV *data_sv = newSV (w * h * 7 + 5);	1709	SV *data_sv = newSV (w * h * 7 + 5);
1358	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1710	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1420	}	1772	}
1421	OUTPUT:	1773	OUTPUT:
1422	RETVAL	1774	RETVAL
1423		1775
1424	void	1776	void
1425	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1777	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1426	PPCODE:	1778	PPCODE:
1427	{	1779	{
1428	int x, y, z;	1780	int x, y, z;
1429	int w, h;	1781	int w, h;
1430	int x1, y1;	1782	int x1, y1;
…		…
1462		1814
1463	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1815	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1464	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1816	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1465	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1817	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1466		1818
1467	if (cell->darkness <= 0)	1819	if (cell->darkness == 0)
1468	{	1820	{
1469	cell->darkness = -1;	1821	cell->darkness = 0;
1470		1822
1471	for (z = 0; z <= 2; z++)	1823	for (z = 0; z <= 2; z++)
1472	{	1824	{
1473	cell->face[z] = face[z];	1825	cell->face[z] = face[z];
1474		1826
…		…
1479	}	1831	}
1480	}	1832	}
1481	}	1833	}
1482	}	1834	}
1483		1835
1484	MODULE = CFClient PACKAGE = CFClient::MixChunk	1836	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1485		1837
1486	CFClient::MixChunk	1838	CFPlus::MixChunk
1487	new_from_file (SV *class, char *path)	1839	new_from_file (SV *class, char *path)
1488	CODE:	1840	CODE:
1489	RETVAL = Mix_LoadWAV (path);	1841	RETVAL = Mix_LoadWAV (path);
1490	OUTPUT:	1842	OUTPUT:
1491	RETVAL	1843	RETVAL
1492		1844
1493	void	1845	void
1494	DESTROY (CFClient::MixChunk self)	1846	DESTROY (CFPlus::MixChunk self)
1495	CODE:	1847	CODE:
1496	Mix_FreeChunk (self);	1848	Mix_FreeChunk (self);
1497		1849
1498	int	1850	int
1499	volume (CFClient::MixChunk self, int volume = -1)	1851	volume (CFPlus::MixChunk self, int volume = -1)
1500	CODE:	1852	CODE:
1501	RETVAL = Mix_VolumeChunk (self, volume);	1853	RETVAL = Mix_VolumeChunk (self, volume);
1502	OUTPUT:	1854	OUTPUT:
1503	RETVAL	1855	RETVAL
1504		1856
1505	int	1857	int
1506	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1858	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1507	CODE:	1859	CODE:
1508	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1860	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1509	OUTPUT:	1861	OUTPUT:
1510	RETVAL	1862	RETVAL
1511		1863
1512	MODULE = CFClient PACKAGE = CFClient::MixMusic	1864	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1513		1865
1514	int	1866	int
1515	volume (int volume = -1)	1867	volume (int volume = -1)
1516	CODE:	1868	CODE:
1517	RETVAL = Mix_VolumeMusic (volume);	1869	RETVAL = Mix_VolumeMusic (volume);
1518	OUTPUT:	1870	OUTPUT:
1519	RETVAL	1871	RETVAL
1520		1872
1521	CFClient::MixMusic	1873	CFPlus::MixMusic
1522	new_from_file (SV *class, char *path)	1874	new_from_file (SV *class, char *path)
1523	CODE:	1875	CODE:
1524	RETVAL = Mix_LoadMUS (path);	1876	RETVAL = Mix_LoadMUS (path);
1525	OUTPUT:	1877	OUTPUT:
1526	RETVAL	1878	RETVAL
1527		1879
1528	void	1880	void
1529	DESTROY (CFClient::MixMusic self)	1881	DESTROY (CFPlus::MixMusic self)
1530	CODE:	1882	CODE:
1531	Mix_FreeMusic (self);	1883	Mix_FreeMusic (self);
1532		1884
1533	int	1885	int
1534	play (CFClient::MixMusic self, int loops = -1)	1886	play (CFPlus::MixMusic self, int loops = -1)
1535	CODE:	1887	CODE:
1536	RETVAL = Mix_PlayMusic (self, loops);	1888	RETVAL = Mix_PlayMusic (self, loops);
1537	OUTPUT:	1889	OUTPUT:
1538	RETVAL	1890	RETVAL
1539		1891
1540	MODULE = CFClient PACKAGE = CFClient::OpenGL	1892	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1541		1893
1542	BOOT:	1894	BOOT:
1543	{	1895	{
1544	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1896	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1545	static const struct {	1897	static const struct {
1546	const char *name;	1898	const char *name;
1547	IV iv;	1899	IV iv;
1548	} *civ, const_iv[] = {	1900	} *civ, const_iv[] = {
1549	# define const_iv(name) { # name, (IV)name }	1901	# define const_iv(name) { # name, (IV)name }
…		…
1556	const_iv (GL_SCISSOR_TEST),	1908	const_iv (GL_SCISSOR_TEST),
1557	const_iv (GL_DEPTH_TEST),	1909	const_iv (GL_DEPTH_TEST),
1558	const_iv (GL_ALPHA_TEST),	1910	const_iv (GL_ALPHA_TEST),
1559	const_iv (GL_NORMALIZE),	1911	const_iv (GL_NORMALIZE),
1560	const_iv (GL_RESCALE_NORMAL),	1912	const_iv (GL_RESCALE_NORMAL),
		1913	const_iv (GL_FRONT),
		1914	const_iv (GL_BACK),
1561	const_iv (GL_AND),	1915	const_iv (GL_AND),
1562	const_iv (GL_ONE),	1916	const_iv (GL_ONE),
1563	const_iv (GL_ZERO),	1917	const_iv (GL_ZERO),
1564	const_iv (GL_SRC_ALPHA),	1918	const_iv (GL_SRC_ALPHA),
1565	const_iv (GL_SRC_ALPHA_SATURATE),	1919	const_iv (GL_DST_ALPHA),
1566	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1920	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567	const_iv (GL_ONE_MINUS_DST_ALPHA),	1921	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1922	const_iv (GL_SRC_ALPHA_SATURATE),
1568	const_iv (GL_RGB),	1923	const_iv (GL_RGB),
1569	const_iv (GL_RGBA),	1924	const_iv (GL_RGBA),
		1925	const_iv (GL_RGBA4),
		1926	const_iv (GL_RGBA8),
		1927	const_iv (GL_RGB5_A1),
1570	const_iv (GL_UNSIGNED_BYTE),	1928	const_iv (GL_UNSIGNED_BYTE),
1571	const_iv (GL_UNSIGNED_SHORT),	1929	const_iv (GL_UNSIGNED_SHORT),
1572	const_iv (GL_UNSIGNED_INT),	1930	const_iv (GL_UNSIGNED_INT),
1573	const_iv (GL_ALPHA),	1931	const_iv (GL_ALPHA),
1574	const_iv (GL_INTENSITY),	1932	const_iv (GL_INTENSITY),
…		…
1583	const_iv (GL_TEXTURE_MAG_FILTER),	1941	const_iv (GL_TEXTURE_MAG_FILTER),
1584	const_iv (GL_TEXTURE_MIN_FILTER),	1942	const_iv (GL_TEXTURE_MIN_FILTER),
1585	const_iv (GL_TEXTURE_ENV_MODE),	1943	const_iv (GL_TEXTURE_ENV_MODE),
1586	const_iv (GL_TEXTURE_WRAP_S),	1944	const_iv (GL_TEXTURE_WRAP_S),
1587	const_iv (GL_TEXTURE_WRAP_T),	1945	const_iv (GL_TEXTURE_WRAP_T),
		1946	const_iv (GL_REPEAT),
1588	const_iv (GL_CLAMP),	1947	const_iv (GL_CLAMP),
1589	const_iv (GL_REPEAT),	1948	const_iv (GL_CLAMP_TO_EDGE),
1590	const_iv (GL_NEAREST),	1949	const_iv (GL_NEAREST),
1591	const_iv (GL_LINEAR),	1950	const_iv (GL_LINEAR),
1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1951	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1952	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1953	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1964	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1965	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1966	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1967	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1968	const_iv (GL_LINES),
		1969	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1970	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1971	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1972	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1973	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1974	const_iv (GL_TRIANGLE_STRIP),
…		…
1624		1984
1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1985	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1986	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627	}	1987	}
1628		1988
		1989	char *
		1990	gl_vendor ()
		1991	CODE:
		1992	RETVAL = (char *)glGetString (GL_VENDOR);
		1993	OUTPUT:
		1994	RETVAL
		1995
		1996	char *
		1997	gl_version ()
		1998	CODE:
		1999	RETVAL = (char *)glGetString (GL_VERSION);
		2000	OUTPUT:
		2001	RETVAL
		2002
		2003	char *
		2004	gl_extensions ()
		2005	CODE:
		2006	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2007	OUTPUT:
		2008	RETVAL
		2009
1629	int glGetError ()	2010	int glGetError ()
		2011
		2012	void glFinish ()
1630		2013
1631	void glClear (int mask)	2014	void glClear (int mask)
1632		2015
1633	void glClearColor (float r, float g, float b, float a = 1.0)	2016	void glClearColor (float r, float g, float b, float a = 1.0)
1634	PROTOTYPE: @	2017	PROTOTYPE: @
…		…
1641		2024
1642	void glHint (int target, int mode)	2025	void glHint (int target, int mode)
1643		2026
1644	void glBlendFunc (int sfactor, int dfactor)	2027	void glBlendFunc (int sfactor, int dfactor)
1645		2028
		2029	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2030	CODE:
		2031	gl_BlendFuncSeparate (sa, da, saa, daa);
		2032
1646	void glDepthMask (int flag)	2033	void glDepthMask (int flag)
1647		2034
1648	void glLogicOp (int opcode)	2035	void glLogicOp (int opcode)
1649		2036
1650	void glColorMask (int red, int green, int blue, int alpha)	2037	void glColorMask (int red, int green, int blue, int alpha)
…		…
1654	void glPushMatrix ()	2041	void glPushMatrix ()
1655		2042
1656	void glPopMatrix ()	2043	void glPopMatrix ()
1657		2044
1658	void glLoadIdentity ()	2045	void glLoadIdentity ()
		2046
		2047	void glDrawBuffer (int buffer)
		2048
		2049	void glReadBuffer (int buffer)
1659		2050
1660	# near_ and far_ are due to microsofts buggy "c" compiler	2051	# near_ and far_ are due to microsofts buggy "c" compiler
1661	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2052	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662		2053
1663	# near_ and far_ are due to microsofts buggy "c" compiler	2054	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1683		2074
1684	void glEnd ()	2075	void glEnd ()
1685		2076
1686	void glColor (float r, float g, float b, float a = 1.0)	2077	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	2078	PROTOTYPE: @
		2079	ALIAS:
		2080	glColor_premultiply = 1
1688	CODE:	2081	CODE:
		2082	if (ix)
		2083	{
		2084	r *= a;
		2085	g *= a;
		2086	b *= a;
		2087	}
1689	// microsoft visual "c" rounds instead of truncating...	2088	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	2089	glColor4f (r, g, b, a);
1691	MIN ((int)(g * 255.f), 255),
1692	MIN ((int)(b * 255.f), 255),
1693	MIN ((int)(a * 255.f), 255));
1694		2090
1695	void glInterleavedArrays (int format, int stride, char *data)	2091	void glInterleavedArrays (int format, int stride, char *data)
1696		2092
1697	void glDrawElements (int mode, int count, int type, char *indices)	2093	void glDrawElements (int mode, int count, int type, char *indices)
1698		2094
…		…
1721		2117
1722	void glBindTexture (int target, int name)	2118	void glBindTexture (int target, int name)
1723		2119
1724	void glConvolutionParameter (int target, int pname, float params)	2120	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	2121	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2122	if (gl.ConvolutionParameterf)
		2123	gl.ConvolutionParameterf (target, pname, params);
1727		2124
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2125	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	2126	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2127	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	2128	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		2129
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2130	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1734	CODE:	2131	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2132	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	2133	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		2134
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2135	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		2136
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2137	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		2138
…		…
1774		2171
1775	void glEndList ()	2172	void glEndList ()
1776		2173
1777	void glCallList (int list)	2174	void glCallList (int list)
1778		2175
1779

Diff Legend

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