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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
48	#endif	53	#endif
49		54
50	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
52		57
53	#include <glib/gmacros.h>	58	#include <glib.h>
54		59
55	#include <pango/pango.h>	60	#include <pango/pango.h>
56		61
57	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
71	# include <netinet/in.h>	76	# include <netinet/in.h>
72	# include <netinet/tcp.h>	77	# include <netinet/tcp.h>
73	# include <inttypes.h>	78	# include <inttypes.h>
74	#endif	79	#endif
75		80
76	#if __GNUC__ >= 4	81	#include "ecb.h"
77	# define expect(expr,value) __builtin_expect ((expr),(value))	82	#include "salloc.h"
78	#else
79	# define expect(expr,value) (expr)
80	#endif
81
82	#define expect_false(expr) expect ((expr) != 0, 0)
83	#define expect_true(expr) expect ((expr) != 0, 1)
84		83
85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86		85
87	/* this is used as fow flag as well, so has to have a different value */	86	/* this is used as fow flag as well, so has to have a different value */
88	/* then anything that is computed by incoming darkness */	87	/* then anything that is computed by incoming darkness */
…		…
100	#define KMOD_LRAM 0x10000 // our extension	99	#define KMOD_LRAM 0x10000 // our extension
101		100
102	#define TEXID_SPEECH 1	101	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	102	#define TEXID_NOFACE 2
104		103
		104	// approximately divide by 255
		105	static unsigned int
		106	div255 (unsigned int n)
		107	{
		108	return (n + (n >> 8)) >> 8;
		109	}
		110
		111	static unsigned int
		112	minpot (unsigned int n)
		113	{
		114	if (!n)
		115	return 0;
		116
		117	--n;
		118
		119	n \|= n >> 1;
		120	n \|= n >> 2;
		121	n \|= n >> 4;
		122	n \|= n >> 8;
		123	n \|= n >> 16;
		124
		125	return n + 1;
		126	}
		127
105	static char *	128	static char *
106	fast_sv_grow (SV *sv, STRLEN need)	129	fast_sv_grow (SV *sv, STRLEN need)
107	{	130	{
108	STRLEN len = SvLEN (sv);	131	STRLEN len = SvLEN (sv);
109	STRLEN want = SvCUR (sv) + need;	132	STRLEN want = SvCUR (sv) + need;
110		133
111	if (expect_false (len < want))	134	if (ecb_expect_false (len < want))
112	{	135	{
113	do	136	do
114	len *= 2;	137	len *= 2;
115	while (len < want);	138	while (len < want);
116		139
…		…
184	{	207	{
185	GSList *attrs = run->item->analysis.extra_attrs;	208	GSList *attrs = run->item->analysis.extra_attrs;
186		209
187	while (attrs)	210	while (attrs)
188	{	211	{
189	PangoAttribute *attr = attrs->data;	212	PangoAttribute attr = (PangoAttribute )attrs->data;
190		213
191	if (attr->klass->type == PANGO_ATTR_SHAPE)	214	if (attr->klass->type == PANGO_ATTR_SHAPE)
192	return 1;	215	return 1;
193		216
194	attrs = attrs->next;	217	attrs = attrs->next;
195	}	218	}
196		219
197	return 0;	220	return 0;
198	}	221	}
199		222
200	typedef struct cf_layout {	223	struct cf_layout {
201	PangoLayout *pl;	224	PangoLayout *pl;
202	float r, g, b, a; // default color for rgba mode	225	float r, g, b, a; // default color for rgba mode
203	int base_height;	226	int base_height;
204	DC__Font font;	227	DC__Font font;
205	rc_t *rc;	228	rc_t rc;
206	} *DC__Layout;	229	};
		230
		231	typedef cf_layout *DC__Layout;
207		232
208	static DC__Font default_font;	233	static DC__Font default_font;
209	static PangoContext *opengl_context;	234	static PangoContext *opengl_context;
210	static PangoFontMap *opengl_fontmap;	235	static PangoFontMap *opengl_fontmap;
211		236
212	static void	237	static void
213	substitute_func (FcPattern *pattern, gpointer data)	238	substitute_func (FcPattern *pattern, gpointer data)
214	{	239	{
215	FcPatternAddBool (pattern, FC_HINTING, 1);	240	FcPatternAddBool (pattern, FC_HINTING, 1);
216	#ifdef FC_HINT_STYLE	241	#ifdef FC_HINT_STYLE
217	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	242	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218	#endif	243	#endif
219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	244	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220	}	245	}
221		246
222	static void	247	static void
…		…
249		274
250	*w = rect.width;	275	*w = rect.width;
251	*h = rect.height;	276	*h = rect.height;
252	}	277	}
253		278
		279	/////////////////////////////////////////////////////////////////////////////
		280
254	typedef uint16_t tileid;	281	typedef uint16_t tileid;
255	typedef uint16_t faceid;	282	typedef uint16_t faceid;
256		283
257	typedef struct {	284	struct maptex
		285	{
258	GLuint name;	286	GLuint name;
259	int w, h;	287	int w, h;
260	float s, t;	288	float s, t;
261	uint8_t r, g, b, a;	289	uint8_t r, g, b, a;
262	tileid smoothtile;	290	tileid smoothtile;
263	uint8_t smoothlevel;	291	uint8_t smoothlevel;
264	uint8_t unused; /* set to zero on use */	292	uint8_t unused; /* set to zero on use */
265	} maptex;	293	};
266		294
267	typedef struct {	295	struct mapcell
		296	{
268	uint32_t player;	297	uint32_t player;
269	tileid tile[3];	298	tileid tile[3];
270	uint16_t darkness;	299	uint16_t darkness;
271	uint8_t stat_width, stat_hp, flags, smoothmax;	300	uint8_t stat_width, stat_hp, flags, smoothmax;
272	} mapcell;	301	};
273		302
274	typedef struct {	303	struct maprow
		304	{
275	int32_t c0, c1;	305	int32_t c0, c1;
276	mapcell *col;	306	mapcell *col;
277	} maprow;	307	};
278		308
279	typedef struct map {	309	struct mapgrid {
280	int x, y, w, h;	310	int x, y, w, h;
281	int ox, oy; /* offset to virtual global coordinate system */	311	int ox, oy; /* offset to virtual global coordinate system */
282	int faces; tileid *face2tile; // [faceid]	312	int faces; tileid *face2tile; // [faceid]
283	int texs; maptex *tex; // [tileid]	313	int texs; maptex *tex; // [tileid]
284		314
285	int32_t rows;	315	int32_t rows;
286	maprow *row;	316	maprow *row;
287	} *DC__Map;	317	};
288		318
289	static char *	319	typedef mapgrid *DC__Map;
		320
		321	template<typename T>
		322	ecb_cold static void
290	prepend (char *ptr, int sze, int inc)	323	prepend (T *&ptr, int sze, int inc)
291	{	324	{
292	char *p;	325	T *p;
293		326
294	New (0, p, sze + inc, char);	327	Newx (p, inc + sze, T);
295	Zero (p, inc, char);	328	Zero (p, inc, T);
296	Move (ptr, p + inc, sze, char);	329	Move (ptr, p + inc, sze, T);
297	Safefree (ptr);	330	Safefree (ptr);
298		331
299	return p;	332	ptr = p;
300	}	333	}
301		334
302	static char *	335	template<typename T>
		336	ecb_cold static void
303	append (char *ptr, int sze, int inc)	337	append (T *&ptr, int sze, int inc)
304	{	338	{
305	Renew (ptr, sze + inc, char);	339	Renew (ptr, sze + inc, T);
306	Zero (ptr + sze, inc, char);	340	Zero (ptr + sze, inc, T);
307
308	return ptr;
309	}	341	}
310
311	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313		342
314	static void	343	static void
315	need_facenum (struct map *self, faceid face)	344	need_facenum (struct mapgrid *self, faceid face)
316	{	345	{
317	while (self->faces <= face)	346	if (ecb_expect_true (self->faces > face))
318	{	347	return;
		348
		349	size_t newsize = minpot (face + 1);
319	Append (tileid, self->face2tile, self->faces, self->faces);	350	append (self->face2tile, self->faces, newsize - self->faces);
320	self->faces *= 2;	351	self->faces = newsize;
321	}
322	}	352	}
323		353
324	static void	354	static void
325	need_texid (struct map *self, int texid)	355	need_texid (struct mapgrid *self, int texid)
326	{	356	{
327	while (self->texs <= texid)	357	if (ecb_expect_true (self->texs > texid))
328	{	358	return;
		359
		360	size_t newsize = minpot (texid + 1);
329	Append (maptex, self->tex, self->texs, self->texs);	361	append (self->tex, self->texs, newsize - self->texs);
330	self->texs *= 2;	362	self->texs = newsize;
331	}
332	}	363	}
333		364
334	static maprow *	365	static maprow *
335	map_get_row (DC__Map self, int y)	366	map_get_row (mapgrid *self, int y)
336	{	367	{
337	if (0 > y)	368	if (0 > y)
338	{	369	{
339	int extend = - y + MAP_EXTEND_Y;	370	int extend = - y + MAP_EXTEND_Y;
340	Prepend (maprow, self->row, self->rows, extend);	371	prepend (self->row, self->rows, extend);
341		372
342	self->rows += extend;	373	self->rows += extend;
343	self->y += extend;	374	self->y += extend;
344	y += extend;	375	y += extend;
345	}	376	}
346	else if (y >= self->rows)	377	else if (y >= self->rows)
347	{	378	{
348	int extend = y - self->rows + MAP_EXTEND_Y;	379	int extend = y - self->rows + MAP_EXTEND_Y;
349	Append (maprow, self->row, self->rows, extend);	380	append (self->row, self->rows, extend);
350	self->rows += extend;	381	self->rows += extend;
351	}	382	}
352		383
353	return self->row + y;	384	return self->row + y;
354	}	385	}
…		…
364	}	395	}
365		396
366	if (row->c0 > x)	397	if (row->c0 > x)
367	{	398	{
368	int extend = row->c0 - x + MAP_EXTEND_X;	399	int extend = row->c0 - x + MAP_EXTEND_X;
369	Prepend (mapcell, row->col, row->c1 - row->c0, extend);	400	prepend (row->col, row->c1 - row->c0, extend);
370	row->c0 -= extend;	401	row->c0 -= extend;
371	}	402	}
372	else if (x >= row->c1)	403	else if (x >= row->c1)
373	{	404	{
374	int extend = x - row->c1 + MAP_EXTEND_X;	405	int extend = x - row->c1 + MAP_EXTEND_X;
375	Append (mapcell, row->col, row->c1 - row->c0, extend);	406	append (row->col, row->c1 - row->c0, extend);
376	row->c1 += extend;	407	row->c1 += extend;
377	}	408	}
378		409
379	return row->col + (x - row->c0);	410	return row->col + (x - row->c0);
380	}	411	}
381		412
382	static mapcell *	413	static mapcell *
383	map_get_cell (DC__Map self, int x, int y)	414	map_get_cell (mapgrid *self, int x, int y)
384	{	415	{
385	return row_get_cell (map_get_row (self, y), x);	416	return row_get_cell (map_get_row (self, y), x);
386	}	417	}
387		418
388	static void	419	static void
389	map_clear (DC__Map self)	420	map_clear (mapgrid *self)
390	{	421	{
391	int r;	422	int r;
392		423
393	for (r = 0; r < self->rows; r++)	424	for (r = 0; r < self->rows; r++)
394	Safefree (self->row[r].col);	425	Safefree (self->row[r].col);
…		…
412	(cell)->flags = 0; \	443	(cell)->flags = 0; \
413	(cell)->player = 0; \	444	(cell)->player = 0; \
414	} while (0)	445	} while (0)
415		446
416	static void	447	static void
417	map_blank (DC__Map self, int x0, int y0, int w, int h)	448	map_blank (mapgrid *self, int x0, int y0, int w, int h)
418	{	449	{
419	int x, y;	450	int x, y;
420	maprow *row;	451	maprow *row;
421	mapcell *cell;	452	mapcell *cell;
422		453
…		…
439	CELL_CLEAR (cell);	470	CELL_CLEAR (cell);
440	}	471	}
441	}	472	}
442	}	473	}
443		474
444	typedef struct {	475	struct smooth_key
		476	{
445	tileid tile;	477	tileid tile;
446	uint8_t x, y, level;	478	uint8_t x, y, level;
447	} smooth_key;	479
		480	bool operator == (const smooth_key &o) const
		481	{
		482	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		483	}
		484	};
		485
		486	typedef ska::flat_hash_map<smooth_key, IV, std::hash<smooth_key>, std::equal_to<smooth_key>, slice_allocator<smooth_key>> smooth_hash;
		487
		488	namespace std {
		489	template <>
		490	struct hash<smooth_key>
		491	{
		492	size_t operator () (const smooth_key &v) const
		493	{
		494	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		495	}
		496	};
		497	}
448		498
449	static void	499	static void
450	smooth_or_bits (HV hv, smooth_key key, IV bits)	500	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451	{	501	{
452	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	502	auto &&it = h.find (key);
453		503
454	if (SvIOK (*sv))	504	if (it == h.end ())
455	SvIV_set (sv, SvIVX (sv) \| bits);	505	h.insert (std::make_pair (key, bits));
456	else	506	else
457	sv_setiv (*sv, bits);	507	it->second \|= bits;
458	}	508	}
459		509
460	static void	510	static void
461	music_finished (void)	511	music_finished (void)
462	{	512	{
…		…
479	ev.code = 1;	529	ev.code = 1;
480	ev.data1 = (void *)(long)channel;	530	ev.data1 = (void *)(long)channel;
481	ev.data2 = 0;	531	ev.data2 = 0;
482		532
483	SDL_PushEvent ((SDL_Event *)&ev);	533	SDL_PushEvent ((SDL_Event *)&ev);
484	}
485
486	static unsigned int
487	div255 (unsigned int n)
488	{
489	return (n + (n >> 8)) >> 8;
490	}
491
492	static unsigned int
493	minpot (unsigned int n)
494	{
495	if (!n)
496	return 0;
497
498	--n;
499
500	n \|= n >> 1;
501	n \|= n >> 2;
502	n \|= n >> 4;
503	n \|= n >> 8;
504	n \|= n >> 16;
505
506	return n + 1;
507	}
508
509	static unsigned int
510	popcount (unsigned int n)
511	{
512	n -= (n >> 1) & 0x55555555U;
513	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514	n = ((n >> 4) + n) & 0x0f0f0f0fU;
515	n *= 0x01010101U;
516
517	return n >> 24;
518	}	534	}
519		535
520	/* SDL should provide this, really. */	536	/* SDL should provide this, really. */
521	#define SDLK_MODIFIER_MIN 300	537	#define SDLK_MODIFIER_MIN 300
522	#define SDLK_MODIFIER_MAX 314	538	#define SDLK_MODIFIER_MAX 314
…		…
853		869
854	NV ceil (NV x)	870	NV ceil (NV x)
855		871
856	IV minpot (UV n)	872	IV minpot (UV n)
857		873
		874	UV ld32 (UV n)
		875	CODE:
		876	RETVAL = ecb_ld32 (n);
		877	OUTPUT:
		878	RETVAL
		879
858	IV popcount (UV n)	880	IV popcount (UV n)
		881	CODE:
		882	RETVAL = ecb_popcount32 (n);
		883	OUTPUT:
		884	RETVAL
859		885
860	NV distance (NV dx, NV dy)	886	NV distance (NV dx, NV dy)
861	CODE:	887	CODE:
862	RETVAL = pow (dx * dx + dy * dy, 0.5);	888	RETVAL = pow (dx * dx + dy * dy, 0.5);
863	OUTPUT:	889	OUTPUT:
…		…
889	void SDL_QuitSubSystem (U32 flags)	915	void SDL_QuitSubSystem (U32 flags)
890		916
891	void SDL_Quit ()	917	void SDL_Quit ()
892		918
893	int SDL_GL_SetAttribute (int attr, int value)	919	int SDL_GL_SetAttribute (int attr, int value)
		920	C_ARGS: (SDL_GLattr)attr, value
894		921
895	int SDL_GL_GetAttribute (int attr)	922	int SDL_GL_GetAttribute (int attr)
896	CODE:	923	CODE:
897	if (SDL_GL_GetAttribute (attr, &RETVAL))	924	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
898	XSRETURN_UNDEF;	925	XSRETURN_UNDEF;
899	OUTPUT:	926	OUTPUT:
900	RETVAL	927	RETVAL
901		928
902	void	929	void
…		…
975	void	1002	void
976	SDL_GL_SwapBuffers ()	1003	SDL_GL_SwapBuffers ()
977		1004
978	char *	1005	char *
979	SDL_GetKeyName (int sym)	1006	SDL_GetKeyName (int sym)
		1007	C_ARGS: (SDLKey)sym
980		1008
981	int	1009	int
982	SDL_GetAppState ()	1010	SDL_GetAppState ()
983		1011
984	int	1012	int
…		…
1081	OUTPUT:	1109	OUTPUT:
1082	RETVAL	1110	RETVAL
1083		1111
1084	int	1112	int
1085	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1113	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1086	POSTCALL:	1114	POSTCALL:
1087	Mix_HookMusicFinished (music_finished);	1115	Mix_HookMusicFinished (music_finished);
1088	Mix_ChannelFinished (channel_finished);	1116	Mix_ChannelFinished (channel_finished);
1089		1117
1090	void	1118	void
1091	Mix_QuerySpec ()	1119	Mix_QuerySpec ()
…		…
1212		1240
1213	SDL_LockSurface (surface2);	1241	SDL_LockSurface (surface2);
1214	EXTEND (SP, 6);	1242	EXTEND (SP, 6);
1215	PUSHs (sv_2mortal (newSViv (surface2->w)));	1243	PUSHs (sv_2mortal (newSViv (surface2->w)));
1216	PUSHs (sv_2mortal (newSViv (surface2->h)));	1244	PUSHs (sv_2mortal (newSViv (surface2->h)));
1217	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1245	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1218	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1246	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1219	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1247	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1220	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1248	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1221	SDL_UnlockSurface (surface2);	1249	SDL_UnlockSurface (surface2);
1222		1250
…		…
1294	MODULE = Deliantra::Client PACKAGE = DC::Font	1322	MODULE = Deliantra::Client PACKAGE = DC::Font
1295		1323
1296	PROTOTYPES: DISABLE	1324	PROTOTYPES: DISABLE
1297		1325
1298	DC::Font	1326	DC::Font
1299	new_from_file (SV class, char path, int id = 0)	1327	new_from_file (SV klass, char path, int id = 0)
1300	CODE:	1328	CODE:
1301	{	1329	{
1302	int count;	1330	int count;
1303	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1331	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1304	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1332	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1333	PROTOTYPE:	1361	PROTOTYPE:
1334	CODE:	1362	CODE:
1335	tc_restore ();	1363	tc_restore ();
1336		1364
1337	DC::Layout	1365	DC::Layout
1338	new (SV *class)	1366	new (SV *klass)
1339	CODE:	1367	CODE:
1340	New (0, RETVAL, 1, struct cf_layout);	1368	RETVAL = new cf_layout;
1341		1369
1342	RETVAL->pl = pango_layout_new (opengl_context);	1370	RETVAL->pl = pango_layout_new (opengl_context);
1343	RETVAL->r = 1.;	1371	RETVAL->r = 1.;
1344	RETVAL->g = 1.;	1372	RETVAL->g = 1.;
1345	RETVAL->b = 1.;	1373	RETVAL->b = 1.;
1346	RETVAL->a = 1.;	1374	RETVAL->a = 1.;
1347	RETVAL->base_height = MIN_FONT_HEIGHT;	1375	RETVAL->base_height = MIN_FONT_HEIGHT;
1348	RETVAL->font = 0;	1376	RETVAL->font = 0;
1349	RETVAL->rc = rc_alloc ();
1350		1377
1351	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1378	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1352	layout_update_font (RETVAL);	1379	layout_update_font (RETVAL);
1353	OUTPUT:	1380	OUTPUT:
1354	RETVAL	1381	RETVAL
1355		1382
1356	void	1383	void
1357	DESTROY (DC::Layout self)	1384	DESTROY (DC::Layout self)
1358	CODE:	1385	CODE:
1359	g_object_unref (self->pl);	1386	g_object_unref (self->pl);
1360	rc_free (self->rc);
1361	Safefree (self);	1387	delete self;
1362		1388
1363	void	1389	void
1364	set_text (DC::Layout self, SV *text_)	1390	set_text (DC::Layout self, SV *text_)
1365	CODE:	1391	CODE:
1366	{	1392	{
…		…
1620	}	1646	}
1621		1647
1622	void	1648	void
1623	render (DC::Layout self, float x, float y, int flags = 0)	1649	render (DC::Layout self, float x, float y, int flags = 0)
1624	CODE:	1650	CODE:
1625	rc_clear (self->rc);	1651	self->rc.clear ();
1626	pango_opengl_render_layout_subpixel (	1652	pango_opengl_render_layout_subpixel (
1627	self->pl,	1653	self->pl,
1628	self->rc,	1654	&self->rc,
1629	x * PANGO_SCALE, y * PANGO_SCALE,	1655	x * PANGO_SCALE, y * PANGO_SCALE,
1630	self->r, self->g, self->b, self->a,	1656	self->r, self->g, self->b, self->a,
1631	flags	1657	flags
1632	);	1658	);
1633	// we assume that context_change actually clears/frees stuff	1659	// we assume that context_change actually clears/frees stuff
…		…
1644	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1670	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1645	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1671	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1646	glEnable (GL_ALPHA_TEST);	1672	glEnable (GL_ALPHA_TEST);
1647	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1673	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1648		1674
1649	rc_draw (self->rc);	1675	self->rc.draw ();
1650		1676
1651	glDisable (GL_ALPHA_TEST);	1677	glDisable (GL_ALPHA_TEST);
1652	glDisable (GL_BLEND);	1678	glDisable (GL_BLEND);
1653	glDisable (GL_TEXTURE_2D);	1679	glDisable (GL_TEXTURE_2D);
1654	}	1680	}
…		…
1866	MODULE = Deliantra::Client PACKAGE = DC::Map	1892	MODULE = Deliantra::Client PACKAGE = DC::Map
1867		1893
1868	PROTOTYPES: DISABLE	1894	PROTOTYPES: DISABLE
1869		1895
1870	DC::Map	1896	DC::Map
1871	new (SV *class)	1897	new (SV *klass)
1872	CODE:	1898	CODE:
1873	New (0, RETVAL, 1, struct map);	1899	New (0, RETVAL, 1, mapgrid);
1874	RETVAL->x = 0;	1900	RETVAL->x = 0;
1875	RETVAL->y = 0;	1901	RETVAL->y = 0;
1876	RETVAL->w = 0;	1902	RETVAL->w = 0;
1877	RETVAL->h = 0;	1903	RETVAL->h = 0;
1878	RETVAL->ox = 0;	1904	RETVAL->ox = 0;
…		…
1915		1941
1916	void	1942	void
1917	set_smooth (DC::Map self, int face, int smooth, int level)	1943	set_smooth (DC::Map self, int face, int smooth, int level)
1918	CODE:	1944	CODE:
1919	{	1945	{
1920	tileid texid;	1946	tileid texid;
1921	maptex *tex;	1947	maptex *tex;
1922		1948
1923	if (face < 0 \|\| face >= self->faces)	1949	if (face < 0 \|\| face >= self->faces)
1924	return;	1950	return;
1925		1951
1926	if (smooth < 0 \|\| smooth >= self->faces)	1952	if (smooth < 0 \|\| smooth >= self->faces)
1927	return;	1953	return;
1928		1954
1929	texid = self->face2tile [face];	1955	texid = self->face2tile [face];
1930		1956
1931	if (!texid)	1957	if (!texid)
1932	return;	1958	return;
1933		1959
1934	tex = self->tex + texid;	1960	tex = self->tex + texid;
…		…
1967	}	1993	}
1968		1994
1969	void	1995	void
1970	expire_textures (DC::Map self, int texid, int count)	1996	expire_textures (DC::Map self, int texid, int count)
1971	PPCODE:	1997	PPCODE:
1972	for (; texid < self->texs && count; ++texid, --count)	1998	for (; texid < self->texs && count; ++texid, --count)
1973	{	1999	{
1974	maptex *tex = self->tex + texid;	2000	maptex *tex = self->tex + texid;
1975		2001
1976	if (tex->name)	2002	if (tex->name)
1977	{	2003	{
…		…
2024	self->ox += dx; self->x += dx;	2050	self->ox += dx; self->x += dx;
2025	self->oy += dy; self->y += dy;	2051	self->oy += dy; self->y += dy;
2026		2052
2027	while (self->y < 0)	2053	while (self->y < 0)
2028	{	2054	{
2029	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	2055	prepend (self->row, self->rows, MAP_EXTEND_Y);
2030		2056
2031	self->rows += MAP_EXTEND_Y;	2057	self->rows += MAP_EXTEND_Y;
2032	self->y += MAP_EXTEND_Y;	2058	self->y += MAP_EXTEND_Y;
2033	}	2059	}
2034	}	2060	}
…		…
2179	\| (b << 16)	2205	\| (b << 16)
2180	\| (a << 24);	2206	\| (a << 24);
2181	}	2207	}
2182	}	2208	}
2183		2209
2184	RETVAL = map_sv;	2210	RETVAL = map_sv;
2185	}	2211	}
2186	OUTPUT:	2212	OUTPUT:
2187	RETVAL	2213	RETVAL
2188		2214
2189	void	2215	void
2190	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2216	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2191	CODE:	2217	CODE:
2192	{	2218	{
2193	int x, y, z;	2219	int x, y, z;
2194		2220
2195	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2196	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2197	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2221	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2198	smooth_key skey;
2199	int pl_x, pl_y;	2222	int pl_x, pl_y;
2200	maptex pl_tex;	2223	maptex pl_tex;
2201	rc_t *rc = rc_alloc ();	2224	rc_t rc;
2202	rc_t *rc_ov = rc_alloc ();	2225	rc_t rc_ov;
2203	rc_key_t key;	2226	rc_key_t key;
2204	rc_array_t *arr;	2227	rc_t::array_t *arr;
2205		2228
2206	pl_tex.name = 0;	2229	pl_tex.name = 0;
2207		2230
2208	// that's current max. sorry.	2231	// that's current max. sorry.
2209	if (sw > 255) sw = 255;	2232	if (sw > 255) sw = 255;
2210	if (sh > 255) sh = 255;	2233	if (sh > 255) sh = 255;
2211
2212	// clear key, in case of extra padding
2213	memset (&skey, 0, sizeof (skey));
2214		2234
2215	memset (&key, 0, sizeof (key));	2235	memset (&key, 0, sizeof (key));
2216	key.r = 255;	2236	key.r = 255;
2217	key.g = 255;	2237	key.g = 255;
2218	key.b = 255;	2238	key.b = 255;
…		…
2224	my += self->y;	2244	my += self->y;
2225		2245
2226	// first pass: determine smooth_max	2246	// first pass: determine smooth_max
2227	// rather ugly, if you ask me	2247	// rather ugly, if you ask me
2228	// could also be stored inside mapcell and updated on change	2248	// could also be stored inside mapcell and updated on change
2229	memset (smooth_max, 0, sizeof (smooth_max));	2249	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2230		2250
2231	for (y = 0; y < sh; y++)	2251	for (y = 0; y < sh; y++)
2232	if (0 <= y + my && y + my < self->rows)	2252	if (0 <= y + my && y + my < self->rows)
2233	{	2253	{
2234	maprow *row = self->row + (y + my);	2254	maprow *row = self->row + (y + my);
…		…
2249	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2269	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2250	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2270	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2251		2271
2252	for (z = 0; z <= 2; z++)	2272	for (z = 0; z <= 2; z++)
2253	{	2273	{
2254	memset (smooth_level, 0, sizeof (smooth_level));	2274	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2275	smooth_key skey;
		2276	smooth_hash smooth;
2255	key.texname = -1;	2277	key.texname = -1;
2256		2278
2257	for (y = 0; y < sh; y++)	2279	for (y = 0; y < sh; y++)
2258	if (0 <= y + my && y + my < self->rows)	2280	if (0 <= y + my && y + my < self->rows)
2259	{	2281	{
…		…
2276		2298
2277	if (!tex.name)	2299	if (!tex.name)
2278	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2300	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2279		2301
2280	key.texname = tex.name;	2302	key.texname = tex.name;
2281	arr = rc_array (rc, &key);	2303	arr = &rc.array (key);
2282	}	2304	}
2283		2305
2284	px = (x + 1) * Th - tex.w;	2306	px = (x + 1) * Th - tex.w;
2285	py = (y + 1) * Tw - tex.h;	2307	py = (y + 1) * Tw - tex.h;
2286		2308
2287	if (expect_false (cell->player == player) && expect_false (z == 2))	2309	if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2288	{	2310	{
2289	pl_x = px;	2311	pl_x = px;
2290	pl_y = py;	2312	pl_y = py;
2291	pl_tex = tex;	2313	pl_tex = tex;
2292	continue;	2314	continue;
2293	}	2315	}
2294		2316
2295	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2317	arr->t2f_v3f (0 , 0 , px , py , 0);
2296	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2318	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2297	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2319	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2298	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2320	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2299		2321
2300	// update smooth hash	2322	// update smooth hash
2301	if (tex.smoothtile)	2323	if (tex.smoothtile)
2302	{	2324	{
2303	skey.tile = tex.smoothtile;	2325	skey.tile = tex.smoothtile;
2304	skey.level = tex.smoothlevel;	2326	skey.level = tex.smoothlevel;
2305		2327
2306	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2328	smooth_level[tex.smoothlevel] = 1;
2307		2329
2308	// add bits to current tile and all neighbours. skey.x\|y is	2330	// add bits to current tile and all neighbours. skey.x\|y is
2309	// shifted +1\|+1 so we always stay positive.	2331	// shifted +1\|+1 so we always stay positive.
2310		2332
2311	// bits is ___n cccc CCCC bbbb	2333	// bits is ___n cccc CCCC bbbb
…		…
2319		2341
2320	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2342	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2321	// ·· ·· ·┏ ┓·	2343	// ·· ·· ·┏ ┓·
2322		2344
2323	// full tile	2345	// full tile
2324	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2346	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2325		2347
2326	// borders	2348	// borders
2327	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2349	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2328	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2350	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2329	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2351	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2330	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2352	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2331		2353
2332	// corners	2354	// corners
2333	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2355	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2334	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2356	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2335	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2357	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2336	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2358	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2337	}	2359	}
2338	}	2360	}
2339		2361
2340	if (expect_false (z == 2) && expect_false (cell->flags))	2362	if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2341	{	2363	{
2342	// overlays such as the speech bubble, probably more to come	2364	// overlays such as the speech bubble, probably more to come
2343	if (cell->flags & 1)	2365	if (cell->flags & 1)
2344	{	2366	{
2345	rc_key_t key_ov = key;	2367	rc_key_t key_ov = key;
2346	maptex tex = self->tex [TEXID_SPEECH];	2368	maptex tex = self->tex[TEXID_SPEECH];
2347	rc_array_t *arr;
2348	int px = x * Tw + Tw * 2 / 32;	2369	int px = x * Tw + Tw * 2 / 32;
2349	int py = y * Th - Th * 6 / 32;	2370	int py = y * Th - Th * 6 / 32;
2350		2371
2351	key_ov.texname = tex.name;	2372	key_ov.texname = tex.name;
2352	arr = rc_array (rc_ov, &key_ov);	2373	rc_t::array_t &arr = rc_ov.array (key_ov);
2353		2374
2354	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2375	arr.t2f_v3f (0 , 0 , px , py , 0);
2355	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);	2376	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2356	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);	2377	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2357	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);	2378	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2358	}	2379	}
2359	}	2380	}
2360	}	2381	}
2361	}	2382	}
2362		2383
2363	rc_draw (rc);	2384	rc.draw ();
2364	rc_clear (rc);	2385	rc.clear ();
2365		2386
2366	// go through all smoothlevels, lowest to highest, then draw.	2387	// go through all smoothlevels, lowest to highest, then draw.
2367	// this is basically counting sort	2388	// this is basically counting sort
2368	{	2389	{
2369	int w, b;	2390	int w, b;
2370		2391
2371	glEnable (GL_TEXTURE_2D);	2392	glEnable (GL_TEXTURE_2D);
2372	glBegin (GL_QUADS);	2393	glBegin (GL_QUADS);
2373	for (w = 0; w < 256 / 32; ++w)	2394	for (int level = 0; level < smooth_level.size (); ++level)
		2395	if (smooth_level[level])
		2396	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2374	{	2397	{
2375	uint32_t smask = smooth_level [w];	2398	smooth_key &skey = it->first;
2376	if (smask)	2399	IV bits = it->second;
2377	for (b = 0; b < 32; ++b)	2400
2378	if (smask & (((uint32_t)1) << b))	2401	if (!(bits & 0x1000)
		2402	&& skey.level == level
		2403	&& level > smooth_max [skey.x][skey.y])
2379	{	2404	{
2380	int level = (w << 5) \| b;	2405	maptex tex = self->tex [skey.tile];
		2406	int px = (((int)skey.x) - 1) * Tw;
		2407	int py = (((int)skey.y) - 1) * Th;
		2408	int border = bits & 15;
		2409	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2410	float dx = tex.s * .0625f; // 16 images/row
		2411	float dy = tex.t * .5f ; // 2 images/column
		2412
2381	HE *he;	2413	if (tex.name)
2382
2383	hv_iterinit (smooth);
2384	while ((he = hv_iternext (smooth)))
2385	{	2414	{
2386	smooth_key skey = (smooth_key )HeKEY (he);	2415	// this time avoiding texture state changes
2387	IV bits = SvIVX (HeVAL (he));	2416	// save gobs of state changes.
2388		2417	if (key.texname != tex.name)
2389	if (!(bits & 0x1000)
2390	&& skey->level == level
2391	&& level > smooth_max [skey->x][skey->y])
2392	{	2418	{
2393	maptex tex = self->tex [skey->tile];
2394	int px = (((int)skey->x) - 1) * Tw;
2395	int py = (((int)skey->y) - 1) * Th;
2396	int border = bits & 15;
2397	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2398	float dx = tex.s * .0625f; // 16 images/row
2399	float dy = tex.t * .5f ; // 2 images/column
2400
2401	if (tex.name)
2402	{
2403	// this time avoiding texture state changes
2404	// save gobs of state changes.
2405	if (key.texname != tex.name)
2406	{
2407	self->tex [skey->tile].unused = 0;	2419	self->tex [skey.tile].unused = 0;
2408		2420
2409	glEnd ();	2421	glEnd ();
2410	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2422	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2411	glBegin (GL_QUADS);	2423	glBegin (GL_QUADS);
2412	}	2424	}
2413		2425
2414	if (border)	2426	if (border)
2415	{	2427	{
2416	float ox = border * dx;	2428	float ox = border * dx;
2417		2429
2418	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2430	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2419	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2420	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);	2432	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2421	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );	2433	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2422	}	2434	}
2423		2435
2424	if (corner)	2436	if (corner)
2425	{	2437	{
2426	float ox = corner * dx;	2438	float ox = corner * dx;
2427		2439
2428	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2440	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2429	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);	2441	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2430	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);	2442	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2431	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );	2443	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2432	}
2433	}
2434	}	2444	}
2435	}	2445	}
2436	}	2446	}
2437	}	2447	}
2438		2448
2439	glEnd ();	2449	glEnd ();
2440	glDisable (GL_TEXTURE_2D);	2450	glDisable (GL_TEXTURE_2D);
2441	key.texname = -1;	2451	key.texname = -1;
2442	}	2452	}
2443
2444	hv_clear (smooth);
2445	}	2453	}
2446		2454
2447	if (pl_tex.name)	2455	if (pl_tex.name)
2448	{	2456	{
2449	maptex tex = pl_tex;	2457	maptex tex = pl_tex;
2450	int px = pl_x + sdx;	2458	int px = pl_x + sdx;
2451	int py = pl_y + sdy;	2459	int py = pl_y + sdy;
2452		2460
2453	key.texname = tex.name;	2461	key.texname = tex.name;
2454	arr = rc_array (rc, &key);	2462	rc_t::array_t &arr = rc.array (key);
2455		2463
2456	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2464	arr.t2f_v3f (0 , 0 , px , py , 0);
2457	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2465	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2458	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2466	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2459	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2467	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2460		2468
2461	rc_draw (rc);	2469	rc.draw ();
2462	}	2470	}
2463		2471
2464	rc_draw (rc_ov);	2472	rc_ov.draw ();
2465	rc_clear (rc_ov);	2473	rc_ov.clear ();
2466		2474
2467	glDisable (GL_BLEND);	2475	glDisable (GL_BLEND);
2468	rc_free (rc);
2469	rc_free (rc_ov);
2470		2476
2471	// top layer: overlays such as the health bar	2477	// top layer: overlays such as the health bar
2472	for (y = 0; y < sh; y++)	2478	for (y = 0; y < sh; y++)
2473	if (0 <= y + my && y + my < self->rows)	2479	if (0 <= y + my && y + my < self->rows)
2474	{	2480	{
…		…
2480	mapcell *cell = row->col + (x + mx - row->c0);	2486	mapcell *cell = row->col + (x + mx - row->c0);
2481		2487
2482	int px = x * Tw;	2488	int px = x * Tw;
2483	int py = y * Th;	2489	int py = y * Th;
2484		2490
2485	if (expect_false (cell->player == player))	2491	if (ecb_expect_false (cell->player == player))
2486	{	2492	{
2487	px += sdx;	2493	px += sdx;
2488	py += sdy;	2494	py += sdy;
2489	}	2495	}
2490		2496
…		…
2718	else	2724	else
2719	*data++ = 0;	2725	*data++ = 0;
2720	}	2726	}
2721	}	2727	}
2722		2728
2723	/* if size is wh + 5 then no data has been found /	2729	/* if size is wh + 5 then no data has been found /
2724	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2730	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2725	{	2731	{
2726	SvPOK_only (data_sv);	2732	SvPOK_only (data_sv);
2727	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2733	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2728	}	2734	}
2729		2735
2730	RETVAL = data_sv;	2736	RETVAL = data_sv;
2731	}	2737	}
2732	OUTPUT:	2738	OUTPUT:
2733	RETVAL	2739	RETVAL
2734		2740
2735	void	2741	void
…		…
2742	STRLEN len;	2748	STRLEN len;
2743	uint8_t data, end;	2749	uint8_t data, end;
2744		2750
2745	len = SvLEN (data_sv);	2751	len = SvLEN (data_sv);
2746	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2752	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2747	data = SvPVbyte_nolen (data_sv);	2753	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2748	end = data + len + 8;	2754	end = data + len + 8;
2749		2755
2750	if (len < 5)	2756	if (len < 5)
2751	XSRETURN_EMPTY;	2757	XSRETURN_EMPTY;
2752		2758
…		…
2813	}	2819	}
2814		2820
2815	MODULE = Deliantra::Client PACKAGE = DC::RW	2821	MODULE = Deliantra::Client PACKAGE = DC::RW
2816		2822
2817	DC::RW	2823	DC::RW
2818	new (SV class, SV data_sv)	2824	new (SV klass, SV data_sv)
2819	CODE:	2825	CODE:
2820	{	2826	{
2821	STRLEN datalen;	2827	STRLEN datalen;
2822	char *data = SvPVbyte (data_sv, datalen);	2828	char *data = SvPVbyte (data_sv, datalen);
2823		2829
…		…
2825	}	2831	}
2826	OUTPUT:	2832	OUTPUT:
2827	RETVAL	2833	RETVAL
2828		2834
2829	DC::RW	2835	DC::RW
2830	new_from_file (SV class, const char path, const char *mode = "rb")	2836	new_from_file (SV klass, const char path, const char *mode = "rb")
2831	CODE:	2837	CODE:
2832	RETVAL = SDL_RWFromFile (path, mode);	2838	RETVAL = SDL_RWFromFile (path, mode);
2833	OUTPUT:	2839	OUTPUT:
2834	RETVAL	2840	RETVAL
2835		2841
…		…
2944	#else	2950	#else
2945	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2951	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946	#endif	2952	#endif
2947		2953
2948	DC::MixChunk	2954	DC::MixChunk
2949	new (SV *class, DC::RW rwops)	2955	new (SV *klass, DC::RW rwops)
2950	CODE:	2956	CODE:
2951	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2957	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2952	OUTPUT:	2958	OUTPUT:
2953	RETVAL	2959	RETVAL
2954		2960
…		…
3024	RETVAL = Mix_PlayingMusic ();	3030	RETVAL = Mix_PlayingMusic ();
3025	OUTPUT:	3031	OUTPUT:
3026	RETVAL	3032	RETVAL
3027		3033
3028	DC::MixMusic	3034	DC::MixMusic
3029	new (SV *class, DC::RW rwops)	3035	new (SV *klass, DC::RW rwops)
3030	CODE:	3036	CODE:
3031	RETVAL = Mix_LoadMUS_RW (rwops);	3037	RETVAL = Mix_LoadMUS_RW (rwops);
3032	OUTPUT:	3038	OUTPUT:
3033	RETVAL	3039	RETVAL
3034		3040
…		…
3187	gl.BlendFuncSeparateEXT = 0;	3193	gl.BlendFuncSeparateEXT = 0;
3188		3194
3189	void	3195	void
3190	apple_nvidia_bug (int enable)	3196	apple_nvidia_bug (int enable)
3191		3197
3192	char *	3198	const char *
3193	gl_vendor ()	3199	gl_vendor ()
3194	CODE:	3200	CODE:
3195	RETVAL = (char *)glGetString (GL_VENDOR);	3201	RETVAL = (const char *)glGetString (GL_VENDOR);
3196	OUTPUT:	3202	OUTPUT:
3197	RETVAL	3203	RETVAL
3198		3204
3199	char *	3205	const char *
3200	gl_version ()	3206	gl_version ()
3201	CODE:	3207	CODE:
3202	RETVAL = (char *)glGetString (GL_VERSION);	3208	RETVAL = (const char *)glGetString (GL_VERSION);
3203	OUTPUT:	3209	OUTPUT:
3204	RETVAL	3210	RETVAL
3205		3211
3206	char *	3212	const char *
3207	gl_extensions ()	3213	gl_extensions ()
3208	CODE:	3214	CODE:
3209	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3215	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3210	OUTPUT:	3216	OUTPUT:
3211	RETVAL	3217	RETVAL
3212		3218
3213	const char *glGetString (GLenum pname)	3219	const char *glGetString (GLenum pname)
		3220	CODE:
		3221	RETVAL = (const char *)glGetString (pname);
		3222	OUTPUT:
		3223	RETVAL
3214		3224
3215	GLint glGetInteger (GLenum pname)	3225	GLint glGetInteger (GLenum pname)
3216	CODE:	3226	CODE:
3217	glGetIntegerv (pname, &RETVAL);	3227	glGetIntegerv (pname, &RETVAL);
3218	OUTPUT:	3228	OUTPUT:
…		…
3421		3431
3422	void	3432	void
3423	find_widget (SV *self, NV x, NV y)	3433	find_widget (SV *self, NV x, NV y)
3424	PPCODE:	3434	PPCODE:
3425	{	3435	{
3426	if (within_widget (self, x, y))	3436	if (within_widget (self, x, y))
3427	XPUSHs (self);	3437	XPUSHs (self);
3428	}	3438	}
3429		3439
3430	BOOT:	3440	BOOT:
3431	{	3441	{
…		…
3439		3449
3440	void	3450	void
3441	draw (SV *self)	3451	draw (SV *self)
3442	CODE:	3452	CODE:
3443	{	3453	{
3444	HV *hv;	3454	HV *hv;
3445	SV **svp;	3455	SV **svp;
3446	NV x, y, w, h;	3456	NV x, y, w, h;
3447	SV *draw_x_sv = GvSV (draw_x_gv);	3457	SV *draw_x_sv = GvSV (draw_x_gv);
3448	SV *draw_y_sv = GvSV (draw_y_gv);	3458	SV *draw_y_sv = GvSV (draw_y_gv);
3449	SV *draw_w_sv = GvSV (draw_w_gv);	3459	SV *draw_w_sv = GvSV (draw_w_gv);
3450	SV *draw_h_sv = GvSV (draw_h_gv);	3460	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC vs. Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC vs.
Revision 1.335 by root, Mon Nov 19 01:56:11 2018 UTC