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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 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
978	SDL_GetModState ()	1019	SDL_GetModState ()
979		1020
		1021	int
		1022	SDL_WaitEvent ()
		1023	C_ARGS: 0
		1024
980	void	1025	void
		1026	SDL_PumpEvents ()
		1027
		1028	void
981	poll_events ()	1029	peep_events ()
982	PPCODE:	1030	PPCODE:
983	{	1031	{
984	SDL_Event ev;	1032	SDL_Event ev;
985		1033
986	SDL_PumpEvents ();	1034	SDL_PumpEvents ();
…		…
1067	OUTPUT:	1115	OUTPUT:
1068	RETVAL	1116	RETVAL
1069		1117
1070	int	1118	int
1071	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)
1072	POSTCALL:	1120	POSTCALL:
1073	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1074	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1075		1123
1076	void	1124	void
1077	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1140	RETVAL	1188	RETVAL
1141		1189
1142	void	1190	void
1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)	1191	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1144		1192
		1193	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1145	void	1194	void
1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)	1195	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1147		1196
1148	void	1197	void
1149	load_image_inline (SV *image_)	1198	load_image_inline (SV *image_)
1150	ALIAS:	1199	ALIAS:
1151	load_image_file = 1	1200	load_image_file = 1
…		…
1197		1246
1198	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1199	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1200	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1201	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1202	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	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)));	1252	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1204	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1205	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1206	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1207		1256
…		…
1279	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1280		1329
1281	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1282		1331
1283	DC::Font	1332	DC::Font
1284	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1285	CODE:	1334	CODE:
1286	{	1335	{
1287	int count;	1336	int count;
1288	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1289	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1318	PROTOTYPE:	1367	PROTOTYPE:
1319	CODE:	1368	CODE:
1320	tc_restore ();	1369	tc_restore ();
1321		1370
1322	DC::Layout	1371	DC::Layout
1323	new (SV *class)	1372	new (SV *klass)
1324	CODE:	1373	CODE:
1325	New (0, RETVAL, 1, struct cf_layout);	1374	RETVAL = new cf_layout;
1326		1375
1327	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1328	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
1329	RETVAL->g = 1.;	1378	RETVAL->g = 1.;
1330	RETVAL->b = 1.;	1379	RETVAL->b = 1.;
1331	RETVAL->a = 1.;	1380	RETVAL->a = 1.;
1332	RETVAL->base_height = MIN_FONT_HEIGHT;	1381	RETVAL->base_height = MIN_FONT_HEIGHT;
1333	RETVAL->font = 0;	1382	RETVAL->font = 0;
1334	RETVAL->rc = rc_alloc ();
1335		1383
1336	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1384	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1337	layout_update_font (RETVAL);	1385	layout_update_font (RETVAL);
1338	OUTPUT:	1386	OUTPUT:
1339	RETVAL	1387	RETVAL
1340		1388
1341	void	1389	void
1342	DESTROY (DC::Layout self)	1390	DESTROY (DC::Layout self)
1343	CODE:	1391	CODE:
1344	g_object_unref (self->pl);	1392	g_object_unref (self->pl);
1345	rc_free (self->rc);
1346	Safefree (self);	1393	delete self;
1347		1394
1348	void	1395	void
1349	set_text (DC::Layout self, SV *text_)	1396	set_text (DC::Layout self, SV *text_)
1350	CODE:	1397	CODE:
1351	{	1398	{
…		…
1477		1524
1478	void	1525	void
1479	set_height (DC::Layout self, int base_height)	1526	set_height (DC::Layout self, int base_height)
1480	CODE:	1527	CODE:
1481	if (self->base_height != base_height)	1528	if (self->base_height != base_height)
1482	{	1529	{
1483	self->base_height = base_height;	1530	self->base_height = base_height;
1484	layout_update_font (self);	1531	layout_update_font (self);
1485	}	1532	}
1486		1533
1487	void	1534	void
…		…
1605	}	1652	}
1606		1653
1607	void	1654	void
1608	render (DC::Layout self, float x, float y, int flags = 0)	1655	render (DC::Layout self, float x, float y, int flags = 0)
1609	CODE:	1656	CODE:
1610	rc_clear (self->rc);	1657	self->rc.clear ();
1611	pango_opengl_render_layout_subpixel (	1658	pango_opengl_render_layout_subpixel (
1612	self->pl,	1659	self->pl,
1613	self->rc,	1660	&self->rc,
1614	x * PANGO_SCALE, y * PANGO_SCALE,	1661	x * PANGO_SCALE, y * PANGO_SCALE,
1615	self->r, self->g, self->b, self->a,	1662	self->r, self->g, self->b, self->a,
1616	flags	1663	flags
1617	);	1664	);
1618	// we assume that context_change actually clears/frees stuff	1665	// we assume that context_change actually clears/frees stuff
…		…
1629	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1676	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1630	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1677	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1631	glEnable (GL_ALPHA_TEST);	1678	glEnable (GL_ALPHA_TEST);
1632	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1679	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1633		1680
1634	rc_draw (self->rc);	1681	self->rc.draw ();
1635		1682
1636	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1637	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1638	glDisable (GL_TEXTURE_2D);	1685	glDisable (GL_TEXTURE_2D);
1639	}	1686	}
…		…
1851	MODULE = Deliantra::Client PACKAGE = DC::Map	1898	MODULE = Deliantra::Client PACKAGE = DC::Map
1852		1899
1853	PROTOTYPES: DISABLE	1900	PROTOTYPES: DISABLE
1854		1901
1855	DC::Map	1902	DC::Map
1856	new (SV *class)	1903	new (SV *klass)
1857	CODE:	1904	CODE:
1858	New (0, RETVAL, 1, struct map);	1905	New (0, RETVAL, 1, mapgrid);
1859	RETVAL->x = 0;	1906	RETVAL->x = 0;
1860	RETVAL->y = 0;	1907	RETVAL->y = 0;
1861	RETVAL->w = 0;	1908	RETVAL->w = 0;
1862	RETVAL->h = 0;	1909	RETVAL->h = 0;
1863	RETVAL->ox = 0;	1910	RETVAL->ox = 0;
…		…
1900		1947
1901	void	1948	void
1902	set_smooth (DC::Map self, int face, int smooth, int level)	1949	set_smooth (DC::Map self, int face, int smooth, int level)
1903	CODE:	1950	CODE:
1904	{	1951	{
1905	tileid texid;	1952	tileid texid;
1906	maptex *tex;	1953	maptex *tex;
1907		1954
1908	if (face < 0 \|\| face >= self->faces)	1955	if (face < 0 \|\| face >= self->faces)
1909	return;	1956	return;
1910		1957
1911	if (smooth < 0 \|\| smooth >= self->faces)	1958	if (smooth < 0 \|\| smooth >= self->faces)
1912	return;	1959	return;
1913		1960
1914	texid = self->face2tile [face];	1961	texid = self->face2tile [face];
1915		1962
1916	if (!texid)	1963	if (!texid)
1917	return;	1964	return;
1918		1965
1919	tex = self->tex + texid;	1966	tex = self->tex + texid;
…		…
1952	}	1999	}
1953		2000
1954	void	2001	void
1955	expire_textures (DC::Map self, int texid, int count)	2002	expire_textures (DC::Map self, int texid, int count)
1956	PPCODE:	2003	PPCODE:
1957	for (; texid < self->texs && count; ++texid, --count)	2004	for (; texid < self->texs && count; ++texid, --count)
1958	{	2005	{
1959	maptex *tex = self->tex + texid;	2006	maptex *tex = self->tex + texid;
1960		2007
1961	if (tex->name)	2008	if (tex->name)
1962	{	2009	{
…		…
2017	self->y += MAP_EXTEND_Y;	2064	self->y += MAP_EXTEND_Y;
2018	}	2065	}
2019	}	2066	}
2020		2067
2021	SV *	2068	SV *
2022	map1a_update (DC::Map self, SV *data_, int extmap)	2069	map1a_update (DC::Map self, SV *data_)
2023	CODE:	2070	CODE:
2024	{	2071	{
2025	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2072	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2026	uint8_t data_end = (uint8_t )SvEND (data_);	2073	uint8_t data_end = (uint8_t )SvEND (data_);
2027	mapcell *cell;	2074	mapcell *cell;
…		…
2048		2095
2049	//TODO: don't trust server data to be in-range(!)	2096	//TODO: don't trust server data to be in-range(!)
2050		2097
2051	if (flags & 8)	2098	if (flags & 8)
2052	{	2099	{
		2100	uint8_t ext, cmd;
		2101
2053	if (extmap)	2102	do
2054	{	2103	{
2055	uint8_t ext, cmd;	2104	ext = *data++;
		2105	cmd = ext & 0x7f;
2056		2106
2057	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
2058	{	2110	{
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;	2111	cell->stat_width = 1;
2067	cell->stat_hp = *data++;	2112	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	}	2113	}
2087	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++;
2088	}	2131	}
2089	else	2132	while (ext & 0x80);
2090	cell->darkness = *data++ + 1;
2091	}	2133	}
2092		2134
2093	for (z = 0; z <= 2; ++z)	2135	for (z = 0; z <= 2; ++z)
2094	if (flags & (4 >> z))	2136	if (flags & (4 >> z))
2095	{	2137	{
…		…
2169	\| (b << 16)	2211	\| (b << 16)
2170	\| (a << 24);	2212	\| (a << 24);
2171	}	2213	}
2172	}	2214	}
2173		2215
2174	RETVAL = map_sv;	2216	RETVAL = map_sv;
2175	}	2217	}
2176	OUTPUT:	2218	OUTPUT:
2177	RETVAL	2219	RETVAL
2178		2220
2179	void	2221	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)	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)
2181	CODE:	2223	CODE:
2182	{	2224	{
2183	int x, y, z;	2225	int x, y, z;
2184		2226
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)	2227	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;	2228	int pl_x, pl_y;
2190	maptex pl_tex;	2229	maptex pl_tex;
2191	rc_t *rc = rc_alloc ();	2230	rc_t rc;
2192	rc_t *rc_ov = rc_alloc ();	2231	rc_t rc_ov;
2193	rc_key_t key;	2232	rc_key_t key;
2194	rc_array_t *arr;	2233	rc_t::array_t *arr;
2195		2234
2196	pl_tex.name = 0;	2235	pl_tex.name = 0;
2197		2236
2198	// that's current max. sorry.	2237	// that's current max. sorry.
2199	if (sw > 255) sw = 255;	2238	if (sw > 255) sw = 255;
2200	if (sh > 255) sh = 255;	2239	if (sh > 255) sh = 255;
2201
2202	// clear key, in case of extra padding
2203	memset (&skey, 0, sizeof (skey));
2204		2240
2205	memset (&key, 0, sizeof (key));	2241	memset (&key, 0, sizeof (key));
2206	key.r = 255;	2242	key.r = 255;
2207	key.g = 255;	2243	key.g = 255;
2208	key.b = 255;	2244	key.b = 255;
…		…
2214	my += self->y;	2250	my += self->y;
2215		2251
2216	// first pass: determine smooth_max	2252	// first pass: determine smooth_max
2217	// rather ugly, if you ask me	2253	// rather ugly, if you ask me
2218	// could also be stored inside mapcell and updated on change	2254	// could also be stored inside mapcell and updated on change
2219	memset (smooth_max, 0, sizeof (smooth_max));	2255	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2220		2256
2221	for (y = 0; y < sh; y++)	2257	for (y = 0; y < sh; y++)
2222	if (0 <= y + my && y + my < self->rows)	2258	if (0 <= y + my && y + my < self->rows)
2223	{	2259	{
2224	maprow *row = self->row + (y + my);	2260	maprow *row = self->row + (y + my);
…		…
2239	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2275	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2276	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2241		2277
2242	for (z = 0; z <= 2; z++)	2278	for (z = 0; z <= 2; z++)
2243	{	2279	{
2244	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;
2245	key.texname = -1;	2283	key.texname = -1;
2246		2284
2247	for (y = 0; y < sh; y++)	2285	for (y = 0; y < sh; y++)
2248	if (0 <= y + my && y + my < self->rows)	2286	if (0 <= y + my && y + my < self->rows)
2249	{	2287	{
…		…
2266		2304
2267	if (!tex.name)	2305	if (!tex.name)
2268	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2306	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2269		2307
2270	key.texname = tex.name;	2308	key.texname = tex.name;
2271	arr = rc_array (rc, &key);	2309	arr = &rc.array (key);
2272	}	2310	}
2273		2311
2274	px = (x + 1) * Th - tex.w;	2312	px = (x + 1) * Th - tex.w;
2275	py = (y + 1) * Tw - tex.h;	2313	py = (y + 1) * Tw - tex.h;
2276		2314
…		…
2280	pl_y = py;	2318	pl_y = py;
2281	pl_tex = tex;	2319	pl_tex = tex;
2282	continue;	2320	continue;
2283	}	2321	}
2284		2322
2285	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2323	arr->t2f_v3f (0 , 0 , px , py , 0);
2286	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2324	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);	2325	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);	2326	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2289		2327
2290	// update smooth hash	2328	// update smooth hash
2291	if (tex.smoothtile)	2329	if (tex.smoothtile)
2292	{	2330	{
2293	skey.tile = tex.smoothtile;	2331	skey.tile = tex.smoothtile;
2294	skey.level = tex.smoothlevel;	2332	skey.level = tex.smoothlevel;
2295		2333
2296	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2334	smooth_level[tex.smoothlevel] = 1;
2297		2335
2298	// 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
2299	// shifted +1\|+1 so we always stay positive.	2337	// shifted +1\|+1 so we always stay positive.
2300		2338
2301	// bits is ___n cccc CCCC bbbb	2339	// bits is ___n cccc CCCC bbbb
…		…
2309		2347
2310	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2348	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2311	// ·· ·· ·┏ ┓·	2349	// ·· ·· ·┏ ┓·
2312		2350
2313	// full tile	2351	// full tile
2314	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);
2315		2353
2316	// borders	2354	// borders
2317	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);
2318	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);
2319	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);
2320	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);
2321		2359
2322	// corners	2360	// corners
2323	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);
2324	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);
2325	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);
2326	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);
2327	}	2365	}
2328	}	2366	}
2329		2367
2330	if (expect_false (z == 2) && expect_false (cell->flags))	2368	if (expect_false (z == 2) && expect_false (cell->flags))
2331	{	2369	{
2332	// overlays such as the speech bubble, probably more to come	2370	// overlays such as the speech bubble, probably more to come
2333	if (cell->flags & 1)	2371	if (cell->flags & 1)
2334	{	2372	{
2335	rc_key_t key_ov = key;	2373	rc_key_t key_ov = key;
2336	maptex tex = self->tex [TEXID_SPEECH];	2374	maptex tex = self->tex[TEXID_SPEECH];
2337	rc_array_t *arr;
2338	int px = x * Tw + Tw * 2 / 32;	2375	int px = x * Tw + Tw * 2 / 32;
2339	int py = y * Th - Th * 6 / 32;	2376	int py = y * Th - Th * 6 / 32;
2340		2377
2341	key_ov.texname = tex.name;	2378	key_ov.texname = tex.name;
2342	arr = rc_array (rc_ov, &key_ov);	2379	rc_t::array_t &arr = rc_ov.array (key_ov);
2343		2380
2344	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2381	arr.t2f_v3f (0 , 0 , px , py , 0);
2345	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);	2382	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2346	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);	2383	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2347	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);	2384	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2348	}	2385	}
2349	}	2386	}
2350	}	2387	}
2351	}	2388	}
2352		2389
2353	rc_draw (rc);	2390	rc.draw ();
2354	rc_clear (rc);	2391	rc.clear ();
2355		2392
2356	// go through all smoothlevels, lowest to highest, then draw.	2393	// go through all smoothlevels, lowest to highest, then draw.
2357	// this is basically counting sort	2394	// this is basically counting sort
2358	{	2395	{
2359	int w, b;	2396	int w, b;
2360		2397
2361	glEnable (GL_TEXTURE_2D);	2398	glEnable (GL_TEXTURE_2D);
2362	glBegin (GL_QUADS);	2399	glBegin (GL_QUADS);
2363	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)
2364	{	2403	{
2365	uint32_t smask = smooth_level [w];	2404	smooth_key &skey = it->first;
2366	if (smask)	2405	IV bits = it->second;
2367	for (b = 0; b < 32; ++b)	2406
2368	if (smask & (((uint32_t)1) << b))	2407	if (!(bits & 0x1000)
		2408	&& skey.level == level
		2409	&& level > smooth_max [skey.x][skey.y])
2369	{	2410	{
2370	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
2371	HE *he;	2419	if (tex.name)
2372
2373	hv_iterinit (smooth);
2374	while ((he = hv_iternext (smooth)))
2375	{	2420	{
2376	smooth_key skey = (smooth_key )HeKEY (he);	2421	// this time avoiding texture state changes
2377	IV bits = SvIVX (HeVAL (he));	2422	// save gobs of state changes.
2378		2423	if (key.texname != tex.name)
2379	if (!(bits & 0x1000)
2380	&& skey->level == level
2381	&& level > smooth_max [skey->x][skey->y])
2382	{	2424	{
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;	2425	self->tex [skey.tile].unused = 0;
2398		2426
2399	glEnd ();	2427	glEnd ();
2400	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2428	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2401	glBegin (GL_QUADS);	2429	glBegin (GL_QUADS);
2402	}	2430	}
2403		2431
2404	if (border)	2432	if (border)
2405	{	2433	{
2406	float ox = border * dx;	2434	float ox = border * dx;
2407		2435
2408	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2436	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2409	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);	2437	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2410	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);	2438	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2411	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );	2439	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2412	}	2440	}
2413		2441
2414	if (corner)	2442	if (corner)
2415	{	2443	{
2416	float ox = corner * dx;	2444	float ox = corner * dx;
2417		2445
2418	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2446	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2419	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);	2447	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2420	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);	2448	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2421	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );	2449	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2422	}
2423	}
2424	}	2450	}
2425	}	2451	}
2426	}	2452	}
2427	}	2453	}
2428		2454
2429	glEnd ();	2455	glEnd ();
2430	glDisable (GL_TEXTURE_2D);	2456	glDisable (GL_TEXTURE_2D);
2431	key.texname = -1;	2457	key.texname = -1;
2432	}	2458	}
2433
2434	hv_clear (smooth);
2435	}	2459	}
2436		2460
2437	if (pl_tex.name)	2461	if (pl_tex.name)
2438	{	2462	{
2439	maptex tex = pl_tex;	2463	maptex tex = pl_tex;
2440	int px = pl_x + sdx;	2464	int px = pl_x + sdx;
2441	int py = pl_y + sdy;	2465	int py = pl_y + sdy;
2442		2466
2443	key.texname = tex.name;	2467	key.texname = tex.name;
2444	arr = rc_array (rc, &key);	2468	rc_t::array_t &arr = rc.array (key);
2445		2469
2446	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2470	arr.t2f_v3f (0 , 0 , px , py , 0);
2447	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2471	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);	2472	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);	2473	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2450		2474
2451	rc_draw (rc);	2475	rc.draw ();
2452	}	2476	}
2453		2477
2454	rc_draw (rc_ov);	2478	rc_ov.draw ();
2455	rc_clear (rc_ov);	2479	rc_ov.clear ();
2456		2480
2457	glDisable (GL_BLEND);	2481	glDisable (GL_BLEND);
2458	rc_free (rc);
2459	rc_free (rc_ov);
2460		2482
2461	// top layer: overlays such as the health bar	2483	// top layer: overlays such as the health bar
2462	for (y = 0; y < sh; y++)	2484	for (y = 0; y < sh; y++)
2463	if (0 <= y + my && y + my < self->rows)	2485	if (0 <= y + my && y + my < self->rows)
2464	{	2486	{
…		…
2708	else	2730	else
2709	*data++ = 0;	2731	*data++ = 0;
2710	}	2732	}
2711	}	2733	}
2712		2734
2713	/* if size is wh + 5 then no data has been found /	2735	/* if size is wh + 5 then no data has been found /
2714	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2736	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2715	{	2737	{
2716	SvPOK_only (data_sv);	2738	SvPOK_only (data_sv);
2717	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2739	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718	}	2740	}
2719		2741
2720	RETVAL = data_sv;	2742	RETVAL = data_sv;
2721	}	2743	}
2722	OUTPUT:	2744	OUTPUT:
2723	RETVAL	2745	RETVAL
2724		2746
2725	void	2747	void
…		…
2732	STRLEN len;	2754	STRLEN len;
2733	uint8_t data, end;	2755	uint8_t data, end;
2734		2756
2735	len = SvLEN (data_sv);	2757	len = SvLEN (data_sv);
2736	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2758	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737	data = SvPVbyte_nolen (data_sv);	2759	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2738	end = data + len + 8;	2760	end = data + len + 8;
2739		2761
2740	if (len < 5)	2762	if (len < 5)
2741	XSRETURN_EMPTY;	2763	XSRETURN_EMPTY;
2742		2764
…		…
2803	}	2825	}
2804		2826
2805	MODULE = Deliantra::Client PACKAGE = DC::RW	2827	MODULE = Deliantra::Client PACKAGE = DC::RW
2806		2828
2807	DC::RW	2829	DC::RW
2808	new (SV class, SV data_sv)	2830	new (SV klass, SV data_sv)
2809	CODE:	2831	CODE:
2810	{	2832	{
2811	STRLEN datalen;	2833	STRLEN datalen;
2812	char *data = SvPVbyte (data_sv, datalen);	2834	char *data = SvPVbyte (data_sv, datalen);
2813		2835
…		…
2815	}	2837	}
2816	OUTPUT:	2838	OUTPUT:
2817	RETVAL	2839	RETVAL
2818		2840
2819	DC::RW	2841	DC::RW
2820	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")
2821	CODE:	2843	CODE:
2822	RETVAL = SDL_RWFromFile (path, mode);	2844	RETVAL = SDL_RWFromFile (path, mode);
2823	OUTPUT:	2845	OUTPUT:
2824	RETVAL	2846	RETVAL
2825		2847
…		…
2934	#else	2956	#else
2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2957	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936	#endif	2958	#endif
2937		2959
2938	DC::MixChunk	2960	DC::MixChunk
2939	new (SV *class, DC::RW rwops)	2961	new (SV *klass, DC::RW rwops)
2940	CODE:	2962	CODE:
2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2963	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2942	OUTPUT:	2964	OUTPUT:
2943	RETVAL	2965	RETVAL
2944		2966
…		…
3014	RETVAL = Mix_PlayingMusic ();	3036	RETVAL = Mix_PlayingMusic ();
3015	OUTPUT:	3037	OUTPUT:
3016	RETVAL	3038	RETVAL
3017		3039
3018	DC::MixMusic	3040	DC::MixMusic
3019	new (SV *class, DC::RW rwops)	3041	new (SV *klass, DC::RW rwops)
3020	CODE:	3042	CODE:
3021	RETVAL = Mix_LoadMUS_RW (rwops);	3043	RETVAL = Mix_LoadMUS_RW (rwops);
3022	OUTPUT:	3044	OUTPUT:
3023	RETVAL	3045	RETVAL
3024		3046
…		…
3177	gl.BlendFuncSeparateEXT = 0;	3199	gl.BlendFuncSeparateEXT = 0;
3178		3200
3179	void	3201	void
3180	apple_nvidia_bug (int enable)	3202	apple_nvidia_bug (int enable)
3181		3203
3182	char *	3204	const char *
3183	gl_vendor ()	3205	gl_vendor ()
3184	CODE:	3206	CODE:
3185	RETVAL = (char *)glGetString (GL_VENDOR);	3207	RETVAL = (const char *)glGetString (GL_VENDOR);
3186	OUTPUT:	3208	OUTPUT:
3187	RETVAL	3209	RETVAL
3188		3210
3189	char *	3211	const char *
3190	gl_version ()	3212	gl_version ()
3191	CODE:	3213	CODE:
3192	RETVAL = (char *)glGetString (GL_VERSION);	3214	RETVAL = (const char *)glGetString (GL_VERSION);
3193	OUTPUT:	3215	OUTPUT:
3194	RETVAL	3216	RETVAL
3195		3217
3196	char *	3218	const char *
3197	gl_extensions ()	3219	gl_extensions ()
3198	CODE:	3220	CODE:
3199	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3221	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3200	OUTPUT:	3222	OUTPUT:
3201	RETVAL	3223	RETVAL
3202		3224
3203	const char *glGetString (GLenum pname)	3225	const char *glGetString (GLenum pname)
		3226	CODE:
		3227	RETVAL = (const char *)glGetString (pname);
		3228	OUTPUT:
		3229	RETVAL
3204		3230
3205	GLint glGetInteger (GLenum pname)	3231	GLint glGetInteger (GLenum pname)
3206	CODE:	3232	CODE:
3207	glGetIntegerv (pname, &RETVAL);	3233	glGetIntegerv (pname, &RETVAL);
3208	OUTPUT:	3234	OUTPUT:
…		…
3411		3437
3412	void	3438	void
3413	find_widget (SV *self, NV x, NV y)	3439	find_widget (SV *self, NV x, NV y)
3414	PPCODE:	3440	PPCODE:
3415	{	3441	{
3416	if (within_widget (self, x, y))	3442	if (within_widget (self, x, y))
3417	XPUSHs (self);	3443	XPUSHs (self);
3418	}	3444	}
3419		3445
3420	BOOT:	3446	BOOT:
3421	{	3447	{
…		…
3429		3455
3430	void	3456	void
3431	draw (SV *self)	3457	draw (SV *self)
3432	CODE:	3458	CODE:
3433	{	3459	{
3434	HV *hv;	3460	HV *hv;
3435	SV **svp;	3461	SV **svp;
3436	NV x, y, w, h;	3462	NV x, y, w, h;
3437	SV *draw_x_sv = GvSV (draw_x_gv);	3463	SV *draw_x_sv = GvSV (draw_x_gv);
3438	SV *draw_y_sv = GvSV (draw_y_gv);	3464	SV *draw_y_sv = GvSV (draw_y_gv);
3439	SV *draw_w_sv = GvSV (draw_w_gv);	3465	SV *draw_w_sv = GvSV (draw_w_gv);
3440	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.310 by root, Tue Dec 27 07:23:33 2011 UTC vs. Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.326 by root, Sun Nov 18 03:06:13 2018 UTC