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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
48	#endif	53	#endif
49		54
50	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
52		57
53	#include <glib/gmacros.h>	58	#include <glib.h>
54		59
55	#include <pango/pango.h>	60	#include <pango/pango.h>
56		61
57	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
71	# include <netinet/in.h>	76	# include <netinet/in.h>
72	# include <netinet/tcp.h>	77	# include <netinet/tcp.h>
73	# include <inttypes.h>	78	# include <inttypes.h>
74	#endif	79	#endif
75		80
76	#if __GNUC__ >= 4	81	#include "ecb.h"
77	# define expect(expr,value) __builtin_expect ((expr),(value))
78	#else
79	# define expect(expr,value) (expr)
80	#endif
81
82	#define expect_false(expr) expect ((expr) != 0, 0)
83	#define expect_true(expr) expect ((expr) != 0, 1)
84		82
85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	83	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
86		84
87	/* this is used as fow flag as well, so has to have a different value */	85	/* this is used as fow flag as well, so has to have a different value */
88	/* then anything that is computed by incoming darkness */	86	/* then anything that is computed by incoming darkness */
…		…
106	fast_sv_grow (SV *sv, STRLEN need)	104	fast_sv_grow (SV *sv, STRLEN need)
107	{	105	{
108	STRLEN len = SvLEN (sv);	106	STRLEN len = SvLEN (sv);
109	STRLEN want = SvCUR (sv) + need;	107	STRLEN want = SvCUR (sv) + need;
110		108
111	if (expect_false (len < want))	109	if (ecb_expect_false (len < want))
112	{	110	{
113	do	111	do
114	len *= 2;	112	len *= 2;
115	while (len < want);	113	while (len < want);
116		114
…		…
184	{	182	{
185	GSList *attrs = run->item->analysis.extra_attrs;	183	GSList *attrs = run->item->analysis.extra_attrs;
186		184
187	while (attrs)	185	while (attrs)
188	{	186	{
189	PangoAttribute *attr = attrs->data;	187	PangoAttribute attr = (PangoAttribute )attrs->data;
190		188
191	if (attr->klass->type == PANGO_ATTR_SHAPE)	189	if (attr->klass->type == PANGO_ATTR_SHAPE)
192	return 1;	190	return 1;
193		191
194	attrs = attrs->next;	192	attrs = attrs->next;
195	}	193	}
196		194
197	return 0;	195	return 0;
198	}	196	}
199		197
200	typedef struct cf_layout {	198	struct cf_layout {
201	PangoLayout *pl;	199	PangoLayout *pl;
202	float r, g, b, a; // default color for rgba mode	200	float r, g, b, a; // default color for rgba mode
203	int base_height;	201	int base_height;
204	DC__Font font;	202	DC__Font font;
205	rc_t *rc;	203	rc_t rc;
206	} *DC__Layout;	204	};
		205
		206	typedef cf_layout *DC__Layout;
207		207
208	static DC__Font default_font;	208	static DC__Font default_font;
209	static PangoContext *opengl_context;	209	static PangoContext *opengl_context;
210	static PangoFontMap *opengl_fontmap;	210	static PangoFontMap *opengl_fontmap;
211		211
212	static void	212	static void
213	substitute_func (FcPattern *pattern, gpointer data)	213	substitute_func (FcPattern *pattern, gpointer data)
214	{	214	{
215	FcPatternAddBool (pattern, FC_HINTING, 1);	215	FcPatternAddBool (pattern, FC_HINTING, 1);
216	#ifdef FC_HINT_STYLE	216	#ifdef FC_HINT_STYLE
217	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	217	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218	#endif	218	#endif
219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220	}	220	}
221		221
222	static void	222	static void
…		…
249		249
250	*w = rect.width;	250	*w = rect.width;
251	*h = rect.height;	251	*h = rect.height;
252	}	252	}
253		253
		254	/////////////////////////////////////////////////////////////////////////////
		255
254	typedef uint16_t tileid;	256	typedef uint16_t tileid;
255	typedef uint16_t faceid;	257	typedef uint16_t faceid;
256		258
257	typedef struct {	259	struct maptex
		260	{
258	GLuint name;	261	GLuint name;
259	int w, h;	262	int w, h;
260	float s, t;	263	float s, t;
261	uint8_t r, g, b, a;	264	uint8_t r, g, b, a;
262	tileid smoothtile;	265	tileid smoothtile;
263	uint8_t smoothlevel;	266	uint8_t smoothlevel;
264	uint8_t unused; /* set to zero on use */	267	uint8_t unused; /* set to zero on use */
265	} maptex;	268	};
266		269
267	typedef struct {	270	struct mapcell
		271	{
268	uint32_t player;	272	uint32_t player;
269	tileid tile[3];	273	tileid tile[3];
270	uint16_t darkness;	274	uint16_t darkness;
271	uint8_t stat_width, stat_hp, flags, smoothmax;	275	uint8_t stat_width, stat_hp, flags, smoothmax;
272	} mapcell;	276	};
273		277
274	typedef struct {	278	struct maprow
		279	{
275	int32_t c0, c1;	280	int32_t c0, c1;
276	mapcell *col;	281	mapcell *col;
277	} maprow;	282	};
278		283
279	typedef struct map {	284	struct mapgrid {
280	int x, y, w, h;	285	int x, y, w, h;
281	int ox, oy; /* offset to virtual global coordinate system */	286	int ox, oy; /* offset to virtual global coordinate system */
282	int faces; tileid *face2tile; // [faceid]	287	int faces; tileid *face2tile; // [faceid]
283	int texs; maptex *tex; // [tileid]	288	int texs; maptex *tex; // [tileid]
284		289
285	int32_t rows;	290	int32_t rows;
286	maprow *row;	291	maprow *row;
287	} *DC__Map;	292	};
288		293
289	static char *	294	typedef mapgrid *DC__Map;
		295
		296	template<typename T>
		297	static void
290	prepend (char *ptr, int sze, int inc)	298	prepend (T *&ptr, int sze, int inc)
291	{	299	{
292	char *p;	300	T *p;
293		301
294	New (0, p, sze + inc, char);	302	Newx (p, inc + sze, T);
295	Zero (p, inc, char);	303	Zero (p, inc, T);
296	Move (ptr, p + inc, sze, char);	304	Move (ptr, p + inc, sze, T);
297	Safefree (ptr);	305	Safefree (ptr);
298		306
299	return p;	307	ptr = p;
300	}	308	}
301		309
302	static char *	310	template<typename T>
303	append (char *ptr, int sze, int inc)
304	{
305	Renew (ptr, sze + inc, char);
306	Zero (ptr + sze, inc, char);
307
308	return ptr;
309	}
310
311	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313
314	static void	311	static void
		312	append (T *&ptr, int sze, int inc)
		313	{
		314	Renew (ptr, sze + inc, T);
		315	Zero (ptr + sze, inc, T);
		316	}
		317
		318	static void
315	need_facenum (struct map *self, faceid face)	319	need_facenum (struct mapgrid *self, faceid face)
316	{	320	{
317	while (self->faces <= face)	321	while (self->faces <= face)
318	{	322	{
319	Append (tileid, self->face2tile, self->faces, self->faces);	323	append (self->face2tile, self->faces, self->faces);
320	self->faces *= 2;	324	self->faces *= 2;
321	}	325	}
322	}	326	}
323		327
324	static void	328	static void
325	need_texid (struct map *self, int texid)	329	need_texid (struct mapgrid *self, int texid)
326	{	330	{
327	while (self->texs <= texid)	331	while (self->texs <= texid)
328	{	332	{
329	Append (maptex, self->tex, self->texs, self->texs);	333	append (self->tex, self->texs, self->texs);
330	self->texs *= 2;	334	self->texs *= 2;
331	}	335	}
332	}	336	}
333		337
334	static maprow *	338	static maprow *
335	map_get_row (DC__Map self, int y)	339	map_get_row (mapgrid *self, int y)
336	{	340	{
337	if (0 > y)	341	if (0 > y)
338	{	342	{
339	int extend = - y + MAP_EXTEND_Y;	343	int extend = - y + MAP_EXTEND_Y;
340	Prepend (maprow, self->row, self->rows, extend);	344	prepend (self->row, self->rows, extend);
341		345
342	self->rows += extend;	346	self->rows += extend;
343	self->y += extend;	347	self->y += extend;
344	y += extend;	348	y += extend;
345	}	349	}
346	else if (y >= self->rows)	350	else if (y >= self->rows)
347	{	351	{
348	int extend = y - self->rows + MAP_EXTEND_Y;	352	int extend = y - self->rows + MAP_EXTEND_Y;
349	Append (maprow, self->row, self->rows, extend);	353	append (self->row, self->rows, extend);
350	self->rows += extend;	354	self->rows += extend;
351	}	355	}
352		356
353	return self->row + y;	357	return self->row + y;
354	}	358	}
…		…
364	}	368	}
365		369
366	if (row->c0 > x)	370	if (row->c0 > x)
367	{	371	{
368	int extend = row->c0 - x + MAP_EXTEND_X;	372	int extend = row->c0 - x + MAP_EXTEND_X;
369	Prepend (mapcell, row->col, row->c1 - row->c0, extend);	373	prepend (row->col, row->c1 - row->c0, extend);
370	row->c0 -= extend;	374	row->c0 -= extend;
371	}	375	}
372	else if (x >= row->c1)	376	else if (x >= row->c1)
373	{	377	{
374	int extend = x - row->c1 + MAP_EXTEND_X;	378	int extend = x - row->c1 + MAP_EXTEND_X;
375	Append (mapcell, row->col, row->c1 - row->c0, extend);	379	append (row->col, row->c1 - row->c0, extend);
376	row->c1 += extend;	380	row->c1 += extend;
377	}	381	}
378		382
379	return row->col + (x - row->c0);	383	return row->col + (x - row->c0);
380	}	384	}
381		385
382	static mapcell *	386	static mapcell *
383	map_get_cell (DC__Map self, int x, int y)	387	map_get_cell (mapgrid *self, int x, int y)
384	{	388	{
385	return row_get_cell (map_get_row (self, y), x);	389	return row_get_cell (map_get_row (self, y), x);
386	}	390	}
387		391
388	static void	392	static void
389	map_clear (DC__Map self)	393	map_clear (mapgrid *self)
390	{	394	{
391	int r;	395	int r;
392		396
393	for (r = 0; r < self->rows; r++)	397	for (r = 0; r < self->rows; r++)
394	Safefree (self->row[r].col);	398	Safefree (self->row[r].col);
…		…
412	(cell)->flags = 0; \	416	(cell)->flags = 0; \
413	(cell)->player = 0; \	417	(cell)->player = 0; \
414	} while (0)	418	} while (0)
415		419
416	static void	420	static void
417	map_blank (DC__Map self, int x0, int y0, int w, int h)	421	map_blank (mapgrid *self, int x0, int y0, int w, int h)
418	{	422	{
419	int x, y;	423	int x, y;
420	maprow *row;	424	maprow *row;
421	mapcell *cell;	425	mapcell *cell;
422		426
…		…
439	CELL_CLEAR (cell);	443	CELL_CLEAR (cell);
440	}	444	}
441	}	445	}
442	}	446	}
443		447
444	typedef struct {	448	struct smooth_key
		449	{
445	tileid tile;	450	tileid tile;
446	uint8_t x, y, level;	451	uint8_t x, y, level;
447	} smooth_key;	452
		453	bool operator == (const smooth_key &o) const
		454	{
		455	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		456	}
		457	};
		458
		459	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		460
		461	namespace std {
		462	template <>
		463	struct hash<smooth_key>
		464	{
		465	size_t operator () (const smooth_key &v) const
		466	{
		467	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		468	}
		469	};
		470	}
448		471
449	static void	472	static void
450	smooth_or_bits (HV hv, smooth_key key, IV bits)	473	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451	{	474	{
452	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	475	auto &&it = h.find (key);
453		476
454	if (SvIOK (*sv))	477	if (it == h.end ())
455	SvIV_set (sv, SvIVX (sv) \| bits);	478	h.insert (std::make_pair (key, bits));
456	else	479	else
457	sv_setiv (*sv, bits);	480	it->second \|= bits;
458	}	481	}
459		482
460	static void	483	static void
461	music_finished (void)	484	music_finished (void)
462	{	485	{
…		…
481	ev.data2 = 0;	504	ev.data2 = 0;
482		505
483	SDL_PushEvent ((SDL_Event *)&ev);	506	SDL_PushEvent ((SDL_Event *)&ev);
484	}	507	}
485		508
		509	// approximately divide by 255
486	static unsigned int	510	static unsigned int
487	div255 (unsigned int n)	511	div255 (unsigned int n)
488	{	512	{
489	return (n + (n >> 8)) >> 8;	513	return (n + (n >> 8)) >> 8;
490	}	514	}
…		…
504	n \|= n >> 16;	528	n \|= n >> 16;
505		529
506	return n + 1;	530	return n + 1;
507	}	531	}
508		532
509	static unsigned int
510	popcount (unsigned int n)
511	{
512	n -= (n >> 1) & 0x55555555U;
513	n = ((n >> 2) & 0x33333333U) + (n & 0x33333333U);
514	n = ((n >> 4) + n) & 0x0f0f0f0fU;
515	n *= 0x01010101U;
516
517	return n >> 24;
518	}
519
520	/* SDL should provide this, really. */	533	/* SDL should provide this, really. */
521	#define SDLK_MODIFIER_MIN 300	534	#define SDLK_MODIFIER_MIN 300
522	#define SDLK_MODIFIER_MAX 314	535	#define SDLK_MODIFIER_MAX 314
523		536
524	/******************************************************************************/	537	/******************************************************************************/
…		…
577		590
578	return mod;	591	return mod;
579	}	592	}
580		593
581	static void	594	static void
582	deliantra_main ()	595	deliantra_main (SV *real_main)
583	{	596	{
584	char *argv[] = { 0 };	597	dSP;
585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);	598
		599	PUSHMARK (SP);
		600	call_sv (real_main, G_DISCARD \| G_VOID);
586	}	601	}
587		602
588	#ifdef __MACOSX__	603	#ifdef __MACOSX__
		604	static SV *real_main;
		605
589	/* to due surprising braindamage on the side of SDL design, we	606	/* to due surprising braindamage on the side of SDL design, we
590	* do some mind-boggling hack here: SDL requires a custom main()	607	* do some mind-boggling hack here: SDL requires a custom main()
591	* on OS X, so... we provide one and call the original main(), which,	608	* on OS X, so... we provide one and call the original main(), which,
592	* due to shared library magic, calls -lSDLmain's main, not perl's main,	609	* due to shared library magic, calls -lSDLmain's main, not perl's main,
593	* and which calls our main (== SDL_main) back.	610	* and which calls our main (== SDL_main) back.
594	*/	611	*/
595	extern C_LINKAGE int	612	extern C_LINKAGE int
596	main (int argc, char *argv[])	613	main (int argc, char *argv[])
597	{	614	{
598	deliantra_main ();	615	deliantra_main (real_main);
599	}	616	}
600		617
601	#undef main	618	#undef main
602		619
603	extern C_LINKAGE int main (int argc, char *argv[]);	620	extern C_LINKAGE int main (int argc, char *argv[]);
604		621
605	static void	622	static void
606	SDL_braino (void)	623	SDL_main_hack (SV *real_main_)
607	{	624	{
		625	real_main = real_main_;
		626
608	char *argv[] = { "deliantra client", 0 };	627	char *argv[] = { "deliantra client", 0 };
609	(main) (1, argv);	628	(main) (1, argv);
610	}	629	}
611	#else	630	#else
612	static void	631	static void
613	SDL_braino (void)	632	SDL_main_hack (SV *real_main)
614	{	633	{
615	deliantra_main ();	634	deliantra_main (real_main);
616	}	635	}
617	#endif	636	#endif
618		637
619	MODULE = Deliantra::Client PACKAGE = DC	638	MODULE = Deliantra::Client PACKAGE = DC
620		639
…		…
848	NV ceil (NV x)	867	NV ceil (NV x)
849		868
850	IV minpot (UV n)	869	IV minpot (UV n)
851		870
852	IV popcount (UV n)	871	IV popcount (UV n)
		872	CODE:
		873	RETVAL = ecb_popcount32 (n);
		874	OUTPUT:
		875	RETVAL
853		876
854	NV distance (NV dx, NV dy)	877	NV distance (NV dx, NV dy)
855	CODE:	878	CODE:
856	RETVAL = pow (dx * dx + dy * dy, 0.5);	879	RETVAL = pow (dx * dx + dy * dy, 0.5);
857	OUTPUT:	880	OUTPUT:
…		…
871	#endif	894	#endif
872	}	895	}
873		896
874	char *SDL_GetError ()	897	char *SDL_GetError ()
875		898
876	void SDL_braino ()	899	void SDL_main_hack (SV *real_main)
		900	PROTOTYPE: &
877		901
878	int SDL_Init (U32 flags)	902	int SDL_Init (U32 flags)
879		903
880	int SDL_InitSubSystem (U32 flags)	904	int SDL_InitSubSystem (U32 flags)
881		905
882	void SDL_QuitSubSystem (U32 flags)	906	void SDL_QuitSubSystem (U32 flags)
883		907
884	void SDL_Quit ()	908	void SDL_Quit ()
885		909
886	int SDL_GL_SetAttribute (int attr, int value)	910	int SDL_GL_SetAttribute (int attr, int value)
		911	C_ARGS: (SDL_GLattr)attr, value
887		912
888	int SDL_GL_GetAttribute (int attr)	913	int SDL_GL_GetAttribute (int attr)
889	CODE:	914	CODE:
890	if (SDL_GL_GetAttribute (attr, &RETVAL))	915	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891	XSRETURN_UNDEF;	916	XSRETURN_UNDEF;
892	OUTPUT:	917	OUTPUT:
893	RETVAL	918	RETVAL
894		919
895	void	920	void
…		…
950	);	975	);
951		976
952	if (RETVAL)	977	if (RETVAL)
953	{	978	{
954	av_clear (texture_av);	979	av_clear (texture_av);
955
956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	980	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958	#include "glfunc.h"	981	#include "glfunc.h"
959	#undef GL_FUNC	982	#undef GL_FUNC
960
961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	983	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	984	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963	}	985	}
964	}	986	}
965	OUTPUT:	987	OUTPUT:
966	RETVAL	988	RETVAL
967		989
968	void	990	void
		991	SDL_WM_SetCaption (const char title, const char icon)
		992
		993	void
969	SDL_GL_SwapBuffers ()	994	SDL_GL_SwapBuffers ()
970		995
971	char *	996	char *
972	SDL_GetKeyName (int sym)	997	SDL_GetKeyName (int sym)
		998	C_ARGS: (SDLKey)sym
973		999
974	int	1000	int
975	SDL_GetAppState ()	1001	SDL_GetAppState ()
976		1002
977	int	1003	int
…		…
1074	OUTPUT:	1100	OUTPUT:
1075	RETVAL	1101	RETVAL
1076		1102
1077	int	1103	int
1078	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1104	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1079	POSTCALL:	1105	POSTCALL:
1080	Mix_HookMusicFinished (music_finished);	1106	Mix_HookMusicFinished (music_finished);
1081	Mix_ChannelFinished (channel_finished);	1107	Mix_ChannelFinished (channel_finished);
1082		1108
1083	void	1109	void
1084	Mix_QuerySpec ()	1110	Mix_QuerySpec ()
…		…
1205		1231
1206	SDL_LockSurface (surface2);	1232	SDL_LockSurface (surface2);
1207	EXTEND (SP, 6);	1233	EXTEND (SP, 6);
1208	PUSHs (sv_2mortal (newSViv (surface2->w)));	1234	PUSHs (sv_2mortal (newSViv (surface2->w)));
1209	PUSHs (sv_2mortal (newSViv (surface2->h)));	1235	PUSHs (sv_2mortal (newSViv (surface2->h)));
1210	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1236	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1211	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1237	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1212	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1238	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1213	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1239	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1214	SDL_UnlockSurface (surface2);	1240	SDL_UnlockSurface (surface2);
1215		1241
…		…
1287	MODULE = Deliantra::Client PACKAGE = DC::Font	1313	MODULE = Deliantra::Client PACKAGE = DC::Font
1288		1314
1289	PROTOTYPES: DISABLE	1315	PROTOTYPES: DISABLE
1290		1316
1291	DC::Font	1317	DC::Font
1292	new_from_file (SV class, char path, int id = 0)	1318	new_from_file (SV klass, char path, int id = 0)
1293	CODE:	1319	CODE:
1294	{	1320	{
1295	int count;	1321	int count;
1296	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1322	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1297	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1323	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1326	PROTOTYPE:	1352	PROTOTYPE:
1327	CODE:	1353	CODE:
1328	tc_restore ();	1354	tc_restore ();
1329		1355
1330	DC::Layout	1356	DC::Layout
1331	new (SV *class)	1357	new (SV *klass)
1332	CODE:	1358	CODE:
1333	New (0, RETVAL, 1, struct cf_layout);	1359	RETVAL = new cf_layout;
1334		1360
1335	RETVAL->pl = pango_layout_new (opengl_context);	1361	RETVAL->pl = pango_layout_new (opengl_context);
1336	RETVAL->r = 1.;	1362	RETVAL->r = 1.;
1337	RETVAL->g = 1.;	1363	RETVAL->g = 1.;
1338	RETVAL->b = 1.;	1364	RETVAL->b = 1.;
1339	RETVAL->a = 1.;	1365	RETVAL->a = 1.;
1340	RETVAL->base_height = MIN_FONT_HEIGHT;	1366	RETVAL->base_height = MIN_FONT_HEIGHT;
1341	RETVAL->font = 0;	1367	RETVAL->font = 0;
1342	RETVAL->rc = rc_alloc ();
1343		1368
1344	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1369	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1345	layout_update_font (RETVAL);	1370	layout_update_font (RETVAL);
1346	OUTPUT:	1371	OUTPUT:
1347	RETVAL	1372	RETVAL
1348		1373
1349	void	1374	void
1350	DESTROY (DC::Layout self)	1375	DESTROY (DC::Layout self)
1351	CODE:	1376	CODE:
1352	g_object_unref (self->pl);	1377	g_object_unref (self->pl);
1353	rc_free (self->rc);
1354	Safefree (self);	1378	delete self;
1355		1379
1356	void	1380	void
1357	set_text (DC::Layout self, SV *text_)	1381	set_text (DC::Layout self, SV *text_)
1358	CODE:	1382	CODE:
1359	{	1383	{
…		…
1485		1509
1486	void	1510	void
1487	set_height (DC::Layout self, int base_height)	1511	set_height (DC::Layout self, int base_height)
1488	CODE:	1512	CODE:
1489	if (self->base_height != base_height)	1513	if (self->base_height != base_height)
1490	{	1514	{
1491	self->base_height = base_height;	1515	self->base_height = base_height;
1492	layout_update_font (self);	1516	layout_update_font (self);
1493	}	1517	}
1494		1518
1495	void	1519	void
…		…
1613	}	1637	}
1614		1638
1615	void	1639	void
1616	render (DC::Layout self, float x, float y, int flags = 0)	1640	render (DC::Layout self, float x, float y, int flags = 0)
1617	CODE:	1641	CODE:
1618	rc_clear (self->rc);	1642	self->rc.clear ();
1619	pango_opengl_render_layout_subpixel (	1643	pango_opengl_render_layout_subpixel (
1620	self->pl,	1644	self->pl,
1621	self->rc,	1645	&self->rc,
1622	x * PANGO_SCALE, y * PANGO_SCALE,	1646	x * PANGO_SCALE, y * PANGO_SCALE,
1623	self->r, self->g, self->b, self->a,	1647	self->r, self->g, self->b, self->a,
1624	flags	1648	flags
1625	);	1649	);
1626	// we assume that context_change actually clears/frees stuff	1650	// we assume that context_change actually clears/frees stuff
…		…
1637	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1661	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1638	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1662	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1639	glEnable (GL_ALPHA_TEST);	1663	glEnable (GL_ALPHA_TEST);
1640	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1664	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1641		1665
1642	rc_draw (self->rc);	1666	self->rc.draw ();
1643		1667
1644	glDisable (GL_ALPHA_TEST);	1668	glDisable (GL_ALPHA_TEST);
1645	glDisable (GL_BLEND);	1669	glDisable (GL_BLEND);
1646	glDisable (GL_TEXTURE_2D);	1670	glDisable (GL_TEXTURE_2D);
1647	}	1671	}
…		…
1859	MODULE = Deliantra::Client PACKAGE = DC::Map	1883	MODULE = Deliantra::Client PACKAGE = DC::Map
1860		1884
1861	PROTOTYPES: DISABLE	1885	PROTOTYPES: DISABLE
1862		1886
1863	DC::Map	1887	DC::Map
1864	new (SV *class)	1888	new (SV *klass)
1865	CODE:	1889	CODE:
1866	New (0, RETVAL, 1, struct map);	1890	New (0, RETVAL, 1, mapgrid);
1867	RETVAL->x = 0;	1891	RETVAL->x = 0;
1868	RETVAL->y = 0;	1892	RETVAL->y = 0;
1869	RETVAL->w = 0;	1893	RETVAL->w = 0;
1870	RETVAL->h = 0;	1894	RETVAL->h = 0;
1871	RETVAL->ox = 0;	1895	RETVAL->ox = 0;
…		…
1908		1932
1909	void	1933	void
1910	set_smooth (DC::Map self, int face, int smooth, int level)	1934	set_smooth (DC::Map self, int face, int smooth, int level)
1911	CODE:	1935	CODE:
1912	{	1936	{
1913	tileid texid;	1937	tileid texid;
1914	maptex *tex;	1938	maptex *tex;
1915		1939
1916	if (face < 0 \|\| face >= self->faces)	1940	if (face < 0 \|\| face >= self->faces)
1917	return;	1941	return;
1918		1942
1919	if (smooth < 0 \|\| smooth >= self->faces)	1943	if (smooth < 0 \|\| smooth >= self->faces)
1920	return;	1944	return;
1921		1945
1922	texid = self->face2tile [face];	1946	texid = self->face2tile [face];
1923		1947
1924	if (!texid)	1948	if (!texid)
1925	return;	1949	return;
1926		1950
1927	tex = self->tex + texid;	1951	tex = self->tex + texid;
…		…
1960	}	1984	}
1961		1985
1962	void	1986	void
1963	expire_textures (DC::Map self, int texid, int count)	1987	expire_textures (DC::Map self, int texid, int count)
1964	PPCODE:	1988	PPCODE:
1965	for (; texid < self->texs && count; ++texid, --count)	1989	for (; texid < self->texs && count; ++texid, --count)
1966	{	1990	{
1967	maptex *tex = self->tex + texid;	1991	maptex *tex = self->tex + texid;
1968		1992
1969	if (tex->name)	1993	if (tex->name)
1970	{	1994	{
…		…
2017	self->ox += dx; self->x += dx;	2041	self->ox += dx; self->x += dx;
2018	self->oy += dy; self->y += dy;	2042	self->oy += dy; self->y += dy;
2019		2043
2020	while (self->y < 0)	2044	while (self->y < 0)
2021	{	2045	{
2022	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	2046	prepend (self->row, self->rows, MAP_EXTEND_Y);
2023		2047
2024	self->rows += MAP_EXTEND_Y;	2048	self->rows += MAP_EXTEND_Y;
2025	self->y += MAP_EXTEND_Y;	2049	self->y += MAP_EXTEND_Y;
2026	}	2050	}
2027	}	2051	}
2028		2052
2029	SV *	2053	SV *
2030	map1a_update (DC::Map self, SV *data_, int extmap)	2054	map1a_update (DC::Map self, SV *data_)
2031	CODE:	2055	CODE:
2032	{	2056	{
2033	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2057	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2034	uint8_t data_end = (uint8_t )SvEND (data_);	2058	uint8_t data_end = (uint8_t )SvEND (data_);
2035	mapcell *cell;	2059	mapcell *cell;
…		…
2056		2080
2057	//TODO: don't trust server data to be in-range(!)	2081	//TODO: don't trust server data to be in-range(!)
2058		2082
2059	if (flags & 8)	2083	if (flags & 8)
2060	{	2084	{
		2085	uint8_t ext, cmd;
		2086
2061	if (extmap)	2087	do
2062	{	2088	{
2063	uint8_t ext, cmd;	2089	ext = *data++;
		2090	cmd = ext & 0x7f;
2064		2091
2065	do	2092	if (cmd < 4)
		2093	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2094	else if (cmd == 5) // health
2066	{	2095	{
2067	ext = *data++;
2068	cmd = ext & 0x7f;
2069
2070	if (cmd < 4)
2071	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2072	else if (cmd == 5) // health
2073	{
2074	cell->stat_width = 1;	2096	cell->stat_width = 1;
2075	cell->stat_hp = *data++;	2097	cell->stat_hp = *data++;
2076	}
2077	else if (cmd == 6) // monster width
2078	cell->stat_width = *data++ + 1;
2079	else if (cmd == 0x47)
2080	{
2081	if (*data == 1) cell->player = data [1];
2082	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2083	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2084	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2085
2086	data += *data + 1;
2087	}
2088	else if (cmd == 8) // cell flags
2089	cell->flags = *data++;
2090	else if (ext & 0x40) // unknown, multibyte => skip
2091	data += *data + 1;
2092	else
2093	data++;
2094	}	2098	}
2095	while (ext & 0x80);	2099	else if (cmd == 6) // monster width
		2100	cell->stat_width = *data++ + 1;
		2101	else if (cmd == 0x47)
		2102	{
		2103	if (*data == 1) cell->player = data [1];
		2104	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2105	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2106	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2107
		2108	data += *data + 1;
		2109	}
		2110	else if (cmd == 8) // cell flags
		2111	cell->flags = *data++;
		2112	else if (ext & 0x40) // unknown, multibyte => skip
		2113	data += *data + 1;
		2114	else
		2115	data++;
2096	}	2116	}
2097	else	2117	while (ext & 0x80);
2098	cell->darkness = *data++ + 1;
2099	}	2118	}
2100		2119
2101	for (z = 0; z <= 2; ++z)	2120	for (z = 0; z <= 2; ++z)
2102	if (flags & (4 >> z))	2121	if (flags & (4 >> z))
2103	{	2122	{
…		…
2177	\| (b << 16)	2196	\| (b << 16)
2178	\| (a << 24);	2197	\| (a << 24);
2179	}	2198	}
2180	}	2199	}
2181		2200
2182	RETVAL = map_sv;	2201	RETVAL = map_sv;
2183	}	2202	}
2184	OUTPUT:	2203	OUTPUT:
2185	RETVAL	2204	RETVAL
2186		2205
2187	void	2206	void
2188	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)	2207	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)
2189	CODE:	2208	CODE:
2190	{	2209	{
2191	int x, y, z;	2210	int x, y, z;
2192		2211
2193	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2194	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2195	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2212	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2196	smooth_key skey;
2197	int pl_x, pl_y;	2213	int pl_x, pl_y;
2198	maptex pl_tex;	2214	maptex pl_tex;
2199	rc_t *rc = rc_alloc ();	2215	rc_t rc;
2200	rc_t *rc_ov = rc_alloc ();	2216	rc_t rc_ov;
2201	rc_key_t key;	2217	rc_key_t key;
2202	rc_array_t *arr;	2218	rc_t::array_t *arr;
2203		2219
2204	pl_tex.name = 0;	2220	pl_tex.name = 0;
2205		2221
2206	// that's current max. sorry.	2222	// that's current max. sorry.
2207	if (sw > 255) sw = 255;	2223	if (sw > 255) sw = 255;
2208	if (sh > 255) sh = 255;	2224	if (sh > 255) sh = 255;
2209
2210	// clear key, in case of extra padding
2211	memset (&skey, 0, sizeof (skey));
2212		2225
2213	memset (&key, 0, sizeof (key));	2226	memset (&key, 0, sizeof (key));
2214	key.r = 255;	2227	key.r = 255;
2215	key.g = 255;	2228	key.g = 255;
2216	key.b = 255;	2229	key.b = 255;
…		…
2222	my += self->y;	2235	my += self->y;
2223		2236
2224	// first pass: determine smooth_max	2237	// first pass: determine smooth_max
2225	// rather ugly, if you ask me	2238	// rather ugly, if you ask me
2226	// could also be stored inside mapcell and updated on change	2239	// could also be stored inside mapcell and updated on change
2227	memset (smooth_max, 0, sizeof (smooth_max));	2240	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2228		2241
2229	for (y = 0; y < sh; y++)	2242	for (y = 0; y < sh; y++)
2230	if (0 <= y + my && y + my < self->rows)	2243	if (0 <= y + my && y + my < self->rows)
2231	{	2244	{
2232	maprow *row = self->row + (y + my);	2245	maprow *row = self->row + (y + my);
…		…
2247	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2260	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2248	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2261	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2249		2262
2250	for (z = 0; z <= 2; z++)	2263	for (z = 0; z <= 2; z++)
2251	{	2264	{
2252	memset (smooth_level, 0, sizeof (smooth_level));	2265	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2266	smooth_key skey;
		2267	smooth_hash smooth;
2253	key.texname = -1;	2268	key.texname = -1;
2254		2269
2255	for (y = 0; y < sh; y++)	2270	for (y = 0; y < sh; y++)
2256	if (0 <= y + my && y + my < self->rows)	2271	if (0 <= y + my && y + my < self->rows)
2257	{	2272	{
…		…
2274		2289
2275	if (!tex.name)	2290	if (!tex.name)
2276	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2291	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2277		2292
2278	key.texname = tex.name;	2293	key.texname = tex.name;
2279	arr = rc_array (rc, &key);	2294	arr = &rc.array (key);
2280	}	2295	}
2281		2296
2282	px = (x + 1) * Th - tex.w;	2297	px = (x + 1) * Th - tex.w;
2283	py = (y + 1) * Tw - tex.h;	2298	py = (y + 1) * Tw - tex.h;
2284		2299
2285	if (expect_false (cell->player == player) && expect_false (z == 2))	2300	if (ecb_expect_false (cell->player == player) && ecb_expect_false (z == 2))
2286	{	2301	{
2287	pl_x = px;	2302	pl_x = px;
2288	pl_y = py;	2303	pl_y = py;
2289	pl_tex = tex;	2304	pl_tex = tex;
2290	continue;	2305	continue;
2291	}	2306	}
2292		2307
2293	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2308	arr->t2f_v3f (0 , 0 , px , py , 0);
2294	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2309	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2295	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2310	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2296	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2311	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2297		2312
2298	// update smooth hash	2313	// update smooth hash
2299	if (tex.smoothtile)	2314	if (tex.smoothtile)
2300	{	2315	{
2301	skey.tile = tex.smoothtile;	2316	skey.tile = tex.smoothtile;
2302	skey.level = tex.smoothlevel;	2317	skey.level = tex.smoothlevel;
2303		2318
2304	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2319	smooth_level[tex.smoothlevel] = 1;
2305		2320
2306	// add bits to current tile and all neighbours. skey.x\|y is	2321	// add bits to current tile and all neighbours. skey.x\|y is
2307	// shifted +1\|+1 so we always stay positive.	2322	// shifted +1\|+1 so we always stay positive.
2308		2323
2309	// bits is ___n cccc CCCC bbbb	2324	// bits is ___n cccc CCCC bbbb
…		…
2317		2332
2318	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2333	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2319	// ·· ·· ·┏ ┓·	2334	// ·· ·· ·┏ ┓·
2320		2335
2321	// full tile	2336	// full tile
2322	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2337	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2323		2338
2324	// borders	2339	// borders
2325	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2340	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2326	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2341	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2327	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2342	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2328	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2343	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2329		2344
2330	// corners	2345	// corners
2331	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2346	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2332	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2347	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2333	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2348	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2334	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2349	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2335	}	2350	}
2336	}	2351	}
2337		2352
2338	if (expect_false (z == 2) && expect_false (cell->flags))	2353	if (ecb_expect_false (z == 2) && ecb_expect_false (cell->flags))
2339	{	2354	{
2340	// overlays such as the speech bubble, probably more to come	2355	// overlays such as the speech bubble, probably more to come
2341	if (cell->flags & 1)	2356	if (cell->flags & 1)
2342	{	2357	{
2343	rc_key_t key_ov = key;	2358	rc_key_t key_ov = key;
2344	maptex tex = self->tex [TEXID_SPEECH];	2359	maptex tex = self->tex[TEXID_SPEECH];
2345	rc_array_t *arr;
2346	int px = x * Tw + Tw * 2 / 32;	2360	int px = x * Tw + Tw * 2 / 32;
2347	int py = y * Th - Th * 6 / 32;	2361	int py = y * Th - Th * 6 / 32;
2348		2362
2349	key_ov.texname = tex.name;	2363	key_ov.texname = tex.name;
2350	arr = rc_array (rc_ov, &key_ov);	2364	rc_t::array_t &arr = rc_ov.array (key_ov);
2351		2365
2352	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2366	arr.t2f_v3f (0 , 0 , px , py , 0);
2353	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);	2367	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2354	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);	2368	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2355	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);	2369	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2356	}	2370	}
2357	}	2371	}
2358	}	2372	}
2359	}	2373	}
2360		2374
2361	rc_draw (rc);	2375	rc.draw ();
2362	rc_clear (rc);	2376	rc.clear ();
2363		2377
2364	// go through all smoothlevels, lowest to highest, then draw.	2378	// go through all smoothlevels, lowest to highest, then draw.
2365	// this is basically counting sort	2379	// this is basically counting sort
2366	{	2380	{
2367	int w, b;	2381	int w, b;
2368		2382
2369	glEnable (GL_TEXTURE_2D);	2383	glEnable (GL_TEXTURE_2D);
2370	glBegin (GL_QUADS);	2384	glBegin (GL_QUADS);
2371	for (w = 0; w < 256 / 32; ++w)	2385	for (int level = 0; level < smooth_level.size (); ++level)
		2386	if (smooth_level[level])
		2387	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2372	{	2388	{
2373	uint32_t smask = smooth_level [w];	2389	smooth_key &skey = it->first;
2374	if (smask)	2390	IV bits = it->second;
2375	for (b = 0; b < 32; ++b)	2391
2376	if (smask & (((uint32_t)1) << b))	2392	if (!(bits & 0x1000)
		2393	&& skey.level == level
		2394	&& level > smooth_max [skey.x][skey.y])
2377	{	2395	{
2378	int level = (w << 5) \| b;	2396	maptex tex = self->tex [skey.tile];
		2397	int px = (((int)skey.x) - 1) * Tw;
		2398	int py = (((int)skey.y) - 1) * Th;
		2399	int border = bits & 15;
		2400	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2401	float dx = tex.s * .0625f; // 16 images/row
		2402	float dy = tex.t * .5f ; // 2 images/column
		2403
2379	HE *he;	2404	if (tex.name)
2380
2381	hv_iterinit (smooth);
2382	while ((he = hv_iternext (smooth)))
2383	{	2405	{
2384	smooth_key skey = (smooth_key )HeKEY (he);	2406	// this time avoiding texture state changes
2385	IV bits = SvIVX (HeVAL (he));	2407	// save gobs of state changes.
2386		2408	if (key.texname != tex.name)
2387	if (!(bits & 0x1000)
2388	&& skey->level == level
2389	&& level > smooth_max [skey->x][skey->y])
2390	{	2409	{
2391	maptex tex = self->tex [skey->tile];
2392	int px = (((int)skey->x) - 1) * Tw;
2393	int py = (((int)skey->y) - 1) * Th;
2394	int border = bits & 15;
2395	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2396	float dx = tex.s * .0625f; // 16 images/row
2397	float dy = tex.t * .5f ; // 2 images/column
2398
2399	if (tex.name)
2400	{
2401	// this time avoiding texture state changes
2402	// save gobs of state changes.
2403	if (key.texname != tex.name)
2404	{
2405	self->tex [skey->tile].unused = 0;	2410	self->tex [skey.tile].unused = 0;
2406		2411
2407	glEnd ();	2412	glEnd ();
2408	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2413	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2409	glBegin (GL_QUADS);	2414	glBegin (GL_QUADS);
2410	}	2415	}
2411		2416
2412	if (border)	2417	if (border)
2413	{	2418	{
2414	float ox = border * dx;	2419	float ox = border * dx;
2415		2420
2416	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2421	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2417	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);	2422	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2418	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);	2423	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2419	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );	2424	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2420	}	2425	}
2421		2426
2422	if (corner)	2427	if (corner)
2423	{	2428	{
2424	float ox = corner * dx;	2429	float ox = corner * dx;
2425		2430
2426	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2431	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2427	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);	2432	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2428	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);	2433	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2429	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2430	}
2431	}
2432	}	2435	}
2433	}	2436	}
2434	}	2437	}
2435	}	2438	}
2436		2439
2437	glEnd ();	2440	glEnd ();
2438	glDisable (GL_TEXTURE_2D);	2441	glDisable (GL_TEXTURE_2D);
2439	key.texname = -1;	2442	key.texname = -1;
2440	}	2443	}
2441
2442	hv_clear (smooth);
2443	}	2444	}
2444		2445
2445	if (pl_tex.name)	2446	if (pl_tex.name)
2446	{	2447	{
2447	maptex tex = pl_tex;	2448	maptex tex = pl_tex;
2448	int px = pl_x + sdx;	2449	int px = pl_x + sdx;
2449	int py = pl_y + sdy;	2450	int py = pl_y + sdy;
2450		2451
2451	key.texname = tex.name;	2452	key.texname = tex.name;
2452	arr = rc_array (rc, &key);	2453	rc_t::array_t &arr = rc.array (key);
2453		2454
2454	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2455	arr.t2f_v3f (0 , 0 , px , py , 0);
2455	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2456	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2456	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2457	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2457	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2458	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2458		2459
2459	rc_draw (rc);	2460	rc.draw ();
2460	}	2461	}
2461		2462
2462	rc_draw (rc_ov);	2463	rc_ov.draw ();
2463	rc_clear (rc_ov);	2464	rc_ov.clear ();
2464		2465
2465	glDisable (GL_BLEND);	2466	glDisable (GL_BLEND);
2466	rc_free (rc);
2467	rc_free (rc_ov);
2468		2467
2469	// top layer: overlays such as the health bar	2468	// top layer: overlays such as the health bar
2470	for (y = 0; y < sh; y++)	2469	for (y = 0; y < sh; y++)
2471	if (0 <= y + my && y + my < self->rows)	2470	if (0 <= y + my && y + my < self->rows)
2472	{	2471	{
…		…
2478	mapcell *cell = row->col + (x + mx - row->c0);	2477	mapcell *cell = row->col + (x + mx - row->c0);
2479		2478
2480	int px = x * Tw;	2479	int px = x * Tw;
2481	int py = y * Th;	2480	int py = y * Th;
2482		2481
2483	if (expect_false (cell->player == player))	2482	if (ecb_expect_false (cell->player == player))
2484	{	2483	{
2485	px += sdx;	2484	px += sdx;
2486	py += sdy;	2485	py += sdy;
2487	}	2486	}
2488		2487
…		…
2716	else	2715	else
2717	*data++ = 0;	2716	*data++ = 0;
2718	}	2717	}
2719	}	2718	}
2720		2719
2721	/* if size is wh + 5 then no data has been found /	2720	/* if size is wh + 5 then no data has been found /
2722	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2721	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2723	{	2722	{
2724	SvPOK_only (data_sv);	2723	SvPOK_only (data_sv);
2725	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2724	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2726	}	2725	}
2727		2726
2728	RETVAL = data_sv;	2727	RETVAL = data_sv;
2729	}	2728	}
2730	OUTPUT:	2729	OUTPUT:
2731	RETVAL	2730	RETVAL
2732		2731
2733	void	2732	void
…		…
2740	STRLEN len;	2739	STRLEN len;
2741	uint8_t data, end;	2740	uint8_t data, end;
2742		2741
2743	len = SvLEN (data_sv);	2742	len = SvLEN (data_sv);
2744	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2743	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2745	data = SvPVbyte_nolen (data_sv);	2744	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2746	end = data + len + 8;	2745	end = data + len + 8;
2747		2746
2748	if (len < 5)	2747	if (len < 5)
2749	XSRETURN_EMPTY;	2748	XSRETURN_EMPTY;
2750		2749
…		…
2811	}	2810	}
2812		2811
2813	MODULE = Deliantra::Client PACKAGE = DC::RW	2812	MODULE = Deliantra::Client PACKAGE = DC::RW
2814		2813
2815	DC::RW	2814	DC::RW
2816	new (SV class, SV data_sv)	2815	new (SV klass, SV data_sv)
2817	CODE:	2816	CODE:
2818	{	2817	{
2819	STRLEN datalen;	2818	STRLEN datalen;
2820	char *data = SvPVbyte (data_sv, datalen);	2819	char *data = SvPVbyte (data_sv, datalen);
2821		2820
…		…
2823	}	2822	}
2824	OUTPUT:	2823	OUTPUT:
2825	RETVAL	2824	RETVAL
2826		2825
2827	DC::RW	2826	DC::RW
2828	new_from_file (SV class, const char path, const char *mode = "rb")	2827	new_from_file (SV klass, const char path, const char *mode = "rb")
2829	CODE:	2828	CODE:
2830	RETVAL = SDL_RWFromFile (path, mode);	2829	RETVAL = SDL_RWFromFile (path, mode);
2831	OUTPUT:	2830	OUTPUT:
2832	RETVAL	2831	RETVAL
2833		2832
…		…
2942	#else	2941	#else
2943	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2942	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944	#endif	2943	#endif
2945		2944
2946	DC::MixChunk	2945	DC::MixChunk
2947	new (SV *class, DC::RW rwops)	2946	new (SV *klass, DC::RW rwops)
2948	CODE:	2947	CODE:
2949	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2948	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2950	OUTPUT:	2949	OUTPUT:
2951	RETVAL	2950	RETVAL
2952		2951
…		…
3022	RETVAL = Mix_PlayingMusic ();	3021	RETVAL = Mix_PlayingMusic ();
3023	OUTPUT:	3022	OUTPUT:
3024	RETVAL	3023	RETVAL
3025		3024
3026	DC::MixMusic	3025	DC::MixMusic
3027	new (SV *class, DC::RW rwops)	3026	new (SV *klass, DC::RW rwops)
3028	CODE:	3027	CODE:
3029	RETVAL = Mix_LoadMUS_RW (rwops);	3028	RETVAL = Mix_LoadMUS_RW (rwops);
3030	OUTPUT:	3029	OUTPUT:
3031	RETVAL	3030	RETVAL
3032		3031
…		…
3185	gl.BlendFuncSeparateEXT = 0;	3184	gl.BlendFuncSeparateEXT = 0;
3186		3185
3187	void	3186	void
3188	apple_nvidia_bug (int enable)	3187	apple_nvidia_bug (int enable)
3189		3188
3190	char *	3189	const char *
3191	gl_vendor ()	3190	gl_vendor ()
3192	CODE:	3191	CODE:
3193	RETVAL = (char *)glGetString (GL_VENDOR);	3192	RETVAL = (const char *)glGetString (GL_VENDOR);
3194	OUTPUT:	3193	OUTPUT:
3195	RETVAL	3194	RETVAL
3196		3195
3197	char *	3196	const char *
3198	gl_version ()	3197	gl_version ()
3199	CODE:	3198	CODE:
3200	RETVAL = (char *)glGetString (GL_VERSION);	3199	RETVAL = (const char *)glGetString (GL_VERSION);
3201	OUTPUT:	3200	OUTPUT:
3202	RETVAL	3201	RETVAL
3203		3202
3204	char *	3203	const char *
3205	gl_extensions ()	3204	gl_extensions ()
3206	CODE:	3205	CODE:
3207	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3206	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3208	OUTPUT:	3207	OUTPUT:
3209	RETVAL	3208	RETVAL
3210		3209
3211	const char *glGetString (GLenum pname)	3210	const char *glGetString (GLenum pname)
		3211	CODE:
		3212	RETVAL = (const char *)glGetString (pname);
		3213	OUTPUT:
		3214	RETVAL
3212		3215
3213	GLint glGetInteger (GLenum pname)	3216	GLint glGetInteger (GLenum pname)
3214	CODE:	3217	CODE:
3215	glGetIntegerv (pname, &RETVAL);	3218	glGetIntegerv (pname, &RETVAL);
3216	OUTPUT:	3219	OUTPUT:
…		…
3419		3422
3420	void	3423	void
3421	find_widget (SV *self, NV x, NV y)	3424	find_widget (SV *self, NV x, NV y)
3422	PPCODE:	3425	PPCODE:
3423	{	3426	{
3424	if (within_widget (self, x, y))	3427	if (within_widget (self, x, y))
3425	XPUSHs (self);	3428	XPUSHs (self);
3426	}	3429	}
3427		3430
3428	BOOT:	3431	BOOT:
3429	{	3432	{
…		…
3437		3440
3438	void	3441	void
3439	draw (SV *self)	3442	draw (SV *self)
3440	CODE:	3443	CODE:
3441	{	3444	{
3442	HV *hv;	3445	HV *hv;
3443	SV **svp;	3446	SV **svp;
3444	NV x, y, w, h;	3447	NV x, y, w, h;
3445	SV *draw_x_sv = GvSV (draw_x_gv);	3448	SV *draw_x_sv = GvSV (draw_x_gv);
3446	SV *draw_y_sv = GvSV (draw_y_gv);	3449	SV *draw_y_sv = GvSV (draw_y_gv);
3447	SV *draw_w_sv = GvSV (draw_w_gv);	3450	SV *draw_w_sv = GvSV (draw_w_gv);
3448	SV *draw_h_sv = GvSV (draw_h_gv);	3451	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs. Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs.
Revision 1.331 by root, Mon Nov 19 00:10:34 2018 UTC