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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 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
…		…
184	{	189	{
185	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
186		191
187	while (attrs)	192	while (attrs)
188	{	193	{
189	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
190		195
191	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
192	return 1;	197	return 1;
193		198
194	attrs = attrs->next;	199	attrs = attrs->next;
195	}	200	}
196		201
197	return 0;	202	return 0;
198	}	203	}
199		204
200	typedef struct cf_layout {	205	struct cf_layout {
201	PangoLayout *pl;	206	PangoLayout *pl;
202	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
203	int base_height;	208	int base_height;
204	DC__Font font;	209	DC__Font font;
205	rc_t *rc;	210	rc_t rc;
206	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
207		214
208	static DC__Font default_font;	215	static DC__Font default_font;
209	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
210	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
211		218
212	static void	219	static void
213	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
214	{	221	{
215	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
216	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
217	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218	#endif	225	#endif
219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220	}	227	}
221		228
222	static void	229	static void
…		…
252	}	259	}
253		260
254	typedef uint16_t tileid;	261	typedef uint16_t tileid;
255	typedef uint16_t faceid;	262	typedef uint16_t faceid;
256		263
257	typedef struct {	264	struct maptex
		265	{
258	GLuint name;	266	GLuint name;
259	int w, h;	267	int w, h;
260	float s, t;	268	float s, t;
261	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
262	tileid smoothtile;	270	tileid smoothtile;
263	uint8_t smoothlevel;	271	uint8_t smoothlevel;
264	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
265	} maptex;	273	};
266		274
267	typedef struct {	275	struct mapcell
		276	{
268	uint32_t player;	277	uint32_t player;
269	tileid tile[3];	278	tileid tile[3];
270	uint16_t darkness;	279	uint16_t darkness;
271	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
272	} mapcell;	281	};
273		282
274	typedef struct {	283	struct maprow
		284	{
275	int32_t c0, c1;	285	int32_t c0, c1;
276	mapcell *col;	286	mapcell *col;
277	} maprow;	287	};
278		288
279	typedef struct map {	289	struct mapgrid {
280	int x, y, w, h;	290	int x, y, w, h;
281	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
282	int faces; tileid *face2tile; // [faceid]	292	std::vector<tileid> tile;
283	int texs; maptex *tex; // [tileid]	293	std::vector<maptex> tex;
284		294
285	int32_t rows;	295	int32_t rows;
286	maprow *row;	296	maprow *row;
287	} *DC__Map;	297
		298	~mapgrid ()
		299	{
		300	clear_cells ();
		301	}
		302
		303	void clear_cells ();
		304	};
		305
		306	typedef mapgrid *DC__Map;
288		307
289	static char *	308	static char *
290	prepend (char *ptr, int sze, int inc)	309	prepend (char *ptr, int sze, int inc)
291	{	310	{
292	char *p;	311	char *p;
…		…
309	}	328	}
310		329
311	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	330	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	331	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313		332
314	static void
315	need_facenum (struct map *self, faceid face)
316	{
317	while (self->faces <= face)
318	{
319	Append (tileid, self->face2tile, self->faces, self->faces);
320	self->faces *= 2;
321	}
322	}
323
324	static void
325	need_texid (struct map *self, int texid)
326	{
327	while (self->texs <= texid)
328	{
329	Append (maptex, self->tex, self->texs, self->texs);
330	self->texs *= 2;
331	}
332	}
333
334	static maprow *	333	static maprow *
335	map_get_row (DC__Map self, int y)	334	map_get_row (mapgrid *self, int y)
336	{	335	{
337	if (0 > y)	336	if (0 > y)
338	{	337	{
339	int extend = - y + MAP_EXTEND_Y;	338	int extend = - y + MAP_EXTEND_Y;
340	Prepend (maprow, self->row, self->rows, extend);	339	Prepend (maprow, self->row, self->rows, extend);
…		…
378		377
379	return row->col + (x - row->c0);	378	return row->col + (x - row->c0);
380	}	379	}
381		380
382	static mapcell *	381	static mapcell *
383	map_get_cell (DC__Map self, int x, int y)	382	map_get_cell (mapgrid *self, int x, int y)
384	{	383	{
385	return row_get_cell (map_get_row (self, y), x);	384	return row_get_cell (map_get_row (self, y), x);
386	}	385	}
387		386
388	static void	387	void mapgrid::clear_cells ()
389	map_clear (DC__Map self)
390	{	388	{
391	int r;	389	int r;
392		390
393	for (r = 0; r < self->rows; r++)	391	for (r = 0; r < rows; r++)
394	Safefree (self->row[r].col);	392	Safefree (row[r].col);
395		393
396	Safefree (self->row);	394	Safefree (row);
397		395
398	self->x = 0;	396	x = 0;
399	self->y = 0;	397	y = 0;
400	self->ox = 0;	398	ox = 0;
401	self->oy = 0;	399	oy = 0;
402	self->row = 0;	400	row = 0;
403	self->rows = 0;	401	rows = 0;
404	}	402	}
405		403
406	#define CELL_CLEAR(cell) \	404	#define CELL_CLEAR(cell) \
407	do { \	405	do { \
408	if ((cell)->player) \	406	if ((cell)->player) \
…		…
412	(cell)->flags = 0; \	410	(cell)->flags = 0; \
413	(cell)->player = 0; \	411	(cell)->player = 0; \
414	} while (0)	412	} while (0)
415		413
416	static void	414	static void
417	map_blank (DC__Map self, int x0, int y0, int w, int h)	415	map_blank (mapgrid *self, int x0, int y0, int w, int h)
418	{	416	{
419	int x, y;	417	int x, y;
420	maprow *row;	418	maprow *row;
421	mapcell *cell;	419	mapcell *cell;
422		420
…		…
439	CELL_CLEAR (cell);	437	CELL_CLEAR (cell);
440	}	438	}
441	}	439	}
442	}	440	}
443		441
444	typedef struct {	442	struct smooth_key
		443	{
445	tileid tile;	444	tileid tile;
446	uint8_t x, y, level;	445	uint8_t x, y, level;
447	} smooth_key;	446
		447	bool operator == (const smooth_key &o) const
		448	{
		449	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		450	}
		451	};
		452
		453	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		454
		455	namespace std {
		456	template <>
		457	struct hash<smooth_key>
		458	{
		459	size_t operator () (const smooth_key &v) const
		460	{
		461	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		462	}
		463	};
		464	}
448		465
449	static void	466	static void
450	smooth_or_bits (HV hv, smooth_key key, IV bits)	467	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451	{	468	{
452	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	469	auto &&it = h.find (key);
453		470
454	if (SvIOK (*sv))	471	if (it == h.end ())
455	SvIV_set (sv, SvIVX (sv) \| bits);	472	h.insert (std::make_pair (key, bits));
456	else	473	else
457	sv_setiv (*sv, bits);	474	it->second \|= bits;
458	}	475	}
459		476
460	static void	477	static void
461	music_finished (void)	478	music_finished (void)
462	{	479	{
…		…
481	ev.data2 = 0;	498	ev.data2 = 0;
482		499
483	SDL_PushEvent ((SDL_Event *)&ev);	500	SDL_PushEvent ((SDL_Event *)&ev);
484	}	501	}
485		502
		503	// approximately divide by 255
486	static unsigned int	504	static unsigned int
487	div255 (unsigned int n)	505	div255 (unsigned int n)
488	{	506	{
489	return (n + (n >> 8)) >> 8;	507	return (n + (n >> 8)) >> 8;
490	}	508	}
…		…
577		595
578	return mod;	596	return mod;
579	}	597	}
580		598
581	static void	599	static void
582	deliantra_main ()	600	deliantra_main (SV *real_main)
583	{	601	{
584	char *argv[] = { 0 };	602	dSP;
585	call_argv ("::main", G_DISCARD \| G_VOID, argv);	603
		604	PUSHMARK (SP);
		605	call_sv (real_main, G_DISCARD \| G_VOID);
586	}	606	}
587		607
588	#ifdef __MACOSX__	608	#ifdef __MACOSX__
		609	static SV *real_main;
		610
589	/* to due surprising braindamage on the side of SDL design, we	611	/* to due surprising braindamage on the side of SDL design, we
590	* do some mind-boggling hack here: SDL requires a custom main()	612	* do some mind-boggling hack here: SDL requires a custom main()
591	* on OS X, so... we provide one and call the original main(), which,	613	* on OS X, so... we provide one and call the original main(), which,
592	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	614	* due to shared library magic, calls -lSDLmain's main, not perl's main,
593	* and which calls our main (== SDL_main) back.	615	* and which calls our main (== SDL_main) back.
594	*/	616	*/
595	extern C_LINKAGE int	617	extern C_LINKAGE int
596	main (int argc, char *argv[])	618	main (int argc, char *argv[])
597	{	619	{
598	deliantra_main ();	620	deliantra_main (real_main);
599	}	621	}
600		622
601	#undef main	623	#undef main
602		624
603	extern C_LINKAGE int main (int argc, char *argv[]);	625	extern C_LINKAGE int main (int argc, char *argv[]);
604		626
605	static void	627	static void
606	SDL_braino (void)	628	SDL_main_hack (SV *real_main_)
607	{	629	{
		630	real_main = real_main_;
		631
608	char *argv[] = { "deliantra client", 0 };	632	char *argv[] = { "deliantra client", 0 };
609	(main) (1, argv);	633	(main) (1, argv);
610	}	634	}
611	#else	635	#else
612	static void	636	static void
613	SDL_braino (void)	637	SDL_main_hack (SV *real_main)
614	{	638	{
615	deliantra_main ();	639	deliantra_main (real_main);
616	}	640	}
617	#endif	641	#endif
618		642
619	MODULE = Deliantra::Client PACKAGE = DC	643	MODULE = Deliantra::Client PACKAGE = DC
620		644
…		…
871	#endif	895	#endif
872	}	896	}
873		897
874	char *SDL_GetError ()	898	char *SDL_GetError ()
875		899
876	void SDL_braino ()	900	void SDL_main_hack (SV *real_main)
		901	PROTOTYPE: &
877		902
878	int SDL_Init (U32 flags)	903	int SDL_Init (U32 flags)
879		904
880	int SDL_InitSubSystem (U32 flags)	905	int SDL_InitSubSystem (U32 flags)
881		906
882	void SDL_QuitSubSystem (U32 flags)	907	void SDL_QuitSubSystem (U32 flags)
883		908
884	void SDL_Quit ()	909	void SDL_Quit ()
885		910
886	int SDL_GL_SetAttribute (int attr, int value)	911	int SDL_GL_SetAttribute (int attr, int value)
		912	C_ARGS: (SDL_GLattr)attr, value
887		913
888	int SDL_GL_GetAttribute (int attr)	914	int SDL_GL_GetAttribute (int attr)
889	CODE:	915	CODE:
890	if (SDL_GL_GetAttribute (attr, &RETVAL))	916	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891	XSRETURN_UNDEF;	917	XSRETURN_UNDEF;
892	OUTPUT:	918	OUTPUT:
893	RETVAL	919	RETVAL
894		920
895	void	921	void
…		…
950	);	976	);
951		977
952	if (RETVAL)	978	if (RETVAL)
953	{	979	{
954	av_clear (texture_av);	980	av_clear (texture_av);
955
956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	981	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958	#include "glfunc.h"	982	#include "glfunc.h"
959	#undef GL_FUNC	983	#undef GL_FUNC
960
961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	984	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	985	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963	}	986	}
964	}	987	}
965	OUTPUT:	988	OUTPUT:
966	RETVAL	989	RETVAL
967		990
968	void	991	void
		992	SDL_WM_SetCaption (const char title, const char icon)
		993
		994	void
969	SDL_GL_SwapBuffers ()	995	SDL_GL_SwapBuffers ()
970		996
971	char *	997	char *
972	SDL_GetKeyName (int sym)	998	SDL_GetKeyName (int sym)
		999	C_ARGS: (SDLKey)sym
973		1000
974	int	1001	int
975	SDL_GetAppState ()	1002	SDL_GetAppState ()
976		1003
977	int	1004	int
978	SDL_GetModState ()	1005	SDL_GetModState ()
979		1006
		1007	int
		1008	SDL_WaitEvent ()
		1009	C_ARGS: 0
		1010
980	void	1011	void
		1012	SDL_PumpEvents ()
		1013
		1014	void
981	poll_events ()	1015	peep_events ()
982	PPCODE:	1016	PPCODE:
983	{	1017	{
984	SDL_Event ev;	1018	SDL_Event ev;
985		1019
986	SDL_PumpEvents ();	1020	SDL_PumpEvents ();
…		…
1067	OUTPUT:	1101	OUTPUT:
1068	RETVAL	1102	RETVAL
1069		1103
1070	int	1104	int
1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1105	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1072	POSTCALL:	1106	POSTCALL:
1073	Mix_HookMusicFinished (music_finished);	1107	Mix_HookMusicFinished (music_finished);
1074	Mix_ChannelFinished (channel_finished);	1108	Mix_ChannelFinished (channel_finished);
1075		1109
1076	void	1110	void
1077	Mix_QuerySpec ()	1111	Mix_QuerySpec ()
…		…
1140	RETVAL	1174	RETVAL
1141		1175
1142	void	1176	void
1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)	1177	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1144		1178
		1179	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1145	void	1180	void
1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)	1181	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1147		1182
1148	void	1183	void
1149	load_image_inline (SV *image_)	1184	load_image_inline (SV *image_)
1150	ALIAS:	1185	ALIAS:
1151	load_image_file = 1	1186	load_image_file = 1
…		…
1197		1232
1198	SDL_LockSurface (surface2);	1233	SDL_LockSurface (surface2);
1199	EXTEND (SP, 6);	1234	EXTEND (SP, 6);
1200	PUSHs (sv_2mortal (newSViv (surface2->w)));	1235	PUSHs (sv_2mortal (newSViv (surface2->w)));
1201	PUSHs (sv_2mortal (newSViv (surface2->h)));	1236	PUSHs (sv_2mortal (newSViv (surface2->h)));
1202	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1237	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1203	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1238	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1204	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1239	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1205	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1240	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1206	SDL_UnlockSurface (surface2);	1241	SDL_UnlockSurface (surface2);
1207		1242
…		…
1279	MODULE = Deliantra::Client PACKAGE = DC::Font	1314	MODULE = Deliantra::Client PACKAGE = DC::Font
1280		1315
1281	PROTOTYPES: DISABLE	1316	PROTOTYPES: DISABLE
1282		1317
1283	DC::Font	1318	DC::Font
1284	new_from_file (SV class, char path, int id = 0)	1319	new_from_file (SV klass, char path, int id = 0)
1285	CODE:	1320	CODE:
1286	{	1321	{
1287	int count;	1322	int count;
1288	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1323	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1289	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1324	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1318	PROTOTYPE:	1353	PROTOTYPE:
1319	CODE:	1354	CODE:
1320	tc_restore ();	1355	tc_restore ();
1321		1356
1322	DC::Layout	1357	DC::Layout
1323	new (SV *class)	1358	new (SV *klass)
1324	CODE:	1359	CODE:
1325	New (0, RETVAL, 1, struct cf_layout);	1360	RETVAL = new cf_layout;
1326		1361
1327	RETVAL->pl = pango_layout_new (opengl_context);	1362	RETVAL->pl = pango_layout_new (opengl_context);
1328	RETVAL->r = 1.;	1363	RETVAL->r = 1.;
1329	RETVAL->g = 1.;	1364	RETVAL->g = 1.;
1330	RETVAL->b = 1.;	1365	RETVAL->b = 1.;
1331	RETVAL->a = 1.;	1366	RETVAL->a = 1.;
1332	RETVAL->base_height = MIN_FONT_HEIGHT;	1367	RETVAL->base_height = MIN_FONT_HEIGHT;
1333	RETVAL->font = 0;	1368	RETVAL->font = 0;
1334	RETVAL->rc = rc_alloc ();
1335		1369
1336	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1370	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1337	layout_update_font (RETVAL);	1371	layout_update_font (RETVAL);
1338	OUTPUT:	1372	OUTPUT:
1339	RETVAL	1373	RETVAL
1340		1374
1341	void	1375	void
1342	DESTROY (DC::Layout self)	1376	DESTROY (DC::Layout self)
1343	CODE:	1377	CODE:
1344	g_object_unref (self->pl);	1378	g_object_unref (self->pl);
1345	rc_free (self->rc);
1346	Safefree (self);	1379	delete self;
1347		1380
1348	void	1381	void
1349	set_text (DC::Layout self, SV *text_)	1382	set_text (DC::Layout self, SV *text_)
1350	CODE:	1383	CODE:
1351	{	1384	{
…		…
1477		1510
1478	void	1511	void
1479	set_height (DC::Layout self, int base_height)	1512	set_height (DC::Layout self, int base_height)
1480	CODE:	1513	CODE:
1481	if (self->base_height != base_height)	1514	if (self->base_height != base_height)
1482	{	1515	{
1483	self->base_height = base_height;	1516	self->base_height = base_height;
1484	layout_update_font (self);	1517	layout_update_font (self);
1485	}	1518	}
1486		1519
1487	void	1520	void
…		…
1605	}	1638	}
1606		1639
1607	void	1640	void
1608	render (DC::Layout self, float x, float y, int flags = 0)	1641	render (DC::Layout self, float x, float y, int flags = 0)
1609	CODE:	1642	CODE:
1610	rc_clear (self->rc);	1643	self->rc.clear ();
1611	pango_opengl_render_layout_subpixel (	1644	pango_opengl_render_layout_subpixel (
1612	self->pl,	1645	self->pl,
1613	self->rc,	1646	&self->rc,
1614	x * PANGO_SCALE, y * PANGO_SCALE,	1647	x * PANGO_SCALE, y * PANGO_SCALE,
1615	self->r, self->g, self->b, self->a,	1648	self->r, self->g, self->b, self->a,
1616	flags	1649	flags
1617	);	1650	);
1618	// we assume that context_change actually clears/frees stuff	1651	// we assume that context_change actually clears/frees stuff
…		…
1629	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1662	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1630	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1663	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1631	glEnable (GL_ALPHA_TEST);	1664	glEnable (GL_ALPHA_TEST);
1632	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1665	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1633		1666
1634	rc_draw (self->rc);	1667	self->rc.draw ();
1635		1668
1636	glDisable (GL_ALPHA_TEST);	1669	glDisable (GL_ALPHA_TEST);
1637	glDisable (GL_BLEND);	1670	glDisable (GL_BLEND);
1638	glDisable (GL_TEXTURE_2D);	1671	glDisable (GL_TEXTURE_2D);
1639	}	1672	}
…		…
1851	MODULE = Deliantra::Client PACKAGE = DC::Map	1884	MODULE = Deliantra::Client PACKAGE = DC::Map
1852		1885
1853	PROTOTYPES: DISABLE	1886	PROTOTYPES: DISABLE
1854		1887
1855	DC::Map	1888	DC::Map
1856	new (SV *class)	1889	new (SV *klass)
1857	CODE:	1890	CODE:
1858	New (0, RETVAL, 1, struct map);	1891	RETVAL = new mapgrid;
1859	RETVAL->x = 0;	1892	RETVAL->x = 0;
1860	RETVAL->y = 0;	1893	RETVAL->y = 0;
1861	RETVAL->w = 0;	1894	RETVAL->w = 0;
1862	RETVAL->h = 0;	1895	RETVAL->h = 0;
1863	RETVAL->ox = 0;	1896	RETVAL->ox = 0;
1864	RETVAL->oy = 0;	1897	RETVAL->oy = 0;
1865	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1866	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1867	RETVAL->rows = 0;	1898	RETVAL->rows = 0;
1868	RETVAL->row = 0;	1899	RETVAL->row = 0;
1869	OUTPUT:	1900	OUTPUT:
1870	RETVAL	1901	RETVAL
1871		1902
1872	void	1903	void
1873	DESTROY (DC::Map self)	1904	DESTROY (DC::Map self)
1874	CODE:	1905	CODE:
1875	{	1906	{
1876	map_clear (self);
1877	Safefree (self->face2tile);
1878	Safefree (self->tex);
1879	Safefree (self);	1907	delete self;
1880	}	1908	}
1881		1909
1882	void	1910	void
1883	resize (DC::Map self, int map_width, int map_height)	1911	resize (DC::Map self, int map_width, int map_height)
1884	CODE:	1912	CODE:
…		…
1886	self->h = map_height;	1914	self->h = map_height;
1887		1915
1888	void	1916	void
1889	clear (DC::Map self)	1917	clear (DC::Map self)
1890	CODE:	1918	CODE:
1891	map_clear (self);	1919	self->clear_cells ();
1892		1920
1893	void	1921	void
1894	set_tileid (DC::Map self, int face, int tile)	1922	set_tileid (DC::Map self, int face, int tile)
1895	CODE:	1923	CODE:
1896	{	1924	{
1897	need_facenum (self, face); self->face2tile [face] = tile;	1925	if (self->tile.size () <= face) self->tile.resize (face + 1);
1898	need_texid (self, tile);	1926	self->tile[face] = tile;
		1927	if (self->tex.size () <= tile) self->tex .resize (tile + 1);
1899	}	1928	}
1900		1929
1901	void	1930	void
1902	set_smooth (DC::Map self, int face, int smooth, int level)	1931	set_smooth (DC::Map self, int face, int smooth, int level)
1903	CODE:	1932	CODE:
1904	{	1933	{
1905	tileid texid;
1906	maptex *tex;
1907
1908	if (face < 0 \|\| face >= self->faces)	1934	if (face < 0 \|\| face >= self->tile.size ())
1909	return;	1935	return;
1910		1936
1911	if (smooth < 0 \|\| smooth >= self->faces)	1937	if (smooth < 0 \|\| smooth >= self->tile.size ())
1912	return;	1938	return;
1913		1939
1914	texid = self->face2tile [face];	1940	tileid texid = self->tile[face];
1915		1941
1916	if (!texid)	1942	if (!texid)
1917	return;	1943	return;
1918		1944
1919	tex = self->tex + texid;	1945	maptex &tex = self->tex[texid];
1920	tex->smoothtile = self->face2tile [smooth];	1946	tex.smoothtile = self->tile[smooth];
1921	tex->smoothlevel = level;	1947	tex.smoothlevel = level;
1922	}	1948	}
1923		1949
1924	void	1950	void
1925	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1951	set_texture (DC::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1926	CODE:	1952	CODE:
1927	{	1953	{
1928	need_texid (self, texid);	1954	if (self->tex.size () < texid) self->tex.resize (texid + 1);
1929		1955
1930	{	1956	{
1931	maptex *tex = self->tex + texid;	1957	maptex &tex = self->tex[texid];
1932		1958
1933	tex->name = name;	1959	tex.name = name;
1934	tex->w = w;	1960	tex.w = w;
1935	tex->h = h;	1961	tex.h = h;
1936	tex->s = s;	1962	tex.s = s;
1937	tex->t = t;	1963	tex.t = t;
1938	tex->r = r;	1964	tex.r = r;
1939	tex->g = g;	1965	tex.g = g;
1940	tex->b = b;	1966	tex.b = b;
1941	tex->a = a;	1967	tex.a = a;
1942	}	1968	}
1943		1969
1944	// somewhat hackish, but for textures that require it, it really	1970	// somewhat hackish, but for textures that require it, it really
1945	// improves the look, and most others don't suffer.	1971	// improves the look, and most others don't suffer.
1946	glBindTexture (GL_TEXTURE_2D, name);	1972	glBindTexture (GL_TEXTURE_2D, name);
…		…
1952	}	1978	}
1953		1979
1954	void	1980	void
1955	expire_textures (DC::Map self, int texid, int count)	1981	expire_textures (DC::Map self, int texid, int count)
1956	PPCODE:	1982	PPCODE:
1957	for (; texid < self->texs && count; ++texid, --count)	1983	for (; texid < self->tex.size () && count; ++texid, --count)
1958	{	1984	{
1959	maptex *tex = self->tex + texid;	1985	maptex &tex = self->tex[texid];
1960		1986
1961	if (tex->name)	1987	if (tex.name)
1962	{	1988	{
1963	if (tex->unused)	1989	if (tex.unused)
1964	{	1990	{
1965	tex->name = 0;	1991	tex.name = 0;
1966	tex->unused = 0;	1992	tex.unused = 0;
1967	XPUSHs (sv_2mortal (newSViv (texid)));	1993	XPUSHs (sv_2mortal (newSViv (texid)));
1968	}	1994	}
1969	else	1995	else
1970	tex->unused = 1;	1996	tex.unused = 1;
1971	}	1997	}
1972	}	1998	}
1973		1999
1974	int	2000	int
1975	ox (DC::Map self)	2001	ox (DC::Map self)
…		…
2017	self->y += MAP_EXTEND_Y;	2043	self->y += MAP_EXTEND_Y;
2018	}	2044	}
2019	}	2045	}
2020		2046
2021	SV *	2047	SV *
2022	map1a_update (DC::Map self, SV *data_, int extmap)	2048	map1a_update (DC::Map self, SV *data_)
2023	CODE:	2049	CODE:
2024	{	2050	{
2025	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2051	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2026	uint8_t data_end = (uint8_t )SvEND (data_);	2052	uint8_t data_end = (uint8_t )SvEND (data_);
2027	mapcell *cell;	2053	mapcell *cell;
…		…
2048		2074
2049	//TODO: don't trust server data to be in-range(!)	2075	//TODO: don't trust server data to be in-range(!)
2050		2076
2051	if (flags & 8)	2077	if (flags & 8)
2052	{	2078	{
		2079	uint8_t ext, cmd;
		2080
2053	if (extmap)	2081	do
2054	{	2082	{
2055	uint8_t ext, cmd;	2083	ext = *data++;
		2084	cmd = ext & 0x7f;
2056		2085
2057	do	2086	if (cmd < 4)
		2087	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2088	else if (cmd == 5) // health
2058	{	2089	{
2059	ext = *data++;
2060	cmd = ext & 0x7f;
2061
2062	if (cmd < 4)
2063	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2064	else if (cmd == 5) // health
2065	{
2066	cell->stat_width = 1;	2090	cell->stat_width = 1;
2067	cell->stat_hp = *data++;	2091	cell->stat_hp = *data++;
2068	}
2069	else if (cmd == 6) // monster width
2070	cell->stat_width = *data++ + 1;
2071	else if (cmd == 0x47)
2072	{
2073	if (*data == 1) cell->player = data [1];
2074	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2077
2078	data += *data + 1;
2079	}
2080	else if (cmd == 8) // cell flags
2081	cell->flags = *data++;
2082	else if (ext & 0x40) // unknown, multibyte => skip
2083	data += *data + 1;
2084	else
2085	data++;
2086	}	2092	}
2087	while (ext & 0x80);	2093	else if (cmd == 6) // monster width
		2094	cell->stat_width = *data++ + 1;
		2095	else if (cmd == 0x47)
		2096	{
		2097	if (*data == 1) cell->player = data [1];
		2098	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2099	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2100	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2101
		2102	data += *data + 1;
		2103	}
		2104	else if (cmd == 8) // cell flags
		2105	cell->flags = *data++;
		2106	else if (ext & 0x40) // unknown, multibyte => skip
		2107	data += *data + 1;
		2108	else
		2109	data++;
2088	}	2110	}
2089	else	2111	while (ext & 0x80);
2090	cell->darkness = *data++ + 1;
2091	}	2112	}
2092		2113
2093	for (z = 0; z <= 2; ++z)	2114	for (z = 0; z <= 2; ++z)
2094	if (flags & (4 >> z))	2115	if (flags & (4 >> z))
2095	{	2116	{
2096	faceid face = (data [0] << 8) + data [1]; data += 2;	2117	faceid face = (data[0] << 8) + data[1]; data += 2;
2097	need_facenum (self, face);	2118	if (self->tile.size () <= face) self->tile.resize (face + 1);
2098	cell->tile [z] = self->face2tile [face];	2119	cell->tile[z] = self->tile[face];
2099		2120
2100	if (cell->tile [z])	2121	if (cell->tile[z])
2101	{	2122	{
2102	maptex *tex = self->tex + cell->tile [z];	2123	maptex &tex = self->tex[cell->tile[z]];
2103	tex->unused = 0;	2124	tex.unused = 0;
2104	if (!tex->name)	2125	if (!tex.name)
2105	av_push (missing, newSViv (cell->tile [z]));	2126	av_push (missing, newSViv (cell->tile [z]));
2106		2127
2107	if (tex->smoothtile)	2128	if (tex.smoothtile)
2108	{	2129	{
2109	maptex *smooth = self->tex + tex->smoothtile;	2130	maptex &smooth = self->tex[tex.smoothtile];
2110	smooth->unused = 0;	2131	smooth.unused = 0;
2111	if (!smooth->name)	2132	if (!smooth.name)
2112	av_push (missing, newSViv (tex->smoothtile));	2133	av_push (missing, newSViv (tex.smoothtile));
2113	}	2134	}
2114	}	2135	}
2115	}	2136	}
2116	}	2137	}
2117	else	2138	else
…		…
2169	\| (b << 16)	2190	\| (b << 16)
2170	\| (a << 24);	2191	\| (a << 24);
2171	}	2192	}
2172	}	2193	}
2173		2194
2174	RETVAL = map_sv;	2195	RETVAL = map_sv;
2175	}	2196	}
2176	OUTPUT:	2197	OUTPUT:
2177	RETVAL	2198	RETVAL
2178		2199
2179	void	2200	void
2180	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)	2201	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)
2181	CODE:	2202	CODE:
2182	{	2203	{
2183	int x, y, z;	2204	int x, y, z;
2184		2205
2185	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2186	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2187	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2206	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2188	smooth_key skey;
2189	int pl_x, pl_y;	2207	int pl_x, pl_y;
2190	maptex pl_tex;	2208	maptex pl_tex;
2191	rc_t *rc = rc_alloc ();	2209	rc_t rc;
2192	rc_t *rc_ov = rc_alloc ();	2210	rc_t rc_ov;
2193	rc_key_t key;	2211	rc_key_t key;
2194	rc_array_t *arr;	2212	rc_t::array_t *arr;
2195		2213
2196	pl_tex.name = 0;	2214	pl_tex.name = 0;
2197		2215
2198	// that's current max. sorry.	2216	// that's current max. sorry.
2199	if (sw > 255) sw = 255;	2217	if (sw > 255) sw = 255;
2200	if (sh > 255) sh = 255;	2218	if (sh > 255) sh = 255;
2201
2202	// clear key, in case of extra padding
2203	memset (&skey, 0, sizeof (skey));
2204		2219
2205	memset (&key, 0, sizeof (key));	2220	memset (&key, 0, sizeof (key));
2206	key.r = 255;	2221	key.r = 255;
2207	key.g = 255;	2222	key.g = 255;
2208	key.b = 255;	2223	key.b = 255;
…		…
2214	my += self->y;	2229	my += self->y;
2215		2230
2216	// first pass: determine smooth_max	2231	// first pass: determine smooth_max
2217	// rather ugly, if you ask me	2232	// rather ugly, if you ask me
2218	// could also be stored inside mapcell and updated on change	2233	// could also be stored inside mapcell and updated on change
2219	memset (smooth_max, 0, sizeof (smooth_max));	2234	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2220		2235
2221	for (y = 0; y < sh; y++)	2236	for (y = 0; y < sh; y++)
2222	if (0 <= y + my && y + my < self->rows)	2237	if (0 <= y + my && y + my < self->rows)
2223	{	2238	{
2224	maprow *row = self->row + (y + my);	2239	maprow *row = self->row + (y + my);
…		…
2239	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2254	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2255	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2241		2256
2242	for (z = 0; z <= 2; z++)	2257	for (z = 0; z <= 2; z++)
2243	{	2258	{
2244	memset (smooth_level, 0, sizeof (smooth_level));	2259	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2260	smooth_key skey;
		2261	smooth_hash smooth;
2245	key.texname = -1;	2262	key.texname = -1;
2246		2263
2247	for (y = 0; y < sh; y++)	2264	for (y = 0; y < sh; y++)
2248	if (0 <= y + my && y + my < self->rows)	2265	if (0 <= y + my && y + my < self->rows)
2249	{	2266	{
…		…
2266		2283
2267	if (!tex.name)	2284	if (!tex.name)
2268	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2285	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2269		2286
2270	key.texname = tex.name;	2287	key.texname = tex.name;
2271	arr = rc_array (rc, &key);	2288	arr = &rc.array (key);
2272	}	2289	}
2273		2290
2274	px = (x + 1) * Th - tex.w;	2291	px = (x + 1) * Th - tex.w;
2275	py = (y + 1) * Tw - tex.h;	2292	py = (y + 1) * Tw - tex.h;
2276		2293
…		…
2280	pl_y = py;	2297	pl_y = py;
2281	pl_tex = tex;	2298	pl_tex = tex;
2282	continue;	2299	continue;
2283	}	2300	}
2284		2301
2285	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2302	arr->t2f_v3f (0 , 0 , px , py , 0);
2286	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2303	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2287	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2304	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2288	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2305	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2289		2306
2290	// update smooth hash	2307	// update smooth hash
2291	if (tex.smoothtile)	2308	if (tex.smoothtile)
2292	{	2309	{
2293	skey.tile = tex.smoothtile;	2310	skey.tile = tex.smoothtile;
2294	skey.level = tex.smoothlevel;	2311	skey.level = tex.smoothlevel;
2295		2312
2296	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2313	smooth_level[tex.smoothlevel] = 1;
2297		2314
2298	// add bits to current tile and all neighbours. skey.x\|y is	2315	// add bits to current tile and all neighbours. skey.x\|y is
2299	// shifted +1\|+1 so we always stay positive.	2316	// shifted +1\|+1 so we always stay positive.
2300		2317
2301	// bits is ___n cccc CCCC bbbb	2318	// bits is ___n cccc CCCC bbbb
…		…
2309		2326
2310	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2327	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2311	// ·· ·· ·┏ ┓·	2328	// ·· ·· ·┏ ┓·
2312		2329
2313	// full tile	2330	// full tile
2314	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2331	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2315		2332
2316	// borders	2333	// borders
2317	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2334	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2318	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2335	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2319	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2336	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2320	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2337	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2321		2338
2322	// corners	2339	// corners
2323	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2340	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2324	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2341	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2325	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2342	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2326	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2343	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2327	}	2344	}
2328	}	2345	}
2329		2346
2330	if (expect_false (z == 2) && expect_false (cell->flags))	2347	if (expect_false (z == 2) && expect_false (cell->flags))
2331	{	2348	{
2332	// overlays such as the speech bubble, probably more to come	2349	// overlays such as the speech bubble, probably more to come
2333	if (cell->flags & 1)	2350	if (cell->flags & 1)
2334	{	2351	{
2335	rc_key_t key_ov = key;	2352	rc_key_t key_ov = key;
2336	maptex tex = self->tex [TEXID_SPEECH];	2353	maptex tex = self->tex[TEXID_SPEECH];
2337	rc_array_t *arr;
2338	int px = x * Tw + Tw * 2 / 32;	2354	int px = x * Tw + Tw * 2 / 32;
2339	int py = y * Th - Th * 6 / 32;	2355	int py = y * Th - Th * 6 / 32;
2340		2356
2341	key_ov.texname = tex.name;	2357	key_ov.texname = tex.name;
2342	arr = rc_array (rc_ov, &key_ov);	2358	rc_t::array_t &arr = rc_ov.array (key_ov);
2343		2359
2344	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2360	arr.t2f_v3f (0 , 0 , px , py , 0);
2345	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);	2361	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2346	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);	2362	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2347	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);	2363	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2348	}	2364	}
2349	}	2365	}
2350	}	2366	}
2351	}	2367	}
2352		2368
2353	rc_draw (rc);	2369	rc.draw ();
2354	rc_clear (rc);	2370	rc.clear ();
2355		2371
2356	// go through all smoothlevels, lowest to highest, then draw.	2372	// go through all smoothlevels, lowest to highest, then draw.
2357	// this is basically counting sort	2373	// this is basically counting sort
2358	{	2374	{
2359	int w, b;	2375	int w, b;
2360		2376
2361	glEnable (GL_TEXTURE_2D);	2377	glEnable (GL_TEXTURE_2D);
2362	glBegin (GL_QUADS);	2378	glBegin (GL_QUADS);
2363	for (w = 0; w < 256 / 32; ++w)	2379	for (int level = 0; level < smooth_level.size (); ++level)
		2380	if (smooth_level[level])
		2381	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2364	{	2382	{
2365	uint32_t smask = smooth_level [w];	2383	smooth_key &skey = it->first;
2366	if (smask)	2384	IV bits = it->second;
2367	for (b = 0; b < 32; ++b)	2385
2368	if (smask & (((uint32_t)1) << b))	2386	if (!(bits & 0x1000)
		2387	&& skey.level == level
		2388	&& level > smooth_max [skey.x][skey.y])
2369	{	2389	{
2370	int level = (w << 5) \| b;	2390	maptex tex = self->tex [skey.tile];
		2391	int px = (((int)skey.x) - 1) * Tw;
		2392	int py = (((int)skey.y) - 1) * Th;
		2393	int border = bits & 15;
		2394	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2395	float dx = tex.s * .0625f; // 16 images/row
		2396	float dy = tex.t * .5f ; // 2 images/column
		2397
2371	HE *he;	2398	if (tex.name)
2372
2373	hv_iterinit (smooth);
2374	while ((he = hv_iternext (smooth)))
2375	{	2399	{
2376	smooth_key skey = (smooth_key )HeKEY (he);	2400	// this time avoiding texture state changes
2377	IV bits = SvIVX (HeVAL (he));	2401	// save gobs of state changes.
2378		2402	if (key.texname != tex.name)
2379	if (!(bits & 0x1000)
2380	&& skey->level == level
2381	&& level > smooth_max [skey->x][skey->y])
2382	{	2403	{
2383	maptex tex = self->tex [skey->tile];
2384	int px = (((int)skey->x) - 1) * Tw;
2385	int py = (((int)skey->y) - 1) * Th;
2386	int border = bits & 15;
2387	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2388	float dx = tex.s * .0625f; // 16 images/row
2389	float dy = tex.t * .5f ; // 2 images/column
2390
2391	if (tex.name)
2392	{
2393	// this time avoiding texture state changes
2394	// save gobs of state changes.
2395	if (key.texname != tex.name)
2396	{
2397	self->tex [skey->tile].unused = 0;	2404	self->tex [skey.tile].unused = 0;
2398		2405
2399	glEnd ();	2406	glEnd ();
2400	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2407	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2401	glBegin (GL_QUADS);	2408	glBegin (GL_QUADS);
2402	}	2409	}
2403		2410
2404	if (border)	2411	if (border)
2405	{	2412	{
2406	float ox = border * dx;	2413	float ox = border * dx;
2407		2414
2408	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2415	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2409	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);	2416	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2410	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);	2417	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2411	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );	2418	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2412	}	2419	}
2413		2420
2414	if (corner)	2421	if (corner)
2415	{	2422	{
2416	float ox = corner * dx;	2423	float ox = corner * dx;
2417		2424
2418	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2425	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2419	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);	2426	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2420	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);	2427	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2421	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );	2428	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2422	}
2423	}
2424	}	2429	}
2425	}	2430	}
2426	}	2431	}
2427	}	2432	}
2428		2433
2429	glEnd ();	2434	glEnd ();
2430	glDisable (GL_TEXTURE_2D);	2435	glDisable (GL_TEXTURE_2D);
2431	key.texname = -1;	2436	key.texname = -1;
2432	}	2437	}
2433
2434	hv_clear (smooth);
2435	}	2438	}
2436		2439
2437	if (pl_tex.name)	2440	if (pl_tex.name)
2438	{	2441	{
2439	maptex tex = pl_tex;	2442	maptex tex = pl_tex;
2440	int px = pl_x + sdx;	2443	int px = pl_x + sdx;
2441	int py = pl_y + sdy;	2444	int py = pl_y + sdy;
2442		2445
2443	key.texname = tex.name;	2446	key.texname = tex.name;
2444	arr = rc_array (rc, &key);	2447	rc_t::array_t &arr = rc.array (key);
2445		2448
2446	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2449	arr.t2f_v3f (0 , 0 , px , py , 0);
2447	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2450	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2448	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2451	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2449	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2452	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2450		2453
2451	rc_draw (rc);	2454	rc.draw ();
2452	}	2455	}
2453		2456
2454	rc_draw (rc_ov);	2457	rc_ov.draw ();
2455	rc_clear (rc_ov);	2458	rc_ov.clear ();
2456		2459
2457	glDisable (GL_BLEND);	2460	glDisable (GL_BLEND);
2458	rc_free (rc);
2459	rc_free (rc_ov);
2460		2461
2461	// top layer: overlays such as the health bar	2462	// top layer: overlays such as the health bar
2462	for (y = 0; y < sh; y++)	2463	for (y = 0; y < sh; y++)
2463	if (0 <= y + my && y + my < self->rows)	2464	if (0 <= y + my && y + my < self->rows)
2464	{	2465	{
…		…
2708	else	2709	else
2709	*data++ = 0;	2710	*data++ = 0;
2710	}	2711	}
2711	}	2712	}
2712		2713
2713	/* if size is wh + 5 then no data has been found /	2714	/* if size is wh + 5 then no data has been found /
2714	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2715	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2715	{	2716	{
2716	SvPOK_only (data_sv);	2717	SvPOK_only (data_sv);
2717	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2718	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718	}	2719	}
2719		2720
2720	RETVAL = data_sv;	2721	RETVAL = data_sv;
2721	}	2722	}
2722	OUTPUT:	2723	OUTPUT:
2723	RETVAL	2724	RETVAL
2724		2725
2725	void	2726	void
…		…
2732	STRLEN len;	2733	STRLEN len;
2733	uint8_t data, end;	2734	uint8_t data, end;
2734		2735
2735	len = SvLEN (data_sv);	2736	len = SvLEN (data_sv);
2736	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2737	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737	data = SvPVbyte_nolen (data_sv);	2738	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2738	end = data + len + 8;	2739	end = data + len + 8;
2739		2740
2740	if (len < 5)	2741	if (len < 5)
2741	XSRETURN_EMPTY;	2742	XSRETURN_EMPTY;
2742		2743
…		…
2786		2787
2787	for (z = 0; z <= 2; z++)	2788	for (z = 0; z <= 2; z++)
2788	{	2789	{
2789	tileid t = tile [z];	2790	tileid t = tile [z];
2790		2791
2791	if (t >= self->texs \|\| (t && !self->tex [t].name))	2792	if (t >= self->tex.size () \|\| (t && !self->tex[t].name))
2792	{	2793	{
2793	PUSHs (sv_2mortal (newSViv (t)));	2794	PUSHs (sv_2mortal (newSViv (t)));
2794	need_texid (self, t);	2795	if (self->tex.size () <= t) self->tex.resize (t + 1);
2795	}	2796	}
2796		2797
2797	cell->tile [z] = t;	2798	cell->tile[z] = t;
2798	}	2799	}
2799	}	2800	}
2800	}	2801	}
2801	}	2802	}
2802	}	2803	}
2803	}	2804	}
2804		2805
2805	MODULE = Deliantra::Client PACKAGE = DC::RW	2806	MODULE = Deliantra::Client PACKAGE = DC::RW
2806		2807
2807	DC::RW	2808	DC::RW
2808	new (SV class, SV data_sv)	2809	new (SV klass, SV data_sv)
2809	CODE:	2810	CODE:
2810	{	2811	{
2811	STRLEN datalen;	2812	STRLEN datalen;
2812	char *data = SvPVbyte (data_sv, datalen);	2813	char *data = SvPVbyte (data_sv, datalen);
2813		2814
…		…
2815	}	2816	}
2816	OUTPUT:	2817	OUTPUT:
2817	RETVAL	2818	RETVAL
2818		2819
2819	DC::RW	2820	DC::RW
2820	new_from_file (SV class, const char path, const char *mode = "rb")	2821	new_from_file (SV klass, const char path, const char *mode = "rb")
2821	CODE:	2822	CODE:
2822	RETVAL = SDL_RWFromFile (path, mode);	2823	RETVAL = SDL_RWFromFile (path, mode);
2823	OUTPUT:	2824	OUTPUT:
2824	RETVAL	2825	RETVAL
2825		2826
…		…
2934	#else	2935	#else
2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2936	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936	#endif	2937	#endif
2937		2938
2938	DC::MixChunk	2939	DC::MixChunk
2939	new (SV *class, DC::RW rwops)	2940	new (SV *klass, DC::RW rwops)
2940	CODE:	2941	CODE:
2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2942	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2942	OUTPUT:	2943	OUTPUT:
2943	RETVAL	2944	RETVAL
2944		2945
…		…
3014	RETVAL = Mix_PlayingMusic ();	3015	RETVAL = Mix_PlayingMusic ();
3015	OUTPUT:	3016	OUTPUT:
3016	RETVAL	3017	RETVAL
3017		3018
3018	DC::MixMusic	3019	DC::MixMusic
3019	new (SV *class, DC::RW rwops)	3020	new (SV *klass, DC::RW rwops)
3020	CODE:	3021	CODE:
3021	RETVAL = Mix_LoadMUS_RW (rwops);	3022	RETVAL = Mix_LoadMUS_RW (rwops);
3022	OUTPUT:	3023	OUTPUT:
3023	RETVAL	3024	RETVAL
3024		3025
…		…
3177	gl.BlendFuncSeparateEXT = 0;	3178	gl.BlendFuncSeparateEXT = 0;
3178		3179
3179	void	3180	void
3180	apple_nvidia_bug (int enable)	3181	apple_nvidia_bug (int enable)
3181		3182
3182	char *	3183	const char *
3183	gl_vendor ()	3184	gl_vendor ()
3184	CODE:	3185	CODE:
3185	RETVAL = (char *)glGetString (GL_VENDOR);	3186	RETVAL = (const char *)glGetString (GL_VENDOR);
3186	OUTPUT:	3187	OUTPUT:
3187	RETVAL	3188	RETVAL
3188		3189
3189	char *	3190	const char *
3190	gl_version ()	3191	gl_version ()
3191	CODE:	3192	CODE:
3192	RETVAL = (char *)glGetString (GL_VERSION);	3193	RETVAL = (const char *)glGetString (GL_VERSION);
3193	OUTPUT:	3194	OUTPUT:
3194	RETVAL	3195	RETVAL
3195		3196
3196	char *	3197	const char *
3197	gl_extensions ()	3198	gl_extensions ()
3198	CODE:	3199	CODE:
3199	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3200	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3200	OUTPUT:	3201	OUTPUT:
3201	RETVAL	3202	RETVAL
3202		3203
3203	const char *glGetString (GLenum pname)	3204	const char *glGetString (GLenum pname)
		3205	CODE:
		3206	RETVAL = (const char *)glGetString (pname);
		3207	OUTPUT:
		3208	RETVAL
3204		3209
3205	GLint glGetInteger (GLenum pname)	3210	GLint glGetInteger (GLenum pname)
3206	CODE:	3211	CODE:
3207	glGetIntegerv (pname, &RETVAL);	3212	glGetIntegerv (pname, &RETVAL);
3208	OUTPUT:	3213	OUTPUT:
…		…
3411		3416
3412	void	3417	void
3413	find_widget (SV *self, NV x, NV y)	3418	find_widget (SV *self, NV x, NV y)
3414	PPCODE:	3419	PPCODE:
3415	{	3420	{
3416	if (within_widget (self, x, y))	3421	if (within_widget (self, x, y))
3417	XPUSHs (self);	3422	XPUSHs (self);
3418	}	3423	}
3419		3424
3420	BOOT:	3425	BOOT:
3421	{	3426	{
…		…
3429		3434
3430	void	3435	void
3431	draw (SV *self)	3436	draw (SV *self)
3432	CODE:	3437	CODE:
3433	{	3438	{
3434	HV *hv;	3439	HV *hv;
3435	SV **svp;	3440	SV **svp;
3436	NV x, y, w, h;	3441	NV x, y, w, h;
3437	SV *draw_x_sv = GvSV (draw_x_gv);	3442	SV *draw_x_sv = GvSV (draw_x_gv);
3438	SV *draw_y_sv = GvSV (draw_y_gv);	3443	SV *draw_y_sv = GvSV (draw_y_gv);
3439	SV *draw_w_sv = GvSV (draw_w_gv);	3444	SV *draw_w_sv = GvSV (draw_w_gv);
3440	SV *draw_h_sv = GvSV (draw_h_gv);	3445	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.309 by root, Mon Dec 26 22:30:21 2011 UTC vs. Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.309 by root, Mon Dec 26 22:30:21 2011 UTC vs.
Revision 1.327 by root, Sun Nov 18 12:01:50 2018 UTC