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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC

…		…
15		15
16	#include "EXTERN.h"	16	#include "EXTERN.h"
17	#include "perl.h"	17	#include "perl.h"
18	#include "XSUB.h"	18	#include "XSUB.h"
19		19
		20	#include "flat_hash_map.hpp"
		21
20	#ifdef _WIN32	22	#ifdef _WIN32
21	# undef pipe	23	# undef pipe
22	// microsoft vs. C	24	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	25	# define sqrtf(x) sqrt(x)
24	# define atan2f(x,y) atan2(x,y)	26	# define atan2f(x,y) atan2(x,y)
25	# define M_PI 3.14159265f	27	# define M_PI 3.14159265f
26	#endif	28	#endif
27		29
28	#include <assert.h>	30	#include <cassert>
29	#include <math.h>	31	#include <cmath>
30	#include <string.h>	32	#include <cstring>
31	#include <stdio.h>	33	#include <cstdio>
32	#include <stdlib.h>	34	#include <cstdlib>
		35
		36	#include <utility>
		37	#include <bitset>
33		38
34	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW	39	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
35		40
36	#include <SDL.h>	41	#include <SDL.h>
37	#include <SDL_thread.h>	42	#include <SDL_thread.h>
…		…
48	#endif	53	#endif
49		54
50	#define PANGO_ENABLE_BACKEND	55	#define PANGO_ENABLE_BACKEND
51	#define G_DISABLE_CAST_CHECKS	56	#define G_DISABLE_CAST_CHECKS
52		57
53	#include <glib/gmacros.h>	58	#include <glib.h>
54		59
55	#include <pango/pango.h>	60	#include <pango/pango.h>
56		61
57	#ifndef PANGO_VERSION_CHECK	62	#ifndef PANGO_VERSION_CHECK
58	# define PANGO_VERSION_CHECK(a,b,c) 0	63	# define PANGO_VERSION_CHECK(a,b,c) 0
…		…
184	{	189	{
185	GSList *attrs = run->item->analysis.extra_attrs;	190	GSList *attrs = run->item->analysis.extra_attrs;
186		191
187	while (attrs)	192	while (attrs)
188	{	193	{
189	PangoAttribute *attr = attrs->data;	194	PangoAttribute attr = (PangoAttribute )attrs->data;
190		195
191	if (attr->klass->type == PANGO_ATTR_SHAPE)	196	if (attr->klass->type == PANGO_ATTR_SHAPE)
192	return 1;	197	return 1;
193		198
194	attrs = attrs->next;	199	attrs = attrs->next;
195	}	200	}
196		201
197	return 0;	202	return 0;
198	}	203	}
199		204
200	typedef struct cf_layout {	205	struct cf_layout {
201	PangoLayout *pl;	206	PangoLayout *pl;
202	float r, g, b, a; // default color for rgba mode	207	float r, g, b, a; // default color for rgba mode
203	int base_height;	208	int base_height;
204	DC__Font font;	209	DC__Font font;
205	rc_t *rc;	210	rc_t rc;
206	} *DC__Layout;	211	};
		212
		213	typedef cf_layout *DC__Layout;
207		214
208	static DC__Font default_font;	215	static DC__Font default_font;
209	static PangoContext *opengl_context;	216	static PangoContext *opengl_context;
210	static PangoFontMap *opengl_fontmap;	217	static PangoFontMap *opengl_fontmap;
211		218
212	static void	219	static void
213	substitute_func (FcPattern *pattern, gpointer data)	220	substitute_func (FcPattern *pattern, gpointer data)
214	{	221	{
215	FcPatternAddBool (pattern, FC_HINTING, 1);	222	FcPatternAddBool (pattern, FC_HINTING, 1);
216	#ifdef FC_HINT_STYLE	223	#ifdef FC_HINT_STYLE
217	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	224	FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
218	#endif	225	#endif
219	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	226	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
220	}	227	}
221		228
222	static void	229	static void
…		…
252	}	259	}
253		260
254	typedef uint16_t tileid;	261	typedef uint16_t tileid;
255	typedef uint16_t faceid;	262	typedef uint16_t faceid;
256		263
257	typedef struct {	264	struct maptex
		265	{
258	GLuint name;	266	GLuint name;
259	int w, h;	267	int w, h;
260	float s, t;	268	float s, t;
261	uint8_t r, g, b, a;	269	uint8_t r, g, b, a;
262	tileid smoothtile;	270	tileid smoothtile;
263	uint8_t smoothlevel;	271	uint8_t smoothlevel;
264	uint8_t unused; /* set to zero on use */	272	uint8_t unused; /* set to zero on use */
265	} maptex;	273	};
266		274
267	typedef struct {	275	struct mapcell
		276	{
268	uint32_t player;	277	uint32_t player;
269	tileid tile[3];	278	tileid tile[3];
270	uint16_t darkness;	279	uint16_t darkness;
271	uint8_t stat_width, stat_hp, flags, smoothmax;	280	uint8_t stat_width, stat_hp, flags, smoothmax;
272	} mapcell;	281	};
273		282
274	typedef struct {	283	struct maprow
		284	{
275	int32_t c0, c1;	285	int32_t c0, c1;
276	mapcell *col;	286	mapcell *col;
277	} maprow;	287	};
278		288
279	typedef struct map {	289	struct mapgrid {
280	int x, y, w, h;	290	int x, y, w, h;
281	int ox, oy; /* offset to virtual global coordinate system */	291	int ox, oy; /* offset to virtual global coordinate system */
282	int faces; tileid *face2tile; // [faceid]	292	int faces; tileid *face2tile; // [faceid]
283	int texs; maptex *tex; // [tileid]	293	int texs; maptex *tex; // [tileid]
284		294
285	int32_t rows;	295	int32_t rows;
286	maprow *row;	296	maprow *row;
287	} *DC__Map;	297	};
288		298
289	static char *	299	typedef mapgrid *DC__Map;
		300
		301	template<typename T>
		302	static void
290	prepend (char *ptr, int sze, int inc)	303	prepend (T *&ptr, int sze, int inc)
291	{	304	{
292	char *p;	305	T *p;
293		306
294	New (0, p, sze + inc, char);	307	Newxz (p, sze + inc, T);
295	Zero (p, inc, char);
296	Move (ptr, p + inc, sze, char);	308	Move (ptr, p + inc, sze, T);
297	Safefree (ptr);	309	Safefree (ptr);
298		310
299	return p;	311	ptr = p;
300	}	312	}
301		313
302	static char *	314	template<typename T>
303	append (char *ptr, int sze, int inc)
304	{
305	Renew (ptr, sze + inc, char);
306	Zero (ptr + sze, inc, char);
307
308	return ptr;
309	}
310
311	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
312	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
313
314	static void	315	static void
		316	append (T *&ptr, int sze, int inc)
		317	{
		318	Renew (ptr, sze + inc, T);
		319	Zero (ptr + sze, inc, T);
		320	}
		321
		322	static void
315	need_facenum (struct map *self, faceid face)	323	need_facenum (struct mapgrid *self, faceid face)
316	{	324	{
317	while (self->faces <= face)	325	while (self->faces <= face)
318	{	326	{
319	Append (tileid, self->face2tile, self->faces, self->faces);	327	append (self->face2tile, self->faces, self->faces);
320	self->faces *= 2;	328	self->faces *= 2;
321	}	329	}
322	}	330	}
323		331
324	static void	332	static void
325	need_texid (struct map *self, int texid)	333	need_texid (struct mapgrid *self, int texid)
326	{	334	{
327	while (self->texs <= texid)	335	while (self->texs <= texid)
328	{	336	{
329	Append (maptex, self->tex, self->texs, self->texs);	337	append (self->tex, self->texs, self->texs);
330	self->texs *= 2;	338	self->texs *= 2;
331	}	339	}
332	}	340	}
333		341
334	static maprow *	342	static maprow *
335	map_get_row (DC__Map self, int y)	343	map_get_row (mapgrid *self, int y)
336	{	344	{
337	if (0 > y)	345	if (0 > y)
338	{	346	{
339	int extend = - y + MAP_EXTEND_Y;	347	int extend = - y + MAP_EXTEND_Y;
340	Prepend (maprow, self->row, self->rows, extend);	348	prepend (self->row, self->rows, extend);
341		349
342	self->rows += extend;	350	self->rows += extend;
343	self->y += extend;	351	self->y += extend;
344	y += extend;	352	y += extend;
345	}	353	}
346	else if (y >= self->rows)	354	else if (y >= self->rows)
347	{	355	{
348	int extend = y - self->rows + MAP_EXTEND_Y;	356	int extend = y - self->rows + MAP_EXTEND_Y;
349	Append (maprow, self->row, self->rows, extend);	357	append (self->row, self->rows, extend);
350	self->rows += extend;	358	self->rows += extend;
351	}	359	}
352		360
353	return self->row + y;	361	return self->row + y;
354	}	362	}
…		…
364	}	372	}
365		373
366	if (row->c0 > x)	374	if (row->c0 > x)
367	{	375	{
368	int extend = row->c0 - x + MAP_EXTEND_X;	376	int extend = row->c0 - x + MAP_EXTEND_X;
369	Prepend (mapcell, row->col, row->c1 - row->c0, extend);	377	prepend (row->col, row->c1 - row->c0, extend);
370	row->c0 -= extend;	378	row->c0 -= extend;
371	}	379	}
372	else if (x >= row->c1)	380	else if (x >= row->c1)
373	{	381	{
374	int extend = x - row->c1 + MAP_EXTEND_X;	382	int extend = x - row->c1 + MAP_EXTEND_X;
375	Append (mapcell, row->col, row->c1 - row->c0, extend);	383	append (row->col, row->c1 - row->c0, extend);
376	row->c1 += extend;	384	row->c1 += extend;
377	}	385	}
378		386
379	return row->col + (x - row->c0);	387	return row->col + (x - row->c0);
380	}	388	}
381		389
382	static mapcell *	390	static mapcell *
383	map_get_cell (DC__Map self, int x, int y)	391	map_get_cell (mapgrid *self, int x, int y)
384	{	392	{
385	return row_get_cell (map_get_row (self, y), x);	393	return row_get_cell (map_get_row (self, y), x);
386	}	394	}
387		395
388	static void	396	static void
389	map_clear (DC__Map self)	397	map_clear (mapgrid *self)
390	{	398	{
391	int r;	399	int r;
392		400
393	for (r = 0; r < self->rows; r++)	401	for (r = 0; r < self->rows; r++)
394	Safefree (self->row[r].col);	402	Safefree (self->row[r].col);
…		…
412	(cell)->flags = 0; \	420	(cell)->flags = 0; \
413	(cell)->player = 0; \	421	(cell)->player = 0; \
414	} while (0)	422	} while (0)
415		423
416	static void	424	static void
417	map_blank (DC__Map self, int x0, int y0, int w, int h)	425	map_blank (mapgrid *self, int x0, int y0, int w, int h)
418	{	426	{
419	int x, y;	427	int x, y;
420	maprow *row;	428	maprow *row;
421	mapcell *cell;	429	mapcell *cell;
422		430
…		…
439	CELL_CLEAR (cell);	447	CELL_CLEAR (cell);
440	}	448	}
441	}	449	}
442	}	450	}
443		451
444	typedef struct {	452	struct smooth_key
		453	{
445	tileid tile;	454	tileid tile;
446	uint8_t x, y, level;	455	uint8_t x, y, level;
447	} smooth_key;	456
		457	bool operator == (const smooth_key &o) const
		458	{
		459	return tile == o.tile && x == o.x && y == o.y && level == o.level;
		460	}
		461	};
		462
		463	typedef ska::flat_hash_map<smooth_key, IV> smooth_hash;
		464
		465	namespace std {
		466	template <>
		467	struct hash<smooth_key>
		468	{
		469	size_t operator () (const smooth_key &v) const
		470	{
		471	return v.tile + (v.x << 8) + (v.y << 16) + (v.level << 24);
		472	}
		473	};
		474	}
448		475
449	static void	476	static void
450	smooth_or_bits (HV hv, smooth_key key, IV bits)	477	smooth_or_bits (smooth_hash &h, smooth_key &key, IV bits)
451	{	478	{
452	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);	479	auto &&it = h.find (key);
453		480
454	if (SvIOK (*sv))	481	if (it == h.end ())
455	SvIV_set (sv, SvIVX (sv) \| bits);	482	h.insert (std::make_pair (key, bits));
456	else	483	else
457	sv_setiv (*sv, bits);	484	it->second \|= bits;
458	}	485	}
459		486
460	static void	487	static void
461	music_finished (void)	488	music_finished (void)
462	{	489	{
…		…
481	ev.data2 = 0;	508	ev.data2 = 0;
482		509
483	SDL_PushEvent ((SDL_Event *)&ev);	510	SDL_PushEvent ((SDL_Event *)&ev);
484	}	511	}
485		512
		513	// approximately divide by 255
486	static unsigned int	514	static unsigned int
487	div255 (unsigned int n)	515	div255 (unsigned int n)
488	{	516	{
489	return (n + (n >> 8)) >> 8;	517	return (n + (n >> 8)) >> 8;
490	}	518	}
…		…
577		605
578	return mod;	606	return mod;
579	}	607	}
580		608
581	static void	609	static void
582	deliantra_main ()	610	deliantra_main (SV *real_main)
583	{	611	{
584	char *argv[] = { 0 };	612	dSP;
585	call_argv ("DC::Main::main", G_DISCARD \| G_VOID, argv);	613
		614	PUSHMARK (SP);
		615	call_sv (real_main, G_DISCARD \| G_VOID);
586	}	616	}
587		617
588	#ifdef __MACOSX__	618	#ifdef __MACOSX__
		619	static SV *real_main;
		620
589	/* to due surprising braindamage on the side of SDL design, we	621	/* to due surprising braindamage on the side of SDL design, we
590	* do some mind-boggling hack here: SDL requires a custom main()	622	* do some mind-boggling hack here: SDL requires a custom main()
591	* on OS X, so... we provide one and call the original main(), which,	623	* on OS X, so... we provide one and call the original main(), which,
592	* due to shared library magic, calls -lSDLmain's main, not perl's main,	624	* due to shared library magic, calls -lSDLmain's main, not perl's main,
593	* and which calls our main (== SDL_main) back.	625	* and which calls our main (== SDL_main) back.
594	*/	626	*/
595	extern C_LINKAGE int	627	extern C_LINKAGE int
596	main (int argc, char *argv[])	628	main (int argc, char *argv[])
597	{	629	{
598	deliantra_main ();	630	deliantra_main (real_main);
599	}	631	}
600		632
601	#undef main	633	#undef main
602		634
603	extern C_LINKAGE int main (int argc, char *argv[]);	635	extern C_LINKAGE int main (int argc, char *argv[]);
604		636
605	static void	637	static void
606	SDL_braino (void)	638	SDL_main_hack (SV *real_main_)
607	{	639	{
		640	real_main = real_main_;
		641
608	char *argv[] = { "deliantra client", 0 };	642	char *argv[] = { "deliantra client", 0 };
609	(main) (1, argv);	643	(main) (1, argv);
610	}	644	}
611	#else	645	#else
612	static void	646	static void
613	SDL_braino (void)	647	SDL_main_hack (SV *real_main)
614	{	648	{
615	deliantra_main ();	649	deliantra_main (real_main);
616	}	650	}
617	#endif	651	#endif
618		652
619	MODULE = Deliantra::Client PACKAGE = DC	653	MODULE = Deliantra::Client PACKAGE = DC
620		654
…		…
871	#endif	905	#endif
872	}	906	}
873		907
874	char *SDL_GetError ()	908	char *SDL_GetError ()
875		909
876	void SDL_braino ()	910	void SDL_main_hack (SV *real_main)
		911	PROTOTYPE: &
877		912
878	int SDL_Init (U32 flags)	913	int SDL_Init (U32 flags)
879		914
880	int SDL_InitSubSystem (U32 flags)	915	int SDL_InitSubSystem (U32 flags)
881		916
882	void SDL_QuitSubSystem (U32 flags)	917	void SDL_QuitSubSystem (U32 flags)
883		918
884	void SDL_Quit ()	919	void SDL_Quit ()
885		920
886	int SDL_GL_SetAttribute (int attr, int value)	921	int SDL_GL_SetAttribute (int attr, int value)
		922	C_ARGS: (SDL_GLattr)attr, value
887		923
888	int SDL_GL_GetAttribute (int attr)	924	int SDL_GL_GetAttribute (int attr)
889	CODE:	925	CODE:
890	if (SDL_GL_GetAttribute (attr, &RETVAL))	926	if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
891	XSRETURN_UNDEF;	927	XSRETURN_UNDEF;
892	OUTPUT:	928	OUTPUT:
893	RETVAL	929	RETVAL
894		930
895	void	931	void
…		…
950	);	986	);
951		987
952	if (RETVAL)	988	if (RETVAL)
953	{	989	{
954	av_clear (texture_av);	990	av_clear (texture_av);
955
956	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
957	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	991	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
958	#include "glfunc.h"	992	#include "glfunc.h"
959	#undef GL_FUNC	993	#undef GL_FUNC
960
961	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;	994	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;	995	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
963	}	996	}
964	}	997	}
965	OUTPUT:	998	OUTPUT:
966	RETVAL	999	RETVAL
967		1000
968	void	1001	void
		1002	SDL_WM_SetCaption (const char title, const char icon)
		1003
		1004	void
969	SDL_GL_SwapBuffers ()	1005	SDL_GL_SwapBuffers ()
970		1006
971	char *	1007	char *
972	SDL_GetKeyName (int sym)	1008	SDL_GetKeyName (int sym)
		1009	C_ARGS: (SDLKey)sym
973		1010
974	int	1011	int
975	SDL_GetAppState ()	1012	SDL_GetAppState ()
976		1013
977	int	1014	int
978	SDL_GetModState ()	1015	SDL_GetModState ()
979		1016
		1017	int
		1018	SDL_WaitEvent ()
		1019	C_ARGS: 0
		1020
980	void	1021	void
		1022	SDL_PumpEvents ()
		1023
		1024	void
981	poll_events ()	1025	peep_events ()
982	PPCODE:	1026	PPCODE:
983	{	1027	{
984	SDL_Event ev;	1028	SDL_Event ev;
985		1029
986	SDL_PumpEvents ();	1030	SDL_PumpEvents ();
…		…
1067	OUTPUT:	1111	OUTPUT:
1068	RETVAL	1112	RETVAL
1069		1113
1070	int	1114	int
1071	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1115	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1072	POSTCALL:	1116	POSTCALL:
1073	Mix_HookMusicFinished (music_finished);	1117	Mix_HookMusicFinished (music_finished);
1074	Mix_ChannelFinished (channel_finished);	1118	Mix_ChannelFinished (channel_finished);
1075		1119
1076	void	1120	void
1077	Mix_QuerySpec ()	1121	Mix_QuerySpec ()
…		…
1140	RETVAL	1184	RETVAL
1141		1185
1142	void	1186	void
1143	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)	1187	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
1144		1188
		1189	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1145	void	1190	void
1146	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_MP3 \| MIX_INIT_OGG)	1191	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
1147		1192
1148	void	1193	void
1149	load_image_inline (SV *image_)	1194	load_image_inline (SV *image_)
1150	ALIAS:	1195	ALIAS:
1151	load_image_file = 1	1196	load_image_file = 1
…		…
1197		1242
1198	SDL_LockSurface (surface2);	1243	SDL_LockSurface (surface2);
1199	EXTEND (SP, 6);	1244	EXTEND (SP, 6);
1200	PUSHs (sv_2mortal (newSViv (surface2->w)));	1245	PUSHs (sv_2mortal (newSViv (surface2->w)));
1201	PUSHs (sv_2mortal (newSViv (surface2->h)));	1246	PUSHs (sv_2mortal (newSViv (surface2->h)));
1202	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	1247	PUSHs (sv_2mortal (newSVpvn ((const char )surface2->pixels, surface2->h surface2->pitch)));
1203	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	1248	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1204	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	1249	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1205	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	1250	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1206	SDL_UnlockSurface (surface2);	1251	SDL_UnlockSurface (surface2);
1207		1252
…		…
1279	MODULE = Deliantra::Client PACKAGE = DC::Font	1324	MODULE = Deliantra::Client PACKAGE = DC::Font
1280		1325
1281	PROTOTYPES: DISABLE	1326	PROTOTYPES: DISABLE
1282		1327
1283	DC::Font	1328	DC::Font
1284	new_from_file (SV class, char path, int id = 0)	1329	new_from_file (SV klass, char path, int id = 0)
1285	CODE:	1330	CODE:
1286	{	1331	{
1287	int count;	1332	int count;
1288	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	1333	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
1289	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);	1334	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
…		…
1318	PROTOTYPE:	1363	PROTOTYPE:
1319	CODE:	1364	CODE:
1320	tc_restore ();	1365	tc_restore ();
1321		1366
1322	DC::Layout	1367	DC::Layout
1323	new (SV *class)	1368	new (SV *klass)
1324	CODE:	1369	CODE:
1325	New (0, RETVAL, 1, struct cf_layout);	1370	RETVAL = new cf_layout;
1326		1371
1327	RETVAL->pl = pango_layout_new (opengl_context);	1372	RETVAL->pl = pango_layout_new (opengl_context);
1328	RETVAL->r = 1.;	1373	RETVAL->r = 1.;
1329	RETVAL->g = 1.;	1374	RETVAL->g = 1.;
1330	RETVAL->b = 1.;	1375	RETVAL->b = 1.;
1331	RETVAL->a = 1.;	1376	RETVAL->a = 1.;
1332	RETVAL->base_height = MIN_FONT_HEIGHT;	1377	RETVAL->base_height = MIN_FONT_HEIGHT;
1333	RETVAL->font = 0;	1378	RETVAL->font = 0;
1334	RETVAL->rc = rc_alloc ();
1335		1379
1336	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	1380	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
1337	layout_update_font (RETVAL);	1381	layout_update_font (RETVAL);
1338	OUTPUT:	1382	OUTPUT:
1339	RETVAL	1383	RETVAL
1340		1384
1341	void	1385	void
1342	DESTROY (DC::Layout self)	1386	DESTROY (DC::Layout self)
1343	CODE:	1387	CODE:
1344	g_object_unref (self->pl);	1388	g_object_unref (self->pl);
1345	rc_free (self->rc);
1346	Safefree (self);	1389	delete self;
1347		1390
1348	void	1391	void
1349	set_text (DC::Layout self, SV *text_)	1392	set_text (DC::Layout self, SV *text_)
1350	CODE:	1393	CODE:
1351	{	1394	{
…		…
1477		1520
1478	void	1521	void
1479	set_height (DC::Layout self, int base_height)	1522	set_height (DC::Layout self, int base_height)
1480	CODE:	1523	CODE:
1481	if (self->base_height != base_height)	1524	if (self->base_height != base_height)
1482	{	1525	{
1483	self->base_height = base_height;	1526	self->base_height = base_height;
1484	layout_update_font (self);	1527	layout_update_font (self);
1485	}	1528	}
1486		1529
1487	void	1530	void
…		…
1605	}	1648	}
1606		1649
1607	void	1650	void
1608	render (DC::Layout self, float x, float y, int flags = 0)	1651	render (DC::Layout self, float x, float y, int flags = 0)
1609	CODE:	1652	CODE:
1610	rc_clear (self->rc);	1653	self->rc.clear ();
1611	pango_opengl_render_layout_subpixel (	1654	pango_opengl_render_layout_subpixel (
1612	self->pl,	1655	self->pl,
1613	self->rc,	1656	&self->rc,
1614	x * PANGO_SCALE, y * PANGO_SCALE,	1657	x * PANGO_SCALE, y * PANGO_SCALE,
1615	self->r, self->g, self->b, self->a,	1658	self->r, self->g, self->b, self->a,
1616	flags	1659	flags
1617	);	1660	);
1618	// we assume that context_change actually clears/frees stuff	1661	// we assume that context_change actually clears/frees stuff
…		…
1629	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1672	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
1630	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);	1673	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
1631	glEnable (GL_ALPHA_TEST);	1674	glEnable (GL_ALPHA_TEST);
1632	glAlphaFunc (GL_GREATER, 7.f / 255.f);	1675	glAlphaFunc (GL_GREATER, 7.f / 255.f);
1633		1676
1634	rc_draw (self->rc);	1677	self->rc.draw ();
1635		1678
1636	glDisable (GL_ALPHA_TEST);	1679	glDisable (GL_ALPHA_TEST);
1637	glDisable (GL_BLEND);	1680	glDisable (GL_BLEND);
1638	glDisable (GL_TEXTURE_2D);	1681	glDisable (GL_TEXTURE_2D);
1639	}	1682	}
…		…
1851	MODULE = Deliantra::Client PACKAGE = DC::Map	1894	MODULE = Deliantra::Client PACKAGE = DC::Map
1852		1895
1853	PROTOTYPES: DISABLE	1896	PROTOTYPES: DISABLE
1854		1897
1855	DC::Map	1898	DC::Map
1856	new (SV *class)	1899	new (SV *klass)
1857	CODE:	1900	CODE:
1858	New (0, RETVAL, 1, struct map);	1901	New (0, RETVAL, 1, mapgrid);
1859	RETVAL->x = 0;	1902	RETVAL->x = 0;
1860	RETVAL->y = 0;	1903	RETVAL->y = 0;
1861	RETVAL->w = 0;	1904	RETVAL->w = 0;
1862	RETVAL->h = 0;	1905	RETVAL->h = 0;
1863	RETVAL->ox = 0;	1906	RETVAL->ox = 0;
…		…
1900		1943
1901	void	1944	void
1902	set_smooth (DC::Map self, int face, int smooth, int level)	1945	set_smooth (DC::Map self, int face, int smooth, int level)
1903	CODE:	1946	CODE:
1904	{	1947	{
1905	tileid texid;	1948	tileid texid;
1906	maptex *tex;	1949	maptex *tex;
1907		1950
1908	if (face < 0 \|\| face >= self->faces)	1951	if (face < 0 \|\| face >= self->faces)
1909	return;	1952	return;
1910		1953
1911	if (smooth < 0 \|\| smooth >= self->faces)	1954	if (smooth < 0 \|\| smooth >= self->faces)
1912	return;	1955	return;
1913		1956
1914	texid = self->face2tile [face];	1957	texid = self->face2tile [face];
1915		1958
1916	if (!texid)	1959	if (!texid)
1917	return;	1960	return;
1918		1961
1919	tex = self->tex + texid;	1962	tex = self->tex + texid;
…		…
1952	}	1995	}
1953		1996
1954	void	1997	void
1955	expire_textures (DC::Map self, int texid, int count)	1998	expire_textures (DC::Map self, int texid, int count)
1956	PPCODE:	1999	PPCODE:
1957	for (; texid < self->texs && count; ++texid, --count)	2000	for (; texid < self->texs && count; ++texid, --count)
1958	{	2001	{
1959	maptex *tex = self->tex + texid;	2002	maptex *tex = self->tex + texid;
1960		2003
1961	if (tex->name)	2004	if (tex->name)
1962	{	2005	{
…		…
2009	self->ox += dx; self->x += dx;	2052	self->ox += dx; self->x += dx;
2010	self->oy += dy; self->y += dy;	2053	self->oy += dy; self->y += dy;
2011		2054
2012	while (self->y < 0)	2055	while (self->y < 0)
2013	{	2056	{
2014	Prepend (maprow, self->row, self->rows, MAP_EXTEND_Y);	2057	prepend (self->row, self->rows, MAP_EXTEND_Y);
2015		2058
2016	self->rows += MAP_EXTEND_Y;	2059	self->rows += MAP_EXTEND_Y;
2017	self->y += MAP_EXTEND_Y;	2060	self->y += MAP_EXTEND_Y;
2018	}	2061	}
2019	}	2062	}
2020		2063
2021	SV *	2064	SV *
2022	map1a_update (DC::Map self, SV *data_, int extmap)	2065	map1a_update (DC::Map self, SV *data_)
2023	CODE:	2066	CODE:
2024	{	2067	{
2025	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	2068	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
2026	uint8_t data_end = (uint8_t )SvEND (data_);	2069	uint8_t data_end = (uint8_t )SvEND (data_);
2027	mapcell *cell;	2070	mapcell *cell;
…		…
2048		2091
2049	//TODO: don't trust server data to be in-range(!)	2092	//TODO: don't trust server data to be in-range(!)
2050		2093
2051	if (flags & 8)	2094	if (flags & 8)
2052	{	2095	{
		2096	uint8_t ext, cmd;
		2097
2053	if (extmap)	2098	do
2054	{	2099	{
2055	uint8_t ext, cmd;	2100	ext = *data++;
		2101	cmd = ext & 0x7f;
2056		2102
2057	do	2103	if (cmd < 4)
		2104	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
		2105	else if (cmd == 5) // health
2058	{	2106	{
2059	ext = *data++;
2060	cmd = ext & 0x7f;
2061
2062	if (cmd < 4)
2063	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2064	else if (cmd == 5) // health
2065	{
2066	cell->stat_width = 1;	2107	cell->stat_width = 1;
2067	cell->stat_hp = *data++;	2108	cell->stat_hp = *data++;
2068	}
2069	else if (cmd == 6) // monster width
2070	cell->stat_width = *data++ + 1;
2071	else if (cmd == 0x47)
2072	{
2073	if (*data == 1) cell->player = data [1];
2074	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2075	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2076	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2077
2078	data += *data + 1;
2079	}
2080	else if (cmd == 8) // cell flags
2081	cell->flags = *data++;
2082	else if (ext & 0x40) // unknown, multibyte => skip
2083	data += *data + 1;
2084	else
2085	data++;
2086	}	2109	}
2087	while (ext & 0x80);	2110	else if (cmd == 6) // monster width
		2111	cell->stat_width = *data++ + 1;
		2112	else if (cmd == 0x47)
		2113	{
		2114	if (*data == 1) cell->player = data [1];
		2115	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2116	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2117	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
		2118
		2119	data += *data + 1;
		2120	}
		2121	else if (cmd == 8) // cell flags
		2122	cell->flags = *data++;
		2123	else if (ext & 0x40) // unknown, multibyte => skip
		2124	data += *data + 1;
		2125	else
		2126	data++;
2088	}	2127	}
2089	else	2128	while (ext & 0x80);
2090	cell->darkness = *data++ + 1;
2091	}	2129	}
2092		2130
2093	for (z = 0; z <= 2; ++z)	2131	for (z = 0; z <= 2; ++z)
2094	if (flags & (4 >> z))	2132	if (flags & (4 >> z))
2095	{	2133	{
…		…
2169	\| (b << 16)	2207	\| (b << 16)
2170	\| (a << 24);	2208	\| (a << 24);
2171	}	2209	}
2172	}	2210	}
2173		2211
2174	RETVAL = map_sv;	2212	RETVAL = map_sv;
2175	}	2213	}
2176	OUTPUT:	2214	OUTPUT:
2177	RETVAL	2215	RETVAL
2178		2216
2179	void	2217	void
2180	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)	2218	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2181	CODE:	2219	CODE:
2182	{	2220	{
2183	int x, y, z;	2221	int x, y, z;
2184		2222
2185	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
2186	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2187	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2223	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k), also, static!
2188	smooth_key skey;
2189	int pl_x, pl_y;	2224	int pl_x, pl_y;
2190	maptex pl_tex;	2225	maptex pl_tex;
2191	rc_t *rc = rc_alloc ();	2226	rc_t rc;
2192	rc_t *rc_ov = rc_alloc ();	2227	rc_t rc_ov;
2193	rc_key_t key;	2228	rc_key_t key;
2194	rc_array_t *arr;	2229	rc_t::array_t *arr;
2195		2230
2196	pl_tex.name = 0;	2231	pl_tex.name = 0;
2197		2232
2198	// that's current max. sorry.	2233	// that's current max. sorry.
2199	if (sw > 255) sw = 255;	2234	if (sw > 255) sw = 255;
2200	if (sh > 255) sh = 255;	2235	if (sh > 255) sh = 255;
2201
2202	// clear key, in case of extra padding
2203	memset (&skey, 0, sizeof (skey));
2204		2236
2205	memset (&key, 0, sizeof (key));	2237	memset (&key, 0, sizeof (key));
2206	key.r = 255;	2238	key.r = 255;
2207	key.g = 255;	2239	key.g = 255;
2208	key.b = 255;	2240	key.b = 255;
…		…
2214	my += self->y;	2246	my += self->y;
2215		2247
2216	// first pass: determine smooth_max	2248	// first pass: determine smooth_max
2217	// rather ugly, if you ask me	2249	// rather ugly, if you ask me
2218	// could also be stored inside mapcell and updated on change	2250	// could also be stored inside mapcell and updated on change
2219	memset (smooth_max, 0, sizeof (smooth_max));	2251	memset (smooth_max, 0, sizeof (smooth_max[0]) * (sh + 1));
2220		2252
2221	for (y = 0; y < sh; y++)	2253	for (y = 0; y < sh; y++)
2222	if (0 <= y + my && y + my < self->rows)	2254	if (0 <= y + my && y + my < self->rows)
2223	{	2255	{
2224	maprow *row = self->row + (y + my);	2256	maprow *row = self->row + (y + my);
…		…
2239	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2271	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2240	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2272	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2241		2273
2242	for (z = 0; z <= 2; z++)	2274	for (z = 0; z <= 2; z++)
2243	{	2275	{
2244	memset (smooth_level, 0, sizeof (smooth_level));	2276	std::bitset<256> smooth_level; // one bit for every possible smooth level
		2277	smooth_key skey;
		2278	smooth_hash smooth;
2245	key.texname = -1;	2279	key.texname = -1;
2246		2280
2247	for (y = 0; y < sh; y++)	2281	for (y = 0; y < sh; y++)
2248	if (0 <= y + my && y + my < self->rows)	2282	if (0 <= y + my && y + my < self->rows)
2249	{	2283	{
…		…
2266		2300
2267	if (!tex.name)	2301	if (!tex.name)
2268	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */	2302	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
2269		2303
2270	key.texname = tex.name;	2304	key.texname = tex.name;
2271	arr = rc_array (rc, &key);	2305	arr = &rc.array (key);
2272	}	2306	}
2273		2307
2274	px = (x + 1) * Th - tex.w;	2308	px = (x + 1) * Th - tex.w;
2275	py = (y + 1) * Tw - tex.h;	2309	py = (y + 1) * Tw - tex.h;
2276		2310
…		…
2280	pl_y = py;	2314	pl_y = py;
2281	pl_tex = tex;	2315	pl_tex = tex;
2282	continue;	2316	continue;
2283	}	2317	}
2284		2318
2285	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2319	arr->t2f_v3f (0 , 0 , px , py , 0);
2286	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2320	arr->t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2287	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2321	arr->t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2288	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2322	arr->t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2289		2323
2290	// update smooth hash	2324	// update smooth hash
2291	if (tex.smoothtile)	2325	if (tex.smoothtile)
2292	{	2326	{
2293	skey.tile = tex.smoothtile;	2327	skey.tile = tex.smoothtile;
2294	skey.level = tex.smoothlevel;	2328	skey.level = tex.smoothlevel;
2295		2329
2296	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);	2330	smooth_level[tex.smoothlevel] = 1;
2297		2331
2298	// add bits to current tile and all neighbours. skey.x\|y is	2332	// add bits to current tile and all neighbours. skey.x\|y is
2299	// shifted +1\|+1 so we always stay positive.	2333	// shifted +1\|+1 so we always stay positive.
2300		2334
2301	// bits is ___n cccc CCCC bbbb	2335	// bits is ___n cccc CCCC bbbb
…		…
2309		2343
2310	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··	2344	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
2311	// ·· ·· ·┏ ┓·	2345	// ·· ·· ·┏ ┓·
2312		2346
2313	// full tile	2347	// full tile
2314	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);	2348	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x1000);
2315		2349
2316	// borders	2350	// borders
2317	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);	2351	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0091);
2318	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);	2352	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0032);
2319	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);	2353	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, skey, 0x0064);
2320	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);	2354	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, skey, 0x00c8);
2321		2355
2322	// corners	2356	// corners
2323	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2357	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0100);
2324	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2358	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, skey, 0x0200);
2325	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2359	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, skey, 0x0400);
2326	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2360	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, skey, 0x0800);
2327	}	2361	}
2328	}	2362	}
2329		2363
2330	if (expect_false (z == 2) && expect_false (cell->flags))	2364	if (expect_false (z == 2) && expect_false (cell->flags))
2331	{	2365	{
2332	// overlays such as the speech bubble, probably more to come	2366	// overlays such as the speech bubble, probably more to come
2333	if (cell->flags & 1)	2367	if (cell->flags & 1)
2334	{	2368	{
2335	rc_key_t key_ov = key;	2369	rc_key_t key_ov = key;
2336	maptex tex = self->tex [TEXID_SPEECH];	2370	maptex tex = self->tex[TEXID_SPEECH];
2337	rc_array_t *arr;
2338	int px = x * Tw + Tw * 2 / 32;	2371	int px = x * Tw + Tw * 2 / 32;
2339	int py = y * Th - Th * 6 / 32;	2372	int py = y * Th - Th * 6 / 32;
2340		2373
2341	key_ov.texname = tex.name;	2374	key_ov.texname = tex.name;
2342	arr = rc_array (rc_ov, &key_ov);	2375	rc_t::array_t &arr = rc_ov.array (key_ov);
2343		2376
2344	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2377	arr.t2f_v3f (0 , 0 , px , py , 0);
2345	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);	2378	arr.t2f_v3f (0 , tex.t, px , py + Th, 0);
2346	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);	2379	arr.t2f_v3f (tex.s, tex.t, px + Tw, py + Th, 0);
2347	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);	2380	arr.t2f_v3f (tex.s, 0 , px + Tw, py , 0);
2348	}	2381	}
2349	}	2382	}
2350	}	2383	}
2351	}	2384	}
2352		2385
2353	rc_draw (rc);	2386	rc.draw ();
2354	rc_clear (rc);	2387	rc.clear ();
2355		2388
2356	// go through all smoothlevels, lowest to highest, then draw.	2389	// go through all smoothlevels, lowest to highest, then draw.
2357	// this is basically counting sort	2390	// this is basically counting sort
2358	{	2391	{
2359	int w, b;	2392	int w, b;
2360		2393
2361	glEnable (GL_TEXTURE_2D);	2394	glEnable (GL_TEXTURE_2D);
2362	glBegin (GL_QUADS);	2395	glBegin (GL_QUADS);
2363	for (w = 0; w < 256 / 32; ++w)	2396	for (int level = 0; level < smooth_level.size (); ++level)
		2397	if (smooth_level[level])
		2398	for (auto &&it = smooth.begin (); it != smooth.end (); ++it)
2364	{	2399	{
2365	uint32_t smask = smooth_level [w];	2400	smooth_key &skey = it->first;
2366	if (smask)	2401	IV bits = it->second;
2367	for (b = 0; b < 32; ++b)	2402
2368	if (smask & (((uint32_t)1) << b))	2403	if (!(bits & 0x1000)
		2404	&& skey.level == level
		2405	&& level > smooth_max [skey.x][skey.y])
2369	{	2406	{
2370	int level = (w << 5) \| b;	2407	maptex tex = self->tex [skey.tile];
		2408	int px = (((int)skey.x) - 1) * Tw;
		2409	int py = (((int)skey.y) - 1) * Th;
		2410	int border = bits & 15;
		2411	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		2412	float dx = tex.s * .0625f; // 16 images/row
		2413	float dy = tex.t * .5f ; // 2 images/column
		2414
2371	HE *he;	2415	if (tex.name)
2372
2373	hv_iterinit (smooth);
2374	while ((he = hv_iternext (smooth)))
2375	{	2416	{
2376	smooth_key skey = (smooth_key )HeKEY (he);	2417	// this time avoiding texture state changes
2377	IV bits = SvIVX (HeVAL (he));	2418	// save gobs of state changes.
2378		2419	if (key.texname != tex.name)
2379	if (!(bits & 0x1000)
2380	&& skey->level == level
2381	&& level > smooth_max [skey->x][skey->y])
2382	{	2420	{
2383	maptex tex = self->tex [skey->tile];
2384	int px = (((int)skey->x) - 1) * Tw;
2385	int py = (((int)skey->y) - 1) * Th;
2386	int border = bits & 15;
2387	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2388	float dx = tex.s * .0625f; // 16 images/row
2389	float dy = tex.t * .5f ; // 2 images/column
2390
2391	if (tex.name)
2392	{
2393	// this time avoiding texture state changes
2394	// save gobs of state changes.
2395	if (key.texname != tex.name)
2396	{
2397	self->tex [skey->tile].unused = 0;	2421	self->tex [skey.tile].unused = 0;
2398		2422
2399	glEnd ();	2423	glEnd ();
2400	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2424	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2401	glBegin (GL_QUADS);	2425	glBegin (GL_QUADS);
2402	}	2426	}
2403		2427
2404	if (border)	2428	if (border)
2405	{	2429	{
2406	float ox = border * dx;	2430	float ox = border * dx;
2407		2431
2408	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2432	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2409	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);	2433	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2410	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);	2434	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2411	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );	2435	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2412	}	2436	}
2413		2437
2414	if (corner)	2438	if (corner)
2415	{	2439	{
2416	float ox = corner * dx;	2440	float ox = corner * dx;
2417		2441
2418	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2442	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2419	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);	2443	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2420	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);	2444	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2421	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );	2445	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2422	}
2423	}
2424	}	2446	}
2425	}	2447	}
2426	}	2448	}
2427	}	2449	}
2428		2450
2429	glEnd ();	2451	glEnd ();
2430	glDisable (GL_TEXTURE_2D);	2452	glDisable (GL_TEXTURE_2D);
2431	key.texname = -1;	2453	key.texname = -1;
2432	}	2454	}
2433
2434	hv_clear (smooth);
2435	}	2455	}
2436		2456
2437	if (pl_tex.name)	2457	if (pl_tex.name)
2438	{	2458	{
2439	maptex tex = pl_tex;	2459	maptex tex = pl_tex;
2440	int px = pl_x + sdx;	2460	int px = pl_x + sdx;
2441	int py = pl_y + sdy;	2461	int py = pl_y + sdy;
2442		2462
2443	key.texname = tex.name;	2463	key.texname = tex.name;
2444	arr = rc_array (rc, &key);	2464	rc_t::array_t &arr = rc.array (key);
2445		2465
2446	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2466	arr.t2f_v3f (0 , 0 , px , py , 0);
2447	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2467	arr.t2f_v3f (0 , tex.t, px , py + tex.h, 0);
2448	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2468	arr.t2f_v3f (tex.s, tex.t, px + tex.w, py + tex.h, 0);
2449	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2469	arr.t2f_v3f (tex.s, 0 , px + tex.w, py , 0);
2450		2470
2451	rc_draw (rc);	2471	rc.draw ();
2452	}	2472	}
2453		2473
2454	rc_draw (rc_ov);	2474	rc_ov.draw ();
2455	rc_clear (rc_ov);	2475	rc_ov.clear ();
2456		2476
2457	glDisable (GL_BLEND);	2477	glDisable (GL_BLEND);
2458	rc_free (rc);
2459	rc_free (rc_ov);
2460		2478
2461	// top layer: overlays such as the health bar	2479	// top layer: overlays such as the health bar
2462	for (y = 0; y < sh; y++)	2480	for (y = 0; y < sh; y++)
2463	if (0 <= y + my && y + my < self->rows)	2481	if (0 <= y + my && y + my < self->rows)
2464	{	2482	{
…		…
2708	else	2726	else
2709	*data++ = 0;	2727	*data++ = 0;
2710	}	2728	}
2711	}	2729	}
2712		2730
2713	/* if size is wh + 5 then no data has been found /	2731	/* if size is wh + 5 then no data has been found /
2714	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)	2732	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
2715	{	2733	{
2716	SvPOK_only (data_sv);	2734	SvPOK_only (data_sv);
2717	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2735	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2718	}	2736	}
2719		2737
2720	RETVAL = data_sv;	2738	RETVAL = data_sv;
2721	}	2739	}
2722	OUTPUT:	2740	OUTPUT:
2723	RETVAL	2741	RETVAL
2724		2742
2725	void	2743	void
…		…
2732	STRLEN len;	2750	STRLEN len;
2733	uint8_t data, end;	2751	uint8_t data, end;
2734		2752
2735	len = SvLEN (data_sv);	2753	len = SvLEN (data_sv);
2736	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more	2754	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2737	data = SvPVbyte_nolen (data_sv);	2755	data = (uint8_t *)SvPVbyte_nolen (data_sv);
2738	end = data + len + 8;	2756	end = data + len + 8;
2739		2757
2740	if (len < 5)	2758	if (len < 5)
2741	XSRETURN_EMPTY;	2759	XSRETURN_EMPTY;
2742		2760
…		…
2803	}	2821	}
2804		2822
2805	MODULE = Deliantra::Client PACKAGE = DC::RW	2823	MODULE = Deliantra::Client PACKAGE = DC::RW
2806		2824
2807	DC::RW	2825	DC::RW
2808	new (SV class, SV data_sv)	2826	new (SV klass, SV data_sv)
2809	CODE:	2827	CODE:
2810	{	2828	{
2811	STRLEN datalen;	2829	STRLEN datalen;
2812	char *data = SvPVbyte (data_sv, datalen);	2830	char *data = SvPVbyte (data_sv, datalen);
2813		2831
…		…
2815	}	2833	}
2816	OUTPUT:	2834	OUTPUT:
2817	RETVAL	2835	RETVAL
2818		2836
2819	DC::RW	2837	DC::RW
2820	new_from_file (SV class, const char path, const char *mode = "rb")	2838	new_from_file (SV klass, const char path, const char *mode = "rb")
2821	CODE:	2839	CODE:
2822	RETVAL = SDL_RWFromFile (path, mode);	2840	RETVAL = SDL_RWFromFile (path, mode);
2823	OUTPUT:	2841	OUTPUT:
2824	RETVAL	2842	RETVAL
2825		2843
…		…
2934	#else	2952	#else
2935	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));	2953	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2936	#endif	2954	#endif
2937		2955
2938	DC::MixChunk	2956	DC::MixChunk
2939	new (SV *class, DC::RW rwops)	2957	new (SV *klass, DC::RW rwops)
2940	CODE:	2958	CODE:
2941	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2959	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2942	OUTPUT:	2960	OUTPUT:
2943	RETVAL	2961	RETVAL
2944		2962
…		…
3014	RETVAL = Mix_PlayingMusic ();	3032	RETVAL = Mix_PlayingMusic ();
3015	OUTPUT:	3033	OUTPUT:
3016	RETVAL	3034	RETVAL
3017		3035
3018	DC::MixMusic	3036	DC::MixMusic
3019	new (SV *class, DC::RW rwops)	3037	new (SV *klass, DC::RW rwops)
3020	CODE:	3038	CODE:
3021	RETVAL = Mix_LoadMUS_RW (rwops);	3039	RETVAL = Mix_LoadMUS_RW (rwops);
3022	OUTPUT:	3040	OUTPUT:
3023	RETVAL	3041	RETVAL
3024		3042
…		…
3177	gl.BlendFuncSeparateEXT = 0;	3195	gl.BlendFuncSeparateEXT = 0;
3178		3196
3179	void	3197	void
3180	apple_nvidia_bug (int enable)	3198	apple_nvidia_bug (int enable)
3181		3199
3182	char *	3200	const char *
3183	gl_vendor ()	3201	gl_vendor ()
3184	CODE:	3202	CODE:
3185	RETVAL = (char *)glGetString (GL_VENDOR);	3203	RETVAL = (const char *)glGetString (GL_VENDOR);
3186	OUTPUT:	3204	OUTPUT:
3187	RETVAL	3205	RETVAL
3188		3206
3189	char *	3207	const char *
3190	gl_version ()	3208	gl_version ()
3191	CODE:	3209	CODE:
3192	RETVAL = (char *)glGetString (GL_VERSION);	3210	RETVAL = (const char *)glGetString (GL_VERSION);
3193	OUTPUT:	3211	OUTPUT:
3194	RETVAL	3212	RETVAL
3195		3213
3196	char *	3214	const char *
3197	gl_extensions ()	3215	gl_extensions ()
3198	CODE:	3216	CODE:
3199	RETVAL = (char *)glGetString (GL_EXTENSIONS);	3217	RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3200	OUTPUT:	3218	OUTPUT:
3201	RETVAL	3219	RETVAL
3202		3220
3203	const char *glGetString (GLenum pname)	3221	const char *glGetString (GLenum pname)
		3222	CODE:
		3223	RETVAL = (const char *)glGetString (pname);
		3224	OUTPUT:
		3225	RETVAL
3204		3226
3205	GLint glGetInteger (GLenum pname)	3227	GLint glGetInteger (GLenum pname)
3206	CODE:	3228	CODE:
3207	glGetIntegerv (pname, &RETVAL);	3229	glGetIntegerv (pname, &RETVAL);
3208	OUTPUT:	3230	OUTPUT:
…		…
3411		3433
3412	void	3434	void
3413	find_widget (SV *self, NV x, NV y)	3435	find_widget (SV *self, NV x, NV y)
3414	PPCODE:	3436	PPCODE:
3415	{	3437	{
3416	if (within_widget (self, x, y))	3438	if (within_widget (self, x, y))
3417	XPUSHs (self);	3439	XPUSHs (self);
3418	}	3440	}
3419		3441
3420	BOOT:	3442	BOOT:
3421	{	3443	{
…		…
3429		3451
3430	void	3452	void
3431	draw (SV *self)	3453	draw (SV *self)
3432	CODE:	3454	CODE:
3433	{	3455	{
3434	HV *hv;	3456	HV *hv;
3435	SV **svp;	3457	SV **svp;
3436	NV x, y, w, h;	3458	NV x, y, w, h;
3437	SV *draw_x_sv = GvSV (draw_x_gv);	3459	SV *draw_x_sv = GvSV (draw_x_gv);
3438	SV *draw_y_sv = GvSV (draw_y_gv);	3460	SV *draw_y_sv = GvSV (draw_y_gv);
3439	SV *draw_w_sv = GvSV (draw_w_gv);	3461	SV *draw_w_sv = GvSV (draw_w_gv);
3440	SV *draw_h_sv = GvSV (draw_h_gv);	3462	SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs. Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.310 by root, Tue Dec 27 07:23:33 2011 UTC vs.
Revision 1.330 by root, Sun Nov 18 15:24:24 2018 UTC