ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.295 by root, Mon Dec 21 03:30:22 2009 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>
…		…
41	#include <SDL_opengl.h>	46	#include <SDL_opengl.h>
42		47
43	/* work around os x broken headers */	48	/* work around os x broken headers */
44	#ifdef __MACOSX__	49	#ifdef __MACOSX__
45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	50	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		51	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		52	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46	#endif	53	#endif
47		54
48	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
50		57
51	#include <glib/gmacros.h>	58	#include <glib.h>
52		59
53	#include <pango/pango.h>	60	#include <pango/pango.h>
54		61
55	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
56	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
69	# include <netinet/in.h>	76	# include <netinet/in.h>
70	# include <netinet/tcp.h>	77	# include <netinet/tcp.h>
71	# include <inttypes.h>	78	# include <inttypes.h>
72	#endif	79	#endif
73		80
74	#if __GNUC__ >= 4	81	#include "ecb.h"
75	# define expect(expr,value) __builtin_expect ((expr),(value))	82	#include "salloc.h"
76	#else
77	# define expect(expr,value) (expr)
78	#endif
79
80	#define expect_false(expr) expect ((expr) != 0, 0)
81	#define expect_true(expr) expect ((expr) != 0, 1)
82		83
83	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84		85
		86	/* this is used as fow flag as well, so has to have a different value */
		87	/* then anything that is computed by incoming darkness */
85	#define FOW_DARKNESS 64	88	#define FOW_DARKNESS 50
86	#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */	89	#define DARKNESS_ADJUST(n) (n)
87		90
88	#define MAP_EXTEND_X 32	91	#define MAP_EXTEND_X 32
89	#define MAP_EXTEND_Y 512	92	#define MAP_EXTEND_Y 512
90		93
91	#define MIN_FONT_HEIGHT 10	94	#define MIN_FONT_HEIGHT 10
…		…
95		98
96	#define KMOD_LRAM 0x10000 // our extension	99	#define KMOD_LRAM 0x10000 // our extension
97		100
98	#define TEXID_SPEECH 1	101	#define TEXID_SPEECH 1
99	#define TEXID_NOFACE 2	102	#define TEXID_NOFACE 2
100	#define TEXID_HIDDEN 3	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
		128	static char *
		129	fast_sv_grow (SV *sv, STRLEN need)
		130	{
		131	STRLEN len = SvLEN (sv);
		132	STRLEN want = SvCUR (sv) + need;
		133
		134	if (ecb_expect_false (len < want))
		135	{
		136	do
		137	len *= 2;
		138	while (len < want);
		139
		140	sv_grow (sv, len);
		141	}
		142
		143	SvCUR_set (sv, want);
		144	return SvEND (sv) - need;
		145	}
101		146
102	static AV *texture_av;	147	static AV *texture_av;
103		148
104	static struct	149	static struct
105	{	150	{
…		…
162	{	207	{
163	GSList *attrs = run->item->analysis.extra_attrs;	208	GSList *attrs = run->item->analysis.extra_attrs;
164		209
165	while (attrs)	210	while (attrs)
166	{	211	{
167	PangoAttribute *attr = attrs->data;	212	PangoAttribute *attr = (PangoAttribute *)attrs->data;
168		213
169	if (attr->klass->type == PANGO_ATTR_SHAPE)	214	if (attr->klass->type == PANGO_ATTR_SHAPE)
170	return 1;	215	return 1;
171		216
172	attrs = attrs->next;	217	attrs = attrs->next;
173	}	218	}
174		219
175	return 0;	220	return 0;
176	}	221	}
177		222
178	typedef struct cf_layout {	223	struct cf_layout {
179	PangoLayout *pl;	224	PangoLayout *pl;
180	float r, g, b, a; // default color for rgba mode	225	float r, g, b, a; // default color for rgba mode
181	int base_height;	226	int base_height;
182	DC__Font font;	227	DC__Font font;
183	rc_t *rc;	228	rc_t rc;
184	} *DC__Layout;	229	};
		230
		231	typedef cf_layout *DC__Layout;
185		232
186	static DC__Font default_font;	233	static DC__Font default_font;
187	static PangoContext *opengl_context;	234	static PangoContext *opengl_context;
188	static PangoFontMap *opengl_fontmap;	235	static PangoFontMap *opengl_fontmap;
189		236
190	static void	237	static void
191	substitute_func (FcPattern *pattern, gpointer data)	238	substitute_func (FcPattern *pattern, gpointer data)
192	{	239	{
193	FcPatternAddBool (pattern, FC_HINTING, 1);	240	FcPatternAddBool (pattern, FC_HINTING, 1);
194	#ifdef FC_HINT_STYLE	241	#ifdef FC_HINT_STYLE
195	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	242	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
196	#endif	243	#endif
197	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	244	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
198	}	245	}
199		246
200	static void	247	static void
…		…
227		274
228	*w = rect.width;	275	*w = rect.width;
229	*h = rect.height;	276	*h = rect.height;
230	}	277	}
231		278
		279	/////////////////////////////////////////////////////////////////////////////
		280
232	typedef uint16_t tileid;	281	typedef uint16_t tileid;
233	typedef uint16_t faceid;	282	typedef uint16_t faceid;
234		283
235	typedef struct {	284	struct maptex
		285	{
236	GLuint name;	286	GLuint name;
237	int w, h;	287	int w, h;
238	float s, t;	288	float s, t;
239	uint8_t r, g, b, a;	289	uint8_t r, g, b, a;
240	tileid smoothtile;	290	tileid smoothtile;
241	uint8_t smoothlevel;	291	uint8_t smoothlevel;
242	uint8_t unused; /* set to zero on use */	292	uint8_t unused; /* set to zero on use */
243	} maptex;	293	};
244		294
245	typedef struct {	295	struct mapcell
		296	{
246	uint32_t player;	297	uint32_t player;
247	tileid tile[3];	298	tileid tile[3];
248	uint16_t darkness;	299	uint16_t darkness;
249	uint8_t stat_width, stat_hp, flags, smoothmax;	300	uint8_t stat_width, stat_hp, flags, smoothmax;
250	} mapcell;	301	};
251		302
252	typedef struct {	303	struct maprow
		304	{
253	int32_t c0, c1;	305	int32_t c0, c1;
254	mapcell *col;	306	mapcell *col;
255	} maprow;	307	};
256		308
257	typedef struct map {	309	struct mapgrid {
258	int x, y, w, h;	310	int x, y, w, h;
259	int ox, oy; /* offset to virtual global coordinate system */	311	int ox, oy; /* offset to virtual global coordinate system */
260	int faces; tileid *face2tile; // [faceid]	312	int faces; tileid *face2tile; // [faceid]
261	int texs; maptex *tex; // [tileid]	313	int texs; maptex *tex; // [tileid]
262		314
263	int32_t rows;	315	int32_t rows;
264	maprow *row;	316	maprow *row;
265	} *DC__Map;	317	};
266		318
267	static char *	319	typedef mapgrid *DC__Map;
		320
		321	template<typename T>
		322	ecb_cold static void
268	prepend (char *ptr, int sze, int inc)	323	prepend (T *&ptr, int sze, int inc)
269	{	324	{
270	char *p;	325	T *p;
271		326
272	New (0, p, sze + inc, char);	327	Newx (p, inc + sze, T);
273	Zero (p, inc, char);	328	Zero (p, inc, T);
274	Move (ptr, p + inc, sze, char);	329	Move (ptr, p + inc, sze, T);
275	Safefree (ptr);	330	Safefree (ptr);
276		331
277	return p;	332	ptr = p;
278	}	333	}
279		334
280	static char *	335	template<typename T>
		336	ecb_cold static void
281	append (char *ptr, int sze, int inc)	337	append (T *&ptr, int sze, int inc)
282	{	338	{
283	Renew (ptr, sze + inc, char);	339	Renew (ptr, sze + inc, T);
284	Zero (ptr + sze, inc, char);	340	Zero (ptr + sze, inc, T);
285
286	return ptr;
287	}	341	}
288
289	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
290	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
291		342
292	static void	343	static void
293	need_facenum (struct map *self, faceid face)	344	need_facenum (struct mapgrid *self, faceid face)
294	{	345	{
295	while (self->faces <= face)	346	if (ecb_expect_true (self->faces > face))
296	{	347	return;
		348
		349	size_t newsize = minpot (face + 1);
297	Append (tileid, self->face2tile, self->faces, self->faces);	350	append (self->face2tile, self->faces, newsize - self->faces);
298	self->faces *= 2;	351	self->faces = newsize;
299	}
300	}	352	}
301		353
302	static void	354	static void
303	need_texid (struct map *self, int texid)	355	need_texid (struct mapgrid *self, int texid)
304	{	356	{
305	while (self->texs <= texid)	357	if (ecb_expect_true (self->texs > texid))
306	{	358	return;
		359
		360	size_t newsize = minpot (texid + 1);
307	Append (maptex, self->tex, self->texs, self->texs);	361	append (self->tex, self->texs, newsize - self->texs);
308	self->texs *= 2;	362	self->texs = newsize;
309	}
310	}	363	}
311		364
312	static maprow *	365	static maprow *
313	map_get_row (DC__Map self, int y)	366	map_get_row (mapgrid *self, int y)
314	{	367	{
315	if (0 > y)	368	if (0 > y)
316	{	369	{
317	int extend = - y + MAP_EXTEND_Y;	370	int extend = - y + MAP_EXTEND_Y;
318	Prepend (maprow, self->row, self->rows, extend);	371	prepend (self->row, self->rows, extend);
319		372
320	self->rows += extend;	373	self->rows += extend;
321	self->y += extend;	374	self->y += extend;
322	y += extend;	375	y += extend;
323	}	376	}
324	else if (y >= self->rows)	377	else if (y >= self->rows)
325	{	378	{
326	int extend = y - self->rows + MAP_EXTEND_Y;	379	int extend = y - self->rows + MAP_EXTEND_Y;
327	Append (maprow, self->row, self->rows, extend);	380	append (self->row, self->rows, extend);
328	self->rows += extend;	381	self->rows += extend;
329	}	382	}
330		383
331	return self->row + y;	384	return self->row + y;
332	}	385	}
…		…
342	}	395	}
343		396
344	if (row->c0 > x)	397	if (row->c0 > x)
345	{	398	{
346	int extend = row->c0 - x + MAP_EXTEND_X;	399	int extend = row->c0 - x + MAP_EXTEND_X;
347	Prepend (mapcell, row->col, row->c1 - row->c0, extend);	400	prepend (row->col, row->c1 - row->c0, extend);
348	row->c0 -= extend;	401	row->c0 -= extend;
349	}	402	}
350	else if (x >= row->c1)	403	else if (x >= row->c1)
351	{	404	{
352	int extend = x - row->c1 + MAP_EXTEND_X;	405	int extend = x - row->c1 + MAP_EXTEND_X;
353	Append (mapcell, row->col, row->c1 - row->c0, extend);	406	append (row->col, row->c1 - row->c0, extend);
354	row->c1 += extend;	407	row->c1 += extend;
355	}	408	}
356		409
357	return row->col + (x - row->c0);	410	return row->col + (x - row->c0);
358	}	411	}
359		412
360	static mapcell *	413	static mapcell *
361	map_get_cell (DC__Map self, int x, int y)	414	map_get_cell (mapgrid *self, int x, int y)
362	{	415	{
363	return row_get_cell (map_get_row (self, y), x);	416	return row_get_cell (map_get_row (self, y), x);
364	}	417	}
365		418
366	static void	419	static void
367	map_clear (DC__Map self)	420	map_clear (mapgrid *self)
368	{	421	{
369	int r;	422	int r;
370		423
371	for (r = 0; r < self->rows; r++)	424	for (r = 0; r < self->rows; r++)
372	Safefree (self->row[r].col);	425	Safefree (self->row[r].col);
…		…
390	(cell)->flags = 0; \	443	(cell)->flags = 0; \
391	(cell)->player = 0; \	444	(cell)->player = 0; \
392	} while (0)	445	} while (0)
393		446
394	static void	447	static void
395	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)
396	{	449	{
397	int x, y;	450	int x, y;
398	maprow *row;	451	maprow *row;
399	mapcell *cell;	452	mapcell *cell;
400		453
…		…
417	CELL_CLEAR (cell);	470	CELL_CLEAR (cell);
418	}	471	}
419	}	472	}
420	}	473	}
421		474
422	typedef struct {	475	struct smooth_key
		476	{
423	tileid tile;	477	tileid tile;
424	uint8_t x, y, level;	478	uint8_t x, y, level;
425	} 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	}
426		498
427	static void	499	static void
428	smooth_or_bits (HV *hv, smooth_key *key, IV bits)	500	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
429	{	501	{
430	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);	502	auto &&it = h.find (key);
431		503
432	if (SvIOK (*sv))	504	if (it == h.end ())
433	SvIV_set (*sv, SvIVX (*sv) | bits);	505	h.insert (std::make_pair (key, bits));
434	else	506	else
435	sv_setiv (*sv, bits);	507	it->second |= bits;
436	}	508	}
437		509
438	static void	510	static void
439	music_finished (void)	511	music_finished (void)
440	{	512	{
…		…
459	ev.data2 = 0;	531	ev.data2 = 0;
460		532
461	SDL_PushEvent ((SDL_Event *)&ev);	533	SDL_PushEvent ((SDL_Event *)&ev);
462	}	534	}
463		535
464	static unsigned int
465	minpot (unsigned int n)
466	{
467	if (!n)
468	return 0;
469
470	--n;
471
472	n |= n >> 1;
473	n |= n >> 2;
474	n |= n >> 4;
475	n |= n >> 8;
476	n |= n >> 16;
477
478	return n + 1;
479	}
480
481	static unsigned int
482	popcount (unsigned int n)
483	{
484	n -= (n >> 1) & 0x55555555U;
485	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
486	n = ((n >> 4) + n) & 0x0f0f0f0fU;
487	n *= 0x01010101U;
488
489	return n >> 24;
490	}
491
492	/* SDL should provide this, really. */	536	/* SDL should provide this, really. */
493	#define SDLK_MODIFIER_MIN 300	537	#define SDLK_MODIFIER_MIN 300
494	#define SDLK_MODIFIER_MAX 314	538	#define SDLK_MODIFIER_MAX 314
495		539
496	/******************************************************************************/	540	/******************************************************************************/
…		…
549		593
550	return mod;	594	return mod;
551	}	595	}
552		596
553	static void	597	static void
554	deliantra_main ()	598	deliantra_main (SV *real_main)
555	{	599	{
556	char *argv[] = { 0 };	600	dSP;
557	call_argv ("::main", G_DISCARD | G_VOID, argv);	601
		602	PUSHMARK (SP);
		603	call_sv (real_main, G_DISCARD | G_VOID);
558	}	604	}
559		605
560	#ifdef __MACOSX__	606	#ifdef __MACOSX__
		607	static SV *real_main;
		608
561	/* to due surprising braindamage on the side of SDL design, we	609	/* to due surprising braindamage on the side of SDL design, we
562	* do some mind-boggling hack here: SDL requires a custom main()	610	* do some mind-boggling hack here: SDL requires a custom main()
563	* on OS X, so... we provide one and call the original main(), which,	611	* on OS X, so... we provide one and call the original main(), which,
564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	612	* due to shared library magic, calls -lSDLmain's main, not perl's main,
565	* and which calls our main (== SDL_main) back.	613	* and which calls our main (== SDL_main) back.
566	*/	614	*/
567	extern C_LINKAGE int	615	extern C_LINKAGE int
568	main (int argc, char *argv[])	616	main (int argc, char *argv[])
569	{	617	{
570	deliantra_main ();	618	deliantra_main (real_main);
571	}	619	}
572		620
573	#undef main	621	#undef main
574		622
575	extern C_LINKAGE int main (int argc, char *argv[]);	623	extern C_LINKAGE int main (int argc, char *argv[]);
576		624
577	static void	625	static void
578	SDL_braino (void)	626	SDL_main_hack (SV *real_main_)
579	{	627	{
		628	real_main = real_main_;
		629
580	char *argv[] = { "deliantra client", 0 };	630	char *argv[] = { "deliantra client", 0 };
581	(main) (1, argv);	631	(main) (1, argv);
582	}	632	}
583	#else	633	#else
584	static void	634	static void
585	SDL_braino (void)	635	SDL_main_hack (SV *real_main)
586	{	636	{
587	deliantra_main ();	637	deliantra_main (real_main);
588	}	638	}
589	#endif	639	#endif
590		640
591	MODULE = Deliantra::Client PACKAGE = DC	641	MODULE = Deliantra::Client PACKAGE = DC
592		642
…		…
793		843
794	const_iv (FOW_DARKNESS)	844	const_iv (FOW_DARKNESS)
795	# undef const_iv	845	# undef const_iv
796	};	846	};
797		847
798	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	848	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	849	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800		850
801	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	851	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	852	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803	}	853	}
804		854
…		…
819		869
820	NV ceil (NV x)	870	NV ceil (NV x)
821		871
822	IV minpot (UV n)	872	IV minpot (UV n)
823		873
		874	UV ld32 (UV n)
		875	CODE:
		876	RETVAL = ecb_ld32 (n);
		877	OUTPUT:
		878	RETVAL
		879
824	IV popcount (UV n)	880	IV popcount (UV n)
		881	CODE:
		882	RETVAL = ecb_popcount32 (n);
		883	OUTPUT:
		884	RETVAL
825		885
826	NV distance (NV dx, NV dy)	886	NV distance (NV dx, NV dy)
827	CODE:	887	CODE:
828	RETVAL = pow (dx * dx + dy * dy, 0.5);	888	RETVAL = pow (dx * dx + dy * dy, 0.5);
829	OUTPUT:	889	OUTPUT:
…		…
843	#endif	903	#endif
844	}	904	}
845		905
846	char *SDL_GetError ()	906	char *SDL_GetError ()
847		907
848	void SDL_braino ()	908	void SDL_main_hack (SV *real_main)
		909	PROTOTYPE: &
849		910
850	int SDL_Init (U32 flags)	911	int SDL_Init (U32 flags)
851		912
852	int SDL_InitSubSystem (U32 flags)	913	int SDL_InitSubSystem (U32 flags)
853		914
854	void SDL_QuitSubSystem (U32 flags)	915	void SDL_QuitSubSystem (U32 flags)
855		916
856	void SDL_Quit ()	917	void SDL_Quit ()
857		918
858	int SDL_GL_SetAttribute (int attr, int value)	919	int SDL_GL_SetAttribute (int attr, int value)
		920	C_ARGS: (SDL_GLattr)attr, value
859		921
860	int SDL_GL_GetAttribute (int attr)	922	int SDL_GL_GetAttribute (int attr)
861	CODE:	923	CODE:
862	if (SDL_GL_GetAttribute (attr, &RETVAL))	924	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
863	XSRETURN_UNDEF;	925	XSRETURN_UNDEF;
864	OUTPUT:	926	OUTPUT:
865	RETVAL	927	RETVAL
866		928
867	void	929	void
…		…
922	);	984	);
923		985
924	if (RETVAL)	986	if (RETVAL)
925	{	987	{
926	av_clear (texture_av);	988	av_clear (texture_av);
927
928	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	989	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
930	#include "glfunc.h"	990	#include "glfunc.h"
931	#undef GL_FUNC	991	#undef GL_FUNC
		992	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		993	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932	}	994	}
933	}	995	}
934	OUTPUT:	996	OUTPUT:
935	RETVAL	997	RETVAL
		998
		999	void
		1000	SDL_WM_SetCaption (const char *title, const char *icon)
936		1001
937	void	1002	void
938	SDL_GL_SwapBuffers ()	1003	SDL_GL_SwapBuffers ()
939		1004
940	char *	1005	char *
941	SDL_GetKeyName (int sym)	1006	SDL_GetKeyName (int sym)
		1007	C_ARGS: (SDLKey)sym
942		1008
943	int	1009	int
944	SDL_GetAppState ()	1010	SDL_GetAppState ()
945		1011
946	int	1012	int
947	SDL_GetModState ()	1013	SDL_GetModState ()
948		1014
		1015	int
		1016	SDL_WaitEvent ()
		1017	C_ARGS: 0
		1018
949	void	1019	void
		1020	SDL_PumpEvents ()
		1021
		1022	void
950	poll_events ()	1023	peep_events ()
951	PPCODE:	1024	PPCODE:
952	{	1025	{
953	SDL_Event ev;	1026	SDL_Event ev;
954		1027
955	SDL_PumpEvents ();	1028	SDL_PumpEvents ();
…		…
1021		1094
1022	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1095	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1023	}	1096	}
1024	}	1097	}
1025		1098
		1099	char *
		1100	SDL_AudioDriverName ()
		1101	CODE:
		1102	{
		1103	char buf [256];
		1104	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1105	XSRETURN_UNDEF;
		1106
		1107	RETVAL = buf;
		1108	}
		1109	OUTPUT:
		1110	RETVAL
		1111
1026	int	1112	int
1027	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)
1028	POSTCALL:	1114	POSTCALL:
1029	Mix_HookMusicFinished (music_finished);	1115	Mix_HookMusicFinished (music_finished);
1030	Mix_ChannelFinished (channel_finished);	1116	Mix_ChannelFinished (channel_finished);
1031		1117
1032	void	1118	void
1033	Mix_QuerySpec ()	1119	Mix_QuerySpec ()
…		…
1092	add_font (char *file)	1178	add_font (char *file)
1093	CODE:	1179	CODE:
1094	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1180	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095	OUTPUT:	1181	OUTPUT:
1096	RETVAL	1182	RETVAL
		1183
		1184	void
		1185	IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
		1186
		1187	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1188	void
		1189	Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1097		1190
1098	void	1191	void
1099	load_image_inline (SV *image_)	1192	load_image_inline (SV *image_)
1100	ALIAS:	1193	ALIAS:
1101	load_image_file = 1	1194	load_image_file = 1
…		…
1147		1240
1148	SDL_LockSurface (surface2);	1241	SDL_LockSurface (surface2);
1149	EXTEND (SP, 6);	1242	EXTEND (SP, 6);
1150	PUSHs (sv_2mortal (newSViv (surface2->w)));	1243	PUSHs (sv_2mortal (newSViv (surface2->w)));
1151	PUSHs (sv_2mortal (newSViv (surface2->h)));	1244	PUSHs (sv_2mortal (newSViv (surface2->h)));
1152	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1245	PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1153	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)));
1154	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1247	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1155	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1248	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1156	SDL_UnlockSurface (surface2);	1249	SDL_UnlockSurface (surface2);
1157		1250
…		…
1229	MODULE = Deliantra::Client PACKAGE = DC::Font	1322	MODULE = Deliantra::Client PACKAGE = DC::Font
1230		1323
1231	PROTOTYPES: DISABLE	1324	PROTOTYPES: DISABLE
1232		1325
1233	DC::Font	1326	DC::Font
1234	new_from_file (SV *class, char *path, int id = 0)	1327	new_from_file (SV *klass, char *path, int id = 0)
1235	CODE:	1328	CODE:
1236	{	1329	{
1237	int count;	1330	int count;
1238	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	1331	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1239	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1332	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1268	PROTOTYPE:	1361	PROTOTYPE:
1269	CODE:	1362	CODE:
1270	tc_restore ();	1363	tc_restore ();
1271		1364
1272	DC::Layout	1365	DC::Layout
1273	new (SV *class)	1366	new (SV *klass)
1274	CODE:	1367	CODE:
1275	New (0, RETVAL, 1, struct cf_layout);	1368	RETVAL = new cf_layout;
1276		1369
1277	RETVAL->pl = pango_layout_new (opengl_context);	1370	RETVAL->pl = pango_layout_new (opengl_context);
1278	RETVAL->r = 1.;	1371	RETVAL->r = 1.;
1279	RETVAL->g = 1.;	1372	RETVAL->g = 1.;
1280	RETVAL->b = 1.;	1373	RETVAL->b = 1.;
1281	RETVAL->a = 1.;	1374	RETVAL->a = 1.;
1282	RETVAL->base_height = MIN_FONT_HEIGHT;	1375	RETVAL->base_height = MIN_FONT_HEIGHT;
1283	RETVAL->font = 0;	1376	RETVAL->font = 0;
1284	RETVAL->rc = rc_alloc ();
1285		1377
1286	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1378	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1287	layout_update_font (RETVAL);	1379	layout_update_font (RETVAL);
1288	OUTPUT:	1380	OUTPUT:
1289	RETVAL	1381	RETVAL
1290		1382
1291	void	1383	void
1292	DESTROY (DC::Layout self)	1384	DESTROY (DC::Layout self)
1293	CODE:	1385	CODE:
1294	g_object_unref (self->pl);	1386	g_object_unref (self->pl);
1295	rc_free (self->rc);
1296	Safefree (self);	1387	delete self;
1297		1388
1298	void	1389	void
1299	set_text (DC::Layout self, SV *text_)	1390	set_text (DC::Layout self, SV *text_)
1300	CODE:	1391	CODE:
1301	{	1392	{
…		…
1427		1518
1428	void	1519	void
1429	set_height (DC::Layout self, int base_height)	1520	set_height (DC::Layout self, int base_height)
1430	CODE:	1521	CODE:
1431	if (self->base_height != base_height)	1522	if (self->base_height != base_height)
1432	{	1523	{
1433	self->base_height = base_height;	1524	self->base_height = base_height;
1434	layout_update_font (self);	1525	layout_update_font (self);
1435	}	1526	}
1436		1527
1437	void	1528	void
…		…
1555	}	1646	}
1556		1647
1557	void	1648	void
1558	render (DC::Layout self, float x, float y, int flags = 0)	1649	render (DC::Layout self, float x, float y, int flags = 0)
1559	CODE:	1650	CODE:
1560	rc_clear (self->rc);	1651	self->rc.clear ();
1561	pango_opengl_render_layout_subpixel (	1652	pango_opengl_render_layout_subpixel (
1562	self->pl,	1653	self->pl,
1563	self->rc,	1654	&self->rc,
1564	x * PANGO_SCALE, y * PANGO_SCALE,	1655	x * PANGO_SCALE, y * PANGO_SCALE,
1565	self->r, self->g, self->b, self->a,	1656	self->r, self->g, self->b, self->a,
1566	flags	1657	flags
1567	);	1658	);
1568	// we assume that context_change actually clears/frees stuff	1659	// we assume that context_change actually clears/frees stuff
…		…
1579	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1670	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1580	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1671	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1581	glEnable (GL_ALPHA_TEST);	1672	glEnable (GL_ALPHA_TEST);
1582	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1673	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1583		1674
1584	rc_draw (self->rc);	1675	self->rc.draw ();
1585		1676
1586	glDisable (GL_ALPHA_TEST);	1677	glDisable (GL_ALPHA_TEST);
1587	glDisable (GL_BLEND);	1678	glDisable (GL_BLEND);
1588	glDisable (GL_TEXTURE_2D);	1679	glDisable (GL_TEXTURE_2D);
1589	}	1680	}
…		…
1665	glDisable (GL_BLEND);	1756	glDisable (GL_BLEND);
1666	}	1757	}
1667	}	1758	}
1668		1759
1669	void	1760	void
1670	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f)	1761	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1671	PROTOTYPE: @	1762	PROTOTYPE: @
1672	CODE:	1763	CODE:
1673	{	1764	{
		1765	glEnable (GL_BLEND);
		1766	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674	glEnable (GL_TEXTURE_2D);	1767	glEnable (GL_TEXTURE_2D);
1675	glEnable (GL_BLEND);
1676	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677	glBindTexture (GL_TEXTURE_2D, name1);	1768	glBindTexture (GL_TEXTURE_2D, name1);
1678		1769
1679	glColor3f (intensity, intensity, intensity);	1770	glColor3f (intensity, intensity, intensity);
1680	glPushMatrix ();	1771	glPushMatrix ();
1681	glScalef (1./3, 1./3, 1.);	1772	glScalef (1./3, 1./3, 1.);
1682		1773
1683	if (blend > 0.f)	1774	if (blend > 0.f)
1684	{	1775	{
1685	float S2, T2; /* 0. 0. for texture 2 */	1776	float dx3 = dx * -3.f / w;
1686	float w = w1 > w2 ? w1 : w2;	1777	float dy3 = dy * -3.f / h;
1687	float h = h1 > h2 ? h1 : h2;
1688	GLfloat env_color[4] = { 0., 0., 0., blend };	1778	GLfloat env_color[4] = { 0., 0., 0., blend };
1689		1779
1690	/* interpolate the two shadow textures */	1780	/* interpolate the two shadow textures */
1691	/* stage 0 == rgb(glcolor) + alpha(t0) */	1781	/* stage 0 == rgb(glcolor) + alpha(t0) */
1692	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1782	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1787	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1788	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1789
1700	/* rgb == rgb(glcolor) */	1790	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1791	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1792	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1793	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1794
1705	/* alpha = interpolate t0, t1 by env_alpha */	1795	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1796	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1797
…		…
1713	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);	1803	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714		1804
1715	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);	1805	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);	1806	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717		1807
1718	s1 *= w / w1;
1719	t1 *= h / h1;
1720
1721	dx *= -3.f / w2;
1722	dy *= -3.f / h2;
1723	dx *= w / w2;
1724	dy *= h / h2;
1725
1726	s2 *= w / w2;
1727	t2 *= h / h2;
1728
1729	glBegin (GL_QUADS);	1808	glBegin (GL_QUADS);
1730	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0);	1809	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1731	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1);	1810	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1732	gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1);	1811	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1733	gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0);	1812	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1734	glEnd ();	1813	glEnd ();
1735		1814
1736	glDisable (GL_TEXTURE_2D);	1815	glDisable (GL_TEXTURE_2D);
1737	gl.ActiveTexture (GL_TEXTURE0);	1816	gl.ActiveTexture (GL_TEXTURE0);
1738	}	1817	}
…		…
1740	{	1819	{
1741	/* simple blending of one texture, also opengl <1.3 path */	1820	/* simple blending of one texture, also opengl <1.3 path */
1742	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1821	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743		1822
1744	glBegin (GL_QUADS);	1823	glBegin (GL_QUADS);
1745	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);	1824	glTexCoord2f (0, 0); glVertex2f (0, 0);
1746	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);	1825	glTexCoord2f (0, t); glVertex2f (0, h);
1747	glTexCoord2f (s1, t1); glVertex2f (w1, h1);	1826	glTexCoord2f (s, t); glVertex2f (w, h);
1748	glTexCoord2f (s1, 0); glVertex2f (w1, 0);	1827	glTexCoord2f (s, 0); glVertex2f (w, 0);
1749	glEnd ();	1828	glEnd ();
1750	}	1829	}
		1830
		1831	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1832	{
		1833	int x, y;
		1834	int dx3 = dx * 3;
		1835	int dy3 = dy * 3;
		1836
		1837	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1838	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1839	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1840	glTranslatef (-1., -1., 0);
		1841	glBegin (GL_QUADS);
		1842
		1843	for (y = 1; y < h; y += 3)
		1844	{
		1845	int y1 = y - dy3;
		1846	int y1valid = y1 >= 0 && y1 < h;
		1847
		1848	for (x = 1; x < w; x += 3)
		1849	{
		1850	int x1 = x - dx3;
		1851	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1852	uint8_t h2;
		1853
		1854	if (y1valid && x1 >= 0 && x1 < w)
		1855	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1856	else
		1857	h2 = 1; /* out of range == invisible */
		1858
		1859	if (h1 || h2)
		1860	{
		1861	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1862	glColor4f (1., 1., 1., alpha);
		1863
		1864	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1865	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1866	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1867	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1868	}
		1869	}
		1870	}
		1871	}
		1872
		1873	glEnd ();
1751		1874
1752	glPopMatrix ();	1875	glPopMatrix ();
1753		1876
1754	glDisable (GL_TEXTURE_2D);	1877	glDisable (GL_TEXTURE_2D);
1755	glDisable (GL_BLEND);	1878	glDisable (GL_BLEND);
…		…
1769	MODULE = Deliantra::Client PACKAGE = DC::Map	1892	MODULE = Deliantra::Client PACKAGE = DC::Map
1770		1893
1771	PROTOTYPES: DISABLE	1894	PROTOTYPES: DISABLE
1772		1895
1773	DC::Map	1896	DC::Map
1774	new (SV *class)	1897	new (SV *klass)
1775	CODE:	1898	CODE:
1776	New (0, RETVAL, 1, struct map);	1899	New (0, RETVAL, 1, mapgrid);
1777	RETVAL->x = 0;	1900	RETVAL->x = 0;
1778	RETVAL->y = 0;	1901	RETVAL->y = 0;
1779	RETVAL->w = 0;	1902	RETVAL->w = 0;
1780	RETVAL->h = 0;	1903	RETVAL->h = 0;
1781	RETVAL->ox = 0;	1904	RETVAL->ox = 0;
…		…
1818		1941
1819	void	1942	void
1820	set_smooth (DC::Map self, int face, int smooth, int level)	1943	set_smooth (DC::Map self, int face, int smooth, int level)
1821	CODE:	1944	CODE:
1822	{	1945	{
1823	tileid texid;	1946	tileid texid;
1824	maptex *tex;	1947	maptex *tex;
1825		1948
1826	if (face < 0 || face >= self->faces)	1949	if (face < 0 || face >= self->faces)
1827	return;	1950	return;
1828		1951
1829	if (smooth < 0 || smooth >= self->faces)	1952	if (smooth < 0 || smooth >= self->faces)
1830	return;	1953	return;
1831		1954
1832	texid = self->face2tile [face];	1955	texid = self->face2tile [face];
1833		1956
1834	if (!texid)	1957	if (!texid)
1835	return;	1958	return;
1836		1959
1837	tex = self->tex + texid;	1960	tex = self->tex + texid;
…		…
1870	}	1993	}
1871		1994
1872	void	1995	void
1873	expire_textures (DC::Map self, int texid, int count)	1996	expire_textures (DC::Map self, int texid, int count)
1874	PPCODE:	1997	PPCODE:
1875	for (; texid < self->texs && count; ++texid, --count)	1998	for (; texid < self->texs && count; ++texid, --count)
1876	{	1999	{
1877	maptex *tex = self->tex + texid;	2000	maptex *tex = self->tex + texid;
1878		2001
1879	if (tex->name)	2002	if (tex->name)
1880	{	2003	{
…		…
1927	self->ox += dx; self->x += dx;	2050	self->ox += dx; self->x += dx;
1928	self->oy += dy; self->y += dy;	2051	self->oy += dy; self->y += dy;
1929		2052
1930	while (self->y < 0)	2053	while (self->y < 0)
1931	{	2054	{
1932	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	2055	prepend (self->row, self->rows, MAP_EXTEND_Y);
1933		2056
1934	self->rows += MAP_EXTEND_Y;	2057	self->rows += MAP_EXTEND_Y;
1935	self->y += MAP_EXTEND_Y;	2058	self->y += MAP_EXTEND_Y;
1936	}	2059	}
1937	}	2060	}
1938		2061
1939	SV *	2062	SV *
1940	map1a_update (DC::Map self, SV *data_, int extmap)	2063	map1a_update (DC::Map self, SV *data_)
1941	CODE:	2064	CODE:
1942	{	2065	{
1943	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	2066	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944	uint8_t *data_end = (uint8_t *)SvEND (data_);	2067	uint8_t *data_end = (uint8_t *)SvEND (data_);
1945	mapcell *cell;	2068	mapcell *cell;
…		…
1966		2089
1967	//TODO: don't trust server data to be in-range(!)	2090	//TODO: don't trust server data to be in-range(!)
1968		2091
1969	if (flags & 8)	2092	if (flags & 8)
1970	{	2093	{
		2094	uint8_t ext, cmd;
		2095
1971	if (extmap)	2096	do
1972	{	2097	{
1973	uint8_t ext, cmd;	2098	ext = *data++;
		2099	cmd = ext & 0x7f;
1974		2100
1975	do	2101	if (cmd < 4)
		2102	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2103	else if (cmd == 5) // health
1976	{	2104	{
1977	ext = *data++;
1978	cmd = ext & 0x7f;
1979
1980	if (cmd < 4)
1981	cell->darkness = 255 - ext * 64 + 1;
1982	else if (cmd == 5) // health
1983	{
1984	cell->stat_width = 1;	2105	cell->stat_width = 1;
1985	cell->stat_hp = *data++;	2106	cell->stat_hp = *data++;
1986	}
1987	else if (cmd == 6) // monster width
1988	cell->stat_width = *data++ + 1;
1989	else if (cmd == 0x47)
1990	{
1991	if (*data == 1) cell->player = data [1];
1992	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996	data += *data + 1;
1997	}
1998	else if (cmd == 8) // cell flags
1999	cell->flags = *data++;
2000	else if (ext & 0x40) // unknown, multibyte => skip
2001	data += *data + 1;
2002	else
2003	data++;
2004	}	2107	}
2005	while (ext & 0x80);	2108	else if (cmd == 6) // monster width
		2109	cell->stat_width = *data++ + 1;
		2110	else if (cmd == 0x47)
		2111	{
		2112	if (*data == 1) cell->player = data [1];
		2113	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2114	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2115	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2116
		2117	data += *data + 1;
		2118	}
		2119	else if (cmd == 8) // cell flags
		2120	cell->flags = *data++;
		2121	else if (ext & 0x40) // unknown, multibyte => skip
		2122	data += *data + 1;
		2123	else
		2124	data++;
2006	}	2125	}
2007	else	2126	while (ext & 0x80);
2008	cell->darkness = *data++ + 1;
2009	}	2127	}
2010		2128
2011	for (z = 0; z <= 2; ++z)	2129	for (z = 0; z <= 2; ++z)
2012	if (flags & (4 >> z))	2130	if (flags & (4 >> z))
2013	{	2131	{
…		…
2061	? self->row + y	2179	? self->row + y
2062	: 0;	2180	: 0;
2063		2181
2064	for (x = x0; x < x1; x++)	2182	for (x = x0; x < x1; x++)
2065	{	2183	{
2066	int r = 32, g = 32, b = 32, a = 192;	2184	unsigned int r = 32, g = 32, b = 32, a = 192;
2067		2185
2068	if (row && row->c0 <= x && x < row->c1)	2186	if (row && row->c0 <= x && x < row->c1)
2069	{	2187	{
2070	mapcell *cell = row->col + (x - row->c0);	2188	mapcell *cell = row->col + (x - row->c0);
2071		2189
…		…
2073	{	2191	{
2074	maptex tex = self->tex [cell->tile [z]];	2192	maptex tex = self->tex [cell->tile [z]];
2075	int a0 = 255 - tex.a;	2193	int a0 = 255 - tex.a;
2076	int a1 = tex.a;	2194	int a1 = tex.a;
2077		2195
2078	r = (r * a0 + tex.r * a1) / 255;	2196	r = div255 (r * a0 + tex.r * a1);
2079	g = (g * a0 + tex.g * a1) / 255;	2197	g = div255 (g * a0 + tex.g * a1);
2080	b = (b * a0 + tex.b * a1) / 255;	2198	b = div255 (b * a0 + tex.b * a1);
2081	a = (a * a0 + tex.a * a1) / 255;	2199	a = div255 (a * a0 + tex.a * a1);
2082	}	2200	}
2083	}	2201	}
2084		2202
2085	*map++ = (r )	2203	*map++ = (r )
2086	| (g << 8)	2204	| (g << 8)
2087	| (b << 16)	2205	| (b << 16)
2088	| (a << 24);	2206	| (a << 24);
2089	}	2207	}
2090	}	2208	}
2091		2209
2092	RETVAL = map_sv;	2210	RETVAL = map_sv;
2093	}	2211	}
2094	OUTPUT:	2212	OUTPUT:
2095	RETVAL	2213	RETVAL
2096		2214
2097	void	2215	void
2098	draw (DC::Map self, int mx, int my, int sw, int sh, int T, 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)
2099	CODE:	2217	CODE:
2100	{	2218	{
2101	int x, y, z;	2219	int x, y, z;
2102		2220
2103	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2104	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2105	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!
2106	smooth_key skey;
2107	int pl_x, pl_y;	2222	int pl_x, pl_y;
2108	maptex pl_tex;	2223	maptex pl_tex;
2109	rc_t *rc = rc_alloc ();	2224	rc_t rc;
2110	rc_t *rc_ov = rc_alloc ();	2225	rc_t rc_ov;
2111	rc_key_t key;	2226	rc_key_t key;
2112	rc_array_t *arr, *arr_hidden;	2227	rc_t::array_t *arr;
2113		2228
2114	pl_tex.name = 0;	2229	pl_tex.name = 0;
2115		2230
2116	// that's current max. sorry.	2231	// that's current max. sorry.
2117	if (sw > 255) sw = 255;	2232	if (sw > 255) sw = 255;
2118	if (sh > 255) sh = 255;	2233	if (sh > 255) sh = 255;
2119
2120	// clear key, in case of extra padding
2121	memset (&skey, 0, sizeof (skey));
2122		2234
2123	memset (&key, 0, sizeof (key));	2235	memset (&key, 0, sizeof (key));
2124	key.r = 255;	2236	key.r = 255;
2125	key.g = 255;	2237	key.g = 255;
2126	key.b = 255;	2238	key.b = 255;
…		…
2132	my += self->y;	2244	my += self->y;
2133		2245
2134	// first pass: determine smooth_max	2246	// first pass: determine smooth_max
2135	// rather ugly, if you ask me	2247	// rather ugly, if you ask me
2136	// could also be stored inside mapcell and updated on change	2248	// could also be stored inside mapcell and updated on change
2137	memset (smooth_max, 0, sizeof (smooth_max));	2249	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2138		2250
2139	for (y = 0; y < sh; y++)	2251	for (y = 0; y < sh; y++)
2140	if (0 <= y + my && y + my < self->rows)	2252	if (0 <= y + my && y + my < self->rows)
2141	{	2253	{
2142	maprow *row = self->row + (y + my);	2254	maprow *row = self->row + (y + my);
…		…
2155		2267
2156	glEnable (GL_BLEND);	2268	glEnable (GL_BLEND);
2157	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2269	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2270	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159		2271
2160	key.texname = self->tex [TEXID_HIDDEN].name;
2161	arr_hidden = rc_array (rc_ov, &key);
2162
2163	for (z = 0; z <= 2; z++)	2272	for (z = 0; z <= 2; z++)
2164	{	2273	{
2165	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;
2166	key.texname = -1;	2277	key.texname = -1;
2167		2278
2168	for (y = 0; y < sh; y++)	2279	for (y = 0; y < sh; y++)
2169	if (0 <= y + my && y + my < self->rows)	2280	if (0 <= y + my && y + my < self->rows)
2170	{	2281	{
…		…
2187		2298
2188	if (!tex.name)	2299	if (!tex.name)
2189	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2300	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2190		2301
2191	key.texname = tex.name;	2302	key.texname = tex.name;
2192	arr = rc_array (rc, &key);	2303	arr = &rc.array (key);
2193	}	2304	}
2194		2305
2195	px = (x + 1) * T - tex.w;	2306	px = (x + 1) * Th - tex.w;
2196	py = (y + 1) * T - tex.h;	2307	py = (y + 1) * Tw - tex.h;
2197		2308
2198	if (expect_false (cell->player == player) && expect_false (z == 2))	2309	if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2199	{	2310	{
2200	pl_x = px;	2311	pl_x = px;
2201	pl_y = py;	2312	pl_y = py;
2202	pl_tex = tex;	2313	pl_tex = tex;
2203	continue;	2314	continue;
2204	}	2315	}
2205		2316
2206	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2317	arr->t2f_v3f (0 , 0 , px , py , 0);
2207	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2318	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2208	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);
2209	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2320	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2210		2321
2211	// update smooth hash	2322	// update smooth hash
2212	if (tex.smoothtile)	2323	if (tex.smoothtile)
2213	{	2324	{
2214	skey.tile = tex.smoothtile;	2325	skey.tile = tex.smoothtile;
2215	skey.level = tex.smoothlevel;	2326	skey.level = tex.smoothlevel;
2216		2327
2217	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);	2328	smooth_level[tex.smoothlevel] = 1;
2218		2329
2219	// 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
2220	// shifted +1|+1 so we always stay positive.	2331	// shifted +1|+1 so we always stay positive.
2221		2332
2222	// bits is ___n cccc CCCC bbbb	2333	// bits is ___n cccc CCCC bbbb
…		…
2230		2341
2231	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2342	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2232	// ·· ·· ·┏ ┓·	2343	// ·· ·· ·┏ ┓·
2233		2344
2234	// full tile	2345	// full tile
2235	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);
2236		2347
2237	// borders	2348	// borders
2238	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);
2239	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);
2240	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);
2241	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);
2242		2353
2243	// corners	2354	// corners
2244	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);
2245	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);
2246	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);
2247	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);
2248	}	2359	}
2249	}	2360	}
2250		2361
2251	if (expect_false (z == 2))	2362	if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2252	{	2363	{
2253	/* draw question marks on top of hidden spaces */	2364	// overlays such as the speech bubble, probably more to come
2254	if (!cell->darkness)	2365	if (cell->flags & 1)
2255	{	2366	{
2256	maptex tex = self->tex [TEXID_HIDDEN];
2257	int px = (x + 1) * T - tex.w;
2258	int py = (y + 1) * T - tex.h;
2259
2260	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264	}
2265
2266	if (expect_false (cell->flags))
2267	{
2268	// overlays such as the speech bubble, probably more to come
2269	if (cell->flags & 1)
2270	{
2271	rc_key_t key_ov = key;	2367	rc_key_t key_ov = key;
2272	maptex tex = self->tex [TEXID_SPEECH];	2368	maptex tex = self->tex[TEXID_SPEECH];
2273	rc_array_t *arr;
2274	int px = x * T + T * 2 / 32;	2369	int px = x * Tw + Tw * 2 / 32;
2275	int py = y * T - T * 6 / 32;	2370	int py = y * Th - Th * 6 / 32;
2276		2371
2277	key_ov.texname = tex.name;	2372	key_ov.texname = tex.name;
2278	arr = rc_array (rc_ov, &key_ov);	2373	rc_t::array_t &arr = rc_ov.array (key_ov);
2279		2374
2280	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2375	arr.t2f_v3f (0 , 0 , px , py , 0);
2281	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2376	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2282	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2377	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2283	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2378	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2284	}
2285	}	2379	}
2286	}	2380	}
2287	}	2381	}
2288	}	2382	}
2289		2383
2290	rc_draw (rc);	2384	rc.draw ();
2291	rc_clear (rc);	2385	rc.clear ();
2292		2386
2293	// go through all smoothlevels, lowest to highest, then draw.	2387	// go through all smoothlevels, lowest to highest, then draw.
2294	// this is basically counting sort	2388	// this is basically counting sort
2295	{	2389	{
2296	int w, b;	2390	int w, b;
2297		2391
2298	glEnable (GL_TEXTURE_2D);	2392	glEnable (GL_TEXTURE_2D);
2299	glBegin (GL_QUADS);	2393	glBegin (GL_QUADS);
2300	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)
2301	{	2397	{
2302	uint32_t smask = smooth_level [w];	2398	smooth_key &skey = it->first;
2303	if (smask)	2399	IV bits = it->second;
2304	for (b = 0; b < 32; ++b)	2400
2305	if (smask & (((uint32_t)1) << b))	2401	if (!(bits & 0x1000)
		2402	&& skey.level == level
		2403	&& level > smooth_max [skey.x][skey.y])
2306	{	2404	{
2307	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
2308	HE *he;	2413	if (tex.name)
2309
2310	hv_iterinit (smooth);
2311	while ((he = hv_iternext (smooth)))
2312	{	2414	{
2313	smooth_key *skey = (smooth_key *)HeKEY (he);	2415	// this time avoiding texture state changes
2314	IV bits = SvIVX (HeVAL (he));	2416	// save gobs of state changes.
2315		2417	if (key.texname != tex.name)
2316	if (!(bits & 0x1000)
2317	&& skey->level == level
2318	&& level > smooth_max [skey->x][skey->y])
2319	{	2418	{
2320	maptex tex = self->tex [skey->tile];
2321	int px = (((int)skey->x) - 1) * T;
2322	int py = (((int)skey->y) - 1) * T;
2323	int border = bits & 15;
2324	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325	float dx = tex.s * .0625f; // 16 images/row
2326	float dy = tex.t * .5f ; // 2 images/column
2327
2328	if (tex.name)
2329	{
2330	// this time avoiding texture state changes
2331	// save gobs of state changes.
2332	if (key.texname != tex.name)
2333	{
2334	self->tex [skey->tile].unused = 0;	2419	self->tex [skey.tile].unused = 0;
2335		2420
2336	glEnd ();	2421	glEnd ();
2337	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2422	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2338	glBegin (GL_QUADS);	2423	glBegin (GL_QUADS);
2339	}	2424	}
2340		2425
2341	if (border)	2426	if (border)
2342	{	2427	{
2343	float ox = border * dx;	2428	float ox = border * dx;
2344		2429
2345	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2430	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2432	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2433	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349	}	2434	}
2350		2435
2351	if (corner)	2436	if (corner)
2352	{	2437	{
2353	float ox = corner * dx;	2438	float ox = corner * dx;
2354		2439
2355	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2440	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2441	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2442	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2443	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359	}
2360	}
2361	}	2444	}
2362	}	2445	}
2363	}	2446	}
2364	}	2447	}
2365		2448
2366	glEnd ();	2449	glEnd ();
2367	glDisable (GL_TEXTURE_2D);	2450	glDisable (GL_TEXTURE_2D);
2368	key.texname = -1;	2451	key.texname = -1;
2369	}	2452	}
2370
2371	hv_clear (smooth);
2372	}	2453	}
2373		2454
2374	if (pl_tex.name)	2455	if (pl_tex.name)
2375	{	2456	{
2376	maptex tex = pl_tex;	2457	maptex tex = pl_tex;
2377	int px = pl_x + sdx;	2458	int px = pl_x + sdx;
2378	int py = pl_y + sdy;	2459	int py = pl_y + sdy;
2379		2460
2380	key.texname = tex.name;	2461	key.texname = tex.name;
2381	arr = rc_array (rc, &key);	2462	rc_t::array_t &arr = rc.array (key);
2382		2463
2383	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2464	arr.t2f_v3f (0 , 0 , px , py , 0);
2384	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2465	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2385	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);
2386	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2467	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2387		2468
2388	rc_draw (rc);	2469	rc.draw ();
2389	}	2470	}
2390		2471
2391	rc_draw (rc_ov);	2472	rc_ov.draw ();
2392	rc_clear (rc_ov);	2473	rc_ov.clear ();
2393		2474
2394	glDisable (GL_BLEND);	2475	glDisable (GL_BLEND);
2395	rc_free (rc);
2396	rc_free (rc_ov);
2397		2476
2398	// top layer: overlays such as the health bar	2477	// top layer: overlays such as the health bar
2399	for (y = 0; y < sh; y++)	2478	for (y = 0; y < sh; y++)
2400	if (0 <= y + my && y + my < self->rows)	2479	if (0 <= y + my && y + my < self->rows)
2401	{	2480	{
…		…
2404	for (x = 0; x < sw; x++)	2483	for (x = 0; x < sw; x++)
2405	if (row->c0 <= x + mx && x + mx < row->c1)	2484	if (row->c0 <= x + mx && x + mx < row->c1)
2406	{	2485	{
2407	mapcell *cell = row->col + (x + mx - row->c0);	2486	mapcell *cell = row->col + (x + mx - row->c0);
2408		2487
2409	int px = x * T;	2488	int px = x * Tw;
2410	int py = y * T;	2489	int py = y * Th;
2411		2490
2412	if (expect_false (cell->player == player))	2491	if (ecb_expect_false (cell->player == player))
2413	{	2492	{
2414	px += sdx;	2493	px += sdx;
2415	py += sdy;	2494	py += sdy;
2416	}	2495	}
2417		2496
2418	if (cell->stat_hp)	2497	if (cell->stat_hp)
2419	{	2498	{
2420	int width = cell->stat_width * T;	2499	int width = cell->stat_width * Tw;
2421	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2500	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422		2501
2423	glColor3ub (0, 0, 0);	2502	glColor3ub (0, 0, 0);
2424	glRectf (px + 1, py - thick - 2,	2503	glRectf (px + 1, py - thick - 2,
2425	px + width - 1, py);	2504	px + width - 1, py);
2426		2505
…		…
2463	int x, y;	2542	int x, y;
2464		2543
2465	glEnable (GL_TEXTURE_2D);	2544	glEnable (GL_TEXTURE_2D);
2466	/* GL_REPLACE would be correct, as we don't need to modulate alpha,	2545	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467	* but the nvidia driver (185.18.14) mishandles alpha textures	2546	* but the nvidia driver (185.18.14) mishandles alpha textures
2468	* ansd takes the colour from god knows where instead of using	2547	* and takes the colour from god knows where instead of using
2469	* Cp. MODULATE results in the same colour, but slightly different	2548	* Cp. MODULATE results in the same colour, but slightly different
2470	* alpha, but atcually gives us the correct colour with nvidia.	2549	* alpha, but atcually gives us the correct colour with nvidia.
2471	*/	2550	*/
2472	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);	2551	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473	glEnable (GL_BLEND);	2552	glEnable (GL_BLEND);
…		…
2502	void	2581	void
2503	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2582	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504	PPCODE:	2583	PPCODE:
2505	{	2584	{
2506	int x, y;	2585	int x, y;
2507	int sw1 = sw + 2;	2586	int sw1 = sw + 2;
2508	int sh1 = sh + 2;	2587	int sh1 = sh + 2;
2509	int sh3 = sh * 3;	2588	int sh3 = sh * 3;
2510	int sw34 = (sw * 3 + 3) & ~3;	2589	int sw3 = sw * 3;
		2590	SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
		2591	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);	2592	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));	2593	memset (darkness1, 0, sw1*sh1);
2513	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514		2594
2515	SvPOK_only (darkness3_sv);	2595	SvPOK_only (darkness3_sv);
2516	SvCUR_set (darkness3_sv, sw34 * sh3);	2596	SvCUR_set (darkness3_sv, sw3 * sh3);
2517		2597
2518	mx += self->x - 1;	2598	mx += self->x - 1;
2519	my += self->y - 1;	2599	my += self->y - 1;
2520
2521	memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522		2600
2523	for (y = 0; y < sh1; y++)	2601	for (y = 0; y < sh1; y++)
2524	if (0 <= y + my && y + my < self->rows)	2602	if (0 <= y + my && y + my < self->rows)
2525	{	2603	{
2526	maprow *row = self->row + (y + my);	2604	maprow *row = self->row + (y + my);
…		…
2559		2637
2560	uint8_t r13 = (d13 + d23 + d12) / 3;	2638	uint8_t r13 = (d13 + d23 + d12) / 3;
2561	uint8_t r23 = d23;	2639	uint8_t r23 = d23;
2562	uint8_t r33 = (d23 + d33 + d32) / 3;	2640	uint8_t r33 = (d23 + d33 + d32) / 3;
2563		2641
2564	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2642	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2643	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2644	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2645	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2646	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2647	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2648	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2649	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2650	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573	}	2651	}
2574		2652
2575	free (darkness1);	2653	free (darkness1);
2576		2654
2577	EXTEND (SP, 3);	2655	EXTEND (SP, 3);
2578	PUSHs (sv_2mortal (newSViv (sw34)));	2656	PUSHs (sv_2mortal (newSViv (sw3)));
2579	PUSHs (sv_2mortal (newSViv (sh3)));	2657	PUSHs (sv_2mortal (newSViv (sh3)));
2580	PUSHs (darkness3_sv);	2658	PUSHs (darkness3_sv);
2581	}	2659	}
2582		2660
2583	SV *	2661	SV *
…		…
2646	else	2724	else
2647	*data++ = 0;	2725	*data++ = 0;
2648	}	2726	}
2649	}	2727	}
2650		2728
2651	/* if size is w*h + 5 then no data has been found */	2729	/* if size is w*h + 5 then no data has been found */
2652	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)	2730	if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2653	{	2731	{
2654	SvPOK_only (data_sv);	2732	SvPOK_only (data_sv);
2655	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2733	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2656	}	2734	}
2657		2735
2658	RETVAL = data_sv;	2736	RETVAL = data_sv;
2659	}	2737	}
2660	OUTPUT:	2738	OUTPUT:
2661	RETVAL	2739	RETVAL
2662		2740
2663	void	2741	void
…		…
2670	STRLEN len;	2748	STRLEN len;
2671	uint8_t *data, *end;	2749	uint8_t *data, *end;
2672		2750
2673	len = SvLEN (data_sv);	2751	len = SvLEN (data_sv);
2674	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2752	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2675	data = SvPVbyte_nolen (data_sv);	2753	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2676	end = data + len + 8;	2754	end = data + len + 8;
2677		2755
2678	if (len < 5)	2756	if (len < 5)
2679	XSRETURN_EMPTY;	2757	XSRETURN_EMPTY;
2680		2758
…		…
2741	}	2819	}
2742		2820
2743	MODULE = Deliantra::Client PACKAGE = DC::RW	2821	MODULE = Deliantra::Client PACKAGE = DC::RW
2744		2822
2745	DC::RW	2823	DC::RW
2746	new (SV *class, SV *data_sv)	2824	new (SV *klass, SV *data_sv)
2747	CODE:	2825	CODE:
2748	{	2826	{
2749	STRLEN datalen;	2827	STRLEN datalen;
2750	char *data = SvPVbyte (data_sv, datalen);	2828	char *data = SvPVbyte (data_sv, datalen);
2751		2829
…		…
2753	}	2831	}
2754	OUTPUT:	2832	OUTPUT:
2755	RETVAL	2833	RETVAL
2756		2834
2757	DC::RW	2835	DC::RW
2758	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")
2759	CODE:	2837	CODE:
2760	RETVAL = SDL_RWFromFile (path, mode);	2838	RETVAL = SDL_RWFromFile (path, mode);
2761	OUTPUT:	2839	OUTPUT:
2762	RETVAL	2840	RETVAL
2763		2841
…		…
2781	if (RETVAL < 0)	2859	if (RETVAL < 0)
2782	{	2860	{
2783	RETVAL = Mix_GroupOldest (-1);	2861	RETVAL = Mix_GroupOldest (-1);
2784		2862
2785	if (RETVAL < 0)	2863	if (RETVAL < 0)
		2864	{
		2865	// happens sometimes, maybe it just stopped playing(?)
		2866	RETVAL = Mix_GroupAvailable (-1);
		2867
		2868	if (RETVAL < 0)
2786	XSRETURN_UNDEF;	2869	XSRETURN_UNDEF;
2787		2870	}
		2871	else
2788	Mix_HaltChannel (RETVAL);	2872	Mix_HaltChannel (RETVAL);
2789	}	2873	}
2790		2874
2791	Mix_UnregisterAllEffects (RETVAL);	2875	Mix_UnregisterAllEffects (RETVAL);
2792	Mix_Volume (RETVAL, 128);	2876	Mix_Volume (RETVAL, 128);
2793	}	2877	}
…		…
2853		2937
2854	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2938	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855		2939
2856	PROTOTYPES: DISABLE	2940	PROTOTYPES: DISABLE
2857		2941
		2942	void
		2943	decoders ()
		2944	PPCODE:
		2945	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2946	int i, num = Mix_GetNumChunkDecoders ();
		2947	EXTEND (SP, num);
		2948	for (i = 0; i < num; ++i)
		2949	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2950	#else
		2951	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2952	#endif
		2953
2858	DC::MixChunk	2954	DC::MixChunk
2859	new (SV *class, DC::RW rwops)	2955	new (SV *klass, DC::RW rwops)
2860	CODE:	2956	CODE:
2861	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2957	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2862	OUTPUT:	2958	OUTPUT:
2863	RETVAL	2959	RETVAL
2864		2960
…		…
2894	OUTPUT:	2990	OUTPUT:
2895	RETVAL	2991	RETVAL
2896		2992
2897	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2993	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898		2994
		2995	void
		2996	decoders ()
		2997	PPCODE:
		2998	#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
		2999	int i, num = Mix_GetNumMusicDecoders ();
		3000	EXTEND (SP, num);
		3001	for (i = 0; i < num; ++i)
		3002	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3003	#else
		3004	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3005	#endif
		3006
2899	int	3007	int
2900	volume (int volume = -1)	3008	volume (int volume = -1)
2901	PROTOTYPE: ;$	3009	PROTOTYPE: ;$
2902	CODE:	3010	CODE:
2903	if (items > 0)	3011	if (items > 0)
…		…
2914	void	3022	void
2915	halt ()	3023	halt ()
2916	CODE:	3024	CODE:
2917	Mix_HaltMusic ();	3025	Mix_HaltMusic ();
2918		3026
		3027	int
		3028	playing ()
		3029	CODE:
		3030	RETVAL = Mix_PlayingMusic ();
		3031	OUTPUT:
		3032	RETVAL
		3033
2919	DC::MixMusic	3034	DC::MixMusic
2920	new (SV *class, DC::RW rwops)	3035	new (SV *klass, DC::RW rwops)
2921	CODE:	3036	CODE:
2922	RETVAL = Mix_LoadMUS_RW (rwops);	3037	RETVAL = Mix_LoadMUS_RW (rwops);
2923	OUTPUT:	3038	OUTPUT:
2924	RETVAL	3039	RETVAL
2925		3040
…		…
3062	const_iv (GL_FUNC_SUBTRACT),	3177	const_iv (GL_FUNC_SUBTRACT),
3063	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3178	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064	# undef const_iv	3179	# undef const_iv
3065	};	3180	};
3066		3181
3067	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3182	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3183	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069		3184
3070	texture_av = newAV ();	3185	texture_av = newAV ();
3071	AvREAL_off (texture_av);	3186	AvREAL_off (texture_av);
3072	}	3187	}
3073		3188
…		…
3078	gl.BlendFuncSeparateEXT = 0;	3193	gl.BlendFuncSeparateEXT = 0;
3079		3194
3080	void	3195	void
3081	apple_nvidia_bug (int enable)	3196	apple_nvidia_bug (int enable)
3082		3197
3083	char *	3198	const char *
3084	gl_vendor ()	3199	gl_vendor ()
3085	CODE:	3200	CODE:
3086	RETVAL = (char *)glGetString (GL_VENDOR);	3201	RETVAL = (const char *)glGetString (GL_VENDOR);
3087	OUTPUT:	3202	OUTPUT:
3088	RETVAL	3203	RETVAL
3089		3204
3090	char *	3205	const char *
3091	gl_version ()	3206	gl_version ()
3092	CODE:	3207	CODE:
3093	RETVAL = (char *)glGetString (GL_VERSION);	3208	RETVAL = (const char *)glGetString (GL_VERSION);
3094	OUTPUT:	3209	OUTPUT:
3095	RETVAL	3210	RETVAL
3096		3211
3097	char *	3212	const char *
3098	gl_extensions ()	3213	gl_extensions ()
3099	CODE:	3214	CODE:
3100	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3215	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3101	OUTPUT:	3216	OUTPUT:
3102	RETVAL	3217	RETVAL
3103		3218
3104	const char *glGetString (GLenum pname)	3219	const char *glGetString (GLenum pname)
		3220	CODE:
		3221	RETVAL = (const char *)glGetString (pname);
		3222	OUTPUT:
		3223	RETVAL
3105		3224
3106	GLint glGetInteger (GLenum pname)	3225	GLint glGetInteger (GLenum pname)
3107	CODE:	3226	CODE:
3108	glGetIntegerv (pname, &RETVAL);	3227	glGetIntegerv (pname, &RETVAL);
3109	OUTPUT:	3228	OUTPUT:
…		…
3116	RETVAL	3235	RETVAL
3117		3236
3118	int glGetError ()	3237	int glGetError ()
3119		3238
3120	void glFinish ()	3239	void glFinish ()
		3240
		3241	void glFlush ()
3121		3242
3122	void glClear (int mask)	3243	void glClear (int mask)
3123		3244
3124	void glClearColor (float r, float g, float b, float a = 1.0)	3245	void glClearColor (float r, float g, float b, float a = 1.0)
3125	PROTOTYPE: @	3246	PROTOTYPE: @
…		…
3297		3418
3298	void glEndList ()	3419	void glEndList ()
3299		3420
3300	void glCallList (int list)	3421	void glCallList (int list)
3301		3422
		3423	void c_init ()
		3424	CODE:
		3425	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3426	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
		3427
3302	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3428	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303		3429
3304	PROTOTYPES: DISABLE	3430	PROTOTYPES: DISABLE
3305		3431
3306	void	3432	void
3307	find_widget (SV *self, NV x, NV y)	3433	find_widget (SV *self, NV x, NV y)
3308	PPCODE:	3434	PPCODE:
3309	{	3435	{
3310	if (within_widget (self, x, y))	3436	if (within_widget (self, x, y))
3311	XPUSHs (self);	3437	XPUSHs (self);
3312	}	3438	}
3313		3439
3314	BOOT:	3440	BOOT:
3315	{	3441	{
…		…
3323		3449
3324	void	3450	void
3325	draw (SV *self)	3451	draw (SV *self)
3326	CODE:	3452	CODE:
3327	{	3453	{
3328	HV *hv;	3454	HV *hv;
3329	SV **svp;	3455	SV **svp;
3330	NV x, y, w, h;	3456	NV x, y, w, h;
3331	SV *draw_x_sv = GvSV (draw_x_gv);	3457	SV *draw_x_sv = GvSV (draw_x_gv);
3332	SV *draw_y_sv = GvSV (draw_y_gv);	3458	SV *draw_y_sv = GvSV (draw_y_gv);
3333	SV *draw_w_sv = GvSV (draw_w_gv);	3459	SV *draw_w_sv = GvSV (draw_w_gv);
3334	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