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

Diff Legend

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