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.64 by root, Mon Apr 24 08:11:31 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
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# include <wininet.h>
		7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
3	#endif	9	#endif
4		10
5	#include "EXTERN.h"	11	#include "EXTERN.h"
6	#include "perl.h"	12	#include "perl.h"
7	#include "XSUB.h"	13	#include "XSUB.h"
8		14
		15	#ifdef _WIN32
		16	# undef pipe
		17	#endif
		18
		19	#include <math.h>
9	#include <string.h>	20	#include <string.h>
10	#include <stdio.h>	21	#include <stdio.h>
		22	#include <stdlib.h>
11		23
12	#include <SDL.h>	24	#include <SDL.h>
		25	#include <SDL_endian.h>
13	#include <SDL_image.h>	26	#include <SDL_image.h>
14	#include <SDL_mixer.h>	27	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	28	#include <SDL_opengl.h>
16		29
		30	#define PANGO_ENABLE_BACKEND
		31	#define G_DISABLE_CAST_CHECKS
		32
17	#include <glib/gmacros.h>	33	#include <glib/gmacros.h>
18		34
19	#include <pango/pango.h>	35	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		36
23	#ifndef _WIN32	37	#ifndef _WIN32
24	# include <sys/types.h>	38	# include <sys/types.h>
25	# include <sys/socket.h>	39	# include <sys/socket.h>
26	# include <netinet/in.h>	40	# include <netinet/in.h>
27	# include <netinet/tcp.h>	41	# include <netinet/tcp.h>
28	# include <inttypes.h>	42	# include <inttypes.h>
29	#else
30	typedef unsigned char uint8_t;
31	typedef unsigned short uint16_t;
32	typedef unsigned int uint32_t;
33	typedef signed char int8_t;
34	typedef signed short int16_t;
35	typedef signed int int32_t;
36	#endif	43	#endif
37		44
38	#include "glext.h"	45	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
39		46
40	#define FOW_DARKNESS 32	47	#define FOW_DARKNESS 32
41		48
42	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
44		51
45	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
46		53
47	#define GL_CALL(type,func,args) \	54	#if 0
48	{ \	55	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	56	#else
50	static type fptr_; \	57	# define PARACHUTE 0
51	\	58	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		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
62	typedef Mix_Chunk *CFClient__MixChunk;	83	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	84	typedef Mix_Music *CFPlus__MixMusic;
64		85
65	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	}
66		105
67	typedef struct cf_layout {	106	typedef struct cf_layout {
68	PangoLayout *pl;	107	PangoLayout *pl;
		108	float r, g, b, a; // default color for rgba mode
69	int base_height;	109	int base_height;
70	CFClient__Font font;	110	CFPlus__Font font;
71	} *CFClient__Layout;	111	} *CFPlus__Layout;
72		112
73	static CFClient__Font default_font;	113	static CFPlus__Font default_font;
74	static PangoContext *context;	114	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	115	static PangoFontMap *opengl_fontmap;
76		116
77	static void	117	static void
78	substitute_func (FcPattern *pattern, gpointer data)	118	substitute_func (FcPattern *pattern, gpointer data)
79	{	119	{
80	FcPatternAddBool (pattern, FC_HINTING , 1);	120	FcPatternAddBool (pattern, FC_HINTING, 1);
		121	#ifdef FC_HINT_STYLE
		122	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		123	#endif
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	124	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	125	}
83		126
84	static void	127	static void
85	layout_update_font (CFClient__Layout self)	128	layout_update_font (CFPlus__Layout self)
86	{	129	{
87	/* 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
88	* reasonably well with bitstream vera	131	* reasonably well with bitstream vera
89	*/	132	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	133	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		137
95	pango_layout_set_font_description (self->pl, font);	138	pango_layout_set_font_description (self->pl, font);
96	}	139	}
97		140
98	static void	141	static void
99	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	142	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
100	{	143	{
		144	PangoRectangle rect;
		145
		146	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	147	pango_layout_get_extents (self->pl, 0, &rect);
102		148
103	*w = (*w + 3) & ~3;	149	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!*w) *w = 1;	150	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	if (!*h) *h = 1;	151
		152	if (!rect.width) rect.width = 1;
		153	if (!rect.height) rect.height = 1;
		154
		155	*w = rect.width;
		156	*h = rect.height;
106	}	157	}
107		158
108	typedef uint16_t mapface;	159	typedef uint16_t mapface;
109		160
110	typedef struct {	161	typedef struct {
…		…
113	float s, t;	164	float s, t;
114	uint8_t r, g, b, a;	165	uint8_t r, g, b, a;
115	} maptex;	166	} maptex;
116		167
117	typedef struct {	168	typedef struct {
118	int16_t darkness;	169	uint32_t player;
119	mapface face[3];	170	mapface face[3];
		171	uint16_t darkness;
		172	uint8_t stat_width, stat_hp, flags;
120	} mapcell;	173	} mapcell;
121		174
122	typedef struct {	175	typedef struct {
123	int32_t c0, c1;	176	int32_t c0, c1;
124	mapcell *col;	177	mapcell *col;
…		…
133	int texs;	186	int texs;
134	maptex *tex;	187	maptex *tex;
135		188
136	int32_t rows;	189	int32_t rows;
137	maprow *row;	190	maprow *row;
138	} *CFClient__Map;	191	} *CFPlus__Map;
139		192
140	static char *	193	static char *
141	prepend (char *ptr, int sze, int inc)	194	prepend (char *ptr, int sze, int inc)
142	{	195	{
143	char *p;	196	char *p;
…		…
161		214
162	#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))
163	#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))
164		217
165	static maprow *	218	static maprow *
166	map_get_row (CFClient__Map self, int y)	219	map_get_row (CFPlus__Map self, int y)
167	{	220	{
168	if (0 > y)	221	if (0 > y)
169	{	222	{
170	int extend = - y + MAP_EXTEND_Y;	223	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	224	Prepend (maprow, self->row, self->rows, extend);
…		…
209		262
210	return row->col + (x - row->c0);	263	return row->col + (x - row->c0);
211	}	264	}
212		265
213	static mapcell *	266	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	267	map_get_cell (CFPlus__Map self, int x, int y)
215	{	268	{
216	return row_get_cell (map_get_row (self, y), x);	269	return row_get_cell (map_get_row (self, y), x);
217	}	270	}
218		271
219	static void	272	static void
220	map_clear (CFClient__Map self)	273	map_clear (CFPlus__Map self)
221	{	274	{
222	int r;	275	int r;
223		276
224	for (r = 0; r < self->rows; r++)	277	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	278	Safefree (self->row[r].col);
…		…
233	self->row = 0;	286	self->row = 0;
234	self->rows = 0;	287	self->rows = 0;
235	}	288	}
236		289
237	static void	290	static void
238	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)
239	{	292	{
240	int x, y;	293	int x, y;
241	maprow *row;	294	maprow *row;
		295	mapcell *cell;
242		296
243	for (y = y0; y < y0 + h; y++)	297	for (y = y0; y < y0 + h; y++)
244	if (y >= 0)	298	if (y >= 0)
245	{	299	{
246	if (y >= self->rows)	300	if (y >= self->rows)
…		…
252	if (x >= row->c0)	306	if (x >= row->c0)
253	{	307	{
254	if (x >= row->c1)	308	if (x >= row->c1)
255	break;	309	break;
256		310
257	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;
258	}	317	}
259	}	318	}
260	}	319	}
261		320
262	static void	321	static void
263	music_finished ()	322	music_finished (void)
264	{	323	{
265	SDL_UserEvent ev;	324	SDL_UserEvent ev;
266		325
267	ev.type = SDL_USEREVENT;	326	ev.type = SDL_USEREVENT;
268	ev.code = 0;	327	ev.code = 0;
…		…
270	ev.data2 = 0;	329	ev.data2 = 0;
271		330
272	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
273	}	332	}
274		333
		334	static void
		335	channel_finished (int channel)
		336	{
		337	SDL_UserEvent ev;
		338
		339	ev.type = SDL_USEREVENT;
		340	ev.code = 1;
		341	ev.data1 = (void *)(long)channel;
		342	ev.data2 = 0;
		343
		344	SDL_PushEvent ((SDL_Event *)&ev);
		345	}
		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
275	MODULE = CFClient PACKAGE = CFClient	364	MODULE = CFPlus PACKAGE = CFPlus
276		365
277	PROTOTYPES: ENABLE	366	PROTOTYPES: ENABLE
278		367
279	BOOT:	368	BOOT:
280	{	369	{
281	HV *stash = gv_stashpv ("CFClient", 1);	370	HV *stash = gv_stashpv ("CFPlus", 1);
282	static const struct {	371	static const struct {
283	const char *name;	372	const char *name;
284	IV iv;	373	IV iv;
285	} *civ, const_iv[] = {	374	} *civ, const_iv[] = {
286	# define const_iv(name) { # name, (IV)name }	375	# define const_iv(name) { # name, (IV)name }
…		…
385	# undef const_iv	474	# undef const_iv
386	};	475	};
387		476
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	478	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	479	}
395		480
396	int	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
		492	void
		493	pango_init ()
		494	CODE:
		495	{
		496	opengl_fontmap = pango_opengl_font_map_new ();
		497	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		498	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		499	}
		500
		501	int
397	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	502	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
398		503
399	void	504	void
400	SDL_Quit ()	505	SDL_Quit ()
401		506
402	void	507	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	515	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	516	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		517
		518	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		519	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		520
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	524	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		525
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	526	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		527	#if SDL_VERSION_ATLEAST(1,2,10)
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	528	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		530	#endif
421		531
422	SDL_EnableUNICODE (1);	532	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	533	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		534
425	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	535	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
434		544
435	++m;	545	++m;
436	}	546	}
437	}	547	}
438		548
		549	char *
		550	SDL_GetError ()
		551
439	int	552	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	553	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	554	CODE:
442	RETVAL = !!SDL_SetVideoMode (	555	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	556	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
444	);	557	);
		558	if (RETVAL)
		559	{
445	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	}
446	OUTPUT:	565	OUTPUT:
447	RETVAL	566	RETVAL
448		567
449	void	568	void
450	SDL_GL_SwapBuffers ()	569	SDL_GL_SwapBuffers ()
		570
		571	char *
		572	SDL_GetKeyName (int sym)
451		573
452	void	574	void
453	SDL_PollEvent ()	575	SDL_PollEvent ()
454	PPCODE:	576	PPCODE:
455	{	577	{
…		…
457		579
458	while (SDL_PollEvent (&ev))	580	while (SDL_PollEvent (&ev))
459	{	581	{
460	HV *hv = newHV ();	582	HV *hv = newHV ();
461	hv_store (hv, "type", 4, newSViv (ev.type), 0);	583	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		584
462	switch (ev.type)	585	switch (ev.type)
463	{	586	{
464	case SDL_KEYDOWN:	587	case SDL_KEYDOWN:
465	case SDL_KEYUP:	588	case SDL_KEYUP:
466	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	589	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
473	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	596	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
474	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	597	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
475	break;	598	break;
476		599
477	case SDL_MOUSEMOTION:	600	case SDL_MOUSEMOTION:
		601	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		602
478	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
479	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	604	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
480	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	605	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
481	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	606	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
482	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	607	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
483	break;	608	break;
484		609
485	case SDL_MOUSEBUTTONDOWN:	610	case SDL_MOUSEBUTTONDOWN:
486	case SDL_MOUSEBUTTONUP:	611	case SDL_MOUSEBUTTONUP:
		612	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		613
487	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	614	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
488	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	615	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
489	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	616	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
490	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	617	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		618	break;
		619
		620	case SDL_USEREVENT:
		621	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		622	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		623	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		624	break;
491	}	625	}
492		626
493	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	627	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
494	}	628	}
495	}	629	}
496		630
497	int	631	int
498	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	632	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
499	POSTCALL:	633	POSTCALL:
500	Mix_HookMusicFinished (music_finished);	634	Mix_HookMusicFinished (music_finished);
		635	Mix_ChannelFinished (channel_finished);
501		636
502	void	637	void
503	Mix_CloseAudio ()	638	Mix_CloseAudio ()
504		639
505	int	640	int
…		…
510	CODE:	645	CODE:
511	#ifndef _WIN32	646	#ifndef _WIN32
512	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	647	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
513	#endif	648	#endif
514		649
515	char *	650	void
516	gl_version ()	651	win32_proxy_info ()
517	CODE:	652	PPCODE:
518	RETVAL = (char *)glGetString (GL_VERSION);	653	{
519	OUTPUT:	654	#ifdef _WIN32
520	RETVAL	655	char buffer[2048];
		656	DWORD buflen;
521		657
522	char *	658	EXTEND (SP, 3);
523	gl_extensions ()	659
524	CODE:	660	buflen = sizeof (buffer);
525	RETVAL = (char *)glGetString (GL_EXTENSIONS);	661	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
526	OUTPUT:	662	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
527	RETVAL	663	{
		664	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		665
		666	buflen = sizeof (buffer);
		667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		668	{
		669	PUSHs (newSVpv (buffer, 0));
		670
		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	}
528		678
529	void	679	void
530	add_font (char *file)	680	add_font (char *file)
531	CODE:	681	CODE:
532	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	682	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
533		683
534	void	684	void
535	load_image_inline (SV *image_)	685	load_image_inline (SV *image_)
536	ALIAS:	686	ALIAS:
537	load_image_file = 1	687	load_image_file = 1
…		…
579		729
580	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	730	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
581		731
582	assert (surface2->pitch == surface2->w * 4);	732	assert (surface2->pitch == surface2->w * 4);
583		733
		734	SDL_LockSurface (surface2);
584	EXTEND (SP, 5);	735	EXTEND (SP, 6);
585	PUSHs (sv_2mortal (newSViv (surface2->w)));	736	PUSHs (sv_2mortal (newSViv (surface2->w)));
586	PUSHs (sv_2mortal (newSViv (surface2->h)));	737	PUSHs (sv_2mortal (newSViv (surface2->h)));
587	SDL_LockSurface (surface2);
588	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	738	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
589	SDL_UnlockSurface (surface2);
590	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)));
591	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	740	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
592	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	741	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		742	SDL_UnlockSurface (surface2);
593		743
594	SDL_FreeSurface (surface);	744	SDL_FreeSurface (surface);
595	SDL_FreeSurface (surface2);	745	SDL_FreeSurface (surface2);
596	}	746	}
597		747
…		…
619	PUSHs (sv_2mortal (newSViv (b / y)));	769	PUSHs (sv_2mortal (newSViv (b / y)));
620	PUSHs (sv_2mortal (newSViv (a / y)));	770	PUSHs (sv_2mortal (newSViv (a / y)));
621	}	771	}
622		772
623	void	773	void
		774	error (char *message)
		775	CODE:
		776	fprintf (stderr, "ERROR: %s\n", message);
		777	#ifdef _WIN32
		778	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
		779	#endif
		780
		781	void
624	fatal (char *message)	782	fatal (char *message)
625	CODE:	783	CODE:
		784	fprintf (stderr, "FATAL: %s\n", message);
626	#ifdef _WIN32	785	#ifdef _WIN32
627	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	786	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
		787	#endif
		788	_exit (1);
		789
		790	void
		791	_exit (int retval = 0)
		792	CODE:
		793	#ifdef WIN32
		794	ExitThread (retval); // unclean, please beam me up
628	#else	795	#else
629	fprintf (stderr, "FATAL: %s\n", message);	796	_exit (retval);
630	#endif	797	#endif
631	exit (1);
632		798
633	MODULE = CFClient PACKAGE = CFClient::Font	799	MODULE = CFPlus PACKAGE = CFPlus::Font
634		800
635	CFClient::Font	801	CFPlus::Font
636	new_from_file (SV *class, char *path)	802	new_from_file (SV *class, char *path, int id = 0)
637	CODE:	803	CODE:
638	{	804	{
639	int count;	805	int count;
640	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, 0, 0, &count);	806	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
641	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	807	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
642	FcPatternDestroy (pattern);	808	FcPatternDestroy (pattern);
643	}	809	}
644	OUTPUT:	810	OUTPUT:
645	RETVAL	811	RETVAL
646		812
647	void	813	void
648	DESTROY (CFClient::Font self)	814	DESTROY (CFPlus::Font self)
649	CODE:	815	CODE:
650	pango_font_description_free (self);	816	pango_font_description_free (self);
651		817
652	void	818	void
653	make_default (CFClient::Font self)	819	make_default (CFPlus::Font self)
654	CODE:	820	CODE:
655	default_font = self;	821	default_font = self;
656		822
657	MODULE = CFClient PACKAGE = CFClient::Layout	823	MODULE = CFPlus PACKAGE = CFPlus::Layout
658		824
659	CFClient::Layout	825	void
660	new (SV *class, int base_height = MIN_FONT_HEIGHT)	826	reset_glyph_cache ()
		827	CODE:
		828	tc_clear ();
		829
		830	CFPlus::Layout
		831	new (SV *class)
661	CODE:	832	CODE:
662	New (0, RETVAL, 1, struct cf_layout);	833	New (0, RETVAL, 1, struct cf_layout);
		834
663	RETVAL->pl = pango_layout_new (context);	835	RETVAL->pl = pango_layout_new (opengl_context);
664	RETVAL->base_height = base_height;	836	RETVAL->r = 1.;
		837	RETVAL->g = 1.;
		838	RETVAL->b = 1.;
		839	RETVAL->a = 1.;
		840	RETVAL->base_height = MIN_FONT_HEIGHT;
665	RETVAL->font = 0;	841	RETVAL->font = 0;
		842
666	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	843	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
667	pango_layout_set_font_description (RETVAL->pl, default_font);	844	layout_update_font (RETVAL);
668	OUTPUT:	845	OUTPUT:
669	RETVAL	846	RETVAL
670		847
671	void	848	void
672	DESTROY (CFClient::Layout self)	849	DESTROY (CFPlus::Layout self)
673	CODE:	850	CODE:
674	g_object_unref (self->pl);	851	g_object_unref (self->pl);
675	Safefree (self);	852	Safefree (self);
676		853
677	void	854	void
678	set_text (CFClient::Layout self, SV *text_)	855	set_text (CFPlus::Layout self, SV *text_)
679	CODE:	856	CODE:
680	{	857	{
681	STRLEN textlen;	858	STRLEN textlen;
682	char *text = SvPVutf8 (text_, textlen);	859	char *text = SvPVutf8 (text_, textlen);
683		860
684	pango_layout_set_text (self->pl, text, textlen);	861	pango_layout_set_text (self->pl, text, textlen);
685	}	862	}
686		863
687	void	864	void
688	set_markup (CFClient::Layout self, SV *text_)	865	set_markup (CFPlus::Layout self, SV *text_)
689	CODE:	866	CODE:
690	{	867	{
691	STRLEN textlen;	868	STRLEN textlen;
692	char *text = SvPVutf8 (text_, textlen);	869	char *text = SvPVutf8 (text_, textlen);
693		870
694	pango_layout_set_markup (self->pl, text, textlen);	871	pango_layout_set_markup (self->pl, text, textlen);
695	}	872	}
696		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
697	SV *	959	SV *
698	get_text (CFClient::Layout self)	960	get_text (CFPlus::Layout self)
699	CODE:	961	CODE:
700	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	962	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
701	SvUTF8_on (RETVAL);	963	sv_utf8_decode (RETVAL);
702	OUTPUT:	964	OUTPUT:
703	RETVAL	965	RETVAL
704		966
705	void	967	void
		968	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		969	CODE:
		970	self->r = r;
		971	self->g = g;
		972	self->b = b;
		973	self->a = a;
		974
		975	void
706	set_font (CFClient::Layout self, CFClient::Font font = 0)	976	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
707	CODE:	977	CODE:
708	if (self->font != font)	978	if (self->font != font)
709	{	979	{
710	self->font = font;	980	self->font = font;
711	layout_update_font (self);	981	layout_update_font (self);
712	}	982	}
713		983
714	void	984	void
715	set_height (CFClient::Layout self, int base_height)	985	set_height (CFPlus::Layout self, int base_height)
716	CODE:	986	CODE:
717	if (self->base_height != base_height)	987	if (self->base_height != base_height)
718	{	988	{
719	self->base_height = base_height;	989	self->base_height = base_height;
720	layout_update_font (self);	990	layout_update_font (self);
721	}	991	}
722		992
723	void	993	void
724	set_width (CFClient::Layout self, int max_width = -1)	994	set_width (CFPlus::Layout self, int max_width = -1)
725	CODE:	995	CODE:
726	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);
727		997
728	void	998	void
		999	set_indent (CFPlus::Layout self, int indent)
		1000	CODE:
		1001	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1002
		1003	void
		1004	set_spacing (CFPlus::Layout self, int spacing)
		1005	CODE:
		1006	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1007
		1008	void
		1009	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1010	CODE:
		1011	pango_layout_set_ellipsize (self->pl,
		1012	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1013	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1014	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1015	: PANGO_ELLIPSIZE_NONE
		1016	);
		1017
		1018	void
		1019	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1020	CODE:
		1021	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1022
		1023	void
729	size (CFClient::Layout self)	1024	size (CFPlus::Layout self)
730	PPCODE:	1025	PPCODE:
731	{	1026	{
732	int w, h;	1027	int w, h;
733		1028
734	layout_get_pixel_size (self, &w, &h);	1029	layout_get_pixel_size (self, &w, &h);
…		…
737	PUSHs (sv_2mortal (newSViv (w)));	1032	PUSHs (sv_2mortal (newSViv (w)));
738	PUSHs (sv_2mortal (newSViv (h)));	1033	PUSHs (sv_2mortal (newSViv (h)));
739	}	1034	}
740		1035
741	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
742	xy_to_index (CFClient::Layout self, int x, int y)	1049	xy_to_index (CFPlus::Layout self, int x, int y)
743	CODE:	1050	CODE:
744	{	1051	{
745	int index, trailing;	1052	int index, trailing;
746	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);
747	RETVAL = index;	1054	RETVAL = index + trailing;
748	}	1055	}
749	OUTPUT:	1056	OUTPUT:
750	RETVAL	1057	RETVAL
751		1058
752	void	1059	void
753	cursor_pos (CFClient::Layout self, int index)	1060	cursor_pos (CFPlus::Layout self, int index)
754	PPCODE:	1061	PPCODE:
755	{	1062	{
756	PangoRectangle strong_pos;	1063	PangoRectangle strong_pos;
757	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1064	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
758		1065
…		…
761	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1068	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
762	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1069	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
763	}	1070	}
764		1071
765	void	1072	void
766	render (CFClient::Layout self)	1073	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
767	PPCODE:	1074	PPCODE:
768	{	1075	{
769	SV *retval;	1076	int line, x;
770	int w, h;
771	FT_Bitmap bitmap;
772		1077
773	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 */
774		1080
775	retval = newSV (w * h);
776	SvPOK_only (retval);
777	SvCUR_set (retval, w * h);
778
779	bitmap.rows = h;
780	bitmap.width = w;
781	bitmap.pitch = w;
782	bitmap.buffer = (unsigned char*)SvPVX (retval);
783	bitmap.num_grays = 256;
784	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
785
786	memset (bitmap.buffer, 0, w * h);
787
788	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
789
790	EXTEND (SP, 3);	1081	EXTEND (SP, 2);
791	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)
		1104	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1105	else
		1106	{
792	PUSHs (sv_2mortal (newSViv (h)));	1107	PUSHs (sv_2mortal (newSViv (index)));
793	PUSHs (sv_2mortal (retval));	1108	PUSHs (sv_2mortal (newSViv (trailing)));
		1109	}
794	}	1110	}
795		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
796	MODULE = CFClient PACKAGE = CFClient::Texture	1122	MODULE = CFPlus PACKAGE = CFPlus::Texture
797		1123
798	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
799	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.)
800	PROTOTYPE: $$$;$$	1163	PROTOTYPE: $$$;$$
		1164	ALIAS:
		1165	draw_quad_alpha = 1
		1166	draw_quad_alpha_premultiplied = 2
801	CODE:	1167	CODE:
802	{	1168	{
803	HV *hv = (HV *)SvRV (self);	1169	HV *hv = (HV *)SvRV (self);
804	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1170	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
805	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1171	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
806	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1172	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
807	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
808		1173
809	if (items < 5)	1174	if (items < 5)
810	{	1175	{
811	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1176	w = SvNV (*hv_fetch (hv, "w", 1, 1));
812	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1177	h = SvNV (*hv_fetch (hv, "h", 1, 1));
813	}	1178	}
814		1179
		1180	if (ix)
		1181	{
		1182	glEnable (GL_BLEND);
		1183
		1184	if (ix == 2)
		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
		1190	glEnable (GL_ALPHA_TEST);
		1191	glAlphaFunc (GL_GREATER, 0.01f);
		1192	}
		1193
815	glBindTexture (GL_TEXTURE_2D, name);	1194	glBindTexture (GL_TEXTURE_2D, name);
816	if (wrap_mode) {	1195
817	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
818	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
819	}
820	glBegin (GL_QUADS);	1196	glBegin (GL_QUADS);
821	glTexCoord2f (0, 0); glVertex2f (x , y );	1197	glTexCoord2f (0, 0); glVertex2f (x , y );
822	glTexCoord2f (0, t); glVertex2f (x , y + h);	1198	glTexCoord2f (0, t); glVertex2f (x , y + h);
823	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1199	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
824	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1200	glTexCoord2f (s, 0); glVertex2f (x + w, y );
825	glEnd ();	1201	glEnd ();
826	}
827		1202
		1203	if (ix)
		1204	{
		1205	glDisable (GL_ALPHA_TEST);
		1206	glDisable (GL_BLEND);
		1207	}
		1208	}
		1209
828	MODULE = CFClient PACKAGE = CFClient::Map	1210	MODULE = CFPlus PACKAGE = CFPlus::Map
829		1211
830	CFClient::Map	1212	CFPlus::Map
831	new (SV *class, int map_width, int map_height)	1213	new (SV *class)
832	CODE:	1214	CODE:
833	New (0, RETVAL, 1, struct map);	1215	New (0, RETVAL, 1, struct map);
834	RETVAL->x = 0;	1216	RETVAL->x = 0;
835	RETVAL->y = 0;	1217	RETVAL->y = 0;
836	RETVAL->w = map_width;	1218	RETVAL->w = 0;
837	RETVAL->h = map_height;	1219	RETVAL->h = 0;
838	RETVAL->ox = 0;	1220	RETVAL->ox = 0;
839	RETVAL->oy = 0;	1221	RETVAL->oy = 0;
840	RETVAL->faces = 8192;	1222	RETVAL->faces = 8192;
841	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1223	Newz (0, RETVAL->face, RETVAL->faces, mapface);
842	RETVAL->texs = 8192;	1224	RETVAL->texs = 8192;
…		…
845	RETVAL->row = 0;	1227	RETVAL->row = 0;
846	OUTPUT:	1228	OUTPUT:
847	RETVAL	1229	RETVAL
848		1230
849	void	1231	void
850	DESTROY (CFClient::Map self)	1232	DESTROY (CFPlus::Map self)
851	CODE:	1233	CODE:
852	{	1234	{
853	map_clear (self);	1235	map_clear (self);
854	Safefree (self->face);	1236	Safefree (self->face);
		1237	Safefree (self->tex);
855	Safefree (self);	1238	Safefree (self);
856	}	1239	}
857		1240
858	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
859	clear (CFClient::Map self)	1248	clear (CFPlus::Map self)
860	CODE:	1249	CODE:
861	map_clear (self);	1250	map_clear (self);
862		1251
863	void	1252	void
864	set_face (CFClient::Map self, int face, int texid)	1253	set_face (CFPlus::Map self, int face, int texid)
865	CODE:	1254	CODE:
866	{	1255	{
867	while (self->faces <= face)	1256	while (self->faces <= face)
868	{	1257	{
869	Append (mapface, self->face, self->faces, self->faces);	1258	Append (mapface, self->face, self->faces, self->faces);
…		…
872		1261
873	self->face [face] = texid;	1262	self->face [face] = texid;
874	}	1263	}
875		1264
876	void	1265	void
877	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)
878	CODE:	1267	CODE:
879	{	1268	{
880	while (self->texs <= texid)	1269	while (self->texs <= texid)
881	{	1270	{
882	Append (maptex, self->tex, self->texs, self->texs);	1271	Append (maptex, self->tex, self->texs, self->texs);
…		…
894	tex->r = r;	1283	tex->r = r;
895	tex->g = g;	1284	tex->g = g;
896	tex->b = b;	1285	tex->b = b;
897	tex->a = a;	1286	tex->a = a;
898	}	1287	}
		1288
		1289	// somewhat hackish, but for textures that require it, it really
		1290	// improves the look, and most others don't suffer.
		1291	glBindTexture (GL_TEXTURE_2D, name);
		1292	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		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);
899	}	1297	}
900		1298
901	int	1299	int
902	ox (CFClient::Map self)	1300	ox (CFPlus::Map self)
903	ALIAS:	1301	ALIAS:
904	oy = 1	1302	oy = 1
		1303	x = 2
		1304	y = 3
		1305	w = 4
		1306	h = 5
905	CODE:	1307	CODE:
906	switch (ix)	1308	switch (ix)
907	{	1309	{
908	case 0: RETVAL = self->ox; break;	1310	case 0: RETVAL = self->ox; break;
909	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;
910	}	1316	}
911	OUTPUT:	1317	OUTPUT:
912	RETVAL	1318	RETVAL
913		1319
914	void	1320	void
915	scroll (CFClient::Map self, int dx, int dy)	1321	scroll (CFPlus::Map self, int dx, int dy)
916	CODE:	1322	CODE:
917	{	1323	{
918	if (dx > 0)	1324	if (dx > 0)
919	map_blank (self, self->x, self->y, dx - 1, self->h);	1325	map_blank (self, self->x, self->y, dx, self->h);
920	else if (dx < 0)	1326	else if (dx < 0)
921	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);
922		1328
923	if (dy > 0)	1329	if (dy > 0)
924	map_blank (self, self->x, self->y, self->w, dy - 1);	1330	map_blank (self, self->x, self->y, self->w, dy);
925	else if (dy < 0)	1331	else if (dy < 0)
926	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);
927		1333
928	self->ox += dx; self->x += dx;	1334	self->ox += dx; self->x += dx;
929	self->oy += dy; self->y += dy;	1335	self->oy += dy; self->y += dy;
930		1336
931	while (self->y < 0)	1337	while (self->y < 0)
…		…
936	self->y += MAP_EXTEND_Y;	1342	self->y += MAP_EXTEND_Y;
937	}	1343	}
938	}	1344	}
939		1345
940	void	1346	void
941	map1a_update (CFClient::Map self, SV *data_)	1347	map1a_update (CFPlus::Map self, SV *data_, int extmap)
942	CODE:	1348	CODE:
943	{	1349	{
944	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1350	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
945	uint8_t *data_end = (uint8_t *)SvEND (data_);	1351	uint8_t *data_end = (uint8_t *)SvEND (data_);
946	mapcell *cell;	1352	mapcell *cell;
947	int x, y, flags;	1353	int x, y, flags;
948		1354
949	while (data < data_end)	1355	while (data < data_end - 1)
950	{	1356	{
951	flags = (data [0] << 8) + data [1]; data += 2;	1357	flags = (data [0] << 8) + data [1]; data += 2;
952		1358
953	x = ((flags >> 10) & 63) + self->x;	1359	x = self->x + ((flags >> 10) & 63);
954	y = ((flags >> 4) & 63) + self->y;	1360	y = self->y + ((flags >> 4) & 63);
955		1361
956	cell = map_get_cell (self, x, y);	1362	cell = map_get_cell (self, x, y);
957		1363
958	if (flags & 15)	1364	if (flags & 15)
959	{	1365	{
960	if (cell->darkness < 0)	1366	if (!cell->darkness)
961	{	1367	{
		1368	memset (cell, 0, sizeof (*cell));
962	cell->darkness = 0;	1369	cell->darkness = 256;
963	cell->face [0] = 0;
964	cell->face [1] = 0;
965	cell->face [2] = 0;
966	}	1370	}
967		1371
968	cell->darkness = flags & 8 ? *data++ : 255;
969
970	//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	}
971		1413
972	if (flags & 4)	1414	if (flags & 4)
973	{	1415	{
974	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;
975	}	1417	}
…		…
983	{	1425	{
984	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;
985	}	1427	}
986	}	1428	}
987	else	1429	else
988	cell->darkness = -1;	1430	cell->darkness = 0;
989	}	1431	}
990	}	1432	}
991		1433
992	SV *	1434	SV *
993	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)
994	CODE:	1436	CODE:
995	{	1437	{
996	int x1, x;	1438	int x1, x;
997	int y1, y;	1439	int y1, y;
998	int z;	1440	int z;
…		…
1048	}	1490	}
1049	OUTPUT:	1491	OUTPUT:
1050	RETVAL	1492	RETVAL
1051		1493
1052	void	1494	void
1053	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)
1054	PPCODE:	1496	CODE:
1055	{	1497	{
1056	int vx, vy;
1057	int x, y, z;	1498	int x, y, z;
1058	int last_name;	1499	int last_name;
1059	mapface face;	1500	mapface face;
1060	int sw4 = (sw + 3) & ~3;
1061	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1062	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1063
1064	memset (darkness, 255, sw4 * sh);
1065	SvPOK_only (darkness_sv);
1066	SvCUR_set (darkness_sv, sw4 * sh);
1067
1068	vx = self->x + (self->w - sw) / 2 - shift_x;
1069	vy = self->y + (self->h - sh) / 2 - shift_y;
1070
1071	/*
1072	int vx = self->vx = self->w >= sw
1073	? self->x + (self->w - sw) / 2
1074	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1075
1076	int vy = self->vy = self->h >= sh
1077	? self->y + (self->h - sh) / 2
1078	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1079	*/
1080		1501
1081	glColor4ub (255, 255, 255, 255);	1502	glColor4ub (255, 255, 255, 255);
1082		1503
		1504	glEnable (GL_BLEND);
1083	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1084	glEnable (GL_BLEND);
1085	glEnable (GL_TEXTURE_2D);	1506	glEnable (GL_TEXTURE_2D);
1086	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1507	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1087		1508
1088	glBegin (GL_QUADS);	1509	glBegin (GL_QUADS);
1089		1510
1090	last_name = 0;	1511	last_name = 0;
1091		1512
		1513	mx += self->x;
		1514	my += self->y;
		1515
1092	for (z = 0; z < 3; z++)	1516	for (z = 0; z < 3; z++)
1093	for (y = 0; y < sh; y++)	1517	for (y = 0; y < sh; y++)
1094	if (0 <= y + vy && y + vy < self->rows)	1518	if (0 <= y + my && y + my < self->rows)
1095	{	1519	{
1096	maprow *row = self->row + (y + vy);	1520	maprow *row = self->row + (y + my);
1097		1521
1098	for (x = 0; x < sw; x++)	1522	for (x = 0; x < sw; x++)
1099	if (row->c0 <= x + vx && x + vx < row->c1)	1523	if (row->c0 <= x + mx && x + mx < row->c1)
1100	{	1524	{
1101	mapcell *cell = row->col + (x + vx - row->c0);	1525	mapcell *cell = row->col + (x + mx - row->c0);
1102
1103	darkness[y * sw4 + x] = cell->darkness < 0
1104	? 255 - FOW_DARKNESS
1105	: 255 - cell->darkness;
1106		1526
1107	face = cell->face [z];	1527	face = cell->face [z];
1108		1528
1109	if (face)	1529	if (face && face < self->texs)
1110	{	1530	{
1111	maptex tex = self->tex [face];	1531	maptex tex = self->tex [face];
1112
1113	int px = (x + 1) * 32 - tex.w;	1532	int px = (x + 1) * 32 - tex.w;
1114	int py = (y + 1) * 32 - tex.h;	1533	int py = (y + 1) * 32 - tex.h;
1115		1534
1116	if (last_name != tex.name)	1535	if (last_name != tex.name)
1117	{	1536	{
1118	glEnd ();	1537	glEnd ();
1119	last_name = tex.name;
1120	glBindTexture (GL_TEXTURE_2D, last_name);	1538	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1121	glBegin (GL_QUADS);	1539	glBegin (GL_QUADS);
1122	}	1540	}
1123		1541
1124	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1542	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1125	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1543	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1126	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);
1127	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1545	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1128	}	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	}
1129	}	1566	}
1130	}	1567	}
1131		1568
1132	glEnd ();	1569	glEnd ();
1133		1570
1134	glDisable (GL_TEXTURE_2D);	1571	glDisable (GL_TEXTURE_2D);
1135	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	}
1136		1697
1137	EXTEND (SP, 3);	1698	EXTEND (SP, 3);
1138	PUSHs (sv_2mortal (newSViv (sw4)));	1699	PUSHs (sv_2mortal (newSViv (sw4)));
1139	PUSHs (sv_2mortal (newSViv (sh)));	1700	PUSHs (sv_2mortal (newSViv (sh)));
1140	PUSHs (darkness_sv);	1701	PUSHs (darkness_sv);
1141	}	1702	}
1142		1703
1143	SV *	1704	SV *
1144	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)
1145	CODE:	1706	CODE:
1146	{	1707	{
1147	int x, y, x1, y1;	1708	int x, y, x1, y1;
1148	SV *data_sv = newSV (w * h * 7 + 5);	1709	SV *data_sv = newSV (w * h * 7 + 5);
1149	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1710	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1211	}	1772	}
1212	OUTPUT:	1773	OUTPUT:
1213	RETVAL	1774	RETVAL
1214		1775
1215	void	1776	void
1216	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)
1217	PPCODE:	1778	PPCODE:
1218	{	1779	{
1219	int x, y, z;	1780	int x, y, z;
1220	int w, h;	1781	int w, h;
1221	int x1, y1;	1782	int x1, y1;
…		…
1253		1814
1254	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1815	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1255	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1816	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1256	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1817	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1257		1818
1258	if (cell->darkness <= 0)	1819	if (cell->darkness == 0)
1259	{	1820	{
1260	cell->darkness = -1;	1821	cell->darkness = 0;
1261		1822
1262	for (z = 0; z <= 2; z++)	1823	for (z = 0; z <= 2; z++)
1263	{	1824	{
1264	cell->face[z] = face[z];	1825	cell->face[z] = face[z];
1265		1826
…		…
1270	}	1831	}
1271	}	1832	}
1272	}	1833	}
1273	}	1834	}
1274		1835
1275	MODULE = CFClient PACKAGE = CFClient::MixChunk	1836	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1276		1837
1277	CFClient::MixChunk	1838	CFPlus::MixChunk
1278	new_from_file (SV *class, char *path)	1839	new_from_file (SV *class, char *path)
1279	CODE:	1840	CODE:
1280	RETVAL = Mix_LoadWAV (path);	1841	RETVAL = Mix_LoadWAV (path);
1281	OUTPUT:	1842	OUTPUT:
1282	RETVAL	1843	RETVAL
1283		1844
1284	void	1845	void
1285	DESTROY (CFClient::MixChunk self)	1846	DESTROY (CFPlus::MixChunk self)
1286	CODE:	1847	CODE:
1287	Mix_FreeChunk (self);	1848	Mix_FreeChunk (self);
1288		1849
1289	int	1850	int
1290	volume (CFClient::MixChunk self, int volume = -1)	1851	volume (CFPlus::MixChunk self, int volume = -1)
1291	CODE:	1852	CODE:
1292	RETVAL = Mix_VolumeChunk (self, volume);	1853	RETVAL = Mix_VolumeChunk (self, volume);
1293	OUTPUT:	1854	OUTPUT:
1294	RETVAL	1855	RETVAL
1295		1856
1296	int	1857	int
1297	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)
1298	CODE:	1859	CODE:
1299	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1860	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1300	OUTPUT:	1861	OUTPUT:
1301	RETVAL	1862	RETVAL
1302		1863
1303	MODULE = CFClient PACKAGE = CFClient::MixMusic	1864	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1304		1865
1305	int	1866	int
1306	volume (int volume = -1)	1867	volume (int volume = -1)
1307	CODE:	1868	CODE:
1308	RETVAL = Mix_VolumeMusic (volume);	1869	RETVAL = Mix_VolumeMusic (volume);
1309	OUTPUT:	1870	OUTPUT:
1310	RETVAL	1871	RETVAL
1311		1872
1312	CFClient::MixMusic	1873	CFPlus::MixMusic
1313	new_from_file (SV *class, char *path)	1874	new_from_file (SV *class, char *path)
1314	CODE:	1875	CODE:
1315	RETVAL = Mix_LoadMUS (path);	1876	RETVAL = Mix_LoadMUS (path);
1316	OUTPUT:	1877	OUTPUT:
1317	RETVAL	1878	RETVAL
1318		1879
1319	void	1880	void
1320	DESTROY (CFClient::MixMusic self)	1881	DESTROY (CFPlus::MixMusic self)
1321	CODE:	1882	CODE:
1322	Mix_FreeMusic (self);	1883	Mix_FreeMusic (self);
1323		1884
1324	int	1885	int
1325	play (CFClient::MixMusic self, int loops = -1)	1886	play (CFPlus::MixMusic self, int loops = -1)
1326	CODE:	1887	CODE:
1327	RETVAL = Mix_PlayMusic (self, loops);	1888	RETVAL = Mix_PlayMusic (self, loops);
1328	OUTPUT:	1889	OUTPUT:
1329	RETVAL	1890	RETVAL
1330		1891
1331	MODULE = CFClient PACKAGE = CFClient::OpenGL	1892	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1332		1893
1333	BOOT:	1894	BOOT:
1334	{	1895	{
1335	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1896	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1336	static const struct {	1897	static const struct {
1337	const char *name;	1898	const char *name;
1338	IV iv;	1899	IV iv;
1339	} *civ, const_iv[] = {	1900	} *civ, const_iv[] = {
1340	# define const_iv(name) { # name, (IV)name }	1901	# define const_iv(name) { # name, (IV)name }
1341	const_iv (GL_COLOR_MATERIAL),	1902	const_iv (GL_COLOR_MATERIAL),
1342	const_iv (GL_SMOOTH),	1903	const_iv (GL_SMOOTH),
1343	const_iv (GL_FLAT),	1904	const_iv (GL_FLAT),
		1905	const_iv (GL_DITHER),
1344	const_iv (GL_BLEND),	1906	const_iv (GL_BLEND),
		1907	const_iv (GL_CULL_FACE),
		1908	const_iv (GL_SCISSOR_TEST),
		1909	const_iv (GL_DEPTH_TEST),
		1910	const_iv (GL_ALPHA_TEST),
		1911	const_iv (GL_NORMALIZE),
		1912	const_iv (GL_RESCALE_NORMAL),
		1913	const_iv (GL_FRONT),
		1914	const_iv (GL_BACK),
1345	const_iv (GL_AND),	1915	const_iv (GL_AND),
		1916	const_iv (GL_ONE),
		1917	const_iv (GL_ZERO),
1346	const_iv (GL_SRC_ALPHA),	1918	const_iv (GL_SRC_ALPHA),
		1919	const_iv (GL_DST_ALPHA),
1347	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1920	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1921	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1922	const_iv (GL_SRC_ALPHA_SATURATE),
1348	const_iv (GL_RGB),	1923	const_iv (GL_RGB),
1349	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),
1350	const_iv (GL_UNSIGNED_BYTE),	1928	const_iv (GL_UNSIGNED_BYTE),
1351	const_iv (GL_ALPHA4),	1929	const_iv (GL_UNSIGNED_SHORT),
		1930	const_iv (GL_UNSIGNED_INT),
1352	const_iv (GL_ALPHA),	1931	const_iv (GL_ALPHA),
		1932	const_iv (GL_INTENSITY),
		1933	const_iv (GL_LUMINANCE),
		1934	const_iv (GL_LUMINANCE_ALPHA),
1353	const_iv (GL_FLOAT),	1935	const_iv (GL_FLOAT),
1354	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1936	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1355	const_iv (GL_COMPILE),	1937	const_iv (GL_COMPILE),
1356	const_iv (GL_TEXTURE_1D),	1938	const_iv (GL_TEXTURE_1D),
1357	const_iv (GL_TEXTURE_2D),	1939	const_iv (GL_TEXTURE_2D),
…		…
1359	const_iv (GL_TEXTURE_MAG_FILTER),	1941	const_iv (GL_TEXTURE_MAG_FILTER),
1360	const_iv (GL_TEXTURE_MIN_FILTER),	1942	const_iv (GL_TEXTURE_MIN_FILTER),
1361	const_iv (GL_TEXTURE_ENV_MODE),	1943	const_iv (GL_TEXTURE_ENV_MODE),
1362	const_iv (GL_TEXTURE_WRAP_S),	1944	const_iv (GL_TEXTURE_WRAP_S),
1363	const_iv (GL_TEXTURE_WRAP_T),	1945	const_iv (GL_TEXTURE_WRAP_T),
		1946	const_iv (GL_REPEAT),
1364	const_iv (GL_CLAMP),	1947	const_iv (GL_CLAMP),
1365	const_iv (GL_REPEAT),	1948	const_iv (GL_CLAMP_TO_EDGE),
1366	const_iv (GL_NEAREST),	1949	const_iv (GL_NEAREST),
1367	const_iv (GL_LINEAR),	1950	const_iv (GL_LINEAR),
1368	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1951	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1369	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1952	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1370	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1953	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1371	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1954	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1372	const_iv (GL_GENERATE_MIPMAP),	1955	const_iv (GL_GENERATE_MIPMAP),
1373	const_iv (GL_LINEAR),
1374	const_iv (GL_MODULATE),	1956	const_iv (GL_MODULATE),
		1957	const_iv (GL_DECAL),
1375	const_iv (GL_REPLACE),	1958	const_iv (GL_REPLACE),
		1959	const_iv (GL_DEPTH_BUFFER_BIT),
1376	const_iv (GL_COLOR_BUFFER_BIT),	1960	const_iv (GL_COLOR_BUFFER_BIT),
1377	const_iv (GL_PROJECTION),	1961	const_iv (GL_PROJECTION),
1378	const_iv (GL_MODELVIEW),	1962	const_iv (GL_MODELVIEW),
1379	const_iv (GL_COLOR_LOGIC_OP),	1963	const_iv (GL_COLOR_LOGIC_OP),
		1964	const_iv (GL_SEPARABLE_2D),
1380	const_iv (GL_CONVOLUTION_2D),	1965	const_iv (GL_CONVOLUTION_2D),
1381	const_iv (GL_CONVOLUTION_BORDER_MODE),	1966	const_iv (GL_CONVOLUTION_BORDER_MODE),
1382	const_iv (GL_CONSTANT_BORDER),	1967	const_iv (GL_CONSTANT_BORDER),
1383	const_iv (GL_LINES),	1968	const_iv (GL_LINES),
		1969	const_iv (GL_LINE_STRIP),
		1970	const_iv (GL_LINE_LOOP),
1384	const_iv (GL_QUADS),	1971	const_iv (GL_QUADS),
1385	const_iv (GL_LINE_LOOP),	1972	const_iv (GL_QUAD_STRIP),
		1973	const_iv (GL_TRIANGLES),
		1974	const_iv (GL_TRIANGLE_STRIP),
		1975	const_iv (GL_TRIANGLE_FAN),
1386	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1976	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1387	const_iv (GL_FASTEST),	1977	const_iv (GL_FASTEST),
		1978	const_iv (GL_V2F),
		1979	const_iv (GL_V3F),
		1980	const_iv (GL_T2F_V3F),
		1981	const_iv (GL_T2F_N3F_V3F),
1388	# undef const_iv	1982	# undef const_iv
1389	};	1983	};
1390		1984
1391	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; )
1392	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1986	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1393	}	1987	}
1394		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
1395	int glGetError ()	2010	int glGetError ()
		2011
		2012	void glFinish ()
1396		2013
1397	void glClear (int mask)	2014	void glClear (int mask)
1398		2015
1399	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)
1400	PROTOTYPE: @	2017	PROTOTYPE: @
…		…
1407		2024
1408	void glHint (int target, int mode)	2025	void glHint (int target, int mode)
1409		2026
1410	void glBlendFunc (int sfactor, int dfactor)	2027	void glBlendFunc (int sfactor, int dfactor)
1411		2028
		2029	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2030	CODE:
		2031	gl_BlendFuncSeparate (sa, da, saa, daa);
		2032
		2033	void glDepthMask (int flag)
		2034
1412	void glLogicOp (int opcode)	2035	void glLogicOp (int opcode)
1413		2036
		2037	void glColorMask (int red, int green, int blue, int alpha)
		2038
1414	void glMatrixMode (int mode)	2039	void glMatrixMode (int mode)
1415		2040
1416	void glPushMatrix ()	2041	void glPushMatrix ()
1417		2042
1418	void glPopMatrix ()	2043	void glPopMatrix ()
1419		2044
1420	void glLoadIdentity ()	2045	void glLoadIdentity ()
1421		2046
		2047	void glDrawBuffer (int buffer)
		2048
		2049	void glReadBuffer (int buffer)
		2050
1422	# near and far are due to microsofts buggy c compiler	2051	# near_ and far_ are due to microsofts buggy "c" compiler
		2052	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2053
		2054	# near_ and far_ are due to microsofts buggy "c" compiler
1423	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2055	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1424		2056
1425	void glViewport (int x, int y, int width, int height)	2057	void glViewport (int x, int y, int width, int height)
		2058
		2059	void glScissor (int x, int y, int width, int height)
1426		2060
1427	void glTranslate (float x, float y, float z = 0.)	2061	void glTranslate (float x, float y, float z = 0.)
1428	CODE:	2062	CODE:
1429	glTranslatef (x, y, z);	2063	glTranslatef (x, y, z);
1430		2064
…		…
1440		2074
1441	void glEnd ()	2075	void glEnd ()
1442		2076
1443	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)
1444	PROTOTYPE: @	2078	PROTOTYPE: @
		2079	ALIAS:
		2080	glColor_premultiply = 1
1445	CODE:	2081	CODE:
		2082	if (ix)
		2083	{
		2084	r *= a;
		2085	g *= a;
		2086	b *= a;
		2087	}
		2088	// microsoft visual "c" rounds instead of truncating...
1446	glColor4f (r, g, b, a);	2089	glColor4f (r, g, b, a);
		2090
		2091	void glInterleavedArrays (int format, int stride, char *data)
		2092
		2093	void glDrawElements (int mode, int count, int type, char *indices)
		2094
		2095	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2096
		2097	void glRasterPos (float x, float y, float z = 0.)
		2098	CODE:
		2099	glRasterPos3f (0, 0, z);
		2100	glBitmap (0, 0, 0, 0, x, y, 0);
1447		2101
1448	void glVertex (float x, float y, float z = 0.)	2102	void glVertex (float x, float y, float z = 0.)
1449	CODE:	2103	CODE:
1450	glVertex3f (x, y, z);	2104	glVertex3f (x, y, z);
1451		2105
…		…
1463		2117
1464	void glBindTexture (int target, int name)	2118	void glBindTexture (int target, int name)
1465		2119
1466	void glConvolutionParameter (int target, int pname, float params)	2120	void glConvolutionParameter (int target, int pname, float params)
1467	CODE:	2121	CODE:
1468	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2122	if (gl.ConvolutionParameterf)
		2123	gl.ConvolutionParameterf (target, pname, params);
1469		2124
1470	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)
1471	CODE:	2126	CODE:
1472	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2127	if (gl.ConvolutionFilter2D)
1473	(target, internalformat, width, height, format, type, data));	2128	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2129
		2130	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
		2131	CODE:
		2132	if (gl.SeparableFilter2D)
		2133	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1474		2134
1475	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)
1476		2136
1477	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)
		2138
		2139	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2140
		2141	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1478		2142
1479	int glGenTexture ()	2143	int glGenTexture ()
1480	CODE:	2144	CODE:
1481	{	2145	{
1482	GLuint name;	2146	GLuint name;

Diff Legend

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