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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
5	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
6	#endif	7	#endif
7		8
8	#include "EXTERN.h"	9	#include "EXTERN.h"
9	#include "perl.h"	10	#include "perl.h"
10	#include "XSUB.h"	11	#include "XSUB.h"
11		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
12	#include <math.h>	17	#include <math.h>
13	#include <string.h>	18	#include <string.h>
14	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
15		21
16	#include <SDL.h>	22	#include <SDL.h>
17	#include <SDL_endian.h>	23	#include <SDL_endian.h>
18	#include <SDL_image.h>	24	#include <SDL_image.h>
19	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
21		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
22	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
23		32
24	#include <pango/pango.h>	33	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		34
29	#ifndef _WIN32	35	#ifndef _WIN32
30	# include <sys/types.h>	36	# include <sys/types.h>
31	# include <sys/socket.h>	37	# include <sys/socket.h>
32	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
39	typedef signed char int8_t;	45	typedef signed char int8_t;
40	typedef signed short int16_t;	46	typedef signed short int16_t;
41	typedef signed int int32_t;	47	typedef signed int int32_t;
42	#endif	48	#endif
43		49
44	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		51
46	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
47		53
48	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
50		56
51	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
52		58
53	#define GL_CALL(type,func,args) \	59	#if 0
54	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	61	#else
56	static type fptr_; \	62	# define PARACHUTE 0
57	\	63	#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		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
68	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
70		90
71	typedef PangoFontDescription *CFClient__Font;	91	typedef PangoFontDescription *CFPlus__Font;
		92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
72		110
73	typedef struct cf_layout {	111	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
77	int base_height;	114	int base_height;
78	CFClient__Font font;	115	CFPlus__Font font;
79	} *CFClient__Layout;	116	} *CFPlus__Layout;
80		117
81	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
82	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
83	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
84		121
85	static void	122	static void
86	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
87	{	124	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	126	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	128	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	130	}
95		131
96	static void	132	static void
97	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
98	{	134	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
101	*/	137	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		142
107	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
108	}	144	}
109		145
110	static void	146	static void
111	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
114		153
115	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		156
118	*w = (*w + 3) & ~3;	157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
119	}	162	}
120		163
121	typedef uint16_t mapface;	164	typedef uint16_t mapface;
122		165
123	typedef struct {	166	typedef struct {
…		…
126	float s, t;	169	float s, t;
127	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
128	} maptex;	171	} maptex;
129		172
130	typedef struct {	173	typedef struct {
131	int16_t darkness;	174	uint32_t player;
132	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	178	} mapcell;
134		179
135	typedef struct {	180	typedef struct {
136	int32_t c0, c1;	181	int32_t c0, c1;
137	mapcell *col;	182	mapcell *col;
…		…
146	int texs;	191	int texs;
147	maptex *tex;	192	maptex *tex;
148		193
149	int32_t rows;	194	int32_t rows;
150	maprow *row;	195	maprow *row;
151	} *CFClient__Map;	196	} *CFPlus__Map;
152		197
153	static char *	198	static char *
154	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
155	{	200	{
156	char *p;	201	char *p;
…		…
174		219
175	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		222
178	static maprow *	223	static maprow *
179	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
180	{	225	{
181	if (0 > y)	226	if (0 > y)
182	{	227	{
183	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
222		267
223	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
224	}	269	}
225		270
226	static mapcell *	271	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
228	{	273	{
229	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
230	}	275	}
231		276
232	static void	277	static void
233	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
234	{	279	{
235	int r;	280	int r;
236		281
237	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
246	self->row = 0;	291	self->row = 0;
247	self->rows = 0;	292	self->rows = 0;
248	}	293	}
249		294
250	static void	295	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	297	{
253	int x, y;	298	int x, y;
254	maprow *row;	299	maprow *row;
		300	mapcell *cell;
255		301
256	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	303	if (y >= 0)
258	{	304	{
259	if (y >= self->rows)	305	if (y >= self->rows)
…		…
265	if (x >= row->c0)	311	if (x >= row->c0)
266	{	312	{
267	if (x >= row->c1)	313	if (x >= row->c1)
268	break;	314	break;
269		315
270	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
271	}	320	}
272	}	321	}
273	}	322	}
274		323
275	static void	324	static void
…		…
296	ev.data2 = 0;	345	ev.data2 = 0;
297		346
298	SDL_PushEvent ((SDL_Event *)&ev);	347	SDL_PushEvent ((SDL_Event *)&ev);
299	}	348	}
300		349
		350	static unsigned int
		351	minpot (unsigned int n)
		352	{
		353	if (!n)
		354	return 0;
		355
		356	--n;
		357
		358	n |= n >> 1;
		359	n |= n >> 2;
		360	n |= n >> 4;
		361	n |= n >> 8;
		362	n |= n >> 16;
		363
		364	return n + 1;
		365	}
		366
301	MODULE = CFClient PACKAGE = CFClient	367	MODULE = CFPlus PACKAGE = CFPlus
302		368
303	PROTOTYPES: ENABLE	369	PROTOTYPES: ENABLE
304		370
305	BOOT:	371	BOOT:
306	{	372	{
307	HV *stash = gv_stashpv ("CFClient", 1);	373	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	374	static const struct {
309	const char *name;	375	const char *name;
310	IV iv;	376	IV iv;
311	} *civ, const_iv[] = {	377	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	378	# define const_iv(name) { # name, (IV)name }
…		…
413		479
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	480	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	481	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	482	}
417		483
		484	int
		485	in_destruct ()
		486	CODE:
		487	RETVAL = PL_main_cv == Nullcv;
		488	OUTPUT:
		489	RETVAL
		490
		491	NV floor (NV x)
		492
		493	NV ceil (NV x)
		494
418	void	495	void
419	pango_init ()	496	pango_init ()
420	CODE:	497	CODE:
421	{	498	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	499	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	500	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);	501	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	}	502	}
430		503
431	int	504	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	505	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		506
434	void	507	void
435	SDL_Quit ()	508	SDL_Quit ()
436		509
437	void	510	void
…		…
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	525	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		528
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	529	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		530	#if SDL_VERSION_ATLEAST(1,2,10)
		531	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		532	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		533	#endif
457		534
458	SDL_EnableUNICODE (1);	535	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	536	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		537
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	538	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
470		547
471	++m;	548	++m;
472	}	549	}
473	}	550	}
474		551
		552	char *
		553	SDL_GetError ()
		554
475	int	555	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	556	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	557	CODE:
478	RETVAL = !!SDL_SetVideoMode (	558	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	559	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480	);	560	);
		561	if (RETVAL)
		562	{
481	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	563	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		564	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		565	# include "glfunc.h"
		566	# undef GL_FUNC
		567	}
482	OUTPUT:	568	OUTPUT:
483	RETVAL	569	RETVAL
484		570
485	void	571	void
486	SDL_GL_SwapBuffers ()	572	SDL_GL_SwapBuffers ()
		573
		574	char *
		575	SDL_GetKeyName (int sym)
487		576
488	void	577	void
489	SDL_PollEvent ()	578	SDL_PollEvent ()
490	PPCODE:	579	PPCODE:
491	{	580	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	599	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	600	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	601	break;
513		602
514	case SDL_MOUSEMOTION:	603	case SDL_MOUSEMOTION:
		604	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		605
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	606	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	607	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	608	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	609	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	610	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	611	break;
521		612
522	case SDL_MOUSEBUTTONDOWN:	613	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	614	case SDL_MOUSEBUTTONUP:
		615	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		616
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	617	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	618	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	619	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	620	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	621	break;
…		…
532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	625	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	626	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534	break;	627	break;
535	}	628	}
536		629
537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	630	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538	}	631	}
539	}	632	}
540		633
541	int	634	int
542	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	635	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
555	CODE:	648	CODE:
556	#ifndef _WIN32	649	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	650	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	651	#endif
559		652
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573
574	void	653	void
575	add_font (char *file)	654	add_font (char *file)
576	CODE:	655	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	656	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		657
583	void	658	void
584	load_image_inline (SV *image_)	659	load_image_inline (SV *image_)
585	ALIAS:	660	ALIAS:
586	load_image_file = 1	661	load_image_file = 1
…		…
628		703
629	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	704	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630		705
631	assert (surface2->pitch == surface2->w * 4);	706	assert (surface2->pitch == surface2->w * 4);
632		707
		708	SDL_LockSurface (surface2);
633	EXTEND (SP, 5);	709	EXTEND (SP, 6);
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	710	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	711	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	712	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638	SDL_UnlockSurface (surface2);
639	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	713	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	714	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	715	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		716	SDL_UnlockSurface (surface2);
642		717
643	SDL_FreeSurface (surface);	718	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	719	SDL_FreeSurface (surface2);
645	}	720	}
646		721
…		…
670	}	745	}
671		746
672	void	747	void
673	error (char *message)	748	error (char *message)
674	CODE:	749	CODE:
		750	fprintf (stderr, "ERROR: %s\n", message);
675	#ifdef _WIN32	751	#ifdef _WIN32
676	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	752	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
677	#else
678	fprintf (stderr, "ERROR: %s\n", message);
679	#endif	753	#endif
680		754
681	void	755	void
682	fatal (char *message)	756	fatal (char *message)
683	CODE:	757	CODE:
		758	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	759	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	760	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686	#else
687	fprintf (stderr, "FATAL: %s\n", message);
688	#endif	761	#endif
689	exit (1);	762	_exit (1);
690		763
		764	void
		765	_exit (int retval)
		766	CODE:
		767	_exit (retval);
		768
691	MODULE = CFClient PACKAGE = CFClient::Font	769	MODULE = CFPlus PACKAGE = CFPlus::Font
692		770
693	CFClient::Font	771	CFPlus::Font
694	new_from_file (SV *class, char *path, int id = 0)	772	new_from_file (SV *class, char *path, int id = 0)
695	CODE:	773	CODE:
696	{	774	{
697	int count;	775	int count;
698	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	776	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
701	}	779	}
702	OUTPUT:	780	OUTPUT:
703	RETVAL	781	RETVAL
704		782
705	void	783	void
706	DESTROY (CFClient::Font self)	784	DESTROY (CFPlus::Font self)
707	CODE:	785	CODE:
708	pango_font_description_free (self);	786	pango_font_description_free (self);
709		787
710	void	788	void
711	make_default (CFClient::Font self)	789	make_default (CFPlus::Font self)
712	CODE:	790	CODE:
713	default_font = self;	791	default_font = self;
714		792
715	MODULE = CFClient PACKAGE = CFClient::Layout	793	MODULE = CFPlus PACKAGE = CFPlus::Layout
716		794
717	CFClient::Layout	795	void
718	new (SV *class, int rgba = 0)	796	reset_glyph_cache ()
		797	CODE:
		798	tc_clear ();
		799
		800	CFPlus::Layout
		801	new (SV *class)
719	CODE:	802	CODE:
720	New (0, RETVAL, 1, struct cf_layout);	803	New (0, RETVAL, 1, struct cf_layout);
721		804
722	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	805	RETVAL->pl = pango_layout_new (opengl_context);
723	RETVAL->rgba = rgba;
724	RETVAL->r = 1.;	806	RETVAL->r = 1.;
725	RETVAL->g = 1.;	807	RETVAL->g = 1.;
726	RETVAL->b = 1.;	808	RETVAL->b = 1.;
727	RETVAL->a = 1.;	809	RETVAL->a = 1.;
728	RETVAL->base_height = MIN_FONT_HEIGHT;	810	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
732	layout_update_font (RETVAL);	814	layout_update_font (RETVAL);
733	OUTPUT:	815	OUTPUT:
734	RETVAL	816	RETVAL
735		817
736	void	818	void
737	DESTROY (CFClient::Layout self)	819	DESTROY (CFPlus::Layout self)
738	CODE:	820	CODE:
739	g_object_unref (self->pl);	821	g_object_unref (self->pl);
740	Safefree (self);	822	Safefree (self);
741		823
742	int
743	is_rgba (CFClient::Layout self)
744	CODE:
745	RETVAL = self->rgba;
746	OUTPUT:
747	RETVAL
748
749	void	824	void
750	set_text (CFClient::Layout self, SV *text_)	825	set_text (CFPlus::Layout self, SV *text_)
751	CODE:	826	CODE:
752	{	827	{
753	STRLEN textlen;	828	STRLEN textlen;
754	char *text = SvPVutf8 (text_, textlen);	829	char *text = SvPVutf8 (text_, textlen);
755		830
756	pango_layout_set_text (self->pl, text, textlen);	831	pango_layout_set_text (self->pl, text, textlen);
757	}	832	}
758		833
759	void	834	void
760	set_markup (CFClient::Layout self, SV *text_)	835	set_markup (CFPlus::Layout self, SV *text_)
761	CODE:	836	CODE:
762	{	837	{
763	STRLEN textlen;	838	STRLEN textlen;
764	char *text = SvPVutf8 (text_, textlen);	839	char *text = SvPVutf8 (text_, textlen);
765		840
766	pango_layout_set_markup (self->pl, text, textlen);	841	pango_layout_set_markup (self->pl, text, textlen);
767	}	842	}
768		843
		844	void
		845	set_shapes (CFPlus::Layout self, ...)
		846	CODE:
		847	{
		848	PangoAttrList *attrs = 0;
		849	const char *text = pango_layout_get_text (self->pl);
		850	const char *pos = text;
		851	int arg = 4;
		852
		853	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		854	{
		855	PangoRectangle inkrect, rect;
		856	PangoAttribute *attr;
		857
		858	int x = SvIV (ST (arg - 3));
		859	int y = SvIV (ST (arg - 2));
		860	int w = SvIV (ST (arg - 1));
		861	int h = SvIV (ST (arg ));
		862
		863	inkrect.x = 0;
		864	inkrect.y = 0;
		865	inkrect.width = 0;
		866	inkrect.height = 0;
		867
		868	rect.x = x * PANGO_SCALE;
		869	rect.y = y * PANGO_SCALE;
		870	rect.width = w * PANGO_SCALE;
		871	rect.height = h * PANGO_SCALE;
		872
		873	if (!attrs)
		874	attrs = pango_layout_get_attributes (self->pl);
		875
		876	attr = pango_attr_shape_new (&inkrect, &rect);
		877	attr->start_index = pos - text;
		878	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		879	pango_attr_list_insert (attrs, attr);
		880
		881	arg += 4;
		882	pos += sizeof (OBJ_STR) - 1;
		883	}
		884
		885	if (attrs)
		886	pango_layout_set_attributes (self->pl, attrs);
		887	}
		888
		889	void
		890	get_shapes (CFPlus::Layout self)
		891	PPCODE:
		892	{
		893	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		894
		895	do
		896	{
		897	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		898
		899	if (run && shape_attr_p (run))
		900	{
		901	PangoRectangle extents;
		902	pango_layout_iter_get_run_extents (iter, 0, &extents);
		903
		904	EXTEND (SP, 2);
		905	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		906	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		907	}
		908	}
		909	while (pango_layout_iter_next_run (iter));
		910
		911	pango_layout_iter_free (iter);
		912	}
		913
		914	int
		915	has_wrapped (CFPlus::Layout self)
		916	CODE:
		917	{
		918	int lines = 1;
		919	const char *text = pango_layout_get_text (self->pl);
		920
		921	while (*text)
		922	lines += *text++ == '\n';
		923
		924	RETVAL = lines < pango_layout_get_line_count (self->pl);
		925	}
		926	OUTPUT:
		927	RETVAL
		928
769	SV *	929	SV *
770	get_text (CFClient::Layout self)	930	get_text (CFPlus::Layout self)
771	CODE:	931	CODE:
772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	932	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773	SvUTF8_on (RETVAL);	933	sv_utf8_decode (RETVAL);
774	OUTPUT:	934	OUTPUT:
775	RETVAL	935	RETVAL
776		936
777	void	937	void
778	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	938	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
779	CODE:	939	CODE:
780	self->r = r;	940	self->r = r;
781	self->g = g;	941	self->g = g;
782	self->b = b;	942	self->b = b;
783	self->a = a;	943	self->a = a;
784		944
785	void	945	void
786	set_font (CFClient::Layout self, CFClient::Font font = 0)	946	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
787	CODE:	947	CODE:
788	if (self->font != font)	948	if (self->font != font)
789	{	949	{
790	self->font = font;	950	self->font = font;
791	layout_update_font (self);	951	layout_update_font (self);
792	}	952	}
793		953
794	void	954	void
795	set_height (CFClient::Layout self, int base_height)	955	set_height (CFPlus::Layout self, int base_height)
796	CODE:	956	CODE:
797	if (self->base_height != base_height)	957	if (self->base_height != base_height)
798	{	958	{
799	self->base_height = base_height;	959	self->base_height = base_height;
800	layout_update_font (self);	960	layout_update_font (self);
801	}	961	}
802		962
803	void	963	void
804	set_width (CFClient::Layout self, int max_width = -1)	964	set_width (CFPlus::Layout self, int max_width = -1)
805	CODE:	965	CODE:
806	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	966	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
807		967
808	void	968	void
809	set_indent (CFClient::Layout self, int indent)	969	set_indent (CFPlus::Layout self, int indent)
810	CODE:	970	CODE:
811	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	971	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812		972
813	void	973	void
814	set_spacing (CFClient::Layout self, int spacing)	974	set_spacing (CFPlus::Layout self, int spacing)
815	CODE:	975	CODE:
816	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	976	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817		977
818	void	978	void
819	set_ellipsise (CFClient::Layout self, int ellipsise)	979	set_ellipsise (CFPlus::Layout self, int ellipsise)
820	CODE:	980	CODE:
821	pango_layout_set_ellipsize (self->pl,	981	pango_layout_set_ellipsize (self->pl,
822	ellipsise == 1 ? PANGO_ELLIPSIZE_START	982	ellipsise == 1 ? PANGO_ELLIPSIZE_START
823	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	983	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	984	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
825	: PANGO_ELLIPSIZE_NONE	985	: PANGO_ELLIPSIZE_NONE
826	);	986	);
827		987
828	void	988	void
829	set_single_paragraph_mode (CFClient::Layout self, int spm)	989	set_single_paragraph_mode (CFPlus::Layout self, int spm)
830	CODE:	990	CODE:
831	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	991	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
832		992
833	void	993	void
834	size (CFClient::Layout self)	994	size (CFPlus::Layout self)
835	PPCODE:	995	PPCODE:
836	{	996	{
837	int w, h;	997	int w, h;
838		998
839	layout_get_pixel_size (self, &w, &h);	999	layout_get_pixel_size (self, &w, &h);
…		…
842	PUSHs (sv_2mortal (newSViv (w)));	1002	PUSHs (sv_2mortal (newSViv (w)));
843	PUSHs (sv_2mortal (newSViv (h)));	1003	PUSHs (sv_2mortal (newSViv (h)));
844	}	1004	}
845		1005
846	int	1006	int
		1007	descent (CFPlus::Layout self)
		1008	CODE:
		1009	{
		1010	PangoRectangle rect;
		1011	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1012	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1013	RETVAL = PANGO_DESCENT (rect);
		1014	}
		1015	OUTPUT:
		1016	RETVAL
		1017
		1018	int
847	xy_to_index (CFClient::Layout self, int x, int y)	1019	xy_to_index (CFPlus::Layout self, int x, int y)
848	CODE:	1020	CODE:
849	{	1021	{
850	int index, trailing;	1022	int index, trailing;
851	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1023	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
852	RETVAL = index;	1024	RETVAL = index;
853	}	1025	}
854	OUTPUT:	1026	OUTPUT:
855	RETVAL	1027	RETVAL
856		1028
857	void	1029	void
858	cursor_pos (CFClient::Layout self, int index)	1030	cursor_pos (CFPlus::Layout self, int index)
859	PPCODE:	1031	PPCODE:
860	{	1032	{
861	PangoRectangle strong_pos;	1033	PangoRectangle strong_pos;
862	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1034	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
863		1035
…		…
866	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1038	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
867	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
868	}	1040	}
869		1041
870	void	1042	void
871	render (CFClient::Layout self)	1043	render (CFPlus::Layout self, float x, float y, int flags = 0)
872	PPCODE:	1044	PPCODE:
873	{	1045	pango_opengl_render_layout_subpixel (
874	SV *retval;	1046	self->pl,
875	int w, h;	1047	x * PANGO_SCALE, y * PANGO_SCALE,
		1048	self->r, self->g, self->b, self->a,
		1049	flags
		1050	);
876		1051
877	layout_get_pixel_size (self, &w, &h);	1052	MODULE = CFPlus PACKAGE = CFPlus::Texture
878		1053
879	if (self->rgba)	1054	void
		1055	pad2pot (SV *data_, SV *w_, SV *h_)
		1056	CODE:
		1057	{
		1058	int ow = SvIV (w_);
		1059	int oh = SvIV (h_);
		1060
		1061	if (ow && oh)
880	{	1062	{
881	cairo_surface_t *surface;	1063	int nw = minpot (ow);
882	cairo_t *cairo;	1064	int nh = minpot (oh);
883		1065
884	retval = newSV (w * h * 4);	1066	if (nw != ow || nh != oh)
885	SvPOK_only (retval);
886	SvCUR_set (retval, w * h * 4);
887
888	memset (SvPVX (retval), 0, w * h * 4);
889
890	surface = cairo_image_surface_create_for_data (
891	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
892	cairo = cairo_create (surface);
893	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
894
895	pango_cairo_show_layout (cairo, self->pl);
896
897	cairo_destroy (cairo);
898	cairo_surface_destroy (surface);
899
900	// what a mess, and its premultiplied, too :(
901	{	1067	{
902	uint32_t *p = (uint32_t *)SvPVX (retval);	1068	if (SvOK (data_))
903	uint32_t *e = p + w * h;
904
905	while (p < e)
906	{	1069	{
907	uint32_t rgba = *p;	1070	STRLEN datalen;
908	rgba = (rgba >> 24) | (rgba << 8);	1071	char *data = SvPVbyte (data_, datalen);
909	rgba = SDL_SwapBE32 (rgba);	1072	int bpp = datalen / (ow * oh);
910	*p++ = rgba;	1073	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1074
		1075	SvPOK_only (result_);
		1076	SvCUR_set (result_, nw * nh * bpp);
		1077
		1078	memset (SvPVX (result_), 0, nw * nh * bpp);
		1079	while (oh--)
		1080	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1081
		1082	sv_setsv (data_, result_);
911	}	1083	}
		1084
		1085	sv_setiv (w_, nw);
		1086	sv_setiv (h_, nh);
912	}	1087	}
913
914	EXTEND (SP, 5);
915	PUSHs (sv_2mortal (newSViv (w)));
916	PUSHs (sv_2mortal (newSViv (h)));
917	PUSHs (sv_2mortal (retval));
918	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
920	}	1088	}
921	else
922	{
923	FT_Bitmap bitmap;
924
925	retval = newSV (w * h);
926	SvPOK_only (retval);
927	SvCUR_set (retval, w * h);
928
929	bitmap.rows = h;
930	bitmap.width = w;
931	bitmap.pitch = w;
932	bitmap.buffer = (unsigned char*)SvPVX (retval);
933	bitmap.num_grays = 256;
934	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
935
936	memset (bitmap.buffer, 0, w * h);
937
938	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
939
940	EXTEND (SP, 5);
941	PUSHs (sv_2mortal (newSViv (w)));
942	PUSHs (sv_2mortal (newSViv (h)));
943	PUSHs (sv_2mortal (retval));
944	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
946	}
947	}	1089	}
948		1090
949	MODULE = CFClient PACKAGE = CFClient::Texture
950
951	void	1091	void
952	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1092	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
953	PROTOTYPE: $$$;$$	1093	PROTOTYPE: $$$;$$
954	ALIAS:	1094	ALIAS:
955	draw_quad_alpha = 1	1095	draw_quad_alpha = 1
956	draw_quad_alpha_premultiplied = 2	1096	draw_quad_alpha_premultiplied = 2
957	CODE:	1097	CODE:
958	{	1098	{
959	HV *hv = (HV *)SvRV (self);	1099	HV *hv = (HV *)SvRV (self);
960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1100	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1101	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1102	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964		1103
965	if (items < 5)	1104	if (items < 5)
966	{	1105	{
967	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1106	w = SvNV (*hv_fetch (hv, "w", 1, 1));
968	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1107	h = SvNV (*hv_fetch (hv, "h", 1, 1));
969	}	1108	}
970		1109
971	if (ix)	1110	if (ix)
972	{	1111	{
973	glEnable (GL_BLEND);	1112	glEnable (GL_BLEND);
		1113
		1114	if (ix == 2)
974	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1115	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1116	else
		1117	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1118	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1119
		1120	glEnable (GL_ALPHA_TEST);
		1121	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1122	}
976		1123
977	glBindTexture (GL_TEXTURE_2D, name);	1124	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1125
985	glBegin (GL_QUADS);	1126	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1127	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1128	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1129	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1130	glTexCoord2f (s, 0); glVertex2f (x + w, y );
990	glEnd ();	1131	glEnd ();
991		1132
992	if (ix)	1133	if (ix)
		1134	{
		1135	glDisable (GL_ALPHA_TEST);
993	glDisable (GL_BLEND);	1136	glDisable (GL_BLEND);
		1137	}
994	}	1138	}
995		1139
996	MODULE = CFClient PACKAGE = CFClient::Map	1140	MODULE = CFPlus PACKAGE = CFPlus::Map
997		1141
998	CFClient::Map	1142	CFPlus::Map
999	new (SV *class, int map_width, int map_height)	1143	new (SV *class, int map_width, int map_height)
1000	CODE:	1144	CODE:
1001	New (0, RETVAL, 1, struct map);	1145	New (0, RETVAL, 1, struct map);
1002	RETVAL->x = 0;	1146	RETVAL->x = 0;
1003	RETVAL->y = 0;	1147	RETVAL->y = 0;
…		…
1013	RETVAL->row = 0;	1157	RETVAL->row = 0;
1014	OUTPUT:	1158	OUTPUT:
1015	RETVAL	1159	RETVAL
1016		1160
1017	void	1161	void
1018	DESTROY (CFClient::Map self)	1162	DESTROY (CFPlus::Map self)
1019	CODE:	1163	CODE:
1020	{	1164	{
1021	map_clear (self);	1165	map_clear (self);
1022	Safefree (self->face);	1166	Safefree (self->face);
		1167	Safefree (self->tex);
1023	Safefree (self);	1168	Safefree (self);
1024	}	1169	}
1025		1170
1026	void	1171	void
1027	clear (CFClient::Map self)	1172	clear (CFPlus::Map self)
1028	CODE:	1173	CODE:
1029	map_clear (self);	1174	map_clear (self);
1030		1175
1031	void	1176	void
1032	set_face (CFClient::Map self, int face, int texid)	1177	set_face (CFPlus::Map self, int face, int texid)
1033	CODE:	1178	CODE:
1034	{	1179	{
1035	while (self->faces <= face)	1180	while (self->faces <= face)
1036	{	1181	{
1037	Append (mapface, self->face, self->faces, self->faces);	1182	Append (mapface, self->face, self->faces, self->faces);
…		…
1040		1185
1041	self->face [face] = texid;	1186	self->face [face] = texid;
1042	}	1187	}
1043		1188
1044	void	1189	void
1045	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)	1190	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)
1046	CODE:	1191	CODE:
1047	{	1192	{
1048	while (self->texs <= texid)	1193	while (self->texs <= texid)
1049	{	1194	{
1050	Append (maptex, self->tex, self->texs, self->texs);	1195	Append (maptex, self->tex, self->texs, self->texs);
…		…
1062	tex->r = r;	1207	tex->r = r;
1063	tex->g = g;	1208	tex->g = g;
1064	tex->b = b;	1209	tex->b = b;
1065	tex->a = a;	1210	tex->a = a;
1066	}	1211	}
		1212
		1213	// somewhat hackish, but for textures that require it, it really
		1214	// improves the look, and most others don't suffer.
		1215	glBindTexture (GL_TEXTURE_2D, name);
		1216	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1217	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1218	// use uglier nearest interpolation because linear suffers
		1219	// from transparent color bleeding and ugly wrapping effects.
		1220	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1067	}	1221	}
1068		1222
1069	int	1223	int
1070	ox (CFClient::Map self)	1224	ox (CFPlus::Map self)
1071	ALIAS:	1225	ALIAS:
1072	oy = 1	1226	oy = 1
		1227	x = 2
		1228	y = 3
		1229	w = 4
		1230	h = 5
1073	CODE:	1231	CODE:
1074	switch (ix)	1232	switch (ix)
1075	{	1233	{
1076	case 0: RETVAL = self->ox; break;	1234	case 0: RETVAL = self->ox; break;
1077	case 1: RETVAL = self->oy; break;	1235	case 1: RETVAL = self->oy; break;
		1236	case 2: RETVAL = self->x; break;
		1237	case 3: RETVAL = self->y; break;
		1238	case 4: RETVAL = self->w; break;
		1239	case 5: RETVAL = self->h; break;
1078	}	1240	}
1079	OUTPUT:	1241	OUTPUT:
1080	RETVAL	1242	RETVAL
1081		1243
1082	void	1244	void
1083	scroll (CFClient::Map self, int dx, int dy)	1245	scroll (CFPlus::Map self, int dx, int dy)
1084	CODE:	1246	CODE:
1085	{	1247	{
1086	if (dx > 0)	1248	if (dx > 0)
1087	map_blank (self, self->x, self->y, dx - 1, self->h);	1249	map_blank (self, self->x, self->y, dx - 1, self->h);
1088	else if (dx < 0)	1250	else if (dx < 0)
…		…
1104	self->y += MAP_EXTEND_Y;	1266	self->y += MAP_EXTEND_Y;
1105	}	1267	}
1106	}	1268	}
1107		1269
1108	void	1270	void
1109	map1a_update (CFClient::Map self, SV *data_)	1271	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1110	CODE:	1272	CODE:
1111	{	1273	{
1112	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1274	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1113	uint8_t *data_end = (uint8_t *)SvEND (data_);	1275	uint8_t *data_end = (uint8_t *)SvEND (data_);
1114	mapcell *cell;	1276	mapcell *cell;
1115	int x, y, flags;	1277	int x, y, flags;
1116		1278
1117	while (data < data_end)	1279	while (data < data_end - 1)
1118	{	1280	{
1119	flags = (data [0] << 8) + data [1]; data += 2;	1281	flags = (data [0] << 8) + data [1]; data += 2;
1120		1282
1121	x = ((flags >> 10) & 63) + self->x;	1283	x = self->x + ((flags >> 10) & 63);
1122	y = ((flags >> 4) & 63) + self->y;	1284	y = self->y + ((flags >> 4) & 63);
1123		1285
1124	cell = map_get_cell (self, x, y);	1286	cell = map_get_cell (self, x, y);
1125		1287
1126	if (flags & 15)	1288	if (flags & 15)
1127	{	1289	{
1128	if (cell->darkness < 0)	1290	if (!cell->darkness)
1129	{	1291	{
1130	cell->darkness = 0;	1292	cell->darkness = 256;
1131	cell->face [0] = 0;	1293	cell->face [0] = 0;
1132	cell->face [1] = 0;	1294	cell->face [1] = 0;
1133	cell->face [2] = 0;	1295	cell->face [2] = 0;
1134	}	1296	}
1135		1297
1136	cell->darkness = flags & 8 ? *data++ : 255;
1137
1138	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
1139		1339
1140	if (flags & 4)	1340	if (flags & 4)
1141	{	1341	{
1142	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1143	}	1343	}
…		…
1151	{	1351	{
1152	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1153	}	1353	}
1154	}	1354	}
1155	else	1355	else
		1356	{
1156	cell->darkness = -1;	1357	cell->darkness = 0;
		1358	cell->stat_hp = 0;
		1359	}
1157	}	1360	}
1158	}	1361	}
1159		1362
1160	SV *	1363	SV *
1161	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1364	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1162	CODE:	1365	CODE:
1163	{	1366	{
1164	int x1, x;	1367	int x1, x;
1165	int y1, y;	1368	int y1, y;
1166	int z;	1369	int z;
…		…
1216	}	1419	}
1217	OUTPUT:	1420	OUTPUT:
1218	RETVAL	1421	RETVAL
1219		1422
1220	void	1423	void
1221	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1424	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1222	PPCODE:	1425	CODE:
1223	{	1426	{
1224	int vx, vy;	1427	int vx, vy;
1225	int x, y, z;	1428	int x, y, z;
1226	int last_name;	1429	int last_name;
1227	mapface face;	1430	mapface face;
1228	int sw4 = (sw + 3) & ~3;
1229	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1230	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1231		1431
1232	memset (darkness, 255, sw4 * sh);
1233	SvPOK_only (darkness_sv);
1234	SvCUR_set (darkness_sv, sw4 * sh);
1235
1236	vx = self->x + (self->w - sw) / 2 - shift_x;	1432	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1237	vy = self->y + (self->h - sh) / 2 - shift_y;	1433	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1238		1434
1239	/*	1435	/*
1240	int vx = self->vx = self->w >= sw	1436	int vx = self->vx = self->w >= sw
1241	? self->x + (self->w - sw) / 2	1437	? self->x + (self->w - sw) / 2
1242	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1438	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1246	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1442	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247	*/	1443	*/
1248		1444
1249	glColor4ub (255, 255, 255, 255);	1445	glColor4ub (255, 255, 255, 255);
1250		1446
		1447	glEnable (GL_BLEND);
1251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1448	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252	glEnable (GL_BLEND);
1253	glEnable (GL_TEXTURE_2D);	1449	glEnable (GL_TEXTURE_2D);
1254	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1450	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255		1451
1256	glBegin (GL_QUADS);	1452	glBegin (GL_QUADS);
1257		1453
…		…
1266	for (x = 0; x < sw; x++)	1462	for (x = 0; x < sw; x++)
1267	if (row->c0 <= x + vx && x + vx < row->c1)	1463	if (row->c0 <= x + vx && x + vx < row->c1)
1268	{	1464	{
1269	mapcell *cell = row->col + (x + vx - row->c0);	1465	mapcell *cell = row->col + (x + vx - row->c0);
1270		1466
1271	darkness[y * sw4 + x] = cell->darkness < 0
1272	? 255 - FOW_DARKNESS
1273	: 255 - cell->darkness;
1274
1275	face = cell->face [z];	1467	face = cell->face [z];
1276		1468
1277	if (face)	1469	if (face && face < self->texs)
1278	{	1470	{
1279	maptex tex = self->tex [face];	1471	maptex tex = self->tex [face];
1280
1281	int px = (x + 1) * 32 - tex.w;	1472	int px = (x + 1) * 32 - tex.w;
1282	int py = (y + 1) * 32 - tex.h;	1473	int py = (y + 1) * 32 - tex.h;
1283		1474
1284	if (last_name != tex.name)	1475	if (last_name != tex.name)
1285	{	1476	{
1286	glEnd ();	1477	glEnd ();
1287	last_name = tex.name;
1288	glBindTexture (GL_TEXTURE_2D, last_name);	1478	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1289	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1290	}	1480	}
1291		1481
1292	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1482	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1293	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1483	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1294	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1484	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1295	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1485	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1296	}	1486	}
		1487
		1488	if (cell->flags && z == 2)
		1489	{
		1490	if (cell->flags & 1)
		1491	{
		1492	maptex tex = self->tex [1];
		1493	int px = (x + 1) * 32 - tex.w + 2;
		1494	int py = (y + 1) * 32 - tex.h - 6;
		1495
		1496	glEnd ();
		1497	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1498	glBegin (GL_QUADS);
		1499
		1500	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1501	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1502	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1503	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1504	}
		1505	}
1297	}	1506	}
1298	}	1507	}
1299		1508
1300	glEnd ();	1509	glEnd ();
1301		1510
1302	glDisable (GL_TEXTURE_2D);	1511	glDisable (GL_TEXTURE_2D);
1303	glDisable (GL_BLEND);	1512	glDisable (GL_BLEND);
		1513
		1514	// top layer: overlays such as the health bar
		1515	for (y = 0; y < sh; y++)
		1516	if (0 <= y + vy && y + vy < self->rows)
		1517	{
		1518	maprow *row = self->row + (y + vy);
		1519
		1520	for (x = 0; x < sw; x++)
		1521	if (row->c0 <= x + vx && x + vx < row->c1)
		1522	{
		1523	mapcell *cell = row->col + (x + vx - row->c0);
		1524
		1525	int px = x * 32;
		1526	int py = y * 32;
		1527
		1528	if (cell->stat_hp)
		1529	{
		1530	int width = cell->stat_width * 32;
		1531	int thick = sh / 28 + 1 + cell->stat_width;
		1532
		1533	glColor3ub (0, 0, 0);
		1534	glRectf (px + 1, py - thick - 2,
		1535	px + width - 1, py);
		1536
		1537	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1538	glRectf (px + 2,
		1539	py - thick - 1,
		1540	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1541	}
		1542	}
		1543	}
		1544	}
		1545
		1546	void
		1547	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1548	CODE:
		1549	{
		1550	static float color[16][3] = {
		1551	{ 0.00F, 0.00F, 0.00F },
		1552	{ 1.00F, 1.00F, 1.00F },
		1553	{ 0.00F, 0.00F, 0.55F },
		1554	{ 1.00F, 0.00F, 0.00F },
		1555
		1556	{ 1.00F, 0.54F, 0.00F },
		1557	{ 0.11F, 0.56F, 1.00F },
		1558	{ 0.93F, 0.46F, 0.00F },
		1559	{ 0.18F, 0.54F, 0.34F },
		1560
		1561	{ 0.56F, 0.73F, 0.56F },
		1562	{ 0.80F, 0.80F, 0.80F },
		1563	{ 0.55F, 0.41F, 0.13F },
		1564	{ 0.99F, 0.77F, 0.26F },
		1565
		1566	{ 0.74F, 0.65F, 0.41F },
		1567
		1568	{ 0.00F, 1.00F, 1.00F },
		1569	{ 1.00F, 0.00F, 1.00F },
		1570	{ 1.00F, 1.00F, 0.00F },
		1571	};
		1572
		1573	int x, y;
		1574
		1575	glEnable (GL_TEXTURE_2D);
		1576	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1577	glEnable (GL_BLEND);
		1578	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1579	glBegin (GL_QUADS);
		1580
		1581	for (y = 0; y < h; y++)
		1582	for (x = 0; x < w; x++)
		1583	{
		1584	unsigned char m = data [x + y * w];
		1585
		1586	if (m)
		1587	{
		1588	float *c = color [m & 15];
		1589
		1590	float tx1 = m & 0x40 ? 0.5 : 0.;
		1591	float tx2 = tx1 + 0.5;
		1592
		1593	glColor4f (c[0], c[1], c[2], 0.75);
		1594	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1595	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1596	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1597	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1598	}
		1599	}
		1600
		1601	glEnd ();
		1602	glDisable (GL_BLEND);
		1603	glDisable (GL_TEXTURE_2D);
		1604	}
		1605
		1606	void
		1607	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1608	PPCODE:
		1609	{
		1610	int vx, vy;
		1611	int x, y;
		1612	int sw4 = (sw + 3) & ~3;
		1613	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1614	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1615
		1616	memset (darkness, 255, sw4 * sh);
		1617	SvPOK_only (darkness_sv);
		1618	SvCUR_set (darkness_sv, sw4 * sh);
		1619
		1620	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1621	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1622
		1623	for (y = 0; y < sh; y++)
		1624	if (0 <= y + vy && y + vy < self->rows)
		1625	{
		1626	maprow *row = self->row + (y + vy);
		1627
		1628	for (x = 0; x < sw; x++)
		1629	if (row->c0 <= x + vx && x + vx < row->c1)
		1630	{
		1631	mapcell *cell = row->col + (x + vx - row->c0);
		1632
		1633	darkness[y * sw4 + x] = cell->darkness
		1634	? 255 - (cell->darkness - 1)
		1635	: 255 - FOW_DARKNESS;
		1636	}
		1637	}
1304		1638
1305	EXTEND (SP, 3);	1639	EXTEND (SP, 3);
1306	PUSHs (sv_2mortal (newSViv (sw4)));	1640	PUSHs (sv_2mortal (newSViv (sw4)));
1307	PUSHs (sv_2mortal (newSViv (sh)));	1641	PUSHs (sv_2mortal (newSViv (sh)));
1308	PUSHs (darkness_sv);	1642	PUSHs (darkness_sv);
1309	}	1643	}
1310		1644
1311	SV *	1645	SV *
1312	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1646	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1313	CODE:	1647	CODE:
1314	{	1648	{
1315	int x, y, x1, y1;	1649	int x, y, x1, y1;
1316	SV *data_sv = newSV (w * h * 7 + 5);	1650	SV *data_sv = newSV (w * h * 7 + 5);
1317	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1651	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1379	}	1713	}
1380	OUTPUT:	1714	OUTPUT:
1381	RETVAL	1715	RETVAL
1382		1716
1383	void	1717	void
1384	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1718	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1385	PPCODE:	1719	PPCODE:
1386	{	1720	{
1387	int x, y, z;	1721	int x, y, z;
1388	int w, h;	1722	int w, h;
1389	int x1, y1;	1723	int x1, y1;
…		…
1421		1755
1422	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1756	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1423	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1757	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1424	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1758	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1425		1759
1426	if (cell->darkness <= 0)	1760	if (cell->darkness == 0)
1427	{	1761	{
1428	cell->darkness = -1;	1762	cell->darkness = 0;
1429		1763
1430	for (z = 0; z <= 2; z++)	1764	for (z = 0; z <= 2; z++)
1431	{	1765	{
1432	cell->face[z] = face[z];	1766	cell->face[z] = face[z];
1433		1767
…		…
1438	}	1772	}
1439	}	1773	}
1440	}	1774	}
1441	}	1775	}
1442		1776
1443	MODULE = CFClient PACKAGE = CFClient::MixChunk	1777	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1444		1778
1445	CFClient::MixChunk	1779	CFPlus::MixChunk
1446	new_from_file (SV *class, char *path)	1780	new_from_file (SV *class, char *path)
1447	CODE:	1781	CODE:
1448	RETVAL = Mix_LoadWAV (path);	1782	RETVAL = Mix_LoadWAV (path);
1449	OUTPUT:	1783	OUTPUT:
1450	RETVAL	1784	RETVAL
1451		1785
1452	void	1786	void
1453	DESTROY (CFClient::MixChunk self)	1787	DESTROY (CFPlus::MixChunk self)
1454	CODE:	1788	CODE:
1455	Mix_FreeChunk (self);	1789	Mix_FreeChunk (self);
1456		1790
1457	int	1791	int
1458	volume (CFClient::MixChunk self, int volume = -1)	1792	volume (CFPlus::MixChunk self, int volume = -1)
1459	CODE:	1793	CODE:
1460	RETVAL = Mix_VolumeChunk (self, volume);	1794	RETVAL = Mix_VolumeChunk (self, volume);
1461	OUTPUT:	1795	OUTPUT:
1462	RETVAL	1796	RETVAL
1463		1797
1464	int	1798	int
1465	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1799	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1466	CODE:	1800	CODE:
1467	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1801	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1468	OUTPUT:	1802	OUTPUT:
1469	RETVAL	1803	RETVAL
1470		1804
1471	MODULE = CFClient PACKAGE = CFClient::MixMusic	1805	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1472		1806
1473	int	1807	int
1474	volume (int volume = -1)	1808	volume (int volume = -1)
1475	CODE:	1809	CODE:
1476	RETVAL = Mix_VolumeMusic (volume);	1810	RETVAL = Mix_VolumeMusic (volume);
1477	OUTPUT:	1811	OUTPUT:
1478	RETVAL	1812	RETVAL
1479		1813
1480	CFClient::MixMusic	1814	CFPlus::MixMusic
1481	new_from_file (SV *class, char *path)	1815	new_from_file (SV *class, char *path)
1482	CODE:	1816	CODE:
1483	RETVAL = Mix_LoadMUS (path);	1817	RETVAL = Mix_LoadMUS (path);
1484	OUTPUT:	1818	OUTPUT:
1485	RETVAL	1819	RETVAL
1486		1820
1487	void	1821	void
1488	DESTROY (CFClient::MixMusic self)	1822	DESTROY (CFPlus::MixMusic self)
1489	CODE:	1823	CODE:
1490	Mix_FreeMusic (self);	1824	Mix_FreeMusic (self);
1491		1825
1492	int	1826	int
1493	play (CFClient::MixMusic self, int loops = -1)	1827	play (CFPlus::MixMusic self, int loops = -1)
1494	CODE:	1828	CODE:
1495	RETVAL = Mix_PlayMusic (self, loops);	1829	RETVAL = Mix_PlayMusic (self, loops);
1496	OUTPUT:	1830	OUTPUT:
1497	RETVAL	1831	RETVAL
1498		1832
1499	MODULE = CFClient PACKAGE = CFClient::OpenGL	1833	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1500		1834
1501	BOOT:	1835	BOOT:
1502	{	1836	{
1503	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1837	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1504	static const struct {	1838	static const struct {
1505	const char *name;	1839	const char *name;
1506	IV iv;	1840	IV iv;
1507	} *civ, const_iv[] = {	1841	} *civ, const_iv[] = {
1508	# define const_iv(name) { # name, (IV)name }	1842	# define const_iv(name) { # name, (IV)name }
1509	const_iv (GL_COLOR_MATERIAL),	1843	const_iv (GL_COLOR_MATERIAL),
1510	const_iv (GL_SMOOTH),	1844	const_iv (GL_SMOOTH),
1511	const_iv (GL_FLAT),	1845	const_iv (GL_FLAT),
1512	const_iv (GL_DITHER),	1846	const_iv (GL_DITHER),
1513	const_iv (GL_BLEND),	1847	const_iv (GL_BLEND),
		1848	const_iv (GL_CULL_FACE),
1514	const_iv (GL_SCISSOR_TEST),	1849	const_iv (GL_SCISSOR_TEST),
		1850	const_iv (GL_DEPTH_TEST),
		1851	const_iv (GL_ALPHA_TEST),
		1852	const_iv (GL_NORMALIZE),
		1853	const_iv (GL_RESCALE_NORMAL),
		1854	const_iv (GL_FRONT),
		1855	const_iv (GL_BACK),
1515	const_iv (GL_AND),	1856	const_iv (GL_AND),
1516	const_iv (GL_ONE),	1857	const_iv (GL_ONE),
1517	const_iv (GL_ZERO),	1858	const_iv (GL_ZERO),
1518	const_iv (GL_SRC_ALPHA),	1859	const_iv (GL_SRC_ALPHA),
1519	const_iv (GL_SRC_ALPHA_SATURATE),	1860	const_iv (GL_DST_ALPHA),
1520	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1861	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521	const_iv (GL_ONE_MINUS_DST_ALPHA),	1862	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1863	const_iv (GL_SRC_ALPHA_SATURATE),
1522	const_iv (GL_RGB),	1864	const_iv (GL_RGB),
1523	const_iv (GL_RGBA),	1865	const_iv (GL_RGBA),
		1866	const_iv (GL_RGBA4),
		1867	const_iv (GL_RGBA8),
		1868	const_iv (GL_RGB5_A1),
1524	const_iv (GL_UNSIGNED_BYTE),	1869	const_iv (GL_UNSIGNED_BYTE),
		1870	const_iv (GL_UNSIGNED_SHORT),
		1871	const_iv (GL_UNSIGNED_INT),
1525	const_iv (GL_ALPHA),	1872	const_iv (GL_ALPHA),
		1873	const_iv (GL_INTENSITY),
1526	const_iv (GL_LUMINANCE),	1874	const_iv (GL_LUMINANCE),
		1875	const_iv (GL_LUMINANCE_ALPHA),
1527	const_iv (GL_FLOAT),	1876	const_iv (GL_FLOAT),
1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1877	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529	const_iv (GL_COMPILE),	1878	const_iv (GL_COMPILE),
1530	const_iv (GL_TEXTURE_1D),	1879	const_iv (GL_TEXTURE_1D),
1531	const_iv (GL_TEXTURE_2D),	1880	const_iv (GL_TEXTURE_2D),
…		…
1533	const_iv (GL_TEXTURE_MAG_FILTER),	1882	const_iv (GL_TEXTURE_MAG_FILTER),
1534	const_iv (GL_TEXTURE_MIN_FILTER),	1883	const_iv (GL_TEXTURE_MIN_FILTER),
1535	const_iv (GL_TEXTURE_ENV_MODE),	1884	const_iv (GL_TEXTURE_ENV_MODE),
1536	const_iv (GL_TEXTURE_WRAP_S),	1885	const_iv (GL_TEXTURE_WRAP_S),
1537	const_iv (GL_TEXTURE_WRAP_T),	1886	const_iv (GL_TEXTURE_WRAP_T),
		1887	const_iv (GL_REPEAT),
1538	const_iv (GL_CLAMP),	1888	const_iv (GL_CLAMP),
1539	const_iv (GL_REPEAT),	1889	const_iv (GL_CLAMP_TO_EDGE),
1540	const_iv (GL_NEAREST),	1890	const_iv (GL_NEAREST),
1541	const_iv (GL_LINEAR),	1891	const_iv (GL_LINEAR),
1542	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1892	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1893	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1894	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1895	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546	const_iv (GL_GENERATE_MIPMAP),	1896	const_iv (GL_GENERATE_MIPMAP),
1547	const_iv (GL_MODULATE),	1897	const_iv (GL_MODULATE),
1548	const_iv (GL_DECAL),	1898	const_iv (GL_DECAL),
1549	const_iv (GL_REPLACE),	1899	const_iv (GL_REPLACE),
		1900	const_iv (GL_DEPTH_BUFFER_BIT),
1550	const_iv (GL_COLOR_BUFFER_BIT),	1901	const_iv (GL_COLOR_BUFFER_BIT),
1551	const_iv (GL_PROJECTION),	1902	const_iv (GL_PROJECTION),
1552	const_iv (GL_MODELVIEW),	1903	const_iv (GL_MODELVIEW),
1553	const_iv (GL_COLOR_LOGIC_OP),	1904	const_iv (GL_COLOR_LOGIC_OP),
1554	const_iv (GL_SEPARABLE_2D),	1905	const_iv (GL_SEPARABLE_2D),
1555	const_iv (GL_CONVOLUTION_2D),	1906	const_iv (GL_CONVOLUTION_2D),
1556	const_iv (GL_CONVOLUTION_BORDER_MODE),	1907	const_iv (GL_CONVOLUTION_BORDER_MODE),
1557	const_iv (GL_CONSTANT_BORDER),	1908	const_iv (GL_CONSTANT_BORDER),
1558	const_iv (GL_LINES),	1909	const_iv (GL_LINES),
		1910	const_iv (GL_LINE_STRIP),
		1911	const_iv (GL_LINE_LOOP),
1559	const_iv (GL_QUADS),	1912	const_iv (GL_QUADS),
1560	const_iv (GL_LINE_LOOP),	1913	const_iv (GL_QUAD_STRIP),
		1914	const_iv (GL_TRIANGLES),
		1915	const_iv (GL_TRIANGLE_STRIP),
		1916	const_iv (GL_TRIANGLE_FAN),
1561	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1917	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562	const_iv (GL_FASTEST),	1918	const_iv (GL_FASTEST),
		1919	const_iv (GL_V2F),
		1920	const_iv (GL_V3F),
		1921	const_iv (GL_T2F_V3F),
		1922	const_iv (GL_T2F_N3F_V3F),
1563	# undef const_iv	1923	# undef const_iv
1564	};	1924	};
1565		1925
1566	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1926	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1927	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568	}	1928	}
1569		1929
		1930	char *
		1931	gl_vendor ()
		1932	CODE:
		1933	RETVAL = (char *)glGetString (GL_VENDOR);
		1934	OUTPUT:
		1935	RETVAL
		1936
		1937	char *
		1938	gl_version ()
		1939	CODE:
		1940	RETVAL = (char *)glGetString (GL_VERSION);
		1941	OUTPUT:
		1942	RETVAL
		1943
		1944	char *
		1945	gl_extensions ()
		1946	CODE:
		1947	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1948	OUTPUT:
		1949	RETVAL
		1950
1570	int glGetError ()	1951	int glGetError ()
		1952
		1953	void glFinish ()
1571		1954
1572	void glClear (int mask)	1955	void glClear (int mask)
1573		1956
1574	void glClearColor (float r, float g, float b, float a = 1.0)	1957	void glClearColor (float r, float g, float b, float a = 1.0)
1575	PROTOTYPE: @	1958	PROTOTYPE: @
…		…
1582		1965
1583	void glHint (int target, int mode)	1966	void glHint (int target, int mode)
1584		1967
1585	void glBlendFunc (int sfactor, int dfactor)	1968	void glBlendFunc (int sfactor, int dfactor)
1586		1969
		1970	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1971	CODE:
		1972	gl_BlendFuncSeparate (sa, da, saa, daa);
		1973
		1974	void glDepthMask (int flag)
		1975
1587	void glLogicOp (int opcode)	1976	void glLogicOp (int opcode)
1588		1977
1589	void glColorMask (int red, int green, int blue, int alpha)	1978	void glColorMask (int red, int green, int blue, int alpha)
1590		1979
1591	void glMatrixMode (int mode)	1980	void glMatrixMode (int mode)
…		…
1594		1983
1595	void glPopMatrix ()	1984	void glPopMatrix ()
1596		1985
1597	void glLoadIdentity ()	1986	void glLoadIdentity ()
1598		1987
		1988	void glDrawBuffer (int buffer)
		1989
		1990	void glReadBuffer (int buffer)
		1991
1599	# near and far are due to microsofts buggy c compiler	1992	# near_ and far_ are due to microsofts buggy "c" compiler
		1993	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1994
		1995	# near_ and far_ are due to microsofts buggy "c" compiler
1600	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1996	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1601		1997
1602	void glViewport (int x, int y, int width, int height)	1998	void glViewport (int x, int y, int width, int height)
1603		1999
1604	void glScissor (int x, int y, int width, int height)	2000	void glScissor (int x, int y, int width, int height)
…		…
1619		2015
1620	void glEnd ()	2016	void glEnd ()
1621		2017
1622	void glColor (float r, float g, float b, float a = 1.0)	2018	void glColor (float r, float g, float b, float a = 1.0)
1623	PROTOTYPE: @	2019	PROTOTYPE: @
		2020	ALIAS:
		2021	glColor_premultiply = 1
1624	CODE:	2022	CODE:
1625	glColor4ub (MIN ((int)(r * 255.f), 255),	2023	if (ix)
1626	MIN ((int)(g * 255.f), 255),	2024	{
1627	MIN ((int)(b * 255.f), 255),	2025	r *= a;
1628	MIN ((int)(a * 255.f), 255));	2026	g *= a;
		2027	b *= a;
		2028	}
		2029	// microsoft visual "c" rounds instead of truncating...
		2030	glColor4f (r, g, b, a);
		2031
		2032	void glInterleavedArrays (int format, int stride, char *data)
		2033
		2034	void glDrawElements (int mode, int count, int type, char *indices)
		2035
		2036	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2037
		2038	void glRasterPos (float x, float y, float z = 0.)
		2039	CODE:
		2040	glRasterPos3f (0, 0, z);
		2041	glBitmap (0, 0, 0, 0, x, y, 0);
1629		2042
1630	void glVertex (float x, float y, float z = 0.)	2043	void glVertex (float x, float y, float z = 0.)
1631	CODE:	2044	CODE:
1632	glVertex3f (x, y, z);	2045	glVertex3f (x, y, z);
1633		2046
…		…
1645		2058
1646	void glBindTexture (int target, int name)	2059	void glBindTexture (int target, int name)
1647		2060
1648	void glConvolutionParameter (int target, int pname, float params)	2061	void glConvolutionParameter (int target, int pname, float params)
1649	CODE:	2062	CODE:
1650	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2063	if (gl.ConvolutionParameterf)
		2064	gl.ConvolutionParameterf (target, pname, params);
1651		2065
1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2066	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653	CODE:	2067	CODE:
1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2068	if (gl.ConvolutionFilter2D)
1655	(target, internalformat, width, height, format, type, data));	2069	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656		2070
1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2071	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1658	CODE:	2072	CODE:
1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2073	if (gl.SeparableFilter2D)
1660	(target, internalformat, width, height, format, type, row, column));	2074	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661		2075
1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2076	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1663		2077
1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2078	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665		2079
1666	void glRasterPos (int x, int y)	2080	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667	CODE:
1668	glRasterPos2i (x, y);
1669		2081
1670	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2082	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671		2083
1672	int glGenTexture ()	2084	int glGenTexture ()
1673	CODE:	2085	CODE:

Diff Legend

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