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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
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
…		…
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		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
103	static AV *texture_av;	129	static AV *texture_av;
104		130
105	static struct	131	static struct
106	{	132	{
107	#define GL_FUNC(ptr,name) ptr name;	133	#define GL_FUNC(ptr,name) ptr name;
…		…
163	{	189	{
164	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
165		191
166	while (attrs)	192	while (attrs)
167	{	193	{
168	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
169		195
170	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
171	return 1;	197	return 1;
172		198
173	attrs = attrs->next;	199	attrs = attrs->next;
174	}	200	}
175		201
176	return 0;	202	return 0;
177	}	203	}
178		204
179	typedef struct cf_layout {	205	struct cf_layout {
180	PangoLayout *pl;	206	PangoLayout *pl;
181	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
182	int base_height;	208	int base_height;
183	DC__Font font;	209	DC__Font font;
184	rc_t *rc;	210	rc_t *rc;
185	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
186		214
187	static DC__Font default_font;	215	static DC__Font default_font;
188	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
189	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
190		218
191	static void	219	static void
192	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
193	{	221	{
194	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
195	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
196	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197	#endif	225	#endif
198	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199	}	227	}
200		228
201	static void	229	static void
…		…
231	}	259	}
232		260
233	typedef uint16_t tileid;	261	typedef uint16_t tileid;
234	typedef uint16_t faceid;	262	typedef uint16_t faceid;
235		263
236	typedef struct {	264	struct maptex
		265	{
237	GLuint name;	266	GLuint name;
238	int w, h;	267	int w, h;
239	float s, t;	268	float s, t;
240	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
241	tileid smoothtile;	270	tileid smoothtile;
242	uint8_t smoothlevel;	271	uint8_t smoothlevel;
243	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
244	} maptex;	273	};
245		274
246	typedef struct {	275	struct mapcell
		276	{
247	uint32_t player;	277	uint32_t player;
248	tileid tile[3];	278	tileid tile[3];
249	uint16_t darkness;	279	uint16_t darkness;
250	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
251	} mapcell;	281	};
252		282
253	typedef struct {	283	struct maprow
		284	{
254	int32_t c0, c1;	285	int32_t c0, c1;
255	mapcell *col;	286	mapcell *col;
256	} maprow;	287	};
257		288
258	typedef struct map {	289	struct mapgrid {
259	int x, y, w, h;	290	int x, y, w, h;
260	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
261	int faces; tileid *face2tile; // [faceid]	292	int faces; tileid *face2tile; // [faceid]
262	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
263		294
264	int32_t rows;	295	int32_t rows;
265	maprow *row;	296	maprow *row;
266	} *DC__Map;	297	};
		298
		299	typedef mapgrid *DC__Map;
267		300
268	static char *	301	static char *
269	prepend (char *ptr, int sze, int inc)	302	prepend (char *ptr, int sze, int inc)
270	{	303	{
271	char *p;	304	char *p;
…		…
289		322
290	#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))
291	#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))
292		325
293	static void	326	static void
294	need_facenum (struct map *self, faceid face)	327	need_facenum (struct mapgrid *self, faceid face)
295	{	328	{
296	while (self->faces <= face)	329	while (self->faces <= face)
297	{	330	{
298	Append (tileid, self->face2tile, self->faces, self->faces);	331	Append (tileid, self->face2tile, self->faces, self->faces);
299	self->faces *= 2;	332	self->faces *= 2;
300	}	333	}
301	}	334	}
302		335
303	static void	336	static void
304	need_texid (struct map *self, int texid)	337	need_texid (struct mapgrid *self, int texid)
305	{	338	{
306	while (self->texs <= texid)	339	while (self->texs <= texid)
307	{	340	{
308	Append (maptex, self->tex, self->texs, self->texs);	341	Append (maptex, self->tex, self->texs, self->texs);
309	self->texs *= 2;	342	self->texs *= 2;
310	}	343	}
311	}	344	}
312		345
313	static maprow *	346	static maprow *
314	map_get_row (DC__Map self, int y)	347	map_get_row (mapgrid *self, int y)
315	{	348	{
316	if (0 > y)	349	if (0 > y)
317	{	350	{
318	int extend = - y + MAP_EXTEND_Y;	351	int extend = - y + MAP_EXTEND_Y;
319	Prepend (maprow, self->row, self->rows, extend);	352	Prepend (maprow, self->row, self->rows, extend);
…		…
357		390
358	return row->col + (x - row->c0);	391	return row->col + (x - row->c0);
359	}	392	}
360		393
361	static mapcell *	394	static mapcell *
362	map_get_cell (DC__Map self, int x, int y)	395	map_get_cell (mapgrid *self, int x, int y)
363	{	396	{
364	return row_get_cell (map_get_row (self, y), x);	397	return row_get_cell (map_get_row (self, y), x);
365	}	398	}
366		399
367	static void	400	static void
368	map_clear (DC__Map self)	401	map_clear (mapgrid *self)
369	{	402	{
370	int r;	403	int r;
371		404
372	for (r = 0; r < self->rows; r++)	405	for (r = 0; r < self->rows; r++)
373	Safefree (self->row[r].col);	406	Safefree (self->row[r].col);
…		…
391	(cell)->flags = 0; \	424	(cell)->flags = 0; \
392	(cell)->player = 0; \	425	(cell)->player = 0; \
393	} while (0)	426	} while (0)
394		427
395	static void	428	static void
396	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)
397	{	430	{
398	int x, y;	431	int x, y;
399	maprow *row;	432	maprow *row;
400	mapcell *cell;	433	mapcell *cell;
401		434
…		…
418	CELL_CLEAR (cell);	451	CELL_CLEAR (cell);
419	}	452	}
420	}	453	}
421	}	454	}
422		455
423	typedef struct {	456	struct smooth_key
		457	{
424	tileid tile;	458	tileid tile;
425	uint8_t x, y, level;	459	uint8_t x, y, level;
426	} 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	}
427		479
428	static void	480	static void
429	smooth_or_bits (HV hv, smooth_key key, IV bits)	481	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
430	{	482	{
431	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	483	auto &&it = h.find (key);
432		484
433	if (SvIOK (*sv))	485	if (it == h.end ())
434	SvIV_set (sv, SvIVX (sv) \| bits);	486	h.insert (std::make_pair (key, bits));
435	else	487	else
436	sv_setiv (*sv, bits);	488	it->second \|= bits;
437	}	489	}
438		490
439	static void	491	static void
440	music_finished (void)	492	music_finished (void)
441	{	493	{
…		…
458	ev.code = 1;	510	ev.code = 1;
459	ev.data1 = (void *)(long)channel;	511	ev.data1 = (void *)(long)channel;
460	ev.data2 = 0;	512	ev.data2 = 0;
461		513
462	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;
463	}	522	}
464		523
465	static unsigned int	524	static unsigned int
466	minpot (unsigned int n)	525	minpot (unsigned int n)
467	{	526	{
…		…
550		609
551	return mod;	610	return mod;
552	}	611	}
553		612
554	static void	613	static void
555	deliantra_main ()	614	deliantra_main (SV *real_main)
556	{	615	{
557	char *argv[] = { 0 };	616	dSP;
558	call_argv ("::main", G_DISCARD \| G_VOID, argv);	617
		618	PUSHMARK (SP);
		619	call_sv (real_main, G_DISCARD \| G_VOID);
559	}	620	}
560		621
561	#ifdef __MACOSX__	622	#ifdef __MACOSX__
		623	static SV *real_main;
		624
562	/* to due surprising braindamage on the side of SDL design, we	625	/* to due surprising braindamage on the side of SDL design, we
563	* do some mind-boggling hack here: SDL requires a custom main()	626	* do some mind-boggling hack here: SDL requires a custom main()
564	* 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,
565	* 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,
566	* and which calls our main (== SDL_main) back.	629	* and which calls our main (== SDL_main) back.
567	*/	630	*/
568	extern C_LINKAGE int	631	extern C_LINKAGE int
569	main (int argc, char *argv[])	632	main (int argc, char *argv[])
570	{	633	{
571	deliantra_main ();	634	deliantra_main (real_main);
572	}	635	}
573		636
574	#undef main	637	#undef main
575		638
576	extern C_LINKAGE int main (int argc, char *argv[]);	639	extern C_LINKAGE int main (int argc, char *argv[]);
577		640
578	static void	641	static void
579	SDL_braino (void)	642	SDL_main_hack (SV *real_main_)
580	{	643	{
		644	real_main = real_main_;
		645
581	char *argv[] = { "deliantra client", 0 };	646	char *argv[] = { "deliantra client", 0 };
582	(main) (1, argv);	647	(main) (1, argv);
583	}	648	}
584	#else	649	#else
585	static void	650	static void
586	SDL_braino (void)	651	SDL_main_hack (SV *real_main)
587	{	652	{
588	deliantra_main ();	653	deliantra_main (real_main);
589	}	654	}
590	#endif	655	#endif
591		656
592	MODULE = Deliantra::Client PACKAGE = DC	657	MODULE = Deliantra::Client PACKAGE = DC
593		658
…		…
794		859
795	const_iv (FOW_DARKNESS)	860	const_iv (FOW_DARKNESS)
796	# undef const_iv	861	# undef const_iv
797	};	862	};
798		863
799	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--)
800	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	865	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801		866
802	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	867	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	868	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804	}	869	}
805		870
…		…
844	#endif	909	#endif
845	}	910	}
846		911
847	char *SDL_GetError ()	912	char *SDL_GetError ()
848		913
849	void SDL_braino ()	914	void SDL_main_hack (SV *real_main)
		915	PROTOTYPE: &
850		916
851	int SDL_Init (U32 flags)	917	int SDL_Init (U32 flags)
852		918
853	int SDL_InitSubSystem (U32 flags)	919	int SDL_InitSubSystem (U32 flags)
854		920
855	void SDL_QuitSubSystem (U32 flags)	921	void SDL_QuitSubSystem (U32 flags)
856		922
857	void SDL_Quit ()	923	void SDL_Quit ()
858		924
859	int SDL_GL_SetAttribute (int attr, int value)	925	int SDL_GL_SetAttribute (int attr, int value)
		926	C_ARGS: (SDL_GLattr)attr, value
860		927
861	int SDL_GL_GetAttribute (int attr)	928	int SDL_GL_GetAttribute (int attr)
862	CODE:	929	CODE:
863	if (SDL_GL_GetAttribute (attr, &RETVAL))	930	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
864	XSRETURN_UNDEF;	931	XSRETURN_UNDEF;
865	OUTPUT:	932	OUTPUT:
866	RETVAL	933	RETVAL
867		934
868	void	935	void
…		…
923	);	990	);
924		991
925	if (RETVAL)	992	if (RETVAL)
926	{	993	{
927	av_clear (texture_av);	994	av_clear (texture_av);
928
929	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930	#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);
931	#include "glfunc.h"	996	#include "glfunc.h"
932	#undef GL_FUNC	997	#undef GL_FUNC
		998	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		999	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933	}	1000	}
934	}	1001	}
935	OUTPUT:	1002	OUTPUT:
936	RETVAL	1003	RETVAL
		1004
		1005	void
		1006	SDL_WM_SetCaption (const char title, const char icon)
937		1007
938	void	1008	void
939	SDL_GL_SwapBuffers ()	1009	SDL_GL_SwapBuffers ()
940		1010
941	char *	1011	char *
942	SDL_GetKeyName (int sym)	1012	SDL_GetKeyName (int sym)
		1013	C_ARGS: (SDLKey)sym
943		1014
944	int	1015	int
945	SDL_GetAppState ()	1016	SDL_GetAppState ()
946		1017
947	int	1018	int
948	SDL_GetModState ()	1019	SDL_GetModState ()
949		1020
		1021	int
		1022	SDL_WaitEvent ()
		1023	C_ARGS: 0
		1024
950	void	1025	void
		1026	SDL_PumpEvents ()
		1027
		1028	void
951	poll_events ()	1029	peep_events ()
952	PPCODE:	1030	PPCODE:
953	{	1031	{
954	SDL_Event ev;	1032	SDL_Event ev;
955		1033
956	SDL_PumpEvents ();	1034	SDL_PumpEvents ();
…		…
1022		1100
1023	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))));
1024	}	1102	}
1025	}	1103	}
1026		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
1027	int	1118	int
1028	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)
1029	POSTCALL:	1120	POSTCALL:
1030	Mix_HookMusicFinished (music_finished);	1121	Mix_HookMusicFinished (music_finished);
1031	Mix_ChannelFinished (channel_finished);	1122	Mix_ChannelFinished (channel_finished);
1032		1123
1033	void	1124	void
1034	Mix_QuerySpec ()	1125	Mix_QuerySpec ()
…		…
1093	add_font (char *file)	1184	add_font (char *file)
1094	CODE:	1185	CODE:
1095	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1186	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096	OUTPUT:	1187	OUTPUT:
1097	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)
1098		1196
1099	void	1197	void
1100	load_image_inline (SV *image_)	1198	load_image_inline (SV *image_)
1101	ALIAS:	1199	ALIAS:
1102	load_image_file = 1	1200	load_image_file = 1
…		…
1148		1246
1149	SDL_LockSurface (surface2);	1247	SDL_LockSurface (surface2);
1150	EXTEND (SP, 6);	1248	EXTEND (SP, 6);
1151	PUSHs (sv_2mortal (newSViv (surface2->w)));	1249	PUSHs (sv_2mortal (newSViv (surface2->w)));
1152	PUSHs (sv_2mortal (newSViv (surface2->h)));	1250	PUSHs (sv_2mortal (newSViv (surface2->h)));
1153	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1251	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1154	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)));
1155	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1253	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1156	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1254	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1157	SDL_UnlockSurface (surface2);	1255	SDL_UnlockSurface (surface2);
1158		1256
…		…
1230	MODULE = Deliantra::Client PACKAGE = DC::Font	1328	MODULE = Deliantra::Client PACKAGE = DC::Font
1231		1329
1232	PROTOTYPES: DISABLE	1330	PROTOTYPES: DISABLE
1233		1331
1234	DC::Font	1332	DC::Font
1235	new_from_file (SV class, char path, int id = 0)	1333	new_from_file (SV klass, char path, int id = 0)
1236	CODE:	1334	CODE:
1237	{	1335	{
1238	int count;	1336	int count;
1239	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1337	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1240	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1338	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1269	PROTOTYPE:	1367	PROTOTYPE:
1270	CODE:	1368	CODE:
1271	tc_restore ();	1369	tc_restore ();
1272		1370
1273	DC::Layout	1371	DC::Layout
1274	new (SV *class)	1372	new (SV *klass)
1275	CODE:	1373	CODE:
1276	New (0, RETVAL, 1, struct cf_layout);	1374	New (0, RETVAL, 1, struct cf_layout);
1277		1375
1278	RETVAL->pl = pango_layout_new (opengl_context);	1376	RETVAL->pl = pango_layout_new (opengl_context);
1279	RETVAL->r = 1.;	1377	RETVAL->r = 1.;
…		…
1428		1526
1429	void	1527	void
1430	set_height (DC::Layout self, int base_height)	1528	set_height (DC::Layout self, int base_height)
1431	CODE:	1529	CODE:
1432	if (self->base_height != base_height)	1530	if (self->base_height != base_height)
1433	{	1531	{
1434	self->base_height = base_height;	1532	self->base_height = base_height;
1435	layout_update_font (self);	1533	layout_update_font (self);
1436	}	1534	}
1437		1535
1438	void	1536	void
…		…
1670	void	1768	void
1671	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)
1672	PROTOTYPE: @	1770	PROTOTYPE: @
1673	CODE:	1771	CODE:
1674	{	1772	{
		1773	glEnable (GL_BLEND);
		1774	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675	glEnable (GL_TEXTURE_2D);	1775	glEnable (GL_TEXTURE_2D);
1676	glEnable (GL_BLEND);
1677	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678	glBindTexture (GL_TEXTURE_2D, name1);	1776	glBindTexture (GL_TEXTURE_2D, name1);
1679		1777
1680	glColor3f (intensity, intensity, intensity);	1778	glColor3f (intensity, intensity, intensity);
1681	glPushMatrix ();	1779	glPushMatrix ();
1682	glScalef (1./3, 1./3, 1.);	1780	glScalef (1./3, 1./3, 1.);
…		…
1697	glBindTexture (GL_TEXTURE_2D, name2);	1795	glBindTexture (GL_TEXTURE_2D, name2);
1698	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);	1796	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699		1797
1700	/* rgb == rgb(glcolor) */	1798	/* rgb == rgb(glcolor) */
1701	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);	1799	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT);	1800	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);	1801	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704		1802
1705	/* alpha = interpolate t0, t1 by env_alpha */	1803	/* alpha = interpolate t0, t1 by env_alpha */
1706	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);	1804	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707		1805
…		…
1802	MODULE = Deliantra::Client PACKAGE = DC::Map	1900	MODULE = Deliantra::Client PACKAGE = DC::Map
1803		1901
1804	PROTOTYPES: DISABLE	1902	PROTOTYPES: DISABLE
1805		1903
1806	DC::Map	1904	DC::Map
1807	new (SV *class)	1905	new (SV *klass)
1808	CODE:	1906	CODE:
1809	New (0, RETVAL, 1, struct map);	1907	New (0, RETVAL, 1, mapgrid);
1810	RETVAL->x = 0;	1908	RETVAL->x = 0;
1811	RETVAL->y = 0;	1909	RETVAL->y = 0;
1812	RETVAL->w = 0;	1910	RETVAL->w = 0;
1813	RETVAL->h = 0;	1911	RETVAL->h = 0;
1814	RETVAL->ox = 0;	1912	RETVAL->ox = 0;
…		…
1851		1949
1852	void	1950	void
1853	set_smooth (DC::Map self, int face, int smooth, int level)	1951	set_smooth (DC::Map self, int face, int smooth, int level)
1854	CODE:	1952	CODE:
1855	{	1953	{
1856	tileid texid;	1954	tileid texid;
1857	maptex *tex;	1955	maptex *tex;
1858		1956
1859	if (face < 0 \|\| face >= self->faces)	1957	if (face < 0 \|\| face >= self->faces)
1860	return;	1958	return;
1861		1959
1862	if (smooth < 0 \|\| smooth >= self->faces)	1960	if (smooth < 0 \|\| smooth >= self->faces)
1863	return;	1961	return;
1864		1962
1865	texid = self->face2tile [face];	1963	texid = self->face2tile [face];
1866		1964
1867	if (!texid)	1965	if (!texid)
1868	return;	1966	return;
1869		1967
1870	tex = self->tex + texid;	1968	tex = self->tex + texid;
…		…
1903	}	2001	}
1904		2002
1905	void	2003	void
1906	expire_textures (DC::Map self, int texid, int count)	2004	expire_textures (DC::Map self, int texid, int count)
1907	PPCODE:	2005	PPCODE:
1908	for (; texid < self->texs && count; ++texid, --count)	2006	for (; texid < self->texs && count; ++texid, --count)
1909	{	2007	{
1910	maptex *tex = self->tex + texid;	2008	maptex *tex = self->tex + texid;
1911		2009
1912	if (tex->name)	2010	if (tex->name)
1913	{	2011	{
…		…
1968	self->y += MAP_EXTEND_Y;	2066	self->y += MAP_EXTEND_Y;
1969	}	2067	}
1970	}	2068	}
1971		2069
1972	SV *	2070	SV *
1973	map1a_update (DC::Map self, SV *data_, int extmap)	2071	map1a_update (DC::Map self, SV *data_)
1974	CODE:	2072	CODE:
1975	{	2073	{
1976	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2074	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1977	uint8_t data_end = (uint8_t )SvEND (data_);	2075	uint8_t data_end = (uint8_t )SvEND (data_);
1978	mapcell *cell;	2076	mapcell *cell;
…		…
1999		2097
2000	//TODO: don't trust server data to be in-range(!)	2098	//TODO: don't trust server data to be in-range(!)
2001		2099
2002	if (flags & 8)	2100	if (flags & 8)
2003	{	2101	{
		2102	uint8_t ext, cmd;
		2103
2004	if (extmap)	2104	do
2005	{	2105	{
2006	uint8_t ext, cmd;	2106	ext = *data++;
		2107	cmd = ext & 0x7f;
2007		2108
2008	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
2009	{	2112	{
2010	ext = *data++;
2011	cmd = ext & 0x7f;
2012
2013	if (cmd < 4)
2014	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2015	else if (cmd == 5) // health
2016	{
2017	cell->stat_width = 1;	2113	cell->stat_width = 1;
2018	cell->stat_hp = *data++;	2114	cell->stat_hp = *data++;
2019	}
2020	else if (cmd == 6) // monster width
2021	cell->stat_width = *data++ + 1;
2022	else if (cmd == 0x47)
2023	{
2024	if (*data == 1) cell->player = data [1];
2025	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2028
2029	data += *data + 1;
2030	}
2031	else if (cmd == 8) // cell flags
2032	cell->flags = *data++;
2033	else if (ext & 0x40) // unknown, multibyte => skip
2034	data += *data + 1;
2035	else
2036	data++;
2037	}	2115	}
2038	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++;
2039	}	2133	}
2040	else	2134	while (ext & 0x80);
2041	cell->darkness = *data++ + 1;
2042	}	2135	}
2043		2136
2044	for (z = 0; z <= 2; ++z)	2137	for (z = 0; z <= 2; ++z)
2045	if (flags & (4 >> z))	2138	if (flags & (4 >> z))
2046	{	2139	{
…		…
2094	? self->row + y	2187	? self->row + y
2095	: 0;	2188	: 0;
2096		2189
2097	for (x = x0; x < x1; x++)	2190	for (x = x0; x < x1; x++)
2098	{	2191	{
2099	int r = 32, g = 32, b = 32, a = 192;	2192	unsigned int r = 32, g = 32, b = 32, a = 192;
2100		2193
2101	if (row && row->c0 <= x && x < row->c1)	2194	if (row && row->c0 <= x && x < row->c1)
2102	{	2195	{
2103	mapcell *cell = row->col + (x - row->c0);	2196	mapcell *cell = row->col + (x - row->c0);
2104		2197
…		…
2106	{	2199	{
2107	maptex tex = self->tex [cell->tile [z]];	2200	maptex tex = self->tex [cell->tile [z]];
2108	int a0 = 255 - tex.a;	2201	int a0 = 255 - tex.a;
2109	int a1 = tex.a;	2202	int a1 = tex.a;
2110		2203
2111	r = (r * a0 + tex.r * a1) / 255;	2204	r = div255 (r * a0 + tex.r * a1);
2112	g = (g * a0 + tex.g * a1) / 255;	2205	g = div255 (g * a0 + tex.g * a1);
2113	b = (b * a0 + tex.b * a1) / 255;	2206	b = div255 (b * a0 + tex.b * a1);
2114	a = (a * a0 + tex.a * a1) / 255;	2207	a = div255 (a * a0 + tex.a * a1);
2115	}	2208	}
2116	}	2209	}
2117		2210
2118	*map++ = (r )	2211	*map++ = (r )
2119	\| (g << 8)	2212	\| (g << 8)
2120	\| (b << 16)	2213	\| (b << 16)
2121	\| (a << 24);	2214	\| (a << 24);
2122	}	2215	}
2123	}	2216	}
2124		2217
2125	RETVAL = map_sv;	2218	RETVAL = map_sv;
2126	}	2219	}
2127	OUTPUT:	2220	OUTPUT:
2128	RETVAL	2221	RETVAL
2129		2222
2130	void	2223	void
2131	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)
2132	CODE:	2225	CODE:
2133	{	2226	{
2134	int x, y, z;	2227	int x, y, z;
2135		2228
2136	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2137	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2138	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!
2139	smooth_key skey;
2140	int pl_x, pl_y;	2230	int pl_x, pl_y;
2141	maptex pl_tex;	2231	maptex pl_tex;
2142	rc_t *rc = rc_alloc ();	2232	rc_t *rc = rc_alloc ();
2143	rc_t *rc_ov = rc_alloc ();	2233	rc_t *rc_ov = rc_alloc ();
2144	rc_key_t key;	2234	rc_key_t key;
…		…
2147	pl_tex.name = 0;	2237	pl_tex.name = 0;
2148		2238
2149	// that's current max. sorry.	2239	// that's current max. sorry.
2150	if (sw > 255) sw = 255;	2240	if (sw > 255) sw = 255;
2151	if (sh > 255) sh = 255;	2241	if (sh > 255) sh = 255;
2152
2153	// clear key, in case of extra padding
2154	memset (&skey, 0, sizeof (skey));
2155		2242
2156	memset (&key, 0, sizeof (key));	2243	memset (&key, 0, sizeof (key));
2157	key.r = 255;	2244	key.r = 255;
2158	key.g = 255;	2245	key.g = 255;
2159	key.b = 255;	2246	key.b = 255;
…		…
2165	my += self->y;	2252	my += self->y;
2166		2253
2167	// first pass: determine smooth_max	2254	// first pass: determine smooth_max
2168	// rather ugly, if you ask me	2255	// rather ugly, if you ask me
2169	// could also be stored inside mapcell and updated on change	2256	// could also be stored inside mapcell and updated on change
2170	memset (smooth_max, 0, sizeof (smooth_max));	2257	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2171		2258
2172	for (y = 0; y < sh; y++)	2259	for (y = 0; y < sh; y++)
2173	if (0 <= y + my && y + my < self->rows)	2260	if (0 <= y + my && y + my < self->rows)
2174	{	2261	{
2175	maprow *row = self->row + (y + my);	2262	maprow *row = self->row + (y + my);
…		…
2190	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2277	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2191	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2278	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2192		2279
2193	for (z = 0; z <= 2; z++)	2280	for (z = 0; z <= 2; z++)
2194	{	2281	{
		2282	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		2283	smooth_key skey;
		2284	smooth_hash smooth;
2195	memset (smooth_level, 0, sizeof (smooth_level));	2285	memset (smooth_level, 0, sizeof (smooth_level));
2196	key.texname = -1;	2286	key.texname = -1;
2197		2287
2198	for (y = 0; y < sh; y++)	2288	for (y = 0; y < sh; y++)
2199	if (0 <= y + my && y + my < self->rows)	2289	if (0 <= y + my && y + my < self->rows)
…		…
2220		2310
2221	key.texname = tex.name;	2311	key.texname = tex.name;
2222	arr = rc_array (rc, &key);	2312	arr = rc_array (rc, &key);
2223	}	2313	}
2224		2314
2225	px = (x + 1) * T - tex.w;	2315	px = (x + 1) * Th - tex.w;
2226	py = (y + 1) * T - tex.h;	2316	py = (y + 1) * Tw - tex.h;
2227		2317
2228	if (expect_false (cell->player == player) && expect_false (z == 2))	2318	if (expect_false (cell->player == player) && expect_false (z == 2))
2229	{	2319	{
2230	pl_x = px;	2320	pl_x = px;
2231	pl_y = py;	2321	pl_y = py;
…		…
2260		2350
2261	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2351	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2262	// ·· ·· ·┏ ┓·	2352	// ·· ·· ·┏ ┓·
2263		2353
2264	// full tile	2354	// full tile
2265	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2355	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2266		2356
2267	// borders	2357	// borders
2268	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2358	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2269	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2359	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2270	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2360	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2271	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2361	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2272		2362
2273	// corners	2363	// corners
2274	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2364	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2275	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2365	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2276	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2366	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2277	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2367	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2278	}	2368	}
2279	}	2369	}
2280		2370
2281	if (expect_false (z == 2) && expect_false (cell->flags))	2371	if (expect_false (z == 2) && expect_false (cell->flags))
2282	{	2372	{
…		…
2284	if (cell->flags & 1)	2374	if (cell->flags & 1)
2285	{	2375	{
2286	rc_key_t key_ov = key;	2376	rc_key_t key_ov = key;
2287	maptex tex = self->tex [TEXID_SPEECH];	2377	maptex tex = self->tex [TEXID_SPEECH];
2288	rc_array_t *arr;	2378	rc_array_t *arr;
2289	int px = x * T + T * 2 / 32;	2379	int px = x * Tw + Tw * 2 / 32;
2290	int py = y * T - T * 6 / 32;	2380	int py = y * Th - Th * 6 / 32;
2291		2381
2292	key_ov.texname = tex.name;	2382	key_ov.texname = tex.name;
2293	arr = rc_array (rc_ov, &key_ov);	2383	arr = rc_array (rc_ov, &key_ov);
2294		2384
2295	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2385	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);	2386	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2297	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);	2387	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2298	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);	2388	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2299	}	2389	}
2300	}	2390	}
2301	}	2391	}
2302	}	2392	}
2303		2393
…		…
2319	if (smask & (((uint32_t)1) << b))	2409	if (smask & (((uint32_t)1) << b))
2320	{	2410	{
2321	int level = (w << 5) \| b;	2411	int level = (w << 5) \| b;
2322	HE *he;	2412	HE *he;
2323		2413
2324	hv_iterinit (smooth);	2414	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2325	while ((he = hv_iternext (smooth)))
2326	{	2415	{
2327	smooth_key skey = (smooth_key )HeKEY (he);	2416	smooth_key &skey = it->first;
2328	IV bits = SvIVX (HeVAL (he));	2417	IV bits = it->second;
2329		2418
2330	if (!(bits & 0x1000)	2419	if (!(bits & 0x1000)
2331	&& skey->level == level	2420	&& skey.level == level
2332	&& level > smooth_max [skey->x][skey->y])	2421	&& level > smooth_max [skey.x][skey.y])
2333	{	2422	{
2334	maptex tex = self->tex [skey->tile];	2423	maptex tex = self->tex [skey.tile];
2335	int px = (((int)skey->x) - 1) * T;	2424	int px = (((int)skey.x) - 1) * Tw;
2336	int py = (((int)skey->y) - 1) * T;	2425	int py = (((int)skey.y) - 1) * Th;
2337	int border = bits & 15;	2426	int border = bits & 15;
2338	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2427	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339	float dx = tex.s * .0625f; // 16 images/row	2428	float dx = tex.s * .0625f; // 16 images/row
2340	float dy = tex.t * .5f ; // 2 images/column	2429	float dy = tex.t * .5f ; // 2 images/column
2341		2430
…		…
2343	{	2432	{
2344	// this time avoiding texture state changes	2433	// this time avoiding texture state changes
2345	// save gobs of state changes.	2434	// save gobs of state changes.
2346	if (key.texname != tex.name)	2435	if (key.texname != tex.name)
2347	{	2436	{
2348	self->tex [skey->tile].unused = 0;	2437	self->tex [skey.tile].unused = 0;
2349		2438
2350	glEnd ();	2439	glEnd ();
2351	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2440	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2352	glBegin (GL_QUADS);	2441	glBegin (GL_QUADS);
2353	}	2442	}
2354		2443
2355	if (border)	2444	if (border)
2356	{	2445	{
2357	float ox = border * dx;	2446	float ox = border * dx;
2358		2447
2359	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2448	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2449	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2450	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2451	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363	}	2452	}
2364		2453
2365	if (corner)	2454	if (corner)
2366	{	2455	{
2367	float ox = corner * dx;	2456	float ox = corner * dx;
2368		2457
2369	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2458	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2459	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2460	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2461	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373	}	2462	}
2374	}	2463	}
2375	}	2464	}
2376	}	2465	}
2377	}	2466	}
…		…
2379		2468
2380	glEnd ();	2469	glEnd ();
2381	glDisable (GL_TEXTURE_2D);	2470	glDisable (GL_TEXTURE_2D);
2382	key.texname = -1;	2471	key.texname = -1;
2383	}	2472	}
2384
2385	hv_clear (smooth);
2386	}	2473	}
2387		2474
2388	if (pl_tex.name)	2475	if (pl_tex.name)
2389	{	2476	{
2390	maptex tex = pl_tex;	2477	maptex tex = pl_tex;
…		…
2418	for (x = 0; x < sw; x++)	2505	for (x = 0; x < sw; x++)
2419	if (row->c0 <= x + mx && x + mx < row->c1)	2506	if (row->c0 <= x + mx && x + mx < row->c1)
2420	{	2507	{
2421	mapcell *cell = row->col + (x + mx - row->c0);	2508	mapcell *cell = row->col + (x + mx - row->c0);
2422		2509
2423	int px = x * T;	2510	int px = x * Tw;
2424	int py = y * T;	2511	int py = y * Th;
2425		2512
2426	if (expect_false (cell->player == player))	2513	if (expect_false (cell->player == player))
2427	{	2514	{
2428	px += sdx;	2515	px += sdx;
2429	py += sdy;	2516	py += sdy;
2430	}	2517	}
2431		2518
2432	if (cell->stat_hp)	2519	if (cell->stat_hp)
2433	{	2520	{
2434	int width = cell->stat_width * T;	2521	int width = cell->stat_width * Tw;
2435	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2522	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436		2523
2437	glColor3ub (0, 0, 0);	2524	glColor3ub (0, 0, 0);
2438	glRectf (px + 1, py - thick - 2,	2525	glRectf (px + 1, py - thick - 2,
2439	px + width - 1, py);	2526	px + width - 1, py);
2440		2527
…		…
2520	int x, y;	2607	int x, y;
2521	int sw1 = sw + 2;	2608	int sw1 = sw + 2;
2522	int sh1 = sh + 2;	2609	int sh1 = sh + 2;
2523	int sh3 = sh * 3;	2610	int sh3 = sh * 3;
2524	int sw3 = sw * 3;	2611	int sw3 = sw * 3;
2525	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2526	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));	2612	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2527	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2613	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
		2614	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
		2615	memset (darkness1, 0, sw1*sh1);
2528		2616
2529	SvPOK_only (darkness3_sv);	2617	SvPOK_only (darkness3_sv);
2530	SvCUR_set (darkness3_sv, sw3 * sh3);	2618	SvCUR_set (darkness3_sv, sw3 * sh3);
2531		2619
2532	mx += self->x - 1;	2620	mx += self->x - 1;
…		…
2658	else	2746	else
2659	*data++ = 0;	2747	*data++ = 0;
2660	}	2748	}
2661	}	2749	}
2662		2750
2663	/* if size is wh + 5 then no data has been found /	2751	/* if size is wh + 5 then no data has been found /
2664	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2752	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2665	{	2753	{
2666	SvPOK_only (data_sv);	2754	SvPOK_only (data_sv);
2667	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2755	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668	}	2756	}
2669		2757
2670	RETVAL = data_sv;	2758	RETVAL = data_sv;
2671	}	2759	}
2672	OUTPUT:	2760	OUTPUT:
2673	RETVAL	2761	RETVAL
2674		2762
2675	void	2763	void
…		…
2682	STRLEN len;	2770	STRLEN len;
2683	uint8_t data, end;	2771	uint8_t data, end;
2684		2772
2685	len = SvLEN (data_sv);	2773	len = SvLEN (data_sv);
2686	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2774	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687	data = SvPVbyte_nolen (data_sv);	2775	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2688	end = data + len + 8;	2776	end = data + len + 8;
2689		2777
2690	if (len < 5)	2778	if (len < 5)
2691	XSRETURN_EMPTY;	2779	XSRETURN_EMPTY;
2692		2780
…		…
2753	}	2841	}
2754		2842
2755	MODULE = Deliantra::Client PACKAGE = DC::RW	2843	MODULE = Deliantra::Client PACKAGE = DC::RW
2756		2844
2757	DC::RW	2845	DC::RW
2758	new (SV class, SV data_sv)	2846	new (SV klass, SV data_sv)
2759	CODE:	2847	CODE:
2760	{	2848	{
2761	STRLEN datalen;	2849	STRLEN datalen;
2762	char *data = SvPVbyte (data_sv, datalen);	2850	char *data = SvPVbyte (data_sv, datalen);
2763		2851
…		…
2765	}	2853	}
2766	OUTPUT:	2854	OUTPUT:
2767	RETVAL	2855	RETVAL
2768		2856
2769	DC::RW	2857	DC::RW
2770	new_from_file (SV class, const char path, const char *mode = "rb")	2858	new_from_file (SV klass, const char path, const char *mode = "rb")
2771	CODE:	2859	CODE:
2772	RETVAL = SDL_RWFromFile (path, mode);	2860	RETVAL = SDL_RWFromFile (path, mode);
2773	OUTPUT:	2861	OUTPUT:
2774	RETVAL	2862	RETVAL
2775		2863
…		…
2793	if (RETVAL < 0)	2881	if (RETVAL < 0)
2794	{	2882	{
2795	RETVAL = Mix_GroupOldest (-1);	2883	RETVAL = Mix_GroupOldest (-1);
2796		2884
2797	if (RETVAL < 0)	2885	if (RETVAL < 0)
		2886	{
		2887	// happens sometimes, maybe it just stopped playing(?)
		2888	RETVAL = Mix_GroupAvailable (-1);
		2889
		2890	if (RETVAL < 0)
2798	XSRETURN_UNDEF;	2891	XSRETURN_UNDEF;
2799		2892	}
		2893	else
2800	Mix_HaltChannel (RETVAL);	2894	Mix_HaltChannel (RETVAL);
2801	}	2895	}
2802		2896
2803	Mix_UnregisterAllEffects (RETVAL);	2897	Mix_UnregisterAllEffects (RETVAL);
2804	Mix_Volume (RETVAL, 128);	2898	Mix_Volume (RETVAL, 128);
2805	}	2899	}
…		…
2865		2959
2866	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2960	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867		2961
2868	PROTOTYPES: DISABLE	2962	PROTOTYPES: DISABLE
2869		2963
		2964	void
		2965	decoders ()
		2966	PPCODE:
		2967	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2968	int i, num = Mix_GetNumChunkDecoders ();
		2969	EXTEND (SP, num);
		2970	for (i = 0; i < num; ++i)
		2971	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2972	#else
		2973	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2974	#endif
		2975
2870	DC::MixChunk	2976	DC::MixChunk
2871	new (SV *class, DC::RW rwops)	2977	new (SV *klass, DC::RW rwops)
2872	CODE:	2978	CODE:
2873	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2979	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2874	OUTPUT:	2980	OUTPUT:
2875	RETVAL	2981	RETVAL
2876		2982
…		…
2906	OUTPUT:	3012	OUTPUT:
2907	RETVAL	3013	RETVAL
2908		3014
2909	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	3015	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910		3016
		3017	void
		3018	decoders ()
		3019	PPCODE:
		3020	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		3021	int i, num = Mix_GetNumMusicDecoders ();
		3022	EXTEND (SP, num);
		3023	for (i = 0; i < num; ++i)
		3024	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3025	#else
		3026	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3027	#endif
		3028
2911	int	3029	int
2912	volume (int volume = -1)	3030	volume (int volume = -1)
2913	PROTOTYPE: ;$	3031	PROTOTYPE: ;$
2914	CODE:	3032	CODE:
2915	if (items > 0)	3033	if (items > 0)
…		…
2926	void	3044	void
2927	halt ()	3045	halt ()
2928	CODE:	3046	CODE:
2929	Mix_HaltMusic ();	3047	Mix_HaltMusic ();
2930		3048
		3049	int
		3050	playing ()
		3051	CODE:
		3052	RETVAL = Mix_PlayingMusic ();
		3053	OUTPUT:
		3054	RETVAL
		3055
2931	DC::MixMusic	3056	DC::MixMusic
2932	new (SV *class, DC::RW rwops)	3057	new (SV *klass, DC::RW rwops)
2933	CODE:	3058	CODE:
2934	RETVAL = Mix_LoadMUS_RW (rwops);	3059	RETVAL = Mix_LoadMUS_RW (rwops);
2935	OUTPUT:	3060	OUTPUT:
2936	RETVAL	3061	RETVAL
2937		3062
…		…
3074	const_iv (GL_FUNC_SUBTRACT),	3199	const_iv (GL_FUNC_SUBTRACT),
3075	const_iv (GL_FUNC_REVERSE_SUBTRACT),	3200	const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076	# undef const_iv	3201	# undef const_iv
3077	};	3202	};
3078		3203
3079	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3204	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3080	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3205	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081		3206
3082	texture_av = newAV ();	3207	texture_av = newAV ();
3083	AvREAL_off (texture_av);	3208	AvREAL_off (texture_av);
3084	}	3209	}
3085		3210
…		…
3090	gl.BlendFuncSeparateEXT = 0;	3215	gl.BlendFuncSeparateEXT = 0;
3091		3216
3092	void	3217	void
3093	apple_nvidia_bug (int enable)	3218	apple_nvidia_bug (int enable)
3094		3219
3095	char *	3220	const char *
3096	gl_vendor ()	3221	gl_vendor ()
3097	CODE:	3222	CODE:
3098	RETVAL = (char *)glGetString (GL_VENDOR);	3223	RETVAL = (const char *)glGetString (GL_VENDOR);
3099	OUTPUT:	3224	OUTPUT:
3100	RETVAL	3225	RETVAL
3101		3226
3102	char *	3227	const char *
3103	gl_version ()	3228	gl_version ()
3104	CODE:	3229	CODE:
3105	RETVAL = (char *)glGetString (GL_VERSION);	3230	RETVAL = (const char *)glGetString (GL_VERSION);
3106	OUTPUT:	3231	OUTPUT:
3107	RETVAL	3232	RETVAL
3108		3233
3109	char *	3234	const char *
3110	gl_extensions ()	3235	gl_extensions ()
3111	CODE:	3236	CODE:
3112	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3237	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3113	OUTPUT:	3238	OUTPUT:
3114	RETVAL	3239	RETVAL
3115		3240
3116	const char *glGetString (GLenum pname)	3241	const char *glGetString (GLenum pname)
		3242	CODE:
		3243	RETVAL = (const char *)glGetString (pname);
		3244	OUTPUT:
		3245	RETVAL
3117		3246
3118	GLint glGetInteger (GLenum pname)	3247	GLint glGetInteger (GLenum pname)
3119	CODE:	3248	CODE:
3120	glGetIntegerv (pname, &RETVAL);	3249	glGetIntegerv (pname, &RETVAL);
3121	OUTPUT:	3250	OUTPUT:
…		…
3128	RETVAL	3257	RETVAL
3129		3258
3130	int glGetError ()	3259	int glGetError ()
3131		3260
3132	void glFinish ()	3261	void glFinish ()
		3262
		3263	void glFlush ()
3133		3264
3134	void glClear (int mask)	3265	void glClear (int mask)
3135		3266
3136	void glClearColor (float r, float g, float b, float a = 1.0)	3267	void glClearColor (float r, float g, float b, float a = 1.0)
3137	PROTOTYPE: @	3268	PROTOTYPE: @
…		…
3322		3453
3323	void	3454	void
3324	find_widget (SV *self, NV x, NV y)	3455	find_widget (SV *self, NV x, NV y)
3325	PPCODE:	3456	PPCODE:
3326	{	3457	{
3327	if (within_widget (self, x, y))	3458	if (within_widget (self, x, y))
3328	XPUSHs (self);	3459	XPUSHs (self);
3329	}	3460	}
3330		3461
3331	BOOT:	3462	BOOT:
3332	{	3463	{
…		…
3340		3471
3341	void	3472	void
3342	draw (SV *self)	3473	draw (SV *self)
3343	CODE:	3474	CODE:
3344	{	3475	{
3345	HV *hv;	3476	HV *hv;
3346	SV **svp;	3477	SV **svp;
3347	NV x, y, w, h;	3478	NV x, y, w, h;
3348	SV *draw_x_sv = GvSV (draw_x_gv);	3479	SV *draw_x_sv = GvSV (draw_x_gv);
3349	SV *draw_y_sv = GvSV (draw_y_gv);	3480	SV *draw_y_sv = GvSV (draw_y_gv);
3350	SV *draw_w_sv = GvSV (draw_w_gv);	3481	SV *draw_w_sv = GvSV (draw_w_gv);
3351	SV *draw_h_sv = GvSV (draw_h_gv);	3482	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs. Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.324 by root, Sun Nov 18 01:58:53 2018 UTC