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

Diff Legend

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