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.131 by root, Thu Jul 13 01:54:18 2006 UTC vs.
Revision 1.176 by root, Tue Apr 10 09:39:48 2007 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
6	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
7	#endif	9	#endif
8		10
9	#include "EXTERN.h"	11	#include "EXTERN.h"
10	#include "perl.h"	12	#include "perl.h"
11	#include "XSUB.h"	13	#include "XSUB.h"
12		14
13	#ifdef _WIN32	15	#ifdef _WIN32
14	# undef pipe	16	# undef pipe
15	#endif	17	#endif
16		18
		19	#include <assert.h>
17	#include <math.h>	20	#include <math.h>
18	#include <string.h>	21	#include <string.h>
19	#include <stdio.h>	22	#include <stdio.h>
20	#include <stdlib.h>	23	#include <stdlib.h>
21		24
…		…
36	# include <sys/types.h>	39	# include <sys/types.h>
37	# include <sys/socket.h>	40	# include <sys/socket.h>
38	# include <netinet/in.h>	41	# include <netinet/in.h>
39	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
40	# include <inttypes.h>	43	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	44	#endif
49		45
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		47
52	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
53		49
54	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
…		…
83		79
84	#include "pango-font.c"	80	#include "pango-font.c"
85	#include "pango-fontmap.c"	81	#include "pango-fontmap.c"
86	#include "pango-render.c"	82	#include "pango-render.c"
87		83
88	typedef Mix_Chunk *CFClient__MixChunk;	84	typedef Mix_Chunk *CFPlus__MixChunk;
89	typedef Mix_Music *CFClient__MixMusic;	85	typedef Mix_Music *CFPlus__MixMusic;
90		86
91	typedef PangoFontDescription *CFClient__Font;	87	typedef PangoFontDescription *CFPlus__Font;
92		88
93	static int	89	static int
94	shape_attr_p (PangoLayoutRun *run)	90	shape_attr_p (PangoLayoutRun *run)
95	{	91	{
96	GSList *attrs = run->item->analysis.extra_attrs;	92	GSList *attrs = run->item->analysis.extra_attrs;
…		…
110		106
111	typedef struct cf_layout {	107	typedef struct cf_layout {
112	PangoLayout *pl;	108	PangoLayout *pl;
113	float r, g, b, a; // default color for rgba mode	109	float r, g, b, a; // default color for rgba mode
114	int base_height;	110	int base_height;
115	CFClient__Font font;	111	CFPlus__Font font;
116	} *CFClient__Layout;	112	} *CFPlus__Layout;
117		113
118	static CFClient__Font default_font;	114	static CFPlus__Font default_font;
119	static PangoContext *opengl_context;	115	static PangoContext *opengl_context;
120	static PangoFontMap *opengl_fontmap;	116	static PangoFontMap *opengl_fontmap;
121		117
122	static void	118	static void
123	substitute_func (FcPattern *pattern, gpointer data)	119	substitute_func (FcPattern *pattern, gpointer data)
…		…
128	#endif	124	#endif
129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	125	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
130	}	126	}
131		127
132	static void	128	static void
133	layout_update_font (CFClient__Layout self)	129	layout_update_font (CFPlus__Layout self)
134	{	130	{
135	/* use a random scale factor to account for unknown descenders, 0.8 works	131	/* use a random scale factor to account for unknown descenders, 0.8 works
136	* reasonably well with bitstream vera	132	* reasonably well with bitstream vera
137	*/	133	*/
138	PangoFontDescription *font = self->font ? self->font : default_font;	134	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
142		138
143	pango_layout_set_font_description (self->pl, font);	139	pango_layout_set_font_description (self->pl, font);
144	}	140	}
145		141
146	static void	142	static void
147	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	143	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148	{	144	{
		145	PangoRectangle rect;
		146
		147	// get_pixel_* wrongly rounds down
149	pango_layout_get_pixel_size (self->pl, w, h);	148	pango_layout_get_extents (self->pl, 0, &rect);
150		149
151	if (!*w) *w = 1;	150	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152	if (!*h) *h = 1;	151	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153		152
154	*w = (*w + 3) & ~3;	153	if (!rect.width) rect.width = 1;
155	}	154	if (!rect.height) rect.height = 1;
156		155
		156	*w = rect.width;
		157	*h = rect.height;
		158	}
		159
		160	typedef uint16_t tileid;
157	typedef uint16_t mapface;	161	typedef uint16_t faceid;
158		162
159	typedef struct {	163	typedef struct {
160	GLint name;	164	int name;
161	int w, h;	165	int w, h;
162	float s, t;	166	float s, t;
163	uint8_t r, g, b, a;	167	uint8_t r, g, b, a;
		168	tileid smoothtile;
		169	uint8_t smoothlevel;
164	} maptex;	170	} maptex;
165		171
166	typedef struct {	172	typedef struct {
		173	uint32_t player;
		174	tileid tile[3];
167	int16_t darkness;	175	uint16_t darkness;
168	mapface face[3];	176	uint8_t stat_width, stat_hp, flags, smoothmax;
169	} mapcell;	177	} mapcell;
170		178
171	typedef struct {	179	typedef struct {
172	int32_t c0, c1;	180	int32_t c0, c1;
173	mapcell *col;	181	mapcell *col;
174	} maprow;	182	} maprow;
175		183
176	typedef struct map {	184	typedef struct map {
177	int x, y, w, h;	185	int x, y, w, h;
178	int ox, oy; /* offset to virtual global coordinate system */	186	int ox, oy; /* offset to virtual global coordinate system */
179	int faces;	187	int faces; tileid *face2tile; // [faceid]
180	mapface *face;	188	int texs; maptex *tex; // [tileid]
181
182	int texs;
183	maptex *tex;
184		189
185	int32_t rows;	190	int32_t rows;
186	maprow *row;	191	maprow *row;
187	} *CFClient__Map;	192	} *CFPlus__Map;
188		193
189	static char *	194	static char *
190	prepend (char *ptr, int sze, int inc)	195	prepend (char *ptr, int sze, int inc)
191	{	196	{
192	char *p;	197	char *p;
…		…
209	}	214	}
210		215
211	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	216	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
212	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	217	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
213		218
		219	static void
		220	need_facenum (struct map *self, faceid face)
		221	{
		222	while (self->faces <= face)
		223	{
		224	Append (tileid, self->face2tile, self->faces, self->faces);
		225	self->faces *= 2;
		226	}
		227	}
		228
		229	static void
		230	need_texid (struct map *self, int texid)
		231	{
		232	while (self->texs <= texid)
		233	{
		234	Append (maptex, self->tex, self->texs, self->texs);
		235	self->texs *= 2;
		236	}
		237	}
		238
214	static maprow *	239	static maprow *
215	map_get_row (CFClient__Map self, int y)	240	map_get_row (CFPlus__Map self, int y)
216	{	241	{
217	if (0 > y)	242	if (0 > y)
218	{	243	{
219	int extend = - y + MAP_EXTEND_Y;	244	int extend = - y + MAP_EXTEND_Y;
220	Prepend (maprow, self->row, self->rows, extend);	245	Prepend (maprow, self->row, self->rows, extend);
…		…
258		283
259	return row->col + (x - row->c0);	284	return row->col + (x - row->c0);
260	}	285	}
261		286
262	static mapcell *	287	static mapcell *
263	map_get_cell (CFClient__Map self, int x, int y)	288	map_get_cell (CFPlus__Map self, int x, int y)
264	{	289	{
265	return row_get_cell (map_get_row (self, y), x);	290	return row_get_cell (map_get_row (self, y), x);
266	}	291	}
267		292
268	static void	293	static void
269	map_clear (CFClient__Map self)	294	map_clear (CFPlus__Map self)
270	{	295	{
271	int r;	296	int r;
272		297
273	for (r = 0; r < self->rows; r++)	298	for (r = 0; r < self->rows; r++)
274	Safefree (self->row[r].col);	299	Safefree (self->row[r].col);
…		…
282	self->row = 0;	307	self->row = 0;
283	self->rows = 0;	308	self->rows = 0;
284	}	309	}
285		310
286	static void	311	static void
287	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	312	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288	{	313	{
289	int x, y;	314	int x, y;
290	maprow *row;	315	maprow *row;
		316	mapcell *cell;
291		317
292	for (y = y0; y < y0 + h; y++)	318	for (y = y0; y < y0 + h; y++)
293	if (y >= 0)	319	if (y >= 0)
294	{	320	{
295	if (y >= self->rows)	321	if (y >= self->rows)
…		…
301	if (x >= row->c0)	327	if (x >= row->c0)
302	{	328	{
303	if (x >= row->c1)	329	if (x >= row->c1)
304	break;	330	break;
305		331
306	row->col[x - row->c0].darkness = -1;	332	cell = row->col + x - row->c0;
		333
		334	cell->darkness = 0;
		335	cell->stat_hp = 0;
		336	cell->flags = 0;
		337	cell->player = 0;
307	}	338	}
308	}	339	}
		340	}
		341
		342	typedef struct {
		343	tileid tile;
		344	uint8_t x, y, level;
		345	} smooth_key;
		346
		347	static void
		348	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		349	{
		350	SV **sv = hv_fetch (hv, (char *)key, sizeof (key), 1);
		351
		352	if (SvIOK (*sv))
		353	SvIV_set (*sv, SvIVX (*sv) | bits);
		354	else
		355	sv_setiv (*sv, bits);
309	}	356	}
310		357
311	static void	358	static void
312	music_finished (void)	359	music_finished (void)
313	{	360	{
…		…
349	n |= n >> 16;	396	n |= n >> 16;
350		397
351	return n + 1;	398	return n + 1;
352	}	399	}
353		400
		401	/* SDL should provide this, really. */
		402	#define SDLK_MODIFIER_MIN 300
		403	#define SDLK_MODIFIER_MAX 314
		404
354	MODULE = CFClient PACKAGE = CFClient	405	MODULE = CFPlus PACKAGE = CFPlus
355		406
356	PROTOTYPES: ENABLE	407	PROTOTYPES: ENABLE
357		408
358	BOOT:	409	BOOT:
359	{	410	{
360	HV *stash = gv_stashpv ("CFClient", 1);	411	HV *stash = gv_stashpv ("CFPlus", 1);
361	static const struct {	412	static const struct {
362	const char *name;	413	const char *name;
363	IV iv;	414	IV iv;
364	} *civ, const_iv[] = {	415	} *civ, const_iv[] = {
365	# define const_iv(name) { # name, (IV)name }	416	# define const_iv(name) { # name, (IV)name }
		417	const_iv (SDLK_MODIFIER_MIN),
		418	const_iv (SDLK_MODIFIER_MAX),
		419
366	const_iv (SDL_ACTIVEEVENT),	420	const_iv (SDL_ACTIVEEVENT),
367	const_iv (SDL_KEYDOWN),	421	const_iv (SDL_KEYDOWN),
368	const_iv (SDL_KEYUP),	422	const_iv (SDL_KEYUP),
369	const_iv (SDL_MOUSEMOTION),	423	const_iv (SDL_MOUSEMOTION),
370	const_iv (SDL_MOUSEBUTTONDOWN),	424	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
379	const_iv (SDL_EVENT_RESERVEDA),	433	const_iv (SDL_EVENT_RESERVEDA),
380	const_iv (SDL_EVENT_RESERVEDB),	434	const_iv (SDL_EVENT_RESERVEDB),
381	const_iv (SDL_VIDEORESIZE),	435	const_iv (SDL_VIDEORESIZE),
382	const_iv (SDL_VIDEOEXPOSE),	436	const_iv (SDL_VIDEOEXPOSE),
383	const_iv (SDL_USEREVENT),	437	const_iv (SDL_USEREVENT),
		438
		439	const_iv (SDL_APPINPUTFOCUS),
		440	const_iv (SDL_APPMOUSEFOCUS),
		441	const_iv (SDL_APPACTIVE),
		442
384	const_iv (SDLK_KP0),	443	const_iv (SDLK_KP0),
385	const_iv (SDLK_KP1),	444	const_iv (SDLK_KP1),
386	const_iv (SDLK_KP2),	445	const_iv (SDLK_KP2),
387	const_iv (SDLK_KP3),	446	const_iv (SDLK_KP3),
388	const_iv (SDLK_KP4),	447	const_iv (SDLK_KP4),
…		…
443	const_iv (SDLK_BREAK),	502	const_iv (SDLK_BREAK),
444	const_iv (SDLK_MENU),	503	const_iv (SDLK_MENU),
445	const_iv (SDLK_POWER),	504	const_iv (SDLK_POWER),
446	const_iv (SDLK_EURO),	505	const_iv (SDLK_EURO),
447	const_iv (SDLK_UNDO),	506	const_iv (SDLK_UNDO),
		507
448	const_iv (KMOD_NONE),	508	const_iv (KMOD_NONE),
		509	const_iv (KMOD_SHIFT),
449	const_iv (KMOD_LSHIFT),	510	const_iv (KMOD_LSHIFT),
450	const_iv (KMOD_RSHIFT),	511	const_iv (KMOD_RSHIFT),
		512	const_iv (KMOD_CTRL),
451	const_iv (KMOD_LCTRL),	513	const_iv (KMOD_LCTRL),
452	const_iv (KMOD_RCTRL),	514	const_iv (KMOD_RCTRL),
		515	const_iv (KMOD_ALT),
453	const_iv (KMOD_LALT),	516	const_iv (KMOD_LALT),
454	const_iv (KMOD_RALT),	517	const_iv (KMOD_RALT),
		518	const_iv (KMOD_META),
455	const_iv (KMOD_LMETA),	519	const_iv (KMOD_LMETA),
456	const_iv (KMOD_RMETA),	520	const_iv (KMOD_RMETA),
457	const_iv (KMOD_NUM),	521	const_iv (KMOD_NUM),
458	const_iv (KMOD_CAPS),	522	const_iv (KMOD_CAPS),
459	const_iv (KMOD_MODE),	523	const_iv (KMOD_MODE),
460	const_iv (KMOD_CTRL),
461	const_iv (KMOD_SHIFT),
462	const_iv (KMOD_ALT),
463	const_iv (KMOD_META)
464	# undef const_iv	524	# undef const_iv
465	};	525	};
466		526
467	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	527	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
468	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	528	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		529
		530	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		531	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
469	}	532	}
		533
		534	void
		535	weaken (SV *rv)
		536	PROTOTYPE: $
		537	CODE:
		538	sv_rvweaken (rv);
470		539
471	int	540	int
472	in_destruct ()	541	in_destruct ()
473	CODE:	542	CODE:
474	RETVAL = PL_main_cv == Nullcv;	543	RETVAL = PL_main_cv == Nullcv;
…		…
512	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	581	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
513	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	582	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
514	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	583	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
515		584
516	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	585	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		586	#if SDL_VERSION_ATLEAST(1,2,10)
517	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	587	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
518	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	588	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		589	#endif
519		590
520	SDL_EnableUNICODE (1);	591	SDL_EnableUNICODE (1);
521	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	592	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
522		593
523	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	594	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
575	case SDL_KEYDOWN:	646	case SDL_KEYDOWN:
576	case SDL_KEYUP:	647	case SDL_KEYUP:
577	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	648	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
578	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	649	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
579	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	650	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		651	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
580	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	652	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
581	break;	653	break;
582		654
583	case SDL_ACTIVEEVENT:	655	case SDL_ACTIVEEVENT:
584	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	656	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
610	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	682	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
611	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	683	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
612	break;	684	break;
613	}	685	}
614		686
615	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	687	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
616	}	688	}
617	}	689	}
618		690
619	int	691	int
620	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	692	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
632	lowdelay (int fd, int val = 1)	704	lowdelay (int fd, int val = 1)
633	CODE:	705	CODE:
634	#ifndef _WIN32	706	#ifndef _WIN32
635	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	707	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
636	#endif	708	#endif
		709
		710	void
		711	win32_proxy_info ()
		712	PPCODE:
		713	{
		714	#ifdef _WIN32
		715	char buffer[2048];
		716	DWORD buflen;
		717
		718	EXTEND (SP, 3);
		719
		720	buflen = sizeof (buffer);
		721	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		722	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		723	{
		724	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		725
		726	buflen = sizeof (buffer);
		727	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		728	{
		729	PUSHs (newSVpv (buffer, 0));
		730
		731	buflen = sizeof (buffer);
		732	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		733	PUSHs (newSVpv (buffer, 0));
		734	}
		735	}
		736	#endif
		737	}
637		738
638	void	739	void
639	add_font (char *file)	740	add_font (char *file)
640	CODE:	741	CODE:
641	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	742	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
745	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	846	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
746	#endif	847	#endif
747	_exit (1);	848	_exit (1);
748		849
749	void	850	void
750	_exit (int retval)	851	_exit (int retval = 0)
751	CODE:	852	CODE:
		853	#ifdef WIN32
		854	ExitThread (retval); // unclean, please beam me up
		855	#else
752	_exit (retval);	856	_exit (retval);
		857	#endif
753		858
754	MODULE = CFClient PACKAGE = CFClient::Font	859	MODULE = CFPlus PACKAGE = CFPlus::Font
755		860
756	CFClient::Font	861	CFPlus::Font
757	new_from_file (SV *class, char *path, int id = 0)	862	new_from_file (SV *class, char *path, int id = 0)
758	CODE:	863	CODE:
759	{	864	{
760	int count;	865	int count;
761	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	866	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
764	}	869	}
765	OUTPUT:	870	OUTPUT:
766	RETVAL	871	RETVAL
767		872
768	void	873	void
769	DESTROY (CFClient::Font self)	874	DESTROY (CFPlus::Font self)
770	CODE:	875	CODE:
771	pango_font_description_free (self);	876	pango_font_description_free (self);
772		877
773	void	878	void
774	make_default (CFClient::Font self)	879	make_default (CFPlus::Font self)
775	CODE:	880	CODE:
776	default_font = self;	881	default_font = self;
777		882
778	MODULE = CFClient PACKAGE = CFClient::Layout	883	MODULE = CFPlus PACKAGE = CFPlus::Layout
779		884
780	void	885	void
781	reset_glyph_cache ()	886	reset_glyph_cache ()
782	CODE:	887	CODE:
783	tc_clear ();	888	tc_clear ();
784		889
785	CFClient::Layout	890	CFPlus::Layout
786	new (SV *class)	891	new (SV *class)
787	CODE:	892	CODE:
788	New (0, RETVAL, 1, struct cf_layout);	893	New (0, RETVAL, 1, struct cf_layout);
789		894
790	RETVAL->pl = pango_layout_new (opengl_context);	895	RETVAL->pl = pango_layout_new (opengl_context);
…		…
799	layout_update_font (RETVAL);	904	layout_update_font (RETVAL);
800	OUTPUT:	905	OUTPUT:
801	RETVAL	906	RETVAL
802		907
803	void	908	void
804	DESTROY (CFClient::Layout self)	909	DESTROY (CFPlus::Layout self)
805	CODE:	910	CODE:
806	g_object_unref (self->pl);	911	g_object_unref (self->pl);
807	Safefree (self);	912	Safefree (self);
808		913
809	void	914	void
810	set_text (CFClient::Layout self, SV *text_)	915	set_text (CFPlus::Layout self, SV *text_)
811	CODE:	916	CODE:
812	{	917	{
813	STRLEN textlen;	918	STRLEN textlen;
814	char *text = SvPVutf8 (text_, textlen);	919	char *text = SvPVutf8 (text_, textlen);
815		920
816	pango_layout_set_text (self->pl, text, textlen);	921	pango_layout_set_text (self->pl, text, textlen);
817	}	922	}
818		923
819	void	924	void
820	set_markup (CFClient::Layout self, SV *text_)	925	set_markup (CFPlus::Layout self, SV *text_)
821	CODE:	926	CODE:
822	{	927	{
823	STRLEN textlen;	928	STRLEN textlen;
824	char *text = SvPVutf8 (text_, textlen);	929	char *text = SvPVutf8 (text_, textlen);
825		930
826	pango_layout_set_markup (self->pl, text, textlen);	931	pango_layout_set_markup (self->pl, text, textlen);
827	}	932	}
828		933
829	void	934	void
830	set_shapes (CFClient::Layout self, ...)	935	set_shapes (CFPlus::Layout self, ...)
831	CODE:	936	CODE:
832	{	937	{
833	PangoAttrList *attrs = 0;	938	PangoAttrList *attrs = 0;
834	const char *text = pango_layout_get_text (self->pl);	939	const char *text = pango_layout_get_text (self->pl);
835	const char *pos = text;	940	const char *pos = text;
…		…
870	if (attrs)	975	if (attrs)
871	pango_layout_set_attributes (self->pl, attrs);	976	pango_layout_set_attributes (self->pl, attrs);
872	}	977	}
873		978
874	void	979	void
875	get_shapes (CFClient::Layout self)	980	get_shapes (CFPlus::Layout self)
876	PPCODE:	981	PPCODE:
877	{	982	{
878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);	983	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
879		984
880	do	985	do
…		…
895		1000
896	pango_layout_iter_free (iter);	1001	pango_layout_iter_free (iter);
897	}	1002	}
898		1003
899	int	1004	int
900	has_wrapped (CFClient::Layout self)	1005	has_wrapped (CFPlus::Layout self)
901	CODE:	1006	CODE:
902	{	1007	{
903	int lines = 1;	1008	int lines = 1;
904	const char *text = pango_layout_get_text (self->pl);	1009	const char *text = pango_layout_get_text (self->pl);
905		1010
…		…
910	}	1015	}
911	OUTPUT:	1016	OUTPUT:
912	RETVAL	1017	RETVAL
913		1018
914	SV *	1019	SV *
915	get_text (CFClient::Layout self)	1020	get_text (CFPlus::Layout self)
916	CODE:	1021	CODE:
917	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1022	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
918	sv_utf8_decode (RETVAL);	1023	sv_utf8_decode (RETVAL);
919	OUTPUT:	1024	OUTPUT:
920	RETVAL	1025	RETVAL
921		1026
922	void	1027	void
923	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1028	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
924	CODE:	1029	CODE:
925	self->r = r;	1030	self->r = r;
926	self->g = g;	1031	self->g = g;
927	self->b = b;	1032	self->b = b;
928	self->a = a;	1033	self->a = a;
929		1034
930	void	1035	void
931	set_font (CFClient::Layout self, CFClient::Font font = 0)	1036	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
932	CODE:	1037	CODE:
933	if (self->font != font)	1038	if (self->font != font)
934	{	1039	{
935	self->font = font;	1040	self->font = font;
936	layout_update_font (self);	1041	layout_update_font (self);
937	}	1042	}
938		1043
939	void	1044	void
940	set_height (CFClient::Layout self, int base_height)	1045	set_height (CFPlus::Layout self, int base_height)
941	CODE:	1046	CODE:
942	if (self->base_height != base_height)	1047	if (self->base_height != base_height)
943	{	1048	{
944	self->base_height = base_height;	1049	self->base_height = base_height;
945	layout_update_font (self);	1050	layout_update_font (self);
946	}	1051	}
947		1052
948	void	1053	void
949	set_width (CFClient::Layout self, int max_width = -1)	1054	set_width (CFPlus::Layout self, int max_width = -1)
950	CODE:	1055	CODE:
951	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1056	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
952		1057
953	void	1058	void
954	set_indent (CFClient::Layout self, int indent)	1059	set_indent (CFPlus::Layout self, int indent)
955	CODE:	1060	CODE:
956	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1061	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
957		1062
958	void	1063	void
959	set_spacing (CFClient::Layout self, int spacing)	1064	set_spacing (CFPlus::Layout self, int spacing)
960	CODE:	1065	CODE:
961	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1066	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
962		1067
963	void	1068	void
964	set_ellipsise (CFClient::Layout self, int ellipsise)	1069	set_ellipsise (CFPlus::Layout self, int ellipsise)
965	CODE:	1070	CODE:
966	pango_layout_set_ellipsize (self->pl,	1071	pango_layout_set_ellipsize (self->pl,
967	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1072	ellipsise == 1 ? PANGO_ELLIPSIZE_START
968	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1073	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
969	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1074	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
970	: PANGO_ELLIPSIZE_NONE	1075	: PANGO_ELLIPSIZE_NONE
971	);	1076	);
972		1077
973	void	1078	void
974	set_single_paragraph_mode (CFClient::Layout self, int spm)	1079	set_single_paragraph_mode (CFPlus::Layout self, int spm)
975	CODE:	1080	CODE:
976	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1081	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
977		1082
978	void	1083	void
979	size (CFClient::Layout self)	1084	size (CFPlus::Layout self)
980	PPCODE:	1085	PPCODE:
981	{	1086	{
982	int w, h;	1087	int w, h;
983		1088
984	layout_get_pixel_size (self, &w, &h);	1089	layout_get_pixel_size (self, &w, &h);
…		…
987	PUSHs (sv_2mortal (newSViv (w)));	1092	PUSHs (sv_2mortal (newSViv (w)));
988	PUSHs (sv_2mortal (newSViv (h)));	1093	PUSHs (sv_2mortal (newSViv (h)));
989	}	1094	}
990		1095
991	int	1096	int
992	descent (CFClient::Layout self)	1097	descent (CFPlus::Layout self)
993	CODE:	1098	CODE:
994	{	1099	{
995	PangoRectangle rect;	1100	PangoRectangle rect;
996	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);	1101	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
997	pango_layout_line_get_pixel_extents (line, 0, &rect);	1102	pango_layout_line_get_pixel_extents (line, 0, &rect);
…		…
999	}	1104	}
1000	OUTPUT:	1105	OUTPUT:
1001	RETVAL	1106	RETVAL
1002		1107
1003	int	1108	int
1004	xy_to_index (CFClient::Layout self, int x, int y)	1109	xy_to_index (CFPlus::Layout self, int x, int y)
1005	CODE:	1110	CODE:
1006	{	1111	{
1007	int index, trailing;	1112	int index, trailing;
1008	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1113	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1009	RETVAL = index;	1114	RETVAL = index + trailing;
1010	}	1115	}
1011	OUTPUT:	1116	OUTPUT:
1012	RETVAL	1117	RETVAL
1013		1118
1014	void	1119	void
1015	cursor_pos (CFClient::Layout self, int index)	1120	cursor_pos (CFPlus::Layout self, int index)
1016	PPCODE:	1121	PPCODE:
1017	{	1122	{
1018	PangoRectangle strong_pos;	1123	PangoRectangle strong_pos;
1019	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1124	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
1020		1125
…		…
1023	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1128	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1024	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1129	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1025	}	1130	}
1026		1131
1027	void	1132	void
		1133	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1134	PPCODE:
		1135	{
		1136	int line, x;
		1137
		1138	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1139	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1140
		1141	EXTEND (SP, 2);
		1142	PUSHs (sv_2mortal (newSViv (line - 1)));
		1143	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1144	}
		1145
		1146	void
		1147	line_x_to_index (CFPlus::Layout self, int line, int x)
		1148	PPCODE:
		1149	{
		1150	PangoLayoutLine *lp;
		1151	int index, trailing;
		1152
		1153	if (line < 0)
		1154	XSRETURN_EMPTY;
		1155
		1156	if (!(lp = pango_layout_get_line (self->pl, line)))
		1157	XSRETURN_EMPTY; /* do better */
		1158
		1159	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1160
		1161	EXTEND (SP, 2);
		1162	if (GIMME_V == G_SCALAR)
		1163	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1164	else
		1165	{
		1166	PUSHs (sv_2mortal (newSViv (index)));
		1167	PUSHs (sv_2mortal (newSViv (trailing)));
		1168	}
		1169	}
		1170
		1171	void
1028	render (CFClient::Layout self, float x, float y)	1172	render (CFPlus::Layout self, float x, float y, int flags = 0)
1029	PPCODE:	1173	PPCODE:
1030	pango_opengl_render_layout_subpixel (	1174	pango_opengl_render_layout_subpixel (
1031	self->pl,	1175	self->pl,
1032	x * PANGO_SCALE, y * PANGO_SCALE,	1176	x * PANGO_SCALE, y * PANGO_SCALE,
1033	self->r, self->g, self->b, self->a	1177	self->r, self->g, self->b, self->a,
		1178	flags
1034	);	1179	);
1035		1180
1036	MODULE = CFClient PACKAGE = CFClient::Texture	1181	MODULE = CFPlus PACKAGE = CFPlus::Texture
1037		1182
1038	void	1183	void
1039	pad2pot (SV *data_, SV *w_, SV *h_)	1184	pad2pot (SV *data_, SV *w_, SV *h_)
1040	CODE:	1185	CODE:
1041	{	1186	{
…		…
1119	glDisable (GL_ALPHA_TEST);	1264	glDisable (GL_ALPHA_TEST);
1120	glDisable (GL_BLEND);	1265	glDisable (GL_BLEND);
1121	}	1266	}
1122	}	1267	}
1123		1268
1124	MODULE = CFClient PACKAGE = CFClient::Map	1269	MODULE = CFPlus PACKAGE = CFPlus::Map
1125		1270
1126	CFClient::Map	1271	CFPlus::Map
1127	new (SV *class, int map_width, int map_height)	1272	new (SV *class)
1128	CODE:	1273	CODE:
1129	New (0, RETVAL, 1, struct map);	1274	New (0, RETVAL, 1, struct map);
1130	RETVAL->x = 0;	1275	RETVAL->x = 0;
1131	RETVAL->y = 0;	1276	RETVAL->y = 0;
1132	RETVAL->w = map_width;	1277	RETVAL->w = 0;
1133	RETVAL->h = map_height;	1278	RETVAL->h = 0;
1134	RETVAL->ox = 0;	1279	RETVAL->ox = 0;
1135	RETVAL->oy = 0;	1280	RETVAL->oy = 0;
1136	RETVAL->faces = 8192;	1281	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1137	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1282	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1138	RETVAL->texs = 8192;
1139	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1140	RETVAL->rows = 0;	1283	RETVAL->rows = 0;
1141	RETVAL->row = 0;	1284	RETVAL->row = 0;
1142	OUTPUT:	1285	OUTPUT:
1143	RETVAL	1286	RETVAL
1144		1287
1145	void	1288	void
1146	DESTROY (CFClient::Map self)	1289	DESTROY (CFPlus::Map self)
1147	CODE:	1290	CODE:
1148	{	1291	{
1149	map_clear (self);	1292	map_clear (self);
1150	Safefree (self->face);	1293	Safefree (self->face2tile);
1151	Safefree (self->tex);	1294	Safefree (self->tex);
1152	Safefree (self);	1295	Safefree (self);
1153	}	1296	}
1154		1297
1155	void	1298	void
		1299	resize (CFPlus::Map self, int map_width, int map_height)
		1300	CODE:
		1301	self->w = map_width;
		1302	self->h = map_height;
		1303
		1304	void
1156	clear (CFClient::Map self)	1305	clear (CFPlus::Map self)
1157	CODE:	1306	CODE:
1158	map_clear (self);	1307	map_clear (self);
1159		1308
1160	void	1309	void
1161	set_face (CFClient::Map self, int face, int texid)	1310	set_tileid (CFPlus::Map self, int face, int tile)
1162	CODE:	1311	CODE:
1163	{	1312	{
1164	while (self->faces <= face)	1313	need_facenum (self, face); self->face2tile [face] = tile;
1165	{	1314	need_texid (self, tile);
1166	Append (mapface, self->face, self->faces, self->faces);
1167	self->faces *= 2;
1168	}
1169
1170	self->face [face] = texid;
1171	}	1315	}
1172		1316
1173	void	1317	void
		1318	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1319	CODE:
		1320	{
		1321	tileid texid;
		1322	maptex *tex;
		1323
		1324	if (face < 0 || face >= self->faces)
		1325	return;
		1326
		1327	if (smooth < 0 || smooth >= self->faces)
		1328	return;
		1329
		1330	texid = self->face2tile [face];
		1331
		1332	if (!texid)
		1333	return;
		1334
		1335	tex = self->tex + texid;
		1336	tex->smoothtile = self->face2tile [smooth];
		1337	tex->smoothlevel = level;
		1338	}
		1339
		1340	void
1174	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)	1341	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)
1175	CODE:	1342	CODE:
1176	{	1343	{
1177	while (self->texs <= texid)	1344	need_texid (self, texid);
1178	{
1179	Append (maptex, self->tex, self->texs, self->texs);
1180	self->texs *= 2;
1181	}
1182		1345
1183	{	1346	{
1184	maptex *tex = self->tex + texid;	1347	maptex *tex = self->tex + texid;
1185		1348
1186	tex->name = name;	1349	tex->name = name;
…		…
1203	// from transparent color bleeding and ugly wrapping effects.	1366	// from transparent color bleeding and ugly wrapping effects.
1204	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1367	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1205	}	1368	}
1206		1369
1207	int	1370	int
1208	ox (CFClient::Map self)	1371	ox (CFPlus::Map self)
1209	ALIAS:	1372	ALIAS:
1210	oy = 1	1373	oy = 1
1211	x = 2	1374	x = 2
1212	y = 3	1375	y = 3
1213	w = 4	1376	w = 4
…		…
1224	}	1387	}
1225	OUTPUT:	1388	OUTPUT:
1226	RETVAL	1389	RETVAL
1227		1390
1228	void	1391	void
1229	scroll (CFClient::Map self, int dx, int dy)	1392	scroll (CFPlus::Map self, int dx, int dy)
1230	CODE:	1393	CODE:
1231	{	1394	{
1232	if (dx > 0)	1395	if (dx > 0)
1233	map_blank (self, self->x, self->y, dx - 1, self->h);	1396	map_blank (self, self->x, self->y, dx, self->h);
1234	else if (dx < 0)	1397	else if (dx < 0)
1235	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1398	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1236		1399
1237	if (dy > 0)	1400	if (dy > 0)
1238	map_blank (self, self->x, self->y, self->w, dy - 1);	1401	map_blank (self, self->x, self->y, self->w, dy);
1239	else if (dy < 0)	1402	else if (dy < 0)
1240	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1403	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1241		1404
1242	self->ox += dx; self->x += dx;	1405	self->ox += dx; self->x += dx;
1243	self->oy += dy; self->y += dy;	1406	self->oy += dy; self->y += dy;
1244		1407
1245	while (self->y < 0)	1408	while (self->y < 0)
…		…
1250	self->y += MAP_EXTEND_Y;	1413	self->y += MAP_EXTEND_Y;
1251	}	1414	}
1252	}	1415	}
1253		1416
1254	void	1417	void
1255	map1a_update (CFClient::Map self, SV *data_)	1418	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1256	CODE:	1419	CODE:
1257	{	1420	{
1258	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1421	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1259	uint8_t *data_end = (uint8_t *)SvEND (data_);	1422	uint8_t *data_end = (uint8_t *)SvEND (data_);
1260	mapcell *cell;	1423	mapcell *cell;
1261	int x, y, flags;	1424	int x, y, flags;
1262		1425
1263	while (data < data_end)	1426	while (data < data_end - 1)
1264	{	1427	{
1265	flags = (data [0] << 8) + data [1]; data += 2;	1428	flags = (data [0] << 8) + data [1]; data += 2;
1266		1429
1267	x = self->x + ((flags >> 10) & 63);	1430	x = self->x + ((flags >> 10) & 63);
1268	y = self->y + ((flags >> 4) & 63);	1431	y = self->y + ((flags >> 4) & 63);
1269		1432
1270	cell = map_get_cell (self, x, y);	1433	cell = map_get_cell (self, x, y);
1271		1434
1272	if (flags & 15)	1435	if (flags & 15)
1273	{	1436	{
1274	if (cell->darkness < 0)	1437	if (!cell->darkness)
1275	{	1438	{
		1439	memset (cell, 0, sizeof (*cell));
1276	cell->darkness = 0;	1440	cell->darkness = 256;
1277	cell->face [0] = 0;
1278	cell->face [1] = 0;
1279	cell->face [2] = 0;
1280	}	1441	}
1281		1442
1282	cell->darkness = flags & 8 ? *data++ : 255;
1283
1284	//TODO: don't trust server data to be in-range(!)	1443	//TODO: don't trust server data to be in-range(!)
		1444
		1445	if (flags & 8)
		1446	{
		1447	if (extmap)
		1448	{
		1449	uint8_t ext, cmd;
		1450
		1451	do
		1452	{
		1453	ext = *data++;
		1454	cmd = ext & 0x3f;
		1455
		1456	if (cmd < 4)
		1457	cell->darkness = 255 - ext * 64 + 1;
		1458	else if (cmd == 5) // health
		1459	{
		1460	cell->stat_width = 1;
		1461	cell->stat_hp = *data++;
		1462	}
		1463	else if (cmd == 6) // monster width
		1464	cell->stat_width = *data++ + 1;
		1465	else if (cmd == 0x47)
		1466	{
		1467	if (*data == 8)
		1468	; // decode player uuid
		1469
		1470	data += *data + 1;
		1471	}
		1472	else if (cmd == 8) // cell flags
		1473	cell->flags = *data++;
		1474	else if (ext & 0x40) // unknown, multibyte => skip
		1475	data += *data + 1;
		1476	else
		1477	data++;
		1478	}
		1479	while (ext & 0x80);
		1480	}
		1481	else
		1482	cell->darkness = *data++ + 1;
		1483	}
1285		1484
1286	if (flags & 4)	1485	if (flags & 4)
1287	{	1486	{
1288	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1487	faceid face = (data [0] << 8) + data [1]; data += 2;
		1488	need_facenum (self, face);
		1489	cell->tile [0] = self->face2tile [face];
1289	}	1490	}
1290		1491
1291	if (flags & 2)	1492	if (flags & 2)
1292	{	1493	{
1293	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1494	faceid face = (data [0] << 8) + data [1]; data += 2;
		1495	need_facenum (self, face);
		1496	cell->tile [1] = self->face2tile [face];
1294	}	1497	}
1295		1498
1296	if (flags & 1)	1499	if (flags & 1)
1297	{	1500	{
1298	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1501	faceid face = (data [0] << 8) + data [1]; data += 2;
		1502	need_facenum (self, face);
		1503	cell->tile [2] = self->face2tile [face];
1299	}	1504	}
1300	}	1505	}
1301	else	1506	else
1302	cell->darkness = -1;	1507	cell->darkness = 0;
1303	}	1508	}
1304	}	1509	}
1305		1510
1306	SV *	1511	SV *
1307	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1512	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1308	CODE:	1513	CODE:
1309	{	1514	{
1310	int x1, x;	1515	int x1, x;
1311	int y1, y;	1516	int y1, y;
1312	int z;	1517	int z;
…		…
1333	{	1538	{
1334	mapcell *cell = row->col + (x - row->c0);	1539	mapcell *cell = row->col + (x - row->c0);
1335		1540
1336	for (z = 0; z <= 0; z++)	1541	for (z = 0; z <= 0; z++)
1337	{	1542	{
1338	mapface face = cell->face [z];
1339
1340	if (face)
1341	{
1342	maptex tex = self->tex [face];	1543	maptex tex = self->tex [cell->tile [z]];
1343	int a0 = 255 - tex.a;	1544	int a0 = 255 - tex.a;
1344	int a1 = tex.a;	1545	int a1 = tex.a;
1345		1546
1346	r = (r * a0 + tex.r * a1) / 255;	1547	r = (r * a0 + tex.r * a1) / 255;
1347	g = (g * a0 + tex.g * a1) / 255;	1548	g = (g * a0 + tex.g * a1) / 255;
1348	b = (b * a0 + tex.b * a1) / 255;	1549	b = (b * a0 + tex.b * a1) / 255;
1349	a = (a * a0 + tex.a * a1) / 255;	1550	a = (a * a0 + tex.a * a1) / 255;
1350	}
1351	}	1551	}
1352	}	1552	}
1353		1553
1354	*map++ = (r )	1554	*map++ = (r )
1355	| (g << 8)	1555	| (g << 8)
…		…
1362	}	1562	}
1363	OUTPUT:	1563	OUTPUT:
1364	RETVAL	1564	RETVAL
1365		1565
1366	void	1566	void
1367	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1567	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1368	CODE:	1568	CODE:
1369	{	1569	{
1370	int vx, vy;	1570	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1571	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1572	uint8_t smooth_max[256][256];
		1573	smooth_key skey;
1371	int x, y, z;	1574	int x, y, z;
1372	int last_name;	1575	int last_name;
1373	mapface face;
1374		1576
1375	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1577	// thats current max. sorry.
1376	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1578	if (sw > 255) sw = 255;
		1579	if (sh > 255) sh = 255;
1377		1580
1378	/*	1581	// clear key, in case of extra padding
1379	int vx = self->vx = self->w >= sw	1582	memset (&skey, 0, sizeof (skey));
1380	? self->x + (self->w - sw) / 2
1381	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1382
1383	int vy = self->vy = self->h >= sh
1384	? self->y + (self->h - sh) / 2
1385	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1386	*/
1387		1583
1388	glColor4ub (255, 255, 255, 255);	1584	glColor4ub (255, 255, 255, 255);
1389		1585
1390	glEnable (GL_BLEND);	1586	glEnable (GL_BLEND);
1391	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1587	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1394		1590
1395	glBegin (GL_QUADS);	1591	glBegin (GL_QUADS);
1396		1592
1397	last_name = 0;	1593	last_name = 0;
1398		1594
		1595	mx += self->x;
		1596	my += self->y;
		1597
		1598	// first pass: determine smooth_max
		1599	// rather ugly, if you ask me
		1600	// could also be stored inside mapcell and updated on change
		1601	memset (smooth_max, 0, sizeof (smooth_max));
		1602
		1603	for (y = 0; y < sh; y++)
		1604	if (0 <= y + my && y + my < self->rows)
		1605	{
		1606	maprow *row = self->row + (y + my);
		1607
		1608	for (x = 0; x < sw; x++)
		1609	if (row->c0 <= x + mx && x + mx < row->c1)
		1610	{
		1611	mapcell *cell = row->col + (x + mx - row->c0);
		1612
		1613	for (z = 0; z <= 2; z++)
		1614	{
		1615	uint8_t level = self->tex [cell->tile [z]].smoothlevel;
		1616	if (level > smooth_max [x + 1][y + 1])
		1617	smooth_max [x + 1][y + 1] = level;
		1618	}
		1619	}
		1620	}
		1621
1399	for (z = 0; z < 3; z++)	1622	for (z = 0; z <= 2; z++)
		1623	{
		1624	memset (smooth_level, 0, sizeof (smooth_level));
		1625
1400	for (y = 0; y < sh; y++)	1626	for (y = 0; y < sh; y++)
1401	if (0 <= y + vy && y + vy < self->rows)	1627	if (0 <= y + my && y + my < self->rows)
1402	{	1628	{
1403	maprow *row = self->row + (y + vy);	1629	maprow *row = self->row + (y + my);
1404		1630
1405	for (x = 0; x < sw; x++)	1631	for (x = 0; x < sw; x++)
1406	if (row->c0 <= x + vx && x + vx < row->c1)	1632	if (row->c0 <= x + mx && x + mx < row->c1)
1407	{	1633	{
1408	mapcell *cell = row->col + (x + vx - row->c0);	1634	mapcell *cell = row->col + (x + mx - row->c0);
1409
1410	face = cell->face [z];	1635	tileid tile = cell->tile [z];
1411		1636
1412	if (face)	1637	if (tile)
		1638	{
		1639	maptex tex = self->tex [tile];
		1640	int px = (x + 1) * T - tex.w;
		1641	int py = (y + 1) * T - tex.h;
		1642
		1643	// suppressing texture state switches here
		1644	// is only moderately effective, but worth the extra effort
		1645	if (last_name != tex.name)
		1646	{
		1647	if (!tex.name)
		1648	tex = self->tex [2]; /* missing, replace by noface */
		1649
		1650	glEnd ();
		1651	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1652	glBegin (GL_QUADS);
		1653	}
		1654
		1655	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1656	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1657	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1658	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1659
		1660	if (cell->flags && z == 2)
		1661	{
		1662	if (cell->flags & 1)
		1663	{
		1664	maptex tex = self->tex [1];
		1665	int px = x * T + T * 2 / 32;
		1666	int py = y * T - T * 6 / 32;
		1667
		1668	glEnd ();
		1669	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1670	glBegin (GL_QUADS);
		1671
		1672	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1673	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1674	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1675	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1676	}
		1677	}
		1678
		1679	// update smooth hash
		1680	if (tex.smoothtile)
		1681	{
		1682	skey.tile = tex.smoothtile;
		1683	skey.level = tex.smoothlevel;
		1684
		1685	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1686
		1687	// add bits to current tile and all neighbours. skey.x|y is
		1688	// shifted +1|+1 so we always stay positive.
		1689
		1690	// full tile
		1691	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1692
		1693	// borders
		1694	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0031);
		1695	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0092);
		1696	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1697	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1698
		1699	// corners
		1700	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1701	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1702	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1703	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1704	}
		1705	}
		1706	}
		1707	}
		1708
		1709	// go through all smoothlevels, lowest to highest, then draw
		1710	// this is basically counting sort
		1711	{
		1712	int w, b;
		1713
		1714	for (w = 0; w < 256 / 32; ++w)
		1715	{
		1716	uint32_t smask = smooth_level [w];
		1717	if (smask)
		1718	for (b = 0; b < 32; ++b)
		1719	if (smask & (((uint32_t)1) << b))
1413	{	1720	{
1414	maptex tex = self->tex [face];	1721	int level = (w << 5) | b;
		1722	HE *he;
1415		1723
1416	int px = (x + 1) * 32 - tex.w;	1724	hv_iterinit (smooth);
1417	int py = (y + 1) * 32 - tex.h;	1725	while ((he = hv_iternext (smooth)))
1418
1419	if (last_name != tex.name)
1420	{	1726	{
		1727	smooth_key *skey = (smooth_key *)HeKEY (he);
		1728	IV bits = SvIVX (HeVAL (he));
		1729
		1730	// bits is ___n cccc CCCC bbbb
		1731	// n do not draw borders&corners
		1732	// c draw these corners, but...
		1733	// C ... not these
		1734	// b draw these borders
		1735
		1736	if (!(bits & 0x1000)
		1737	&& skey->level == level
		1738	&& level >= smooth_max [skey->x][skey->y])
		1739	{
		1740	maptex tex = self->tex [skey->tile];
		1741	int px = (((int)skey->x) - 1) * T;
		1742	int py = (((int)skey->y) - 1) * T;
		1743	int border = bits & 15;
		1744	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1745	float dx = tex.s * .0625f; // 16 images/row
		1746	float dy = tex.t * .5f ; // 2 images/column
		1747
		1748	// this time naively avoiding texture state changes
		1749	// save gobs of state changes.
		1750	if (last_name != tex.name)
		1751	{
		1752	if (!tex.name)
		1753	continue; // smoothing not yet available
		1754
1421	glEnd ();	1755	glEnd ();
1422	last_name = tex.name;
1423	glBindTexture (GL_TEXTURE_2D, last_name);	1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1424	glBegin (GL_QUADS);	1757	glBegin (GL_QUADS);
		1758	}
		1759
		1760	if (border)
		1761	{
		1762	float ox = border * dx;
		1763
		1764	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1765	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1766	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1767	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1768	}
		1769
		1770	if (corner)
		1771	{
		1772	float ox = corner * dx;
		1773
		1774	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1775	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1776	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1777	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1778	}
		1779	}
1425	}	1780	}
1426
1427	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1428	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1429	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1430	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1431	}	1781	}
1432	}
1433	}	1782	}
		1783	}
		1784
		1785	hv_clear (smooth);
		1786	}
1434		1787
1435	glEnd ();	1788	glEnd ();
1436		1789
1437	glDisable (GL_TEXTURE_2D);	1790	glDisable (GL_TEXTURE_2D);
1438	glDisable (GL_BLEND);	1791	glDisable (GL_BLEND);
1439	}
1440		1792
		1793	// top layer: overlays such as the health bar
		1794	for (y = 0; y < sh; y++)
		1795	if (0 <= y + my && y + my < self->rows)
		1796	{
		1797	maprow *row = self->row + (y + my);
		1798
		1799	for (x = 0; x < sw; x++)
		1800	if (row->c0 <= x + mx && x + mx < row->c1)
		1801	{
		1802	mapcell *cell = row->col + (x + mx - row->c0);
		1803
		1804	int px = x * T;
		1805	int py = y * T;
		1806
		1807	if (cell->stat_hp)
		1808	{
		1809	int width = cell->stat_width * T;
		1810	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1811
		1812	glColor3ub (0, 0, 0);
		1813	glRectf (px + 1, py - thick - 2,
		1814	px + width - 1, py);
		1815
		1816	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1817	glRectf (px + 2,
		1818	py - thick - 1,
		1819	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1820	}
		1821	}
		1822	}
		1823	}
		1824
1441	void	1825	void
1442	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)	1826	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1443	CODE:	1827	CODE:
1444	{	1828	{
1445	static float color[16][3] = {	1829	static float color[16][3] = {
1446	{ 0.00F, 0.00F, 0.00F },	1830	{ 0.00F, 0.00F, 0.00F },
1447	{ 1.00F, 1.00F, 1.00F },	1831	{ 1.00F, 1.00F, 1.00F },
…		…
1497	glDisable (GL_BLEND);	1881	glDisable (GL_BLEND);
1498	glDisable (GL_TEXTURE_2D);	1882	glDisable (GL_TEXTURE_2D);
1499	}	1883	}
1500		1884
1501	void	1885	void
1502	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1886	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1503	PPCODE:	1887	PPCODE:
1504	{	1888	{
1505	int vx, vy;
1506	int x, y;	1889	int x, y;
1507	int sw4 = (sw + 3) & ~3;	1890	int sw4 = (sw + 3) & ~3;
1508	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1891	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1509	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1892	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1510		1893
1511	memset (darkness, 255, sw4 * sh);	1894	memset (darkness, 255, sw4 * sh);
1512	SvPOK_only (darkness_sv);	1895	SvPOK_only (darkness_sv);
1513	SvCUR_set (darkness_sv, sw4 * sh);	1896	SvCUR_set (darkness_sv, sw4 * sh);
1514		1897
1515	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1898	mx += self->x;
1516	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1899	my += self->y;
1517		1900
1518	for (y = 0; y < sh; y++)	1901	for (y = 0; y < sh; y++)
1519	if (0 <= y + vy && y + vy < self->rows)	1902	if (0 <= y + my && y + my < self->rows)
1520	{	1903	{
1521	maprow *row = self->row + (y + vy);	1904	maprow *row = self->row + (y + my);
1522		1905
1523	for (x = 0; x < sw; x++)	1906	for (x = 0; x < sw; x++)
1524	if (row->c0 <= x + vx && x + vx < row->c1)	1907	if (row->c0 <= x + mx && x + mx < row->c1)
1525	{	1908	{
1526	mapcell *cell = row->col + (x + vx - row->c0);	1909	mapcell *cell = row->col + (x + mx - row->c0);
1527		1910
1528	darkness[y * sw4 + x] = cell->darkness < 0	1911	darkness[y * sw4 + x] = cell->darkness
		1912	? 255 - (cell->darkness - 1)
1529	? 255 - FOW_DARKNESS	1913	: 255 - FOW_DARKNESS;
1530	: 255 - cell->darkness;
1531	}	1914	}
1532	}	1915	}
1533		1916
1534	EXTEND (SP, 3);	1917	EXTEND (SP, 3);
1535	PUSHs (sv_2mortal (newSViv (sw4)));	1918	PUSHs (sv_2mortal (newSViv (sw4)));
1536	PUSHs (sv_2mortal (newSViv (sh)));	1919	PUSHs (sv_2mortal (newSViv (sh)));
1537	PUSHs (darkness_sv);	1920	PUSHs (darkness_sv);
1538	}	1921	}
1539		1922
1540	SV *	1923	SV *
1541	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1924	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1542	CODE:	1925	CODE:
1543	{	1926	{
1544	int x, y, x1, y1;	1927	int x, y, x1, y1;
1545	SV *data_sv = newSV (w * h * 7 + 5);	1928	SV *data_sv = newSV (w * h * 7 + 5);
1546	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1929	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1571	if (row && row->c0 <= x && x < row->c1)	1954	if (row && row->c0 <= x && x < row->c1)
1572	{	1955	{
1573	mapcell *cell = row->col + (x - row->c0);	1956	mapcell *cell = row->col + (x - row->c0);
1574	uint8_t flags = 0;	1957	uint8_t flags = 0;
1575		1958
1576	if (cell->face [0]) flags |= 1;	1959	if (cell->tile [0]) flags |= 1;
1577	if (cell->face [1]) flags |= 2;	1960	if (cell->tile [1]) flags |= 2;
1578	if (cell->face [2]) flags |= 4;	1961	if (cell->tile [2]) flags |= 4;
1579		1962
1580	*data++ = flags;	1963	*data++ = flags;
1581		1964
1582	if (flags & 1)	1965	if (flags & 1)
1583	{	1966	{
		1967	tileid tile = cell->tile [0];
1584	*data++ = cell->face [0] >> 8;	1968	*data++ = tile >> 8;
1585	*data++ = cell->face [0];	1969	*data++ = tile;
1586	}	1970	}
1587		1971
1588	if (flags & 2)	1972	if (flags & 2)
1589	{	1973	{
		1974	tileid tile = cell->tile [1];
1590	*data++ = cell->face [1] >> 8;	1975	*data++ = tile >> 8;
1591	*data++ = cell->face [1];	1976	*data++ = tile;
1592	}	1977	}
1593		1978
1594	if (flags & 4)	1979	if (flags & 4)
1595	{	1980	{
		1981	tileid tile = cell->tile [2];
1596	*data++ = cell->face [2] >> 8;	1982	*data++ = tile >> 8;
1597	*data++ = cell->face [2];	1983	*data++ = tile;
1598	}	1984	}
1599	}	1985	}
1600	else	1986	else
1601	*data++ = 0;	1987	*data++ = 0;
1602	}	1988	}
…		…
1608	}	1994	}
1609	OUTPUT:	1995	OUTPUT:
1610	RETVAL	1996	RETVAL
1611		1997
1612	void	1998	void
1613	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1999	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1614	PPCODE:	2000	PPCODE:
1615	{	2001	{
1616	int x, y, z;	2002	int x, y, z;
1617	int w, h;	2003	int w, h;
1618	int x1, y1;	2004	int x1, y1;
…		…
1642	{	2028	{
1643	uint8_t flags = *data++;	2029	uint8_t flags = *data++;
1644		2030
1645	if (flags)	2031	if (flags)
1646	{	2032	{
1647	mapface face[3] = { 0, 0, 0 };
1648
1649	mapcell *cell = row_get_cell (row, x);	2033	mapcell *cell = row_get_cell (row, x);
		2034	tileid tile[3] = { 0, 0, 0 };
1650		2035
1651	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2036	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1652	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2037	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1653	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2038	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1654		2039
1655	if (cell->darkness <= 0)	2040	if (cell->darkness == 0)
1656	{	2041	{
1657	cell->darkness = -1;	2042	cell->darkness = 0;
1658		2043
1659	for (z = 0; z <= 2; z++)	2044	for (z = 0; z <= 2; z++)
1660	{	2045	{
1661	cell->face[z] = face[z];	2046	tileid t = tile [z];
1662		2047
1663	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2048	if (t >= self->texs || (t && !self->tex [t].name))
		2049	{
1664	XPUSHs (sv_2mortal (newSViv (face[z])));	2050	XPUSHs (sv_2mortal (newSViv (t)));
		2051	need_texid (self, t);
		2052	}
		2053
		2054	cell->tile [z] = t;
1665	}	2055	}
1666	}	2056	}
1667	}	2057	}
1668	}	2058	}
1669	}	2059	}
1670	}	2060	}
1671		2061
1672	MODULE = CFClient PACKAGE = CFClient::MixChunk	2062	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1673		2063
1674	CFClient::MixChunk	2064	CFPlus::MixChunk
1675	new_from_file (SV *class, char *path)	2065	new_from_file (SV *class, char *path)
1676	CODE:	2066	CODE:
1677	RETVAL = Mix_LoadWAV (path);	2067	RETVAL = Mix_LoadWAV (path);
1678	OUTPUT:	2068	OUTPUT:
1679	RETVAL	2069	RETVAL
1680		2070
1681	void	2071	void
1682	DESTROY (CFClient::MixChunk self)	2072	DESTROY (CFPlus::MixChunk self)
1683	CODE:	2073	CODE:
1684	Mix_FreeChunk (self);	2074	Mix_FreeChunk (self);
1685		2075
1686	int	2076	int
1687	volume (CFClient::MixChunk self, int volume = -1)	2077	volume (CFPlus::MixChunk self, int volume = -1)
1688	CODE:	2078	CODE:
1689	RETVAL = Mix_VolumeChunk (self, volume);	2079	RETVAL = Mix_VolumeChunk (self, volume);
1690	OUTPUT:	2080	OUTPUT:
1691	RETVAL	2081	RETVAL
1692		2082
1693	int	2083	int
1694	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2084	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1695	CODE:	2085	CODE:
1696	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2086	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1697	OUTPUT:	2087	OUTPUT:
1698	RETVAL	2088	RETVAL
1699		2089
1700	MODULE = CFClient PACKAGE = CFClient::MixMusic	2090	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1701		2091
1702	int	2092	int
1703	volume (int volume = -1)	2093	volume (int volume = -1)
1704	CODE:	2094	CODE:
1705	RETVAL = Mix_VolumeMusic (volume);	2095	RETVAL = Mix_VolumeMusic (volume);
1706	OUTPUT:	2096	OUTPUT:
1707	RETVAL	2097	RETVAL
1708		2098
1709	CFClient::MixMusic	2099	CFPlus::MixMusic
1710	new_from_file (SV *class, char *path)	2100	new_from_file (SV *class, char *path)
1711	CODE:	2101	CODE:
1712	RETVAL = Mix_LoadMUS (path);	2102	RETVAL = Mix_LoadMUS (path);
1713	OUTPUT:	2103	OUTPUT:
1714	RETVAL	2104	RETVAL
1715		2105
1716	void	2106	void
1717	DESTROY (CFClient::MixMusic self)	2107	DESTROY (CFPlus::MixMusic self)
1718	CODE:	2108	CODE:
1719	Mix_FreeMusic (self);	2109	Mix_FreeMusic (self);
1720		2110
1721	int	2111	int
1722	play (CFClient::MixMusic self, int loops = -1)	2112	play (CFPlus::MixMusic self, int loops = -1)
1723	CODE:	2113	CODE:
1724	RETVAL = Mix_PlayMusic (self, loops);	2114	RETVAL = Mix_PlayMusic (self, loops);
1725	OUTPUT:	2115	OUTPUT:
1726	RETVAL	2116	RETVAL
1727		2117
1728	MODULE = CFClient PACKAGE = CFClient::OpenGL	2118	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1729		2119
1730	BOOT:	2120	BOOT:
1731	{	2121	{
1732	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2122	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1733	static const struct {	2123	static const struct {
1734	const char *name;	2124	const char *name;
1735	IV iv;	2125	IV iv;
1736	} *civ, const_iv[] = {	2126	} *civ, const_iv[] = {
1737	# define const_iv(name) { # name, (IV)name }	2127	# define const_iv(name) { # name, (IV)name }
…		…
1800	const_iv (GL_SEPARABLE_2D),	2190	const_iv (GL_SEPARABLE_2D),
1801	const_iv (GL_CONVOLUTION_2D),	2191	const_iv (GL_CONVOLUTION_2D),
1802	const_iv (GL_CONVOLUTION_BORDER_MODE),	2192	const_iv (GL_CONVOLUTION_BORDER_MODE),
1803	const_iv (GL_CONSTANT_BORDER),	2193	const_iv (GL_CONSTANT_BORDER),
1804	const_iv (GL_LINES),	2194	const_iv (GL_LINES),
		2195	const_iv (GL_LINE_STRIP),
1805	const_iv (GL_LINE_LOOP),	2196	const_iv (GL_LINE_LOOP),
1806	const_iv (GL_QUADS),	2197	const_iv (GL_QUADS),
1807	const_iv (GL_QUAD_STRIP),	2198	const_iv (GL_QUAD_STRIP),
1808	const_iv (GL_TRIANGLES),	2199	const_iv (GL_TRIANGLES),
1809	const_iv (GL_TRIANGLE_STRIP),	2200	const_iv (GL_TRIANGLE_STRIP),
…		…
2006		2397
2007	void glEndList ()	2398	void glEndList ()
2008		2399
2009	void glCallList (int list)	2400	void glCallList (int list)
2010		2401
2011

Diff Legend

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