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