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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 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, 16);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
447		611
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
450		614
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		619
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
457		621	#if SDL_VERSION_ATLEAST(1,2,10)
458	SDL_EnableUNICODE (1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		624	#endif
460		625
461	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
462		627
463	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
464	while (*m)	629	while (*m)
465	{	630	{
		631	if ((*m)->w >= 640 && (*m)->h >= 480)
		632	{
466	AV *av = newAV ();	633	AV *av = newAV ();
467	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
468	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));
469	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
470		640
471	++m;	641	++m;
472	}	642	}
473	}	643	}
474		644
475	int	645	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
477	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
478	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
480	);	659	);
		660
		661	if (RETVAL)
		662	{
		663	av_clear (texture_av);
		664
481	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	}
482	OUTPUT:	671	OUTPUT:
483	RETVAL	672	RETVAL
484		673
485	void	674	void
486	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
487		676
		677	char *
		678	SDL_GetKeyName (int sym)
		679
		680	int
		681	SDL_GetAppState ()
		682
488	void	683	void
489	SDL_PollEvent ()	684	poll_events ()
490	PPCODE:	685	PPCODE:
491	{	686	{
492	SDL_Event ev;	687	SDL_Event ev;
493		688
494	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
495	{	691	{
496	HV *hv = newHV ();	692	HV *hv = newHV ();
497	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
498		694
499	switch (ev.type)	695	switch (ev.type)
…		…
501	case SDL_KEYDOWN:	697	case SDL_KEYDOWN:
502	case SDL_KEYUP:	698	case SDL_KEYUP:
503	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	699	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
504	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	700	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
505	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 */
506	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	703	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
507	break;	704	break;
508		705
509	case SDL_ACTIVEEVENT:	706	case SDL_ACTIVEEVENT:
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	709	break;
513		710
514	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);
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
520	break;	737	break;
521		738
522	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
		741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		742
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	743	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	744	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	745	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	746	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	747	break;
…		…
532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	751	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	752	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534	break;	753	break;
535	}	754	}
536		755
537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	756	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538	}	757	}
539	}	758	}
540		759
541	int	760	int
542	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)
…		…
551	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
552		771
553	void	772	void
554	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
555	CODE:	774	CODE:
		775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		776
		777	void
		778	win32_proxy_info ()
		779	PPCODE:
		780	{
556	#ifndef _WIN32	781	#ifdef _WIN32
557	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	}
558	#endif	803	#endif
559		804	}
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		805
574	void	806	void
575	add_font (char *file)	807	add_font (char *file)
576	CODE:	808	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	809	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		810
583	void	811	void
584	load_image_inline (SV *image_)	812	load_image_inline (SV *image_)
585	ALIAS:	813	ALIAS:
586	load_image_file = 1	814	load_image_file = 1
…		…
628		856
629	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	857	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630		858
631	assert (surface2->pitch == surface2->w * 4);	859	assert (surface2->pitch == surface2->w * 4);
632		860
		861	SDL_LockSurface (surface2);
633	EXTEND (SP, 5);	862	EXTEND (SP, 6);
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	863	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	864	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	865	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638	SDL_UnlockSurface (surface2);
639	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)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	867	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	868	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		869	SDL_UnlockSurface (surface2);
642		870
643	SDL_FreeSurface (surface);	871	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	872	SDL_FreeSurface (surface2);
645	}	873	}
646		874
…		…
682	CODE:	910	CODE:
683	fprintf (stderr, "FATAL: %s\n", message);	911	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	912	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);	913	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
686	#endif	914	#endif
687	exit (1);	915	_exit (1);
688		916
		917	void
		918	_exit (int retval = 0)
		919	CODE:
		920	#ifdef WIN32
		921	ExitThread (retval); // unclean, please beam me up
		922	#else
		923	_exit (retval);
		924	#endif
		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
689	MODULE = CFClient PACKAGE = CFClient::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
690		936
691	CFClient::Font	937	CFPlus::Font
692	new_from_file (SV *class, char *path, int id = 0)	938	new_from_file (SV *class, char *path, int id = 0)
693	CODE:	939	CODE:
694	{	940	{
695	int count;	941	int count;
696	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	942	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
699	}	945	}
700	OUTPUT:	946	OUTPUT:
701	RETVAL	947	RETVAL
702		948
703	void	949	void
704	DESTROY (CFClient::Font self)	950	DESTROY (CFPlus::Font self)
705	CODE:	951	CODE:
706	pango_font_description_free (self);	952	pango_font_description_free (self);
707		953
708	void	954	void
709	make_default (CFClient::Font self)	955	make_default (CFPlus::Font self)
710	CODE:	956	CODE:
711	default_font = self;	957	default_font = self;
712		958
713	MODULE = CFClient PACKAGE = CFClient::Layout	959	MODULE = CFPlus PACKAGE = CFPlus::Layout
714		960
715	CFClient::Layout	961	void
716	new (SV *class, int rgba = 0)	962	reset_glyph_cache ()
		963	CODE:
		964	tc_clear ();
		965
		966	CFPlus::Layout
		967	new (SV *class)
717	CODE:	968	CODE:
718	New (0, RETVAL, 1, struct cf_layout);	969	New (0, RETVAL, 1, struct cf_layout);
719		970
720	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	971	RETVAL->pl = pango_layout_new (opengl_context);
721	RETVAL->rgba = rgba;
722	RETVAL->r = 1.;	972	RETVAL->r = 1.;
723	RETVAL->g = 1.;	973	RETVAL->g = 1.;
724	RETVAL->b = 1.;	974	RETVAL->b = 1.;
725	RETVAL->a = 1.;	975	RETVAL->a = 1.;
726	RETVAL->base_height = MIN_FONT_HEIGHT;	976	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
730	layout_update_font (RETVAL);	980	layout_update_font (RETVAL);
731	OUTPUT:	981	OUTPUT:
732	RETVAL	982	RETVAL
733		983
734	void	984	void
735	DESTROY (CFClient::Layout self)	985	DESTROY (CFPlus::Layout self)
736	CODE:	986	CODE:
737	g_object_unref (self->pl);	987	g_object_unref (self->pl);
738	Safefree (self);	988	Safefree (self);
739		989
740	int
741	is_rgba (CFClient::Layout self)
742	CODE:
743	RETVAL = self->rgba;
744	OUTPUT:
745	RETVAL
746
747	void	990	void
748	set_text (CFClient::Layout self, SV *text_)	991	set_text (CFPlus::Layout self, SV *text_)
749	CODE:	992	CODE:
750	{	993	{
751	STRLEN textlen;	994	STRLEN textlen;
752	char *text = SvPVutf8 (text_, textlen);	995	char *text = SvPVutf8 (text_, textlen);
753		996
754	pango_layout_set_text (self->pl, text, textlen);	997	pango_layout_set_text (self->pl, text, textlen);
755	}	998	}
756		999
757	void	1000	void
758	set_markup (CFClient::Layout self, SV *text_)	1001	set_markup (CFPlus::Layout self, SV *text_)
759	CODE:	1002	CODE:
760	{	1003	{
761	STRLEN textlen;	1004	STRLEN textlen;
762	char *text = SvPVutf8 (text_, textlen);	1005	char *text = SvPVutf8 (text_, textlen);
763		1006
764	pango_layout_set_markup (self->pl, text, textlen);	1007	pango_layout_set_markup (self->pl, text, textlen);
765	}	1008	}
766		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
767	SV *	1095	SV *
768	get_text (CFClient::Layout self)	1096	get_text (CFPlus::Layout self)
769	CODE:	1097	CODE:
770	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1098	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771	SvUTF8_on (RETVAL);	1099	sv_utf8_decode (RETVAL);
772	OUTPUT:	1100	OUTPUT:
773	RETVAL	1101	RETVAL
774		1102
775	void	1103	void
776	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.)
777	CODE:	1105	CODE:
778	self->r = r;	1106	self->r = r;
779	self->g = g;	1107	self->g = g;
780	self->b = b;	1108	self->b = b;
781	self->a = a;	1109	self->a = a;
782		1110
783	void	1111	void
784	set_font (CFClient::Layout self, CFClient::Font font = 0)	1112	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
785	CODE:	1113	CODE:
786	if (self->font != font)	1114	if (self->font != font)
787	{	1115	{
788	self->font = font;	1116	self->font = font;
789	layout_update_font (self);	1117	layout_update_font (self);
790	}	1118	}
791		1119
792	void	1120	void
793	set_height (CFClient::Layout self, int base_height)	1121	set_height (CFPlus::Layout self, int base_height)
794	CODE:	1122	CODE:
795	if (self->base_height != base_height)	1123	if (self->base_height != base_height)
796	{	1124	{
797	self->base_height = base_height;	1125	self->base_height = base_height;
798	layout_update_font (self);	1126	layout_update_font (self);
799	}	1127	}
800		1128
801	void	1129	void
802	set_width (CFClient::Layout self, int max_width = -1)	1130	set_width (CFPlus::Layout self, int max_width = -1)
803	CODE:	1131	CODE:
804	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);
805		1133
806	void	1134	void
807	set_indent (CFClient::Layout self, int indent)	1135	set_indent (CFPlus::Layout self, int indent)
808	CODE:	1136	CODE:
809	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1137	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810		1138
811	void	1139	void
812	set_spacing (CFClient::Layout self, int spacing)	1140	set_spacing (CFPlus::Layout self, int spacing)
813	CODE:	1141	CODE:
814	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1142	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815		1143
816	void	1144	void
817	set_ellipsise (CFClient::Layout self, int ellipsise)	1145	set_ellipsise (CFPlus::Layout self, int ellipsise)
818	CODE:	1146	CODE:
819	pango_layout_set_ellipsize (self->pl,	1147	pango_layout_set_ellipsize (self->pl,
820	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1148	ellipsise == 1 ? PANGO_ELLIPSIZE_START
821	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1149	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1150	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
823	: PANGO_ELLIPSIZE_NONE	1151	: PANGO_ELLIPSIZE_NONE
824	);	1152	);
825		1153
826	void	1154	void
827	set_single_paragraph_mode (CFClient::Layout self, int spm)	1155	set_single_paragraph_mode (CFPlus::Layout self, int spm)
828	CODE:	1156	CODE:
829	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1157	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
830		1158
831	void	1159	void
832	size (CFClient::Layout self)	1160	size (CFPlus::Layout self)
833	PPCODE:	1161	PPCODE:
834	{	1162	{
835	int w, h;	1163	int w, h;
836		1164
837	layout_get_pixel_size (self, &w, &h);	1165	layout_get_pixel_size (self, &w, &h);
…		…
840	PUSHs (sv_2mortal (newSViv (w)));	1168	PUSHs (sv_2mortal (newSViv (w)));
841	PUSHs (sv_2mortal (newSViv (h)));	1169	PUSHs (sv_2mortal (newSViv (h)));
842	}	1170	}
843		1171
844	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
845	xy_to_index (CFClient::Layout self, int x, int y)	1185	xy_to_index (CFPlus::Layout self, int x, int y)
846	CODE:	1186	CODE:
847	{	1187	{
848	int index, trailing;	1188	int index, trailing;
849	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);
850	RETVAL = index;	1190	RETVAL = index + trailing;
851	}	1191	}
852	OUTPUT:	1192	OUTPUT:
853	RETVAL	1193	RETVAL
854		1194
855	void	1195	void
856	cursor_pos (CFClient::Layout self, int index)	1196	cursor_pos (CFPlus::Layout self, int index)
857	PPCODE:	1197	PPCODE:
858	{	1198	{
859	PangoRectangle strong_pos;	1199	PangoRectangle strong_pos;
860	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1200	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
861		1201
…		…
864	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1204	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
865	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1205	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
866	}	1206	}
867		1207
868	void	1208	void
869	render (CFClient::Layout self)	1209	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
870	PPCODE:	1210	PPCODE:
871	{	1211	{
872	SV *retval;	1212	int line, x;
873	int w, h;
874		1213
875	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 */
876		1216
877	if (self->rgba)
878	{
879	cairo_surface_t *surface;
880	cairo_t *cairo;
881
882	retval = newSV (w * h * 4);
883	SvPOK_only (retval);
884	SvCUR_set (retval, w * h * 4);
885
886	memset (SvPVX (retval), 0, w * h * 4);
887
888	surface = cairo_image_surface_create_for_data (
889	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
890	cairo = cairo_create (surface);
891	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893	pango_cairo_show_layout (cairo, self->pl);
894
895	cairo_destroy (cairo);
896	cairo_surface_destroy (surface);
897
898	// what a mess, and its premultiplied, too :(
899	{
900	uint32_t *p = (uint32_t *)SvPVX (retval);
901	uint32_t *e = p + w * h;
902
903	while (p < e)
904	{
905	uint32_t rgba = *p;
906	rgba = (rgba >> 24) | (rgba << 8);
907	rgba = SDL_SwapBE32 (rgba);
908	*p++ = rgba;
909	}
910	}
911
912	EXTEND (SP, 5);	1217	EXTEND (SP, 2);
913	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)
914	PUSHs (sv_2mortal (newSViv (h)));	1239	PUSHs (sv_2mortal (newSViv (index + trailing)));
915	PUSHs (sv_2mortal (retval));
916	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918	}
919	else	1240	else
920	{	1241	{
921	FT_Bitmap bitmap;
922
923	retval = newSV (w * h);
924	SvPOK_only (retval);
925	SvCUR_set (retval, w * h);
926
927	bitmap.rows = h;
928	bitmap.width = w;
929	bitmap.pitch = w;
930	bitmap.buffer = (unsigned char*)SvPVX (retval);
931	bitmap.num_grays = 256;
932	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
933
934	memset (bitmap.buffer, 0, w * h);
935
936	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
937
938	EXTEND (SP, 5);
939	PUSHs (sv_2mortal (newSViv (w)));	1242	PUSHs (sv_2mortal (newSViv (index)));
940	PUSHs (sv_2mortal (newSViv (h)));	1243	PUSHs (sv_2mortal (newSViv (trailing)));
941	PUSHs (sv_2mortal (retval));
942	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944	}	1244	}
945	}	1245	}
946		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
947	MODULE = CFClient PACKAGE = CFClient::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
948		1258
		1259	int minpot (int n)
		1260
949	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
950	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.)
951	PROTOTYPE: $$$;$$	1300	PROTOTYPE: $$$;$$
952	ALIAS:	1301	ALIAS:
953	draw_quad_alpha = 1	1302	draw_quad_alpha = 1
954	draw_quad_alpha_premultiplied = 2	1303	draw_quad_alpha_premultiplied = 2
955	CODE:	1304	CODE:
956	{	1305	{
957	HV *hv = (HV *)SvRV (self);	1306	HV *hv = (HV *)SvRV (self);
958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1307	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1308	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1309	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962		1310
963	if (items < 5)	1311	if (items < 5)
964	{	1312	{
965	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1313	w = SvNV (*hv_fetch (hv, "w", 1, 1));
966	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1314	h = SvNV (*hv_fetch (hv, "h", 1, 1));
967	}	1315	}
968		1316
969	if (ix)	1317	if (ix)
970	{	1318	{
971	glEnable (GL_BLEND);	1319	glEnable (GL_BLEND);
		1320
		1321	if (ix == 2)
972	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
973	glEnable (GL_ALPHA_TEST);	1327	glEnable (GL_ALPHA_TEST);
974	glAlphaFunc (GL_GREATER, 0.01f);	1328	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1329	}
976		1330
977	glBindTexture (GL_TEXTURE_2D, name);	1331	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1332
985	glBegin (GL_QUADS);	1333	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1334	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1335	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1336	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
994	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
995	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
996	}	1344	}
997	}	1345	}
998		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
999	MODULE = CFClient PACKAGE = CFClient::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1000		1359
1001	CFClient::Map	1360	CFPlus::Map
1002	new (SV *class, int map_width, int map_height)	1361	new (SV *class)
1003	CODE:	1362	CODE:
1004	New (0, RETVAL, 1, struct map);	1363	New (0, RETVAL, 1, struct map);
1005	RETVAL->x = 0;	1364	RETVAL->x = 0;
1006	RETVAL->y = 0;	1365	RETVAL->y = 0;
1007	RETVAL->w = map_width;	1366	RETVAL->w = 0;
1008	RETVAL->h = map_height;	1367	RETVAL->h = 0;
1009	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
1010	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
1011	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1012	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1013	RETVAL->texs = 8192;
1014	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1015	RETVAL->rows = 0;	1372	RETVAL->rows = 0;
1016	RETVAL->row = 0;	1373	RETVAL->row = 0;
1017	OUTPUT:	1374	OUTPUT:
1018	RETVAL	1375	RETVAL
1019		1376
1020	void	1377	void
1021	DESTROY (CFClient::Map self)	1378	DESTROY (CFPlus::Map self)
1022	CODE:	1379	CODE:
1023	{	1380	{
1024	map_clear (self);	1381	map_clear (self);
1025	Safefree (self->face);	1382	Safefree (self->face2tile);
		1383	Safefree (self->tex);
1026	Safefree (self);	1384	Safefree (self);
1027	}	1385	}
1028		1386
1029	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
1030	clear (CFClient::Map self)	1394	clear (CFPlus::Map self)
1031	CODE:	1395	CODE:
1032	map_clear (self);	1396	map_clear (self);
1033		1397
1034	void	1398	void
1035	set_face (CFClient::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1036	CODE:	1400	CODE:
1037	{	1401	{
1038	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1039	{	1403	need_texid (self, tile);
1040	Append (mapface, self->face, self->faces, self->faces);
1041	self->faces *= 2;
1042	}
1043
1044	self->face [face] = texid;
1045	}	1404	}
1046		1405
1047	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
1048	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)
1049	CODE:	1431	CODE:
1050	{	1432	{
1051	while (self->texs <= texid)	1433	need_texid (self, texid);
1052	{
1053	Append (maptex, self->tex, self->texs, self->texs);
1054	self->texs *= 2;
1055	}
1056		1434
1057	{	1435	{
1058	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1059		1437
1060	tex->name = name;	1438	tex->name = name;
…		…
1065	tex->r = r;	1443	tex->r = r;
1066	tex->g = g;	1444	tex->g = g;
1067	tex->b = b;	1445	tex->b = b;
1068	tex->a = a;	1446	tex->a = a;
1069	}	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);
1070	}	1457	}
1071		1458
1072	int	1459	int
1073	ox (CFClient::Map self)	1460	ox (CFPlus::Map self)
1074	ALIAS:	1461	ALIAS:
1075	oy = 1	1462	oy = 1
		1463	x = 2
		1464	y = 3
		1465	w = 4
		1466	h = 5
1076	CODE:	1467	CODE:
1077	switch (ix)	1468	switch (ix)
1078	{	1469	{
1079	case 0: RETVAL = self->ox; break;	1470	case 0: RETVAL = self->ox; break;
1080	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;
1081	}	1476	}
1082	OUTPUT:	1477	OUTPUT:
1083	RETVAL	1478	RETVAL
1084		1479
1085	void	1480	void
1086	scroll (CFClient::Map self, int dx, int dy)	1481	scroll (CFPlus::Map self, int dx, int dy)
1087	CODE:	1482	CODE:
1088	{	1483	{
1089	if (dx > 0)	1484	if (dx > 0)
1090	map_blank (self, self->x, self->y, dx - 1, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1091	else if (dx < 0)	1486	else if (dx < 0)
1092	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);
1093		1488
1094	if (dy > 0)	1489	if (dy > 0)
1095	map_blank (self, self->x, self->y, self->w, dy - 1);	1490	map_blank (self, self->x, self->y, self->w, dy);
1096	else if (dy < 0)	1491	else if (dy < 0)
1097	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);
1098		1493
1099	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1100	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1101		1496
1102	while (self->y < 0)	1497	while (self->y < 0)
…		…
1107	self->y += MAP_EXTEND_Y;	1502	self->y += MAP_EXTEND_Y;
1108	}	1503	}
1109	}	1504	}
1110		1505
1111	void	1506	void
1112	map1a_update (CFClient::Map self, SV *data_)	1507	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1113	CODE:	1508	CODE:
1114	{	1509	{
1115	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1510	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1116	uint8_t *data_end = (uint8_t *)SvEND (data_);	1511	uint8_t *data_end = (uint8_t *)SvEND (data_);
1117	mapcell *cell;	1512	mapcell *cell;
1118	int x, y, flags;	1513	int x, y, flags;
1119		1514
1120	while (data < data_end)	1515	while (data < data_end - 1)
1121	{	1516	{
1122	flags = (data [0] << 8) + data [1]; data += 2;	1517	flags = (data [0] << 8) + data [1]; data += 2;
1123		1518
1124	x = ((flags >> 10) & 63) + self->x;	1519	x = self->x + ((flags >> 10) & 63);
1125	y = ((flags >> 4) & 63) + self->y;	1520	y = self->y + ((flags >> 4) & 63);
1126		1521
1127	cell = map_get_cell (self, x, y);	1522	cell = map_get_cell (self, x, y);
1128		1523
1129	if (flags & 15)	1524	if (flags & 15)
1130	{	1525	{
1131	if (cell->darkness < 0)	1526	if (!cell->darkness)
1132	{	1527	{
		1528	memset (cell, 0, sizeof (*cell));
1133	cell->darkness = 0;	1529	cell->darkness = 256;
1134	cell->face [0] = 0;
1135	cell->face [1] = 0;
1136	cell->face [2] = 0;
1137	}	1530	}
1138		1531
1139	cell->darkness = flags & 8 ? *data++ : 255;
1140
1141	//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	}
1142		1573
1143	if (flags & 4)	1574	if (flags & 4)
1144	{	1575	{
1145	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];
1146	}	1579	}
1147		1580
1148	if (flags & 2)	1581	if (flags & 2)
1149	{	1582	{
1150	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];
1151	}	1586	}
1152		1587
1153	if (flags & 1)	1588	if (flags & 1)
1154	{	1589	{
1155	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];
1156	}	1593	}
1157	}	1594	}
1158	else	1595	else
1159	cell->darkness = -1;	1596	cell->darkness = 0;
1160	}	1597	}
1161	}	1598	}
1162		1599
1163	SV *	1600	SV *
1164	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)
1165	CODE:	1602	CODE:
1166	{	1603	{
1167	int x1, x;	1604	int x1, x;
1168	int y1, y;	1605	int y1, y;
1169	int z;	1606	int z;
…		…
1190	{	1627	{
1191	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1192		1629
1193	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1194	{	1631	{
1195	mapface face = cell->face [z];
1196
1197	if (face)
1198	{
1199	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1200	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1201	int a1 = tex.a;	1634	int a1 = tex.a;
1202		1635
1203	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1204	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1205	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1206	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1207	}
1208	}	1640	}
1209	}	1641	}
1210		1642
1211	*map++ = (r )	1643	*map++ = (r )
1212	| (g << 8)	1644	| (g << 8)
…		…
1219	}	1651	}
1220	OUTPUT:	1652	OUTPUT:
1221	RETVAL	1653	RETVAL
1222		1654
1223	void	1655	void
1224	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)
1225	PPCODE:	1657	CODE:
1226	{	1658	{
1227	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;
1228	int x, y, z;	1663	int x, y, z;
1229	int last_name;	1664	int last_name;
1230	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, int smoothing, const char *matrix)
		1980	PPCODE:
		1981	{
		1982	int x, y;
1231	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1232	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1984	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1233	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1985	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1234		1986
1235	memset (darkness, 255, sw4 * sh);	1987	memset (darkness, 255, sw4 * sh);
1236	SvPOK_only (darkness_sv);	1988	SvPOK_only (darkness_sv);
1237	SvCUR_set (darkness_sv, sw4 * sh);	1989	SvCUR_set (darkness_sv, sw4 * sh);
1238		1990
1239	vx = self->x + (self->w - sw) / 2 - shift_x;	1991	mx += self->x;
1240	vy = self->y + (self->h - sh) / 2 - shift_y;	1992	my += self->y;
1241		1993
1242	/*
1243	int vx = self->vx = self->w >= sw
1244	? self->x + (self->w - sw) / 2
1245	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1246
1247	int vy = self->vy = self->h >= sh
1248	? self->y + (self->h - sh) / 2
1249	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1250	*/
1251
1252	glColor4ub (255, 255, 255, 255);
1253
1254	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1255	glEnable (GL_BLEND);
1256	glEnable (GL_TEXTURE_2D);
1257	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1258
1259	glBegin (GL_QUADS);
1260
1261	last_name = 0;
1262
1263	for (z = 0; z < 3; z++)
1264	for (y = 0; y < sh; y++)	1994	for (y = 0; y < sh; y++)
1265	if (0 <= y + vy && y + vy < self->rows)	1995	if (0 <= y + my && y + my < self->rows)
1266	{	1996	{
1267	maprow *row = self->row + (y + vy);	1997	maprow *row = self->row + (y + my);
1268		1998
1269	for (x = 0; x < sw; x++)	1999	for (x = 0; x < sw; x++)
1270	if (row->c0 <= x + vx && x + vx < row->c1)	2000	if (row->c0 <= x + mx && x + mx < row->c1)
1271	{	2001	{
1272	mapcell *cell = row->col + (x + vx - row->c0);	2002	mapcell *cell = row->col + (x + mx - row->c0);
1273		2003
1274	darkness[y * sw4 + x] = cell->darkness < 0	2004	darkness[y * sw4 + x] = cell->darkness
		2005	? 255 - (cell->darkness - 1)
1275	? 255 - FOW_DARKNESS	2006	: 255 - FOW_DARKNESS;
1276	: 255 - cell->darkness;	2007	}
		2008	}
1277		2009
1278	face = cell->face [z];	2010	if (smoothing)
		2011	{
		2012	SV *darkness2_sv = sv_2mortal (newSV (sw4 * sh));
		2013	uint8_t *darkness2 = (uint8_t *)SvPVX (darkness2_sv);
1279		2014
1280	if (face)	2015	SvPOK_only (darkness2_sv);
		2016	SvCUR_set (darkness2_sv, sw4 * sh);
		2017
		2018	for (y = 0; y < sh; ++y)
		2019	for (x = 0; x < sw4; ++x)
		2020	{
		2021	float *f = (float *)matrix;
		2022	int dx, dy;
		2023	float sum = 0.f;
		2024
		2025	for (dy = -1; dy <= 1; ++dy)
		2026	for (dx = -1; dx <= 1; ++dx)
1281	{	2027	{
1282	maptex tex = self->tex [face];	2028	unsigned int x2 = x + dx;
		2029	unsigned int y2 = y + dy;
1283		2030
1284	int px = (x + 1) * 32 - tex.w;	2031	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
1285	int py = (y + 1) * 32 - tex.h;
1286
1287	if (last_name != tex.name)
1288	{
1289	glEnd ();
1290	last_name = tex.name;
1291	glBindTexture (GL_TEXTURE_2D, last_name);
1292	glBegin (GL_QUADS);
1293	}
1294
1295	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1296	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1297	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1298	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1299	}	2032	}
1300	}	2033
		2034	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
1301	}	2035	}
1302		2036
1303	glEnd ();	2037	darkness_sv = darkness2_sv;
1304		2038	}
1305	glDisable (GL_TEXTURE_2D);
1306	glDisable (GL_BLEND);
1307		2039
1308	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1309	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1310	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1311	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
1312	}	2044	}
1313		2045
1314	SV *	2046	SV *
1315	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	2047	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1316	CODE:	2048	CODE:
1317	{	2049	{
1318	int x, y, x1, y1;	2050	int x, y, x1, y1;
1319	SV *data_sv = newSV (w * h * 7 + 5);	2051	SV *data_sv = newSV (w * h * 7 + 5);
1320	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2052	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1345	if (row && row->c0 <= x && x < row->c1)	2077	if (row && row->c0 <= x && x < row->c1)
1346	{	2078	{
1347	mapcell *cell = row->col + (x - row->c0);	2079	mapcell *cell = row->col + (x - row->c0);
1348	uint8_t flags = 0;	2080	uint8_t flags = 0;
1349		2081
1350	if (cell->face [0]) flags |= 1;	2082	if (cell->tile [0]) flags |= 1;
1351	if (cell->face [1]) flags |= 2;	2083	if (cell->tile [1]) flags |= 2;
1352	if (cell->face [2]) flags |= 4;	2084	if (cell->tile [2]) flags |= 4;
1353		2085
1354	*data++ = flags;	2086	*data++ = flags;
1355		2087
1356	if (flags & 1)	2088	if (flags & 1)
1357	{	2089	{
		2090	tileid tile = cell->tile [0];
1358	*data++ = cell->face [0] >> 8;	2091	*data++ = tile >> 8;
1359	*data++ = cell->face [0];	2092	*data++ = tile;
1360	}	2093	}
1361		2094
1362	if (flags & 2)	2095	if (flags & 2)
1363	{	2096	{
		2097	tileid tile = cell->tile [1];
1364	*data++ = cell->face [1] >> 8;	2098	*data++ = tile >> 8;
1365	*data++ = cell->face [1];	2099	*data++ = tile;
1366	}	2100	}
1367		2101
1368	if (flags & 4)	2102	if (flags & 4)
1369	{	2103	{
		2104	tileid tile = cell->tile [2];
1370	*data++ = cell->face [2] >> 8;	2105	*data++ = tile >> 8;
1371	*data++ = cell->face [2];	2106	*data++ = tile;
1372	}	2107	}
1373	}	2108	}
1374	else	2109	else
1375	*data++ = 0;	2110	*data++ = 0;
1376	}	2111	}
…		…
1382	}	2117	}
1383	OUTPUT:	2118	OUTPUT:
1384	RETVAL	2119	RETVAL
1385		2120
1386	void	2121	void
1387	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	2122	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1388	PPCODE:	2123	PPCODE:
1389	{	2124	{
1390	int x, y, z;	2125	int x, y, z;
1391	int w, h;	2126	int w, h;
1392	int x1, y1;	2127	int x1, y1;
…		…
1416	{	2151	{
1417	uint8_t flags = *data++;	2152	uint8_t flags = *data++;
1418		2153
1419	if (flags)	2154	if (flags)
1420	{	2155	{
1421	mapface face[3] = { 0, 0, 0 };
1422
1423	mapcell *cell = row_get_cell (row, x);	2156	mapcell *cell = row_get_cell (row, x);
		2157	tileid tile[3] = { 0, 0, 0 };
1424		2158
1425	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2159	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1426	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2160	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1427	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2161	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1428		2162
1429	if (cell->darkness <= 0)	2163	if (cell->darkness == 0)
1430	{	2164	{
1431	cell->darkness = -1;	2165	cell->darkness = 0;
1432		2166
1433	for (z = 0; z <= 2; z++)	2167	for (z = 0; z <= 2; z++)
1434	{	2168	{
1435	cell->face[z] = face[z];	2169	tileid t = tile [z];
1436		2170
1437	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2171	if (t >= self->texs || (t && !self->tex [t].name))
		2172	{
1438	XPUSHs (sv_2mortal (newSViv (face[z])));	2173	XPUSHs (sv_2mortal (newSViv (t)));
		2174	need_texid (self, t);
		2175	}
		2176
		2177	cell->tile [z] = t;
1439	}	2178	}
1440	}	2179	}
1441	}	2180	}
1442	}	2181	}
1443	}	2182	}
1444	}	2183	}
1445		2184
1446	MODULE = CFClient PACKAGE = CFClient::MixChunk	2185	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1447		2186
1448	CFClient::MixChunk	2187	CFPlus::MixChunk
1449	new_from_file (SV *class, char *path)	2188	new_from_file (SV *class, char *path)
1450	CODE:	2189	CODE:
1451	RETVAL = Mix_LoadWAV (path);	2190	RETVAL = Mix_LoadWAV (path);
1452	OUTPUT:	2191	OUTPUT:
1453	RETVAL	2192	RETVAL
1454		2193
1455	void	2194	void
1456	DESTROY (CFClient::MixChunk self)	2195	DESTROY (CFPlus::MixChunk self)
1457	CODE:	2196	CODE:
1458	Mix_FreeChunk (self);	2197	Mix_FreeChunk (self);
1459		2198
1460	int	2199	int
1461	volume (CFClient::MixChunk self, int volume = -1)	2200	volume (CFPlus::MixChunk self, int volume = -1)
1462	CODE:	2201	CODE:
1463	RETVAL = Mix_VolumeChunk (self, volume);	2202	RETVAL = Mix_VolumeChunk (self, volume);
1464	OUTPUT:	2203	OUTPUT:
1465	RETVAL	2204	RETVAL
1466		2205
1467	int	2206	int
1468	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2207	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1469	CODE:	2208	CODE:
1470	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2209	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1471	OUTPUT:	2210	OUTPUT:
1472	RETVAL	2211	RETVAL
1473		2212
1474	MODULE = CFClient PACKAGE = CFClient::MixMusic	2213	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1475		2214
1476	int	2215	int
1477	volume (int volume = -1)	2216	volume (int volume = -1)
1478	CODE:	2217	CODE:
1479	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
1480	OUTPUT:	2219	OUTPUT:
1481	RETVAL	2220	RETVAL
1482		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
1483	CFClient::MixMusic	2229	CFPlus::MixMusic
1484	new_from_file (SV *class, char *path)	2230	new_from_file (SV *class, char *path)
1485	CODE:	2231	CODE:
1486	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
1487	OUTPUT:	2233	OUTPUT:
1488	RETVAL	2234	RETVAL
1489		2235
1490	void	2236	void
1491	DESTROY (CFClient::MixMusic self)	2237	DESTROY (CFPlus::MixMusic self)
1492	CODE:	2238	CODE:
1493	Mix_FreeMusic (self);	2239	Mix_FreeMusic (self);
1494		2240
1495	int	2241	int
1496	play (CFClient::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
1497	CODE:	2243	CODE:
1498	RETVAL = Mix_PlayMusic (self, loops);	2244	RETVAL = Mix_PlayMusic (self, loops);
1499	OUTPUT:	2245	OUTPUT:
1500	RETVAL	2246	RETVAL
1501		2247
		2248	int
		2249	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2250	CODE:
		2251	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
		2252	OUTPUT:
		2253	RETVAL
		2254
1502	MODULE = CFClient PACKAGE = CFClient::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1503		2256
1504	BOOT:	2257	BOOT:
1505	{	2258	{
1506	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2259	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1507	static const struct {	2260	static const struct {
1508	const char *name;	2261	const char *name;
1509	IV iv;	2262	IV iv;
1510	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
1511	# define const_iv(name) { # name, (IV)name }	2264	# define const_iv(name) { # name, (IV)name }
		2265	const_iv (GL_VENDOR),
		2266	const_iv (GL_VERSION),
		2267	const_iv (GL_EXTENSIONS),
1512	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
1513	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
1514	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
1515	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
1516	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
		2273	const_iv (GL_CULL_FACE),
1517	const_iv (GL_SCISSOR_TEST),	2274	const_iv (GL_SCISSOR_TEST),
		2275	const_iv (GL_DEPTH_TEST),
		2276	const_iv (GL_ALPHA_TEST),
		2277	const_iv (GL_NORMALIZE),
		2278	const_iv (GL_RESCALE_NORMAL),
		2279	const_iv (GL_FRONT),
		2280	const_iv (GL_BACK),
1518	const_iv (GL_AND),	2281	const_iv (GL_AND),
1519	const_iv (GL_ONE),	2282	const_iv (GL_ONE),
1520	const_iv (GL_ZERO),	2283	const_iv (GL_ZERO),
1521	const_iv (GL_SRC_ALPHA),	2284	const_iv (GL_SRC_ALPHA),
1522	const_iv (GL_SRC_ALPHA_SATURATE),	2285	const_iv (GL_DST_ALPHA),
1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2286	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524	const_iv (GL_ONE_MINUS_DST_ALPHA),	2287	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2288	const_iv (GL_SRC_ALPHA_SATURATE),
1525	const_iv (GL_RGB),	2289	const_iv (GL_RGB),
1526	const_iv (GL_RGBA),	2290	const_iv (GL_RGBA),
		2291	const_iv (GL_RGBA4),
		2292	const_iv (GL_RGBA8),
		2293	const_iv (GL_RGB5_A1),
1527	const_iv (GL_UNSIGNED_BYTE),	2294	const_iv (GL_UNSIGNED_BYTE),
		2295	const_iv (GL_UNSIGNED_SHORT),
		2296	const_iv (GL_UNSIGNED_INT),
1528	const_iv (GL_ALPHA),	2297	const_iv (GL_ALPHA),
1529	const_iv (GL_INTENSITY),	2298	const_iv (GL_INTENSITY),
1530	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
1531	const_iv (GL_LUMINANCE_ALPHA),	2300	const_iv (GL_LUMINANCE_ALPHA),
1532	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
1533	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1534	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
1535	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
1536	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
1537	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
1538	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
1539	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
1540	const_iv (GL_TEXTURE_ENV_MODE),	2311	const_iv (GL_TEXTURE_ENV_MODE),
1541	const_iv (GL_TEXTURE_WRAP_S),	2312	const_iv (GL_TEXTURE_WRAP_S),
1542	const_iv (GL_TEXTURE_WRAP_T),	2313	const_iv (GL_TEXTURE_WRAP_T),
		2314	const_iv (GL_REPEAT),
1543	const_iv (GL_CLAMP),	2315	const_iv (GL_CLAMP),
1544	const_iv (GL_REPEAT),	2316	const_iv (GL_CLAMP_TO_EDGE),
1545	const_iv (GL_NEAREST),	2317	const_iv (GL_NEAREST),
1546	const_iv (GL_LINEAR),	2318	const_iv (GL_LINEAR),
1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),	2319	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),	2320	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),	2321	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),	2322	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551	const_iv (GL_GENERATE_MIPMAP),	2323	const_iv (GL_GENERATE_MIPMAP),
1552	const_iv (GL_MODULATE),	2324	const_iv (GL_MODULATE),
1553	const_iv (GL_DECAL),	2325	const_iv (GL_DECAL),
1554	const_iv (GL_REPLACE),	2326	const_iv (GL_REPLACE),
		2327	const_iv (GL_DEPTH_BUFFER_BIT),
1555	const_iv (GL_COLOR_BUFFER_BIT),	2328	const_iv (GL_COLOR_BUFFER_BIT),
1556	const_iv (GL_PROJECTION),	2329	const_iv (GL_PROJECTION),
1557	const_iv (GL_MODELVIEW),	2330	const_iv (GL_MODELVIEW),
1558	const_iv (GL_COLOR_LOGIC_OP),	2331	const_iv (GL_COLOR_LOGIC_OP),
1559	const_iv (GL_SEPARABLE_2D),	2332	const_iv (GL_SEPARABLE_2D),
1560	const_iv (GL_CONVOLUTION_2D),	2333	const_iv (GL_CONVOLUTION_2D),
1561	const_iv (GL_CONVOLUTION_BORDER_MODE),	2334	const_iv (GL_CONVOLUTION_BORDER_MODE),
1562	const_iv (GL_CONSTANT_BORDER),	2335	const_iv (GL_CONSTANT_BORDER),
1563	const_iv (GL_LINES),	2336	const_iv (GL_LINES),
		2337	const_iv (GL_LINE_STRIP),
		2338	const_iv (GL_LINE_LOOP),
1564	const_iv (GL_QUADS),	2339	const_iv (GL_QUADS),
1565	const_iv (GL_LINE_LOOP),	2340	const_iv (GL_QUAD_STRIP),
		2341	const_iv (GL_TRIANGLES),
		2342	const_iv (GL_TRIANGLE_STRIP),
		2343	const_iv (GL_TRIANGLE_FAN),
1566	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2344	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567	const_iv (GL_FASTEST),	2345	const_iv (GL_FASTEST),
		2346	const_iv (GL_V2F),
		2347	const_iv (GL_V3F),
		2348	const_iv (GL_T2F_V3F),
		2349	const_iv (GL_T2F_N3F_V3F),
1568	# undef const_iv	2350	# undef const_iv
1569	};	2351	};
1570		2352
1571	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1572	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2355
		2356	texture_av = newAV ();
		2357	AvREAL_off (texture_av);
1573	}	2358	}
		2359
		2360	char *
		2361	gl_vendor ()
		2362	CODE:
		2363	RETVAL = (char *)glGetString (GL_VENDOR);
		2364	OUTPUT:
		2365	RETVAL
		2366
		2367	char *
		2368	gl_version ()
		2369	CODE:
		2370	RETVAL = (char *)glGetString (GL_VERSION);
		2371	OUTPUT:
		2372	RETVAL
		2373
		2374	char *
		2375	gl_extensions ()
		2376	CODE:
		2377	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2378	OUTPUT:
		2379	RETVAL
		2380
		2381	const char *glGetString (GLenum pname)
		2382
		2383	GLint glGetInteger (GLenum pname)
		2384	CODE:
		2385	glGetIntegerv (pname, &RETVAL);
		2386	OUTPUT:
		2387	RETVAL
		2388
		2389	GLdouble glGetDouble (GLenum pname)
		2390	CODE:
		2391	glGetDoublev (pname, &RETVAL);
		2392	OUTPUT:
		2393	RETVAL
1574		2394
1575	int glGetError ()	2395	int glGetError ()
		2396
		2397	void glFinish ()
1576		2398
1577	void glClear (int mask)	2399	void glClear (int mask)
1578		2400
1579	void glClearColor (float r, float g, float b, float a = 1.0)	2401	void glClearColor (float r, float g, float b, float a = 1.0)
1580	PROTOTYPE: @	2402	PROTOTYPE: @
…		…
1587		2409
1588	void glHint (int target, int mode)	2410	void glHint (int target, int mode)
1589		2411
1590	void glBlendFunc (int sfactor, int dfactor)	2412	void glBlendFunc (int sfactor, int dfactor)
1591		2413
		2414	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2415	CODE:
		2416	gl_BlendFuncSeparate (sa, da, saa, daa);
		2417
		2418	void glDepthMask (int flag)
		2419
1592	void glLogicOp (int opcode)	2420	void glLogicOp (int opcode)
1593		2421
1594	void glColorMask (int red, int green, int blue, int alpha)	2422	void glColorMask (int red, int green, int blue, int alpha)
1595		2423
1596	void glMatrixMode (int mode)	2424	void glMatrixMode (int mode)
…		…
1599		2427
1600	void glPopMatrix ()	2428	void glPopMatrix ()
1601		2429
1602	void glLoadIdentity ()	2430	void glLoadIdentity ()
1603		2431
		2432	void glDrawBuffer (int buffer)
		2433
		2434	void glReadBuffer (int buffer)
		2435
1604	# near and far are due to microsofts buggy c compiler	2436	# near_ and far_ are due to microsofts buggy "c" compiler
		2437	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2438
		2439	# near_ and far_ are due to microsofts buggy "c" compiler
1605	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2440	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606		2441
1607	void glViewport (int x, int y, int width, int height)	2442	void glViewport (int x, int y, int width, int height)
1608		2443
1609	void glScissor (int x, int y, int width, int height)	2444	void glScissor (int x, int y, int width, int height)
…		…
1624		2459
1625	void glEnd ()	2460	void glEnd ()
1626		2461
1627	void glColor (float r, float g, float b, float a = 1.0)	2462	void glColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	2463	PROTOTYPE: @
		2464	ALIAS:
		2465	glColor_premultiply = 1
1629	CODE:	2466	CODE:
1630	glColor4ub (MIN ((int)(r * 255.f), 255),	2467	if (ix)
1631	MIN ((int)(g * 255.f), 255),	2468	{
1632	MIN ((int)(b * 255.f), 255),	2469	r *= a;
1633	MIN ((int)(a * 255.f), 255));	2470	g *= a;
		2471	b *= a;
		2472	}
		2473	// microsoft visual "c" rounds instead of truncating...
		2474	glColor4f (r, g, b, a);
		2475
		2476	void glInterleavedArrays (int format, int stride, char *data)
		2477
		2478	void glDrawElements (int mode, int count, int type, char *indices)
		2479
		2480	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2481
		2482	void glRasterPos (float x, float y, float z = 0.)
		2483	CODE:
		2484	glRasterPos3f (0, 0, z);
		2485	glBitmap (0, 0, 0, 0, x, y, 0);
1634		2486
1635	void glVertex (float x, float y, float z = 0.)	2487	void glVertex (float x, float y, float z = 0.)
1636	CODE:	2488	CODE:
1637	glVertex3f (x, y, z);	2489	glVertex3f (x, y, z);
1638		2490
…		…
1650		2502
1651	void glBindTexture (int target, int name)	2503	void glBindTexture (int target, int name)
1652		2504
1653	void glConvolutionParameter (int target, int pname, float params)	2505	void glConvolutionParameter (int target, int pname, float params)
1654	CODE:	2506	CODE:
1655	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2507	if (gl.ConvolutionParameterf)
		2508	gl.ConvolutionParameterf (target, pname, params);
1656		2509
1657	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2510	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1658	CODE:	2511	CODE:
1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2512	if (gl.ConvolutionFilter2D)
1660	(target, internalformat, width, height, format, type, data));	2513	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661		2514
1662	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	2515	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1663	CODE:	2516	CODE:
1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2517	if (gl.SeparableFilter2D)
1665	(target, internalformat, width, height, format, type, row, column));	2518	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666		2519
1667	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2520	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1668		2521
1669	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2522	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1670		2523
1671	void glRasterPos (int x, int y)	2524	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672	CODE:	2525
1673	glRasterPos2i (x, y);	2526	void glPixelZoom (float x, float y)
1674		2527
1675	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2528	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676		2529
1677	int glGenTexture ()	2530	int glGenTexture ()
1678	CODE:	2531	CODE:
1679	{	2532	RETVAL = gen_texture ();
1680	GLuint name;
1681	glGenTextures (1, &name);
1682	RETVAL = name;
1683	}
1684	OUTPUT:	2533	OUTPUT:
1685	RETVAL	2534	RETVAL
1686		2535
1687	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
1688	CODE:	2537	CODE:
1689	{
1690	GLuint name_ = name;
1691	glDeleteTextures (1, &name_);	2538	del_texture (name);
1692	}	2539
1693
1694	int glGenList ()	2540	int glGenList ()
1695	CODE:	2541	CODE:
1696	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
1697	OUTPUT:	2543	OUTPUT:
1698	RETVAL	2544	RETVAL

Diff Legend

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