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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.300 by root, Thu Dec 24 10:47:45 2009 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 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
…		…
100	#define KMOD_LRAM 0x10000 // our extension	105	#define KMOD_LRAM 0x10000 // our extension
101		106
102	#define TEXID_SPEECH 1	107	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	108	#define TEXID_NOFACE 2
104		109
		110	static char *
		111	fast_sv_grow (SV *sv, STRLEN need)
		112	{
		113	STRLEN len = SvLEN (sv);
		114	STRLEN want = SvCUR (sv) + need;
		115
		116	if (expect_false (len < want))
		117	{
		118	do
		119	len *= 2;
		120	while (len < want);
		121
		122	sv_grow (sv, len);
		123	}
		124
		125	SvCUR_set (sv, want);
		126	return SvEND (sv) - need;
		127	}
		128
105	static AV *texture_av;	129	static AV *texture_av;
106		130
107	static struct	131	static struct
108	{	132	{
109	#define GL_FUNC(ptr,name) ptr name;	133	#define GL_FUNC(ptr,name) ptr name;
…		…
165	{	189	{
166	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
167		191
168	while (attrs)	192	while (attrs)
169	{	193	{
170	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
171		195
172	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
173	return 1;	197	return 1;
174		198
175	attrs = attrs->next;	199	attrs = attrs->next;
176	}	200	}
177		201
178	return 0;	202	return 0;
179	}	203	}
180		204
181	typedef struct cf_layout {	205	struct cf_layout {
182	PangoLayout *pl;	206	PangoLayout *pl;
183	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
184	int base_height;	208	int base_height;
185	DC__Font font;	209	DC__Font font;
186	rc_t *rc;	210	rc_t rc;
187	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
188		214
189	static DC__Font default_font;	215	static DC__Font default_font;
190	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
191	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
192		218
193	static void	219	static void
194	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
195	{	221	{
196	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
197	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
198	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199	#endif	225	#endif
200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201	}	227	}
202		228
203	static void	229	static void
…		…
233	}	259	}
234		260
235	typedef uint16_t tileid;	261	typedef uint16_t tileid;
236	typedef uint16_t faceid;	262	typedef uint16_t faceid;
237		263
238	typedef struct {	264	struct maptex
		265	{
239	GLuint name;	266	GLuint name;
240	int w, h;	267	int w, h;
241	float s, t;	268	float s, t;
242	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
243	tileid smoothtile;	270	tileid smoothtile;
244	uint8_t smoothlevel;	271	uint8_t smoothlevel;
245	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
246	} maptex;	273	};
247		274
248	typedef struct {	275	struct mapcell
		276	{
249	uint32_t player;	277	uint32_t player;
250	tileid tile[3];	278	tileid tile[3];
251	uint16_t darkness;	279	uint16_t darkness;
252	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
253	} mapcell;	281	};
254		282
255	typedef struct {	283	struct maprow
		284	{
256	int32_t c0, c1;	285	int32_t c0, c1;
257	mapcell *col;	286	mapcell *col;
258	} maprow;	287	};
259		288
260	typedef struct map {	289	struct mapgrid {
261	int x, y, w, h;	290	int x, y, w, h;
262	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
263	int faces; tileid *face2tile; // [faceid]	292	int faces; tileid *face2tile; // [faceid]
264	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
265		294
266	int32_t rows;	295	int32_t rows;
267	maprow *row;	296	maprow *row;
268	} *DC__Map;	297	};
		298
		299	typedef mapgrid *DC__Map;
269		300
270	static char *	301	static char *
271	prepend (char *ptr, int sze, int inc)	302	prepend (char *ptr, int sze, int inc)
272	{	303	{
273	char *p;	304	char *p;
…		…
291		322
292	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	323	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	324	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294		325
295	static void	326	static void
296	need_facenum (struct map *self, faceid face)	327	need_facenum (struct mapgrid *self, faceid face)
297	{	328	{
298	while (self->faces <= face)	329	while (self->faces <= face)
299	{	330	{
300	Append (tileid, self->face2tile, self->faces, self->faces);	331	Append (tileid, self->face2tile, self->faces, self->faces);
301	self->faces *= 2;	332	self->faces *= 2;
302	}	333	}
303	}	334	}
304		335
305	static void	336	static void
306	need_texid (struct map *self, int texid)	337	need_texid (struct mapgrid *self, int texid)
307	{	338	{
308	while (self->texs <= texid)	339	while (self->texs <= texid)
309	{	340	{
310	Append (maptex, self->tex, self->texs, self->texs);	341	Append (maptex, self->tex, self->texs, self->texs);
311	self->texs *= 2;	342	self->texs *= 2;
312	}	343	}
313	}	344	}
314		345
315	static maprow *	346	static maprow *
316	map_get_row (DC__Map self, int y)	347	map_get_row (mapgrid *self, int y)
317	{	348	{
318	if (0 > y)	349	if (0 > y)
319	{	350	{
320	int extend = - y + MAP_EXTEND_Y;	351	int extend = - y + MAP_EXTEND_Y;
321	Prepend (maprow, self->row, self->rows, extend);	352	Prepend (maprow, self->row, self->rows, extend);
…		…
359		390
360	return row->col + (x - row->c0);	391	return row->col + (x - row->c0);
361	}	392	}
362		393
363	static mapcell *	394	static mapcell *
364	map_get_cell (DC__Map self, int x, int y)	395	map_get_cell (mapgrid *self, int x, int y)
365	{	396	{
366	return row_get_cell (map_get_row (self, y), x);	397	return row_get_cell (map_get_row (self, y), x);
367	}	398	}
368		399
369	static void	400	static void
370	map_clear (DC__Map self)	401	map_clear (mapgrid *self)
371	{	402	{
372	int r;	403	int r;
373		404
374	for (r = 0; r < self->rows; r++)	405	for (r = 0; r < self->rows; r++)
375	Safefree (self->row[r].col);	406	Safefree (self->row[r].col);
…		…
393	(cell)->flags = 0; \	424	(cell)->flags = 0; \
394	(cell)->player = 0; \	425	(cell)->player = 0; \
395	} while (0)	426	} while (0)
396		427
397	static void	428	static void
398	map_blank (DC__Map self, int x0, int y0, int w, int h)	429	map_blank (mapgrid *self, int x0, int y0, int w, int h)
399	{	430	{
400	int x, y;	431	int x, y;
401	maprow *row;	432	maprow *row;
402	mapcell *cell;	433	mapcell *cell;
403		434
…		…
420	CELL_CLEAR (cell);	451	CELL_CLEAR (cell);
421	}	452	}
422	}	453	}
423	}	454	}
424		455
425	typedef struct {	456	struct smooth_key
		457	{
426	tileid tile;	458	tileid tile;
427	uint8_t x, y, level;	459	uint8_t x, y, level;
428	} smooth_key;	460
		461	bool operator == (const smooth_key &o) const
		462	{
		463	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		464	}
		465	};
		466
		467	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		468
		469	namespace std {
		470	template <>
		471	struct hash<smooth_key>
		472	{
		473	size_t operator () (const smooth_key &v) const
		474	{
		475	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		476	}
		477	};
		478	}
429		479
430	static void	480	static void
431	smooth_or_bits (HV hv, smooth_key key, IV bits)	481	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432	{	482	{
433	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	483	auto &&it = h.find (key);
434		484
435	if (SvIOK (*sv))	485	if (it == h.end ())
436	SvIV_set (sv, SvIVX (sv) \| bits);	486	h.insert (std::make_pair (key, bits));
437	else	487	else
438	sv_setiv (*sv, bits);	488	it->second \|= bits;
439	}	489	}
440		490
441	static void	491	static void
442	music_finished (void)	492	music_finished (void)
443	{	493	{
…		…
460	ev.code = 1;	510	ev.code = 1;
461	ev.data1 = (void *)(long)channel;	511	ev.data1 = (void *)(long)channel;
462	ev.data2 = 0;	512	ev.data2 = 0;
463		513
464	SDL_PushEvent ((SDL_Event *)&ev);	514	SDL_PushEvent ((SDL_Event *)&ev);
		515	}
		516
		517	// approximately divide by 255
		518	static unsigned int
		519	div255 (unsigned int n)
		520	{
		521	return (n + (n >> 8)) >> 8;
465	}	522	}
466		523
467	static unsigned int	524	static unsigned int
468	minpot (unsigned int n)	525	minpot (unsigned int n)
469	{	526	{
…		…
552		609
553	return mod;	610	return mod;
554	}	611	}
555		612
556	static void	613	static void
557	deliantra_main ()	614	deliantra_main (SV *real_main)
558	{	615	{
559	char *argv[] = { 0 };	616	dSP;
560	call_argv ("::main", G_DISCARD \| G_VOID, argv);	617
		618	PUSHMARK (SP);
		619	call_sv (real_main, G_DISCARD \| G_VOID);
561	}	620	}
562		621
563	#ifdef __MACOSX__	622	#ifdef __MACOSX__
		623	static SV *real_main;
		624
564	/* to due surprising braindamage on the side of SDL design, we	625	/* to due surprising braindamage on the side of SDL design, we
565	* do some mind-boggling hack here: SDL requires a custom main()	626	* do some mind-boggling hack here: SDL requires a custom main()
566	* on OS X, so... we provide one and call the original main(), which,	627	* on OS X, so... we provide one and call the original main(), which,
567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	628	* due to shared library magic, calls -lSDLmain's main, not perl's main,
568	* and which calls our main (== SDL_main) back.	629	* and which calls our main (== SDL_main) back.
569	*/	630	*/
570	extern C_LINKAGE int	631	extern C_LINKAGE int
571	main (int argc, char *argv[])	632	main (int argc, char *argv[])
572	{	633	{
573	deliantra_main ();	634	deliantra_main (real_main);
574	}	635	}
575		636
576	#undef main	637	#undef main
577		638
578	extern C_LINKAGE int main (int argc, char *argv[]);	639	extern C_LINKAGE int main (int argc, char *argv[]);
579		640
580	static void	641	static void
581	SDL_braino (void)	642	SDL_main_hack (SV *real_main_)
582	{	643	{
		644	real_main = real_main_;
		645
583	char *argv[] = { "deliantra client", 0 };	646	char *argv[] = { "deliantra client", 0 };
584	(main) (1, argv);	647	(main) (1, argv);
585	}	648	}
586	#else	649	#else
587	static void	650	static void
588	SDL_braino (void)	651	SDL_main_hack (SV *real_main)
589	{	652	{
590	deliantra_main ();	653	deliantra_main (real_main);
591	}	654	}
592	#endif	655	#endif
593		656
594	MODULE = Deliantra::Client PACKAGE = DC	657	MODULE = Deliantra::Client PACKAGE = DC
595		658
…		…
796		859
797	const_iv (FOW_DARKNESS)	860	const_iv (FOW_DARKNESS)
798	# undef const_iv	861	# undef const_iv
799	};	862	};
800		863
801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	864	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	865	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803		866
804	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	867	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	868	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806	}	869	}
807		870
…		…
846	#endif	909	#endif
847	}	910	}
848		911
849	char *SDL_GetError ()	912	char *SDL_GetError ()
850		913
851	void SDL_braino ()	914	void SDL_main_hack (SV *real_main)
		915	PROTOTYPE: &
852		916
853	int SDL_Init (U32 flags)	917	int SDL_Init (U32 flags)
854		918
855	int SDL_InitSubSystem (U32 flags)	919	int SDL_InitSubSystem (U32 flags)
856		920
857	void SDL_QuitSubSystem (U32 flags)	921	void SDL_QuitSubSystem (U32 flags)
858		922
859	void SDL_Quit ()	923	void SDL_Quit ()
860		924
861	int SDL_GL_SetAttribute (int attr, int value)	925	int SDL_GL_SetAttribute (int attr, int value)
		926	C_ARGS: (SDL_GLattr)attr, value
862		927
863	int SDL_GL_GetAttribute (int attr)	928	int SDL_GL_GetAttribute (int attr)
864	CODE:	929	CODE:
865	if (SDL_GL_GetAttribute (attr, &RETVAL))	930	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866	XSRETURN_UNDEF;	931	XSRETURN_UNDEF;
867	OUTPUT:	932	OUTPUT:
868	RETVAL	933	RETVAL
869		934
870	void	935	void
…		…
925	);	990	);
926		991
927	if (RETVAL)	992	if (RETVAL)
928	{	993	{
929	av_clear (texture_av);	994	av_clear (texture_av);
930
931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	995	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933	#include "glfunc.h"	996	#include "glfunc.h"
934	#undef GL_FUNC	997	#undef GL_FUNC
935
936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	998	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	999	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938	}	1000	}
939	}	1001	}
940	OUTPUT:	1002	OUTPUT:
941	RETVAL	1003	RETVAL
942		1004
943	void	1005	void
		1006	SDL_WM_SetCaption (const char title, const char icon)
		1007
		1008	void
944	SDL_GL_SwapBuffers ()	1009	SDL_GL_SwapBuffers ()
945		1010
946	char *	1011	char *
947	SDL_GetKeyName (int sym)	1012	SDL_GetKeyName (int sym)
		1013	C_ARGS: (SDLKey)sym
948		1014
949	int	1015	int
950	SDL_GetAppState ()	1016	SDL_GetAppState ()
951		1017
952	int	1018	int
953	SDL_GetModState ()	1019	SDL_GetModState ()
954		1020
		1021	int
		1022	SDL_WaitEvent ()
		1023	C_ARGS: 0
		1024
955	void	1025	void
		1026	SDL_PumpEvents ()
		1027
		1028	void
956	poll_events ()	1029	peep_events ()
957	PPCODE:	1030	PPCODE:
958	{	1031	{
959	SDL_Event ev;	1032	SDL_Event ev;
960		1033
961	SDL_PumpEvents ();	1034	SDL_PumpEvents ();
…		…
1027		1100
1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1101	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1029	}	1102	}
1030	}	1103	}
1031		1104
		1105	char *
		1106	SDL_AudioDriverName ()
		1107	CODE:
		1108	{
		1109	char buf [256];
		1110	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1111	XSRETURN_UNDEF;
		1112
		1113	RETVAL = buf;
		1114	}
		1115	OUTPUT:
		1116	RETVAL
		1117
1032	int	1118	int
1033	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1119	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1034	POSTCALL:	1120	POSTCALL:
1035	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1036	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1037		1123
1038	void	1124	void
1039	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1098	add_font (char *file)	1184	add_font (char *file)
1099	CODE:	1185	CODE:
1100	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1186	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1101	OUTPUT:	1187	OUTPUT:
1102	RETVAL	1188	RETVAL
		1189
		1190	void
		1191	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1192
		1193	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1194	void
		1195	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1103		1196
1104	void	1197	void
1105	load_image_inline (SV *image_)	1198	load_image_inline (SV *image_)
1106	ALIAS:	1199	ALIAS:
1107	load_image_file = 1	1200	load_image_file = 1
…		…
1153		1246
1154	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1155	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1156	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1157	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1158	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1159	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1252	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1160	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1161	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1162	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1163		1256
…		…
1235	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1236		1329
1237	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1238		1331
1239	DC::Font	1332	DC::Font
1240	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1241	CODE:	1334	CODE:
1242	{	1335	{
1243	int count;	1336	int count;
1244	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1245	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1274	PROTOTYPE:	1367	PROTOTYPE:
1275	CODE:	1368	CODE:
1276	tc_restore ();	1369	tc_restore ();
1277		1370
1278	DC::Layout	1371	DC::Layout
1279	new (SV *class)	1372	new (SV *klass)
1280	CODE:	1373	CODE:
1281	New (0, RETVAL, 1, struct cf_layout);	1374	RETVAL = new cf_layout;
1282		1375
1283	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1284	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
1285	RETVAL->g = 1.;	1378	RETVAL->g = 1.;
1286	RETVAL->b = 1.;	1379	RETVAL->b = 1.;
1287	RETVAL->a = 1.;	1380	RETVAL->a = 1.;
1288	RETVAL->base_height = MIN_FONT_HEIGHT;	1381	RETVAL->base_height = MIN_FONT_HEIGHT;
1289	RETVAL->font = 0;	1382	RETVAL->font = 0;
1290	RETVAL->rc = rc_alloc ();
1291		1383
1292	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1384	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1293	layout_update_font (RETVAL);	1385	layout_update_font (RETVAL);
1294	OUTPUT:	1386	OUTPUT:
1295	RETVAL	1387	RETVAL
1296		1388
1297	void	1389	void
1298	DESTROY (DC::Layout self)	1390	DESTROY (DC::Layout self)
1299	CODE:	1391	CODE:
1300	g_object_unref (self->pl);	1392	g_object_unref (self->pl);
1301	rc_free (self->rc);
1302	Safefree (self);	1393	delete self;
1303		1394
1304	void	1395	void
1305	set_text (DC::Layout self, SV *text_)	1396	set_text (DC::Layout self, SV *text_)
1306	CODE:	1397	CODE:
1307	{	1398	{
…		…
1433		1524
1434	void	1525	void
1435	set_height (DC::Layout self, int base_height)	1526	set_height (DC::Layout self, int base_height)
1436	CODE:	1527	CODE:
1437	if (self->base_height != base_height)	1528	if (self->base_height != base_height)
1438	{	1529	{
1439	self->base_height = base_height;	1530	self->base_height = base_height;
1440	layout_update_font (self);	1531	layout_update_font (self);
1441	}	1532	}
1442		1533
1443	void	1534	void
…		…
1561	}	1652	}
1562		1653
1563	void	1654	void
1564	render (DC::Layout self, float x, float y, int flags = 0)	1655	render (DC::Layout self, float x, float y, int flags = 0)
1565	CODE:	1656	CODE:
1566	rc_clear (self->rc);	1657	self->rc.clear ();
1567	pango_opengl_render_layout_subpixel (	1658	pango_opengl_render_layout_subpixel (
1568	self->pl,	1659	self->pl,
1569	self->rc,	1660	&self->rc,
1570	x * PANGO_SCALE, y * PANGO_SCALE,	1661	x * PANGO_SCALE, y * PANGO_SCALE,
1571	self->r, self->g, self->b, self->a,	1662	self->r, self->g, self->b, self->a,
1572	flags	1663	flags
1573	);	1664	);
1574	// we assume that context_change actually clears/frees stuff	1665	// we assume that context_change actually clears/frees stuff
…		…
1585	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1676	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1586	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1677	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1587	glEnable (GL_ALPHA_TEST);	1678	glEnable (GL_ALPHA_TEST);
1588	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1679	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1589		1680
1590	rc_draw (self->rc);	1681	self->rc.draw ();
1591		1682
1592	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1593	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1594	glDisable (GL_TEXTURE_2D);	1685	glDisable (GL_TEXTURE_2D);
1595	}	1686	}
…		…
1807	MODULE = Deliantra::Client PACKAGE = DC::Map	1898	MODULE = Deliantra::Client PACKAGE = DC::Map
1808		1899
1809	PROTOTYPES: DISABLE	1900	PROTOTYPES: DISABLE
1810		1901
1811	DC::Map	1902	DC::Map
1812	new (SV *class)	1903	new (SV *klass)
1813	CODE:	1904	CODE:
1814	New (0, RETVAL, 1, struct map);	1905	New (0, RETVAL, 1, mapgrid);
1815	RETVAL->x = 0;	1906	RETVAL->x = 0;
1816	RETVAL->y = 0;	1907	RETVAL->y = 0;
1817	RETVAL->w = 0;	1908	RETVAL->w = 0;
1818	RETVAL->h = 0;	1909	RETVAL->h = 0;
1819	RETVAL->ox = 0;	1910	RETVAL->ox = 0;
…		…
1856		1947
1857	void	1948	void
1858	set_smooth (DC::Map self, int face, int smooth, int level)	1949	set_smooth (DC::Map self, int face, int smooth, int level)
1859	CODE:	1950	CODE:
1860	{	1951	{
1861	tileid texid;	1952	tileid texid;
1862	maptex *tex;	1953	maptex *tex;
1863		1954
1864	if (face < 0 \|\| face >= self->faces)	1955	if (face < 0 \|\| face >= self->faces)
1865	return;	1956	return;
1866		1957
1867	if (smooth < 0 \|\| smooth >= self->faces)	1958	if (smooth < 0 \|\| smooth >= self->faces)
1868	return;	1959	return;
1869		1960
1870	texid = self->face2tile [face];	1961	texid = self->face2tile [face];
1871		1962
1872	if (!texid)	1963	if (!texid)
1873	return;	1964	return;
1874		1965
1875	tex = self->tex + texid;	1966	tex = self->tex + texid;
…		…
1908	}	1999	}
1909		2000
1910	void	2001	void
1911	expire_textures (DC::Map self, int texid, int count)	2002	expire_textures (DC::Map self, int texid, int count)
1912	PPCODE:	2003	PPCODE:
1913	for (; texid < self->texs && count; ++texid, --count)	2004	for (; texid < self->texs && count; ++texid, --count)
1914	{	2005	{
1915	maptex *tex = self->tex + texid;	2006	maptex *tex = self->tex + texid;
1916		2007
1917	if (tex->name)	2008	if (tex->name)
1918	{	2009	{
…		…
1973	self->y += MAP_EXTEND_Y;	2064	self->y += MAP_EXTEND_Y;
1974	}	2065	}
1975	}	2066	}
1976		2067
1977	SV *	2068	SV *
1978	map1a_update (DC::Map self, SV *data_, int extmap)	2069	map1a_update (DC::Map self, SV *data_)
1979	CODE:	2070	CODE:
1980	{	2071	{
1981	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2072	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1982	uint8_t data_end = (uint8_t )SvEND (data_);	2073	uint8_t data_end = (uint8_t )SvEND (data_);
1983	mapcell *cell;	2074	mapcell *cell;
…		…
2004		2095
2005	//TODO: don't trust server data to be in-range(!)	2096	//TODO: don't trust server data to be in-range(!)
2006		2097
2007	if (flags & 8)	2098	if (flags & 8)
2008	{	2099	{
		2100	uint8_t ext, cmd;
		2101
2009	if (extmap)	2102	do
2010	{	2103	{
2011	uint8_t ext, cmd;	2104	ext = *data++;
		2105	cmd = ext & 0x7f;
2012		2106
2013	do	2107	if (cmd < 4)
		2108	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2109	else if (cmd == 5) // health
2014	{	2110	{
2015	ext = *data++;
2016	cmd = ext & 0x7f;
2017
2018	if (cmd < 4)
2019	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2020	else if (cmd == 5) // health
2021	{
2022	cell->stat_width = 1;	2111	cell->stat_width = 1;
2023	cell->stat_hp = *data++;	2112	cell->stat_hp = *data++;
2024	}
2025	else if (cmd == 6) // monster width
2026	cell->stat_width = *data++ + 1;
2027	else if (cmd == 0x47)
2028	{
2029	if (*data == 1) cell->player = data [1];
2030	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2031	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2032	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2033
2034	data += *data + 1;
2035	}
2036	else if (cmd == 8) // cell flags
2037	cell->flags = *data++;
2038	else if (ext & 0x40) // unknown, multibyte => skip
2039	data += *data + 1;
2040	else
2041	data++;
2042	}	2113	}
2043	while (ext & 0x80);	2114	else if (cmd == 6) // monster width
		2115	cell->stat_width = *data++ + 1;
		2116	else if (cmd == 0x47)
		2117	{
		2118	if (*data == 1) cell->player = data [1];
		2119	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2120	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2121	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2122
		2123	data += *data + 1;
		2124	}
		2125	else if (cmd == 8) // cell flags
		2126	cell->flags = *data++;
		2127	else if (ext & 0x40) // unknown, multibyte => skip
		2128	data += *data + 1;
		2129	else
		2130	data++;
2044	}	2131	}
2045	else	2132	while (ext & 0x80);
2046	cell->darkness = *data++ + 1;
2047	}	2133	}
2048		2134
2049	for (z = 0; z <= 2; ++z)	2135	for (z = 0; z <= 2; ++z)
2050	if (flags & (4 >> z))	2136	if (flags & (4 >> z))
2051	{	2137	{
…		…
2099	? self->row + y	2185	? self->row + y
2100	: 0;	2186	: 0;
2101		2187
2102	for (x = x0; x < x1; x++)	2188	for (x = x0; x < x1; x++)
2103	{	2189	{
2104	int r = 32, g = 32, b = 32, a = 192;	2190	unsigned int r = 32, g = 32, b = 32, a = 192;
2105		2191
2106	if (row && row->c0 <= x && x < row->c1)	2192	if (row && row->c0 <= x && x < row->c1)
2107	{	2193	{
2108	mapcell *cell = row->col + (x - row->c0);	2194	mapcell *cell = row->col + (x - row->c0);
2109		2195
…		…
2111	{	2197	{
2112	maptex tex = self->tex [cell->tile [z]];	2198	maptex tex = self->tex [cell->tile [z]];
2113	int a0 = 255 - tex.a;	2199	int a0 = 255 - tex.a;
2114	int a1 = tex.a;	2200	int a1 = tex.a;
2115		2201
2116	r = (r * a0 + tex.r * a1) / 255;	2202	r = div255 (r * a0 + tex.r * a1);
2117	g = (g * a0 + tex.g * a1) / 255;	2203	g = div255 (g * a0 + tex.g * a1);
2118	b = (b * a0 + tex.b * a1) / 255;	2204	b = div255 (b * a0 + tex.b * a1);
2119	a = (a * a0 + tex.a * a1) / 255;	2205	a = div255 (a * a0 + tex.a * a1);
2120	}	2206	}
2121	}	2207	}
2122		2208
2123	*map++ = (r )	2209	*map++ = (r )
2124	\| (g << 8)	2210	\| (g << 8)
2125	\| (b << 16)	2211	\| (b << 16)
2126	\| (a << 24);	2212	\| (a << 24);
2127	}	2213	}
2128	}	2214	}
2129		2215
2130	RETVAL = map_sv;	2216	RETVAL = map_sv;
2131	}	2217	}
2132	OUTPUT:	2218	OUTPUT:
2133	RETVAL	2219	RETVAL
2134		2220
2135	void	2221	void
2136	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2222	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)
2137	CODE:	2223	CODE:
2138	{	2224	{
2139	int x, y, z;	2225	int x, y, z;
2140		2226
2141	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2142	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2143	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2227	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2144	smooth_key skey;
2145	int pl_x, pl_y;	2228	int pl_x, pl_y;
2146	maptex pl_tex;	2229	maptex pl_tex;
2147	rc_t *rc = rc_alloc ();	2230	rc_t rc;
2148	rc_t *rc_ov = rc_alloc ();	2231	rc_t rc_ov;
2149	rc_key_t key;	2232	rc_key_t key;
2150	rc_array_t *arr;	2233	rc_t::array_t *arr;
2151		2234
2152	pl_tex.name = 0;	2235	pl_tex.name = 0;
2153		2236
2154	// that's current max. sorry.	2237	// that's current max. sorry.
2155	if (sw > 255) sw = 255;	2238	if (sw > 255) sw = 255;
2156	if (sh > 255) sh = 255;	2239	if (sh > 255) sh = 255;
2157
2158	// clear key, in case of extra padding
2159	memset (&skey, 0, sizeof (skey));
2160		2240
2161	memset (&key, 0, sizeof (key));	2241	memset (&key, 0, sizeof (key));
2162	key.r = 255;	2242	key.r = 255;
2163	key.g = 255;	2243	key.g = 255;
2164	key.b = 255;	2244	key.b = 255;
…		…
2170	my += self->y;	2250	my += self->y;
2171		2251
2172	// first pass: determine smooth_max	2252	// first pass: determine smooth_max
2173	// rather ugly, if you ask me	2253	// rather ugly, if you ask me
2174	// could also be stored inside mapcell and updated on change	2254	// could also be stored inside mapcell and updated on change
2175	memset (smooth_max, 0, sizeof (smooth_max));	2255	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2176		2256
2177	for (y = 0; y < sh; y++)	2257	for (y = 0; y < sh; y++)
2178	if (0 <= y + my && y + my < self->rows)	2258	if (0 <= y + my && y + my < self->rows)
2179	{	2259	{
2180	maprow *row = self->row + (y + my);	2260	maprow *row = self->row + (y + my);
…		…
2195	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2275	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2196	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2276	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2197		2277
2198	for (z = 0; z <= 2; z++)	2278	for (z = 0; z <= 2; z++)
2199	{	2279	{
2200	memset (smooth_level, 0, sizeof (smooth_level));	2280	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2281	smooth_key skey;
		2282	smooth_hash smooth;
2201	key.texname = -1;	2283	key.texname = -1;
2202		2284
2203	for (y = 0; y < sh; y++)	2285	for (y = 0; y < sh; y++)
2204	if (0 <= y + my && y + my < self->rows)	2286	if (0 <= y + my && y + my < self->rows)
2205	{	2287	{
…		…
2222		2304
2223	if (!tex.name)	2305	if (!tex.name)
2224	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2306	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2225		2307
2226	key.texname = tex.name;	2308	key.texname = tex.name;
2227	arr = rc_array (rc, &key);	2309	arr = &rc.array (key);
2228	}	2310	}
2229		2311
2230	px = (x + 1) * T - tex.w;	2312	px = (x + 1) * Th - tex.w;
2231	py = (y + 1) * T - tex.h;	2313	py = (y + 1) * Tw - tex.h;
2232		2314
2233	if (expect_false (cell->player == player) && expect_false (z == 2))	2315	if (expect_false (cell->player == player) && expect_false (z == 2))
2234	{	2316	{
2235	pl_x = px;	2317	pl_x = px;
2236	pl_y = py;	2318	pl_y = py;
2237	pl_tex = tex;	2319	pl_tex = tex;
2238	continue;	2320	continue;
2239	}	2321	}
2240		2322
2241	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2323	arr->t2f_v3f (0 , 0 , px , py , 0);
2242	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2324	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2243	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2325	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2244	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2326	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2245		2327
2246	// update smooth hash	2328	// update smooth hash
2247	if (tex.smoothtile)	2329	if (tex.smoothtile)
2248	{	2330	{
2249	skey.tile = tex.smoothtile;	2331	skey.tile = tex.smoothtile;
2250	skey.level = tex.smoothlevel;	2332	skey.level = tex.smoothlevel;
2251		2333
2252	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2334	smooth_level[tex.smoothlevel] = 1;
2253		2335
2254	// add bits to current tile and all neighbours. skey.x\|y is	2336	// add bits to current tile and all neighbours. skey.x\|y is
2255	// shifted +1\|+1 so we always stay positive.	2337	// shifted +1\|+1 so we always stay positive.
2256		2338
2257	// bits is ___n cccc CCCC bbbb	2339	// bits is ___n cccc CCCC bbbb
…		…
2265		2347
2266	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2348	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2267	// ·· ·· ·┏ ┓·	2349	// ·· ·· ·┏ ┓·
2268		2350
2269	// full tile	2351	// full tile
2270	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2352	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2271		2353
2272	// borders	2354	// borders
2273	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2355	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2274	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2356	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2275	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2357	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2276	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2358	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2277		2359
2278	// corners	2360	// corners
2279	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2361	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2280	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2362	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2281	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2363	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2282	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2364	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2283	}	2365	}
2284	}	2366	}
2285		2367
2286	if (expect_false (z == 2) && expect_false (cell->flags))	2368	if (expect_false (z == 2) && expect_false (cell->flags))
2287	{	2369	{
2288	// overlays such as the speech bubble, probably more to come	2370	// overlays such as the speech bubble, probably more to come
2289	if (cell->flags & 1)	2371	if (cell->flags & 1)
2290	{	2372	{
2291	rc_key_t key_ov = key;	2373	rc_key_t key_ov = key;
2292	maptex tex = self->tex [TEXID_SPEECH];	2374	maptex tex = self->tex[TEXID_SPEECH];
2293	rc_array_t *arr;
2294	int px = x * T + T * 2 / 32;	2375	int px = x * Tw + Tw * 2 / 32;
2295	int py = y * T - T * 6 / 32;	2376	int py = y * Th - Th * 6 / 32;
2296		2377
2297	key_ov.texname = tex.name;	2378	key_ov.texname = tex.name;
2298	arr = rc_array (rc_ov, &key_ov);	2379	rc_t::array_t &arr = rc_ov.array (key_ov);
2299		2380
2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2381	arr.t2f_v3f (0 , 0 , px , py , 0);
2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2382	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2302	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2383	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2303	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2384	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2304	}	2385	}
2305	}	2386	}
2306	}	2387	}
2307	}	2388	}
2308		2389
2309	rc_draw (rc);	2390	rc.draw ();
2310	rc_clear (rc);	2391	rc.clear ();
2311		2392
2312	// go through all smoothlevels, lowest to highest, then draw.	2393	// go through all smoothlevels, lowest to highest, then draw.
2313	// this is basically counting sort	2394	// this is basically counting sort
2314	{	2395	{
2315	int w, b;	2396	int w, b;
2316		2397
2317	glEnable (GL_TEXTURE_2D);	2398	glEnable (GL_TEXTURE_2D);
2318	glBegin (GL_QUADS);	2399	glBegin (GL_QUADS);
2319	for (w = 0; w < 256 / 32; ++w)	2400	for (int level = 0; level < smooth_level.size (); ++level)
		2401	if (smooth_level[level])
		2402	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2320	{	2403	{
2321	uint32_t smask = smooth_level [w];	2404	smooth_key &skey = it->first;
2322	if (smask)	2405	IV bits = it->second;
2323	for (b = 0; b < 32; ++b)	2406
2324	if (smask & (((uint32_t)1) << b))	2407	if (!(bits & 0x1000)
		2408	&& skey.level == level
		2409	&& level > smooth_max [skey.x][skey.y])
2325	{	2410	{
2326	int level = (w << 5) \| b;	2411	maptex tex = self->tex [skey.tile];
		2412	int px = (((int)skey.x) - 1) * Tw;
		2413	int py = (((int)skey.y) - 1) * Th;
		2414	int border = bits & 15;
		2415	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2416	float dx = tex.s * .0625f; // 16 images/row
		2417	float dy = tex.t * .5f ; // 2 images/column
		2418
2327	HE *he;	2419	if (tex.name)
2328
2329	hv_iterinit (smooth);
2330	while ((he = hv_iternext (smooth)))
2331	{	2420	{
2332	smooth_key skey = (smooth_key )HeKEY (he);	2421	// this time avoiding texture state changes
2333	IV bits = SvIVX (HeVAL (he));	2422	// save gobs of state changes.
2334		2423	if (key.texname != tex.name)
2335	if (!(bits & 0x1000)
2336	&& skey->level == level
2337	&& level > smooth_max [skey->x][skey->y])
2338	{	2424	{
2339	maptex tex = self->tex [skey->tile];
2340	int px = (((int)skey->x) - 1) * T;
2341	int py = (((int)skey->y) - 1) * T;
2342	int border = bits & 15;
2343	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2344	float dx = tex.s * .0625f; // 16 images/row
2345	float dy = tex.t * .5f ; // 2 images/column
2346
2347	if (tex.name)
2348	{
2349	// this time avoiding texture state changes
2350	// save gobs of state changes.
2351	if (key.texname != tex.name)
2352	{
2353	self->tex [skey->tile].unused = 0;	2425	self->tex [skey.tile].unused = 0;
2354		2426
2355	glEnd ();	2427	glEnd ();
2356	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2428	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2357	glBegin (GL_QUADS);	2429	glBegin (GL_QUADS);
2358	}	2430	}
2359		2431
2360	if (border)	2432	if (border)
2361	{	2433	{
2362	float ox = border * dx;	2434	float ox = border * dx;
2363		2435
2364	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2436	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2365	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2437	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2366	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2438	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2367	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2439	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2368	}	2440	}
2369		2441
2370	if (corner)	2442	if (corner)
2371	{	2443	{
2372	float ox = corner * dx;	2444	float ox = corner * dx;
2373		2445
2374	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2446	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2375	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2447	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2376	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2448	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2377	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2449	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2378	}
2379	}
2380	}	2450	}
2381	}	2451	}
2382	}	2452	}
2383	}	2453	}
2384		2454
2385	glEnd ();	2455	glEnd ();
2386	glDisable (GL_TEXTURE_2D);	2456	glDisable (GL_TEXTURE_2D);
2387	key.texname = -1;	2457	key.texname = -1;
2388	}	2458	}
2389
2390	hv_clear (smooth);
2391	}	2459	}
2392		2460
2393	if (pl_tex.name)	2461	if (pl_tex.name)
2394	{	2462	{
2395	maptex tex = pl_tex;	2463	maptex tex = pl_tex;
2396	int px = pl_x + sdx;	2464	int px = pl_x + sdx;
2397	int py = pl_y + sdy;	2465	int py = pl_y + sdy;
2398		2466
2399	key.texname = tex.name;	2467	key.texname = tex.name;
2400	arr = rc_array (rc, &key);	2468	rc_t::array_t &arr = rc.array (key);
2401		2469
2402	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2470	arr.t2f_v3f (0 , 0 , px , py , 0);
2403	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2471	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2404	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2472	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2405	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2473	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2406		2474
2407	rc_draw (rc);	2475	rc.draw ();
2408	}	2476	}
2409		2477
2410	rc_draw (rc_ov);	2478	rc_ov.draw ();
2411	rc_clear (rc_ov);	2479	rc_ov.clear ();
2412		2480
2413	glDisable (GL_BLEND);	2481	glDisable (GL_BLEND);
2414	rc_free (rc);
2415	rc_free (rc_ov);
2416		2482
2417	// top layer: overlays such as the health bar	2483	// top layer: overlays such as the health bar
2418	for (y = 0; y < sh; y++)	2484	for (y = 0; y < sh; y++)
2419	if (0 <= y + my && y + my < self->rows)	2485	if (0 <= y + my && y + my < self->rows)
2420	{	2486	{
…		…
2423	for (x = 0; x < sw; x++)	2489	for (x = 0; x < sw; x++)
2424	if (row->c0 <= x + mx && x + mx < row->c1)	2490	if (row->c0 <= x + mx && x + mx < row->c1)
2425	{	2491	{
2426	mapcell *cell = row->col + (x + mx - row->c0);	2492	mapcell *cell = row->col + (x + mx - row->c0);
2427		2493
2428	int px = x * T;	2494	int px = x * Tw;
2429	int py = y * T;	2495	int py = y * Th;
2430		2496
2431	if (expect_false (cell->player == player))	2497	if (expect_false (cell->player == player))
2432	{	2498	{
2433	px += sdx;	2499	px += sdx;
2434	py += sdy;	2500	py += sdy;
2435	}	2501	}
2436		2502
2437	if (cell->stat_hp)	2503	if (cell->stat_hp)
2438	{	2504	{
2439	int width = cell->stat_width * T;	2505	int width = cell->stat_width * Tw;
2440	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2506	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2441		2507
2442	glColor3ub (0, 0, 0);	2508	glColor3ub (0, 0, 0);
2443	glRectf (px + 1, py - thick - 2,	2509	glRectf (px + 1, py - thick - 2,
2444	px + width - 1, py);	2510	px + width - 1, py);
2445		2511
…		…
2525	int x, y;	2591	int x, y;
2526	int sw1 = sw + 2;	2592	int sw1 = sw + 2;
2527	int sh1 = sh + 2;	2593	int sh1 = sh + 2;
2528	int sh3 = sh * 3;	2594	int sh3 = sh * 3;
2529	int sw3 = sw * 3;	2595	int sw3 = sw * 3;
2530	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2531	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2596	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2532	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2597	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2598	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2599	memset (darkness1, 0, sw1*sh1);
2533		2600
2534	SvPOK_only (darkness3_sv);	2601	SvPOK_only (darkness3_sv);
2535	SvCUR_set (darkness3_sv, sw3 * sh3);	2602	SvCUR_set (darkness3_sv, sw3 * sh3);
2536		2603
2537	mx += self->x - 1;	2604	mx += self->x - 1;
…		…
2663	else	2730	else
2664	*data++ = 0;	2731	*data++ = 0;
2665	}	2732	}
2666	}	2733	}
2667		2734
2668	/* if size is wh + 5 then no data has been found /	2735	/* if size is wh + 5 then no data has been found /
2669	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2736	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2670	{	2737	{
2671	SvPOK_only (data_sv);	2738	SvPOK_only (data_sv);
2672	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2739	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2673	}	2740	}
2674		2741
2675	RETVAL = data_sv;	2742	RETVAL = data_sv;
2676	}	2743	}
2677	OUTPUT:	2744	OUTPUT:
2678	RETVAL	2745	RETVAL
2679		2746
2680	void	2747	void
…		…
2687	STRLEN len;	2754	STRLEN len;
2688	uint8_t data, end;	2755	uint8_t data, end;
2689		2756
2690	len = SvLEN (data_sv);	2757	len = SvLEN (data_sv);
2691	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2758	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2692	data = SvPVbyte_nolen (data_sv);	2759	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2693	end = data + len + 8;	2760	end = data + len + 8;
2694		2761
2695	if (len < 5)	2762	if (len < 5)
2696	XSRETURN_EMPTY;	2763	XSRETURN_EMPTY;
2697		2764
…		…
2758	}	2825	}
2759		2826
2760	MODULE = Deliantra::Client PACKAGE = DC::RW	2827	MODULE = Deliantra::Client PACKAGE = DC::RW
2761		2828
2762	DC::RW	2829	DC::RW
2763	new (SV class, SV data_sv)	2830	new (SV klass, SV data_sv)
2764	CODE:	2831	CODE:
2765	{	2832	{
2766	STRLEN datalen;	2833	STRLEN datalen;
2767	char *data = SvPVbyte (data_sv, datalen);	2834	char *data = SvPVbyte (data_sv, datalen);
2768		2835
…		…
2770	}	2837	}
2771	OUTPUT:	2838	OUTPUT:
2772	RETVAL	2839	RETVAL
2773		2840
2774	DC::RW	2841	DC::RW
2775	new_from_file (SV class, const char path, const char *mode = "rb")	2842	new_from_file (SV klass, const char path, const char *mode = "rb")
2776	CODE:	2843	CODE:
2777	RETVAL = SDL_RWFromFile (path, mode);	2844	RETVAL = SDL_RWFromFile (path, mode);
2778	OUTPUT:	2845	OUTPUT:
2779	RETVAL	2846	RETVAL
2780		2847
…		…
2798	if (RETVAL < 0)	2865	if (RETVAL < 0)
2799	{	2866	{
2800	RETVAL = Mix_GroupOldest (-1);	2867	RETVAL = Mix_GroupOldest (-1);
2801		2868
2802	if (RETVAL < 0)	2869	if (RETVAL < 0)
		2870	{
		2871	// happens sometimes, maybe it just stopped playing(?)
		2872	RETVAL = Mix_GroupAvailable (-1);
		2873
		2874	if (RETVAL < 0)
2803	XSRETURN_UNDEF;	2875	XSRETURN_UNDEF;
2804		2876	}
		2877	else
2805	Mix_HaltChannel (RETVAL);	2878	Mix_HaltChannel (RETVAL);
2806	}	2879	}
2807		2880
2808	Mix_UnregisterAllEffects (RETVAL);	2881	Mix_UnregisterAllEffects (RETVAL);
2809	Mix_Volume (RETVAL, 128);	2882	Mix_Volume (RETVAL, 128);
2810	}	2883	}
…		…
2870		2943
2871	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2944	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2872		2945
2873	PROTOTYPES: DISABLE	2946	PROTOTYPES: DISABLE
2874		2947
		2948	void
		2949	decoders ()
		2950	PPCODE:
		2951	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2952	int i, num = Mix_GetNumChunkDecoders ();
		2953	EXTEND (SP, num);
		2954	for (i = 0; i < num; ++i)
		2955	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2956	#else
		2957	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2958	#endif
		2959
2875	DC::MixChunk	2960	DC::MixChunk
2876	new (SV *class, DC::RW rwops)	2961	new (SV *klass, DC::RW rwops)
2877	CODE:	2962	CODE:
2878	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2963	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2879	OUTPUT:	2964	OUTPUT:
2880	RETVAL	2965	RETVAL
2881		2966
…		…
2911	OUTPUT:	2996	OUTPUT:
2912	RETVAL	2997	RETVAL
2913		2998
2914	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2999	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2915		3000
		3001	void
		3002	decoders ()
		3003	PPCODE:
		3004	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		3005	int i, num = Mix_GetNumMusicDecoders ();
		3006	EXTEND (SP, num);
		3007	for (i = 0; i < num; ++i)
		3008	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3009	#else
		3010	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3011	#endif
		3012
2916	int	3013	int
2917	volume (int volume = -1)	3014	volume (int volume = -1)
2918	PROTOTYPE: ;$	3015	PROTOTYPE: ;$
2919	CODE:	3016	CODE:
2920	if (items > 0)	3017	if (items > 0)
…		…
2931	void	3028	void
2932	halt ()	3029	halt ()
2933	CODE:	3030	CODE:
2934	Mix_HaltMusic ();	3031	Mix_HaltMusic ();
2935		3032
		3033	int
		3034	playing ()
		3035	CODE:
		3036	RETVAL = Mix_PlayingMusic ();
		3037	OUTPUT:
		3038	RETVAL
		3039
2936	DC::MixMusic	3040	DC::MixMusic
2937	new (SV *class, DC::RW rwops)	3041	new (SV *klass, DC::RW rwops)
2938	CODE:	3042	CODE:
2939	RETVAL = Mix_LoadMUS_RW (rwops);	3043	RETVAL = Mix_LoadMUS_RW (rwops);
2940	OUTPUT:	3044	OUTPUT:
2941	RETVAL	3045	RETVAL
2942		3046
…		…
3079	const_iv (GL_FUNC_SUBTRACT),	3183	const_iv (GL_FUNC_SUBTRACT),
3080	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3184	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3081	# undef const_iv	3185	# undef const_iv
3082	};	3186	};
3083		3187
3084	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3188	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3085	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3189	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3086		3190
3087	texture_av = newAV ();	3191	texture_av = newAV ();
3088	AvREAL_off (texture_av);	3192	AvREAL_off (texture_av);
3089	}	3193	}
3090		3194
…		…
3095	gl.BlendFuncSeparateEXT = 0;	3199	gl.BlendFuncSeparateEXT = 0;
3096		3200
3097	void	3201	void
3098	apple_nvidia_bug (int enable)	3202	apple_nvidia_bug (int enable)
3099		3203
3100	char *	3204	const char *
3101	gl_vendor ()	3205	gl_vendor ()
3102	CODE:	3206	CODE:
3103	RETVAL = (char *)glGetString (GL_VENDOR);	3207	RETVAL = (const char *)glGetString (GL_VENDOR);
3104	OUTPUT:	3208	OUTPUT:
3105	RETVAL	3209	RETVAL
3106		3210
3107	char *	3211	const char *
3108	gl_version ()	3212	gl_version ()
3109	CODE:	3213	CODE:
3110	RETVAL = (char *)glGetString (GL_VERSION);	3214	RETVAL = (const char *)glGetString (GL_VERSION);
3111	OUTPUT:	3215	OUTPUT:
3112	RETVAL	3216	RETVAL
3113		3217
3114	char *	3218	const char *
3115	gl_extensions ()	3219	gl_extensions ()
3116	CODE:	3220	CODE:
3117	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3221	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3118	OUTPUT:	3222	OUTPUT:
3119	RETVAL	3223	RETVAL
3120		3224
3121	const char *glGetString (GLenum pname)	3225	const char *glGetString (GLenum pname)
		3226	CODE:
		3227	RETVAL = (const char *)glGetString (pname);
		3228	OUTPUT:
		3229	RETVAL
3122		3230
3123	GLint glGetInteger (GLenum pname)	3231	GLint glGetInteger (GLenum pname)
3124	CODE:	3232	CODE:
3125	glGetIntegerv (pname, &RETVAL);	3233	glGetIntegerv (pname, &RETVAL);
3126	OUTPUT:	3234	OUTPUT:
…		…
3133	RETVAL	3241	RETVAL
3134		3242
3135	int glGetError ()	3243	int glGetError ()
3136		3244
3137	void glFinish ()	3245	void glFinish ()
		3246
		3247	void glFlush ()
3138		3248
3139	void glClear (int mask)	3249	void glClear (int mask)
3140		3250
3141	void glClearColor (float r, float g, float b, float a = 1.0)	3251	void glClearColor (float r, float g, float b, float a = 1.0)
3142	PROTOTYPE: @	3252	PROTOTYPE: @
…		…
3327		3437
3328	void	3438	void
3329	find_widget (SV *self, NV x, NV y)	3439	find_widget (SV *self, NV x, NV y)
3330	PPCODE:	3440	PPCODE:
3331	{	3441	{
3332	if (within_widget (self, x, y))	3442	if (within_widget (self, x, y))
3333	XPUSHs (self);	3443	XPUSHs (self);
3334	}	3444	}
3335		3445
3336	BOOT:	3446	BOOT:
3337	{	3447	{
…		…
3345		3455
3346	void	3456	void
3347	draw (SV *self)	3457	draw (SV *self)
3348	CODE:	3458	CODE:
3349	{	3459	{
3350	HV *hv;	3460	HV *hv;
3351	SV **svp;	3461	SV **svp;
3352	NV x, y, w, h;	3462	NV x, y, w, h;
3353	SV *draw_x_sv = GvSV (draw_x_gv);	3463	SV *draw_x_sv = GvSV (draw_x_gv);
3354	SV *draw_y_sv = GvSV (draw_y_gv);	3464	SV *draw_y_sv = GvSV (draw_y_gv);
3355	SV *draw_w_sv = GvSV (draw_w_gv);	3465	SV *draw_w_sv = GvSV (draw_w_gv);
3356	SV *draw_h_sv = GvSV (draw_h_gv);	3466	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.300 by root, Thu Dec 24 10:47:45 2009 UTC vs. Revision 1.328 by root, Sun Nov 18 12:47:55 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.300 by root, Thu Dec 24 10:47:45 2009 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 2018 UTC