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.91 by root, Mon May 22 03:28:54 2006 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	2	# define WIN32_LEAN_AND_MEAN
		3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
6	#endif	14	#endif
7		15
8	#include "EXTERN.h"	16	#include "EXTERN.h"
9	#include "perl.h"	17	#include "perl.h"
10	#include "XSUB.h"	18	#include "XSUB.h"
11		19
		20	#ifdef _WIN32
		21	# undef pipe
		22	#endif
		23
		24	#include <assert.h>
12	#include <math.h>	25	#include <math.h>
13	#include <string.h>	26	#include <string.h>
14	#include <stdio.h>	27	#include <stdio.h>
		28	#include <stdlib.h>
15		29
16	#include <SDL.h>	30	#include <SDL.h>
17	#include <SDL_endian.h>	31	#include <SDL_endian.h>
18	#include <SDL_image.h>	32	#include <SDL_image.h>
19	#include <SDL_mixer.h>	33	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	34	#include <SDL_opengl.h>
21		35
		36	#define PANGO_ENABLE_BACKEND
		37	#define G_DISABLE_CAST_CHECKS
		38
22	#include <glib/gmacros.h>	39	#include <glib/gmacros.h>
23		40
24	#include <pango/pango.h>	41	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		42
29	#ifndef _WIN32	43	#ifndef _WIN32
30	# include <sys/types.h>	44	# include <sys/types.h>
31	# include <sys/socket.h>	45	# include <sys/socket.h>
32	# include <netinet/in.h>	46	# include <netinet/in.h>
33	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
34	# include <inttypes.h>	48	# include <inttypes.h>
35	#else
36	typedef unsigned char uint8_t;
37	typedef unsigned short uint16_t;
38	typedef unsigned int uint32_t;
39	typedef signed char int8_t;
40	typedef signed short int16_t;
41	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
52		59
53	#define GL_CALL(type,func,args) \	60	#if 0
54	{ \	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	62	#else
56	static type fptr_; \	63	# define PARACHUTE 0
57	\	64	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		65
		66	static AV *texture_av;
		67
		68	static struct
		69	{
		70	#define GL_FUNC(ptr,name) ptr name;
		71	#include "glfunc.h"
		72	#undef GL_FUNC
		73	} gl;
		74
		75	static void
		76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		77	{
		78	if (gl.BlendFuncSeparate)
		79	gl.BlendFuncSeparate (sa, da, saa, daa);
		80	else if (gl.BlendFuncSeparateEXT)
		81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		82	else
		83	glBlendFunc (sa, da);
		84	}
		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/*glBindTexture (GL_TEXTURE_2D, name);*/
		105	/*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
		110	#include "texcache.c"
		111
		112	#include "pango-font.c"
		113	#include "pango-fontmap.c"
		114	#include "pango-render.c"
		115
68	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
70		118
71	typedef PangoFontDescription *CFClient__Font;	119	typedef PangoFontDescription *CFPlus__Font;
		120
		121	static int
		122	shape_attr_p (PangoLayoutRun *run)
		123	{
		124	GSList *attrs = run->item->analysis.extra_attrs;
		125
		126	while (attrs)
		127	{
		128	PangoAttribute *attr = attrs->data;
		129
		130	if (attr->klass->type == PANGO_ATTR_SHAPE)
		131	return 1;
		132
		133	attrs = attrs->next;
		134	}
		135
		136	return 0;
		137	}
72		138
73	typedef struct cf_layout {	139	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	140	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
77	int base_height;	142	int base_height;
78	CFClient__Font font;	143	CFPlus__Font font;
79	} *CFClient__Layout;	144	} *CFPlus__Layout;
80		145
81	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
82	static PangoContext *ft2_context, *cairo_context;	147	static PangoContext *opengl_context;
83	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	148	static PangoFontMap *opengl_fontmap;
84		149
85	static void	150	static void
86	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
87	{	152	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	153	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	154	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	155	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	156	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	158	}
95		159
96	static void	160	static void
97	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
98	{	162	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	163	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
101	*/	165	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		170
107	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
108	}	172	}
109		173
110	static void	174	static void
111	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	175	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
112	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
114		181
115	if (!*w) *w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!*h) *h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		184
118	*w = (*w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
119	}	186	if (!rect.height) rect.height = 1;
120		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
121	typedef uint16_t mapface;	193	typedef uint16_t faceid;
122		194
123	typedef struct {	195	typedef struct {
124	GLint name;	196	int name;
125	int w, h;	197	int w, h;
126	float s, t;	198	float s, t;
127	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
128	} maptex;	202	} maptex;
129		203
130	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
131	int16_t darkness;	207	uint16_t darkness;
132	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
133	} mapcell;	209	} mapcell;
134		210
135	typedef struct {	211	typedef struct {
136	int32_t c0, c1;	212	int32_t c0, c1;
137	mapcell *col;	213	mapcell *col;
138	} maprow;	214	} maprow;
139		215
140	typedef struct map {	216	typedef struct map {
141	int x, y, w, h;	217	int x, y, w, h;
142	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
143	int faces;	219	int faces; tileid *face2tile; // [faceid]
144	mapface *face;	220	int texs; maptex *tex; // [tileid]
145
146	int texs;
147	maptex *tex;
148		221
149	int32_t rows;	222	int32_t rows;
150	maprow *row;	223	maprow *row;
151	} *CFClient__Map;	224	} *CFPlus__Map;
152		225
153	static char *	226	static char *
154	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
155	{	228	{
156	char *p;	229	char *p;
…		…
173	}	246	}
174		247
175	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
		270
178	static maprow *	271	static maprow *
179	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
180	{	273	{
181	if (0 > y)	274	if (0 > y)
182	{	275	{
183	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
222		315
223	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
224	}	317	}
225		318
226	static mapcell *	319	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
228	{	321	{
229	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
230	}	323	}
231		324
232	static void	325	static void
233	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
234	{	327	{
235	int r;	328	int r;
236		329
237	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
246	self->row = 0;	339	self->row = 0;
247	self->rows = 0;	340	self->rows = 0;
248	}	341	}
249		342
250	static void	343	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	344	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	345	{
253	int x, y;	346	int x, y;
254	maprow *row;	347	maprow *row;
		348	mapcell *cell;
255		349
256	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	351	if (y >= 0)
258	{	352	{
259	if (y >= self->rows)	353	if (y >= self->rows)
…		…
265	if (x >= row->c0)	359	if (x >= row->c0)
266	{	360	{
267	if (x >= row->c1)	361	if (x >= row->c1)
268	break;	362	break;
269		363
270	row->col[x - row->c0].darkness = -1;	364	cell = row->col + x - row->c0;
		365
		366	cell->darkness = 0;
		367	cell->stat_hp = 0;
		368	cell->flags = 0;
		369	cell->player = 0;
271	}	370	}
272	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		381	{
		382	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (*sv, SvIVX (*sv) | bits);
		386	else
		387	sv_setiv (*sv, bits);
273	}	388	}
274		389
275	static void	390	static void
276	music_finished (void)	391	music_finished (void)
277	{	392	{
…		…
296	ev.data2 = 0;	411	ev.data2 = 0;
297		412
298	SDL_PushEvent ((SDL_Event *)&ev);	413	SDL_PushEvent ((SDL_Event *)&ev);
299	}	414	}
300		415
		416	static unsigned int
		417	minpot (unsigned int n)
		418	{
		419	if (!n)
		420	return 0;
		421
		422	--n;
		423
		424	n |= n >> 1;
		425	n |= n >> 2;
		426	n |= n >> 4;
		427	n |= n >> 8;
		428	n |= n >> 16;
		429
		430	return n + 1;
		431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
		436
301	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
302		438
303	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
304		440
305	BOOT:	441	BOOT:
306	{	442	{
307	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	444	static const struct {
309	const char *name;	445	const char *name;
310	IV iv;	446	IV iv;
311	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
313	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
314	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
315	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
316	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
317	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
326	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
327	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
328	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
329	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
330	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
331	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
332	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
333	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
334	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
335	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
390	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
391	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
392	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
393	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
394	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
395	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
396	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
397	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
398	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
399	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
400	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
401	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
402	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
403	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
404	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
405	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
406	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
407	const_iv (KMOD_CTRL),
408	const_iv (KMOD_SHIFT),
409	const_iv (KMOD_ALT),
410	const_iv (KMOD_META)
411	# undef const_iv	556	# undef const_iv
412	};	557	};
413		558
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
416	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
		572	int
		573	in_destruct ()
		574	CODE:
		575	RETVAL = PL_main_cv == Nullcv;
		576	OUTPUT:
		577	RETVAL
		578
		579	NV floor (NV x)
		580
		581	NV ceil (NV x)
417		582
418	void	583	void
419	pango_init ()	584	pango_init ()
420	CODE:	585	CODE:
421	{	586	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	590	}
430		591
431	int	592	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	593	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		594
434	void	595	void
435	SDL_Quit ()	596	SDL_Quit ()
436		597
437	void	598	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	605	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	606	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	607	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		608
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	609	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	610	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		611
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	612	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		616
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	617	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		618	#if SDL_VERSION_ATLEAST(1,2,10)
		619	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		620	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		621	#endif
457		622
458	SDL_EnableUNICODE (1);	623	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	624	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		625
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	644	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	645	CODE:
481	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
483	);	648	);
		649	if (RETVAL)
		650	{
		651	av_clear (texture_av);
		652
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		655	# include "glfunc.h"
		656	# undef GL_FUNC
		657
		658	}
485	OUTPUT:	659	OUTPUT:
486	RETVAL	660	RETVAL
487		661
488	void	662	void
489	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
490		664
		665	char *
		666	SDL_GetKeyName (int sym)
		667
		668	int
		669	SDL_GetAppState ()
		670
491	void	671	void
492	SDL_PollEvent ()	672	poll_events ()
493	PPCODE:	673	PPCODE:
494	{	674	{
495	SDL_Event ev;	675	SDL_Event ev;
496		676
497	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
498	{	679	{
499	HV *hv = newHV ();	680	HV *hv = newHV ();
500	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
501		682
502	switch (ev.type)	683	switch (ev.type)
…		…
504	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
505	case SDL_KEYUP:	686	case SDL_KEYUP:
506	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
507	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
508	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	689	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		690	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
509	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
510	break;	692	break;
511		693
512	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	697	break;
516		698
517	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
		718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
523	break;	725	break;
524		726
525	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
		729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		730
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	731	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	732	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	733	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	734	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	735	break;
…		…
535	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	739	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
536	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	740	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
537	break;	741	break;
538	}	742	}
539		743
540	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	744	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
541	}	745	}
542	}	746	}
543		747
544	int	748	int
545	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	749	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
554	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
555		759
556	void	760	void
557	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
558	CODE:	762	CODE:
		763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		764
		765	void
		766	win32_proxy_info ()
		767	PPCODE:
		768	{
559	#ifndef _WIN32	769	#ifdef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	770	char buffer[2048];
		771	DWORD buflen;
		772
		773	EXTEND (SP, 3);
		774
		775	buflen = sizeof (buffer);
		776	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		777	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		778	{
		779	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		780
		781	buflen = sizeof (buffer);
		782	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		783	{
		784	PUSHs (newSVpv (buffer, 0));
		785
		786	buflen = sizeof (buffer);
		787	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		788	PUSHs (newSVpv (buffer, 0));
		789	}
		790	}
561	#endif	791	#endif
562		792	}
563	char *
564	gl_version ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VERSION);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_extensions ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);
574	OUTPUT:
575	RETVAL
576		793
577	void	794	void
578	add_font (char *file)	795	add_font (char *file)
579	CODE:	796	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	797	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
581	#ifdef _WIN32
582	// cairo... sigh... requires win2000
583	AddFontResourceEx (file, FR_PRIVATE, 0);
584	#endif
585		798
586	void	799	void
587	load_image_inline (SV *image_)	800	load_image_inline (SV *image_)
588	ALIAS:	801	ALIAS:
589	load_image_file = 1	802	load_image_file = 1
…		…
631		844
632	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	845	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
633		846
634	assert (surface2->pitch == surface2->w * 4);	847	assert (surface2->pitch == surface2->w * 4);
635		848
		849	SDL_LockSurface (surface2);
636	EXTEND (SP, 5);	850	EXTEND (SP, 6);
637	PUSHs (sv_2mortal (newSViv (surface2->w)));	851	PUSHs (sv_2mortal (newSViv (surface2->w)));
638	PUSHs (sv_2mortal (newSViv (surface2->h)));	852	PUSHs (sv_2mortal (newSViv (surface2->h)));
639	SDL_LockSurface (surface2);
640	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	853	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
641	SDL_UnlockSurface (surface2);
642	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	854	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
643	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	855	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
644	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	856	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		857	SDL_UnlockSurface (surface2);
645		858
646	SDL_FreeSurface (surface);	859	SDL_FreeSurface (surface);
647	SDL_FreeSurface (surface2);	860	SDL_FreeSurface (surface2);
648	}	861	}
649		862
…		…
685	CODE:	898	CODE:
686	fprintf (stderr, "FATAL: %s\n", message);	899	fprintf (stderr, "FATAL: %s\n", message);
687	#ifdef _WIN32	900	#ifdef _WIN32
688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	901	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
689	#endif	902	#endif
690	exit (1);	903	_exit (1);
691		904
		905	void
		906	_exit (int retval = 0)
		907	CODE:
		908	#ifdef WIN32
		909	ExitThread (retval); // unclean, please beam me up
		910	#else
		911	_exit (retval);
		912	#endif
		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
692	MODULE = CFClient PACKAGE = CFClient::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
693		924
694	CFClient::Font	925	CFPlus::Font
695	new_from_file (SV *class, char *path, int id = 0)	926	new_from_file (SV *class, char *path, int id = 0)
696	CODE:	927	CODE:
697	{	928	{
698	int count;	929	int count;
699	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	930	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
702	}	933	}
703	OUTPUT:	934	OUTPUT:
704	RETVAL	935	RETVAL
705		936
706	void	937	void
707	DESTROY (CFClient::Font self)	938	DESTROY (CFPlus::Font self)
708	CODE:	939	CODE:
709	pango_font_description_free (self);	940	pango_font_description_free (self);
710		941
711	void	942	void
712	make_default (CFClient::Font self)	943	make_default (CFPlus::Font self)
713	CODE:	944	CODE:
714	default_font = self;	945	default_font = self;
715		946
716	MODULE = CFClient PACKAGE = CFClient::Layout	947	MODULE = CFPlus PACKAGE = CFPlus::Layout
717		948
718	CFClient::Layout	949	void
719	new (SV *class, int rgba = 0)	950	reset_glyph_cache ()
720	CODE:	951	CODE:
721	#if _WIN32	952	tc_clear ();
722	rgba = 0;//D	953
723	#endif	954	CFPlus::Layout
		955	new (SV *class)
		956	CODE:
724	New (0, RETVAL, 1, struct cf_layout);	957	New (0, RETVAL, 1, struct cf_layout);
725		958
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	959	RETVAL->pl = pango_layout_new (opengl_context);
727	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	960	RETVAL->r = 1.;
729	RETVAL->g = 1.;	961	RETVAL->g = 1.;
730	RETVAL->b = 1.;	962	RETVAL->b = 1.;
731	RETVAL->a = 1.;	963	RETVAL->a = 1.;
732	RETVAL->base_height = MIN_FONT_HEIGHT;	964	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
736	layout_update_font (RETVAL);	968	layout_update_font (RETVAL);
737	OUTPUT:	969	OUTPUT:
738	RETVAL	970	RETVAL
739		971
740	void	972	void
741	DESTROY (CFClient::Layout self)	973	DESTROY (CFPlus::Layout self)
742	CODE:	974	CODE:
743	g_object_unref (self->pl);	975	g_object_unref (self->pl);
744	Safefree (self);	976	Safefree (self);
745		977
		978	void
		979	set_text (CFPlus::Layout self, SV *text_)
		980	CODE:
		981	{
		982	STRLEN textlen;
		983	char *text = SvPVutf8 (text_, textlen);
		984
		985	pango_layout_set_text (self->pl, text, textlen);
		986	}
		987
		988	void
		989	set_markup (CFPlus::Layout self, SV *text_)
		990	CODE:
		991	{
		992	STRLEN textlen;
		993	char *text = SvPVutf8 (text_, textlen);
		994
		995	pango_layout_set_markup (self->pl, text, textlen);
		996	}
		997
		998	void
		999	set_shapes (CFPlus::Layout self, ...)
		1000	CODE:
		1001	{
		1002	PangoAttrList *attrs = 0;
		1003	const char *text = pango_layout_get_text (self->pl);
		1004	const char *pos = text;
		1005	int arg = 4;
		1006
		1007	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		1008	{
		1009	PangoRectangle inkrect, rect;
		1010	PangoAttribute *attr;
		1011
		1012	int x = SvIV (ST (arg - 3));
		1013	int y = SvIV (ST (arg - 2));
		1014	int w = SvIV (ST (arg - 1));
		1015	int h = SvIV (ST (arg ));
		1016
		1017	inkrect.x = 0;
		1018	inkrect.y = 0;
		1019	inkrect.width = 0;
		1020	inkrect.height = 0;
		1021
		1022	rect.x = x * PANGO_SCALE;
		1023	rect.y = y * PANGO_SCALE;
		1024	rect.width = w * PANGO_SCALE;
		1025	rect.height = h * PANGO_SCALE;
		1026
		1027	if (!attrs)
		1028	attrs = pango_layout_get_attributes (self->pl);
		1029
		1030	attr = pango_attr_shape_new (&inkrect, &rect);
		1031	attr->start_index = pos - text;
		1032	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		1033	pango_attr_list_insert (attrs, attr);
		1034
		1035	arg += 4;
		1036	pos += sizeof (OBJ_STR) - 1;
		1037	}
		1038
		1039	if (attrs)
		1040	pango_layout_set_attributes (self->pl, attrs);
		1041	}
		1042
		1043	void
		1044	get_shapes (CFPlus::Layout self)
		1045	PPCODE:
		1046	{
		1047	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		1048
		1049	do
		1050	{
		1051	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		1052
		1053	if (run && shape_attr_p (run))
		1054	{
		1055	PangoRectangle extents;
		1056	pango_layout_iter_get_run_extents (iter, 0, &extents);
		1057
		1058	EXTEND (SP, 2);
		1059	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		1060	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		1061	}
		1062	}
		1063	while (pango_layout_iter_next_run (iter));
		1064
		1065	pango_layout_iter_free (iter);
		1066	}
		1067
746	int	1068	int
747	is_rgba (CFClient::Layout self)	1069	has_wrapped (CFPlus::Layout self)
748	CODE:	1070	CODE:
749	RETVAL = self->rgba;	1071	{
		1072	int lines = 1;
		1073	const char *text = pango_layout_get_text (self->pl);
		1074
		1075	while (*text)
		1076	lines += *text++ == '\n';
		1077
		1078	RETVAL = lines < pango_layout_get_line_count (self->pl);
		1079	}
750	OUTPUT:	1080	OUTPUT:
751	RETVAL	1081	RETVAL
752		1082
753	void
754	set_text (CFClient::Layout self, SV *text_)
755	CODE:
756	{
757	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);
759
760	pango_layout_set_text (self->pl, text, textlen);
761	}
762
763	void
764	set_markup (CFClient::Layout self, SV *text_)
765	CODE:
766	{
767	STRLEN textlen;
768	char *text = SvPVutf8 (text_, textlen);
769
770	pango_layout_set_markup (self->pl, text, textlen);
771	}
772
773	SV *	1083	SV *
774	get_text (CFClient::Layout self)	1084	get_text (CFPlus::Layout self)
775	CODE:	1085	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1086	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	1087	sv_utf8_decode (RETVAL);
778	OUTPUT:	1088	OUTPUT:
779	RETVAL	1089	RETVAL
780		1090
781	void	1091	void
782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1092	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
783	CODE:	1093	CODE:
784	self->r = r;	1094	self->r = r;
785	self->g = g;	1095	self->g = g;
786	self->b = b;	1096	self->b = b;
787	self->a = a;	1097	self->a = a;
788		1098
789	void	1099	void
790	set_font (CFClient::Layout self, CFClient::Font font = 0)	1100	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
791	CODE:	1101	CODE:
792	if (self->font != font)	1102	if (self->font != font)
793	{	1103	{
794	self->font = font;	1104	self->font = font;
795	layout_update_font (self);	1105	layout_update_font (self);
796	}	1106	}
797		1107
798	void	1108	void
799	set_height (CFClient::Layout self, int base_height)	1109	set_height (CFPlus::Layout self, int base_height)
800	CODE:	1110	CODE:
801	if (self->base_height != base_height)	1111	if (self->base_height != base_height)
802	{	1112	{
803	self->base_height = base_height;	1113	self->base_height = base_height;
804	layout_update_font (self);	1114	layout_update_font (self);
805	}	1115	}
806		1116
807	void	1117	void
808	set_width (CFClient::Layout self, int max_width = -1)	1118	set_width (CFPlus::Layout self, int max_width = -1)
809	CODE:	1119	CODE:
810	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1120	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
811		1121
812	void	1122	void
813	set_indent (CFClient::Layout self, int indent)	1123	set_indent (CFPlus::Layout self, int indent)
814	CODE:	1124	CODE:
815	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1125	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
816		1126
817	void	1127	void
818	set_spacing (CFClient::Layout self, int spacing)	1128	set_spacing (CFPlus::Layout self, int spacing)
819	CODE:	1129	CODE:
820	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1130	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
821		1131
822	void	1132	void
823	set_ellipsise (CFClient::Layout self, int ellipsise)	1133	set_ellipsise (CFPlus::Layout self, int ellipsise)
824	CODE:	1134	CODE:
825	pango_layout_set_ellipsize (self->pl,	1135	pango_layout_set_ellipsize (self->pl,
826	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1136	ellipsise == 1 ? PANGO_ELLIPSIZE_START
827	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1137	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
828	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1138	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
829	: PANGO_ELLIPSIZE_NONE	1139	: PANGO_ELLIPSIZE_NONE
830	);	1140	);
831		1141
832	void	1142	void
833	set_single_paragraph_mode (CFClient::Layout self, int spm)	1143	set_single_paragraph_mode (CFPlus::Layout self, int spm)
834	CODE:	1144	CODE:
835	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1145	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
836		1146
837	void	1147	void
838	size (CFClient::Layout self)	1148	size (CFPlus::Layout self)
839	PPCODE:	1149	PPCODE:
840	{	1150	{
841	int w, h;	1151	int w, h;
842		1152
843	layout_get_pixel_size (self, &w, &h);	1153	layout_get_pixel_size (self, &w, &h);
…		…
846	PUSHs (sv_2mortal (newSViv (w)));	1156	PUSHs (sv_2mortal (newSViv (w)));
847	PUSHs (sv_2mortal (newSViv (h)));	1157	PUSHs (sv_2mortal (newSViv (h)));
848	}	1158	}
849		1159
850	int	1160	int
		1161	descent (CFPlus::Layout self)
		1162	CODE:
		1163	{
		1164	PangoRectangle rect;
		1165	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1166	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1167	RETVAL = PANGO_DESCENT (rect);
		1168	}
		1169	OUTPUT:
		1170	RETVAL
		1171
		1172	int
851	xy_to_index (CFClient::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
852	CODE:	1174	CODE:
853	{	1175	{
854	int index, trailing;	1176	int index, trailing;
855	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1177	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
856	RETVAL = index;	1178	RETVAL = index + trailing;
857	}	1179	}
858	OUTPUT:	1180	OUTPUT:
859	RETVAL	1181	RETVAL
860		1182
861	void	1183	void
862	cursor_pos (CFClient::Layout self, int index)	1184	cursor_pos (CFPlus::Layout self, int index)
863	PPCODE:	1185	PPCODE:
864	{	1186	{
865	PangoRectangle strong_pos;	1187	PangoRectangle strong_pos;
866	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1188	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
867		1189
…		…
870	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
871	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1193	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
872	}	1194	}
873		1195
874	void	1196	void
875	render (CFClient::Layout self)	1197	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
876	PPCODE:	1198	PPCODE:
877	{	1199	{
878	SV *retval;	1200	int line, x;
879	int w, h;
880		1201
881	layout_get_pixel_size (self, &w, &h);	1202	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1203	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
882		1204
883	if (self->rgba)
884	{
885	cairo_surface_t *surface;
886	cairo_t *cairo;
887
888	retval = newSV (w * h * 4);
889	SvPOK_only (retval);
890	SvCUR_set (retval, w * h * 4);
891
892	memset (SvPVX (retval), 0, w * h * 4);
893
894	surface = cairo_image_surface_create_for_data (
895	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
896	cairo = cairo_create (surface);
897	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
898
899	pango_cairo_show_layout (cairo, self->pl);
900
901	cairo_destroy (cairo);
902	cairo_surface_destroy (surface);
903
904	// what a mess, and its premultiplied, too :(
905	{
906	uint32_t *p = (uint32_t *)SvPVX (retval);
907	uint32_t *e = p + w * h;
908
909	while (p < e)
910	{
911	uint32_t rgba = *p;
912	rgba = (rgba >> 24) | (rgba << 8);
913	#if 0
914	#ifdef _WIN32
915	{//D
916	uint8_t r = rgba >> 24;
917	uint8_t g = rgba >> 16;
918	uint8_t b = rgba >> 8;
919	uint8_t a = rgba >> 0;
920
921	rgba = (rgba & 0xffffff00) | a;
922	}
923	#endif
924	#endif
925	rgba = SDL_SwapBE32 (rgba);
926	*p++ = rgba;
927	}
928	}
929
930	EXTEND (SP, 5);	1205	EXTEND (SP, 2);
931	PUSHs (sv_2mortal (newSViv (w)));	1206	PUSHs (sv_2mortal (newSViv (line - 1)));
		1207	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1208	}
		1209
		1210	void
		1211	line_x_to_index (CFPlus::Layout self, int line, int x)
		1212	PPCODE:
		1213	{
		1214	PangoLayoutLine *lp;
		1215	int index, trailing;
		1216
		1217	if (line < 0)
		1218	XSRETURN_EMPTY;
		1219
		1220	if (!(lp = pango_layout_get_line (self->pl, line)))
		1221	XSRETURN_EMPTY; /* do better */
		1222
		1223	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1224
		1225	EXTEND (SP, 2);
		1226	if (GIMME_V == G_SCALAR)
932	PUSHs (sv_2mortal (newSViv (h)));	1227	PUSHs (sv_2mortal (newSViv (index + trailing)));
933	PUSHs (sv_2mortal (retval));
934	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	}
937	else	1228	else
938	{	1229	{
939	FT_Bitmap bitmap;
940
941	retval = newSV (w * h);
942	SvPOK_only (retval);
943	SvCUR_set (retval, w * h);
944
945	bitmap.rows = h;
946	bitmap.width = w;
947	bitmap.pitch = w;
948	bitmap.buffer = (unsigned char*)SvPVX (retval);
949	bitmap.num_grays = 256;
950	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
951
952	memset (bitmap.buffer, 0, w * h);
953
954	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
955
956	EXTEND (SP, 5);
957	PUSHs (sv_2mortal (newSViv (w)));	1230	PUSHs (sv_2mortal (newSViv (index)));
958	PUSHs (sv_2mortal (newSViv (h)));	1231	PUSHs (sv_2mortal (newSViv (trailing)));
959	PUSHs (sv_2mortal (retval));
960	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	}	1232	}
963	}	1233	}
964		1234
		1235	void
		1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1237	PPCODE:
		1238	pango_opengl_render_layout_subpixel (
		1239	self->pl,
		1240	x * PANGO_SCALE, y * PANGO_SCALE,
		1241	self->r, self->g, self->b, self->a,
		1242	flags
		1243	);
		1244
965	MODULE = CFClient PACKAGE = CFClient::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
966		1246
967	void	1247	void
		1248	pad2pot (SV *data_, SV *w_, SV *h_)
		1249	CODE:
		1250	{
		1251	int ow = SvIV (w_);
		1252	int oh = SvIV (h_);
		1253
		1254	if (ow && oh)
		1255	{
		1256	int nw = minpot (ow);
		1257	int nh = minpot (oh);
		1258
		1259	if (nw != ow || nh != oh)
		1260	{
		1261	if (SvOK (data_))
		1262	{
		1263	STRLEN datalen;
		1264	char *data = SvPVbyte (data_, datalen);
		1265	int bpp = datalen / (ow * oh);
		1266	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1267
		1268	SvPOK_only (result_);
		1269	SvCUR_set (result_, nw * nh * bpp);
		1270
		1271	memset (SvPVX (result_), 0, nw * nh * bpp);
		1272	while (oh--)
		1273	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1274
		1275	sv_setsv (data_, result_);
		1276	}
		1277
		1278	sv_setiv (w_, nw);
		1279	sv_setiv (h_, nh);
		1280	}
		1281	}
		1282	}
		1283
		1284	void
968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1285	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
969	PROTOTYPE: $$$;$$	1286	PROTOTYPE: $$$;$$
970	ALIAS:	1287	ALIAS:
971	draw_quad_alpha = 1	1288	draw_quad_alpha = 1
972	draw_quad_alpha_premultiplied = 2	1289	draw_quad_alpha_premultiplied = 2
973	CODE:	1290	CODE:
974	{	1291	{
975	HV *hv = (HV *)SvRV (self);	1292	HV *hv = (HV *)SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1293	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1294	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1295	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		1296
981	if (items < 5)	1297	if (items < 5)
982	{	1298	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1299	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1300	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	1301	}
986		1302
987	if (ix)	1303	if (ix)
988	{	1304	{
989	glEnable (GL_BLEND);	1305	glEnable (GL_BLEND);
		1306
		1307	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1308	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1309	else
		1310	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1311	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1312
991	glEnable (GL_ALPHA_TEST);	1313	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1314	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1315	}
994		1316
995	glBindTexture (GL_TEXTURE_2D, name);	1317	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1318
1003	glBegin (GL_QUADS);	1319	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1320	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1321	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1322	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1012	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1013	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1014	}	1330	}
1015	}	1331	}
1016		1332
1017	MODULE = CFClient PACKAGE = CFClient::Map	1333	MODULE = CFPlus PACKAGE = CFPlus::Map
1018		1334
1019	CFClient::Map	1335	CFPlus::Map
1020	new (SV *class, int map_width, int map_height)	1336	new (SV *class)
1021	CODE:	1337	CODE:
1022	New (0, RETVAL, 1, struct map);	1338	New (0, RETVAL, 1, struct map);
1023	RETVAL->x = 0;	1339	RETVAL->x = 0;
1024	RETVAL->y = 0;	1340	RETVAL->y = 0;
1025	RETVAL->w = map_width;	1341	RETVAL->w = 0;
1026	RETVAL->h = map_height;	1342	RETVAL->h = 0;
1027	RETVAL->ox = 0;	1343	RETVAL->ox = 0;
1028	RETVAL->oy = 0;	1344	RETVAL->oy = 0;
1029	RETVAL->faces = 8192;	1345	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1030	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1346	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1031	RETVAL->texs = 8192;
1032	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1033	RETVAL->rows = 0;	1347	RETVAL->rows = 0;
1034	RETVAL->row = 0;	1348	RETVAL->row = 0;
1035	OUTPUT:	1349	OUTPUT:
1036	RETVAL	1350	RETVAL
1037		1351
1038	void	1352	void
1039	DESTROY (CFClient::Map self)	1353	DESTROY (CFPlus::Map self)
1040	CODE:	1354	CODE:
1041	{	1355	{
1042	map_clear (self);	1356	map_clear (self);
1043	Safefree (self->face);	1357	Safefree (self->face2tile);
		1358	Safefree (self->tex);
1044	Safefree (self);	1359	Safefree (self);
1045	}	1360	}
1046		1361
1047	void	1362	void
		1363	resize (CFPlus::Map self, int map_width, int map_height)
		1364	CODE:
		1365	self->w = map_width;
		1366	self->h = map_height;
		1367
		1368	void
1048	clear (CFClient::Map self)	1369	clear (CFPlus::Map self)
1049	CODE:	1370	CODE:
1050	map_clear (self);	1371	map_clear (self);
1051		1372
1052	void	1373	void
1053	set_face (CFClient::Map self, int face, int texid)	1374	set_tileid (CFPlus::Map self, int face, int tile)
1054	CODE:	1375	CODE:
1055	{	1376	{
1056	while (self->faces <= face)	1377	need_facenum (self, face); self->face2tile [face] = tile;
1057	{	1378	need_texid (self, tile);
1058	Append (mapface, self->face, self->faces, self->faces);
1059	self->faces *= 2;
1060	}
1061
1062	self->face [face] = texid;
1063	}	1379	}
1064		1380
1065	void	1381	void
		1382	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1383	CODE:
		1384	{
		1385	tileid texid;
		1386	maptex *tex;
		1387
		1388	if (face < 0 || face >= self->faces)
		1389	return;
		1390
		1391	if (smooth < 0 || smooth >= self->faces)
		1392	return;
		1393
		1394	texid = self->face2tile [face];
		1395
		1396	if (!texid)
		1397	return;
		1398
		1399	tex = self->tex + texid;
		1400	tex->smoothtile = self->face2tile [smooth];
		1401	tex->smoothlevel = level;
		1402	}
		1403
		1404	void
1066	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)	1405	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)
1067	CODE:	1406	CODE:
1068	{	1407	{
1069	while (self->texs <= texid)	1408	need_texid (self, texid);
1070	{
1071	Append (maptex, self->tex, self->texs, self->texs);
1072	self->texs *= 2;
1073	}
1074		1409
1075	{	1410	{
1076	maptex *tex = self->tex + texid;	1411	maptex *tex = self->tex + texid;
1077		1412
1078	tex->name = name;	1413	tex->name = name;
…		…
1083	tex->r = r;	1418	tex->r = r;
1084	tex->g = g;	1419	tex->g = g;
1085	tex->b = b;	1420	tex->b = b;
1086	tex->a = a;	1421	tex->a = a;
1087	}	1422	}
		1423
		1424	// somewhat hackish, but for textures that require it, it really
		1425	// improves the look, and most others don't suffer.
		1426	glBindTexture (GL_TEXTURE_2D, name);
		1427	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1428	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1429	// use uglier nearest interpolation because linear suffers
		1430	// from transparent color bleeding and ugly wrapping effects.
		1431	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1432	}
1089		1433
1090	int	1434	int
1091	ox (CFClient::Map self)	1435	ox (CFPlus::Map self)
1092	ALIAS:	1436	ALIAS:
1093	oy = 1	1437	oy = 1
		1438	x = 2
		1439	y = 3
		1440	w = 4
		1441	h = 5
1094	CODE:	1442	CODE:
1095	switch (ix)	1443	switch (ix)
1096	{	1444	{
1097	case 0: RETVAL = self->ox; break;	1445	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1446	case 1: RETVAL = self->oy; break;
		1447	case 2: RETVAL = self->x; break;
		1448	case 3: RETVAL = self->y; break;
		1449	case 4: RETVAL = self->w; break;
		1450	case 5: RETVAL = self->h; break;
1099	}	1451	}
1100	OUTPUT:	1452	OUTPUT:
1101	RETVAL	1453	RETVAL
1102		1454
1103	void	1455	void
1104	scroll (CFClient::Map self, int dx, int dy)	1456	scroll (CFPlus::Map self, int dx, int dy)
1105	CODE:	1457	CODE:
1106	{	1458	{
1107	if (dx > 0)	1459	if (dx > 0)
1108	map_blank (self, self->x, self->y, dx - 1, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1109	else if (dx < 0)	1461	else if (dx < 0)
1110	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1111		1463
1112	if (dy > 0)	1464	if (dy > 0)
1113	map_blank (self, self->x, self->y, self->w, dy - 1);	1465	map_blank (self, self->x, self->y, self->w, dy);
1114	else if (dy < 0)	1466	else if (dy < 0)
1115	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1116		1468
1117	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1118	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1119		1471
1120	while (self->y < 0)	1472	while (self->y < 0)
…		…
1125	self->y += MAP_EXTEND_Y;	1477	self->y += MAP_EXTEND_Y;
1126	}	1478	}
1127	}	1479	}
1128		1480
1129	void	1481	void
1130	map1a_update (CFClient::Map self, SV *data_)	1482	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1131	CODE:	1483	CODE:
1132	{	1484	{
1133	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1485	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1134	uint8_t *data_end = (uint8_t *)SvEND (data_);	1486	uint8_t *data_end = (uint8_t *)SvEND (data_);
1135	mapcell *cell;	1487	mapcell *cell;
1136	int x, y, flags;	1488	int x, y, flags;
1137		1489
1138	while (data < data_end)	1490	while (data < data_end - 1)
1139	{	1491	{
1140	flags = (data [0] << 8) + data [1]; data += 2;	1492	flags = (data [0] << 8) + data [1]; data += 2;
1141		1493
1142	x = ((flags >> 10) & 63) + self->x;	1494	x = self->x + ((flags >> 10) & 63);
1143	y = ((flags >> 4) & 63) + self->y;	1495	y = self->y + ((flags >> 4) & 63);
1144		1496
1145	cell = map_get_cell (self, x, y);	1497	cell = map_get_cell (self, x, y);
1146		1498
1147	if (flags & 15)	1499	if (flags & 15)
1148	{	1500	{
1149	if (cell->darkness < 0)	1501	if (!cell->darkness)
1150	{	1502	{
		1503	memset (cell, 0, sizeof (*cell));
1151	cell->darkness = 0;	1504	cell->darkness = 256;
1152	cell->face [0] = 0;
1153	cell->face [1] = 0;
1154	cell->face [2] = 0;
1155	}	1505	}
1156		1506
1157	cell->darkness = flags & 8 ? *data++ : 255;
1158
1159	//TODO: don't trust server data to be in-range(!)	1507	//TODO: don't trust server data to be in-range(!)
		1508
		1509	if (flags & 8)
		1510	{
		1511	if (extmap)
		1512	{
		1513	uint8_t ext, cmd;
		1514
		1515	do
		1516	{
		1517	ext = *data++;
		1518	cmd = ext & 0x3f;
		1519
		1520	if (cmd < 4)
		1521	cell->darkness = 255 - ext * 64 + 1;
		1522	else if (cmd == 5) // health
		1523	{
		1524	cell->stat_width = 1;
		1525	cell->stat_hp = *data++;
		1526	}
		1527	else if (cmd == 6) // monster width
		1528	cell->stat_width = *data++ + 1;
		1529	else if (cmd == 0x47)
		1530	{
		1531	if (*data == 4)
		1532	; // decode player count
		1533
		1534	data += *data + 1;
		1535	}
		1536	else if (cmd == 8) // cell flags
		1537	cell->flags = *data++;
		1538	else if (ext & 0x40) // unknown, multibyte => skip
		1539	data += *data + 1;
		1540	else
		1541	data++;
		1542	}
		1543	while (ext & 0x80);
		1544	}
		1545	else
		1546	cell->darkness = *data++ + 1;
		1547	}
1160		1548
1161	if (flags & 4)	1549	if (flags & 4)
1162	{	1550	{
1163	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1551	faceid face = (data [0] << 8) + data [1]; data += 2;
		1552	need_facenum (self, face);
		1553	cell->tile [0] = self->face2tile [face];
1164	}	1554	}
1165		1555
1166	if (flags & 2)	1556	if (flags & 2)
1167	{	1557	{
1168	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1558	faceid face = (data [0] << 8) + data [1]; data += 2;
		1559	need_facenum (self, face);
		1560	cell->tile [1] = self->face2tile [face];
1169	}	1561	}
1170		1562
1171	if (flags & 1)	1563	if (flags & 1)
1172	{	1564	{
1173	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1565	faceid face = (data [0] << 8) + data [1]; data += 2;
		1566	need_facenum (self, face);
		1567	cell->tile [2] = self->face2tile [face];
1174	}	1568	}
1175	}	1569	}
1176	else	1570	else
1177	cell->darkness = -1;	1571	cell->darkness = 0;
1178	}	1572	}
1179	}	1573	}
1180		1574
1181	SV *	1575	SV *
1182	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1576	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1183	CODE:	1577	CODE:
1184	{	1578	{
1185	int x1, x;	1579	int x1, x;
1186	int y1, y;	1580	int y1, y;
1187	int z;	1581	int z;
…		…
1208	{	1602	{
1209	mapcell *cell = row->col + (x - row->c0);	1603	mapcell *cell = row->col + (x - row->c0);
1210		1604
1211	for (z = 0; z <= 0; z++)	1605	for (z = 0; z <= 0; z++)
1212	{	1606	{
1213	mapface face = cell->face [z];
1214
1215	if (face)
1216	{
1217	maptex tex = self->tex [face];	1607	maptex tex = self->tex [cell->tile [z]];
1218	int a0 = 255 - tex.a;	1608	int a0 = 255 - tex.a;
1219	int a1 = tex.a;	1609	int a1 = tex.a;
1220		1610
1221	r = (r * a0 + tex.r * a1) / 255;	1611	r = (r * a0 + tex.r * a1) / 255;
1222	g = (g * a0 + tex.g * a1) / 255;	1612	g = (g * a0 + tex.g * a1) / 255;
1223	b = (b * a0 + tex.b * a1) / 255;	1613	b = (b * a0 + tex.b * a1) / 255;
1224	a = (a * a0 + tex.a * a1) / 255;	1614	a = (a * a0 + tex.a * a1) / 255;
1225	}
1226	}	1615	}
1227	}	1616	}
1228		1617
1229	*map++ = (r )	1618	*map++ = (r )
1230	| (g << 8)	1619	| (g << 8)
…		…
1237	}	1626	}
1238	OUTPUT:	1627	OUTPUT:
1239	RETVAL	1628	RETVAL
1240		1629
1241	void	1630	void
1242	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1243	PPCODE:	1632	CODE:
1244	{	1633	{
1245	int vx, vy;	1634	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1637	smooth_key skey;
1246	int x, y, z;	1638	int x, y, z;
1247	int last_name;	1639	int last_name;
1248	mapface face;	1640
		1641	// thats current max. sorry.
		1642	if (sw > 255) sw = 255;
		1643	if (sh > 255) sh = 255;
		1644
		1645	// clear key, in case of extra padding
		1646	memset (&skey, 0, sizeof (skey));
		1647
		1648	glColor4ub (255, 255, 255, 255);
		1649
		1650	glEnable (GL_BLEND);
		1651	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1652	glEnable (GL_TEXTURE_2D);
		1653	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1654
		1655	glBegin (GL_QUADS);
		1656
		1657	last_name = 0;
		1658
		1659	mx += self->x;
		1660	my += self->y;
		1661
		1662	// first pass: determine smooth_max
		1663	// rather ugly, if you ask me
		1664	// could also be stored inside mapcell and updated on change
		1665	memset (smooth_max, 0, sizeof (smooth_max));
		1666
		1667	for (y = 0; y < sh; y++)
		1668	if (0 <= y + my && y + my < self->rows)
		1669	{
		1670	maprow *row = self->row + (y + my);
		1671
		1672	for (x = 0; x < sw; x++)
		1673	if (row->c0 <= x + mx && x + mx < row->c1)
		1674	{
		1675	mapcell *cell = row->col + (x + mx - row->c0);
		1676
		1677	smooth_max[x + 1][y + 1] =
		1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
		1681	}
		1682	}
		1683
		1684	for (z = 0; z <= 2; z++)
		1685	{
		1686	memset (smooth_level, 0, sizeof (smooth_level));
		1687
		1688	for (y = 0; y < sh; y++)
		1689	if (0 <= y + my && y + my < self->rows)
		1690	{
		1691	maprow *row = self->row + (y + my);
		1692
		1693	for (x = 0; x < sw; x++)
		1694	if (row->c0 <= x + mx && x + mx < row->c1)
		1695	{
		1696	mapcell *cell = row->col + (x + mx - row->c0);
		1697	tileid tile = cell->tile [z];
		1698
		1699	if (tile)
		1700	{
		1701	maptex tex = self->tex [tile];
		1702	int px = (x + 1) * T - tex.w;
		1703	int py = (y + 1) * T - tex.h;
		1704
		1705	// suppressing texture state switches here
		1706	// is only moderately effective, but worth the extra effort
		1707	if (last_name != tex.name)
		1708	{
		1709	if (!tex.name)
		1710	tex = self->tex [2]; /* missing, replace by noface */
		1711
		1712	glEnd ();
		1713	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1714	glBegin (GL_QUADS);
		1715	}
		1716
		1717	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1718	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1719	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1720	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1721
		1722	if (cell->flags && z == 2)
		1723	{
		1724	if (cell->flags & 1)
		1725	{
		1726	maptex tex = self->tex [1];
		1727	int px = x * T + T * 2 / 32;
		1728	int py = y * T - T * 6 / 32;
		1729
		1730	glEnd ();
		1731	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1732	glBegin (GL_QUADS);
		1733
		1734	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1735	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1736	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1737	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1738	}
		1739	}
		1740
		1741	// update smooth hash
		1742	if (tex.smoothtile)
		1743	{
		1744	skey.tile = tex.smoothtile;
		1745	skey.level = tex.smoothlevel;
		1746
		1747	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1748
		1749	// add bits to current tile and all neighbours. skey.x|y is
		1750	// shifted +1|+1 so we always stay positive.
		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
		1764	// full tile
		1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1766
		1767	// borders
		1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1772
		1773	// corners
		1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1775	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1776	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1777	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1778	}
		1779	}
		1780	}
		1781	}
		1782
		1783	// go through all smoothlevels, lowest to highest, then draw.
		1784	// this is basically counting sort
		1785	{
		1786	int w, b;
		1787
		1788	for (w = 0; w < 256 / 32; ++w)
		1789	{
		1790	uint32_t smask = smooth_level [w];
		1791	if (smask)
		1792	for (b = 0; b < 32; ++b)
		1793	if (smask & (((uint32_t)1) << b))
		1794	{
		1795	int level = (w << 5) | b;
		1796	HE *he;
		1797
		1798	hv_iterinit (smooth);
		1799	while ((he = hv_iternext (smooth)))
		1800	{
		1801	smooth_key *skey = (smooth_key *)HeKEY (he);
		1802	IV bits = SvIVX (HeVAL (he));
		1803
		1804	if (!(bits & 0x1000)
		1805	&& skey->level == level
		1806	&& level > smooth_max [skey->x][skey->y])
		1807	{
		1808	maptex tex = self->tex [skey->tile];
		1809	int px = (((int)skey->x) - 1) * T;
		1810	int py = (((int)skey->y) - 1) * T;
		1811	int border = bits & 15;
		1812	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1813	float dx = tex.s * .0625f; // 16 images/row
		1814	float dy = tex.t * .5f ; // 2 images/column
		1815
		1816	// this time naively avoiding texture state changes
		1817	// save gobs of state changes.
		1818	if (last_name != tex.name)
		1819	{
		1820	if (!tex.name)
		1821	continue; // smoothing not yet available
		1822
		1823	glEnd ();
		1824	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1825	glBegin (GL_QUADS);
		1826	}
		1827
		1828	if (border)
		1829	{
		1830	float ox = border * dx;
		1831
		1832	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1833	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1834	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1835	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1836	}
		1837
		1838	if (corner)
		1839	{
		1840	float ox = corner * dx;
		1841
		1842	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1843	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1844	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1846	}
		1847	}
		1848	}
		1849	}
		1850	}
		1851	}
		1852
		1853	hv_clear (smooth);
		1854	}
		1855
		1856	glEnd ();
		1857
		1858	glDisable (GL_TEXTURE_2D);
		1859	glDisable (GL_BLEND);
		1860
		1861	// top layer: overlays such as the health bar
		1862	for (y = 0; y < sh; y++)
		1863	if (0 <= y + my && y + my < self->rows)
		1864	{
		1865	maprow *row = self->row + (y + my);
		1866
		1867	for (x = 0; x < sw; x++)
		1868	if (row->c0 <= x + mx && x + mx < row->c1)
		1869	{
		1870	mapcell *cell = row->col + (x + mx - row->c0);
		1871
		1872	int px = x * T;
		1873	int py = y * T;
		1874
		1875	if (cell->stat_hp)
		1876	{
		1877	int width = cell->stat_width * T;
		1878	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1879
		1880	glColor3ub (0, 0, 0);
		1881	glRectf (px + 1, py - thick - 2,
		1882	px + width - 1, py);
		1883
		1884	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1885	glRectf (px + 2,
		1886	py - thick - 1,
		1887	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1888	}
		1889	}
		1890	}
		1891	}
		1892
		1893	void
		1894	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1895	CODE:
		1896	{
		1897	static float color[16][3] = {
		1898	{ 0.00F, 0.00F, 0.00F },
		1899	{ 1.00F, 1.00F, 1.00F },
		1900	{ 0.00F, 0.00F, 0.55F },
		1901	{ 1.00F, 0.00F, 0.00F },
		1902
		1903	{ 1.00F, 0.54F, 0.00F },
		1904	{ 0.11F, 0.56F, 1.00F },
		1905	{ 0.93F, 0.46F, 0.00F },
		1906	{ 0.18F, 0.54F, 0.34F },
		1907
		1908	{ 0.56F, 0.73F, 0.56F },
		1909	{ 0.80F, 0.80F, 0.80F },
		1910	{ 0.55F, 0.41F, 0.13F },
		1911	{ 0.99F, 0.77F, 0.26F },
		1912
		1913	{ 0.74F, 0.65F, 0.41F },
		1914
		1915	{ 0.00F, 1.00F, 1.00F },
		1916	{ 1.00F, 0.00F, 1.00F },
		1917	{ 1.00F, 1.00F, 0.00F },
		1918	};
		1919
		1920	int x, y;
		1921
		1922	glEnable (GL_TEXTURE_2D);
		1923	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1924	glEnable (GL_BLEND);
		1925	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1926	glBegin (GL_QUADS);
		1927
		1928	for (y = 0; y < h; y++)
		1929	for (x = 0; x < w; x++)
		1930	{
		1931	unsigned char m = data [x + y * w];
		1932
		1933	if (m)
		1934	{
		1935	float *c = color [m & 15];
		1936
		1937	float tx1 = m & 0x40 ? 0.5 : 0.;
		1938	float tx2 = tx1 + 0.5;
		1939
		1940	glColor4f (c[0], c[1], c[2], 0.75);
		1941	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1942	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1943	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1944	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1945	}
		1946	}
		1947
		1948	glEnd ();
		1949	glDisable (GL_BLEND);
		1950	glDisable (GL_TEXTURE_2D);
		1951	}
		1952
		1953	void
		1954	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1955	PPCODE:
		1956	{
		1957	int x, y;
1249	int sw4 = (sw + 3) & ~3;	1958	int sw4 = (sw + 3) & ~3;
1250	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1959	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1251	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1960	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1252		1961
1253	memset (darkness, 255, sw4 * sh);	1962	memset (darkness, 255, sw4 * sh);
1254	SvPOK_only (darkness_sv);	1963	SvPOK_only (darkness_sv);
1255	SvCUR_set (darkness_sv, sw4 * sh);	1964	SvCUR_set (darkness_sv, sw4 * sh);
1256		1965
1257	vx = self->x + (self->w - sw) / 2 - shift_x;	1966	mx += self->x;
1258	vy = self->y + (self->h - sh) / 2 - shift_y;	1967	my += self->y;
1259		1968
1260	/*
1261	int vx = self->vx = self->w >= sw
1262	? self->x + (self->w - sw) / 2
1263	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1264
1265	int vy = self->vy = self->h >= sh
1266	? self->y + (self->h - sh) / 2
1267	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1268	*/
1269
1270	glColor4ub (255, 255, 255, 255);
1271
1272	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1273	glEnable (GL_BLEND);
1274	glEnable (GL_TEXTURE_2D);
1275	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1276
1277	glBegin (GL_QUADS);
1278
1279	last_name = 0;
1280
1281	for (z = 0; z < 3; z++)
1282	for (y = 0; y < sh; y++)	1969	for (y = 0; y < sh; y++)
1283	if (0 <= y + vy && y + vy < self->rows)	1970	if (0 <= y + my && y + my < self->rows)
1284	{	1971	{
1285	maprow *row = self->row + (y + vy);	1972	maprow *row = self->row + (y + my);
1286		1973
1287	for (x = 0; x < sw; x++)	1974	for (x = 0; x < sw; x++)
1288	if (row->c0 <= x + vx && x + vx < row->c1)	1975	if (row->c0 <= x + mx && x + mx < row->c1)
1289	{	1976	{
1290	mapcell *cell = row->col + (x + vx - row->c0);	1977	mapcell *cell = row->col + (x + mx - row->c0);
1291		1978
1292	darkness[y * sw4 + x] = cell->darkness < 0	1979	darkness[y * sw4 + x] = cell->darkness
		1980	? 255 - (cell->darkness - 1)
1293	? 255 - FOW_DARKNESS	1981	: 255 - FOW_DARKNESS;
1294	: 255 - cell->darkness;
1295
1296	face = cell->face [z];
1297
1298	if (face)
1299	{
1300	maptex tex = self->tex [face];
1301
1302	int px = (x + 1) * 32 - tex.w;
1303	int py = (y + 1) * 32 - tex.h;
1304
1305	if (last_name != tex.name)
1306	{
1307	glEnd ();
1308	last_name = tex.name;
1309	glBindTexture (GL_TEXTURE_2D, last_name);
1310	glBegin (GL_QUADS);
1311	}
1312
1313	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1314	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1315	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1316	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1317	}
1318	}	1982	}
1319	}	1983	}
1320
1321	glEnd ();
1322
1323	glDisable (GL_TEXTURE_2D);
1324	glDisable (GL_BLEND);
1325		1984
1326	EXTEND (SP, 3);	1985	EXTEND (SP, 3);
1327	PUSHs (sv_2mortal (newSViv (sw4)));	1986	PUSHs (sv_2mortal (newSViv (sw4)));
1328	PUSHs (sv_2mortal (newSViv (sh)));	1987	PUSHs (sv_2mortal (newSViv (sh)));
1329	PUSHs (darkness_sv);	1988	PUSHs (darkness_sv);
1330	}	1989	}
1331		1990
1332	SV *	1991	SV *
1333	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1992	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1334	CODE:	1993	CODE:
1335	{	1994	{
1336	int x, y, x1, y1;	1995	int x, y, x1, y1;
1337	SV *data_sv = newSV (w * h * 7 + 5);	1996	SV *data_sv = newSV (w * h * 7 + 5);
1338	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1997	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1363	if (row && row->c0 <= x && x < row->c1)	2022	if (row && row->c0 <= x && x < row->c1)
1364	{	2023	{
1365	mapcell *cell = row->col + (x - row->c0);	2024	mapcell *cell = row->col + (x - row->c0);
1366	uint8_t flags = 0;	2025	uint8_t flags = 0;
1367		2026
1368	if (cell->face [0]) flags |= 1;	2027	if (cell->tile [0]) flags |= 1;
1369	if (cell->face [1]) flags |= 2;	2028	if (cell->tile [1]) flags |= 2;
1370	if (cell->face [2]) flags |= 4;	2029	if (cell->tile [2]) flags |= 4;
1371		2030
1372	*data++ = flags;	2031	*data++ = flags;
1373		2032
1374	if (flags & 1)	2033	if (flags & 1)
1375	{	2034	{
		2035	tileid tile = cell->tile [0];
1376	*data++ = cell->face [0] >> 8;	2036	*data++ = tile >> 8;
1377	*data++ = cell->face [0];	2037	*data++ = tile;
1378	}	2038	}
1379		2039
1380	if (flags & 2)	2040	if (flags & 2)
1381	{	2041	{
		2042	tileid tile = cell->tile [1];
1382	*data++ = cell->face [1] >> 8;	2043	*data++ = tile >> 8;
1383	*data++ = cell->face [1];	2044	*data++ = tile;
1384	}	2045	}
1385		2046
1386	if (flags & 4)	2047	if (flags & 4)
1387	{	2048	{
		2049	tileid tile = cell->tile [2];
1388	*data++ = cell->face [2] >> 8;	2050	*data++ = tile >> 8;
1389	*data++ = cell->face [2];	2051	*data++ = tile;
1390	}	2052	}
1391	}	2053	}
1392	else	2054	else
1393	*data++ = 0;	2055	*data++ = 0;
1394	}	2056	}
…		…
1400	}	2062	}
1401	OUTPUT:	2063	OUTPUT:
1402	RETVAL	2064	RETVAL
1403		2065
1404	void	2066	void
1405	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2067	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1406	PPCODE:	2068	PPCODE:
1407	{	2069	{
1408	int x, y, z;	2070	int x, y, z;
1409	int w, h;	2071	int w, h;
1410	int x1, y1;	2072	int x1, y1;
…		…
1434	{	2096	{
1435	uint8_t flags = *data++;	2097	uint8_t flags = *data++;
1436		2098
1437	if (flags)	2099	if (flags)
1438	{	2100	{
1439	mapface face[3] = { 0, 0, 0 };
1440
1441	mapcell *cell = row_get_cell (row, x);	2101	mapcell *cell = row_get_cell (row, x);
		2102	tileid tile[3] = { 0, 0, 0 };
1442		2103
1443	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2104	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1444	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2105	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1445	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2106	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1446		2107
1447	if (cell->darkness <= 0)	2108	if (cell->darkness == 0)
1448	{	2109	{
1449	cell->darkness = -1;	2110	cell->darkness = 0;
1450		2111
1451	for (z = 0; z <= 2; z++)	2112	for (z = 0; z <= 2; z++)
1452	{	2113	{
1453	cell->face[z] = face[z];	2114	tileid t = tile [z];
1454		2115
1455	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2116	if (t >= self->texs || (t && !self->tex [t].name))
		2117	{
1456	XPUSHs (sv_2mortal (newSViv (face[z])));	2118	XPUSHs (sv_2mortal (newSViv (t)));
		2119	need_texid (self, t);
		2120	}
		2121
		2122	cell->tile [z] = t;
1457	}	2123	}
1458	}	2124	}
1459	}	2125	}
1460	}	2126	}
1461	}	2127	}
1462	}	2128	}
1463		2129
1464	MODULE = CFClient PACKAGE = CFClient::MixChunk	2130	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1465		2131
1466	CFClient::MixChunk	2132	CFPlus::MixChunk
1467	new_from_file (SV *class, char *path)	2133	new_from_file (SV *class, char *path)
1468	CODE:	2134	CODE:
1469	RETVAL = Mix_LoadWAV (path);	2135	RETVAL = Mix_LoadWAV (path);
1470	OUTPUT:	2136	OUTPUT:
1471	RETVAL	2137	RETVAL
1472		2138
1473	void	2139	void
1474	DESTROY (CFClient::MixChunk self)	2140	DESTROY (CFPlus::MixChunk self)
1475	CODE:	2141	CODE:
1476	Mix_FreeChunk (self);	2142	Mix_FreeChunk (self);
1477		2143
1478	int	2144	int
1479	volume (CFClient::MixChunk self, int volume = -1)	2145	volume (CFPlus::MixChunk self, int volume = -1)
1480	CODE:	2146	CODE:
1481	RETVAL = Mix_VolumeChunk (self, volume);	2147	RETVAL = Mix_VolumeChunk (self, volume);
1482	OUTPUT:	2148	OUTPUT:
1483	RETVAL	2149	RETVAL
1484		2150
1485	int	2151	int
1486	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2152	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1487	CODE:	2153	CODE:
1488	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2154	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1489	OUTPUT:	2155	OUTPUT:
1490	RETVAL	2156	RETVAL
1491		2157
1492	MODULE = CFClient PACKAGE = CFClient::MixMusic	2158	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1493		2159
1494	int	2160	int
1495	volume (int volume = -1)	2161	volume (int volume = -1)
1496	CODE:	2162	CODE:
1497	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
1498	OUTPUT:	2164	OUTPUT:
1499	RETVAL	2165	RETVAL
1500		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
1501	CFClient::MixMusic	2174	CFPlus::MixMusic
1502	new_from_file (SV *class, char *path)	2175	new_from_file (SV *class, char *path)
1503	CODE:	2176	CODE:
1504	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
1505	OUTPUT:	2178	OUTPUT:
1506	RETVAL	2179	RETVAL
1507		2180
1508	void	2181	void
1509	DESTROY (CFClient::MixMusic self)	2182	DESTROY (CFPlus::MixMusic self)
1510	CODE:	2183	CODE:
1511	Mix_FreeMusic (self);	2184	Mix_FreeMusic (self);
1512		2185
1513	int	2186	int
1514	play (CFClient::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
1515	CODE:	2188	CODE:
1516	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
1517	OUTPUT:	2190	OUTPUT:
1518	RETVAL	2191	RETVAL
1519		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2197	OUTPUT:
		2198	RETVAL
		2199
1520	MODULE = CFClient PACKAGE = CFClient::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1521		2201
1522	BOOT:	2202	BOOT:
1523	{	2203	{
1524	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2204	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1525	static const struct {	2205	static const struct {
1526	const char *name;	2206	const char *name;
1527	IV iv;	2207	IV iv;
1528	} *civ, const_iv[] = {	2208	} *civ, const_iv[] = {
1529	# define const_iv(name) { # name, (IV)name }	2209	# define const_iv(name) { # name, (IV)name }
…		…
1536	const_iv (GL_SCISSOR_TEST),	2216	const_iv (GL_SCISSOR_TEST),
1537	const_iv (GL_DEPTH_TEST),	2217	const_iv (GL_DEPTH_TEST),
1538	const_iv (GL_ALPHA_TEST),	2218	const_iv (GL_ALPHA_TEST),
1539	const_iv (GL_NORMALIZE),	2219	const_iv (GL_NORMALIZE),
1540	const_iv (GL_RESCALE_NORMAL),	2220	const_iv (GL_RESCALE_NORMAL),
		2221	const_iv (GL_FRONT),
		2222	const_iv (GL_BACK),
1541	const_iv (GL_AND),	2223	const_iv (GL_AND),
1542	const_iv (GL_ONE),	2224	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	2225	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	2226	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	2227	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2228	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	2229	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2230	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	2231	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	2232	const_iv (GL_RGBA),
		2233	const_iv (GL_RGBA4),
		2234	const_iv (GL_RGBA8),
		2235	const_iv (GL_RGB5_A1),
1550	const_iv (GL_UNSIGNED_BYTE),	2236	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	2237	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	2238	const_iv (GL_UNSIGNED_INT),
1553	const_iv (GL_ALPHA),	2239	const_iv (GL_ALPHA),
1554	const_iv (GL_INTENSITY),	2240	const_iv (GL_INTENSITY),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	2249	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	2250	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	2251	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	2252	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	2253	const_iv (GL_TEXTURE_WRAP_T),
		2254	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	2255	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	2256	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	2257	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	2258	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	2259	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	2260	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	2261	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1585	const_iv (GL_SEPARABLE_2D),	2272	const_iv (GL_SEPARABLE_2D),
1586	const_iv (GL_CONVOLUTION_2D),	2273	const_iv (GL_CONVOLUTION_2D),
1587	const_iv (GL_CONVOLUTION_BORDER_MODE),	2274	const_iv (GL_CONVOLUTION_BORDER_MODE),
1588	const_iv (GL_CONSTANT_BORDER),	2275	const_iv (GL_CONSTANT_BORDER),
1589	const_iv (GL_LINES),	2276	const_iv (GL_LINES),
		2277	const_iv (GL_LINE_STRIP),
1590	const_iv (GL_LINE_LOOP),	2278	const_iv (GL_LINE_LOOP),
1591	const_iv (GL_QUADS),	2279	const_iv (GL_QUADS),
1592	const_iv (GL_QUAD_STRIP),	2280	const_iv (GL_QUAD_STRIP),
1593	const_iv (GL_TRIANGLES),	2281	const_iv (GL_TRIANGLES),
1594	const_iv (GL_TRIANGLE_STRIP),	2282	const_iv (GL_TRIANGLE_STRIP),
…		…
1602	# undef const_iv	2290	# undef const_iv
1603	};	2291	};
1604		2292
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
1607	}	2298	}
		2299
		2300	char *
		2301	gl_vendor ()
		2302	CODE:
		2303	RETVAL = (char *)glGetString (GL_VENDOR);
		2304	OUTPUT:
		2305	RETVAL
		2306
		2307	char *
		2308	gl_version ()
		2309	CODE:
		2310	RETVAL = (char *)glGetString (GL_VERSION);
		2311	OUTPUT:
		2312	RETVAL
		2313
		2314	char *
		2315	gl_extensions ()
		2316	CODE:
		2317	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2318	OUTPUT:
		2319	RETVAL
1608		2320
1609	int glGetError ()	2321	int glGetError ()
		2322
		2323	void glFinish ()
1610		2324
1611	void glClear (int mask)	2325	void glClear (int mask)
1612		2326
1613	void glClearColor (float r, float g, float b, float a = 1.0)	2327	void glClearColor (float r, float g, float b, float a = 1.0)
1614	PROTOTYPE: @	2328	PROTOTYPE: @
…		…
1621		2335
1622	void glHint (int target, int mode)	2336	void glHint (int target, int mode)
1623		2337
1624	void glBlendFunc (int sfactor, int dfactor)	2338	void glBlendFunc (int sfactor, int dfactor)
1625		2339
		2340	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2341	CODE:
		2342	gl_BlendFuncSeparate (sa, da, saa, daa);
		2343
1626	void glDepthMask (int flag)	2344	void glDepthMask (int flag)
1627		2345
1628	void glLogicOp (int opcode)	2346	void glLogicOp (int opcode)
1629		2347
1630	void glColorMask (int red, int green, int blue, int alpha)	2348	void glColorMask (int red, int green, int blue, int alpha)
…		…
1634	void glPushMatrix ()	2352	void glPushMatrix ()
1635		2353
1636	void glPopMatrix ()	2354	void glPopMatrix ()
1637		2355
1638	void glLoadIdentity ()	2356	void glLoadIdentity ()
		2357
		2358	void glDrawBuffer (int buffer)
		2359
		2360	void glReadBuffer (int buffer)
1639		2361
1640	# near_ and far_ are due to microsofts buggy "c" compiler	2362	# near_ and far_ are due to microsofts buggy "c" compiler
1641	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2363	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1642		2364
1643	# near_ and far_ are due to microsofts buggy "c" compiler	2365	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1663		2385
1664	void glEnd ()	2386	void glEnd ()
1665		2387
1666	void glColor (float r, float g, float b, float a = 1.0)	2388	void glColor (float r, float g, float b, float a = 1.0)
1667	PROTOTYPE: @	2389	PROTOTYPE: @
		2390	ALIAS:
		2391	glColor_premultiply = 1
1668	CODE:	2392	CODE:
		2393	if (ix)
		2394	{
		2395	r *= a;
		2396	g *= a;
		2397	b *= a;
		2398	}
1669	// microsoft visual "c" rounds instead of truncating...	2399	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	2400	glColor4f (r, g, b, a);
1671	MIN ((int)(g * 255.f), 255),
1672	MIN ((int)(b * 255.f), 255),
1673	MIN ((int)(a * 255.f), 255));
1674		2401
1675	void glInterleavedArrays (int format, int stride, char *data)	2402	void glInterleavedArrays (int format, int stride, char *data)
1676		2403
1677	void glDrawElements (int mode, int count, int type, char *indices)	2404	void glDrawElements (int mode, int count, int type, char *indices)
1678		2405
…		…
1701		2428
1702	void glBindTexture (int target, int name)	2429	void glBindTexture (int target, int name)
1703		2430
1704	void glConvolutionParameter (int target, int pname, float params)	2431	void glConvolutionParameter (int target, int pname, float params)
1705	CODE:	2432	CODE:
1706	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2433	if (gl.ConvolutionParameterf)
		2434	gl.ConvolutionParameterf (target, pname, params);
1707		2435
1708	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2436	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1709	CODE:	2437	CODE:
1710	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2438	if (gl.ConvolutionFilter2D)
1711	(target, internalformat, width, height, format, type, data));	2439	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1712		2440
1713	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2441	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1714	CODE:	2442	CODE:
1715	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2443	if (gl.SeparableFilter2D)
1716	(target, internalformat, width, height, format, type, row, column));	2444	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1717		2445
1718	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2446	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1719		2447
1720	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2448	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1721		2449
…		…
1723		2451
1724	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1725		2453
1726	int glGenTexture ()	2454	int glGenTexture ()
1727	CODE:	2455	CODE:
1728	{	2456	RETVAL = gen_texture ();
1729	GLuint name;
1730	glGenTextures (1, &name);
1731	RETVAL = name;
1732	}
1733	OUTPUT:	2457	OUTPUT:
1734	RETVAL	2458	RETVAL
1735		2459
1736	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
1737	CODE:	2461	CODE:
1738	{
1739	GLuint name_ = name;
1740	glDeleteTextures (1, &name_);	2462	del_texture (name);
1741	}	2463
1742
1743	int glGenList ()	2464	int glGenList ()
1744	CODE:	2465	CODE:
1745	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
1746	OUTPUT:	2467	OUTPUT:
1747	RETVAL	2468	RETVAL
…		…
1754		2475
1755	void glEndList ()	2476	void glEndList ()
1756		2477
1757	void glCallList (int list)	2478	void glCallList (int list)
1758		2479
1759

Diff Legend

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