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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 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	int faces; tileid *face2tile; // [faceid]
283	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
284		294
285	int32_t rows;	295	int32_t rows;
286	maprow *row;	296	maprow *row;
287	} *DC__Map;	297	};
		298
		299	typedef mapgrid *DC__Map;
288		300
289	static char *	301	static char *
290	prepend (char *ptr, int sze, int inc)	302	prepend (char *ptr, int sze, int inc)
291	{	303	{
292	char *p;	304	char *p;
…		…
310		322
311	#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))
312	#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))
313		325
314	static void	326	static void
315	need_facenum (struct map *self, faceid face)	327	need_facenum (struct mapgrid *self, faceid face)
316	{	328	{
317	while (self->faces <= face)	329	while (self->faces <= face)
318	{	330	{
319	Append (tileid, self->face2tile, self->faces, self->faces);	331	Append (tileid, self->face2tile, self->faces, self->faces);
320	self->faces *= 2;	332	self->faces *= 2;
321	}	333	}
322	}	334	}
323		335
324	static void	336	static void
325	need_texid (struct map *self, int texid)	337	need_texid (struct mapgrid *self, int texid)
326	{	338	{
327	while (self->texs <= texid)	339	while (self->texs <= texid)
328	{	340	{
329	Append (maptex, self->tex, self->texs, self->texs);	341	Append (maptex, self->tex, self->texs, self->texs);
330	self->texs *= 2;	342	self->texs *= 2;
331	}	343	}
332	}	344	}
333		345
334	static maprow *	346	static maprow *
335	map_get_row (DC__Map self, int y)	347	map_get_row (mapgrid *self, int y)
336	{	348	{
337	if (0 > y)	349	if (0 > y)
338	{	350	{
339	int extend = - y + MAP_EXTEND_Y;	351	int extend = - y + MAP_EXTEND_Y;
340	Prepend (maprow, self->row, self->rows, extend);	352	Prepend (maprow, self->row, self->rows, extend);
…		…
378		390
379	return row->col + (x - row->c0);	391	return row->col + (x - row->c0);
380	}	392	}
381		393
382	static mapcell *	394	static mapcell *
383	map_get_cell (DC__Map self, int x, int y)	395	map_get_cell (mapgrid *self, int x, int y)
384	{	396	{
385	return row_get_cell (map_get_row (self, y), x);	397	return row_get_cell (map_get_row (self, y), x);
386	}	398	}
387		399
388	static void	400	static void
389	map_clear (DC__Map self)	401	map_clear (mapgrid *self)
390	{	402	{
391	int r;	403	int r;
392		404
393	for (r = 0; r < self->rows; r++)	405	for (r = 0; r < self->rows; r++)
394	Safefree (self->row[r].col);	406	Safefree (self->row[r].col);
…		…
412	(cell)->flags = 0; \	424	(cell)->flags = 0; \
413	(cell)->player = 0; \	425	(cell)->player = 0; \
414	} while (0)	426	} while (0)
415		427
416	static void	428	static void
417	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)
418	{	430	{
419	int x, y;	431	int x, y;
420	maprow *row;	432	maprow *row;
421	mapcell *cell;	433	mapcell *cell;
422		434
…		…
439	CELL_CLEAR (cell);	451	CELL_CLEAR (cell);
440	}	452	}
441	}	453	}
442	}	454	}
443		455
444	typedef struct {	456	struct smooth_key
		457	{
445	tileid tile;	458	tileid tile;
446	uint8_t x, y, level;	459	uint8_t x, y, level;
447	} 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	}
448		479
449	static void	480	static void
450	smooth_or_bits (HV hv, smooth_key key, IV bits)	481	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451	{	482	{
452	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	483	auto &&it = h.find (key);
453		484
454	if (SvIOK (*sv))	485	if (it == h.end ())
455	SvIV_set (sv, SvIVX (sv) \| bits);	486	h.insert (std::make_pair (key, bits));
456	else	487	else
457	sv_setiv (*sv, bits);	488	it->second \|= bits;
458	}	489	}
459		490
460	static void	491	static void
461	music_finished (void)	492	music_finished (void)
462	{	493	{
…		…
481	ev.data2 = 0;	512	ev.data2 = 0;
482		513
483	SDL_PushEvent ((SDL_Event *)&ev);	514	SDL_PushEvent ((SDL_Event *)&ev);
484	}	515	}
485		516
		517	// approximately divide by 255
486	static unsigned int	518	static unsigned int
487	div255 (unsigned int n)	519	div255 (unsigned int n)
488	{	520	{
489	return (n + (n >> 8)) >> 8;	521	return (n + (n >> 8)) >> 8;
490	}	522	}
…		…
577		609
578	return mod;	610	return mod;
579	}	611	}
580		612
581	static void	613	static void
582	deliantra_main ()	614	deliantra_main (SV *real_main)
583	{	615	{
584	char *argv[] = { 0 };	616	dSP;
585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);	617
		618	PUSHMARK (SP);
		619	call_sv (real_main, G_DISCARD \| G_VOID);
586	}	620	}
587		621
588	#ifdef __MACOSX__	622	#ifdef __MACOSX__
		623	static SV *real_main;
		624
589	/* to due surprising braindamage on the side of SDL design, we	625	/* to due surprising braindamage on the side of SDL design, we
590	* do some mind-boggling hack here: SDL requires a custom main()	626	* 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,	627	* on OS X, so... we provide one and call the original main(), which,
592	* due to shared library magic, calls -lSDLmain's main, not perl's main,	628	* due to shared library magic, calls -lSDLmain's main, not perl's main,
593	* and which calls our main (== SDL_main) back.	629	* and which calls our main (== SDL_main) back.
594	*/	630	*/
595	extern C_LINKAGE int	631	extern C_LINKAGE int
596	main (int argc, char *argv[])	632	main (int argc, char *argv[])
597	{	633	{
598	deliantra_main ();	634	deliantra_main (real_main);
599	}	635	}
600		636
601	#undef main	637	#undef main
602		638
603	extern C_LINKAGE int main (int argc, char *argv[]);	639	extern C_LINKAGE int main (int argc, char *argv[]);
604		640
605	static void	641	static void
606	SDL_braino (void)	642	SDL_main_hack (SV *real_main_)
607	{	643	{
		644	real_main = real_main_;
		645
608	char *argv[] = { "deliantra client", 0 };	646	char *argv[] = { "deliantra client", 0 };
609	(main) (1, argv);	647	(main) (1, argv);
610	}	648	}
611	#else	649	#else
612	static void	650	static void
613	SDL_braino (void)	651	SDL_main_hack (SV *real_main)
614	{	652	{
615	deliantra_main ();	653	deliantra_main (real_main);
616	}	654	}
617	#endif	655	#endif
618		656
619	MODULE = Deliantra::Client PACKAGE = DC	657	MODULE = Deliantra::Client PACKAGE = DC
620		658
…		…
871	#endif	909	#endif
872	}	910	}
873		911
874	char *SDL_GetError ()	912	char *SDL_GetError ()
875		913
876	void SDL_braino ()	914	void SDL_main_hack (SV *real_main)
		915	PROTOTYPE: &
877		916
878	int SDL_Init (U32 flags)	917	int SDL_Init (U32 flags)
879		918
880	int SDL_InitSubSystem (U32 flags)	919	int SDL_InitSubSystem (U32 flags)
881		920
882	void SDL_QuitSubSystem (U32 flags)	921	void SDL_QuitSubSystem (U32 flags)
883		922
884	void SDL_Quit ()	923	void SDL_Quit ()
885		924
886	int SDL_GL_SetAttribute (int attr, int value)	925	int SDL_GL_SetAttribute (int attr, int value)
		926	C_ARGS: (SDL_GLattr)attr, value
887		927
888	int SDL_GL_GetAttribute (int attr)	928	int SDL_GL_GetAttribute (int attr)
889	CODE:	929	CODE:
890	if (SDL_GL_GetAttribute (attr, &RETVAL))	930	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891	XSRETURN_UNDEF;	931	XSRETURN_UNDEF;
892	OUTPUT:	932	OUTPUT:
893	RETVAL	933	RETVAL
894		934
895	void	935	void
…		…
950	);	990	);
951		991
952	if (RETVAL)	992	if (RETVAL)
953	{	993	{
954	av_clear (texture_av);	994	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);	995	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958	#include "glfunc.h"	996	#include "glfunc.h"
959	#undef GL_FUNC	997	#undef GL_FUNC
960
961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	998	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	999	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963	}	1000	}
964	}	1001	}
965	OUTPUT:	1002	OUTPUT:
966	RETVAL	1003	RETVAL
967		1004
968	void	1005	void
		1006	SDL_WM_SetCaption (const char title, const char icon)
		1007
		1008	void
969	SDL_GL_SwapBuffers ()	1009	SDL_GL_SwapBuffers ()
970		1010
971	char *	1011	char *
972	SDL_GetKeyName (int sym)	1012	SDL_GetKeyName (int sym)
		1013	C_ARGS: (SDLKey)sym
973		1014
974	int	1015	int
975	SDL_GetAppState ()	1016	SDL_GetAppState ()
976		1017
977	int	1018	int
…		…
1074	OUTPUT:	1115	OUTPUT:
1075	RETVAL	1116	RETVAL
1076		1117
1077	int	1118	int
1078	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)
1079	POSTCALL:	1120	POSTCALL:
1080	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1081	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1082		1123
1083	void	1124	void
1084	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1205		1246
1206	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1207	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1208	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1209	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1210	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1211	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1252	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1212	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1213	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1214	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1215		1256
…		…
1287	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1288		1329
1289	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1290		1331
1291	DC::Font	1332	DC::Font
1292	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1293	CODE:	1334	CODE:
1294	{	1335	{
1295	int count;	1336	int count;
1296	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1297	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1326	PROTOTYPE:	1367	PROTOTYPE:
1327	CODE:	1368	CODE:
1328	tc_restore ();	1369	tc_restore ();
1329		1370
1330	DC::Layout	1371	DC::Layout
1331	new (SV *class)	1372	new (SV *klass)
1332	CODE:	1373	CODE:
1333	New (0, RETVAL, 1, struct cf_layout);	1374	New (0, RETVAL, 1, struct cf_layout);
1334		1375
1335	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1336	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
…		…
1485		1526
1486	void	1527	void
1487	set_height (DC::Layout self, int base_height)	1528	set_height (DC::Layout self, int base_height)
1488	CODE:	1529	CODE:
1489	if (self->base_height != base_height)	1530	if (self->base_height != base_height)
1490	{	1531	{
1491	self->base_height = base_height;	1532	self->base_height = base_height;
1492	layout_update_font (self);	1533	layout_update_font (self);
1493	}	1534	}
1494		1535
1495	void	1536	void
…		…
1859	MODULE = Deliantra::Client PACKAGE = DC::Map	1900	MODULE = Deliantra::Client PACKAGE = DC::Map
1860		1901
1861	PROTOTYPES: DISABLE	1902	PROTOTYPES: DISABLE
1862		1903
1863	DC::Map	1904	DC::Map
1864	new (SV *class)	1905	new (SV *klass)
1865	CODE:	1906	CODE:
1866	New (0, RETVAL, 1, struct map);	1907	New (0, RETVAL, 1, mapgrid);
1867	RETVAL->x = 0;	1908	RETVAL->x = 0;
1868	RETVAL->y = 0;	1909	RETVAL->y = 0;
1869	RETVAL->w = 0;	1910	RETVAL->w = 0;
1870	RETVAL->h = 0;	1911	RETVAL->h = 0;
1871	RETVAL->ox = 0;	1912	RETVAL->ox = 0;
…		…
1908		1949
1909	void	1950	void
1910	set_smooth (DC::Map self, int face, int smooth, int level)	1951	set_smooth (DC::Map self, int face, int smooth, int level)
1911	CODE:	1952	CODE:
1912	{	1953	{
1913	tileid texid;	1954	tileid texid;
1914	maptex *tex;	1955	maptex *tex;
1915		1956
1916	if (face < 0 \|\| face >= self->faces)	1957	if (face < 0 \|\| face >= self->faces)
1917	return;	1958	return;
1918		1959
1919	if (smooth < 0 \|\| smooth >= self->faces)	1960	if (smooth < 0 \|\| smooth >= self->faces)
1920	return;	1961	return;
1921		1962
1922	texid = self->face2tile [face];	1963	texid = self->face2tile [face];
1923		1964
1924	if (!texid)	1965	if (!texid)
1925	return;	1966	return;
1926		1967
1927	tex = self->tex + texid;	1968	tex = self->tex + texid;
…		…
1960	}	2001	}
1961		2002
1962	void	2003	void
1963	expire_textures (DC::Map self, int texid, int count)	2004	expire_textures (DC::Map self, int texid, int count)
1964	PPCODE:	2005	PPCODE:
1965	for (; texid < self->texs && count; ++texid, --count)	2006	for (; texid < self->texs && count; ++texid, --count)
1966	{	2007	{
1967	maptex *tex = self->tex + texid;	2008	maptex *tex = self->tex + texid;
1968		2009
1969	if (tex->name)	2010	if (tex->name)
1970	{	2011	{
…		…
2025	self->y += MAP_EXTEND_Y;	2066	self->y += MAP_EXTEND_Y;
2026	}	2067	}
2027	}	2068	}
2028		2069
2029	SV *	2070	SV *
2030	map1a_update (DC::Map self, SV *data_, int extmap)	2071	map1a_update (DC::Map self, SV *data_)
2031	CODE:	2072	CODE:
2032	{	2073	{
2033	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2074	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2034	uint8_t data_end = (uint8_t )SvEND (data_);	2075	uint8_t data_end = (uint8_t )SvEND (data_);
2035	mapcell *cell;	2076	mapcell *cell;
…		…
2056		2097
2057	//TODO: don't trust server data to be in-range(!)	2098	//TODO: don't trust server data to be in-range(!)
2058		2099
2059	if (flags & 8)	2100	if (flags & 8)
2060	{	2101	{
		2102	uint8_t ext, cmd;
		2103
2061	if (extmap)	2104	do
2062	{	2105	{
2063	uint8_t ext, cmd;	2106	ext = *data++;
		2107	cmd = ext & 0x7f;
2064		2108
2065	do	2109	if (cmd < 4)
		2110	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2111	else if (cmd == 5) // health
2066	{	2112	{
2067	ext = *data++;
2068	cmd = ext & 0x7f;
2069
2070	if (cmd < 4)
2071	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2072	else if (cmd == 5) // health
2073	{
2074	cell->stat_width = 1;	2113	cell->stat_width = 1;
2075	cell->stat_hp = *data++;	2114	cell->stat_hp = *data++;
2076	}
2077	else if (cmd == 6) // monster width
2078	cell->stat_width = *data++ + 1;
2079	else if (cmd == 0x47)
2080	{
2081	if (*data == 1) cell->player = data [1];
2082	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2083	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2084	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2085
2086	data += *data + 1;
2087	}
2088	else if (cmd == 8) // cell flags
2089	cell->flags = *data++;
2090	else if (ext & 0x40) // unknown, multibyte => skip
2091	data += *data + 1;
2092	else
2093	data++;
2094	}	2115	}
2095	while (ext & 0x80);	2116	else if (cmd == 6) // monster width
		2117	cell->stat_width = *data++ + 1;
		2118	else if (cmd == 0x47)
		2119	{
		2120	if (*data == 1) cell->player = data [1];
		2121	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2122	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2123	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2124
		2125	data += *data + 1;
		2126	}
		2127	else if (cmd == 8) // cell flags
		2128	cell->flags = *data++;
		2129	else if (ext & 0x40) // unknown, multibyte => skip
		2130	data += *data + 1;
		2131	else
		2132	data++;
2096	}	2133	}
2097	else	2134	while (ext & 0x80);
2098	cell->darkness = *data++ + 1;
2099	}	2135	}
2100		2136
2101	for (z = 0; z <= 2; ++z)	2137	for (z = 0; z <= 2; ++z)
2102	if (flags & (4 >> z))	2138	if (flags & (4 >> z))
2103	{	2139	{
…		…
2177	\| (b << 16)	2213	\| (b << 16)
2178	\| (a << 24);	2214	\| (a << 24);
2179	}	2215	}
2180	}	2216	}
2181		2217
2182	RETVAL = map_sv;	2218	RETVAL = map_sv;
2183	}	2219	}
2184	OUTPUT:	2220	OUTPUT:
2185	RETVAL	2221	RETVAL
2186		2222
2187	void	2223	void
2188	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2224	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2189	CODE:	2225	CODE:
2190	{	2226	{
2191	int x, y, z;	2227	int x, y, z;
2192		2228
2193	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2194	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2195	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2229	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2196	smooth_key skey;
2197	int pl_x, pl_y;	2230	int pl_x, pl_y;
2198	maptex pl_tex;	2231	maptex pl_tex;
2199	rc_t *rc = rc_alloc ();	2232	rc_t *rc = rc_alloc ();
2200	rc_t *rc_ov = rc_alloc ();	2233	rc_t *rc_ov = rc_alloc ();
2201	rc_key_t key;	2234	rc_key_t key;
…		…
2204	pl_tex.name = 0;	2237	pl_tex.name = 0;
2205		2238
2206	// that's current max. sorry.	2239	// that's current max. sorry.
2207	if (sw > 255) sw = 255;	2240	if (sw > 255) sw = 255;
2208	if (sh > 255) sh = 255;	2241	if (sh > 255) sh = 255;
2209
2210	// clear key, in case of extra padding
2211	memset (&skey, 0, sizeof (skey));
2212		2242
2213	memset (&key, 0, sizeof (key));	2243	memset (&key, 0, sizeof (key));
2214	key.r = 255;	2244	key.r = 255;
2215	key.g = 255;	2245	key.g = 255;
2216	key.b = 255;	2246	key.b = 255;
…		…
2222	my += self->y;	2252	my += self->y;
2223		2253
2224	// first pass: determine smooth_max	2254	// first pass: determine smooth_max
2225	// rather ugly, if you ask me	2255	// rather ugly, if you ask me
2226	// could also be stored inside mapcell and updated on change	2256	// could also be stored inside mapcell and updated on change
2227	memset (smooth_max, 0, sizeof (smooth_max));	2257	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2228		2258
2229	for (y = 0; y < sh; y++)	2259	for (y = 0; y < sh; y++)
2230	if (0 <= y + my && y + my < self->rows)	2260	if (0 <= y + my && y + my < self->rows)
2231	{	2261	{
2232	maprow *row = self->row + (y + my);	2262	maprow *row = self->row + (y + my);
…		…
2247	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2277	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2248	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2278	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2249		2279
2250	for (z = 0; z <= 2; z++)	2280	for (z = 0; z <= 2; z++)
2251	{	2281	{
		2282	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		2283	smooth_key skey;
		2284	smooth_hash smooth;
2252	memset (smooth_level, 0, sizeof (smooth_level));	2285	memset (smooth_level, 0, sizeof (smooth_level));
2253	key.texname = -1;	2286	key.texname = -1;
2254		2287
2255	for (y = 0; y < sh; y++)	2288	for (y = 0; y < sh; y++)
2256	if (0 <= y + my && y + my < self->rows)	2289	if (0 <= y + my && y + my < self->rows)
…		…
2317		2350
2318	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2351	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2319	// ·· ·· ·┏ ┓·	2352	// ·· ·· ·┏ ┓·
2320		2353
2321	// full tile	2354	// full tile
2322	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2355	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2323		2356
2324	// borders	2357	// borders
2325	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2358	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2326	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2359	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2327	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2360	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2328	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2361	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2329		2362
2330	// corners	2363	// corners
2331	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2364	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2332	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2365	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2333	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2366	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2334	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2367	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2335	}	2368	}
2336	}	2369	}
2337		2370
2338	if (expect_false (z == 2) && expect_false (cell->flags))	2371	if (expect_false (z == 2) && expect_false (cell->flags))
2339	{	2372	{
…		…
2376	if (smask & (((uint32_t)1) << b))	2409	if (smask & (((uint32_t)1) << b))
2377	{	2410	{
2378	int level = (w << 5) \| b;	2411	int level = (w << 5) \| b;
2379	HE *he;	2412	HE *he;
2380		2413
2381	hv_iterinit (smooth);	2414	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2382	while ((he = hv_iternext (smooth)))
2383	{	2415	{
2384	smooth_key skey = (smooth_key )HeKEY (he);	2416	smooth_key &skey = it->first;
2385	IV bits = SvIVX (HeVAL (he));	2417	IV bits = it->second;
2386		2418
2387	if (!(bits & 0x1000)	2419	if (!(bits & 0x1000)
2388	&& skey->level == level	2420	&& skey.level == level
2389	&& level > smooth_max [skey->x][skey->y])	2421	&& level > smooth_max [skey.x][skey.y])
2390	{	2422	{
2391	maptex tex = self->tex [skey->tile];	2423	maptex tex = self->tex [skey.tile];
2392	int px = (((int)skey->x) - 1) * Tw;	2424	int px = (((int)skey.x) - 1) * Tw;
2393	int py = (((int)skey->y) - 1) * Th;	2425	int py = (((int)skey.y) - 1) * Th;
2394	int border = bits & 15;	2426	int border = bits & 15;
2395	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2427	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2396	float dx = tex.s * .0625f; // 16 images/row	2428	float dx = tex.s * .0625f; // 16 images/row
2397	float dy = tex.t * .5f ; // 2 images/column	2429	float dy = tex.t * .5f ; // 2 images/column
2398		2430
…		…
2400	{	2432	{
2401	// this time avoiding texture state changes	2433	// this time avoiding texture state changes
2402	// save gobs of state changes.	2434	// save gobs of state changes.
2403	if (key.texname != tex.name)	2435	if (key.texname != tex.name)
2404	{	2436	{
2405	self->tex [skey->tile].unused = 0;	2437	self->tex [skey.tile].unused = 0;
2406		2438
2407	glEnd ();	2439	glEnd ();
2408	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2440	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2409	glBegin (GL_QUADS);	2441	glBegin (GL_QUADS);
2410	}	2442	}
…		…
2436		2468
2437	glEnd ();	2469	glEnd ();
2438	glDisable (GL_TEXTURE_2D);	2470	glDisable (GL_TEXTURE_2D);
2439	key.texname = -1;	2471	key.texname = -1;
2440	}	2472	}
2441
2442	hv_clear (smooth);
2443	}	2473	}
2444		2474
2445	if (pl_tex.name)	2475	if (pl_tex.name)
2446	{	2476	{
2447	maptex tex = pl_tex;	2477	maptex tex = pl_tex;
…		…
2716	else	2746	else
2717	*data++ = 0;	2747	*data++ = 0;
2718	}	2748	}
2719	}	2749	}
2720		2750
2721	/* if size is wh + 5 then no data has been found /	2751	/* if size is wh + 5 then no data has been found /
2722	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2752	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2723	{	2753	{
2724	SvPOK_only (data_sv);	2754	SvPOK_only (data_sv);
2725	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2755	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2726	}	2756	}
2727		2757
2728	RETVAL = data_sv;	2758	RETVAL = data_sv;
2729	}	2759	}
2730	OUTPUT:	2760	OUTPUT:
2731	RETVAL	2761	RETVAL
2732		2762
2733	void	2763	void
…		…
2740	STRLEN len;	2770	STRLEN len;
2741	uint8_t data, end;	2771	uint8_t data, end;
2742		2772
2743	len = SvLEN (data_sv);	2773	len = SvLEN (data_sv);
2744	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2774	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2745	data = SvPVbyte_nolen (data_sv);	2775	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2746	end = data + len + 8;	2776	end = data + len + 8;
2747		2777
2748	if (len < 5)	2778	if (len < 5)
2749	XSRETURN_EMPTY;	2779	XSRETURN_EMPTY;
2750		2780
…		…
2811	}	2841	}
2812		2842
2813	MODULE = Deliantra::Client PACKAGE = DC::RW	2843	MODULE = Deliantra::Client PACKAGE = DC::RW
2814		2844
2815	DC::RW	2845	DC::RW
2816	new (SV class, SV data_sv)	2846	new (SV klass, SV data_sv)
2817	CODE:	2847	CODE:
2818	{	2848	{
2819	STRLEN datalen;	2849	STRLEN datalen;
2820	char *data = SvPVbyte (data_sv, datalen);	2850	char *data = SvPVbyte (data_sv, datalen);
2821		2851
…		…
2823	}	2853	}
2824	OUTPUT:	2854	OUTPUT:
2825	RETVAL	2855	RETVAL
2826		2856
2827	DC::RW	2857	DC::RW
2828	new_from_file (SV class, const char path, const char *mode = "rb")	2858	new_from_file (SV klass, const char path, const char *mode = "rb")
2829	CODE:	2859	CODE:
2830	RETVAL = SDL_RWFromFile (path, mode);	2860	RETVAL = SDL_RWFromFile (path, mode);
2831	OUTPUT:	2861	OUTPUT:
2832	RETVAL	2862	RETVAL
2833		2863
…		…
2942	#else	2972	#else
2943	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2973	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2944	#endif	2974	#endif
2945		2975
2946	DC::MixChunk	2976	DC::MixChunk
2947	new (SV *class, DC::RW rwops)	2977	new (SV *klass, DC::RW rwops)
2948	CODE:	2978	CODE:
2949	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2979	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2950	OUTPUT:	2980	OUTPUT:
2951	RETVAL	2981	RETVAL
2952		2982
…		…
3022	RETVAL = Mix_PlayingMusic ();	3052	RETVAL = Mix_PlayingMusic ();
3023	OUTPUT:	3053	OUTPUT:
3024	RETVAL	3054	RETVAL
3025		3055
3026	DC::MixMusic	3056	DC::MixMusic
3027	new (SV *class, DC::RW rwops)	3057	new (SV *klass, DC::RW rwops)
3028	CODE:	3058	CODE:
3029	RETVAL = Mix_LoadMUS_RW (rwops);	3059	RETVAL = Mix_LoadMUS_RW (rwops);
3030	OUTPUT:	3060	OUTPUT:
3031	RETVAL	3061	RETVAL
3032		3062
…		…
3185	gl.BlendFuncSeparateEXT = 0;	3215	gl.BlendFuncSeparateEXT = 0;
3186		3216
3187	void	3217	void
3188	apple_nvidia_bug (int enable)	3218	apple_nvidia_bug (int enable)
3189		3219
3190	char *	3220	const char *
3191	gl_vendor ()	3221	gl_vendor ()
3192	CODE:	3222	CODE:
3193	RETVAL = (char *)glGetString (GL_VENDOR);	3223	RETVAL = (const char *)glGetString (GL_VENDOR);
3194	OUTPUT:	3224	OUTPUT:
3195	RETVAL	3225	RETVAL
3196		3226
3197	char *	3227	const char *
3198	gl_version ()	3228	gl_version ()
3199	CODE:	3229	CODE:
3200	RETVAL = (char *)glGetString (GL_VERSION);	3230	RETVAL = (const char *)glGetString (GL_VERSION);
3201	OUTPUT:	3231	OUTPUT:
3202	RETVAL	3232	RETVAL
3203		3233
3204	char *	3234	const char *
3205	gl_extensions ()	3235	gl_extensions ()
3206	CODE:	3236	CODE:
3207	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3237	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3208	OUTPUT:	3238	OUTPUT:
3209	RETVAL	3239	RETVAL
3210		3240
3211	const char *glGetString (GLenum pname)	3241	const char *glGetString (GLenum pname)
		3242	CODE:
		3243	RETVAL = (const char *)glGetString (pname);
		3244	OUTPUT:
		3245	RETVAL
3212		3246
3213	GLint glGetInteger (GLenum pname)	3247	GLint glGetInteger (GLenum pname)
3214	CODE:	3248	CODE:
3215	glGetIntegerv (pname, &RETVAL);	3249	glGetIntegerv (pname, &RETVAL);
3216	OUTPUT:	3250	OUTPUT:
…		…
3419		3453
3420	void	3454	void
3421	find_widget (SV *self, NV x, NV y)	3455	find_widget (SV *self, NV x, NV y)
3422	PPCODE:	3456	PPCODE:
3423	{	3457	{
3424	if (within_widget (self, x, y))	3458	if (within_widget (self, x, y))
3425	XPUSHs (self);	3459	XPUSHs (self);
3426	}	3460	}
3427		3461
3428	BOOT:	3462	BOOT:
3429	{	3463	{
…		…
3437		3471
3438	void	3472	void
3439	draw (SV *self)	3473	draw (SV *self)
3440	CODE:	3474	CODE:
3441	{	3475	{
3442	HV *hv;	3476	HV *hv;
3443	SV **svp;	3477	SV **svp;
3444	NV x, y, w, h;	3478	NV x, y, w, h;
3445	SV *draw_x_sv = GvSV (draw_x_gv);	3479	SV *draw_x_sv = GvSV (draw_x_gv);
3446	SV *draw_y_sv = GvSV (draw_y_gv);	3480	SV *draw_y_sv = GvSV (draw_y_gv);
3447	SV *draw_w_sv = GvSV (draw_w_gv);	3481	SV *draw_w_sv = GvSV (draw_w_gv);
3448	SV *draw_h_sv = GvSV (draw_h_gv);	3482	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs. Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.312 by root, Thu Dec 29 07:13:44 2011 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC