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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.303 by root, Thu Apr 22 11:18:04 2010 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 ();
…		…
1042	OUTPUT:	1115	OUTPUT:
1043	RETVAL	1116	RETVAL
1044		1117
1045	int	1118	int
1046	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)
1047	POSTCALL:	1120	POSTCALL:
1048	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1049	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1050		1123
1051	void	1124	void
1052	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1111	add_font (char *file)	1184	add_font (char *file)
1112	CODE:	1185	CODE:
1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1186	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1114	OUTPUT:	1187	OUTPUT:
1115	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)
1116		1196
1117	void	1197	void
1118	load_image_inline (SV *image_)	1198	load_image_inline (SV *image_)
1119	ALIAS:	1199	ALIAS:
1120	load_image_file = 1	1200	load_image_file = 1
…		…
1166		1246
1167	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1168	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1169	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1170	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1171	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1172	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)));
1173	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1174	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1175	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1176		1256
…		…
1248	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1249		1329
1250	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1251		1331
1252	DC::Font	1332	DC::Font
1253	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1254	CODE:	1334	CODE:
1255	{	1335	{
1256	int count;	1336	int count;
1257	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1258	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1287	PROTOTYPE:	1367	PROTOTYPE:
1288	CODE:	1368	CODE:
1289	tc_restore ();	1369	tc_restore ();
1290		1370
1291	DC::Layout	1371	DC::Layout
1292	new (SV *class)	1372	new (SV *klass)
1293	CODE:	1373	CODE:
1294	New (0, RETVAL, 1, struct cf_layout);	1374	RETVAL = new cf_layout;
1295		1375
1296	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1297	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
1298	RETVAL->g = 1.;	1378	RETVAL->g = 1.;
1299	RETVAL->b = 1.;	1379	RETVAL->b = 1.;
1300	RETVAL->a = 1.;	1380	RETVAL->a = 1.;
1301	RETVAL->base_height = MIN_FONT_HEIGHT;	1381	RETVAL->base_height = MIN_FONT_HEIGHT;
1302	RETVAL->font = 0;	1382	RETVAL->font = 0;
1303	RETVAL->rc = rc_alloc ();
1304		1383
1305	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1384	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1306	layout_update_font (RETVAL);	1385	layout_update_font (RETVAL);
1307	OUTPUT:	1386	OUTPUT:
1308	RETVAL	1387	RETVAL
1309		1388
1310	void	1389	void
1311	DESTROY (DC::Layout self)	1390	DESTROY (DC::Layout self)
1312	CODE:	1391	CODE:
1313	g_object_unref (self->pl);	1392	g_object_unref (self->pl);
1314	rc_free (self->rc);
1315	Safefree (self);	1393	delete self;
1316		1394
1317	void	1395	void
1318	set_text (DC::Layout self, SV *text_)	1396	set_text (DC::Layout self, SV *text_)
1319	CODE:	1397	CODE:
1320	{	1398	{
…		…
1446		1524
1447	void	1525	void
1448	set_height (DC::Layout self, int base_height)	1526	set_height (DC::Layout self, int base_height)
1449	CODE:	1527	CODE:
1450	if (self->base_height != base_height)	1528	if (self->base_height != base_height)
1451	{	1529	{
1452	self->base_height = base_height;	1530	self->base_height = base_height;
1453	layout_update_font (self);	1531	layout_update_font (self);
1454	}	1532	}
1455		1533
1456	void	1534	void
…		…
1574	}	1652	}
1575		1653
1576	void	1654	void
1577	render (DC::Layout self, float x, float y, int flags = 0)	1655	render (DC::Layout self, float x, float y, int flags = 0)
1578	CODE:	1656	CODE:
1579	rc_clear (self->rc);	1657	self->rc.clear ();
1580	pango_opengl_render_layout_subpixel (	1658	pango_opengl_render_layout_subpixel (
1581	self->pl,	1659	self->pl,
1582	self->rc,	1660	&self->rc,
1583	x * PANGO_SCALE, y * PANGO_SCALE,	1661	x * PANGO_SCALE, y * PANGO_SCALE,
1584	self->r, self->g, self->b, self->a,	1662	self->r, self->g, self->b, self->a,
1585	flags	1663	flags
1586	);	1664	);
1587	// we assume that context_change actually clears/frees stuff	1665	// we assume that context_change actually clears/frees stuff
…		…
1598	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1676	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1599	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1677	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1600	glEnable (GL_ALPHA_TEST);	1678	glEnable (GL_ALPHA_TEST);
1601	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1679	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1602		1680
1603	rc_draw (self->rc);	1681	self->rc.draw ();
1604		1682
1605	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1606	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1607	glDisable (GL_TEXTURE_2D);	1685	glDisable (GL_TEXTURE_2D);
1608	}	1686	}
…		…
1820	MODULE = Deliantra::Client PACKAGE = DC::Map	1898	MODULE = Deliantra::Client PACKAGE = DC::Map
1821		1899
1822	PROTOTYPES: DISABLE	1900	PROTOTYPES: DISABLE
1823		1901
1824	DC::Map	1902	DC::Map
1825	new (SV *class)	1903	new (SV *klass)
1826	CODE:	1904	CODE:
1827	New (0, RETVAL, 1, struct map);	1905	New (0, RETVAL, 1, mapgrid);
1828	RETVAL->x = 0;	1906	RETVAL->x = 0;
1829	RETVAL->y = 0;	1907	RETVAL->y = 0;
1830	RETVAL->w = 0;	1908	RETVAL->w = 0;
1831	RETVAL->h = 0;	1909	RETVAL->h = 0;
1832	RETVAL->ox = 0;	1910	RETVAL->ox = 0;
…		…
1869		1947
1870	void	1948	void
1871	set_smooth (DC::Map self, int face, int smooth, int level)	1949	set_smooth (DC::Map self, int face, int smooth, int level)
1872	CODE:	1950	CODE:
1873	{	1951	{
1874	tileid texid;	1952	tileid texid;
1875	maptex *tex;	1953	maptex *tex;
1876		1954
1877	if (face < 0 \|\| face >= self->faces)	1955	if (face < 0 \|\| face >= self->faces)
1878	return;	1956	return;
1879		1957
1880	if (smooth < 0 \|\| smooth >= self->faces)	1958	if (smooth < 0 \|\| smooth >= self->faces)
1881	return;	1959	return;
1882		1960
1883	texid = self->face2tile [face];	1961	texid = self->face2tile [face];
1884		1962
1885	if (!texid)	1963	if (!texid)
1886	return;	1964	return;
1887		1965
1888	tex = self->tex + texid;	1966	tex = self->tex + texid;
…		…
1921	}	1999	}
1922		2000
1923	void	2001	void
1924	expire_textures (DC::Map self, int texid, int count)	2002	expire_textures (DC::Map self, int texid, int count)
1925	PPCODE:	2003	PPCODE:
1926	for (; texid < self->texs && count; ++texid, --count)	2004	for (; texid < self->texs && count; ++texid, --count)
1927	{	2005	{
1928	maptex *tex = self->tex + texid;	2006	maptex *tex = self->tex + texid;
1929		2007
1930	if (tex->name)	2008	if (tex->name)
1931	{	2009	{
…		…
1986	self->y += MAP_EXTEND_Y;	2064	self->y += MAP_EXTEND_Y;
1987	}	2065	}
1988	}	2066	}
1989		2067
1990	SV *	2068	SV *
1991	map1a_update (DC::Map self, SV *data_, int extmap)	2069	map1a_update (DC::Map self, SV *data_)
1992	CODE:	2070	CODE:
1993	{	2071	{
1994	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2072	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1995	uint8_t data_end = (uint8_t )SvEND (data_);	2073	uint8_t data_end = (uint8_t )SvEND (data_);
1996	mapcell *cell;	2074	mapcell *cell;
…		…
2017		2095
2018	//TODO: don't trust server data to be in-range(!)	2096	//TODO: don't trust server data to be in-range(!)
2019		2097
2020	if (flags & 8)	2098	if (flags & 8)
2021	{	2099	{
		2100	uint8_t ext, cmd;
		2101
2022	if (extmap)	2102	do
2023	{	2103	{
2024	uint8_t ext, cmd;	2104	ext = *data++;
		2105	cmd = ext & 0x7f;
2025		2106
2026	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
2027	{	2110	{
2028	ext = *data++;
2029	cmd = ext & 0x7f;
2030
2031	if (cmd < 4)
2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2033	else if (cmd == 5) // health
2034	{
2035	cell->stat_width = 1;	2111	cell->stat_width = 1;
2036	cell->stat_hp = *data++;	2112	cell->stat_hp = *data++;
2037	}
2038	else if (cmd == 6) // monster width
2039	cell->stat_width = *data++ + 1;
2040	else if (cmd == 0x47)
2041	{
2042	if (*data == 1) cell->player = data [1];
2043	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2044	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2045	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2046
2047	data += *data + 1;
2048	}
2049	else if (cmd == 8) // cell flags
2050	cell->flags = *data++;
2051	else if (ext & 0x40) // unknown, multibyte => skip
2052	data += *data + 1;
2053	else
2054	data++;
2055	}	2113	}
2056	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++;
2057	}	2131	}
2058	else	2132	while (ext & 0x80);
2059	cell->darkness = *data++ + 1;
2060	}	2133	}
2061		2134
2062	for (z = 0; z <= 2; ++z)	2135	for (z = 0; z <= 2; ++z)
2063	if (flags & (4 >> z))	2136	if (flags & (4 >> z))
2064	{	2137	{
…		…
2112	? self->row + y	2185	? self->row + y
2113	: 0;	2186	: 0;
2114		2187
2115	for (x = x0; x < x1; x++)	2188	for (x = x0; x < x1; x++)
2116	{	2189	{
2117	int r = 32, g = 32, b = 32, a = 192;	2190	unsigned int r = 32, g = 32, b = 32, a = 192;
2118		2191
2119	if (row && row->c0 <= x && x < row->c1)	2192	if (row && row->c0 <= x && x < row->c1)
2120	{	2193	{
2121	mapcell *cell = row->col + (x - row->c0);	2194	mapcell *cell = row->col + (x - row->c0);
2122		2195
…		…
2124	{	2197	{
2125	maptex tex = self->tex [cell->tile [z]];	2198	maptex tex = self->tex [cell->tile [z]];
2126	int a0 = 255 - tex.a;	2199	int a0 = 255 - tex.a;
2127	int a1 = tex.a;	2200	int a1 = tex.a;
2128		2201
2129	r = (r * a0 + tex.r * a1) / 255;	2202	r = div255 (r * a0 + tex.r * a1);
2130	g = (g * a0 + tex.g * a1) / 255;	2203	g = div255 (g * a0 + tex.g * a1);
2131	b = (b * a0 + tex.b * a1) / 255;	2204	b = div255 (b * a0 + tex.b * a1);
2132	a = (a * a0 + tex.a * a1) / 255;	2205	a = div255 (a * a0 + tex.a * a1);
2133	}	2206	}
2134	}	2207	}
2135		2208
2136	*map++ = (r )	2209	*map++ = (r )
2137	\| (g << 8)	2210	\| (g << 8)
2138	\| (b << 16)	2211	\| (b << 16)
2139	\| (a << 24);	2212	\| (a << 24);
2140	}	2213	}
2141	}	2214	}
2142		2215
2143	RETVAL = map_sv;	2216	RETVAL = map_sv;
2144	}	2217	}
2145	OUTPUT:	2218	OUTPUT:
2146	RETVAL	2219	RETVAL
2147		2220
2148	void	2221	void
2149	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)
2150	CODE:	2223	CODE:
2151	{	2224	{
2152	int x, y, z;	2225	int x, y, z;
2153		2226
2154	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2155	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2156	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!
2157	smooth_key skey;
2158	int pl_x, pl_y;	2228	int pl_x, pl_y;
2159	maptex pl_tex;	2229	maptex pl_tex;
2160	rc_t *rc = rc_alloc ();	2230	rc_t rc;
2161	rc_t *rc_ov = rc_alloc ();	2231	rc_t rc_ov;
2162	rc_key_t key;	2232	rc_key_t key;
2163	rc_array_t *arr;	2233	rc_t::array_t *arr;
2164		2234
2165	pl_tex.name = 0;	2235	pl_tex.name = 0;
2166		2236
2167	// that's current max. sorry.	2237	// that's current max. sorry.
2168	if (sw > 255) sw = 255;	2238	if (sw > 255) sw = 255;
2169	if (sh > 255) sh = 255;	2239	if (sh > 255) sh = 255;
2170
2171	// clear key, in case of extra padding
2172	memset (&skey, 0, sizeof (skey));
2173		2240
2174	memset (&key, 0, sizeof (key));	2241	memset (&key, 0, sizeof (key));
2175	key.r = 255;	2242	key.r = 255;
2176	key.g = 255;	2243	key.g = 255;
2177	key.b = 255;	2244	key.b = 255;
…		…
2183	my += self->y;	2250	my += self->y;
2184		2251
2185	// first pass: determine smooth_max	2252	// first pass: determine smooth_max
2186	// rather ugly, if you ask me	2253	// rather ugly, if you ask me
2187	// could also be stored inside mapcell and updated on change	2254	// could also be stored inside mapcell and updated on change
2188	memset (smooth_max, 0, sizeof (smooth_max));	2255	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2189		2256
2190	for (y = 0; y < sh; y++)	2257	for (y = 0; y < sh; y++)
2191	if (0 <= y + my && y + my < self->rows)	2258	if (0 <= y + my && y + my < self->rows)
2192	{	2259	{
2193	maprow *row = self->row + (y + my);	2260	maprow *row = self->row + (y + my);
…		…
2208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2275	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2276	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2210		2277
2211	for (z = 0; z <= 2; z++)	2278	for (z = 0; z <= 2; z++)
2212	{	2279	{
2213	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;
2214	key.texname = -1;	2283	key.texname = -1;
2215		2284
2216	for (y = 0; y < sh; y++)	2285	for (y = 0; y < sh; y++)
2217	if (0 <= y + my && y + my < self->rows)	2286	if (0 <= y + my && y + my < self->rows)
2218	{	2287	{
…		…
2235		2304
2236	if (!tex.name)	2305	if (!tex.name)
2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2306	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2238		2307
2239	key.texname = tex.name;	2308	key.texname = tex.name;
2240	arr = rc_array (rc, &key);	2309	arr = &rc.array (key);
2241	}	2310	}
2242		2311
2243	px = (x + 1) * T - tex.w;	2312	px = (x + 1) * Th - tex.w;
2244	py = (y + 1) * T - tex.h;	2313	py = (y + 1) * Tw - tex.h;
2245		2314
2246	if (expect_false (cell->player == player) && expect_false (z == 2))	2315	if (expect_false (cell->player == player) && expect_false (z == 2))
2247	{	2316	{
2248	pl_x = px;	2317	pl_x = px;
2249	pl_y = py;	2318	pl_y = py;
2250	pl_tex = tex;	2319	pl_tex = tex;
2251	continue;	2320	continue;
2252	}	2321	}
2253		2322
2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2323	arr->t2f_v3f (0 , 0 , px , py , 0);
2255	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2324	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2256	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);
2257	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2326	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2258		2327
2259	// update smooth hash	2328	// update smooth hash
2260	if (tex.smoothtile)	2329	if (tex.smoothtile)
2261	{	2330	{
2262	skey.tile = tex.smoothtile;	2331	skey.tile = tex.smoothtile;
2263	skey.level = tex.smoothlevel;	2332	skey.level = tex.smoothlevel;
2264		2333
2265	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2334	smooth_level[tex.smoothlevel] = 1;
2266		2335
2267	// 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
2268	// shifted +1\|+1 so we always stay positive.	2337	// shifted +1\|+1 so we always stay positive.
2269		2338
2270	// bits is ___n cccc CCCC bbbb	2339	// bits is ___n cccc CCCC bbbb
…		…
2278		2347
2279	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2348	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2280	// ·· ·· ·┏ ┓·	2349	// ·· ·· ·┏ ┓·
2281		2350
2282	// full tile	2351	// full tile
2283	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);
2284		2353
2285	// borders	2354	// borders
2286	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);
2287	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);
2288	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);
2289	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);
2290		2359
2291	// corners	2360	// corners
2292	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);
2293	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);
2294	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);
2295	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);
2296	}	2365	}
2297	}	2366	}
2298		2367
2299	if (expect_false (z == 2) && expect_false (cell->flags))	2368	if (expect_false (z == 2) && expect_false (cell->flags))
2300	{	2369	{
2301	// overlays such as the speech bubble, probably more to come	2370	// overlays such as the speech bubble, probably more to come
2302	if (cell->flags & 1)	2371	if (cell->flags & 1)
2303	{	2372	{
2304	rc_key_t key_ov = key;	2373	rc_key_t key_ov = key;
2305	maptex tex = self->tex [TEXID_SPEECH];	2374	maptex tex = self->tex[TEXID_SPEECH];
2306	rc_array_t *arr;
2307	int px = x * T + T * 2 / 32;	2375	int px = x * Tw + Tw * 2 / 32;
2308	int py = y * T - T * 6 / 32;	2376	int py = y * Th - Th * 6 / 32;
2309		2377
2310	key_ov.texname = tex.name;	2378	key_ov.texname = tex.name;
2311	arr = rc_array (rc_ov, &key_ov);	2379	rc_t::array_t &arr = rc_ov.array (key_ov);
2312		2380
2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2381	arr.t2f_v3f (0 , 0 , px , py , 0);
2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2382	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2315	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);
2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2384	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2317	}	2385	}
2318	}	2386	}
2319	}	2387	}
2320	}	2388	}
2321		2389
2322	rc_draw (rc);	2390	rc.draw ();
2323	rc_clear (rc);	2391	rc.clear ();
2324		2392
2325	// go through all smoothlevels, lowest to highest, then draw.	2393	// go through all smoothlevels, lowest to highest, then draw.
2326	// this is basically counting sort	2394	// this is basically counting sort
2327	{	2395	{
2328	int w, b;	2396	int w, b;
2329		2397
2330	glEnable (GL_TEXTURE_2D);	2398	glEnable (GL_TEXTURE_2D);
2331	glBegin (GL_QUADS);	2399	glBegin (GL_QUADS);
2332	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)
2333	{	2403	{
2334	uint32_t smask = smooth_level [w];	2404	smooth_key &skey = it->first;
2335	if (smask)	2405	IV bits = it->second;
2336	for (b = 0; b < 32; ++b)	2406
2337	if (smask & (((uint32_t)1) << b))	2407	if (!(bits & 0x1000)
		2408	&& skey.level == level
		2409	&& level > smooth_max [skey.x][skey.y])
2338	{	2410	{
2339	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
2340	HE *he;	2419	if (tex.name)
2341
2342	hv_iterinit (smooth);
2343	while ((he = hv_iternext (smooth)))
2344	{	2420	{
2345	smooth_key skey = (smooth_key )HeKEY (he);	2421	// this time avoiding texture state changes
2346	IV bits = SvIVX (HeVAL (he));	2422	// save gobs of state changes.
2347		2423	if (key.texname != tex.name)
2348	if (!(bits & 0x1000)
2349	&& skey->level == level
2350	&& level > smooth_max [skey->x][skey->y])
2351	{	2424	{
2352	maptex tex = self->tex [skey->tile];
2353	int px = (((int)skey->x) - 1) * T;
2354	int py = (((int)skey->y) - 1) * T;
2355	int border = bits & 15;
2356	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2357	float dx = tex.s * .0625f; // 16 images/row
2358	float dy = tex.t * .5f ; // 2 images/column
2359
2360	if (tex.name)
2361	{
2362	// this time avoiding texture state changes
2363	// save gobs of state changes.
2364	if (key.texname != tex.name)
2365	{
2366	self->tex [skey->tile].unused = 0;	2425	self->tex [skey.tile].unused = 0;
2367		2426
2368	glEnd ();	2427	glEnd ();
2369	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2428	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2370	glBegin (GL_QUADS);	2429	glBegin (GL_QUADS);
2371	}	2430	}
2372		2431
2373	if (border)	2432	if (border)
2374	{	2433	{
2375	float ox = border * dx;	2434	float ox = border * dx;
2376		2435
2377	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2436	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2378	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2437	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2379	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2438	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2380	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2439	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2381	}	2440	}
2382		2441
2383	if (corner)	2442	if (corner)
2384	{	2443	{
2385	float ox = corner * dx;	2444	float ox = corner * dx;
2386		2445
2387	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2446	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2388	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2447	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2389	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2448	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2390	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2449	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2391	}
2392	}
2393	}	2450	}
2394	}	2451	}
2395	}	2452	}
2396	}	2453	}
2397		2454
2398	glEnd ();	2455	glEnd ();
2399	glDisable (GL_TEXTURE_2D);	2456	glDisable (GL_TEXTURE_2D);
2400	key.texname = -1;	2457	key.texname = -1;
2401	}	2458	}
2402
2403	hv_clear (smooth);
2404	}	2459	}
2405		2460
2406	if (pl_tex.name)	2461	if (pl_tex.name)
2407	{	2462	{
2408	maptex tex = pl_tex;	2463	maptex tex = pl_tex;
2409	int px = pl_x + sdx;	2464	int px = pl_x + sdx;
2410	int py = pl_y + sdy;	2465	int py = pl_y + sdy;
2411		2466
2412	key.texname = tex.name;	2467	key.texname = tex.name;
2413	arr = rc_array (rc, &key);	2468	rc_t::array_t &arr = rc.array (key);
2414		2469
2415	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2470	arr.t2f_v3f (0 , 0 , px , py , 0);
2416	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2471	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2417	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);
2418	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2473	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2419		2474
2420	rc_draw (rc);	2475	rc.draw ();
2421	}	2476	}
2422		2477
2423	rc_draw (rc_ov);	2478	rc_ov.draw ();
2424	rc_clear (rc_ov);	2479	rc_ov.clear ();
2425		2480
2426	glDisable (GL_BLEND);	2481	glDisable (GL_BLEND);
2427	rc_free (rc);
2428	rc_free (rc_ov);
2429		2482
2430	// top layer: overlays such as the health bar	2483	// top layer: overlays such as the health bar
2431	for (y = 0; y < sh; y++)	2484	for (y = 0; y < sh; y++)
2432	if (0 <= y + my && y + my < self->rows)	2485	if (0 <= y + my && y + my < self->rows)
2433	{	2486	{
…		…
2436	for (x = 0; x < sw; x++)	2489	for (x = 0; x < sw; x++)
2437	if (row->c0 <= x + mx && x + mx < row->c1)	2490	if (row->c0 <= x + mx && x + mx < row->c1)
2438	{	2491	{
2439	mapcell *cell = row->col + (x + mx - row->c0);	2492	mapcell *cell = row->col + (x + mx - row->c0);
2440		2493
2441	int px = x * T;	2494	int px = x * Tw;
2442	int py = y * T;	2495	int py = y * Th;
2443		2496
2444	if (expect_false (cell->player == player))	2497	if (expect_false (cell->player == player))
2445	{	2498	{
2446	px += sdx;	2499	px += sdx;
2447	py += sdy;	2500	py += sdy;
2448	}	2501	}
2449		2502
2450	if (cell->stat_hp)	2503	if (cell->stat_hp)
2451	{	2504	{
2452	int width = cell->stat_width * T;	2505	int width = cell->stat_width * Tw;
2453	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2506	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2454		2507
2455	glColor3ub (0, 0, 0);	2508	glColor3ub (0, 0, 0);
2456	glRectf (px + 1, py - thick - 2,	2509	glRectf (px + 1, py - thick - 2,
2457	px + width - 1, py);	2510	px + width - 1, py);
2458		2511
…		…
2538	int x, y;	2591	int x, y;
2539	int sw1 = sw + 2;	2592	int sw1 = sw + 2;
2540	int sh1 = sh + 2;	2593	int sh1 = sh + 2;
2541	int sh3 = sh * 3;	2594	int sh3 = sh * 3;
2542	int sw3 = sw * 3;	2595	int sw3 = sw * 3;
2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2596	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2545	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);
2546		2600
2547	SvPOK_only (darkness3_sv);	2601	SvPOK_only (darkness3_sv);
2548	SvCUR_set (darkness3_sv, sw3 * sh3);	2602	SvCUR_set (darkness3_sv, sw3 * sh3);
2549		2603
2550	mx += self->x - 1;	2604	mx += self->x - 1;
…		…
2676	else	2730	else
2677	*data++ = 0;	2731	*data++ = 0;
2678	}	2732	}
2679	}	2733	}
2680		2734
2681	/* if size is wh + 5 then no data has been found /	2735	/* if size is wh + 5 then no data has been found /
2682	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2736	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2683	{	2737	{
2684	SvPOK_only (data_sv);	2738	SvPOK_only (data_sv);
2685	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2739	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2686	}	2740	}
2687		2741
2688	RETVAL = data_sv;	2742	RETVAL = data_sv;
2689	}	2743	}
2690	OUTPUT:	2744	OUTPUT:
2691	RETVAL	2745	RETVAL
2692		2746
2693	void	2747	void
…		…
2700	STRLEN len;	2754	STRLEN len;
2701	uint8_t data, end;	2755	uint8_t data, end;
2702		2756
2703	len = SvLEN (data_sv);	2757	len = SvLEN (data_sv);
2704	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2758	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2705	data = SvPVbyte_nolen (data_sv);	2759	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2706	end = data + len + 8;	2760	end = data + len + 8;
2707		2761
2708	if (len < 5)	2762	if (len < 5)
2709	XSRETURN_EMPTY;	2763	XSRETURN_EMPTY;
2710		2764
…		…
2771	}	2825	}
2772		2826
2773	MODULE = Deliantra::Client PACKAGE = DC::RW	2827	MODULE = Deliantra::Client PACKAGE = DC::RW
2774		2828
2775	DC::RW	2829	DC::RW
2776	new (SV class, SV data_sv)	2830	new (SV klass, SV data_sv)
2777	CODE:	2831	CODE:
2778	{	2832	{
2779	STRLEN datalen;	2833	STRLEN datalen;
2780	char *data = SvPVbyte (data_sv, datalen);	2834	char *data = SvPVbyte (data_sv, datalen);
2781		2835
…		…
2783	}	2837	}
2784	OUTPUT:	2838	OUTPUT:
2785	RETVAL	2839	RETVAL
2786		2840
2787	DC::RW	2841	DC::RW
2788	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")
2789	CODE:	2843	CODE:
2790	RETVAL = SDL_RWFromFile (path, mode);	2844	RETVAL = SDL_RWFromFile (path, mode);
2791	OUTPUT:	2845	OUTPUT:
2792	RETVAL	2846	RETVAL
2793		2847
…		…
2902	#else	2956	#else
2903	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2957	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2904	#endif	2958	#endif
2905		2959
2906	DC::MixChunk	2960	DC::MixChunk
2907	new (SV *class, DC::RW rwops)	2961	new (SV *klass, DC::RW rwops)
2908	CODE:	2962	CODE:
2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2963	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2910	OUTPUT:	2964	OUTPUT:
2911	RETVAL	2965	RETVAL
2912		2966
…		…
2982	RETVAL = Mix_PlayingMusic ();	3036	RETVAL = Mix_PlayingMusic ();
2983	OUTPUT:	3037	OUTPUT:
2984	RETVAL	3038	RETVAL
2985		3039
2986	DC::MixMusic	3040	DC::MixMusic
2987	new (SV *class, DC::RW rwops)	3041	new (SV *klass, DC::RW rwops)
2988	CODE:	3042	CODE:
2989	RETVAL = Mix_LoadMUS_RW (rwops);	3043	RETVAL = Mix_LoadMUS_RW (rwops);
2990	OUTPUT:	3044	OUTPUT:
2991	RETVAL	3045	RETVAL
2992		3046
…		…
3129	const_iv (GL_FUNC_SUBTRACT),	3183	const_iv (GL_FUNC_SUBTRACT),
3130	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3184	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3131	# undef const_iv	3185	# undef const_iv
3132	};	3186	};
3133		3187
3134	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--)
3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3189	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3136		3190
3137	texture_av = newAV ();	3191	texture_av = newAV ();
3138	AvREAL_off (texture_av);	3192	AvREAL_off (texture_av);
3139	}	3193	}
3140		3194
…		…
3145	gl.BlendFuncSeparateEXT = 0;	3199	gl.BlendFuncSeparateEXT = 0;
3146		3200
3147	void	3201	void
3148	apple_nvidia_bug (int enable)	3202	apple_nvidia_bug (int enable)
3149		3203
3150	char *	3204	const char *
3151	gl_vendor ()	3205	gl_vendor ()
3152	CODE:	3206	CODE:
3153	RETVAL = (char *)glGetString (GL_VENDOR);	3207	RETVAL = (const char *)glGetString (GL_VENDOR);
3154	OUTPUT:	3208	OUTPUT:
3155	RETVAL	3209	RETVAL
3156		3210
3157	char *	3211	const char *
3158	gl_version ()	3212	gl_version ()
3159	CODE:	3213	CODE:
3160	RETVAL = (char *)glGetString (GL_VERSION);	3214	RETVAL = (const char *)glGetString (GL_VERSION);
3161	OUTPUT:	3215	OUTPUT:
3162	RETVAL	3216	RETVAL
3163		3217
3164	char *	3218	const char *
3165	gl_extensions ()	3219	gl_extensions ()
3166	CODE:	3220	CODE:
3167	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3221	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3168	OUTPUT:	3222	OUTPUT:
3169	RETVAL	3223	RETVAL
3170		3224
3171	const char *glGetString (GLenum pname)	3225	const char *glGetString (GLenum pname)
		3226	CODE:
		3227	RETVAL = (const char *)glGetString (pname);
		3228	OUTPUT:
		3229	RETVAL
3172		3230
3173	GLint glGetInteger (GLenum pname)	3231	GLint glGetInteger (GLenum pname)
3174	CODE:	3232	CODE:
3175	glGetIntegerv (pname, &RETVAL);	3233	glGetIntegerv (pname, &RETVAL);
3176	OUTPUT:	3234	OUTPUT:
…		…
3183	RETVAL	3241	RETVAL
3184		3242
3185	int glGetError ()	3243	int glGetError ()
3186		3244
3187	void glFinish ()	3245	void glFinish ()
		3246
		3247	void glFlush ()
3188		3248
3189	void glClear (int mask)	3249	void glClear (int mask)
3190		3250
3191	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)
3192	PROTOTYPE: @	3252	PROTOTYPE: @
…		…
3377		3437
3378	void	3438	void
3379	find_widget (SV *self, NV x, NV y)	3439	find_widget (SV *self, NV x, NV y)
3380	PPCODE:	3440	PPCODE:
3381	{	3441	{
3382	if (within_widget (self, x, y))	3442	if (within_widget (self, x, y))
3383	XPUSHs (self);	3443	XPUSHs (self);
3384	}	3444	}
3385		3445
3386	BOOT:	3446	BOOT:
3387	{	3447	{
…		…
3395		3455
3396	void	3456	void
3397	draw (SV *self)	3457	draw (SV *self)
3398	CODE:	3458	CODE:
3399	{	3459	{
3400	HV *hv;	3460	HV *hv;
3401	SV **svp;	3461	SV **svp;
3402	NV x, y, w, h;	3462	NV x, y, w, h;
3403	SV *draw_x_sv = GvSV (draw_x_gv);	3463	SV *draw_x_sv = GvSV (draw_x_gv);
3404	SV *draw_y_sv = GvSV (draw_y_gv);	3464	SV *draw_y_sv = GvSV (draw_y_gv);
3405	SV *draw_w_sv = GvSV (draw_w_gv);	3465	SV *draw_w_sv = GvSV (draw_w_gv);
3406	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.303 by root, Thu Apr 22 11:18:04 2010 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.303 by root, Thu Apr 22 11:18:04 2010 UTC vs.
Revision 1.328 by root, Sun Nov 18 12:47:55 2018 UTC