[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/Client.xs

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC