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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.200 by root, Tue Jul 17 16:02:13 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	}
		591
		592	char *
		593	SDL_GetError ()
430		594
431	int	595	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
433		597
434	void	598	void
435	SDL_Quit ()	599	SDL_Quit ()
436		600
437	void	601	void
438	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
439	PPCODE:	603	PPCODE:
440	{	604	{
441	SDL_Rect **m;	605	SDL_Rect **m;
442		606
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
447		611
		612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
		614
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		619
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		621	#if SDL_VERSION_ATLEAST(1,2,10)
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
456		624	#endif
457	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		625
460	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
461		627
462	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
463	while (*m)	629	while (*m)
464	{	630	{
		631	if ((*m)->w >= 640 && (*m)->h >= 480)
		632	{
465	AV *av = newAV ();	633	AV *av = newAV ();
466	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
467	av_push (av, newSViv ((*m)->h));	635	av_push (av, newSViv ((*m)->h));
		636	av_push (av, newSViv (rgb));
		637	av_push (av, newSViv (alpha));
468	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
469		640
470	++m;	641	++m;
471	}	642	}
472	}	643	}
473		644
474	int	645	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
476	CODE:	647	CODE:
		648	{
		649	SDL_EnableUNICODE (1);
		650	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		651
		652	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		653	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		654	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		655	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		656
477	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
479	);	659	);
		660
		661	if (RETVAL)
		662	{
		663	av_clear (texture_av);
		664
480	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		666	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		667	#include "glfunc.h"
		668	#undef GL_FUNC
		669	}
		670	}
481	OUTPUT:	671	OUTPUT:
482	RETVAL	672	RETVAL
483		673
484	void	674	void
485	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
486		676
		677	char *
		678	SDL_GetKeyName (int sym)
		679
		680	int
		681	SDL_GetAppState ()
		682
487	void	683	void
488	SDL_PollEvent ()	684	poll_events ()
489	PPCODE:	685	PPCODE:
490	{	686	{
491	SDL_Event ev;	687	SDL_Event ev;
492		688
493	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
494	{	691	{
495	HV *hv = newHV ();	692	HV *hv = newHV ();
496	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
497		694
498	switch (ev.type)	695	switch (ev.type)
…		…
500	case SDL_KEYDOWN:	697	case SDL_KEYDOWN:
501	case SDL_KEYUP:	698	case SDL_KEYUP:
502	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	699	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
503	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	700	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
504	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	701	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		702	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
505	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	703	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
506	break;	704	break;
507		705
508	case SDL_ACTIVEEVENT:	706	case SDL_ACTIVEEVENT:
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	709	break;
512		710
513	case SDL_MOUSEMOTION:	711	case SDL_MOUSEMOTION:
		712	{
		713	int state = ev.motion.state;
		714	int x = ev.motion.x;
		715	int y = ev.motion.y;
		716	int xrel = ev.motion.xrel;
		717	int yrel = ev.motion.yrel;
		718
		719	/* do simplistic event compression */
		720	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		721	&& state == ev.motion.state)
		722	{
		723	xrel += ev.motion.xrel;
		724	yrel += ev.motion.yrel;
		725	x = ev.motion.x;
		726	y = ev.motion.y;
		727	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		728	}
		729
		730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
519	break;	737	break;
520		738
521	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
		741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		742
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	743	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	744	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	745	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	746	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	747	break;
…		…
531	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	751	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
532	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	752	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
533	break;	753	break;
534	}	754	}
535		755
536	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	756	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
537	}	757	}
538	}	758	}
539		759
540	int	760	int
541	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	761	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
550	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
551		771
552	void	772	void
553	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
554	CODE:	774	CODE:
		775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		776
		777	void
		778	win32_proxy_info ()
		779	PPCODE:
		780	{
555	#ifndef _WIN32	781	#ifdef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	782	char buffer[2048];
		783	DWORD buflen;
		784
		785	EXTEND (SP, 3);
		786
		787	buflen = sizeof (buffer);
		788	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		789	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		790	{
		791	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		792
		793	buflen = sizeof (buffer);
		794	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		795	{
		796	PUSHs (newSVpv (buffer, 0));
		797
		798	buflen = sizeof (buffer);
		799	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		800	PUSHs (newSVpv (buffer, 0));
		801	}
		802	}
557	#endif	803	#endif
558		804	}
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		805
573	void	806	void
574	add_font (char *file)	807	add_font (char *file)
575	CODE:	808	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	809	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577	#ifdef _WIN32
578	// cairo... sigh... requires win2000
579	AddFontResourceEx (file, FR_PRIVATE, 0);
580	#endif
581		810
582	void	811	void
583	load_image_inline (SV *image_)	812	load_image_inline (SV *image_)
584	ALIAS:	813	ALIAS:
585	load_image_file = 1	814	load_image_file = 1
…		…
627		856
628	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	857	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629		858
630	assert (surface2->pitch == surface2->w * 4);	859	assert (surface2->pitch == surface2->w * 4);
631		860
		861	SDL_LockSurface (surface2);
632	EXTEND (SP, 5);	862	EXTEND (SP, 6);
633	PUSHs (sv_2mortal (newSViv (surface2->w)));	863	PUSHs (sv_2mortal (newSViv (surface2->w)));
634	PUSHs (sv_2mortal (newSViv (surface2->h)));	864	PUSHs (sv_2mortal (newSViv (surface2->h)));
635	SDL_LockSurface (surface2);
636	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	865	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
637	SDL_UnlockSurface (surface2);
638	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	866	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	867	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	868	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		869	SDL_UnlockSurface (surface2);
641		870
642	SDL_FreeSurface (surface);	871	SDL_FreeSurface (surface);
643	SDL_FreeSurface (surface2);	872	SDL_FreeSurface (surface2);
644	}	873	}
645		874
…		…
669	}	898	}
670		899
671	void	900	void
672	error (char *message)	901	error (char *message)
673	CODE:	902	CODE:
		903	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	904	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	905	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
		906	#endif
		907
		908	void
		909	fatal (char *message)
		910	CODE:
		911	fprintf (stderr, "FATAL: %s\n", message);
		912	#ifdef _WIN32
		913	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
		914	#endif
		915	_exit (1);
		916
		917	void
		918	_exit (int retval = 0)
		919	CODE:
		920	#ifdef WIN32
		921	ExitThread (retval); // unclean, please beam me up
676	#else	922	#else
677	fprintf (stderr, "ERROR: %s\n", message);	923	_exit (retval);
678	#endif	924	#endif
679		925
680	void	926	void
681	fatal (char *message)	927	debug ()
682	CODE:	928	CODE:
683	#ifdef _WIN32	929	{
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	930	#if DEBUG
685	#else	931	VALGRIND_DO_LEAK_CHECK;
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	932	#endif
688	exit (1);	933	}
689		934
690	MODULE = CFClient PACKAGE = CFClient::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
691		936
692	CFClient::Font	937	CFPlus::Font
693	new_from_file (SV *class, char *path, int id = 0)	938	new_from_file (SV *class, char *path, int id = 0)
694	CODE:	939	CODE:
695	{	940	{
696	int count;	941	int count;
697	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	942	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
700	}	945	}
701	OUTPUT:	946	OUTPUT:
702	RETVAL	947	RETVAL
703		948
704	void	949	void
705	DESTROY (CFClient::Font self)	950	DESTROY (CFPlus::Font self)
706	CODE:	951	CODE:
707	pango_font_description_free (self);	952	pango_font_description_free (self);
708		953
709	void	954	void
710	make_default (CFClient::Font self)	955	make_default (CFPlus::Font self)
711	CODE:	956	CODE:
712	default_font = self;	957	default_font = self;
713		958
714	MODULE = CFClient PACKAGE = CFClient::Layout	959	MODULE = CFPlus PACKAGE = CFPlus::Layout
715		960
716	CFClient::Layout	961	void
717	new (SV *class, int rgba = 0)	962	reset_glyph_cache ()
		963	CODE:
		964	tc_clear ();
		965
		966	CFPlus::Layout
		967	new (SV *class)
718	CODE:	968	CODE:
719	New (0, RETVAL, 1, struct cf_layout);	969	New (0, RETVAL, 1, struct cf_layout);
720		970
721	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	971	RETVAL->pl = pango_layout_new (opengl_context);
722	RETVAL->rgba = rgba;
723	RETVAL->r = 1.;	972	RETVAL->r = 1.;
724	RETVAL->g = 1.;	973	RETVAL->g = 1.;
725	RETVAL->b = 1.;	974	RETVAL->b = 1.;
726	RETVAL->a = 1.;	975	RETVAL->a = 1.;
727	RETVAL->base_height = MIN_FONT_HEIGHT;	976	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
731	layout_update_font (RETVAL);	980	layout_update_font (RETVAL);
732	OUTPUT:	981	OUTPUT:
733	RETVAL	982	RETVAL
734		983
735	void	984	void
736	DESTROY (CFClient::Layout self)	985	DESTROY (CFPlus::Layout self)
737	CODE:	986	CODE:
738	g_object_unref (self->pl);	987	g_object_unref (self->pl);
739	Safefree (self);	988	Safefree (self);
740		989
741	int
742	is_rgba (CFClient::Layout self)
743	CODE:
744	RETVAL = self->rgba;
745	OUTPUT:
746	RETVAL
747
748	void	990	void
749	set_text (CFClient::Layout self, SV *text_)	991	set_text (CFPlus::Layout self, SV *text_)
750	CODE:	992	CODE:
751	{	993	{
752	STRLEN textlen;	994	STRLEN textlen;
753	char *text = SvPVutf8 (text_, textlen);	995	char *text = SvPVutf8 (text_, textlen);
754		996
755	pango_layout_set_text (self->pl, text, textlen);	997	pango_layout_set_text (self->pl, text, textlen);
756	}	998	}
757		999
758	void	1000	void
759	set_markup (CFClient::Layout self, SV *text_)	1001	set_markup (CFPlus::Layout self, SV *text_)
760	CODE:	1002	CODE:
761	{	1003	{
762	STRLEN textlen;	1004	STRLEN textlen;
763	char *text = SvPVutf8 (text_, textlen);	1005	char *text = SvPVutf8 (text_, textlen);
764		1006
765	pango_layout_set_markup (self->pl, text, textlen);	1007	pango_layout_set_markup (self->pl, text, textlen);
766	}	1008	}
767		1009
		1010	void
		1011	set_shapes (CFPlus::Layout self, ...)
		1012	CODE:
		1013	{
		1014	PangoAttrList *attrs = 0;
		1015	const char *text = pango_layout_get_text (self->pl);
		1016	const char *pos = text;
		1017	int arg = 4;
		1018
		1019	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		1020	{
		1021	PangoRectangle inkrect, rect;
		1022	PangoAttribute *attr;
		1023
		1024	int x = SvIV (ST (arg - 3));
		1025	int y = SvIV (ST (arg - 2));
		1026	int w = SvIV (ST (arg - 1));
		1027	int h = SvIV (ST (arg ));
		1028
		1029	inkrect.x = 0;
		1030	inkrect.y = 0;
		1031	inkrect.width = 0;
		1032	inkrect.height = 0;
		1033
		1034	rect.x = x * PANGO_SCALE;
		1035	rect.y = y * PANGO_SCALE;
		1036	rect.width = w * PANGO_SCALE;
		1037	rect.height = h * PANGO_SCALE;
		1038
		1039	if (!attrs)
		1040	attrs = pango_layout_get_attributes (self->pl);
		1041
		1042	attr = pango_attr_shape_new (&inkrect, &rect);
		1043	attr->start_index = pos - text;
		1044	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		1045	pango_attr_list_insert (attrs, attr);
		1046
		1047	arg += 4;
		1048	pos += sizeof (OBJ_STR) - 1;
		1049	}
		1050
		1051	if (attrs)
		1052	pango_layout_set_attributes (self->pl, attrs);
		1053	}
		1054
		1055	void
		1056	get_shapes (CFPlus::Layout self)
		1057	PPCODE:
		1058	{
		1059	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		1060
		1061	do
		1062	{
		1063	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		1064
		1065	if (run && shape_attr_p (run))
		1066	{
		1067	PangoRectangle extents;
		1068	pango_layout_iter_get_run_extents (iter, 0, &extents);
		1069
		1070	EXTEND (SP, 2);
		1071	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		1072	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		1073	}
		1074	}
		1075	while (pango_layout_iter_next_run (iter));
		1076
		1077	pango_layout_iter_free (iter);
		1078	}
		1079
		1080	int
		1081	has_wrapped (CFPlus::Layout self)
		1082	CODE:
		1083	{
		1084	int lines = 1;
		1085	const char *text = pango_layout_get_text (self->pl);
		1086
		1087	while (*text)
		1088	lines += *text++ == '\n';
		1089
		1090	RETVAL = lines < pango_layout_get_line_count (self->pl);
		1091	}
		1092	OUTPUT:
		1093	RETVAL
		1094
768	SV *	1095	SV *
769	get_text (CFClient::Layout self)	1096	get_text (CFPlus::Layout self)
770	CODE:	1097	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1098	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	1099	sv_utf8_decode (RETVAL);
773	OUTPUT:	1100	OUTPUT:
774	RETVAL	1101	RETVAL
775		1102
776	void	1103	void
777	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	1104	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
778	CODE:	1105	CODE:
779	self->r = r;	1106	self->r = r;
780	self->g = g;	1107	self->g = g;
781	self->b = b;	1108	self->b = b;
782	self->a = a;	1109	self->a = a;
783		1110
784	void	1111	void
785	set_font (CFClient::Layout self, CFClient::Font font = 0)	1112	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
786	CODE:	1113	CODE:
787	if (self->font != font)	1114	if (self->font != font)
788	{	1115	{
789	self->font = font;	1116	self->font = font;
790	layout_update_font (self);	1117	layout_update_font (self);
791	}	1118	}
792		1119
793	void	1120	void
794	set_height (CFClient::Layout self, int base_height)	1121	set_height (CFPlus::Layout self, int base_height)
795	CODE:	1122	CODE:
796	if (self->base_height != base_height)	1123	if (self->base_height != base_height)
797	{	1124	{
798	self->base_height = base_height;	1125	self->base_height = base_height;
799	layout_update_font (self);	1126	layout_update_font (self);
800	}	1127	}
801		1128
802	void	1129	void
803	set_width (CFClient::Layout self, int max_width = -1)	1130	set_width (CFPlus::Layout self, int max_width = -1)
804	CODE:	1131	CODE:
805	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1132	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806		1133
807	void	1134	void
808	set_indent (CFClient::Layout self, int indent)	1135	set_indent (CFPlus::Layout self, int indent)
809	CODE:	1136	CODE:
810	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1137	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
811		1138
812	void	1139	void
813	set_spacing (CFClient::Layout self, int spacing)	1140	set_spacing (CFPlus::Layout self, int spacing)
814	CODE:	1141	CODE:
815	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1142	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
816		1143
817	void	1144	void
818	set_ellipsise (CFClient::Layout self, int ellipsise)	1145	set_ellipsise (CFPlus::Layout self, int ellipsise)
819	CODE:	1146	CODE:
820	pango_layout_set_ellipsize (self->pl,	1147	pango_layout_set_ellipsize (self->pl,
821	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1148	ellipsise == 1 ? PANGO_ELLIPSIZE_START
822	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1149	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
823	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1150	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
824	: PANGO_ELLIPSIZE_NONE	1151	: PANGO_ELLIPSIZE_NONE
825	);	1152	);
826		1153
827	void	1154	void
828	set_single_paragraph_mode (CFClient::Layout self, int spm)	1155	set_single_paragraph_mode (CFPlus::Layout self, int spm)
829	CODE:	1156	CODE:
830	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1157	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
831		1158
832	void	1159	void
833	size (CFClient::Layout self)	1160	size (CFPlus::Layout self)
834	PPCODE:	1161	PPCODE:
835	{	1162	{
836	int w, h;	1163	int w, h;
837		1164
838	layout_get_pixel_size (self, &w, &h);	1165	layout_get_pixel_size (self, &w, &h);
…		…
841	PUSHs (sv_2mortal (newSViv (w)));	1168	PUSHs (sv_2mortal (newSViv (w)));
842	PUSHs (sv_2mortal (newSViv (h)));	1169	PUSHs (sv_2mortal (newSViv (h)));
843	}	1170	}
844		1171
845	int	1172	int
		1173	descent (CFPlus::Layout self)
		1174	CODE:
		1175	{
		1176	PangoRectangle rect;
		1177	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1178	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1179	RETVAL = PANGO_DESCENT (rect);
		1180	}
		1181	OUTPUT:
		1182	RETVAL
		1183
		1184	int
846	xy_to_index (CFClient::Layout self, int x, int y)	1185	xy_to_index (CFPlus::Layout self, int x, int y)
847	CODE:	1186	CODE:
848	{	1187	{
849	int index, trailing;	1188	int index, trailing;
850	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1189	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
851	RETVAL = index;	1190	RETVAL = index + trailing;
852	}	1191	}
853	OUTPUT:	1192	OUTPUT:
854	RETVAL	1193	RETVAL
855		1194
856	void	1195	void
857	cursor_pos (CFClient::Layout self, int index)	1196	cursor_pos (CFPlus::Layout self, int index)
858	PPCODE:	1197	PPCODE:
859	{	1198	{
860	PangoRectangle strong_pos;	1199	PangoRectangle strong_pos;
861	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1200	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
862		1201
…		…
865	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1204	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
866	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1205	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
867	}	1206	}
868		1207
869	void	1208	void
870	render (CFClient::Layout self)	1209	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
871	PPCODE:	1210	PPCODE:
872	{	1211	{
873	SV *retval;	1212	int line, x;
874	int w, h;
875		1213
876	layout_get_pixel_size (self, &w, &h);	1214	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1215	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
877		1216
878	if (self->rgba)
879	{
880	cairo_surface_t *surface;
881	cairo_t *cairo;
882
883	retval = newSV (w * h * 4);
884	SvPOK_only (retval);
885	SvCUR_set (retval, w * h * 4);
886
887	memset (SvPVX (retval), 0, w * h * 4);
888
889	surface = cairo_image_surface_create_for_data (
890	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
891	cairo = cairo_create (surface);
892	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
893
894	pango_cairo_show_layout (cairo, self->pl);
895
896	cairo_destroy (cairo);
897	cairo_surface_destroy (surface);
898
899	// what a mess, and its premultiplied, too :(
900	{
901	uint32_t *p = (uint32_t *)SvPVX (retval);
902	uint32_t *e = p + w * h;
903
904	while (p < e)
905	{
906	uint32_t rgba = *p;
907	rgba = (rgba >> 24) | (rgba << 8);
908	rgba = SDL_SwapBE32 (rgba);
909	*p++ = rgba;
910	}
911	}
912
913	EXTEND (SP, 5);	1217	EXTEND (SP, 2);
914	PUSHs (sv_2mortal (newSViv (w)));	1218	PUSHs (sv_2mortal (newSViv (line - 1)));
		1219	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1220	}
		1221
		1222	void
		1223	line_x_to_index (CFPlus::Layout self, int line, int x)
		1224	PPCODE:
		1225	{
		1226	PangoLayoutLine *lp;
		1227	int index, trailing;
		1228
		1229	if (line < 0)
		1230	XSRETURN_EMPTY;
		1231
		1232	if (!(lp = pango_layout_get_line (self->pl, line)))
		1233	XSRETURN_EMPTY; /* do better */
		1234
		1235	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1236
		1237	EXTEND (SP, 2);
		1238	if (GIMME_V == G_SCALAR)
915	PUSHs (sv_2mortal (newSViv (h)));	1239	PUSHs (sv_2mortal (newSViv (index + trailing)));
916	PUSHs (sv_2mortal (retval));
917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
919	}
920	else	1240	else
921	{	1241	{
922	FT_Bitmap bitmap;
923
924	retval = newSV (w * h);
925	SvPOK_only (retval);
926	SvCUR_set (retval, w * h);
927
928	bitmap.rows = h;
929	bitmap.width = w;
930	bitmap.pitch = w;
931	bitmap.buffer = (unsigned char*)SvPVX (retval);
932	bitmap.num_grays = 256;
933	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
934
935	memset (bitmap.buffer, 0, w * h);
936
937	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
938
939	EXTEND (SP, 5);
940	PUSHs (sv_2mortal (newSViv (w)));	1242	PUSHs (sv_2mortal (newSViv (index)));
941	PUSHs (sv_2mortal (newSViv (h)));	1243	PUSHs (sv_2mortal (newSViv (trailing)));
942	PUSHs (sv_2mortal (retval));
943	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
945	}	1244	}
946	}	1245	}
947		1246
		1247	void
		1248	render (CFPlus::Layout self, float x, float y, int flags = 0)
		1249	PPCODE:
		1250	pango_opengl_render_layout_subpixel (
		1251	self->pl,
		1252	x * PANGO_SCALE, y * PANGO_SCALE,
		1253	self->r, self->g, self->b, self->a,
		1254	flags
		1255	);
		1256
948	MODULE = CFClient PACKAGE = CFClient::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
949		1258
		1259	int minpot (int n)
		1260
950	void	1261	void
		1262	pad2pot (SV *data_, SV *w_, SV *h_)
		1263	CODE:
		1264	{
		1265	int ow = SvIV (w_);
		1266	int oh = SvIV (h_);
		1267
		1268	if (ow && oh)
		1269	{
		1270	int nw = minpot (ow);
		1271	int nh = minpot (oh);
		1272
		1273	if (nw != ow || nh != oh)
		1274	{
		1275	if (SvOK (data_))
		1276	{
		1277	STRLEN datalen;
		1278	char *data = SvPVbyte (data_, datalen);
		1279	int bpp = datalen / (ow * oh);
		1280	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
		1281
		1282	SvPOK_only (result_);
		1283	SvCUR_set (result_, nw * nh * bpp);
		1284
		1285	memset (SvPVX (result_), 0, nw * nh * bpp);
		1286	while (oh--)
		1287	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1288
		1289	sv_setsv (data_, result_);
		1290	}
		1291
		1292	sv_setiv (w_, nw);
		1293	sv_setiv (h_, nh);
		1294	}
		1295	}
		1296	}
		1297
		1298	void
951	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1299	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
952	PROTOTYPE: $$$;$$	1300	PROTOTYPE: $$$;$$
953	ALIAS:	1301	ALIAS:
954	draw_quad_alpha = 1	1302	draw_quad_alpha = 1
955	draw_quad_alpha_premultiplied = 2	1303	draw_quad_alpha_premultiplied = 2
956	CODE:	1304	CODE:
957	{	1305	{
958	HV *hv = (HV *)SvRV (self);	1306	HV *hv = (HV *)SvRV (self);
959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1307	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1308	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1309	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963		1310
964	if (items < 5)	1311	if (items < 5)
965	{	1312	{
966	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1313	w = SvNV (*hv_fetch (hv, "w", 1, 1));
967	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1314	h = SvNV (*hv_fetch (hv, "h", 1, 1));
968	}	1315	}
969		1316
970	if (ix)	1317	if (ix)
971	{	1318	{
972	glEnable (GL_BLEND);	1319	glEnable (GL_BLEND);
		1320
		1321	if (ix == 2)
973	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1322	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1323	else
		1324	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1325	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1326
		1327	glEnable (GL_ALPHA_TEST);
		1328	glAlphaFunc (GL_GREATER, 0.01f);
974	}	1329	}
975		1330
976	glBindTexture (GL_TEXTURE_2D, name);	1331	glBindTexture (GL_TEXTURE_2D, name);
977
978	if (wrap_mode)
979	{
980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982	}
983		1332
984	glBegin (GL_QUADS);	1333	glBegin (GL_QUADS);
985	glTexCoord2f (0, 0); glVertex2f (x , y );	1334	glTexCoord2f (0, 0); glVertex2f (x , y );
986	glTexCoord2f (0, t); glVertex2f (x , y + h);	1335	glTexCoord2f (0, t); glVertex2f (x , y + h);
987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1336	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1337	glTexCoord2f (s, 0); glVertex2f (x + w, y );
989	glEnd ();	1338	glEnd ();
990		1339
991	if (ix)	1340	if (ix)
		1341	{
		1342	glDisable (GL_ALPHA_TEST);
992	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
		1344	}
993	}	1345	}
994		1346
		1347	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1348	CODE:
		1349	{
		1350	GLint width;
		1351	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1352	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1353	RETVAL = width > 0;
		1354	}
		1355	OUTPUT:
		1356	RETVAL
		1357
995	MODULE = CFClient PACKAGE = CFClient::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
996		1359
997	CFClient::Map	1360	CFPlus::Map
998	new (SV *class, int map_width, int map_height)	1361	new (SV *class)
999	CODE:	1362	CODE:
1000	New (0, RETVAL, 1, struct map);	1363	New (0, RETVAL, 1, struct map);
1001	RETVAL->x = 0;	1364	RETVAL->x = 0;
1002	RETVAL->y = 0;	1365	RETVAL->y = 0;
1003	RETVAL->w = map_width;	1366	RETVAL->w = 0;
1004	RETVAL->h = map_height;	1367	RETVAL->h = 0;
1005	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
1006	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
1007	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1008	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1009	RETVAL->texs = 8192;
1010	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1011	RETVAL->rows = 0;	1372	RETVAL->rows = 0;
1012	RETVAL->row = 0;	1373	RETVAL->row = 0;
1013	OUTPUT:	1374	OUTPUT:
1014	RETVAL	1375	RETVAL
1015		1376
1016	void	1377	void
1017	DESTROY (CFClient::Map self)	1378	DESTROY (CFPlus::Map self)
1018	CODE:	1379	CODE:
1019	{	1380	{
1020	map_clear (self);	1381	map_clear (self);
1021	Safefree (self->face);	1382	Safefree (self->face2tile);
		1383	Safefree (self->tex);
1022	Safefree (self);	1384	Safefree (self);
1023	}	1385	}
1024		1386
1025	void	1387	void
		1388	resize (CFPlus::Map self, int map_width, int map_height)
		1389	CODE:
		1390	self->w = map_width;
		1391	self->h = map_height;
		1392
		1393	void
1026	clear (CFClient::Map self)	1394	clear (CFPlus::Map self)
1027	CODE:	1395	CODE:
1028	map_clear (self);	1396	map_clear (self);
1029		1397
1030	void	1398	void
1031	set_face (CFClient::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1032	CODE:	1400	CODE:
1033	{	1401	{
1034	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1035	{	1403	need_texid (self, tile);
1036	Append (mapface, self->face, self->faces, self->faces);
1037	self->faces *= 2;
1038	}
1039
1040	self->face [face] = texid;
1041	}	1404	}
1042		1405
1043	void	1406	void
		1407	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1408	CODE:
		1409	{
		1410	tileid texid;
		1411	maptex *tex;
		1412
		1413	if (face < 0 || face >= self->faces)
		1414	return;
		1415
		1416	if (smooth < 0 || smooth >= self->faces)
		1417	return;
		1418
		1419	texid = self->face2tile [face];
		1420
		1421	if (!texid)
		1422	return;
		1423
		1424	tex = self->tex + texid;
		1425	tex->smoothtile = self->face2tile [smooth];
		1426	tex->smoothlevel = level;
		1427	}
		1428
		1429	void
1044	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)	1430	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)
1045	CODE:	1431	CODE:
1046	{	1432	{
1047	while (self->texs <= texid)	1433	need_texid (self, texid);
1048	{
1049	Append (maptex, self->tex, self->texs, self->texs);
1050	self->texs *= 2;
1051	}
1052		1434
1053	{	1435	{
1054	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1055		1437
1056	tex->name = name;	1438	tex->name = name;
…		…
1061	tex->r = r;	1443	tex->r = r;
1062	tex->g = g;	1444	tex->g = g;
1063	tex->b = b;	1445	tex->b = b;
1064	tex->a = a;	1446	tex->a = a;
1065	}	1447	}
		1448
		1449	// somewhat hackish, but for textures that require it, it really
		1450	// improves the look, and most others don't suffer.
		1451	glBindTexture (GL_TEXTURE_2D, name);
		1452	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1453	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1454	// use uglier nearest interpolation because linear suffers
		1455	// from transparent color bleeding and ugly wrapping effects.
		1456	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1066	}	1457	}
1067		1458
1068	int	1459	int
1069	ox (CFClient::Map self)	1460	ox (CFPlus::Map self)
1070	ALIAS:	1461	ALIAS:
1071	oy = 1	1462	oy = 1
		1463	x = 2
		1464	y = 3
		1465	w = 4
		1466	h = 5
1072	CODE:	1467	CODE:
1073	switch (ix)	1468	switch (ix)
1074	{	1469	{
1075	case 0: RETVAL = self->ox; break;	1470	case 0: RETVAL = self->ox; break;
1076	case 1: RETVAL = self->oy; break;	1471	case 1: RETVAL = self->oy; break;
		1472	case 2: RETVAL = self->x; break;
		1473	case 3: RETVAL = self->y; break;
		1474	case 4: RETVAL = self->w; break;
		1475	case 5: RETVAL = self->h; break;
1077	}	1476	}
1078	OUTPUT:	1477	OUTPUT:
1079	RETVAL	1478	RETVAL
1080		1479
1081	void	1480	void
1082	scroll (CFClient::Map self, int dx, int dy)	1481	scroll (CFPlus::Map self, int dx, int dy)
1083	CODE:	1482	CODE:
1084	{	1483	{
1085	if (dx > 0)	1484	if (dx > 0)
1086	map_blank (self, self->x, self->y, dx - 1, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1087	else if (dx < 0)	1486	else if (dx < 0)
1088	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1487	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1089		1488
1090	if (dy > 0)	1489	if (dy > 0)
1091	map_blank (self, self->x, self->y, self->w, dy - 1);	1490	map_blank (self, self->x, self->y, self->w, dy);
1092	else if (dy < 0)	1491	else if (dy < 0)
1093	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1492	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1094		1493
1095	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1096	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1097		1496
1098	while (self->y < 0)	1497	while (self->y < 0)
…		…
1103	self->y += MAP_EXTEND_Y;	1502	self->y += MAP_EXTEND_Y;
1104	}	1503	}
1105	}	1504	}
1106		1505
1107	void	1506	void
1108	map1a_update (CFClient::Map self, SV *data_)	1507	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1109	CODE:	1508	CODE:
1110	{	1509	{
1111	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1510	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1112	uint8_t *data_end = (uint8_t *)SvEND (data_);	1511	uint8_t *data_end = (uint8_t *)SvEND (data_);
1113	mapcell *cell;	1512	mapcell *cell;
1114	int x, y, flags;	1513	int x, y, flags;
1115		1514
1116	while (data < data_end)	1515	while (data < data_end - 1)
1117	{	1516	{
1118	flags = (data [0] << 8) + data [1]; data += 2;	1517	flags = (data [0] << 8) + data [1]; data += 2;
1119		1518
1120	x = ((flags >> 10) & 63) + self->x;	1519	x = self->x + ((flags >> 10) & 63);
1121	y = ((flags >> 4) & 63) + self->y;	1520	y = self->y + ((flags >> 4) & 63);
1122		1521
1123	cell = map_get_cell (self, x, y);	1522	cell = map_get_cell (self, x, y);
1124		1523
1125	if (flags & 15)	1524	if (flags & 15)
1126	{	1525	{
1127	if (cell->darkness < 0)	1526	if (!cell->darkness)
1128	{	1527	{
		1528	memset (cell, 0, sizeof (*cell));
1129	cell->darkness = 0;	1529	cell->darkness = 256;
1130	cell->face [0] = 0;
1131	cell->face [1] = 0;
1132	cell->face [2] = 0;
1133	}	1530	}
1134		1531
1135	cell->darkness = flags & 8 ? *data++ : 255;
1136
1137	//TODO: don't trust server data to be in-range(!)	1532	//TODO: don't trust server data to be in-range(!)
		1533
		1534	if (flags & 8)
		1535	{
		1536	if (extmap)
		1537	{
		1538	uint8_t ext, cmd;
		1539
		1540	do
		1541	{
		1542	ext = *data++;
		1543	cmd = ext & 0x3f;
		1544
		1545	if (cmd < 4)
		1546	cell->darkness = 255 - ext * 64 + 1;
		1547	else if (cmd == 5) // health
		1548	{
		1549	cell->stat_width = 1;
		1550	cell->stat_hp = *data++;
		1551	}
		1552	else if (cmd == 6) // monster width
		1553	cell->stat_width = *data++ + 1;
		1554	else if (cmd == 0x47)
		1555	{
		1556	if (*data == 4)
		1557	; // decode player count
		1558
		1559	data += *data + 1;
		1560	}
		1561	else if (cmd == 8) // cell flags
		1562	cell->flags = *data++;
		1563	else if (ext & 0x40) // unknown, multibyte => skip
		1564	data += *data + 1;
		1565	else
		1566	data++;
		1567	}
		1568	while (ext & 0x80);
		1569	}
		1570	else
		1571	cell->darkness = *data++ + 1;
		1572	}
1138		1573
1139	if (flags & 4)	1574	if (flags & 4)
1140	{	1575	{
1141	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1576	faceid face = (data [0] << 8) + data [1]; data += 2;
		1577	need_facenum (self, face);
		1578	cell->tile [0] = self->face2tile [face];
1142	}	1579	}
1143		1580
1144	if (flags & 2)	1581	if (flags & 2)
1145	{	1582	{
1146	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1583	faceid face = (data [0] << 8) + data [1]; data += 2;
		1584	need_facenum (self, face);
		1585	cell->tile [1] = self->face2tile [face];
1147	}	1586	}
1148		1587
1149	if (flags & 1)	1588	if (flags & 1)
1150	{	1589	{
1151	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1590	faceid face = (data [0] << 8) + data [1]; data += 2;
		1591	need_facenum (self, face);
		1592	cell->tile [2] = self->face2tile [face];
1152	}	1593	}
1153	}	1594	}
1154	else	1595	else
1155	cell->darkness = -1;	1596	cell->darkness = 0;
1156	}	1597	}
1157	}	1598	}
1158		1599
1159	SV *	1600	SV *
1160	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1601	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1161	CODE:	1602	CODE:
1162	{	1603	{
1163	int x1, x;	1604	int x1, x;
1164	int y1, y;	1605	int y1, y;
1165	int z;	1606	int z;
…		…
1186	{	1627	{
1187	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1188		1629
1189	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1190	{	1631	{
1191	mapface face = cell->face [z];
1192
1193	if (face)
1194	{
1195	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1196	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1197	int a1 = tex.a;	1634	int a1 = tex.a;
1198		1635
1199	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1200	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1201	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1202	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1203	}
1204	}	1640	}
1205	}	1641	}
1206		1642
1207	*map++ = (r )	1643	*map++ = (r )
1208	| (g << 8)	1644	| (g << 8)
…		…
1215	}	1651	}
1216	OUTPUT:	1652	OUTPUT:
1217	RETVAL	1653	RETVAL
1218		1654
1219	void	1655	void
1220	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1656	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1221	PPCODE:	1657	CODE:
1222	{	1658	{
1223	int vx, vy;	1659	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1660	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1661	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1662	smooth_key skey;
1224	int x, y, z;	1663	int x, y, z;
1225	int last_name;	1664	int last_name;
1226	mapface face;	1665
		1666	// thats current max. sorry.
		1667	if (sw > 255) sw = 255;
		1668	if (sh > 255) sh = 255;
		1669
		1670	// clear key, in case of extra padding
		1671	memset (&skey, 0, sizeof (skey));
		1672
		1673	glColor4ub (255, 255, 255, 255);
		1674
		1675	glEnable (GL_BLEND);
		1676	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1677	glEnable (GL_TEXTURE_2D);
		1678	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1679
		1680	glBegin (GL_QUADS);
		1681
		1682	last_name = 0;
		1683
		1684	mx += self->x;
		1685	my += self->y;
		1686
		1687	// first pass: determine smooth_max
		1688	// rather ugly, if you ask me
		1689	// could also be stored inside mapcell and updated on change
		1690	memset (smooth_max, 0, sizeof (smooth_max));
		1691
		1692	for (y = 0; y < sh; y++)
		1693	if (0 <= y + my && y + my < self->rows)
		1694	{
		1695	maprow *row = self->row + (y + my);
		1696
		1697	for (x = 0; x < sw; x++)
		1698	if (row->c0 <= x + mx && x + mx < row->c1)
		1699	{
		1700	mapcell *cell = row->col + (x + mx - row->c0);
		1701
		1702	smooth_max[x + 1][y + 1] =
		1703	MAX (self->tex [cell->tile [0]].smoothlevel,
		1704	MAX (self->tex [cell->tile [1]].smoothlevel,
		1705	self->tex [cell->tile [2]].smoothlevel));
		1706	}
		1707	}
		1708
		1709	for (z = 0; z <= 2; z++)
		1710	{
		1711	memset (smooth_level, 0, sizeof (smooth_level));
		1712
		1713	for (y = 0; y < sh; y++)
		1714	if (0 <= y + my && y + my < self->rows)
		1715	{
		1716	maprow *row = self->row + (y + my);
		1717
		1718	for (x = 0; x < sw; x++)
		1719	if (row->c0 <= x + mx && x + mx < row->c1)
		1720	{
		1721	mapcell *cell = row->col + (x + mx - row->c0);
		1722	tileid tile = cell->tile [z];
		1723
		1724	if (tile)
		1725	{
		1726	maptex tex = self->tex [tile];
		1727	int px = (x + 1) * T - tex.w;
		1728	int py = (y + 1) * T - tex.h;
		1729
		1730	// suppressing texture state switches here
		1731	// is only moderately effective, but worth the extra effort
		1732	if (last_name != tex.name)
		1733	{
		1734	if (!tex.name)
		1735	tex = self->tex [2]; /* missing, replace by noface */
		1736
		1737	glEnd ();
		1738	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1739	glBegin (GL_QUADS);
		1740	}
		1741
		1742	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1743	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1744	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1745	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1746
		1747	if (cell->flags && z == 2)
		1748	{
		1749	if (cell->flags & 1)
		1750	{
		1751	maptex tex = self->tex [1];
		1752	int px = x * T + T * 2 / 32;
		1753	int py = y * T - T * 6 / 32;
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758
		1759	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1760	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1761	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1762	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1763	}
		1764	}
		1765
		1766	// update smooth hash
		1767	if (tex.smoothtile)
		1768	{
		1769	skey.tile = tex.smoothtile;
		1770	skey.level = tex.smoothlevel;
		1771
		1772	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1773
		1774	// add bits to current tile and all neighbours. skey.x|y is
		1775	// shifted +1|+1 so we always stay positive.
		1776
		1777	// bits is ___n cccc CCCC bbbb
		1778	// n do not draw borders&corners
		1779	// c draw these corners, but...
		1780	// C ... not these
		1781	// b draw these borders
		1782
		1783	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1784	// ┃· ·· ·┃ ━━
		1785
		1786	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1787	// ·· ·· ·┏ ┓·
		1788
		1789	// full tile
		1790	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1791
		1792	// borders
		1793	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1794	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1795	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1796	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1797
		1798	// corners
		1799	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1800	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1801	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1802	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1803	}
		1804	}
		1805	}
		1806	}
		1807
		1808	// go through all smoothlevels, lowest to highest, then draw.
		1809	// this is basically counting sort
		1810	{
		1811	int w, b;
		1812
		1813	for (w = 0; w < 256 / 32; ++w)
		1814	{
		1815	uint32_t smask = smooth_level [w];
		1816	if (smask)
		1817	for (b = 0; b < 32; ++b)
		1818	if (smask & (((uint32_t)1) << b))
		1819	{
		1820	int level = (w << 5) | b;
		1821	HE *he;
		1822
		1823	hv_iterinit (smooth);
		1824	while ((he = hv_iternext (smooth)))
		1825	{
		1826	smooth_key *skey = (smooth_key *)HeKEY (he);
		1827	IV bits = SvIVX (HeVAL (he));
		1828
		1829	if (!(bits & 0x1000)
		1830	&& skey->level == level
		1831	&& level > smooth_max [skey->x][skey->y])
		1832	{
		1833	maptex tex = self->tex [skey->tile];
		1834	int px = (((int)skey->x) - 1) * T;
		1835	int py = (((int)skey->y) - 1) * T;
		1836	int border = bits & 15;
		1837	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1838	float dx = tex.s * .0625f; // 16 images/row
		1839	float dy = tex.t * .5f ; // 2 images/column
		1840
		1841	// this time naively avoiding texture state changes
		1842	// save gobs of state changes.
		1843	if (last_name != tex.name)
		1844	{
		1845	if (!tex.name)
		1846	continue; // smoothing not yet available
		1847
		1848	glEnd ();
		1849	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1850	glBegin (GL_QUADS);
		1851	}
		1852
		1853	if (border)
		1854	{
		1855	float ox = border * dx;
		1856
		1857	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1858	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1859	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1860	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1861	}
		1862
		1863	if (corner)
		1864	{
		1865	float ox = corner * dx;
		1866
		1867	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1868	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1869	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1870	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1871	}
		1872	}
		1873	}
		1874	}
		1875	}
		1876	}
		1877
		1878	hv_clear (smooth);
		1879	}
		1880
		1881	glEnd ();
		1882
		1883	glDisable (GL_TEXTURE_2D);
		1884	glDisable (GL_BLEND);
		1885
		1886	// top layer: overlays such as the health bar
		1887	for (y = 0; y < sh; y++)
		1888	if (0 <= y + my && y + my < self->rows)
		1889	{
		1890	maprow *row = self->row + (y + my);
		1891
		1892	for (x = 0; x < sw; x++)
		1893	if (row->c0 <= x + mx && x + mx < row->c1)
		1894	{
		1895	mapcell *cell = row->col + (x + mx - row->c0);
		1896
		1897	int px = x * T;
		1898	int py = y * T;
		1899
		1900	if (cell->stat_hp)
		1901	{
		1902	int width = cell->stat_width * T;
		1903	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1904
		1905	glColor3ub (0, 0, 0);
		1906	glRectf (px + 1, py - thick - 2,
		1907	px + width - 1, py);
		1908
		1909	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1910	glRectf (px + 2,
		1911	py - thick - 1,
		1912	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1913	}
		1914	}
		1915	}
		1916	}
		1917
		1918	void
		1919	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1920	CODE:
		1921	{
		1922	static float color[16][3] = {
		1923	{ 0.00F, 0.00F, 0.00F },
		1924	{ 1.00F, 1.00F, 1.00F },
		1925	{ 0.00F, 0.00F, 0.55F },
		1926	{ 1.00F, 0.00F, 0.00F },
		1927
		1928	{ 1.00F, 0.54F, 0.00F },
		1929	{ 0.11F, 0.56F, 1.00F },
		1930	{ 0.93F, 0.46F, 0.00F },
		1931	{ 0.18F, 0.54F, 0.34F },
		1932
		1933	{ 0.56F, 0.73F, 0.56F },
		1934	{ 0.80F, 0.80F, 0.80F },
		1935	{ 0.55F, 0.41F, 0.13F },
		1936	{ 0.99F, 0.77F, 0.26F },
		1937
		1938	{ 0.74F, 0.65F, 0.41F },
		1939
		1940	{ 0.00F, 1.00F, 1.00F },
		1941	{ 1.00F, 0.00F, 1.00F },
		1942	{ 1.00F, 1.00F, 0.00F },
		1943	};
		1944
		1945	int x, y;
		1946
		1947	glEnable (GL_TEXTURE_2D);
		1948	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1949	glEnable (GL_BLEND);
		1950	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1951	glBegin (GL_QUADS);
		1952
		1953	for (y = 0; y < h; y++)
		1954	for (x = 0; x < w; x++)
		1955	{
		1956	unsigned char m = data [x + y * w];
		1957
		1958	if (m)
		1959	{
		1960	float *c = color [m & 15];
		1961
		1962	float tx1 = m & 0x40 ? 0.5 : 0.;
		1963	float tx2 = tx1 + 0.5;
		1964
		1965	glColor4f (c[0], c[1], c[2], 0.75);
		1966	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1967	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1968	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1969	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1970	}
		1971	}
		1972
		1973	glEnd ();
		1974	glDisable (GL_BLEND);
		1975	glDisable (GL_TEXTURE_2D);
		1976	}
		1977
		1978	void
		1979	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
		1980	PPCODE:
		1981	{
		1982	int x, y;
1227	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1228	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1984	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1229	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1985	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1230		1986
1231	memset (darkness, 255, sw4 * sh);	1987	memset (darkness, 255, sw4 * sh);
1232	SvPOK_only (darkness_sv);	1988	SvPOK_only (darkness_sv);
1233	SvCUR_set (darkness_sv, sw4 * sh);	1989	SvCUR_set (darkness_sv, sw4 * sh);
1234		1990
1235	vx = self->x + (self->w - sw) / 2 - shift_x;	1991	mx += self->x;
1236	vy = self->y + (self->h - sh) / 2 - shift_y;	1992	my += self->y;
1237		1993
1238	/*
1239	int vx = self->vx = self->w >= sw
1240	? self->x + (self->w - sw) / 2
1241	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1242
1243	int vy = self->vy = self->h >= sh
1244	? self->y + (self->h - sh) / 2
1245	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1246	*/
1247
1248	glColor4ub (255, 255, 255, 255);
1249
1250	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1251	glEnable (GL_BLEND);
1252	glEnable (GL_TEXTURE_2D);
1253	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1254
1255	glBegin (GL_QUADS);
1256
1257	last_name = 0;
1258
1259	for (z = 0; z < 3; z++)
1260	for (y = 0; y < sh; y++)	1994	for (y = 0; y < sh; y++)
1261	if (0 <= y + vy && y + vy < self->rows)	1995	if (0 <= y + my && y + my < self->rows)
1262	{	1996	{
1263	maprow *row = self->row + (y + vy);	1997	maprow *row = self->row + (y + my);
1264		1998
1265	for (x = 0; x < sw; x++)	1999	for (x = 0; x < sw; x++)
1266	if (row->c0 <= x + vx && x + vx < row->c1)	2000	if (row->c0 <= x + mx && x + mx < row->c1)
1267	{	2001	{
1268	mapcell *cell = row->col + (x + vx - row->c0);	2002	mapcell *cell = row->col + (x + mx - row->c0);
1269		2003
1270	darkness[y * sw4 + x] = cell->darkness < 0	2004	darkness[y * sw4 + x] = cell->darkness
		2005	? 255 - (cell->darkness - 1)
1271	? 255 - FOW_DARKNESS	2006	: 255 - FOW_DARKNESS;
1272	: 255 - cell->darkness;
1273
1274	face = cell->face [z];
1275
1276	if (face)
1277	{
1278	maptex tex = self->tex [face];
1279
1280	int px = (x + 1) * 32 - tex.w;
1281	int py = (y + 1) * 32 - tex.h;
1282
1283	if (last_name != tex.name)
1284	{
1285	glEnd ();
1286	last_name = tex.name;
1287	glBindTexture (GL_TEXTURE_2D, last_name);
1288	glBegin (GL_QUADS);
1289	}
1290
1291	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1292	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1293	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1294	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1295	}
1296	}	2007	}
1297	}	2008	}
1298
1299	glEnd ();
1300
1301	glDisable (GL_TEXTURE_2D);
1302	glDisable (GL_BLEND);
1303		2009
1304	EXTEND (SP, 3);	2010	EXTEND (SP, 3);
1305	PUSHs (sv_2mortal (newSViv (sw4)));	2011	PUSHs (sv_2mortal (newSViv (sw4)));
1306	PUSHs (sv_2mortal (newSViv (sh)));	2012	PUSHs (sv_2mortal (newSViv (sh)));
1307	PUSHs (darkness_sv);	2013	PUSHs (darkness_sv);
1308	}	2014	}
1309		2015
1310	SV *	2016	SV *
1311	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	2017	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1312	CODE:	2018	CODE:
1313	{	2019	{
1314	int x, y, x1, y1;	2020	int x, y, x1, y1;
1315	SV *data_sv = newSV (w * h * 7 + 5);	2021	SV *data_sv = newSV (w * h * 7 + 5);
1316	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2022	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1341	if (row && row->c0 <= x && x < row->c1)	2047	if (row && row->c0 <= x && x < row->c1)
1342	{	2048	{
1343	mapcell *cell = row->col + (x - row->c0);	2049	mapcell *cell = row->col + (x - row->c0);
1344	uint8_t flags = 0;	2050	uint8_t flags = 0;
1345		2051
1346	if (cell->face [0]) flags |= 1;	2052	if (cell->tile [0]) flags |= 1;
1347	if (cell->face [1]) flags |= 2;	2053	if (cell->tile [1]) flags |= 2;
1348	if (cell->face [2]) flags |= 4;	2054	if (cell->tile [2]) flags |= 4;
1349		2055
1350	*data++ = flags;	2056	*data++ = flags;
1351		2057
1352	if (flags & 1)	2058	if (flags & 1)
1353	{	2059	{
		2060	tileid tile = cell->tile [0];
1354	*data++ = cell->face [0] >> 8;	2061	*data++ = tile >> 8;
1355	*data++ = cell->face [0];	2062	*data++ = tile;
1356	}	2063	}
1357		2064
1358	if (flags & 2)	2065	if (flags & 2)
1359	{	2066	{
		2067	tileid tile = cell->tile [1];
1360	*data++ = cell->face [1] >> 8;	2068	*data++ = tile >> 8;
1361	*data++ = cell->face [1];	2069	*data++ = tile;
1362	}	2070	}
1363		2071
1364	if (flags & 4)	2072	if (flags & 4)
1365	{	2073	{
		2074	tileid tile = cell->tile [2];
1366	*data++ = cell->face [2] >> 8;	2075	*data++ = tile >> 8;
1367	*data++ = cell->face [2];	2076	*data++ = tile;
1368	}	2077	}
1369	}	2078	}
1370	else	2079	else
1371	*data++ = 0;	2080	*data++ = 0;
1372	}	2081	}
…		…
1378	}	2087	}
1379	OUTPUT:	2088	OUTPUT:
1380	RETVAL	2089	RETVAL
1381		2090
1382	void	2091	void
1383	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2092	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1384	PPCODE:	2093	PPCODE:
1385	{	2094	{
1386	int x, y, z;	2095	int x, y, z;
1387	int w, h;	2096	int w, h;
1388	int x1, y1;	2097	int x1, y1;
…		…
1412	{	2121	{
1413	uint8_t flags = *data++;	2122	uint8_t flags = *data++;
1414		2123
1415	if (flags)	2124	if (flags)
1416	{	2125	{
1417	mapface face[3] = { 0, 0, 0 };
1418
1419	mapcell *cell = row_get_cell (row, x);	2126	mapcell *cell = row_get_cell (row, x);
		2127	tileid tile[3] = { 0, 0, 0 };
1420		2128
1421	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2129	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1422	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2130	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1423	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2131	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1424		2132
1425	if (cell->darkness <= 0)	2133	if (cell->darkness == 0)
1426	{	2134	{
1427	cell->darkness = -1;	2135	cell->darkness = 0;
1428		2136
1429	for (z = 0; z <= 2; z++)	2137	for (z = 0; z <= 2; z++)
1430	{	2138	{
1431	cell->face[z] = face[z];	2139	tileid t = tile [z];
1432		2140
1433	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2141	if (t >= self->texs || (t && !self->tex [t].name))
		2142	{
1434	XPUSHs (sv_2mortal (newSViv (face[z])));	2143	XPUSHs (sv_2mortal (newSViv (t)));
		2144	need_texid (self, t);
		2145	}
		2146
		2147	cell->tile [z] = t;
1435	}	2148	}
1436	}	2149	}
1437	}	2150	}
1438	}	2151	}
1439	}	2152	}
1440	}	2153	}
1441		2154
1442	MODULE = CFClient PACKAGE = CFClient::MixChunk	2155	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1443		2156
1444	CFClient::MixChunk	2157	CFPlus::MixChunk
1445	new_from_file (SV *class, char *path)	2158	new_from_file (SV *class, char *path)
1446	CODE:	2159	CODE:
1447	RETVAL = Mix_LoadWAV (path);	2160	RETVAL = Mix_LoadWAV (path);
1448	OUTPUT:	2161	OUTPUT:
1449	RETVAL	2162	RETVAL
1450		2163
1451	void	2164	void
1452	DESTROY (CFClient::MixChunk self)	2165	DESTROY (CFPlus::MixChunk self)
1453	CODE:	2166	CODE:
1454	Mix_FreeChunk (self);	2167	Mix_FreeChunk (self);
1455		2168
1456	int	2169	int
1457	volume (CFClient::MixChunk self, int volume = -1)	2170	volume (CFPlus::MixChunk self, int volume = -1)
1458	CODE:	2171	CODE:
1459	RETVAL = Mix_VolumeChunk (self, volume);	2172	RETVAL = Mix_VolumeChunk (self, volume);
1460	OUTPUT:	2173	OUTPUT:
1461	RETVAL	2174	RETVAL
1462		2175
1463	int	2176	int
1464	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2177	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1465	CODE:	2178	CODE:
1466	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2179	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1467	OUTPUT:	2180	OUTPUT:
1468	RETVAL	2181	RETVAL
1469		2182
1470	MODULE = CFClient PACKAGE = CFClient::MixMusic	2183	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1471		2184
1472	int	2185	int
1473	volume (int volume = -1)	2186	volume (int volume = -1)
1474	CODE:	2187	CODE:
1475	RETVAL = Mix_VolumeMusic (volume);	2188	RETVAL = Mix_VolumeMusic (volume);
1476	OUTPUT:	2189	OUTPUT:
1477	RETVAL	2190	RETVAL
1478		2191
		2192	int
		2193	fade_out (int ms)
		2194	CODE:
		2195	RETVAL = Mix_FadeOutMusic (ms);
		2196	OUTPUT:
		2197	RETVAL
		2198
1479	CFClient::MixMusic	2199	CFPlus::MixMusic
1480	new_from_file (SV *class, char *path)	2200	new_from_file (SV *class, char *path)
1481	CODE:	2201	CODE:
1482	RETVAL = Mix_LoadMUS (path);	2202	RETVAL = Mix_LoadMUS (path);
1483	OUTPUT:	2203	OUTPUT:
1484	RETVAL	2204	RETVAL
1485		2205
1486	void	2206	void
1487	DESTROY (CFClient::MixMusic self)	2207	DESTROY (CFPlus::MixMusic self)
1488	CODE:	2208	CODE:
1489	Mix_FreeMusic (self);	2209	Mix_FreeMusic (self);
1490		2210
1491	int	2211	int
1492	play (CFClient::MixMusic self, int loops = -1)	2212	play (CFPlus::MixMusic self, int loops = -1)
1493	CODE:	2213	CODE:
1494	RETVAL = Mix_PlayMusic (self, loops);	2214	RETVAL = Mix_PlayMusic (self, loops);
1495	OUTPUT:	2215	OUTPUT:
1496	RETVAL	2216	RETVAL
1497		2217
		2218	int
		2219	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2220	CODE:
		2221	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2222	OUTPUT:
		2223	RETVAL
		2224
1498	MODULE = CFClient PACKAGE = CFClient::OpenGL	2225	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1499		2226
1500	BOOT:	2227	BOOT:
1501	{	2228	{
1502	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2229	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1503	static const struct {	2230	static const struct {
1504	const char *name;	2231	const char *name;
1505	IV iv;	2232	IV iv;
1506	} *civ, const_iv[] = {	2233	} *civ, const_iv[] = {
1507	# define const_iv(name) { # name, (IV)name }	2234	# define const_iv(name) { # name, (IV)name }
		2235	const_iv (GL_VENDOR),
		2236	const_iv (GL_VERSION),
		2237	const_iv (GL_EXTENSIONS),
1508	const_iv (GL_COLOR_MATERIAL),	2238	const_iv (GL_COLOR_MATERIAL),
1509	const_iv (GL_SMOOTH),	2239	const_iv (GL_SMOOTH),
1510	const_iv (GL_FLAT),	2240	const_iv (GL_FLAT),
1511	const_iv (GL_DITHER),	2241	const_iv (GL_DITHER),
1512	const_iv (GL_BLEND),	2242	const_iv (GL_BLEND),
		2243	const_iv (GL_CULL_FACE),
1513	const_iv (GL_SCISSOR_TEST),	2244	const_iv (GL_SCISSOR_TEST),
		2245	const_iv (GL_DEPTH_TEST),
		2246	const_iv (GL_ALPHA_TEST),
		2247	const_iv (GL_NORMALIZE),
		2248	const_iv (GL_RESCALE_NORMAL),
		2249	const_iv (GL_FRONT),
		2250	const_iv (GL_BACK),
1514	const_iv (GL_AND),	2251	const_iv (GL_AND),
1515	const_iv (GL_ONE),	2252	const_iv (GL_ONE),
1516	const_iv (GL_ZERO),	2253	const_iv (GL_ZERO),
1517	const_iv (GL_SRC_ALPHA),	2254	const_iv (GL_SRC_ALPHA),
1518	const_iv (GL_SRC_ALPHA_SATURATE),	2255	const_iv (GL_DST_ALPHA),
1519	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2256	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520	const_iv (GL_ONE_MINUS_DST_ALPHA),	2257	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2258	const_iv (GL_SRC_ALPHA_SATURATE),
1521	const_iv (GL_RGB),	2259	const_iv (GL_RGB),
1522	const_iv (GL_RGBA),	2260	const_iv (GL_RGBA),
		2261	const_iv (GL_RGBA4),
		2262	const_iv (GL_RGBA8),
		2263	const_iv (GL_RGB5_A1),
1523	const_iv (GL_UNSIGNED_BYTE),	2264	const_iv (GL_UNSIGNED_BYTE),
		2265	const_iv (GL_UNSIGNED_SHORT),
		2266	const_iv (GL_UNSIGNED_INT),
1524	const_iv (GL_ALPHA),	2267	const_iv (GL_ALPHA),
		2268	const_iv (GL_INTENSITY),
1525	const_iv (GL_LUMINANCE),	2269	const_iv (GL_LUMINANCE),
		2270	const_iv (GL_LUMINANCE_ALPHA),
1526	const_iv (GL_FLOAT),	2271	const_iv (GL_FLOAT),
1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2272	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528	const_iv (GL_COMPILE),	2273	const_iv (GL_COMPILE),
		2274	const_iv (GL_PROXY_TEXTURE_1D),
		2275	const_iv (GL_PROXY_TEXTURE_2D),
1529	const_iv (GL_TEXTURE_1D),	2276	const_iv (GL_TEXTURE_1D),
1530	const_iv (GL_TEXTURE_2D),	2277	const_iv (GL_TEXTURE_2D),
1531	const_iv (GL_TEXTURE_ENV),	2278	const_iv (GL_TEXTURE_ENV),
1532	const_iv (GL_TEXTURE_MAG_FILTER),	2279	const_iv (GL_TEXTURE_MAG_FILTER),
1533	const_iv (GL_TEXTURE_MIN_FILTER),	2280	const_iv (GL_TEXTURE_MIN_FILTER),
1534	const_iv (GL_TEXTURE_ENV_MODE),	2281	const_iv (GL_TEXTURE_ENV_MODE),
1535	const_iv (GL_TEXTURE_WRAP_S),	2282	const_iv (GL_TEXTURE_WRAP_S),
1536	const_iv (GL_TEXTURE_WRAP_T),	2283	const_iv (GL_TEXTURE_WRAP_T),
		2284	const_iv (GL_REPEAT),
1537	const_iv (GL_CLAMP),	2285	const_iv (GL_CLAMP),
1538	const_iv (GL_REPEAT),	2286	const_iv (GL_CLAMP_TO_EDGE),
1539	const_iv (GL_NEAREST),	2287	const_iv (GL_NEAREST),
1540	const_iv (GL_LINEAR),	2288	const_iv (GL_LINEAR),
1541	const_iv (GL_NEAREST_MIPMAP_NEAREST),	2289	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542	const_iv (GL_LINEAR_MIPMAP_NEAREST),	2290	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543	const_iv (GL_NEAREST_MIPMAP_LINEAR),	2291	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544	const_iv (GL_LINEAR_MIPMAP_LINEAR),	2292	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545	const_iv (GL_GENERATE_MIPMAP),	2293	const_iv (GL_GENERATE_MIPMAP),
1546	const_iv (GL_MODULATE),	2294	const_iv (GL_MODULATE),
1547	const_iv (GL_DECAL),	2295	const_iv (GL_DECAL),
1548	const_iv (GL_REPLACE),	2296	const_iv (GL_REPLACE),
		2297	const_iv (GL_DEPTH_BUFFER_BIT),
1549	const_iv (GL_COLOR_BUFFER_BIT),	2298	const_iv (GL_COLOR_BUFFER_BIT),
1550	const_iv (GL_PROJECTION),	2299	const_iv (GL_PROJECTION),
1551	const_iv (GL_MODELVIEW),	2300	const_iv (GL_MODELVIEW),
1552	const_iv (GL_COLOR_LOGIC_OP),	2301	const_iv (GL_COLOR_LOGIC_OP),
1553	const_iv (GL_SEPARABLE_2D),	2302	const_iv (GL_SEPARABLE_2D),
1554	const_iv (GL_CONVOLUTION_2D),	2303	const_iv (GL_CONVOLUTION_2D),
1555	const_iv (GL_CONVOLUTION_BORDER_MODE),	2304	const_iv (GL_CONVOLUTION_BORDER_MODE),
1556	const_iv (GL_CONSTANT_BORDER),	2305	const_iv (GL_CONSTANT_BORDER),
1557	const_iv (GL_LINES),	2306	const_iv (GL_LINES),
		2307	const_iv (GL_LINE_STRIP),
		2308	const_iv (GL_LINE_LOOP),
1558	const_iv (GL_QUADS),	2309	const_iv (GL_QUADS),
1559	const_iv (GL_LINE_LOOP),	2310	const_iv (GL_QUAD_STRIP),
		2311	const_iv (GL_TRIANGLES),
		2312	const_iv (GL_TRIANGLE_STRIP),
		2313	const_iv (GL_TRIANGLE_FAN),
1560	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2314	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561	const_iv (GL_FASTEST),	2315	const_iv (GL_FASTEST),
		2316	const_iv (GL_V2F),
		2317	const_iv (GL_V3F),
		2318	const_iv (GL_T2F_V3F),
		2319	const_iv (GL_T2F_N3F_V3F),
1562	# undef const_iv	2320	# undef const_iv
1563	};	2321	};
1564		2322
1565	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2323	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1566	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2324	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2325
		2326	texture_av = newAV ();
		2327	AvREAL_off (texture_av);
1567	}	2328	}
		2329
		2330	char *
		2331	gl_vendor ()
		2332	CODE:
		2333	RETVAL = (char *)glGetString (GL_VENDOR);
		2334	OUTPUT:
		2335	RETVAL
		2336
		2337	char *
		2338	gl_version ()
		2339	CODE:
		2340	RETVAL = (char *)glGetString (GL_VERSION);
		2341	OUTPUT:
		2342	RETVAL
		2343
		2344	char *
		2345	gl_extensions ()
		2346	CODE:
		2347	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2348	OUTPUT:
		2349	RETVAL
		2350
		2351	char *glGetString (GLenum pname)
		2352
		2353	GLint glGetInteger (GLenum pname)
		2354	CODE:
		2355	glGetIntegerv (pname, &RETVAL);
		2356	OUTPUT:
		2357	RETVAL
		2358
		2359	GLdouble glGetDouble (GLenum pname)
		2360	CODE:
		2361	glGetDoublev (pname, &RETVAL);
		2362	OUTPUT:
		2363	RETVAL
1568		2364
1569	int glGetError ()	2365	int glGetError ()
		2366
		2367	void glFinish ()
1570		2368
1571	void glClear (int mask)	2369	void glClear (int mask)
1572		2370
1573	void glClearColor (float r, float g, float b, float a = 1.0)	2371	void glClearColor (float r, float g, float b, float a = 1.0)
1574	PROTOTYPE: @	2372	PROTOTYPE: @
…		…
1581		2379
1582	void glHint (int target, int mode)	2380	void glHint (int target, int mode)
1583		2381
1584	void glBlendFunc (int sfactor, int dfactor)	2382	void glBlendFunc (int sfactor, int dfactor)
1585		2383
		2384	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2385	CODE:
		2386	gl_BlendFuncSeparate (sa, da, saa, daa);
		2387
		2388	void glDepthMask (int flag)
		2389
1586	void glLogicOp (int opcode)	2390	void glLogicOp (int opcode)
1587		2391
1588	void glColorMask (int red, int green, int blue, int alpha)	2392	void glColorMask (int red, int green, int blue, int alpha)
1589		2393
1590	void glMatrixMode (int mode)	2394	void glMatrixMode (int mode)
…		…
1593		2397
1594	void glPopMatrix ()	2398	void glPopMatrix ()
1595		2399
1596	void glLoadIdentity ()	2400	void glLoadIdentity ()
1597		2401
		2402	void glDrawBuffer (int buffer)
		2403
		2404	void glReadBuffer (int buffer)
		2405
1598	# near and far are due to microsofts buggy c compiler	2406	# near_ and far_ are due to microsofts buggy "c" compiler
		2407	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2408
		2409	# near_ and far_ are due to microsofts buggy "c" compiler
1599	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2410	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1600		2411
1601	void glViewport (int x, int y, int width, int height)	2412	void glViewport (int x, int y, int width, int height)
1602		2413
1603	void glScissor (int x, int y, int width, int height)	2414	void glScissor (int x, int y, int width, int height)
…		…
1618		2429
1619	void glEnd ()	2430	void glEnd ()
1620		2431
1621	void glColor (float r, float g, float b, float a = 1.0)	2432	void glColor (float r, float g, float b, float a = 1.0)
1622	PROTOTYPE: @	2433	PROTOTYPE: @
		2434	ALIAS:
		2435	glColor_premultiply = 1
1623	CODE:	2436	CODE:
1624	glColor4ub (MIN ((int)(r * 255.f), 255),	2437	if (ix)
1625	MIN ((int)(g * 255.f), 255),	2438	{
1626	MIN ((int)(b * 255.f), 255),	2439	r *= a;
1627	MIN ((int)(a * 255.f), 255));	2440	g *= a;
		2441	b *= a;
		2442	}
		2443	// microsoft visual "c" rounds instead of truncating...
		2444	glColor4f (r, g, b, a);
		2445
		2446	void glInterleavedArrays (int format, int stride, char *data)
		2447
		2448	void glDrawElements (int mode, int count, int type, char *indices)
		2449
		2450	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2451
		2452	void glRasterPos (float x, float y, float z = 0.)
		2453	CODE:
		2454	glRasterPos3f (0, 0, z);
		2455	glBitmap (0, 0, 0, 0, x, y, 0);
1628		2456
1629	void glVertex (float x, float y, float z = 0.)	2457	void glVertex (float x, float y, float z = 0.)
1630	CODE:	2458	CODE:
1631	glVertex3f (x, y, z);	2459	glVertex3f (x, y, z);
1632		2460
…		…
1644		2472
1645	void glBindTexture (int target, int name)	2473	void glBindTexture (int target, int name)
1646		2474
1647	void glConvolutionParameter (int target, int pname, float params)	2475	void glConvolutionParameter (int target, int pname, float params)
1648	CODE:	2476	CODE:
1649	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2477	if (gl.ConvolutionParameterf)
		2478	gl.ConvolutionParameterf (target, pname, params);
1650		2479
1651	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2480	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1652	CODE:	2481	CODE:
1653	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2482	if (gl.ConvolutionFilter2D)
1654	(target, internalformat, width, height, format, type, data));	2483	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655		2484
1656	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2485	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1657	CODE:	2486	CODE:
1658	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2487	if (gl.SeparableFilter2D)
1659	(target, internalformat, width, height, format, type, row, column));	2488	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660		2489
1661	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2490	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1662		2491
1663	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2492	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1664		2493
1665	void glRasterPos (int x, int y)	2494	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666	CODE:	2495
1667	glRasterPos2i (x, y);	2496	void glPixelZoom (float x, float y)
1668		2497
1669	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2498	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1670		2499
1671	int glGenTexture ()	2500	int glGenTexture ()
1672	CODE:	2501	CODE:
1673	{	2502	RETVAL = gen_texture ();
1674	GLuint name;
1675	glGenTextures (1, &name);
1676	RETVAL = name;
1677	}
1678	OUTPUT:	2503	OUTPUT:
1679	RETVAL	2504	RETVAL
1680		2505
1681	void glDeleteTexture (int name)	2506	void glDeleteTexture (int name)
1682	CODE:	2507	CODE:
1683	{
1684	GLuint name_ = name;
1685	glDeleteTextures (1, &name_);	2508	del_texture (name);
1686	}	2509
1687
1688	int glGenList ()	2510	int glGenList ()
1689	CODE:	2511	CODE:
1690	RETVAL = glGenLists (1);	2512	RETVAL = glGenLists (1);
1691	OUTPUT:	2513	OUTPUT:
1692	RETVAL	2514	RETVAL

Diff Legend

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