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.79 by root, Sun May 14 22:24:14 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>
		25	#include <math.h>
12	#include <string.h>	26	#include <string.h>
13	#include <stdio.h>	27	#include <stdio.h>
		28	#include <stdlib.h>
14		29
15	#include <SDL.h>	30	#include <SDL.h>
16	#include <SDL_endian.h>	31	#include <SDL_endian.h>
17	#include <SDL_image.h>	32	#include <SDL_image.h>
18	#include <SDL_mixer.h>	33	#include <SDL_mixer.h>
19	#include <SDL_opengl.h>	34	#include <SDL_opengl.h>
20		35
		36	#define PANGO_ENABLE_BACKEND
		37	#define G_DISABLE_CAST_CHECKS
		38
21	#include <glib/gmacros.h>	39	#include <glib/gmacros.h>
22		40
23	#include <pango/pango.h>	41	#include <pango/pango.h>
24	#include <pango/pangofc-fontmap.h>
25	#include <pango/pangoft2.h>
26	#include <pango/pangocairo.h>
27		42
28	#ifndef _WIN32	43	#ifndef _WIN32
29	# include <sys/types.h>	44	# include <sys/types.h>
30	# include <sys/socket.h>	45	# include <sys/socket.h>
31	# include <netinet/in.h>	46	# include <netinet/in.h>
32	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
33	# include <inttypes.h>	48	# include <inttypes.h>
34	#else
35	typedef unsigned char uint8_t;
36	typedef unsigned short uint16_t;
37	typedef unsigned int uint32_t;
38	typedef signed char int8_t;
39	typedef signed short int16_t;
40	typedef signed int int32_t;
41	#endif	49	#endif
42		50
43	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
44		52
45	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
46		54
47	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
48	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
49		57
50	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
51		59
52	#define GL_CALL(type,func,args) \	60	#if 0
53	{ \	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
54	static int init_; \	62	#else
55	static type fptr_; \	63	# define PARACHUTE 0
56	\	64	#endif
57	if (!init_) \
58	{ \
59	init_ = 1; \
60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
61	} \
62	\
63	if (fptr_) \
64	fptr_ args; \
65	}
66		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
67	typedef Mix_Chunk *CFClient__MixChunk;	116	typedef Mix_Chunk *CFPlus__MixChunk;
68	typedef Mix_Music *CFClient__MixMusic;	117	typedef Mix_Music *CFPlus__MixMusic;
69		118
70	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	}
71		138
72	typedef struct cf_layout {	139	typedef struct cf_layout {
73	PangoLayout *pl; // either derived from a cairo or ft2 context	140	PangoLayout *pl;
74	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75	float r, g, b, a; // default color for rgba mode	141	float r, g, b, a; // default color for rgba mode
76	int base_height;	142	int base_height;
77	CFClient__Font font;	143	CFPlus__Font font;
78	} *CFClient__Layout;	144	} *CFPlus__Layout;
79		145
80	static CFClient__Font default_font;	146	static CFPlus__Font default_font;
81	static PangoContext *ft2_context, *cairo_context;	147	static PangoContext *opengl_context;
82	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	148	static PangoFontMap *opengl_fontmap;
83		149
84	static void	150	static void
85	substitute_func (FcPattern *pattern, gpointer data)	151	substitute_func (FcPattern *pattern, gpointer data)
86	{	152	{
87	FcPatternAddBool (pattern, FC_HINTING , 1);	153	FcPatternAddBool (pattern, FC_HINTING, 1);
		154	#ifdef FC_HINT_STYLE
		155	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		156	#endif
88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	157	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
89	}	158	}
90		159
91	static void	160	static void
92	layout_update_font (CFClient__Layout self)	161	layout_update_font (CFPlus__Layout self)
93	{	162	{
94	/* 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
95	* reasonably well with bitstream vera	164	* reasonably well with bitstream vera
96	*/	165	*/
97	PangoFontDescription *font = self->font ? self->font : default_font;	166	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
101		170
102	pango_layout_set_font_description (self->pl, font);	171	pango_layout_set_font_description (self->pl, font);
103	}	172	}
104		173
105	static void	174	static void
106	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	175	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
107	{	176	{
		177	PangoRectangle rect;
		178
		179	// get_pixel_* wrongly rounds down
108	pango_layout_get_pixel_size (self->pl, w, h);	180	pango_layout_get_extents (self->pl, 0, &rect);
109		181
110	if (!*w) *w = 1;	182	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
111	if (!*h) *h = 1;	183	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
112		184
113	*w = (*w + 3) & ~3;	185	if (!rect.width) rect.width = 1;
114	}	186	if (!rect.height) rect.height = 1;
115		187
		188	*w = rect.width;
		189	*h = rect.height;
		190	}
		191
		192	typedef uint16_t tileid;
116	typedef uint16_t mapface;	193	typedef uint16_t faceid;
117		194
118	typedef struct {	195	typedef struct {
119	GLint name;	196	int name;
120	int w, h;	197	int w, h;
121	float s, t;	198	float s, t;
122	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
123	} maptex;	202	} maptex;
124		203
125	typedef struct {	204	typedef struct {
		205	uint32_t player;
		206	tileid tile[3];
126	int16_t darkness;	207	uint16_t darkness;
127	mapface face[3];	208	uint8_t stat_width, stat_hp, flags, smoothmax;
128	} mapcell;	209	} mapcell;
129		210
130	typedef struct {	211	typedef struct {
131	int32_t c0, c1;	212	int32_t c0, c1;
132	mapcell *col;	213	mapcell *col;
133	} maprow;	214	} maprow;
134		215
135	typedef struct map {	216	typedef struct map {
136	int x, y, w, h;	217	int x, y, w, h;
137	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
138	int faces;	219	int faces; tileid *face2tile; // [faceid]
139	mapface *face;	220	int texs; maptex *tex; // [tileid]
140
141	int texs;
142	maptex *tex;
143		221
144	int32_t rows;	222	int32_t rows;
145	maprow *row;	223	maprow *row;
146	} *CFClient__Map;	224	} *CFPlus__Map;
147		225
148	static char *	226	static char *
149	prepend (char *ptr, int sze, int inc)	227	prepend (char *ptr, int sze, int inc)
150	{	228	{
151	char *p;	229	char *p;
…		…
168	}	246	}
169		247
170	#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))
171	#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))
172		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
173	static maprow *	271	static maprow *
174	map_get_row (CFClient__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
175	{	273	{
176	if (0 > y)	274	if (0 > y)
177	{	275	{
178	int extend = - y + MAP_EXTEND_Y;	276	int extend = - y + MAP_EXTEND_Y;
179	Prepend (maprow, self->row, self->rows, extend);	277	Prepend (maprow, self->row, self->rows, extend);
…		…
217		315
218	return row->col + (x - row->c0);	316	return row->col + (x - row->c0);
219	}	317	}
220		318
221	static mapcell *	319	static mapcell *
222	map_get_cell (CFClient__Map self, int x, int y)	320	map_get_cell (CFPlus__Map self, int x, int y)
223	{	321	{
224	return row_get_cell (map_get_row (self, y), x);	322	return row_get_cell (map_get_row (self, y), x);
225	}	323	}
226		324
227	static void	325	static void
228	map_clear (CFClient__Map self)	326	map_clear (CFPlus__Map self)
229	{	327	{
230	int r;	328	int r;
231		329
232	for (r = 0; r < self->rows; r++)	330	for (r = 0; r < self->rows; r++)
233	Safefree (self->row[r].col);	331	Safefree (self->row[r].col);
…		…
241	self->row = 0;	339	self->row = 0;
242	self->rows = 0;	340	self->rows = 0;
243	}	341	}
244		342
245	static void	343	static void
246	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)
247	{	345	{
248	int x, y;	346	int x, y;
249	maprow *row;	347	maprow *row;
		348	mapcell *cell;
250		349
251	for (y = y0; y < y0 + h; y++)	350	for (y = y0; y < y0 + h; y++)
252	if (y >= 0)	351	if (y >= 0)
253	{	352	{
254	if (y >= self->rows)	353	if (y >= self->rows)
…		…
260	if (x >= row->c0)	359	if (x >= row->c0)
261	{	360	{
262	if (x >= row->c1)	361	if (x >= row->c1)
263	break;	362	break;
264		363
265	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;
266	}	370	}
267	}	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);
268	}	388	}
269		389
270	static void	390	static void
271	music_finished (void)	391	music_finished (void)
272	{	392	{
…		…
291	ev.data2 = 0;	411	ev.data2 = 0;
292		412
293	SDL_PushEvent ((SDL_Event *)&ev);	413	SDL_PushEvent ((SDL_Event *)&ev);
294	}	414	}
295		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
296	MODULE = CFClient PACKAGE = CFClient	437	MODULE = CFPlus PACKAGE = CFPlus
297		438
298	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
299		440
300	BOOT:	441	BOOT:
301	{	442	{
302	HV *stash = gv_stashpv ("CFClient", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
303	static const struct {	444	static const struct {
304	const char *name;	445	const char *name;
305	IV iv;	446	IV iv;
306	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
307	# 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
308	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
309	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
310	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
311	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
312	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
321	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
322	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
323	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
324	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
325	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
326	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
327	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
328	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
329	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
330	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
385	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
386	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
387	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
388	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
389	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
390	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
391	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
392	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
393	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
394	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
395	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
396	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
397	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
398	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
399	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
400	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
401	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
402	const_iv (KMOD_CTRL),
403	const_iv (KMOD_SHIFT),
404	const_iv (KMOD_ALT),
405	const_iv (KMOD_META)
406	# undef const_iv	556	# undef const_iv
407	};	557	};
408		558
409	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; )
410	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);
411	}	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)
412		582
413	void	583	void
414	pango_init ()	584	pango_init ()
415	CODE:	585	CODE:
416	{	586	{
417	// delayed, so it can pick up new fonts added by AddFontResourceEx
418	ft2_fontmap = pango_ft2_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
419	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);
420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
421
422	cairo_fontmap = pango_cairo_font_map_get_default ();
423	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
424	}	590	}
		591
		592	char *
		593	SDL_GetError ()
425		594
426	int	595	int
427	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
428		597
429	void	598	void
430	SDL_Quit ()	599	SDL_Quit ()
431		600
432	void	601	void
433	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
434	PPCODE:	603	PPCODE:
435	{	604	{
436	SDL_Rect **m;	605	SDL_Rect **m;
437		606
438	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
439	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
440	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
441	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
442		611
		612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
		614
443	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447		619
448	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		621	#if SDL_VERSION_ATLEAST(1,2,10)
449	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
450	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
451		624	#endif
452	SDL_EnableUNICODE (1);
453	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454		625
455	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
456		627
457	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
458	while (*m)	629	while (*m)
459	{	630	{
		631	if ((*m)->w >= 640 && (*m)->h >= 480)
		632	{
460	AV *av = newAV ();	633	AV *av = newAV ();
461	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
462	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));
463	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
464		640
465	++m;	641	++m;
466	}	642	}
467	}	643	}
468		644
469	int	645	int
470	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
471	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
472	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
473	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474	);	659	);
		660
		661	if (RETVAL)
		662	{
		663	av_clear (texture_av);
		664
475	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	}
476	OUTPUT:	671	OUTPUT:
477	RETVAL	672	RETVAL
478		673
479	void	674	void
480	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
481		676
		677	char *
		678	SDL_GetKeyName (int sym)
		679
		680	int
		681	SDL_GetAppState ()
		682
482	void	683	void
483	SDL_PollEvent ()	684	poll_events ()
484	PPCODE:	685	PPCODE:
485	{	686	{
486	SDL_Event ev;	687	SDL_Event ev;
487		688
488	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
489	{	691	{
490	HV *hv = newHV ();	692	HV *hv = newHV ();
491	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
492		694
493	switch (ev.type)	695	switch (ev.type)
…		…
495	case SDL_KEYDOWN:	697	case SDL_KEYDOWN:
496	case SDL_KEYUP:	698	case SDL_KEYUP:
497	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	699	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
498	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	700	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
499	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 */
500	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	703	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
501	break;	704	break;
502		705
503	case SDL_ACTIVEEVENT:	706	case SDL_ACTIVEEVENT:
504	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506	break;	709	break;
507		710
508	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);
509	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
510	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
511	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
512	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
513	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
514	break;	737	break;
515		738
516	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
517	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
		741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		742
518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	743	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	744	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	745	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	746	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522	break;	747	break;
…		…
526	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	751	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	752	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528	break;	753	break;
529	}	754	}
530		755
531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	756	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
532	}	757	}
533	}	758	}
534		759
535	int	760	int
536	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)
…		…
545	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
546		771
547	void	772	void
548	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
549	CODE:	774	CODE:
		775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		776
		777	void
		778	win32_proxy_info ()
		779	PPCODE:
		780	{
550	#ifndef _WIN32	781	#ifdef _WIN32
551	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	}
552	#endif	803	#endif
553		804	}
554	char *
555	gl_version ()
556	CODE:
557	RETVAL = (char *)glGetString (GL_VERSION);
558	OUTPUT:
559	RETVAL
560
561	char *
562	gl_extensions ()
563	CODE:
564	RETVAL = (char *)glGetString (GL_EXTENSIONS);
565	OUTPUT:
566	RETVAL
567		805
568	void	806	void
569	add_font (char *file)	807	add_font (char *file)
570	CODE:	808	CODE:
571	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	809	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572	#ifdef _WIN32
573	// cairo... sigh... requires win2000
574	AddFontResourceEx (file, FR_PRIVATE, 0);
575	#endif
576		810
577	void	811	void
578	load_image_inline (SV *image_)	812	load_image_inline (SV *image_)
579	ALIAS:	813	ALIAS:
580	load_image_file = 1	814	load_image_file = 1
…		…
622		856
623	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	857	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624		858
625	assert (surface2->pitch == surface2->w * 4);	859	assert (surface2->pitch == surface2->w * 4);
626		860
		861	SDL_LockSurface (surface2);
627	EXTEND (SP, 5);	862	EXTEND (SP, 6);
628	PUSHs (sv_2mortal (newSViv (surface2->w)));	863	PUSHs (sv_2mortal (newSViv (surface2->w)));
629	PUSHs (sv_2mortal (newSViv (surface2->h)));	864	PUSHs (sv_2mortal (newSViv (surface2->h)));
630	SDL_LockSurface (surface2);
631	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	865	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
632	SDL_UnlockSurface (surface2);
633	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)));
634	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	867	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	868	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		869	SDL_UnlockSurface (surface2);
636		870
637	SDL_FreeSurface (surface);	871	SDL_FreeSurface (surface);
638	SDL_FreeSurface (surface2);	872	SDL_FreeSurface (surface2);
639	}	873	}
640		874
…		…
664	}	898	}
665		899
666	void	900	void
667	error (char *message)	901	error (char *message)
668	CODE:	902	CODE:
		903	fprintf (stderr, "ERROR: %s\n", message);
669	#ifdef _WIN32	904	#ifdef _WIN32
670	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
671	#else	922	#else
672	fprintf (stderr, "ERROR: %s\n", message);	923	_exit (retval);
673	#endif	924	#endif
674		925
675	void	926	void
676	fatal (char *message)	927	debug ()
677	CODE:	928	CODE:
678	#ifdef _WIN32	929	{
679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	930	#if DEBUG
680	#else	931	VALGRIND_DO_LEAK_CHECK;
681	fprintf (stderr, "FATAL: %s\n", message);
682	#endif	932	#endif
683	exit (1);	933	}
684		934
685	MODULE = CFClient PACKAGE = CFClient::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
686		936
687	CFClient::Font	937	CFPlus::Font
688	new_from_file (SV *class, char *path, int id = 0)	938	new_from_file (SV *class, char *path, int id = 0)
689	CODE:	939	CODE:
690	{	940	{
691	int count;	941	int count;
692	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	942	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
695	}	945	}
696	OUTPUT:	946	OUTPUT:
697	RETVAL	947	RETVAL
698		948
699	void	949	void
700	DESTROY (CFClient::Font self)	950	DESTROY (CFPlus::Font self)
701	CODE:	951	CODE:
702	pango_font_description_free (self);	952	pango_font_description_free (self);
703		953
704	void	954	void
705	make_default (CFClient::Font self)	955	make_default (CFPlus::Font self)
706	CODE:	956	CODE:
707	default_font = self;	957	default_font = self;
708		958
709	MODULE = CFClient PACKAGE = CFClient::Layout	959	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		960
711	CFClient::Layout	961	void
712	new (SV *class, int rgba = 0)	962	reset_glyph_cache ()
		963	CODE:
		964	tc_clear ();
		965
		966	CFPlus::Layout
		967	new (SV *class)
713	CODE:	968	CODE:
714	New (0, RETVAL, 1, struct cf_layout);	969	New (0, RETVAL, 1, struct cf_layout);
715		970
716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	971	RETVAL->pl = pango_layout_new (opengl_context);
717	RETVAL->rgba = rgba;
718	RETVAL->r = 1.;	972	RETVAL->r = 1.;
719	RETVAL->g = 1.;	973	RETVAL->g = 1.;
720	RETVAL->b = 1.;	974	RETVAL->b = 1.;
721	RETVAL->a = 1.;	975	RETVAL->a = 1.;
722	RETVAL->base_height = MIN_FONT_HEIGHT;	976	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
726	layout_update_font (RETVAL);	980	layout_update_font (RETVAL);
727	OUTPUT:	981	OUTPUT:
728	RETVAL	982	RETVAL
729		983
730	void	984	void
731	DESTROY (CFClient::Layout self)	985	DESTROY (CFPlus::Layout self)
732	CODE:	986	CODE:
733	g_object_unref (self->pl);	987	g_object_unref (self->pl);
734	Safefree (self);	988	Safefree (self);
735		989
736	int
737	is_rgba (CFClient::Layout self)
738	CODE:
739	RETVAL = self->rgba;
740	OUTPUT:
741	RETVAL
742
743	void	990	void
744	set_text (CFClient::Layout self, SV *text_)	991	set_text (CFPlus::Layout self, SV *text_)
745	CODE:	992	CODE:
746	{	993	{
747	STRLEN textlen;	994	STRLEN textlen;
748	char *text = SvPVutf8 (text_, textlen);	995	char *text = SvPVutf8 (text_, textlen);
749		996
750	pango_layout_set_text (self->pl, text, textlen);	997	pango_layout_set_text (self->pl, text, textlen);
751	}	998	}
752		999
753	void	1000	void
754	set_markup (CFClient::Layout self, SV *text_)	1001	set_markup (CFPlus::Layout self, SV *text_)
755	CODE:	1002	CODE:
756	{	1003	{
757	STRLEN textlen;	1004	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	1005	char *text = SvPVutf8 (text_, textlen);
759		1006
760	pango_layout_set_markup (self->pl, text, textlen);	1007	pango_layout_set_markup (self->pl, text, textlen);
761	}	1008	}
762		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
763	SV *	1095	SV *
764	get_text (CFClient::Layout self)	1096	get_text (CFPlus::Layout self)
765	CODE:	1097	CODE:
766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	1098	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767	SvUTF8_on (RETVAL);	1099	sv_utf8_decode (RETVAL);
768	OUTPUT:	1100	OUTPUT:
769	RETVAL	1101	RETVAL
770		1102
771	void	1103	void
772	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.)
773	CODE:	1105	CODE:
774	self->r = r;	1106	self->r = r;
775	self->g = g;	1107	self->g = g;
776	self->b = b;	1108	self->b = b;
777	self->a = a;	1109	self->a = a;
778		1110
779	void	1111	void
780	set_font (CFClient::Layout self, CFClient::Font font = 0)	1112	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781	CODE:	1113	CODE:
782	if (self->font != font)	1114	if (self->font != font)
783	{	1115	{
784	self->font = font;	1116	self->font = font;
785	layout_update_font (self);	1117	layout_update_font (self);
786	}	1118	}
787		1119
788	void	1120	void
789	set_height (CFClient::Layout self, int base_height)	1121	set_height (CFPlus::Layout self, int base_height)
790	CODE:	1122	CODE:
791	if (self->base_height != base_height)	1123	if (self->base_height != base_height)
792	{	1124	{
793	self->base_height = base_height;	1125	self->base_height = base_height;
794	layout_update_font (self);	1126	layout_update_font (self);
795	}	1127	}
796		1128
797	void	1129	void
798	set_width (CFClient::Layout self, int max_width = -1)	1130	set_width (CFPlus::Layout self, int max_width = -1)
799	CODE:	1131	CODE:
800	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);
801		1133
802	void	1134	void
		1135	set_indent (CFPlus::Layout self, int indent)
		1136	CODE:
		1137	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1138
		1139	void
		1140	set_spacing (CFPlus::Layout self, int spacing)
		1141	CODE:
		1142	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1143
		1144	void
		1145	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1146	CODE:
		1147	pango_layout_set_ellipsize (self->pl,
		1148	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1149	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1150	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1151	: PANGO_ELLIPSIZE_NONE
		1152	);
		1153
		1154	void
		1155	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1156	CODE:
		1157	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1158
		1159	void
803	size (CFClient::Layout self)	1160	size (CFPlus::Layout self)
804	PPCODE:	1161	PPCODE:
805	{	1162	{
806	int w, h;	1163	int w, h;
807		1164
808	layout_get_pixel_size (self, &w, &h);	1165	layout_get_pixel_size (self, &w, &h);
…		…
811	PUSHs (sv_2mortal (newSViv (w)));	1168	PUSHs (sv_2mortal (newSViv (w)));
812	PUSHs (sv_2mortal (newSViv (h)));	1169	PUSHs (sv_2mortal (newSViv (h)));
813	}	1170	}
814		1171
815	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
816	xy_to_index (CFClient::Layout self, int x, int y)	1185	xy_to_index (CFPlus::Layout self, int x, int y)
817	CODE:	1186	CODE:
818	{	1187	{
819	int index, trailing;	1188	int index, trailing;
820	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);
821	RETVAL = index;	1190	RETVAL = index + trailing;
822	}	1191	}
823	OUTPUT:	1192	OUTPUT:
824	RETVAL	1193	RETVAL
825		1194
826	void	1195	void
827	cursor_pos (CFClient::Layout self, int index)	1196	cursor_pos (CFPlus::Layout self, int index)
828	PPCODE:	1197	PPCODE:
829	{	1198	{
830	PangoRectangle strong_pos;	1199	PangoRectangle strong_pos;
831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1200	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832		1201
…		…
835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1204	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1205	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837	}	1206	}
838		1207
839	void	1208	void
840	render (CFClient::Layout self)	1209	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
841	PPCODE:	1210	PPCODE:
842	{	1211	{
843	SV *retval;	1212	int line, x;
844	int w, h;
845		1213
846	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 */
847		1216
848	if (self->rgba)
849	{
850	cairo_surface_t *surface;
851	cairo_t *cairo;
852
853	retval = newSV (w * h * 4);
854	SvPOK_only (retval);
855	SvCUR_set (retval, w * h * 4);
856
857	memset (SvPVX (retval), 0, w * h * 4);
858
859	surface = cairo_image_surface_create_for_data (
860	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
861	cairo = cairo_create (surface);
862	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
863
864	pango_cairo_show_layout (cairo, self->pl);
865
866	cairo_destroy (cairo);
867	cairo_surface_destroy (surface);
868
869	// what a mess, and its premultiplied, too :(
870	{
871	uint32_t *p = (uint32_t *)SvPVX (retval);
872	uint32_t *e = p + w * h;
873
874	while (p < e)
875	{
876	uint32_t rgba = *p;
877	rgba = (rgba >> 24) | (rgba << 8);
878	rgba = SDL_SwapBE32 (rgba);
879	*p++ = rgba;
880	}
881	}
882
883	EXTEND (SP, 5);	1217	EXTEND (SP, 2);
884	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)
885	PUSHs (sv_2mortal (newSViv (h)));	1239	PUSHs (sv_2mortal (newSViv (index + trailing)));
886	PUSHs (sv_2mortal (retval));
887	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889	}
890	else	1240	else
891	{	1241	{
892	FT_Bitmap bitmap;
893
894	retval = newSV (w * h);
895	SvPOK_only (retval);
896	SvCUR_set (retval, w * h);
897
898	bitmap.rows = h;
899	bitmap.width = w;
900	bitmap.pitch = w;
901	bitmap.buffer = (unsigned char*)SvPVX (retval);
902	bitmap.num_grays = 256;
903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
904
905	memset (bitmap.buffer, 0, w * h);
906
907	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
908
909	EXTEND (SP, 5);
910	PUSHs (sv_2mortal (newSViv (w)));	1242	PUSHs (sv_2mortal (newSViv (index)));
911	PUSHs (sv_2mortal (newSViv (h)));	1243	PUSHs (sv_2mortal (newSViv (trailing)));
912	PUSHs (sv_2mortal (retval));
913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915	}	1244	}
916	}	1245	}
917		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
918	MODULE = CFClient PACKAGE = CFClient::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
919		1258
		1259	int minpot (int n)
		1260
920	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
921	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.)
922	PROTOTYPE: $$$;$$	1300	PROTOTYPE: $$$;$$
923	ALIAS:	1301	ALIAS:
924	draw_quad_alpha = 1	1302	draw_quad_alpha = 1
925	draw_quad_alpha_premultiplied = 2	1303	draw_quad_alpha_premultiplied = 2
926	CODE:	1304	CODE:
927	{	1305	{
928	HV *hv = (HV *)SvRV (self);	1306	HV *hv = (HV *)SvRV (self);
929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1307	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1308	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1309	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933		1310
934	if (items < 5)	1311	if (items < 5)
935	{	1312	{
936	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1313	w = SvNV (*hv_fetch (hv, "w", 1, 1));
937	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1314	h = SvNV (*hv_fetch (hv, "h", 1, 1));
938	}	1315	}
939		1316
940	if (ix)	1317	if (ix)
941	{	1318	{
942	glEnable (GL_BLEND);	1319	glEnable (GL_BLEND);
		1320
		1321	if (ix == 2)
943	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);
944	}	1329	}
945		1330
946	glBindTexture (GL_TEXTURE_2D, name);	1331	glBindTexture (GL_TEXTURE_2D, name);
947
948	if (wrap_mode)
949	{
950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952	}
953		1332
954	glBegin (GL_QUADS);	1333	glBegin (GL_QUADS);
955	glTexCoord2f (0, 0); glVertex2f (x , y );	1334	glTexCoord2f (0, 0); glVertex2f (x , y );
956	glTexCoord2f (0, t); glVertex2f (x , y + h);	1335	glTexCoord2f (0, t); glVertex2f (x , y + h);
957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1336	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1337	glTexCoord2f (s, 0); glVertex2f (x + w, y );
959	glEnd ();	1338	glEnd ();
960		1339
961	if (ix)	1340	if (ix)
		1341	{
		1342	glDisable (GL_ALPHA_TEST);
962	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
		1344	}
963	}	1345	}
964		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
965	MODULE = CFClient PACKAGE = CFClient::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
966		1359
967	CFClient::Map	1360	CFPlus::Map
968	new (SV *class, int map_width, int map_height)	1361	new (SV *class)
969	CODE:	1362	CODE:
970	New (0, RETVAL, 1, struct map);	1363	New (0, RETVAL, 1, struct map);
971	RETVAL->x = 0;	1364	RETVAL->x = 0;
972	RETVAL->y = 0;	1365	RETVAL->y = 0;
973	RETVAL->w = map_width;	1366	RETVAL->w = 0;
974	RETVAL->h = map_height;	1367	RETVAL->h = 0;
975	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
976	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
977	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
978	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
979	RETVAL->texs = 8192;
980	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
981	RETVAL->rows = 0;	1372	RETVAL->rows = 0;
982	RETVAL->row = 0;	1373	RETVAL->row = 0;
983	OUTPUT:	1374	OUTPUT:
984	RETVAL	1375	RETVAL
985		1376
986	void	1377	void
987	DESTROY (CFClient::Map self)	1378	DESTROY (CFPlus::Map self)
988	CODE:	1379	CODE:
989	{	1380	{
990	map_clear (self);	1381	map_clear (self);
991	Safefree (self->face);	1382	Safefree (self->face2tile);
		1383	Safefree (self->tex);
992	Safefree (self);	1384	Safefree (self);
993	}	1385	}
994		1386
995	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
996	clear (CFClient::Map self)	1394	clear (CFPlus::Map self)
997	CODE:	1395	CODE:
998	map_clear (self);	1396	map_clear (self);
999		1397
1000	void	1398	void
1001	set_face (CFClient::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1002	CODE:	1400	CODE:
1003	{	1401	{
1004	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1005	{	1403	need_texid (self, tile);
1006	Append (mapface, self->face, self->faces, self->faces);
1007	self->faces *= 2;
1008	}
1009
1010	self->face [face] = texid;
1011	}	1404	}
1012		1405
1013	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
1014	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)
1015	CODE:	1431	CODE:
1016	{	1432	{
1017	while (self->texs <= texid)	1433	need_texid (self, texid);
1018	{
1019	Append (maptex, self->tex, self->texs, self->texs);
1020	self->texs *= 2;
1021	}
1022		1434
1023	{	1435	{
1024	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1025		1437
1026	tex->name = name;	1438	tex->name = name;
…		…
1031	tex->r = r;	1443	tex->r = r;
1032	tex->g = g;	1444	tex->g = g;
1033	tex->b = b;	1445	tex->b = b;
1034	tex->a = a;	1446	tex->a = a;
1035	}	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);
1036	}	1457	}
1037		1458
1038	int	1459	int
1039	ox (CFClient::Map self)	1460	ox (CFPlus::Map self)
1040	ALIAS:	1461	ALIAS:
1041	oy = 1	1462	oy = 1
		1463	x = 2
		1464	y = 3
		1465	w = 4
		1466	h = 5
1042	CODE:	1467	CODE:
1043	switch (ix)	1468	switch (ix)
1044	{	1469	{
1045	case 0: RETVAL = self->ox; break;	1470	case 0: RETVAL = self->ox; break;
1046	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;
1047	}	1476	}
1048	OUTPUT:	1477	OUTPUT:
1049	RETVAL	1478	RETVAL
1050		1479
1051	void	1480	void
1052	scroll (CFClient::Map self, int dx, int dy)	1481	scroll (CFPlus::Map self, int dx, int dy)
1053	CODE:	1482	CODE:
1054	{	1483	{
1055	if (dx > 0)	1484	if (dx > 0)
1056	map_blank (self, self->x, self->y, dx - 1, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1057	else if (dx < 0)	1486	else if (dx < 0)
1058	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);
1059		1488
1060	if (dy > 0)	1489	if (dy > 0)
1061	map_blank (self, self->x, self->y, self->w, dy - 1);	1490	map_blank (self, self->x, self->y, self->w, dy);
1062	else if (dy < 0)	1491	else if (dy < 0)
1063	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);
1064		1493
1065	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1066	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1067		1496
1068	while (self->y < 0)	1497	while (self->y < 0)
…		…
1073	self->y += MAP_EXTEND_Y;	1502	self->y += MAP_EXTEND_Y;
1074	}	1503	}
1075	}	1504	}
1076		1505
1077	void	1506	void
1078	map1a_update (CFClient::Map self, SV *data_)	1507	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1079	CODE:	1508	CODE:
1080	{	1509	{
1081	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1510	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1082	uint8_t *data_end = (uint8_t *)SvEND (data_);	1511	uint8_t *data_end = (uint8_t *)SvEND (data_);
1083	mapcell *cell;	1512	mapcell *cell;
1084	int x, y, flags;	1513	int x, y, flags;
1085		1514
1086	while (data < data_end)	1515	while (data < data_end - 1)
1087	{	1516	{
1088	flags = (data [0] << 8) + data [1]; data += 2;	1517	flags = (data [0] << 8) + data [1]; data += 2;
1089		1518
1090	x = ((flags >> 10) & 63) + self->x;	1519	x = self->x + ((flags >> 10) & 63);
1091	y = ((flags >> 4) & 63) + self->y;	1520	y = self->y + ((flags >> 4) & 63);
1092		1521
1093	cell = map_get_cell (self, x, y);	1522	cell = map_get_cell (self, x, y);
1094		1523
1095	if (flags & 15)	1524	if (flags & 15)
1096	{	1525	{
1097	if (cell->darkness < 0)	1526	if (!cell->darkness)
1098	{	1527	{
		1528	memset (cell, 0, sizeof (*cell));
1099	cell->darkness = 0;	1529	cell->darkness = 256;
1100	cell->face [0] = 0;
1101	cell->face [1] = 0;
1102	cell->face [2] = 0;
1103	}	1530	}
1104		1531
1105	cell->darkness = flags & 8 ? *data++ : 255;
1106
1107	//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	}
1108		1573
1109	if (flags & 4)	1574	if (flags & 4)
1110	{	1575	{
1111	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];
1112	}	1579	}
1113		1580
1114	if (flags & 2)	1581	if (flags & 2)
1115	{	1582	{
1116	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];
1117	}	1586	}
1118		1587
1119	if (flags & 1)	1588	if (flags & 1)
1120	{	1589	{
1121	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];
1122	}	1593	}
1123	}	1594	}
1124	else	1595	else
1125	cell->darkness = -1;	1596	cell->darkness = 0;
1126	}	1597	}
1127	}	1598	}
1128		1599
1129	SV *	1600	SV *
1130	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)
1131	CODE:	1602	CODE:
1132	{	1603	{
1133	int x1, x;	1604	int x1, x;
1134	int y1, y;	1605	int y1, y;
1135	int z;	1606	int z;
…		…
1156	{	1627	{
1157	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1158		1629
1159	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1160	{	1631	{
1161	mapface face = cell->face [z];
1162
1163	if (face)
1164	{
1165	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1166	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1167	int a1 = tex.a;	1634	int a1 = tex.a;
1168		1635
1169	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1170	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1171	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1172	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1173	}
1174	}	1640	}
1175	}	1641	}
1176		1642
1177	*map++ = (r )	1643	*map++ = (r )
1178	| (g << 8)	1644	| (g << 8)
…		…
1185	}	1651	}
1186	OUTPUT:	1652	OUTPUT:
1187	RETVAL	1653	RETVAL
1188		1654
1189	void	1655	void
1190	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)
1191	PPCODE:	1657	CODE:
1192	{	1658	{
1193	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;
1194	int x, y, z;	1663	int x, y, z;
1195	int last_name;	1664	int last_name;
1196	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;
1197	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1198	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	1984	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1199	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	1985	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1200		1986
1201	memset (darkness, 255, sw4 * sh);	1987	memset (darkness, 255, sw4 * sh);
1202	SvPOK_only (darkness_sv);	1988	SvPOK_only (darkness_sv);
1203	SvCUR_set (darkness_sv, sw4 * sh);	1989	SvCUR_set (darkness_sv, sw4 * sh);
1204		1990
1205	vx = self->x + (self->w - sw) / 2 - shift_x;	1991	mx += self->x;
1206	vy = self->y + (self->h - sh) / 2 - shift_y;	1992	my += self->y;
1207		1993
1208	/*
1209	int vx = self->vx = self->w >= sw
1210	? self->x + (self->w - sw) / 2
1211	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1212
1213	int vy = self->vy = self->h >= sh
1214	? self->y + (self->h - sh) / 2
1215	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1216	*/
1217
1218	glColor4ub (255, 255, 255, 255);
1219
1220	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221	glEnable (GL_BLEND);
1222	glEnable (GL_TEXTURE_2D);
1223	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224
1225	glBegin (GL_QUADS);
1226
1227	last_name = 0;
1228
1229	for (z = 0; z < 3; z++)
1230	for (y = 0; y < sh; y++)	1994	for (y = 0; y < sh; y++)
1231	if (0 <= y + vy && y + vy < self->rows)	1995	if (0 <= y + my && y + my < self->rows)
1232	{	1996	{
1233	maprow *row = self->row + (y + vy);	1997	maprow *row = self->row + (y + my);
1234		1998
1235	for (x = 0; x < sw; x++)	1999	for (x = 0; x < sw; x++)
1236	if (row->c0 <= x + vx && x + vx < row->c1)	2000	if (row->c0 <= x + mx && x + mx < row->c1)
1237	{	2001	{
1238	mapcell *cell = row->col + (x + vx - row->c0);	2002	mapcell *cell = row->col + (x + mx - row->c0);
1239		2003
1240	darkness[y * sw4 + x] = cell->darkness < 0	2004	darkness[y * sw4 + x] = cell->darkness
		2005	? 255 - (cell->darkness - 1)
1241	? 255 - FOW_DARKNESS	2006	: 255 - FOW_DARKNESS;
1242	: 255 - cell->darkness;	2007	}
		2008	}
1243		2009
1244	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);
1245		2014
1246	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)
1247	{	2027	{
1248	maptex tex = self->tex [face];	2028	unsigned int x2 = x + dx;
		2029	unsigned int y2 = y + dy;
1249		2030
1250	int px = (x + 1) * 32 - tex.w;	2031	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
1251	int py = (y + 1) * 32 - tex.h;
1252
1253	if (last_name != tex.name)
1254	{
1255	glEnd ();
1256	last_name = tex.name;
1257	glBindTexture (GL_TEXTURE_2D, last_name);
1258	glBegin (GL_QUADS);
1259	}
1260
1261	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1262	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1263	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1264	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1265	}	2032	}
1266	}	2033
		2034	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
1267	}	2035	}
1268		2036
1269	glEnd ();	2037	darkness_sv = darkness2_sv;
1270		2038	}
1271	glDisable (GL_TEXTURE_2D);
1272	glDisable (GL_BLEND);
1273		2039
1274	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1275	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1276	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1277	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
1278	}	2044	}
1279		2045
1280	SV *	2046	SV *
1281	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)
1282	CODE:	2048	CODE:
1283	{	2049	{
1284	int x, y, x1, y1;	2050	int x, y, x1, y1;
1285	SV *data_sv = newSV (w * h * 7 + 5);	2051	SV *data_sv = newSV (w * h * 7 + 5);
1286	uint8_t *data = (uint8_t *)SvPVX (data_sv);	2052	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1311	if (row && row->c0 <= x && x < row->c1)	2077	if (row && row->c0 <= x && x < row->c1)
1312	{	2078	{
1313	mapcell *cell = row->col + (x - row->c0);	2079	mapcell *cell = row->col + (x - row->c0);
1314	uint8_t flags = 0;	2080	uint8_t flags = 0;
1315		2081
1316	if (cell->face [0]) flags |= 1;	2082	if (cell->tile [0]) flags |= 1;
1317	if (cell->face [1]) flags |= 2;	2083	if (cell->tile [1]) flags |= 2;
1318	if (cell->face [2]) flags |= 4;	2084	if (cell->tile [2]) flags |= 4;
1319		2085
1320	*data++ = flags;	2086	*data++ = flags;
1321		2087
1322	if (flags & 1)	2088	if (flags & 1)
1323	{	2089	{
		2090	tileid tile = cell->tile [0];
1324	*data++ = cell->face [0] >> 8;	2091	*data++ = tile >> 8;
1325	*data++ = cell->face [0];	2092	*data++ = tile;
1326	}	2093	}
1327		2094
1328	if (flags & 2)	2095	if (flags & 2)
1329	{	2096	{
		2097	tileid tile = cell->tile [1];
1330	*data++ = cell->face [1] >> 8;	2098	*data++ = tile >> 8;
1331	*data++ = cell->face [1];	2099	*data++ = tile;
1332	}	2100	}
1333		2101
1334	if (flags & 4)	2102	if (flags & 4)
1335	{	2103	{
		2104	tileid tile = cell->tile [2];
1336	*data++ = cell->face [2] >> 8;	2105	*data++ = tile >> 8;
1337	*data++ = cell->face [2];	2106	*data++ = tile;
1338	}	2107	}
1339	}	2108	}
1340	else	2109	else
1341	*data++ = 0;	2110	*data++ = 0;
1342	}	2111	}
…		…
1348	}	2117	}
1349	OUTPUT:	2118	OUTPUT:
1350	RETVAL	2119	RETVAL
1351		2120
1352	void	2121	void
1353	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)
1354	PPCODE:	2123	PPCODE:
1355	{	2124	{
1356	int x, y, z;	2125	int x, y, z;
1357	int w, h;	2126	int w, h;
1358	int x1, y1;	2127	int x1, y1;
…		…
1382	{	2151	{
1383	uint8_t flags = *data++;	2152	uint8_t flags = *data++;
1384		2153
1385	if (flags)	2154	if (flags)
1386	{	2155	{
1387	mapface face[3] = { 0, 0, 0 };
1388
1389	mapcell *cell = row_get_cell (row, x);	2156	mapcell *cell = row_get_cell (row, x);
		2157	tileid tile[3] = { 0, 0, 0 };
1390		2158
1391	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2159	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1392	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2160	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1393	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2161	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1394		2162
1395	if (cell->darkness <= 0)	2163	if (cell->darkness == 0)
1396	{	2164	{
1397	cell->darkness = -1;	2165	cell->darkness = 0;
1398		2166
1399	for (z = 0; z <= 2; z++)	2167	for (z = 0; z <= 2; z++)
1400	{	2168	{
1401	cell->face[z] = face[z];	2169	tileid t = tile [z];
1402		2170
1403	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2171	if (t >= self->texs || (t && !self->tex [t].name))
		2172	{
1404	XPUSHs (sv_2mortal (newSViv (face[z])));	2173	XPUSHs (sv_2mortal (newSViv (t)));
		2174	need_texid (self, t);
		2175	}
		2176
		2177	cell->tile [z] = t;
1405	}	2178	}
1406	}	2179	}
1407	}	2180	}
1408	}	2181	}
1409	}	2182	}
1410	}	2183	}
1411		2184
1412	MODULE = CFClient PACKAGE = CFClient::MixChunk	2185	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413		2186
1414	CFClient::MixChunk	2187	CFPlus::MixChunk
1415	new_from_file (SV *class, char *path)	2188	new_from_file (SV *class, char *path)
1416	CODE:	2189	CODE:
1417	RETVAL = Mix_LoadWAV (path);	2190	RETVAL = Mix_LoadWAV (path);
1418	OUTPUT:	2191	OUTPUT:
1419	RETVAL	2192	RETVAL
1420		2193
1421	void	2194	void
1422	DESTROY (CFClient::MixChunk self)	2195	DESTROY (CFPlus::MixChunk self)
1423	CODE:	2196	CODE:
1424	Mix_FreeChunk (self);	2197	Mix_FreeChunk (self);
1425		2198
1426	int	2199	int
1427	volume (CFClient::MixChunk self, int volume = -1)	2200	volume (CFPlus::MixChunk self, int volume = -1)
1428	CODE:	2201	CODE:
1429	RETVAL = Mix_VolumeChunk (self, volume);	2202	RETVAL = Mix_VolumeChunk (self, volume);
1430	OUTPUT:	2203	OUTPUT:
1431	RETVAL	2204	RETVAL
1432		2205
1433	int	2206	int
1434	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)
1435	CODE:	2208	CODE:
1436	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2209	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437	OUTPUT:	2210	OUTPUT:
1438	RETVAL	2211	RETVAL
1439		2212
1440	MODULE = CFClient PACKAGE = CFClient::MixMusic	2213	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441		2214
1442	int	2215	int
1443	volume (int volume = -1)	2216	volume (int volume = -1)
1444	CODE:	2217	CODE:
1445	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
1446	OUTPUT:	2219	OUTPUT:
1447	RETVAL	2220	RETVAL
1448		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
1449	CFClient::MixMusic	2229	CFPlus::MixMusic
1450	new_from_file (SV *class, char *path)	2230	new_from_file (SV *class, char *path)
1451	CODE:	2231	CODE:
1452	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
1453	OUTPUT:	2233	OUTPUT:
1454	RETVAL	2234	RETVAL
1455		2235
1456	void	2236	void
1457	DESTROY (CFClient::MixMusic self)	2237	DESTROY (CFPlus::MixMusic self)
1458	CODE:	2238	CODE:
1459	Mix_FreeMusic (self);	2239	Mix_FreeMusic (self);
1460		2240
1461	int	2241	int
1462	play (CFClient::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
1463	CODE:	2243	CODE:
1464	RETVAL = Mix_PlayMusic (self, loops);	2244	RETVAL = Mix_PlayMusic (self, loops);
1465	OUTPUT:	2245	OUTPUT:
1466	RETVAL	2246	RETVAL
1467		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
1468	MODULE = CFClient PACKAGE = CFClient::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469		2256
1470	BOOT:	2257	BOOT:
1471	{	2258	{
1472	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	2259	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473	static const struct {	2260	static const struct {
1474	const char *name;	2261	const char *name;
1475	IV iv;	2262	IV iv;
1476	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
1477	# 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),
1478	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
1479	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
1480	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
1481	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
1482	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
		2273	const_iv (GL_CULL_FACE),
1483	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),
1484	const_iv (GL_AND),	2281	const_iv (GL_AND),
1485	const_iv (GL_ONE),	2282	const_iv (GL_ONE),
1486	const_iv (GL_ZERO),	2283	const_iv (GL_ZERO),
1487	const_iv (GL_SRC_ALPHA),	2284	const_iv (GL_SRC_ALPHA),
1488	const_iv (GL_SRC_ALPHA_SATURATE),	2285	const_iv (GL_DST_ALPHA),
1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2286	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490	const_iv (GL_ONE_MINUS_DST_ALPHA),	2287	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2288	const_iv (GL_SRC_ALPHA_SATURATE),
1491	const_iv (GL_RGB),	2289	const_iv (GL_RGB),
1492	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),
1493	const_iv (GL_UNSIGNED_BYTE),	2294	const_iv (GL_UNSIGNED_BYTE),
		2295	const_iv (GL_UNSIGNED_SHORT),
		2296	const_iv (GL_UNSIGNED_INT),
1494	const_iv (GL_ALPHA),	2297	const_iv (GL_ALPHA),
		2298	const_iv (GL_INTENSITY),
1495	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
		2300	const_iv (GL_LUMINANCE_ALPHA),
1496	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
1499	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
1500	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
1501	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
1502	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
1503	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
1504	const_iv (GL_TEXTURE_ENV_MODE),	2311	const_iv (GL_TEXTURE_ENV_MODE),
1505	const_iv (GL_TEXTURE_WRAP_S),	2312	const_iv (GL_TEXTURE_WRAP_S),
1506	const_iv (GL_TEXTURE_WRAP_T),	2313	const_iv (GL_TEXTURE_WRAP_T),
		2314	const_iv (GL_REPEAT),
1507	const_iv (GL_CLAMP),	2315	const_iv (GL_CLAMP),
1508	const_iv (GL_REPEAT),	2316	const_iv (GL_CLAMP_TO_EDGE),
1509	const_iv (GL_NEAREST),	2317	const_iv (GL_NEAREST),
1510	const_iv (GL_LINEAR),	2318	const_iv (GL_LINEAR),
1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),	2319	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),	2320	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),	2321	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),	2322	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515	const_iv (GL_GENERATE_MIPMAP),	2323	const_iv (GL_GENERATE_MIPMAP),
1516	const_iv (GL_MODULATE),	2324	const_iv (GL_MODULATE),
1517	const_iv (GL_DECAL),	2325	const_iv (GL_DECAL),
1518	const_iv (GL_REPLACE),	2326	const_iv (GL_REPLACE),
		2327	const_iv (GL_DEPTH_BUFFER_BIT),
1519	const_iv (GL_COLOR_BUFFER_BIT),	2328	const_iv (GL_COLOR_BUFFER_BIT),
1520	const_iv (GL_PROJECTION),	2329	const_iv (GL_PROJECTION),
1521	const_iv (GL_MODELVIEW),	2330	const_iv (GL_MODELVIEW),
1522	const_iv (GL_COLOR_LOGIC_OP),	2331	const_iv (GL_COLOR_LOGIC_OP),
1523	const_iv (GL_SEPARABLE_2D),	2332	const_iv (GL_SEPARABLE_2D),
1524	const_iv (GL_CONVOLUTION_2D),	2333	const_iv (GL_CONVOLUTION_2D),
1525	const_iv (GL_CONVOLUTION_BORDER_MODE),	2334	const_iv (GL_CONVOLUTION_BORDER_MODE),
1526	const_iv (GL_CONSTANT_BORDER),	2335	const_iv (GL_CONSTANT_BORDER),
1527	const_iv (GL_LINES),	2336	const_iv (GL_LINES),
		2337	const_iv (GL_LINE_STRIP),
		2338	const_iv (GL_LINE_LOOP),
1528	const_iv (GL_QUADS),	2339	const_iv (GL_QUADS),
1529	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),
1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2344	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531	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),
1532	# undef const_iv	2350	# undef const_iv
1533	};	2351	};
1534		2352
1535	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; )
1536	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);
1537	}	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
1538		2394
1539	int glGetError ()	2395	int glGetError ()
		2396
		2397	void glFinish ()
1540		2398
1541	void glClear (int mask)	2399	void glClear (int mask)
1542		2400
1543	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)
1544	PROTOTYPE: @	2402	PROTOTYPE: @
…		…
1551		2409
1552	void glHint (int target, int mode)	2410	void glHint (int target, int mode)
1553		2411
1554	void glBlendFunc (int sfactor, int dfactor)	2412	void glBlendFunc (int sfactor, int dfactor)
1555		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
1556	void glLogicOp (int opcode)	2420	void glLogicOp (int opcode)
1557		2421
1558	void glColorMask (int red, int green, int blue, int alpha)	2422	void glColorMask (int red, int green, int blue, int alpha)
1559		2423
1560	void glMatrixMode (int mode)	2424	void glMatrixMode (int mode)
…		…
1563		2427
1564	void glPopMatrix ()	2428	void glPopMatrix ()
1565		2429
1566	void glLoadIdentity ()	2430	void glLoadIdentity ()
1567		2431
		2432	void glDrawBuffer (int buffer)
		2433
		2434	void glReadBuffer (int buffer)
		2435
1568	# 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
1569	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_)
1570		2441
1571	void glViewport (int x, int y, int width, int height)	2442	void glViewport (int x, int y, int width, int height)
1572		2443
1573	void glScissor (int x, int y, int width, int height)	2444	void glScissor (int x, int y, int width, int height)
…		…
1588		2459
1589	void glEnd ()	2460	void glEnd ()
1590		2461
1591	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)
1592	PROTOTYPE: @	2463	PROTOTYPE: @
		2464	ALIAS:
		2465	glColor_premultiply = 1
1593	CODE:	2466	CODE:
1594	// 255.999 is close enough to correctness (256 and clamp)	2467	if (ix)
1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	2468	{
		2469	r *= a;
		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);
1596		2486
1597	void glVertex (float x, float y, float z = 0.)	2487	void glVertex (float x, float y, float z = 0.)
1598	CODE:	2488	CODE:
1599	glVertex3f (x, y, z);	2489	glVertex3f (x, y, z);
1600		2490
…		…
1612		2502
1613	void glBindTexture (int target, int name)	2503	void glBindTexture (int target, int name)
1614		2504
1615	void glConvolutionParameter (int target, int pname, float params)	2505	void glConvolutionParameter (int target, int pname, float params)
1616	CODE:	2506	CODE:
1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2507	if (gl.ConvolutionParameterf)
		2508	gl.ConvolutionParameterf (target, pname, params);
1618		2509
1619	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)
1620	CODE:	2511	CODE:
1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2512	if (gl.ConvolutionFilter2D)
1622	(target, internalformat, width, height, format, type, data));	2513	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623		2514
1624	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)
1625	CODE:	2516	CODE:
1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2517	if (gl.SeparableFilter2D)
1627	(target, internalformat, width, height, format, type, row, column));	2518	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628		2519
1629	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)
1630		2521
1631	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)
1632		2523
1633	void glRasterPos (int x, int y)	2524	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634	CODE:	2525
1635	glRasterPos2i (x, y);	2526	void glPixelZoom (float x, float y)
1636		2527
1637	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)
1638		2529
1639	int glGenTexture ()	2530	int glGenTexture ()
1640	CODE:	2531	CODE:
1641	{	2532	RETVAL = gen_texture ();
1642	GLuint name;
1643	glGenTextures (1, &name);
1644	RETVAL = name;
1645	}
1646	OUTPUT:	2533	OUTPUT:
1647	RETVAL	2534	RETVAL
1648		2535
1649	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
1650	CODE:	2537	CODE:
1651	{
1652	GLuint name_ = name;
1653	glDeleteTextures (1, &name_);	2538	del_texture (name);
1654	}	2539
1655
1656	int glGenList ()	2540	int glGenList ()
1657	CODE:	2541	CODE:
1658	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
1659	OUTPUT:	2543	OUTPUT:
1660	RETVAL	2544	RETVAL

Diff Legend

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