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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 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>
…		…
41	#include <SDL_opengl.h>	46	#include <SDL_opengl.h>
42		47
43	/* work around os x broken headers */	48	/* work around os x broken headers */
44	#ifdef __MACOSX__	49	#ifdef __MACOSX__
45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);	50	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		51	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		52	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
46	#endif	53	#endif
47		54
48	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
49	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
50		57
51	#include <glib/gmacros.h>	58	#include <glib.h>
52		59
53	#include <pango/pango.h>	60	#include <pango/pango.h>
54		61
55	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
56	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
97		104
98	#define KMOD_LRAM 0x10000 // our extension	105	#define KMOD_LRAM 0x10000 // our extension
99		106
100	#define TEXID_SPEECH 1	107	#define TEXID_SPEECH 1
101	#define TEXID_NOFACE 2	108	#define TEXID_NOFACE 2
102	#define TEXID_HIDDEN 3	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	}
103		128
104	static AV *texture_av;	129	static AV *texture_av;
105		130
106	static struct	131	static struct
107	{	132	{
…		…
164	{	189	{
165	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
166		191
167	while (attrs)	192	while (attrs)
168	{	193	{
169	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
170		195
171	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
172	return 1;	197	return 1;
173		198
174	attrs = attrs->next;	199	attrs = attrs->next;
175	}	200	}
176		201
177	return 0;	202	return 0;
178	}	203	}
179		204
180	typedef struct cf_layout {	205	struct cf_layout {
181	PangoLayout *pl;	206	PangoLayout *pl;
182	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
183	int base_height;	208	int base_height;
184	DC__Font font;	209	DC__Font font;
185	rc_t *rc;	210	rc_t *rc;
186	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
187		214
188	static DC__Font default_font;	215	static DC__Font default_font;
189	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
190	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
191		218
192	static void	219	static void
193	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
194	{	221	{
195	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
196	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
197	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
198	#endif	225	#endif
199	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
200	}	227	}
201		228
202	static void	229	static void
…		…
232	}	259	}
233		260
234	typedef uint16_t tileid;	261	typedef uint16_t tileid;
235	typedef uint16_t faceid;	262	typedef uint16_t faceid;
236		263
237	typedef struct {	264	struct maptex
		265	{
238	GLuint name;	266	GLuint name;
239	int w, h;	267	int w, h;
240	float s, t;	268	float s, t;
241	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
242	tileid smoothtile;	270	tileid smoothtile;
243	uint8_t smoothlevel;	271	uint8_t smoothlevel;
244	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
245	} maptex;	273	};
246		274
247	typedef struct {	275	struct mapcell
		276	{
248	uint32_t player;	277	uint32_t player;
249	tileid tile[3];	278	tileid tile[3];
250	uint16_t darkness;	279	uint16_t darkness;
251	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
252	} mapcell;	281	};
253		282
254	typedef struct {	283	struct maprow
		284	{
255	int32_t c0, c1;	285	int32_t c0, c1;
256	mapcell *col;	286	mapcell *col;
257	} maprow;	287	};
258		288
259	typedef struct map {	289	struct mapgrid {
260	int x, y, w, h;	290	int x, y, w, h;
261	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
262	int faces; tileid *face2tile; // [faceid]	292	int faces; tileid *face2tile; // [faceid]
263	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
264		294
265	int32_t rows;	295	int32_t rows;
266	maprow *row;	296	maprow *row;
267	} *DC__Map;	297	};
		298
		299	typedef mapgrid *DC__Map;
268		300
269	static char *	301	static char *
270	prepend (char *ptr, int sze, int inc)	302	prepend (char *ptr, int sze, int inc)
271	{	303	{
272	char *p;	304	char *p;
…		…
290		322
291	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	323	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
292	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	324	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
293		325
294	static void	326	static void
295	need_facenum (struct map *self, faceid face)	327	need_facenum (struct mapgrid *self, faceid face)
296	{	328	{
297	while (self->faces <= face)	329	while (self->faces <= face)
298	{	330	{
299	Append (tileid, self->face2tile, self->faces, self->faces);	331	Append (tileid, self->face2tile, self->faces, self->faces);
300	self->faces *= 2;	332	self->faces *= 2;
301	}	333	}
302	}	334	}
303		335
304	static void	336	static void
305	need_texid (struct map *self, int texid)	337	need_texid (struct mapgrid *self, int texid)
306	{	338	{
307	while (self->texs <= texid)	339	while (self->texs <= texid)
308	{	340	{
309	Append (maptex, self->tex, self->texs, self->texs);	341	Append (maptex, self->tex, self->texs, self->texs);
310	self->texs *= 2;	342	self->texs *= 2;
311	}	343	}
312	}	344	}
313		345
314	static maprow *	346	static maprow *
315	map_get_row (DC__Map self, int y)	347	map_get_row (mapgrid *self, int y)
316	{	348	{
317	if (0 > y)	349	if (0 > y)
318	{	350	{
319	int extend = - y + MAP_EXTEND_Y;	351	int extend = - y + MAP_EXTEND_Y;
320	Prepend (maprow, self->row, self->rows, extend);	352	Prepend (maprow, self->row, self->rows, extend);
…		…
358		390
359	return row->col + (x - row->c0);	391	return row->col + (x - row->c0);
360	}	392	}
361		393
362	static mapcell *	394	static mapcell *
363	map_get_cell (DC__Map self, int x, int y)	395	map_get_cell (mapgrid *self, int x, int y)
364	{	396	{
365	return row_get_cell (map_get_row (self, y), x);	397	return row_get_cell (map_get_row (self, y), x);
366	}	398	}
367		399
368	static void	400	static void
369	map_clear (DC__Map self)	401	map_clear (mapgrid *self)
370	{	402	{
371	int r;	403	int r;
372		404
373	for (r = 0; r < self->rows; r++)	405	for (r = 0; r < self->rows; r++)
374	Safefree (self->row[r].col);	406	Safefree (self->row[r].col);
…		…
392	(cell)->flags = 0; \	424	(cell)->flags = 0; \
393	(cell)->player = 0; \	425	(cell)->player = 0; \
394	} while (0)	426	} while (0)
395		427
396	static void	428	static void
397	map_blank (DC__Map self, int x0, int y0, int w, int h)	429	map_blank (mapgrid *self, int x0, int y0, int w, int h)
398	{	430	{
399	int x, y;	431	int x, y;
400	maprow *row;	432	maprow *row;
401	mapcell *cell;	433	mapcell *cell;
402		434
…		…
419	CELL_CLEAR (cell);	451	CELL_CLEAR (cell);
420	}	452	}
421	}	453	}
422	}	454	}
423		455
424	typedef struct {	456	struct smooth_key
		457	{
425	tileid tile;	458	tileid tile;
426	uint8_t x, y, level;	459	uint8_t x, y, level;
427	} smooth_key;	460
		461	bool operator == (const smooth_key &o) const
		462	{
		463	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		464	}
		465	};
		466
		467	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		468
		469	namespace std {
		470	template <>
		471	struct hash<smooth_key>
		472	{
		473	size_t operator () (const smooth_key &v) const
		474	{
		475	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		476	}
		477	};
		478	}
428		479
429	static void	480	static void
430	smooth_or_bits (HV hv, smooth_key key, IV bits)	481	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
431	{	482	{
432	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	483	auto &&it = h.find (key);
433		484
434	if (SvIOK (*sv))	485	if (it == h.end ())
435	SvIV_set (sv, SvIVX (sv) \| bits);	486	h.insert (std::make_pair (key, bits));
436	else	487	else
437	sv_setiv (*sv, bits);	488	it->second \|= bits;
438	}	489	}
439		490
440	static void	491	static void
441	music_finished (void)	492	music_finished (void)
442	{	493	{
…		…
459	ev.code = 1;	510	ev.code = 1;
460	ev.data1 = (void *)(long)channel;	511	ev.data1 = (void *)(long)channel;
461	ev.data2 = 0;	512	ev.data2 = 0;
462		513
463	SDL_PushEvent ((SDL_Event *)&ev);	514	SDL_PushEvent ((SDL_Event *)&ev);
		515	}
		516
		517	// approximately divide by 255
		518	static unsigned int
		519	div255 (unsigned int n)
		520	{
		521	return (n + (n >> 8)) >> 8;
464	}	522	}
465		523
466	static unsigned int	524	static unsigned int
467	minpot (unsigned int n)	525	minpot (unsigned int n)
468	{	526	{
…		…
551		609
552	return mod;	610	return mod;
553	}	611	}
554		612
555	static void	613	static void
556	deliantra_main ()	614	deliantra_main (SV *real_main)
557	{	615	{
558	char *argv[] = { 0 };	616	dSP;
559	call_argv ("::main", G_DISCARD \| G_VOID, argv);	617
		618	PUSHMARK (SP);
		619	call_sv (real_main, G_DISCARD \| G_VOID);
560	}	620	}
561		621
562	#ifdef __MACOSX__	622	#ifdef __MACOSX__
		623	static SV *real_main;
		624
563	/* to due surprising braindamage on the side of SDL design, we	625	/* to due surprising braindamage on the side of SDL design, we
564	* do some mind-boggling hack here: SDL requires a custom main()	626	* do some mind-boggling hack here: SDL requires a custom main()
565	* on OS X, so... we provide one and call the original main(), which,	627	* on OS X, so... we provide one and call the original main(), which,
566	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,	628	* due to shared library magic, calls -lSDLmain's main, not perl's main,
567	* and which calls our main (== SDL_main) back.	629	* and which calls our main (== SDL_main) back.
568	*/	630	*/
569	extern C_LINKAGE int	631	extern C_LINKAGE int
570	main (int argc, char *argv[])	632	main (int argc, char *argv[])
571	{	633	{
572	deliantra_main ();	634	deliantra_main (real_main);
573	}	635	}
574		636
575	#undef main	637	#undef main
576		638
577	extern C_LINKAGE int main (int argc, char *argv[]);	639	extern C_LINKAGE int main (int argc, char *argv[]);
578		640
579	static void	641	static void
580	SDL_braino (void)	642	SDL_main_hack (SV *real_main_)
581	{	643	{
		644	real_main = real_main_;
		645
582	char *argv[] = { "deliantra client", 0 };	646	char *argv[] = { "deliantra client", 0 };
583	(main) (1, argv);	647	(main) (1, argv);
584	}	648	}
585	#else	649	#else
586	static void	650	static void
587	SDL_braino (void)	651	SDL_main_hack (SV *real_main)
588	{	652	{
589	deliantra_main ();	653	deliantra_main (real_main);
590	}	654	}
591	#endif	655	#endif
592		656
593	MODULE = Deliantra::Client PACKAGE = DC	657	MODULE = Deliantra::Client PACKAGE = DC
594		658
…		…
795		859
796	const_iv (FOW_DARKNESS)	860	const_iv (FOW_DARKNESS)
797	# undef const_iv	861	# undef const_iv
798	};	862	};
799		863
800	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	864	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
801	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	865	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
802		866
803	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	867	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
804	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	868	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
805	}	869	}
806		870
…		…
845	#endif	909	#endif
846	}	910	}
847		911
848	char *SDL_GetError ()	912	char *SDL_GetError ()
849		913
850	void SDL_braino ()	914	void SDL_main_hack (SV *real_main)
		915	PROTOTYPE: &
851		916
852	int SDL_Init (U32 flags)	917	int SDL_Init (U32 flags)
853		918
854	int SDL_InitSubSystem (U32 flags)	919	int SDL_InitSubSystem (U32 flags)
855		920
856	void SDL_QuitSubSystem (U32 flags)	921	void SDL_QuitSubSystem (U32 flags)
857		922
858	void SDL_Quit ()	923	void SDL_Quit ()
859		924
860	int SDL_GL_SetAttribute (int attr, int value)	925	int SDL_GL_SetAttribute (int attr, int value)
		926	C_ARGS: (SDL_GLattr)attr, value
861		927
862	int SDL_GL_GetAttribute (int attr)	928	int SDL_GL_GetAttribute (int attr)
863	CODE:	929	CODE:
864	if (SDL_GL_GetAttribute (attr, &RETVAL))	930	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
865	XSRETURN_UNDEF;	931	XSRETURN_UNDEF;
866	OUTPUT:	932	OUTPUT:
867	RETVAL	933	RETVAL
868		934
869	void	935	void
…		…
924	);	990	);
925		991
926	if (RETVAL)	992	if (RETVAL)
927	{	993	{
928	av_clear (texture_av);	994	av_clear (texture_av);
929
930	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
931	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	995	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
932	#include "glfunc.h"	996	#include "glfunc.h"
933	#undef GL_FUNC	997	#undef GL_FUNC
		998	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		999	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
934	}	1000	}
935	}	1001	}
936	OUTPUT:	1002	OUTPUT:
937	RETVAL	1003	RETVAL
		1004
		1005	void
		1006	SDL_WM_SetCaption (const char title, const char icon)
938		1007
939	void	1008	void
940	SDL_GL_SwapBuffers ()	1009	SDL_GL_SwapBuffers ()
941		1010
942	char *	1011	char *
943	SDL_GetKeyName (int sym)	1012	SDL_GetKeyName (int sym)
		1013	C_ARGS: (SDLKey)sym
944		1014
945	int	1015	int
946	SDL_GetAppState ()	1016	SDL_GetAppState ()
947		1017
948	int	1018	int
949	SDL_GetModState ()	1019	SDL_GetModState ()
950		1020
		1021	int
		1022	SDL_WaitEvent ()
		1023	C_ARGS: 0
		1024
951	void	1025	void
		1026	SDL_PumpEvents ()
		1027
		1028	void
952	poll_events ()	1029	peep_events ()
953	PPCODE:	1030	PPCODE:
954	{	1031	{
955	SDL_Event ev;	1032	SDL_Event ev;
956		1033
957	SDL_PumpEvents ();	1034	SDL_PumpEvents ();
…		…
1023		1100
1024	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1101	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1025	}	1102	}
1026	}	1103	}
1027		1104
		1105	char *
		1106	SDL_AudioDriverName ()
		1107	CODE:
		1108	{
		1109	char buf [256];
		1110	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1111	XSRETURN_UNDEF;
		1112
		1113	RETVAL = buf;
		1114	}
		1115	OUTPUT:
		1116	RETVAL
		1117
1028	int	1118	int
1029	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1119	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1030	POSTCALL:	1120	POSTCALL:
1031	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1032	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1033		1123
1034	void	1124	void
1035	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1094	add_font (char *file)	1184	add_font (char *file)
1095	CODE:	1185	CODE:
1096	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1186	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1097	OUTPUT:	1187	OUTPUT:
1098	RETVAL	1188	RETVAL
		1189
		1190	void
		1191	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1192
		1193	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1194	void
		1195	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1099		1196
1100	void	1197	void
1101	load_image_inline (SV *image_)	1198	load_image_inline (SV *image_)
1102	ALIAS:	1199	ALIAS:
1103	load_image_file = 1	1200	load_image_file = 1
…		…
1149		1246
1150	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1151	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1152	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1153	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1154	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1155	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1252	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1156	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1157	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1158	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1159		1256
…		…
1231	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1232		1329
1233	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1234		1331
1235	DC::Font	1332	DC::Font
1236	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1237	CODE:	1334	CODE:
1238	{	1335	{
1239	int count;	1336	int count;
1240	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1241	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1270	PROTOTYPE:	1367	PROTOTYPE:
1271	CODE:	1368	CODE:
1272	tc_restore ();	1369	tc_restore ();
1273		1370
1274	DC::Layout	1371	DC::Layout
1275	new (SV *class)	1372	new (SV *klass)
1276	CODE:	1373	CODE:
1277	New (0, RETVAL, 1, struct cf_layout);	1374	New (0, RETVAL, 1, struct cf_layout);
1278		1375
1279	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1280	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
…		…
1429		1526
1430	void	1527	void
1431	set_height (DC::Layout self, int base_height)	1528	set_height (DC::Layout self, int base_height)
1432	CODE:	1529	CODE:
1433	if (self->base_height != base_height)	1530	if (self->base_height != base_height)
1434	{	1531	{
1435	self->base_height = base_height;	1532	self->base_height = base_height;
1436	layout_update_font (self);	1533	layout_update_font (self);
1437	}	1534	}
1438		1535
1439	void	1536	void
…		…
1671	void	1768	void
1672	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)	1769	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
1673	PROTOTYPE: @	1770	PROTOTYPE: @
1674	CODE:	1771	CODE:
1675	{	1772	{
		1773	glEnable (GL_BLEND);
		1774	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1676	glEnable (GL_TEXTURE_2D);	1775	glEnable (GL_TEXTURE_2D);
1677	glEnable (GL_BLEND);
1678	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1679	glBindTexture (GL_TEXTURE_2D, name1);	1776	glBindTexture (GL_TEXTURE_2D, name1);
1680		1777
1681	glColor3f (intensity, intensity, intensity);	1778	glColor3f (intensity, intensity, intensity);
1682	glPushMatrix ();	1779	glPushMatrix ();
1683	glScalef (1./3, 1./3, 1.);	1780	glScalef (1./3, 1./3, 1.);
…		…
1698	glBindTexture (GL_TEXTURE_2D, name2);	1795	glBindTexture (GL_TEXTURE_2D, name2);
1699	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1796	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1700		1797
1701	/* rgb == rgb(glcolor) */	1798	/* rgb == rgb(glcolor) */
1702	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1799	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1800	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1704	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1801	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1705		1802
1706	/* alpha = interpolate t0, t1 by env_alpha */	1803	/* alpha = interpolate t0, t1 by env_alpha */
1707	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1804	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1708		1805
…		…
1803	MODULE = Deliantra::Client PACKAGE = DC::Map	1900	MODULE = Deliantra::Client PACKAGE = DC::Map
1804		1901
1805	PROTOTYPES: DISABLE	1902	PROTOTYPES: DISABLE
1806		1903
1807	DC::Map	1904	DC::Map
1808	new (SV *class)	1905	new (SV *klass)
1809	CODE:	1906	CODE:
1810	New (0, RETVAL, 1, struct map);	1907	New (0, RETVAL, 1, mapgrid);
1811	RETVAL->x = 0;	1908	RETVAL->x = 0;
1812	RETVAL->y = 0;	1909	RETVAL->y = 0;
1813	RETVAL->w = 0;	1910	RETVAL->w = 0;
1814	RETVAL->h = 0;	1911	RETVAL->h = 0;
1815	RETVAL->ox = 0;	1912	RETVAL->ox = 0;
…		…
1852		1949
1853	void	1950	void
1854	set_smooth (DC::Map self, int face, int smooth, int level)	1951	set_smooth (DC::Map self, int face, int smooth, int level)
1855	CODE:	1952	CODE:
1856	{	1953	{
1857	tileid texid;	1954	tileid texid;
1858	maptex *tex;	1955	maptex *tex;
1859		1956
1860	if (face < 0 \|\| face >= self->faces)	1957	if (face < 0 \|\| face >= self->faces)
1861	return;	1958	return;
1862		1959
1863	if (smooth < 0 \|\| smooth >= self->faces)	1960	if (smooth < 0 \|\| smooth >= self->faces)
1864	return;	1961	return;
1865		1962
1866	texid = self->face2tile [face];	1963	texid = self->face2tile [face];
1867		1964
1868	if (!texid)	1965	if (!texid)
1869	return;	1966	return;
1870		1967
1871	tex = self->tex + texid;	1968	tex = self->tex + texid;
…		…
1904	}	2001	}
1905		2002
1906	void	2003	void
1907	expire_textures (DC::Map self, int texid, int count)	2004	expire_textures (DC::Map self, int texid, int count)
1908	PPCODE:	2005	PPCODE:
1909	for (; texid < self->texs && count; ++texid, --count)	2006	for (; texid < self->texs && count; ++texid, --count)
1910	{	2007	{
1911	maptex *tex = self->tex + texid;	2008	maptex *tex = self->tex + texid;
1912		2009
1913	if (tex->name)	2010	if (tex->name)
1914	{	2011	{
…		…
1969	self->y += MAP_EXTEND_Y;	2066	self->y += MAP_EXTEND_Y;
1970	}	2067	}
1971	}	2068	}
1972		2069
1973	SV *	2070	SV *
1974	map1a_update (DC::Map self, SV *data_, int extmap)	2071	map1a_update (DC::Map self, SV *data_)
1975	CODE:	2072	CODE:
1976	{	2073	{
1977	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2074	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1978	uint8_t data_end = (uint8_t )SvEND (data_);	2075	uint8_t data_end = (uint8_t )SvEND (data_);
1979	mapcell *cell;	2076	mapcell *cell;
…		…
2000		2097
2001	//TODO: don't trust server data to be in-range(!)	2098	//TODO: don't trust server data to be in-range(!)
2002		2099
2003	if (flags & 8)	2100	if (flags & 8)
2004	{	2101	{
		2102	uint8_t ext, cmd;
		2103
2005	if (extmap)	2104	do
2006	{	2105	{
2007	uint8_t ext, cmd;	2106	ext = *data++;
		2107	cmd = ext & 0x7f;
2008		2108
2009	do	2109	if (cmd < 4)
		2110	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2111	else if (cmd == 5) // health
2010	{	2112	{
2011	ext = *data++;
2012	cmd = ext & 0x7f;
2013
2014	if (cmd < 4)
2015	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2016	else if (cmd == 5) // health
2017	{
2018	cell->stat_width = 1;	2113	cell->stat_width = 1;
2019	cell->stat_hp = *data++;	2114	cell->stat_hp = *data++;
2020	}
2021	else if (cmd == 6) // monster width
2022	cell->stat_width = *data++ + 1;
2023	else if (cmd == 0x47)
2024	{
2025	if (*data == 1) cell->player = data [1];
2026	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2027	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2028	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2029
2030	data += *data + 1;
2031	}
2032	else if (cmd == 8) // cell flags
2033	cell->flags = *data++;
2034	else if (ext & 0x40) // unknown, multibyte => skip
2035	data += *data + 1;
2036	else
2037	data++;
2038	}	2115	}
2039	while (ext & 0x80);	2116	else if (cmd == 6) // monster width
		2117	cell->stat_width = *data++ + 1;
		2118	else if (cmd == 0x47)
		2119	{
		2120	if (*data == 1) cell->player = data [1];
		2121	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2122	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2123	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2124
		2125	data += *data + 1;
		2126	}
		2127	else if (cmd == 8) // cell flags
		2128	cell->flags = *data++;
		2129	else if (ext & 0x40) // unknown, multibyte => skip
		2130	data += *data + 1;
		2131	else
		2132	data++;
2040	}	2133	}
2041	else	2134	while (ext & 0x80);
2042	cell->darkness = *data++ + 1;
2043	}	2135	}
2044		2136
2045	for (z = 0; z <= 2; ++z)	2137	for (z = 0; z <= 2; ++z)
2046	if (flags & (4 >> z))	2138	if (flags & (4 >> z))
2047	{	2139	{
…		…
2095	? self->row + y	2187	? self->row + y
2096	: 0;	2188	: 0;
2097		2189
2098	for (x = x0; x < x1; x++)	2190	for (x = x0; x < x1; x++)
2099	{	2191	{
2100	int r = 32, g = 32, b = 32, a = 192;	2192	unsigned int r = 32, g = 32, b = 32, a = 192;
2101		2193
2102	if (row && row->c0 <= x && x < row->c1)	2194	if (row && row->c0 <= x && x < row->c1)
2103	{	2195	{
2104	mapcell *cell = row->col + (x - row->c0);	2196	mapcell *cell = row->col + (x - row->c0);
2105		2197
…		…
2107	{	2199	{
2108	maptex tex = self->tex [cell->tile [z]];	2200	maptex tex = self->tex [cell->tile [z]];
2109	int a0 = 255 - tex.a;	2201	int a0 = 255 - tex.a;
2110	int a1 = tex.a;	2202	int a1 = tex.a;
2111		2203
2112	r = (r * a0 + tex.r * a1) / 255;	2204	r = div255 (r * a0 + tex.r * a1);
2113	g = (g * a0 + tex.g * a1) / 255;	2205	g = div255 (g * a0 + tex.g * a1);
2114	b = (b * a0 + tex.b * a1) / 255;	2206	b = div255 (b * a0 + tex.b * a1);
2115	a = (a * a0 + tex.a * a1) / 255;	2207	a = div255 (a * a0 + tex.a * a1);
2116	}	2208	}
2117	}	2209	}
2118		2210
2119	*map++ = (r )	2211	*map++ = (r )
2120	\| (g << 8)	2212	\| (g << 8)
2121	\| (b << 16)	2213	\| (b << 16)
2122	\| (a << 24);	2214	\| (a << 24);
2123	}	2215	}
2124	}	2216	}
2125		2217
2126	RETVAL = map_sv;	2218	RETVAL = map_sv;
2127	}	2219	}
2128	OUTPUT:	2220	OUTPUT:
2129	RETVAL	2221	RETVAL
2130		2222
2131	void	2223	void
2132	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)	2224	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2133	CODE:	2225	CODE:
2134	{	2226	{
2135	int x, y, z;	2227	int x, y, z;
2136		2228
2137	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2138	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2139	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2229	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2140	smooth_key skey;
2141	int pl_x, pl_y;	2230	int pl_x, pl_y;
2142	maptex pl_tex;	2231	maptex pl_tex;
2143	rc_t *rc = rc_alloc ();	2232	rc_t *rc = rc_alloc ();
2144	rc_t *rc_ov = rc_alloc ();	2233	rc_t *rc_ov = rc_alloc ();
2145	rc_key_t key;	2234	rc_key_t key;
2146	rc_array_t arr, arr_hidden;	2235	rc_array_t *arr;
2147		2236
2148	pl_tex.name = 0;	2237	pl_tex.name = 0;
2149		2238
2150	// that's current max. sorry.	2239	// that's current max. sorry.
2151	if (sw > 255) sw = 255;	2240	if (sw > 255) sw = 255;
2152	if (sh > 255) sh = 255;	2241	if (sh > 255) sh = 255;
2153
2154	// clear key, in case of extra padding
2155	memset (&skey, 0, sizeof (skey));
2156		2242
2157	memset (&key, 0, sizeof (key));	2243	memset (&key, 0, sizeof (key));
2158	key.r = 255;	2244	key.r = 255;
2159	key.g = 255;	2245	key.g = 255;
2160	key.b = 255;	2246	key.b = 255;
…		…
2166	my += self->y;	2252	my += self->y;
2167		2253
2168	// first pass: determine smooth_max	2254	// first pass: determine smooth_max
2169	// rather ugly, if you ask me	2255	// rather ugly, if you ask me
2170	// could also be stored inside mapcell and updated on change	2256	// could also be stored inside mapcell and updated on change
2171	memset (smooth_max, 0, sizeof (smooth_max));	2257	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2172		2258
2173	for (y = 0; y < sh; y++)	2259	for (y = 0; y < sh; y++)
2174	if (0 <= y + my && y + my < self->rows)	2260	if (0 <= y + my && y + my < self->rows)
2175	{	2261	{
2176	maprow *row = self->row + (y + my);	2262	maprow *row = self->row + (y + my);
…		…
2189		2275
2190	glEnable (GL_BLEND);	2276	glEnable (GL_BLEND);
2191	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2277	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2192	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2278	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2193		2279
2194	key.texname = self->tex [TEXID_HIDDEN].name;
2195	arr_hidden = rc_array (rc_ov, &key);
2196
2197	for (z = 0; z <= 2; z++)	2280	for (z = 0; z <= 2; z++)
2198	{	2281	{
2199	memset (smooth_level, 0, sizeof (smooth_level));	2282	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2283	smooth_key skey;
		2284	smooth_hash smooth;
2200	key.texname = -1;	2285	key.texname = -1;
2201		2286
2202	for (y = 0; y < sh; y++)	2287	for (y = 0; y < sh; y++)
2203	if (0 <= y + my && y + my < self->rows)	2288	if (0 <= y + my && y + my < self->rows)
2204	{	2289	{
…		…
2224		2309
2225	key.texname = tex.name;	2310	key.texname = tex.name;
2226	arr = rc_array (rc, &key);	2311	arr = rc_array (rc, &key);
2227	}	2312	}
2228		2313
2229	px = (x + 1) * T - tex.w;	2314	px = (x + 1) * Th - tex.w;
2230	py = (y + 1) * T - tex.h;	2315	py = (y + 1) * Tw - tex.h;
2231		2316
2232	if (expect_false (cell->player == player) && expect_false (z == 2))	2317	if (expect_false (cell->player == player) && expect_false (z == 2))
2233	{	2318	{
2234	pl_x = px;	2319	pl_x = px;
2235	pl_y = py;	2320	pl_y = py;
…		…
2246	if (tex.smoothtile)	2331	if (tex.smoothtile)
2247	{	2332	{
2248	skey.tile = tex.smoothtile;	2333	skey.tile = tex.smoothtile;
2249	skey.level = tex.smoothlevel;	2334	skey.level = tex.smoothlevel;
2250		2335
2251	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2336	smooth_level[tex.smoothlevel] = 1;
2252		2337
2253	// add bits to current tile and all neighbours. skey.x\|y is	2338	// add bits to current tile and all neighbours. skey.x\|y is
2254	// shifted +1\|+1 so we always stay positive.	2339	// shifted +1\|+1 so we always stay positive.
2255		2340
2256	// bits is ___n cccc CCCC bbbb	2341	// bits is ___n cccc CCCC bbbb
…		…
2264		2349
2265	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2350	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2266	// ·· ·· ·┏ ┓·	2351	// ·· ·· ·┏ ┓·
2267		2352
2268	// full tile	2353	// full tile
2269	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2354	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2270		2355
2271	// borders	2356	// borders
2272	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2357	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2273	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2358	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2274	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2359	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2275	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2360	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2276		2361
2277	// corners	2362	// corners
2278	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2363	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2279	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2364	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2280	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2365	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2281	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2366	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2282	}	2367	}
2283	}	2368	}
2284		2369
2285	if (expect_false (z == 2) && expect_false (cell->flags))	2370	if (expect_false (z == 2) && expect_false (cell->flags))
2286	{	2371	{
…		…
2288	if (cell->flags & 1)	2373	if (cell->flags & 1)
2289	{	2374	{
2290	rc_key_t key_ov = key;	2375	rc_key_t key_ov = key;
2291	maptex tex = self->tex [TEXID_SPEECH];	2376	maptex tex = self->tex [TEXID_SPEECH];
2292	rc_array_t *arr;	2377	rc_array_t *arr;
2293	int px = x * T + T * 2 / 32;	2378	int px = x * Tw + Tw * 2 / 32;
2294	int py = y * T - T * 6 / 32;	2379	int py = y * Th - Th * 6 / 32;
2295		2380
2296	key_ov.texname = tex.name;	2381	key_ov.texname = tex.name;
2297	arr = rc_array (rc_ov, &key_ov);	2382	arr = rc_array (rc_ov, &key_ov);
2298		2383
2299	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2384	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2300	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2385	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2301	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2386	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2302	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2387	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2303	}	2388	}
2304	}	2389	}
2305	}	2390	}
2306	}	2391	}
2307		2392
…		…
2313	{	2398	{
2314	int w, b;	2399	int w, b;
2315		2400
2316	glEnable (GL_TEXTURE_2D);	2401	glEnable (GL_TEXTURE_2D);
2317	glBegin (GL_QUADS);	2402	glBegin (GL_QUADS);
2318	for (w = 0; w < 256 / 32; ++w)	2403	for (int level = 0; level < smooth_level.size (); ++level)
		2404	if (smooth_level[level])
		2405	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2319	{	2406	{
2320	uint32_t smask = smooth_level [w];	2407	smooth_key &skey = it->first;
2321	if (smask)	2408	IV bits = it->second;
2322	for (b = 0; b < 32; ++b)	2409
2323	if (smask & (((uint32_t)1) << b))	2410	if (!(bits & 0x1000)
		2411	&& skey.level == level
		2412	&& level > smooth_max [skey.x][skey.y])
2324	{	2413	{
2325	int level = (w << 5) \| b;	2414	maptex tex = self->tex [skey.tile];
		2415	int px = (((int)skey.x) - 1) * Tw;
		2416	int py = (((int)skey.y) - 1) * Th;
		2417	int border = bits & 15;
		2418	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2419	float dx = tex.s * .0625f; // 16 images/row
		2420	float dy = tex.t * .5f ; // 2 images/column
		2421
2326	HE *he;	2422	if (tex.name)
2327
2328	hv_iterinit (smooth);
2329	while ((he = hv_iternext (smooth)))
2330	{	2423	{
2331	smooth_key skey = (smooth_key )HeKEY (he);	2424	// this time avoiding texture state changes
2332	IV bits = SvIVX (HeVAL (he));	2425	// save gobs of state changes.
2333		2426	if (key.texname != tex.name)
2334	if (!(bits & 0x1000)
2335	&& skey->level == level
2336	&& level > smooth_max [skey->x][skey->y])
2337	{	2427	{
2338	maptex tex = self->tex [skey->tile];
2339	int px = (((int)skey->x) - 1) * T;
2340	int py = (((int)skey->y) - 1) * T;
2341	int border = bits & 15;
2342	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2343	float dx = tex.s * .0625f; // 16 images/row
2344	float dy = tex.t * .5f ; // 2 images/column
2345
2346	if (tex.name)
2347	{
2348	// this time avoiding texture state changes
2349	// save gobs of state changes.
2350	if (key.texname != tex.name)
2351	{
2352	self->tex [skey->tile].unused = 0;	2428	self->tex [skey.tile].unused = 0;
2353		2429
2354	glEnd ();	2430	glEnd ();
2355	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2431	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2356	glBegin (GL_QUADS);	2432	glBegin (GL_QUADS);
2357	}	2433	}
2358		2434
2359	if (border)	2435	if (border)
2360	{	2436	{
2361	float ox = border * dx;	2437	float ox = border * dx;
2362		2438
2363	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2439	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2364	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2440	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2365	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2441	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2366	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2442	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2367	}	2443	}
2368		2444
2369	if (corner)	2445	if (corner)
2370	{	2446	{
2371	float ox = corner * dx;	2447	float ox = corner * dx;
2372		2448
2373	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2449	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2374	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2450	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2375	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2451	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2376	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2452	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2377	}
2378	}
2379	}	2453	}
2380	}	2454	}
2381	}	2455	}
2382	}	2456	}
2383		2457
2384	glEnd ();	2458	glEnd ();
2385	glDisable (GL_TEXTURE_2D);	2459	glDisable (GL_TEXTURE_2D);
2386	key.texname = -1;	2460	key.texname = -1;
2387	}	2461	}
2388
2389	hv_clear (smooth);
2390	}	2462	}
2391		2463
2392	if (pl_tex.name)	2464	if (pl_tex.name)
2393	{	2465	{
2394	maptex tex = pl_tex;	2466	maptex tex = pl_tex;
…		…
2422	for (x = 0; x < sw; x++)	2494	for (x = 0; x < sw; x++)
2423	if (row->c0 <= x + mx && x + mx < row->c1)	2495	if (row->c0 <= x + mx && x + mx < row->c1)
2424	{	2496	{
2425	mapcell *cell = row->col + (x + mx - row->c0);	2497	mapcell *cell = row->col + (x + mx - row->c0);
2426		2498
2427	int px = x * T;	2499	int px = x * Tw;
2428	int py = y * T;	2500	int py = y * Th;
2429		2501
2430	if (expect_false (cell->player == player))	2502	if (expect_false (cell->player == player))
2431	{	2503	{
2432	px += sdx;	2504	px += sdx;
2433	py += sdy;	2505	py += sdy;
2434	}	2506	}
2435		2507
2436	if (cell->stat_hp)	2508	if (cell->stat_hp)
2437	{	2509	{
2438	int width = cell->stat_width * T;	2510	int width = cell->stat_width * Tw;
2439	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2511	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2440		2512
2441	glColor3ub (0, 0, 0);	2513	glColor3ub (0, 0, 0);
2442	glRectf (px + 1, py - thick - 2,	2514	glRectf (px + 1, py - thick - 2,
2443	px + width - 1, py);	2515	px + width - 1, py);
2444		2516
…		…
2524	int x, y;	2596	int x, y;
2525	int sw1 = sw + 2;	2597	int sw1 = sw + 2;
2526	int sh1 = sh + 2;	2598	int sh1 = sh + 2;
2527	int sh3 = sh * 3;	2599	int sh3 = sh * 3;
2528	int sw3 = sw * 3;	2600	int sw3 = sw * 3;
2529	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2530	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2601	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2531	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2602	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2603	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2604	memset (darkness1, 0, sw1*sh1);
2532		2605
2533	SvPOK_only (darkness3_sv);	2606	SvPOK_only (darkness3_sv);
2534	SvCUR_set (darkness3_sv, sw3 * sh3);	2607	SvCUR_set (darkness3_sv, sw3 * sh3);
2535		2608
2536	mx += self->x - 1;	2609	mx += self->x - 1;
…		…
2662	else	2735	else
2663	*data++ = 0;	2736	*data++ = 0;
2664	}	2737	}
2665	}	2738	}
2666		2739
2667	/* if size is wh + 5 then no data has been found /	2740	/* if size is wh + 5 then no data has been found /
2668	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2741	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2669	{	2742	{
2670	SvPOK_only (data_sv);	2743	SvPOK_only (data_sv);
2671	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2744	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2672	}	2745	}
2673		2746
2674	RETVAL = data_sv;	2747	RETVAL = data_sv;
2675	}	2748	}
2676	OUTPUT:	2749	OUTPUT:
2677	RETVAL	2750	RETVAL
2678		2751
2679	void	2752	void
…		…
2686	STRLEN len;	2759	STRLEN len;
2687	uint8_t data, end;	2760	uint8_t data, end;
2688		2761
2689	len = SvLEN (data_sv);	2762	len = SvLEN (data_sv);
2690	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2763	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2691	data = SvPVbyte_nolen (data_sv);	2764	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2692	end = data + len + 8;	2765	end = data + len + 8;
2693		2766
2694	if (len < 5)	2767	if (len < 5)
2695	XSRETURN_EMPTY;	2768	XSRETURN_EMPTY;
2696		2769
…		…
2757	}	2830	}
2758		2831
2759	MODULE = Deliantra::Client PACKAGE = DC::RW	2832	MODULE = Deliantra::Client PACKAGE = DC::RW
2760		2833
2761	DC::RW	2834	DC::RW
2762	new (SV class, SV data_sv)	2835	new (SV klass, SV data_sv)
2763	CODE:	2836	CODE:
2764	{	2837	{
2765	STRLEN datalen;	2838	STRLEN datalen;
2766	char *data = SvPVbyte (data_sv, datalen);	2839	char *data = SvPVbyte (data_sv, datalen);
2767		2840
…		…
2769	}	2842	}
2770	OUTPUT:	2843	OUTPUT:
2771	RETVAL	2844	RETVAL
2772		2845
2773	DC::RW	2846	DC::RW
2774	new_from_file (SV class, const char path, const char *mode = "rb")	2847	new_from_file (SV klass, const char path, const char *mode = "rb")
2775	CODE:	2848	CODE:
2776	RETVAL = SDL_RWFromFile (path, mode);	2849	RETVAL = SDL_RWFromFile (path, mode);
2777	OUTPUT:	2850	OUTPUT:
2778	RETVAL	2851	RETVAL
2779		2852
…		…
2797	if (RETVAL < 0)	2870	if (RETVAL < 0)
2798	{	2871	{
2799	RETVAL = Mix_GroupOldest (-1);	2872	RETVAL = Mix_GroupOldest (-1);
2800		2873
2801	if (RETVAL < 0)	2874	if (RETVAL < 0)
		2875	{
		2876	// happens sometimes, maybe it just stopped playing(?)
		2877	RETVAL = Mix_GroupAvailable (-1);
		2878
		2879	if (RETVAL < 0)
2802	XSRETURN_UNDEF;	2880	XSRETURN_UNDEF;
2803		2881	}
		2882	else
2804	Mix_HaltChannel (RETVAL);	2883	Mix_HaltChannel (RETVAL);
2805	}	2884	}
2806		2885
2807	Mix_UnregisterAllEffects (RETVAL);	2886	Mix_UnregisterAllEffects (RETVAL);
2808	Mix_Volume (RETVAL, 128);	2887	Mix_Volume (RETVAL, 128);
2809	}	2888	}
…		…
2869		2948
2870	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2949	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2871		2950
2872	PROTOTYPES: DISABLE	2951	PROTOTYPES: DISABLE
2873		2952
		2953	void
		2954	decoders ()
		2955	PPCODE:
		2956	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2957	int i, num = Mix_GetNumChunkDecoders ();
		2958	EXTEND (SP, num);
		2959	for (i = 0; i < num; ++i)
		2960	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2961	#else
		2962	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2963	#endif
		2964
2874	DC::MixChunk	2965	DC::MixChunk
2875	new (SV *class, DC::RW rwops)	2966	new (SV *klass, DC::RW rwops)
2876	CODE:	2967	CODE:
2877	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2968	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2878	OUTPUT:	2969	OUTPUT:
2879	RETVAL	2970	RETVAL
2880		2971
…		…
2910	OUTPUT:	3001	OUTPUT:
2911	RETVAL	3002	RETVAL
2912		3003
2913	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	3004	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2914		3005
		3006	void
		3007	decoders ()
		3008	PPCODE:
		3009	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		3010	int i, num = Mix_GetNumMusicDecoders ();
		3011	EXTEND (SP, num);
		3012	for (i = 0; i < num; ++i)
		3013	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3014	#else
		3015	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3016	#endif
		3017
2915	int	3018	int
2916	volume (int volume = -1)	3019	volume (int volume = -1)
2917	PROTOTYPE: ;$	3020	PROTOTYPE: ;$
2918	CODE:	3021	CODE:
2919	if (items > 0)	3022	if (items > 0)
…		…
2930	void	3033	void
2931	halt ()	3034	halt ()
2932	CODE:	3035	CODE:
2933	Mix_HaltMusic ();	3036	Mix_HaltMusic ();
2934		3037
		3038	int
		3039	playing ()
		3040	CODE:
		3041	RETVAL = Mix_PlayingMusic ();
		3042	OUTPUT:
		3043	RETVAL
		3044
2935	DC::MixMusic	3045	DC::MixMusic
2936	new (SV *class, DC::RW rwops)	3046	new (SV *klass, DC::RW rwops)
2937	CODE:	3047	CODE:
2938	RETVAL = Mix_LoadMUS_RW (rwops);	3048	RETVAL = Mix_LoadMUS_RW (rwops);
2939	OUTPUT:	3049	OUTPUT:
2940	RETVAL	3050	RETVAL
2941		3051
…		…
3078	const_iv (GL_FUNC_SUBTRACT),	3188	const_iv (GL_FUNC_SUBTRACT),
3079	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3189	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3080	# undef const_iv	3190	# undef const_iv
3081	};	3191	};
3082		3192
3083	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3193	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3084	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3194	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3085		3195
3086	texture_av = newAV ();	3196	texture_av = newAV ();
3087	AvREAL_off (texture_av);	3197	AvREAL_off (texture_av);
3088	}	3198	}
3089		3199
…		…
3094	gl.BlendFuncSeparateEXT = 0;	3204	gl.BlendFuncSeparateEXT = 0;
3095		3205
3096	void	3206	void
3097	apple_nvidia_bug (int enable)	3207	apple_nvidia_bug (int enable)
3098		3208
3099	char *	3209	const char *
3100	gl_vendor ()	3210	gl_vendor ()
3101	CODE:	3211	CODE:
3102	RETVAL = (char *)glGetString (GL_VENDOR);	3212	RETVAL = (const char *)glGetString (GL_VENDOR);
3103	OUTPUT:	3213	OUTPUT:
3104	RETVAL	3214	RETVAL
3105		3215
3106	char *	3216	const char *
3107	gl_version ()	3217	gl_version ()
3108	CODE:	3218	CODE:
3109	RETVAL = (char *)glGetString (GL_VERSION);	3219	RETVAL = (const char *)glGetString (GL_VERSION);
3110	OUTPUT:	3220	OUTPUT:
3111	RETVAL	3221	RETVAL
3112		3222
3113	char *	3223	const char *
3114	gl_extensions ()	3224	gl_extensions ()
3115	CODE:	3225	CODE:
3116	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3226	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3117	OUTPUT:	3227	OUTPUT:
3118	RETVAL	3228	RETVAL
3119		3229
3120	const char *glGetString (GLenum pname)	3230	const char *glGetString (GLenum pname)
		3231	CODE:
		3232	RETVAL = (const char *)glGetString (pname);
		3233	OUTPUT:
		3234	RETVAL
3121		3235
3122	GLint glGetInteger (GLenum pname)	3236	GLint glGetInteger (GLenum pname)
3123	CODE:	3237	CODE:
3124	glGetIntegerv (pname, &RETVAL);	3238	glGetIntegerv (pname, &RETVAL);
3125	OUTPUT:	3239	OUTPUT:
…		…
3132	RETVAL	3246	RETVAL
3133		3247
3134	int glGetError ()	3248	int glGetError ()
3135		3249
3136	void glFinish ()	3250	void glFinish ()
		3251
		3252	void glFlush ()
3137		3253
3138	void glClear (int mask)	3254	void glClear (int mask)
3139		3255
3140	void glClearColor (float r, float g, float b, float a = 1.0)	3256	void glClearColor (float r, float g, float b, float a = 1.0)
3141	PROTOTYPE: @	3257	PROTOTYPE: @
…		…
3326		3442
3327	void	3443	void
3328	find_widget (SV *self, NV x, NV y)	3444	find_widget (SV *self, NV x, NV y)
3329	PPCODE:	3445	PPCODE:
3330	{	3446	{
3331	if (within_widget (self, x, y))	3447	if (within_widget (self, x, y))
3332	XPUSHs (self);	3448	XPUSHs (self);
3333	}	3449	}
3334		3450
3335	BOOT:	3451	BOOT:
3336	{	3452	{
…		…
3344		3460
3345	void	3461	void
3346	draw (SV *self)	3462	draw (SV *self)
3347	CODE:	3463	CODE:
3348	{	3464	{
3349	HV *hv;	3465	HV *hv;
3350	SV **svp;	3466	SV **svp;
3351	NV x, y, w, h;	3467	NV x, y, w, h;
3352	SV *draw_x_sv = GvSV (draw_x_gv);	3468	SV *draw_x_sv = GvSV (draw_x_gv);
3353	SV *draw_y_sv = GvSV (draw_y_gv);	3469	SV *draw_y_sv = GvSV (draw_y_gv);
3354	SV *draw_w_sv = GvSV (draw_w_gv);	3470	SV *draw_w_sv = GvSV (draw_w_gv);
3355	SV *draw_h_sv = GvSV (draw_h_gv);	3471	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.296 by root, Mon Dec 21 23:52:34 2009 UTC vs. Revision 1.325 by root, Sun Nov 18 02:04:48 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.296 by root, Mon Dec 21 23:52:34 2009 UTC vs.
Revision 1.325 by root, Sun Nov 18 02:04:48 2018 UTC