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

Diff Legend

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