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