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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
48	#endif	53	#endif
49		54
50	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
52		57
53	#include <glib/gmacros.h>	58	#include <glib.h>
54		59
55	#include <pango/pango.h>	60	#include <pango/pango.h>
56		61
57	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
100	#define KMOD_LRAM 0x10000 // our extension	105	#define KMOD_LRAM 0x10000 // our extension
101		106
102	#define TEXID_SPEECH 1	107	#define TEXID_SPEECH 1
103	#define TEXID_NOFACE 2	108	#define TEXID_NOFACE 2
104		109
		110	static char *
		111	fast_sv_grow (SV *sv, STRLEN need)
		112	{
		113	STRLEN len = SvLEN (sv);
		114	STRLEN want = SvCUR (sv) + need;
		115
		116	if (expect_false (len < want))
		117	{
		118	do
		119	len *= 2;
		120	while (len < want);
		121
		122	sv_grow (sv, len);
		123	}
		124
		125	SvCUR_set (sv, want);
		126	return SvEND (sv) - need;
		127	}
		128
105	static AV *texture_av;	129	static AV *texture_av;
106		130
107	static struct	131	static struct
108	{	132	{
109	#define GL_FUNC(ptr,name) ptr name;	133	#define GL_FUNC(ptr,name) ptr name;
…		…
165	{	189	{
166	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
167		191
168	while (attrs)	192	while (attrs)
169	{	193	{
170	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
171		195
172	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
173	return 1;	197	return 1;
174		198
175	attrs = attrs->next;	199	attrs = attrs->next;
176	}	200	}
177		201
178	return 0;	202	return 0;
179	}	203	}
180		204
181	typedef struct cf_layout {	205	struct cf_layout {
182	PangoLayout *pl;	206	PangoLayout *pl;
183	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
184	int base_height;	208	int base_height;
185	DC__Font font;	209	DC__Font font;
186	rc_t *rc;	210	rc_t rc;
187	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
188		214
189	static DC__Font default_font;	215	static DC__Font default_font;
190	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
191	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
192		218
193	static void	219	static void
194	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
195	{	221	{
196	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
197	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
198	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
199	#endif	225	#endif
200	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
201	}	227	}
202		228
203	static void	229	static void
…		…
233	}	259	}
234		260
235	typedef uint16_t tileid;	261	typedef uint16_t tileid;
236	typedef uint16_t faceid;	262	typedef uint16_t faceid;
237		263
238	typedef struct {	264	struct maptex
		265	{
239	GLuint name;	266	GLuint name;
240	int w, h;	267	int w, h;
241	float s, t;	268	float s, t;
242	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
243	tileid smoothtile;	270	tileid smoothtile;
244	uint8_t smoothlevel;	271	uint8_t smoothlevel;
245	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
246	} maptex;	273	};
247		274
248	typedef struct {	275	struct mapcell
		276	{
249	uint32_t player;	277	uint32_t player;
250	tileid tile[3];	278	tileid tile[3];
251	uint16_t darkness;	279	uint16_t darkness;
252	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
253	} mapcell;	281	};
254		282
255	typedef struct {	283	struct maprow
		284	{
256	int32_t c0, c1;	285	int32_t c0, c1;
257	mapcell *col;	286	mapcell *col;
258	} maprow;	287	};
259		288
260	typedef struct map {	289	struct mapgrid {
261	int x, y, w, h;	290	int x, y, w, h;
262	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
263	int faces; tileid *face2tile; // [faceid]	292	int faces; tileid *face2tile; // [faceid]
264	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
265		294
266	int32_t rows;	295	int32_t rows;
267	maprow *row;	296	maprow *row;
268	} *DC__Map;	297	};
269		298
270	static char *	299	typedef mapgrid *DC__Map;
		300
		301	template<typename T>
		302	static void
271	prepend (char *ptr, int sze, int inc)	303	prepend (T *&ptr, int sze, int inc)
272	{	304	{
273	char *p;	305	T *p;
274		306
275	New (0, p, sze + inc, char);	307	New (0, p, sze + inc, T);
276	Zero (p, inc, char);	308	Zero (p, inc, T);
277	Move (ptr, p + inc, sze, char);	309	Move (ptr, p + inc, sze, T);
278	Safefree (ptr);	310	Safefree (ptr);
279		311
280	return p;	312	ptr = p;
281	}	313	}
282		314
283	static char *	315	template<typename T>
284	append (char *ptr, int sze, int inc)
285	{
286	Renew (ptr, sze + inc, char);
287	Zero (ptr + sze, inc, char);
288
289	return ptr;
290	}
291
292	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
294
295	static void	316	static void
		317	append (T *&ptr, int sze, int inc)
		318	{
		319	Renew (ptr, sze + inc, T);
		320	Zero (ptr + sze, inc, T);
		321	}
		322
		323	static void
296	need_facenum (struct map *self, faceid face)	324	need_facenum (struct mapgrid *self, faceid face)
297	{	325	{
298	while (self->faces <= face)	326	while (self->faces <= face)
299	{	327	{
300	Append (tileid, self->face2tile, self->faces, self->faces);	328	append (self->face2tile, self->faces, self->faces);
301	self->faces *= 2;	329	self->faces *= 2;
302	}	330	}
303	}	331	}
304		332
305	static void	333	static void
306	need_texid (struct map *self, int texid)	334	need_texid (struct mapgrid *self, int texid)
307	{	335	{
308	while (self->texs <= texid)	336	while (self->texs <= texid)
309	{	337	{
310	Append (maptex, self->tex, self->texs, self->texs);	338	append (self->tex, self->texs, self->texs);
311	self->texs *= 2;	339	self->texs *= 2;
312	}	340	}
313	}	341	}
314		342
315	static maprow *	343	static maprow *
316	map_get_row (DC__Map self, int y)	344	map_get_row (mapgrid *self, int y)
317	{	345	{
318	if (0 > y)	346	if (0 > y)
319	{	347	{
320	int extend = - y + MAP_EXTEND_Y;	348	int extend = - y + MAP_EXTEND_Y;
321	Prepend (maprow, self->row, self->rows, extend);	349	prepend (self->row, self->rows, extend);
322		350
323	self->rows += extend;	351	self->rows += extend;
324	self->y += extend;	352	self->y += extend;
325	y += extend;	353	y += extend;
326	}	354	}
327	else if (y >= self->rows)	355	else if (y >= self->rows)
328	{	356	{
329	int extend = y - self->rows + MAP_EXTEND_Y;	357	int extend = y - self->rows + MAP_EXTEND_Y;
330	Append (maprow, self->row, self->rows, extend);	358	append (self->row, self->rows, extend);
331	self->rows += extend;	359	self->rows += extend;
332	}	360	}
333		361
334	return self->row + y;	362	return self->row + y;
335	}	363	}
…		…
345	}	373	}
346		374
347	if (row->c0 > x)	375	if (row->c0 > x)
348	{	376	{
349	int extend = row->c0 - x + MAP_EXTEND_X;	377	int extend = row->c0 - x + MAP_EXTEND_X;
350	Prepend (mapcell, row->col, row->c1 - row->c0, extend);	378	prepend (row->col, row->c1 - row->c0, extend);
351	row->c0 -= extend;	379	row->c0 -= extend;
352	}	380	}
353	else if (x >= row->c1)	381	else if (x >= row->c1)
354	{	382	{
355	int extend = x - row->c1 + MAP_EXTEND_X;	383	int extend = x - row->c1 + MAP_EXTEND_X;
356	Append (mapcell, row->col, row->c1 - row->c0, extend);	384	append (row->col, row->c1 - row->c0, extend);
357	row->c1 += extend;	385	row->c1 += extend;
358	}	386	}
359		387
360	return row->col + (x - row->c0);	388	return row->col + (x - row->c0);
361	}	389	}
362		390
363	static mapcell *	391	static mapcell *
364	map_get_cell (DC__Map self, int x, int y)	392	map_get_cell (mapgrid *self, int x, int y)
365	{	393	{
366	return row_get_cell (map_get_row (self, y), x);	394	return row_get_cell (map_get_row (self, y), x);
367	}	395	}
368		396
369	static void	397	static void
370	map_clear (DC__Map self)	398	map_clear (mapgrid *self)
371	{	399	{
372	int r;	400	int r;
373		401
374	for (r = 0; r < self->rows; r++)	402	for (r = 0; r < self->rows; r++)
375	Safefree (self->row[r].col);	403	Safefree (self->row[r].col);
…		…
393	(cell)->flags = 0; \	421	(cell)->flags = 0; \
394	(cell)->player = 0; \	422	(cell)->player = 0; \
395	} while (0)	423	} while (0)
396		424
397	static void	425	static void
398	map_blank (DC__Map self, int x0, int y0, int w, int h)	426	map_blank (mapgrid *self, int x0, int y0, int w, int h)
399	{	427	{
400	int x, y;	428	int x, y;
401	maprow *row;	429	maprow *row;
402	mapcell *cell;	430	mapcell *cell;
403		431
…		…
420	CELL_CLEAR (cell);	448	CELL_CLEAR (cell);
421	}	449	}
422	}	450	}
423	}	451	}
424		452
425	typedef struct {	453	struct smooth_key
		454	{
426	tileid tile;	455	tileid tile;
427	uint8_t x, y, level;	456	uint8_t x, y, level;
428	} smooth_key;	457
		458	bool operator == (const smooth_key &o) const
		459	{
		460	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		461	}
		462	};
		463
		464	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		465
		466	namespace std {
		467	template <>
		468	struct hash<smooth_key>
		469	{
		470	size_t operator () (const smooth_key &v) const
		471	{
		472	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		473	}
		474	};
		475	}
429		476
430	static void	477	static void
431	smooth_or_bits (HV hv, smooth_key key, IV bits)	478	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
432	{	479	{
433	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	480	auto &&it = h.find (key);
434		481
435	if (SvIOK (*sv))	482	if (it == h.end ())
436	SvIV_set (sv, SvIVX (sv) \| bits);	483	h.insert (std::make_pair (key, bits));
437	else	484	else
438	sv_setiv (*sv, bits);	485	it->second \|= bits;
439	}	486	}
440		487
441	static void	488	static void
442	music_finished (void)	489	music_finished (void)
443	{	490	{
…		…
460	ev.code = 1;	507	ev.code = 1;
461	ev.data1 = (void *)(long)channel;	508	ev.data1 = (void *)(long)channel;
462	ev.data2 = 0;	509	ev.data2 = 0;
463		510
464	SDL_PushEvent ((SDL_Event *)&ev);	511	SDL_PushEvent ((SDL_Event *)&ev);
		512	}
		513
		514	// approximately divide by 255
		515	static unsigned int
		516	div255 (unsigned int n)
		517	{
		518	return (n + (n >> 8)) >> 8;
465	}	519	}
466		520
467	static unsigned int	521	static unsigned int
468	minpot (unsigned int n)	522	minpot (unsigned int n)
469	{	523	{
…		…
552		606
553	return mod;	607	return mod;
554	}	608	}
555		609
556	static void	610	static void
557	deliantra_main ()	611	deliantra_main (SV *real_main)
558	{	612	{
559	char *argv[] = { 0 };	613	dSP;
560	call_argv ("::main", G_DISCARD \| G_VOID, argv);	614
		615	PUSHMARK (SP);
		616	call_sv (real_main, G_DISCARD \| G_VOID);
561	}	617	}
562		618
563	#ifdef __MACOSX__	619	#ifdef __MACOSX__
		620	static SV *real_main;
		621
564	/* to due surprising braindamage on the side of SDL design, we	622	/* to due surprising braindamage on the side of SDL design, we
565	* do some mind-boggling hack here: SDL requires a custom main()	623	* do some mind-boggling hack here: SDL requires a custom main()
566	* on OS X, so... we provide one and call the original main(), which,	624	* on OS X, so... we provide one and call the original main(), which,
567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	625	* due to shared library magic, calls -lSDLmain's main, not perl's main,
568	* and which calls our main (== SDL_main) back.	626	* and which calls our main (== SDL_main) back.
569	*/	627	*/
570	extern C_LINKAGE int	628	extern C_LINKAGE int
571	main (int argc, char *argv[])	629	main (int argc, char *argv[])
572	{	630	{
573	deliantra_main ();	631	deliantra_main (real_main);
574	}	632	}
575		633
576	#undef main	634	#undef main
577		635
578	extern C_LINKAGE int main (int argc, char *argv[]);	636	extern C_LINKAGE int main (int argc, char *argv[]);
579		637
580	static void	638	static void
581	SDL_braino (void)	639	SDL_main_hack (SV *real_main_)
582	{	640	{
		641	real_main = real_main_;
		642
583	char *argv[] = { "deliantra client", 0 };	643	char *argv[] = { "deliantra client", 0 };
584	(main) (1, argv);	644	(main) (1, argv);
585	}	645	}
586	#else	646	#else
587	static void	647	static void
588	SDL_braino (void)	648	SDL_main_hack (SV *real_main)
589	{	649	{
590	deliantra_main ();	650	deliantra_main (real_main);
591	}	651	}
592	#endif	652	#endif
593		653
594	MODULE = Deliantra::Client PACKAGE = DC	654	MODULE = Deliantra::Client PACKAGE = DC
595		655
…		…
796		856
797	const_iv (FOW_DARKNESS)	857	const_iv (FOW_DARKNESS)
798	# undef const_iv	858	# undef const_iv
799	};	859	};
800		860
801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	861	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	862	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
803		863
804	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	864	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
805	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	865	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
806	}	866	}
807		867
…		…
846	#endif	906	#endif
847	}	907	}
848		908
849	char *SDL_GetError ()	909	char *SDL_GetError ()
850		910
851	void SDL_braino ()	911	void SDL_main_hack (SV *real_main)
		912	PROTOTYPE: &
852		913
853	int SDL_Init (U32 flags)	914	int SDL_Init (U32 flags)
854		915
855	int SDL_InitSubSystem (U32 flags)	916	int SDL_InitSubSystem (U32 flags)
856		917
857	void SDL_QuitSubSystem (U32 flags)	918	void SDL_QuitSubSystem (U32 flags)
858		919
859	void SDL_Quit ()	920	void SDL_Quit ()
860		921
861	int SDL_GL_SetAttribute (int attr, int value)	922	int SDL_GL_SetAttribute (int attr, int value)
		923	C_ARGS: (SDL_GLattr)attr, value
862		924
863	int SDL_GL_GetAttribute (int attr)	925	int SDL_GL_GetAttribute (int attr)
864	CODE:	926	CODE:
865	if (SDL_GL_GetAttribute (attr, &RETVAL))	927	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
866	XSRETURN_UNDEF;	928	XSRETURN_UNDEF;
867	OUTPUT:	929	OUTPUT:
868	RETVAL	930	RETVAL
869		931
870	void	932	void
…		…
925	);	987	);
926		988
927	if (RETVAL)	989	if (RETVAL)
928	{	990	{
929	av_clear (texture_av);	991	av_clear (texture_av);
930
931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	992	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
933	#include "glfunc.h"	993	#include "glfunc.h"
934	#undef GL_FUNC	994	#undef GL_FUNC
935
936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	995	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	996	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
938	}	997	}
939	}	998	}
940	OUTPUT:	999	OUTPUT:
941	RETVAL	1000	RETVAL
942		1001
943	void	1002	void
		1003	SDL_WM_SetCaption (const char title, const char icon)
		1004
		1005	void
944	SDL_GL_SwapBuffers ()	1006	SDL_GL_SwapBuffers ()
945		1007
946	char *	1008	char *
947	SDL_GetKeyName (int sym)	1009	SDL_GetKeyName (int sym)
		1010	C_ARGS: (SDLKey)sym
948		1011
949	int	1012	int
950	SDL_GetAppState ()	1013	SDL_GetAppState ()
951		1014
952	int	1015	int
953	SDL_GetModState ()	1016	SDL_GetModState ()
954		1017
		1018	int
		1019	SDL_WaitEvent ()
		1020	C_ARGS: 0
		1021
955	void	1022	void
		1023	SDL_PumpEvents ()
		1024
		1025	void
956	poll_events ()	1026	peep_events ()
957	PPCODE:	1027	PPCODE:
958	{	1028	{
959	SDL_Event ev;	1029	SDL_Event ev;
960		1030
961	SDL_PumpEvents ();	1031	SDL_PumpEvents ();
…		…
1042	OUTPUT:	1112	OUTPUT:
1043	RETVAL	1113	RETVAL
1044		1114
1045	int	1115	int
1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1116	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1047	POSTCALL:	1117	POSTCALL:
1048	Mix_HookMusicFinished (music_finished);	1118	Mix_HookMusicFinished (music_finished);
1049	Mix_ChannelFinished (channel_finished);	1119	Mix_ChannelFinished (channel_finished);
1050		1120
1051	void	1121	void
1052	Mix_QuerySpec ()	1122	Mix_QuerySpec ()
…		…
1114	OUTPUT:	1184	OUTPUT:
1115	RETVAL	1185	RETVAL
1116		1186
1117	void	1187	void
1118	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)	1188	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1189
		1190	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1191	void
		1192	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1119		1193
1120	void	1194	void
1121	load_image_inline (SV *image_)	1195	load_image_inline (SV *image_)
1122	ALIAS:	1196	ALIAS:
1123	load_image_file = 1	1197	load_image_file = 1
…		…
1169		1243
1170	SDL_LockSurface (surface2);	1244	SDL_LockSurface (surface2);
1171	EXTEND (SP, 6);	1245	EXTEND (SP, 6);
1172	PUSHs (sv_2mortal (newSViv (surface2->w)));	1246	PUSHs (sv_2mortal (newSViv (surface2->w)));
1173	PUSHs (sv_2mortal (newSViv (surface2->h)));	1247	PUSHs (sv_2mortal (newSViv (surface2->h)));
1174	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1248	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1175	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1249	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1176	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1250	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1177	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1251	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1178	SDL_UnlockSurface (surface2);	1252	SDL_UnlockSurface (surface2);
1179		1253
…		…
1251	MODULE = Deliantra::Client PACKAGE = DC::Font	1325	MODULE = Deliantra::Client PACKAGE = DC::Font
1252		1326
1253	PROTOTYPES: DISABLE	1327	PROTOTYPES: DISABLE
1254		1328
1255	DC::Font	1329	DC::Font
1256	new_from_file (SV class, char path, int id = 0)	1330	new_from_file (SV klass, char path, int id = 0)
1257	CODE:	1331	CODE:
1258	{	1332	{
1259	int count;	1333	int count;
1260	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1334	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1261	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1335	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1290	PROTOTYPE:	1364	PROTOTYPE:
1291	CODE:	1365	CODE:
1292	tc_restore ();	1366	tc_restore ();
1293		1367
1294	DC::Layout	1368	DC::Layout
1295	new (SV *class)	1369	new (SV *klass)
1296	CODE:	1370	CODE:
1297	New (0, RETVAL, 1, struct cf_layout);	1371	RETVAL = new cf_layout;
1298		1372
1299	RETVAL->pl = pango_layout_new (opengl_context);	1373	RETVAL->pl = pango_layout_new (opengl_context);
1300	RETVAL->r = 1.;	1374	RETVAL->r = 1.;
1301	RETVAL->g = 1.;	1375	RETVAL->g = 1.;
1302	RETVAL->b = 1.;	1376	RETVAL->b = 1.;
1303	RETVAL->a = 1.;	1377	RETVAL->a = 1.;
1304	RETVAL->base_height = MIN_FONT_HEIGHT;	1378	RETVAL->base_height = MIN_FONT_HEIGHT;
1305	RETVAL->font = 0;	1379	RETVAL->font = 0;
1306	RETVAL->rc = rc_alloc ();
1307		1380
1308	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1381	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1309	layout_update_font (RETVAL);	1382	layout_update_font (RETVAL);
1310	OUTPUT:	1383	OUTPUT:
1311	RETVAL	1384	RETVAL
1312		1385
1313	void	1386	void
1314	DESTROY (DC::Layout self)	1387	DESTROY (DC::Layout self)
1315	CODE:	1388	CODE:
1316	g_object_unref (self->pl);	1389	g_object_unref (self->pl);
1317	rc_free (self->rc);
1318	Safefree (self);	1390	delete self;
1319		1391
1320	void	1392	void
1321	set_text (DC::Layout self, SV *text_)	1393	set_text (DC::Layout self, SV *text_)
1322	CODE:	1394	CODE:
1323	{	1395	{
…		…
1449		1521
1450	void	1522	void
1451	set_height (DC::Layout self, int base_height)	1523	set_height (DC::Layout self, int base_height)
1452	CODE:	1524	CODE:
1453	if (self->base_height != base_height)	1525	if (self->base_height != base_height)
1454	{	1526	{
1455	self->base_height = base_height;	1527	self->base_height = base_height;
1456	layout_update_font (self);	1528	layout_update_font (self);
1457	}	1529	}
1458		1530
1459	void	1531	void
…		…
1577	}	1649	}
1578		1650
1579	void	1651	void
1580	render (DC::Layout self, float x, float y, int flags = 0)	1652	render (DC::Layout self, float x, float y, int flags = 0)
1581	CODE:	1653	CODE:
1582	rc_clear (self->rc);	1654	self->rc.clear ();
1583	pango_opengl_render_layout_subpixel (	1655	pango_opengl_render_layout_subpixel (
1584	self->pl,	1656	self->pl,
1585	self->rc,	1657	&self->rc,
1586	x * PANGO_SCALE, y * PANGO_SCALE,	1658	x * PANGO_SCALE, y * PANGO_SCALE,
1587	self->r, self->g, self->b, self->a,	1659	self->r, self->g, self->b, self->a,
1588	flags	1660	flags
1589	);	1661	);
1590	// we assume that context_change actually clears/frees stuff	1662	// we assume that context_change actually clears/frees stuff
…		…
1601	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1673	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1602	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1674	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1603	glEnable (GL_ALPHA_TEST);	1675	glEnable (GL_ALPHA_TEST);
1604	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1676	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1605		1677
1606	rc_draw (self->rc);	1678	self->rc.draw ();
1607		1679
1608	glDisable (GL_ALPHA_TEST);	1680	glDisable (GL_ALPHA_TEST);
1609	glDisable (GL_BLEND);	1681	glDisable (GL_BLEND);
1610	glDisable (GL_TEXTURE_2D);	1682	glDisable (GL_TEXTURE_2D);
1611	}	1683	}
…		…
1823	MODULE = Deliantra::Client PACKAGE = DC::Map	1895	MODULE = Deliantra::Client PACKAGE = DC::Map
1824		1896
1825	PROTOTYPES: DISABLE	1897	PROTOTYPES: DISABLE
1826		1898
1827	DC::Map	1899	DC::Map
1828	new (SV *class)	1900	new (SV *klass)
1829	CODE:	1901	CODE:
1830	New (0, RETVAL, 1, struct map);	1902	New (0, RETVAL, 1, mapgrid);
1831	RETVAL->x = 0;	1903	RETVAL->x = 0;
1832	RETVAL->y = 0;	1904	RETVAL->y = 0;
1833	RETVAL->w = 0;	1905	RETVAL->w = 0;
1834	RETVAL->h = 0;	1906	RETVAL->h = 0;
1835	RETVAL->ox = 0;	1907	RETVAL->ox = 0;
…		…
1872		1944
1873	void	1945	void
1874	set_smooth (DC::Map self, int face, int smooth, int level)	1946	set_smooth (DC::Map self, int face, int smooth, int level)
1875	CODE:	1947	CODE:
1876	{	1948	{
1877	tileid texid;	1949	tileid texid;
1878	maptex *tex;	1950	maptex *tex;
1879		1951
1880	if (face < 0 \|\| face >= self->faces)	1952	if (face < 0 \|\| face >= self->faces)
1881	return;	1953	return;
1882		1954
1883	if (smooth < 0 \|\| smooth >= self->faces)	1955	if (smooth < 0 \|\| smooth >= self->faces)
1884	return;	1956	return;
1885		1957
1886	texid = self->face2tile [face];	1958	texid = self->face2tile [face];
1887		1959
1888	if (!texid)	1960	if (!texid)
1889	return;	1961	return;
1890		1962
1891	tex = self->tex + texid;	1963	tex = self->tex + texid;
…		…
1924	}	1996	}
1925		1997
1926	void	1998	void
1927	expire_textures (DC::Map self, int texid, int count)	1999	expire_textures (DC::Map self, int texid, int count)
1928	PPCODE:	2000	PPCODE:
1929	for (; texid < self->texs && count; ++texid, --count)	2001	for (; texid < self->texs && count; ++texid, --count)
1930	{	2002	{
1931	maptex *tex = self->tex + texid;	2003	maptex *tex = self->tex + texid;
1932		2004
1933	if (tex->name)	2005	if (tex->name)
1934	{	2006	{
…		…
1981	self->ox += dx; self->x += dx;	2053	self->ox += dx; self->x += dx;
1982	self->oy += dy; self->y += dy;	2054	self->oy += dy; self->y += dy;
1983		2055
1984	while (self->y < 0)	2056	while (self->y < 0)
1985	{	2057	{
1986	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	2058	prepend (self->row, self->rows, MAP_EXTEND_Y);
1987		2059
1988	self->rows += MAP_EXTEND_Y;	2060	self->rows += MAP_EXTEND_Y;
1989	self->y += MAP_EXTEND_Y;	2061	self->y += MAP_EXTEND_Y;
1990	}	2062	}
1991	}	2063	}
1992		2064
1993	SV *	2065	SV *
1994	map1a_update (DC::Map self, SV *data_, int extmap)	2066	map1a_update (DC::Map self, SV *data_)
1995	CODE:	2067	CODE:
1996	{	2068	{
1997	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2069	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1998	uint8_t data_end = (uint8_t )SvEND (data_);	2070	uint8_t data_end = (uint8_t )SvEND (data_);
1999	mapcell *cell;	2071	mapcell *cell;
…		…
2020		2092
2021	//TODO: don't trust server data to be in-range(!)	2093	//TODO: don't trust server data to be in-range(!)
2022		2094
2023	if (flags & 8)	2095	if (flags & 8)
2024	{	2096	{
		2097	uint8_t ext, cmd;
		2098
2025	if (extmap)	2099	do
2026	{	2100	{
2027	uint8_t ext, cmd;	2101	ext = *data++;
		2102	cmd = ext & 0x7f;
2028		2103
2029	do	2104	if (cmd < 4)
		2105	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2106	else if (cmd == 5) // health
2030	{	2107	{
2031	ext = *data++;
2032	cmd = ext & 0x7f;
2033
2034	if (cmd < 4)
2035	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2036	else if (cmd == 5) // health
2037	{
2038	cell->stat_width = 1;	2108	cell->stat_width = 1;
2039	cell->stat_hp = *data++;	2109	cell->stat_hp = *data++;
2040	}
2041	else if (cmd == 6) // monster width
2042	cell->stat_width = *data++ + 1;
2043	else if (cmd == 0x47)
2044	{
2045	if (*data == 1) cell->player = data [1];
2046	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2047	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2048	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2049
2050	data += *data + 1;
2051	}
2052	else if (cmd == 8) // cell flags
2053	cell->flags = *data++;
2054	else if (ext & 0x40) // unknown, multibyte => skip
2055	data += *data + 1;
2056	else
2057	data++;
2058	}	2110	}
2059	while (ext & 0x80);	2111	else if (cmd == 6) // monster width
		2112	cell->stat_width = *data++ + 1;
		2113	else if (cmd == 0x47)
		2114	{
		2115	if (*data == 1) cell->player = data [1];
		2116	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2117	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2118	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2119
		2120	data += *data + 1;
		2121	}
		2122	else if (cmd == 8) // cell flags
		2123	cell->flags = *data++;
		2124	else if (ext & 0x40) // unknown, multibyte => skip
		2125	data += *data + 1;
		2126	else
		2127	data++;
2060	}	2128	}
2061	else	2129	while (ext & 0x80);
2062	cell->darkness = *data++ + 1;
2063	}	2130	}
2064		2131
2065	for (z = 0; z <= 2; ++z)	2132	for (z = 0; z <= 2; ++z)
2066	if (flags & (4 >> z))	2133	if (flags & (4 >> z))
2067	{	2134	{
…		…
2115	? self->row + y	2182	? self->row + y
2116	: 0;	2183	: 0;
2117		2184
2118	for (x = x0; x < x1; x++)	2185	for (x = x0; x < x1; x++)
2119	{	2186	{
2120	int r = 32, g = 32, b = 32, a = 192;	2187	unsigned int r = 32, g = 32, b = 32, a = 192;
2121		2188
2122	if (row && row->c0 <= x && x < row->c1)	2189	if (row && row->c0 <= x && x < row->c1)
2123	{	2190	{
2124	mapcell *cell = row->col + (x - row->c0);	2191	mapcell *cell = row->col + (x - row->c0);
2125		2192
…		…
2127	{	2194	{
2128	maptex tex = self->tex [cell->tile [z]];	2195	maptex tex = self->tex [cell->tile [z]];
2129	int a0 = 255 - tex.a;	2196	int a0 = 255 - tex.a;
2130	int a1 = tex.a;	2197	int a1 = tex.a;
2131		2198
2132	r = (r * a0 + tex.r * a1) / 255;	2199	r = div255 (r * a0 + tex.r * a1);
2133	g = (g * a0 + tex.g * a1) / 255;	2200	g = div255 (g * a0 + tex.g * a1);
2134	b = (b * a0 + tex.b * a1) / 255;	2201	b = div255 (b * a0 + tex.b * a1);
2135	a = (a * a0 + tex.a * a1) / 255;	2202	a = div255 (a * a0 + tex.a * a1);
2136	}	2203	}
2137	}	2204	}
2138		2205
2139	*map++ = (r )	2206	*map++ = (r )
2140	\| (g << 8)	2207	\| (g << 8)
2141	\| (b << 16)	2208	\| (b << 16)
2142	\| (a << 24);	2209	\| (a << 24);
2143	}	2210	}
2144	}	2211	}
2145		2212
2146	RETVAL = map_sv;	2213	RETVAL = map_sv;
2147	}	2214	}
2148	OUTPUT:	2215	OUTPUT:
2149	RETVAL	2216	RETVAL
2150		2217
2151	void	2218	void
2152	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2219	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)
2153	CODE:	2220	CODE:
2154	{	2221	{
2155	int x, y, z;	2222	int x, y, z;
2156		2223
2157	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2158	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2159	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2224	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2160	smooth_key skey;
2161	int pl_x, pl_y;	2225	int pl_x, pl_y;
2162	maptex pl_tex;	2226	maptex pl_tex;
2163	rc_t *rc = rc_alloc ();	2227	rc_t rc;
2164	rc_t *rc_ov = rc_alloc ();	2228	rc_t rc_ov;
2165	rc_key_t key;	2229	rc_key_t key;
2166	rc_array_t *arr;	2230	rc_t::array_t *arr;
2167		2231
2168	pl_tex.name = 0;	2232	pl_tex.name = 0;
2169		2233
2170	// that's current max. sorry.	2234	// that's current max. sorry.
2171	if (sw > 255) sw = 255;	2235	if (sw > 255) sw = 255;
2172	if (sh > 255) sh = 255;	2236	if (sh > 255) sh = 255;
2173
2174	// clear key, in case of extra padding
2175	memset (&skey, 0, sizeof (skey));
2176		2237
2177	memset (&key, 0, sizeof (key));	2238	memset (&key, 0, sizeof (key));
2178	key.r = 255;	2239	key.r = 255;
2179	key.g = 255;	2240	key.g = 255;
2180	key.b = 255;	2241	key.b = 255;
…		…
2186	my += self->y;	2247	my += self->y;
2187		2248
2188	// first pass: determine smooth_max	2249	// first pass: determine smooth_max
2189	// rather ugly, if you ask me	2250	// rather ugly, if you ask me
2190	// could also be stored inside mapcell and updated on change	2251	// could also be stored inside mapcell and updated on change
2191	memset (smooth_max, 0, sizeof (smooth_max));	2252	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2192		2253
2193	for (y = 0; y < sh; y++)	2254	for (y = 0; y < sh; y++)
2194	if (0 <= y + my && y + my < self->rows)	2255	if (0 <= y + my && y + my < self->rows)
2195	{	2256	{
2196	maprow *row = self->row + (y + my);	2257	maprow *row = self->row + (y + my);
…		…
2211	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2272	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2212	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2273	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2213		2274
2214	for (z = 0; z <= 2; z++)	2275	for (z = 0; z <= 2; z++)
2215	{	2276	{
2216	memset (smooth_level, 0, sizeof (smooth_level));	2277	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2278	smooth_key skey;
		2279	smooth_hash smooth;
2217	key.texname = -1;	2280	key.texname = -1;
2218		2281
2219	for (y = 0; y < sh; y++)	2282	for (y = 0; y < sh; y++)
2220	if (0 <= y + my && y + my < self->rows)	2283	if (0 <= y + my && y + my < self->rows)
2221	{	2284	{
…		…
2238		2301
2239	if (!tex.name)	2302	if (!tex.name)
2240	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2303	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2241		2304
2242	key.texname = tex.name;	2305	key.texname = tex.name;
2243	arr = rc_array (rc, &key);	2306	arr = &rc.array (key);
2244	}	2307	}
2245		2308
2246	px = (x + 1) * T - tex.w;	2309	px = (x + 1) * Th - tex.w;
2247	py = (y + 1) * T - tex.h;	2310	py = (y + 1) * Tw - tex.h;
2248		2311
2249	if (expect_false (cell->player == player) && expect_false (z == 2))	2312	if (expect_false (cell->player == player) && expect_false (z == 2))
2250	{	2313	{
2251	pl_x = px;	2314	pl_x = px;
2252	pl_y = py;	2315	pl_y = py;
2253	pl_tex = tex;	2316	pl_tex = tex;
2254	continue;	2317	continue;
2255	}	2318	}
2256		2319
2257	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2320	arr->t2f_v3f (0 , 0 , px , py , 0);
2258	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2321	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2259	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2322	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2260	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2323	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2261		2324
2262	// update smooth hash	2325	// update smooth hash
2263	if (tex.smoothtile)	2326	if (tex.smoothtile)
2264	{	2327	{
2265	skey.tile = tex.smoothtile;	2328	skey.tile = tex.smoothtile;
2266	skey.level = tex.smoothlevel;	2329	skey.level = tex.smoothlevel;
2267		2330
2268	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2331	smooth_level[tex.smoothlevel] = 1;
2269		2332
2270	// add bits to current tile and all neighbours. skey.x\|y is	2333	// add bits to current tile and all neighbours. skey.x\|y is
2271	// shifted +1\|+1 so we always stay positive.	2334	// shifted +1\|+1 so we always stay positive.
2272		2335
2273	// bits is ___n cccc CCCC bbbb	2336	// bits is ___n cccc CCCC bbbb
…		…
2281		2344
2282	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2345	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2283	// ·· ·· ·┏ ┓·	2346	// ·· ·· ·┏ ┓·
2284		2347
2285	// full tile	2348	// full tile
2286	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2349	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2287		2350
2288	// borders	2351	// borders
2289	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2352	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2290	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2353	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2291	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2354	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2292	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2355	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2293		2356
2294	// corners	2357	// corners
2295	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2358	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2296	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2359	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2297	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2360	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2298	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2361	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2299	}	2362	}
2300	}	2363	}
2301		2364
2302	if (expect_false (z == 2) && expect_false (cell->flags))	2365	if (expect_false (z == 2) && expect_false (cell->flags))
2303	{	2366	{
2304	// overlays such as the speech bubble, probably more to come	2367	// overlays such as the speech bubble, probably more to come
2305	if (cell->flags & 1)	2368	if (cell->flags & 1)
2306	{	2369	{
2307	rc_key_t key_ov = key;	2370	rc_key_t key_ov = key;
2308	maptex tex = self->tex [TEXID_SPEECH];	2371	maptex tex = self->tex[TEXID_SPEECH];
2309	rc_array_t *arr;
2310	int px = x * T + T * 2 / 32;	2372	int px = x * Tw + Tw * 2 / 32;
2311	int py = y * T - T * 6 / 32;	2373	int py = y * Th - Th * 6 / 32;
2312		2374
2313	key_ov.texname = tex.name;	2375	key_ov.texname = tex.name;
2314	arr = rc_array (rc_ov, &key_ov);	2376	rc_t::array_t &arr = rc_ov.array (key_ov);
2315		2377
2316	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2378	arr.t2f_v3f (0 , 0 , px , py , 0);
2317	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2379	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2318	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2380	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2319	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2381	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2320	}	2382	}
2321	}	2383	}
2322	}	2384	}
2323	}	2385	}
2324		2386
2325	rc_draw (rc);	2387	rc.draw ();
2326	rc_clear (rc);	2388	rc.clear ();
2327		2389
2328	// go through all smoothlevels, lowest to highest, then draw.	2390	// go through all smoothlevels, lowest to highest, then draw.
2329	// this is basically counting sort	2391	// this is basically counting sort
2330	{	2392	{
2331	int w, b;	2393	int w, b;
2332		2394
2333	glEnable (GL_TEXTURE_2D);	2395	glEnable (GL_TEXTURE_2D);
2334	glBegin (GL_QUADS);	2396	glBegin (GL_QUADS);
2335	for (w = 0; w < 256 / 32; ++w)	2397	for (int level = 0; level < smooth_level.size (); ++level)
		2398	if (smooth_level[level])
		2399	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2336	{	2400	{
2337	uint32_t smask = smooth_level [w];	2401	smooth_key &skey = it->first;
2338	if (smask)	2402	IV bits = it->second;
2339	for (b = 0; b < 32; ++b)	2403
2340	if (smask & (((uint32_t)1) << b))	2404	if (!(bits & 0x1000)
		2405	&& skey.level == level
		2406	&& level > smooth_max [skey.x][skey.y])
2341	{	2407	{
2342	int level = (w << 5) \| b;	2408	maptex tex = self->tex [skey.tile];
		2409	int px = (((int)skey.x) - 1) * Tw;
		2410	int py = (((int)skey.y) - 1) * Th;
		2411	int border = bits & 15;
		2412	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2413	float dx = tex.s * .0625f; // 16 images/row
		2414	float dy = tex.t * .5f ; // 2 images/column
		2415
2343	HE *he;	2416	if (tex.name)
2344
2345	hv_iterinit (smooth);
2346	while ((he = hv_iternext (smooth)))
2347	{	2417	{
2348	smooth_key skey = (smooth_key )HeKEY (he);	2418	// this time avoiding texture state changes
2349	IV bits = SvIVX (HeVAL (he));	2419	// save gobs of state changes.
2350		2420	if (key.texname != tex.name)
2351	if (!(bits & 0x1000)
2352	&& skey->level == level
2353	&& level > smooth_max [skey->x][skey->y])
2354	{	2421	{
2355	maptex tex = self->tex [skey->tile];
2356	int px = (((int)skey->x) - 1) * T;
2357	int py = (((int)skey->y) - 1) * T;
2358	int border = bits & 15;
2359	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2360	float dx = tex.s * .0625f; // 16 images/row
2361	float dy = tex.t * .5f ; // 2 images/column
2362
2363	if (tex.name)
2364	{
2365	// this time avoiding texture state changes
2366	// save gobs of state changes.
2367	if (key.texname != tex.name)
2368	{
2369	self->tex [skey->tile].unused = 0;	2422	self->tex [skey.tile].unused = 0;
2370		2423
2371	glEnd ();	2424	glEnd ();
2372	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2425	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2373	glBegin (GL_QUADS);	2426	glBegin (GL_QUADS);
2374	}	2427	}
2375		2428
2376	if (border)	2429	if (border)
2377	{	2430	{
2378	float ox = border * dx;	2431	float ox = border * dx;
2379		2432
2380	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2433	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2381	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2434	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2382	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2435	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2383	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2436	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2384	}	2437	}
2385		2438
2386	if (corner)	2439	if (corner)
2387	{	2440	{
2388	float ox = corner * dx;	2441	float ox = corner * dx;
2389		2442
2390	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2443	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2391	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2444	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2392	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2445	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2393	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2446	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2394	}
2395	}
2396	}	2447	}
2397	}	2448	}
2398	}	2449	}
2399	}	2450	}
2400		2451
2401	glEnd ();	2452	glEnd ();
2402	glDisable (GL_TEXTURE_2D);	2453	glDisable (GL_TEXTURE_2D);
2403	key.texname = -1;	2454	key.texname = -1;
2404	}	2455	}
2405
2406	hv_clear (smooth);
2407	}	2456	}
2408		2457
2409	if (pl_tex.name)	2458	if (pl_tex.name)
2410	{	2459	{
2411	maptex tex = pl_tex;	2460	maptex tex = pl_tex;
2412	int px = pl_x + sdx;	2461	int px = pl_x + sdx;
2413	int py = pl_y + sdy;	2462	int py = pl_y + sdy;
2414		2463
2415	key.texname = tex.name;	2464	key.texname = tex.name;
2416	arr = rc_array (rc, &key);	2465	rc_t::array_t &arr = rc.array (key);
2417		2466
2418	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2467	arr.t2f_v3f (0 , 0 , px , py , 0);
2419	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2468	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2420	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2469	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2421	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2470	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2422		2471
2423	rc_draw (rc);	2472	rc.draw ();
2424	}	2473	}
2425		2474
2426	rc_draw (rc_ov);	2475	rc_ov.draw ();
2427	rc_clear (rc_ov);	2476	rc_ov.clear ();
2428		2477
2429	glDisable (GL_BLEND);	2478	glDisable (GL_BLEND);
2430	rc_free (rc);
2431	rc_free (rc_ov);
2432		2479
2433	// top layer: overlays such as the health bar	2480	// top layer: overlays such as the health bar
2434	for (y = 0; y < sh; y++)	2481	for (y = 0; y < sh; y++)
2435	if (0 <= y + my && y + my < self->rows)	2482	if (0 <= y + my && y + my < self->rows)
2436	{	2483	{
…		…
2439	for (x = 0; x < sw; x++)	2486	for (x = 0; x < sw; x++)
2440	if (row->c0 <= x + mx && x + mx < row->c1)	2487	if (row->c0 <= x + mx && x + mx < row->c1)
2441	{	2488	{
2442	mapcell *cell = row->col + (x + mx - row->c0);	2489	mapcell *cell = row->col + (x + mx - row->c0);
2443		2490
2444	int px = x * T;	2491	int px = x * Tw;
2445	int py = y * T;	2492	int py = y * Th;
2446		2493
2447	if (expect_false (cell->player == player))	2494	if (expect_false (cell->player == player))
2448	{	2495	{
2449	px += sdx;	2496	px += sdx;
2450	py += sdy;	2497	py += sdy;
2451	}	2498	}
2452		2499
2453	if (cell->stat_hp)	2500	if (cell->stat_hp)
2454	{	2501	{
2455	int width = cell->stat_width * T;	2502	int width = cell->stat_width * Tw;
2456	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2503	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2457		2504
2458	glColor3ub (0, 0, 0);	2505	glColor3ub (0, 0, 0);
2459	glRectf (px + 1, py - thick - 2,	2506	glRectf (px + 1, py - thick - 2,
2460	px + width - 1, py);	2507	px + width - 1, py);
2461		2508
…		…
2541	int x, y;	2588	int x, y;
2542	int sw1 = sw + 2;	2589	int sw1 = sw + 2;
2543	int sh1 = sh + 2;	2590	int sh1 = sh + 2;
2544	int sh3 = sh * 3;	2591	int sh3 = sh * 3;
2545	int sw3 = sw * 3;	2592	int sw3 = sw * 3;
2546	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2547	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2593	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2548	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2594	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2595	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2596	memset (darkness1, 0, sw1*sh1);
2549		2597
2550	SvPOK_only (darkness3_sv);	2598	SvPOK_only (darkness3_sv);
2551	SvCUR_set (darkness3_sv, sw3 * sh3);	2599	SvCUR_set (darkness3_sv, sw3 * sh3);
2552		2600
2553	mx += self->x - 1;	2601	mx += self->x - 1;
…		…
2679	else	2727	else
2680	*data++ = 0;	2728	*data++ = 0;
2681	}	2729	}
2682	}	2730	}
2683		2731
2684	/* if size is wh + 5 then no data has been found /	2732	/* if size is wh + 5 then no data has been found /
2685	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2733	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2686	{	2734	{
2687	SvPOK_only (data_sv);	2735	SvPOK_only (data_sv);
2688	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2736	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2689	}	2737	}
2690		2738
2691	RETVAL = data_sv;	2739	RETVAL = data_sv;
2692	}	2740	}
2693	OUTPUT:	2741	OUTPUT:
2694	RETVAL	2742	RETVAL
2695		2743
2696	void	2744	void
…		…
2703	STRLEN len;	2751	STRLEN len;
2704	uint8_t data, end;	2752	uint8_t data, end;
2705		2753
2706	len = SvLEN (data_sv);	2754	len = SvLEN (data_sv);
2707	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2755	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2708	data = SvPVbyte_nolen (data_sv);	2756	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2709	end = data + len + 8;	2757	end = data + len + 8;
2710		2758
2711	if (len < 5)	2759	if (len < 5)
2712	XSRETURN_EMPTY;	2760	XSRETURN_EMPTY;
2713		2761
…		…
2774	}	2822	}
2775		2823
2776	MODULE = Deliantra::Client PACKAGE = DC::RW	2824	MODULE = Deliantra::Client PACKAGE = DC::RW
2777		2825
2778	DC::RW	2826	DC::RW
2779	new (SV class, SV data_sv)	2827	new (SV klass, SV data_sv)
2780	CODE:	2828	CODE:
2781	{	2829	{
2782	STRLEN datalen;	2830	STRLEN datalen;
2783	char *data = SvPVbyte (data_sv, datalen);	2831	char *data = SvPVbyte (data_sv, datalen);
2784		2832
…		…
2786	}	2834	}
2787	OUTPUT:	2835	OUTPUT:
2788	RETVAL	2836	RETVAL
2789		2837
2790	DC::RW	2838	DC::RW
2791	new_from_file (SV class, const char path, const char *mode = "rb")	2839	new_from_file (SV klass, const char path, const char *mode = "rb")
2792	CODE:	2840	CODE:
2793	RETVAL = SDL_RWFromFile (path, mode);	2841	RETVAL = SDL_RWFromFile (path, mode);
2794	OUTPUT:	2842	OUTPUT:
2795	RETVAL	2843	RETVAL
2796		2844
…		…
2905	#else	2953	#else
2906	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2954	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2907	#endif	2955	#endif
2908		2956
2909	DC::MixChunk	2957	DC::MixChunk
2910	new (SV *class, DC::RW rwops)	2958	new (SV *klass, DC::RW rwops)
2911	CODE:	2959	CODE:
2912	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2960	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2913	OUTPUT:	2961	OUTPUT:
2914	RETVAL	2962	RETVAL
2915		2963
…		…
2985	RETVAL = Mix_PlayingMusic ();	3033	RETVAL = Mix_PlayingMusic ();
2986	OUTPUT:	3034	OUTPUT:
2987	RETVAL	3035	RETVAL
2988		3036
2989	DC::MixMusic	3037	DC::MixMusic
2990	new (SV *class, DC::RW rwops)	3038	new (SV *klass, DC::RW rwops)
2991	CODE:	3039	CODE:
2992	RETVAL = Mix_LoadMUS_RW (rwops);	3040	RETVAL = Mix_LoadMUS_RW (rwops);
2993	OUTPUT:	3041	OUTPUT:
2994	RETVAL	3042	RETVAL
2995		3043
…		…
3132	const_iv (GL_FUNC_SUBTRACT),	3180	const_iv (GL_FUNC_SUBTRACT),
3133	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3181	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3134	# undef const_iv	3182	# undef const_iv
3135	};	3183	};
3136		3184
3137	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3185	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3138	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3186	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3139		3187
3140	texture_av = newAV ();	3188	texture_av = newAV ();
3141	AvREAL_off (texture_av);	3189	AvREAL_off (texture_av);
3142	}	3190	}
3143		3191
…		…
3148	gl.BlendFuncSeparateEXT = 0;	3196	gl.BlendFuncSeparateEXT = 0;
3149		3197
3150	void	3198	void
3151	apple_nvidia_bug (int enable)	3199	apple_nvidia_bug (int enable)
3152		3200
3153	char *	3201	const char *
3154	gl_vendor ()	3202	gl_vendor ()
3155	CODE:	3203	CODE:
3156	RETVAL = (char *)glGetString (GL_VENDOR);	3204	RETVAL = (const char *)glGetString (GL_VENDOR);
3157	OUTPUT:	3205	OUTPUT:
3158	RETVAL	3206	RETVAL
3159		3207
3160	char *	3208	const char *
3161	gl_version ()	3209	gl_version ()
3162	CODE:	3210	CODE:
3163	RETVAL = (char *)glGetString (GL_VERSION);	3211	RETVAL = (const char *)glGetString (GL_VERSION);
3164	OUTPUT:	3212	OUTPUT:
3165	RETVAL	3213	RETVAL
3166		3214
3167	char *	3215	const char *
3168	gl_extensions ()	3216	gl_extensions ()
3169	CODE:	3217	CODE:
3170	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3218	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3171	OUTPUT:	3219	OUTPUT:
3172	RETVAL	3220	RETVAL
3173		3221
3174	const char *glGetString (GLenum pname)	3222	const char *glGetString (GLenum pname)
		3223	CODE:
		3224	RETVAL = (const char *)glGetString (pname);
		3225	OUTPUT:
		3226	RETVAL
3175		3227
3176	GLint glGetInteger (GLenum pname)	3228	GLint glGetInteger (GLenum pname)
3177	CODE:	3229	CODE:
3178	glGetIntegerv (pname, &RETVAL);	3230	glGetIntegerv (pname, &RETVAL);
3179	OUTPUT:	3231	OUTPUT:
…		…
3382		3434
3383	void	3435	void
3384	find_widget (SV *self, NV x, NV y)	3436	find_widget (SV *self, NV x, NV y)
3385	PPCODE:	3437	PPCODE:
3386	{	3438	{
3387	if (within_widget (self, x, y))	3439	if (within_widget (self, x, y))
3388	XPUSHs (self);	3440	XPUSHs (self);
3389	}	3441	}
3390		3442
3391	BOOT:	3443	BOOT:
3392	{	3444	{
…		…
3400		3452
3401	void	3453	void
3402	draw (SV *self)	3454	draw (SV *self)
3403	CODE:	3455	CODE:
3404	{	3456	{
3405	HV *hv;	3457	HV *hv;
3406	SV **svp;	3458	SV **svp;
3407	NV x, y, w, h;	3459	NV x, y, w, h;
3408	SV *draw_x_sv = GvSV (draw_x_gv);	3460	SV *draw_x_sv = GvSV (draw_x_gv);
3409	SV *draw_y_sv = GvSV (draw_y_gv);	3461	SV *draw_y_sv = GvSV (draw_y_gv);
3410	SV *draw_w_sv = GvSV (draw_w_gv);	3462	SV *draw_w_sv = GvSV (draw_w_gv);
3411	SV *draw_h_sv = GvSV (draw_h_gv);	3463	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.305 by root, Sun May 2 21:22:20 2010 UTC vs. Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.305 by root, Sun May 2 21:22:20 2010 UTC vs.
Revision 1.329 by root, Sun Nov 18 13:07:51 2018 UTC