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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
6	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
7	#endif	9	#endif
8		10
9	#include "EXTERN.h"	11	#include "EXTERN.h"
10	#include "perl.h"	12	#include "perl.h"
11	#include "XSUB.h"	13	#include "XSUB.h"
12		14
13	#ifdef _WIN32	15	#ifdef _WIN32
14	# undef pipe	16	# undef pipe
15	#endif	17	#endif
16		18
		19	#include <assert.h>
17	#include <math.h>	20	#include <math.h>
18	#include <string.h>	21	#include <string.h>
19	#include <stdio.h>	22	#include <stdio.h>
20	#include <stdlib.h>	23	#include <stdlib.h>
21		24
36	# include <sys/types.h>	39	# include <sys/types.h>
37	# include <sys/socket.h>	40	# include <sys/socket.h>
38	# include <netinet/in.h>	41	# include <netinet/in.h>
39	# include <netinet/tcp.h>	42	# include <netinet/tcp.h>
40	# include <inttypes.h>	43	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	44	#endif
49		45
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	46	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		47
52	#define FOW_DARKNESS 32	48	#define FOW_DARKNESS 32
53		49
54	#define MAP_EXTEND_X 32	50	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	51	#define MAP_EXTEND_Y 512
…		…
60	# define PARACHUTE SDL_INIT_NOPARACHUTE	56	# define PARACHUTE SDL_INIT_NOPARACHUTE
61	#else	57	#else
62	# define PARACHUTE 0	58	# define PARACHUTE 0
63	#endif	59	#endif
64		60
		61	static AV *texture_av;
		62
65	static struct	63	static struct
66	{	64	{
67	#define GL_FUNC(ptr,name) ptr name;	65	#define GL_FUNC(ptr,name) ptr name;
68	#include "glfunc.h"	66	#include "glfunc.h"
69	#undef GL_FUNC	67	#undef GL_FUNC
70	} gl;	68	} gl;
71		69
		70	static void
72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	71	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73	{	72	{
74	if (gl.BlendFuncSeparate)	73	if (gl.BlendFuncSeparate)
75	gl.BlendFuncSeparate (sa, da, saa, daa);	74	gl.BlendFuncSeparate (sa, da, saa, daa);
76	else if (gl.BlendFuncSeparateEXT)	75	else if (gl.BlendFuncSeparateEXT)
77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	76	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78	else	77	else
79	glBlendFunc (sa, da);	78	glBlendFunc (sa, da);
80	}	79	}
81		80
		81	static GLuint
		82	gen_texture ()
		83	{
		84	GLuint name;
		85
		86	if (AvFILL (texture_av) >= 0)
		87	name = (GLuint)(size_t)av_pop (texture_av);
		88	else
		89	glGenTextures (1, &name);
		90
		91	return name;
		92	}
		93
		94	static void
		95	del_texture (GLuint name)
		96	{
		97	/* make a half-assed attempt at returning the memory used by the texture */
		98	/* textures are frequently being reused by cfplus anyway */
		99	/glBindTexture (GL_TEXTURE_2D, name);/
		100	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		101	av_push (texture_av, (SV *)(size_t)name);
		102	glDeleteTextures (1, &name);
		103	}
		104
82	#include "texcache.c"	105	#include "texcache.c"
83		106
84	#include "pango-font.c"	107	#include "pango-font.c"
85	#include "pango-fontmap.c"	108	#include "pango-fontmap.c"
86	#include "pango-render.c"	109	#include "pango-render.c"
…		…
155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;	178	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156		179
157	if (!rect.width) rect.width = 1;	180	if (!rect.width) rect.width = 1;
158	if (!rect.height) rect.height = 1;	181	if (!rect.height) rect.height = 1;
159		182
160	rect.width = (rect.width + 3) & ~3;
161
162	*w = rect.width;	183	*w = rect.width;
163	*h = rect.height;	184	*h = rect.height;
164	}	185	}
165		186
		187	typedef uint16_t tileid;
166	typedef uint16_t mapface;	188	typedef uint16_t faceid;
167		189
168	typedef struct {	190	typedef struct {
169	GLint name;	191	int name;
170	int w, h;	192	int w, h;
171	float s, t;	193	float s, t;
172	uint8_t r, g, b, a;	194	uint8_t r, g, b, a;
		195	tileid smoothtile;
		196	uint8_t smoothlevel;
173	} maptex;	197	} maptex;
174		198
175	typedef struct {	199	typedef struct {
		200	uint32_t player;
		201	tileid tile[3];
176	int16_t darkness;	202	uint16_t darkness;
177	mapface face[3];	203	uint8_t stat_width, stat_hp, flags, smoothmax;
178	} mapcell;	204	} mapcell;
179		205
180	typedef struct {	206	typedef struct {
181	int32_t c0, c1;	207	int32_t c0, c1;
182	mapcell *col;	208	mapcell *col;
183	} maprow;	209	} maprow;
184		210
185	typedef struct map {	211	typedef struct map {
186	int x, y, w, h;	212	int x, y, w, h;
187	int ox, oy; /* offset to virtual global coordinate system */	213	int ox, oy; /* offset to virtual global coordinate system */
188	int faces;	214	int faces; tileid *face2tile; // [faceid]
189	mapface *face;	215	int texs; maptex *tex; // [tileid]
190
191	int texs;
192	maptex *tex;
193		216
194	int32_t rows;	217	int32_t rows;
195	maprow *row;	218	maprow *row;
196	} *CFPlus__Map;	219	} *CFPlus__Map;
197		220
…		…
217	return ptr;	240	return ptr;
218	}	241	}
219		242
220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	243	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	244	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		245
		246	static void
		247	need_facenum (struct map *self, faceid face)
		248	{
		249	while (self->faces <= face)
		250	{
		251	Append (tileid, self->face2tile, self->faces, self->faces);
		252	self->faces *= 2;
		253	}
		254	}
		255
		256	static void
		257	need_texid (struct map *self, int texid)
		258	{
		259	while (self->texs <= texid)
		260	{
		261	Append (maptex, self->tex, self->texs, self->texs);
		262	self->texs *= 2;
		263	}
		264	}
222		265
223	static maprow *	266	static maprow *
224	map_get_row (CFPlus__Map self, int y)	267	map_get_row (CFPlus__Map self, int y)
225	{	268	{
226	if (0 > y)	269	if (0 > y)
…		…
295	static void	338	static void
296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)	339	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
297	{	340	{
298	int x, y;	341	int x, y;
299	maprow *row;	342	maprow *row;
		343	mapcell *cell;
300		344
301	for (y = y0; y < y0 + h; y++)	345	for (y = y0; y < y0 + h; y++)
302	if (y >= 0)	346	if (y >= 0)
303	{	347	{
304	if (y >= self->rows)	348	if (y >= self->rows)
…		…
310	if (x >= row->c0)	354	if (x >= row->c0)
311	{	355	{
312	if (x >= row->c1)	356	if (x >= row->c1)
313	break;	357	break;
314		358
315	row->col[x - row->c0].darkness = -1;	359	cell = row->col + x - row->c0;
		360
		361	cell->darkness = 0;
		362	cell->stat_hp = 0;
		363	cell->flags = 0;
		364	cell->player = 0;
316	}	365	}
317	}	366	}
		367	}
		368
		369	typedef struct {
		370	tileid tile;
		371	uint8_t x, y, level;
		372	} smooth_key;
		373
		374	static void
		375	smooth_or_bits (HV hv, smooth_key key, IV bits)
		376	{
		377	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		378
		379	if (SvIOK (*sv))
		380	SvIV_set (sv, SvIVX (sv) \| bits);
		381	else
		382	sv_setiv (*sv, bits);
318	}	383	}
319		384
320	static void	385	static void
321	music_finished (void)	386	music_finished (void)
322	{	387	{
…		…
357	n \|= n >> 8;	422	n \|= n >> 8;
358	n \|= n >> 16;	423	n \|= n >> 16;
359		424
360	return n + 1;	425	return n + 1;
361	}	426	}
		427
		428	/* SDL should provide this, really. */
		429	#define SDLK_MODIFIER_MIN 300
		430	#define SDLK_MODIFIER_MAX 314
362		431
363	MODULE = CFPlus PACKAGE = CFPlus	432	MODULE = CFPlus PACKAGE = CFPlus
364		433
365	PROTOTYPES: ENABLE	434	PROTOTYPES: ENABLE
366		435
…		…
370	static const struct {	439	static const struct {
371	const char *name;	440	const char *name;
372	IV iv;	441	IV iv;
373	} *civ, const_iv[] = {	442	} *civ, const_iv[] = {
374	# define const_iv(name) { # name, (IV)name }	443	# define const_iv(name) { # name, (IV)name }
		444	const_iv (SDLK_MODIFIER_MIN),
		445	const_iv (SDLK_MODIFIER_MAX),
		446
375	const_iv (SDL_ACTIVEEVENT),	447	const_iv (SDL_ACTIVEEVENT),
376	const_iv (SDL_KEYDOWN),	448	const_iv (SDL_KEYDOWN),
377	const_iv (SDL_KEYUP),	449	const_iv (SDL_KEYUP),
378	const_iv (SDL_MOUSEMOTION),	450	const_iv (SDL_MOUSEMOTION),
379	const_iv (SDL_MOUSEBUTTONDOWN),	451	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
388	const_iv (SDL_EVENT_RESERVEDA),	460	const_iv (SDL_EVENT_RESERVEDA),
389	const_iv (SDL_EVENT_RESERVEDB),	461	const_iv (SDL_EVENT_RESERVEDB),
390	const_iv (SDL_VIDEORESIZE),	462	const_iv (SDL_VIDEORESIZE),
391	const_iv (SDL_VIDEOEXPOSE),	463	const_iv (SDL_VIDEOEXPOSE),
392	const_iv (SDL_USEREVENT),	464	const_iv (SDL_USEREVENT),
		465
		466	const_iv (SDL_APPINPUTFOCUS),
		467	const_iv (SDL_APPMOUSEFOCUS),
		468	const_iv (SDL_APPACTIVE),
		469
393	const_iv (SDLK_KP0),	470	const_iv (SDLK_KP0),
394	const_iv (SDLK_KP1),	471	const_iv (SDLK_KP1),
395	const_iv (SDLK_KP2),	472	const_iv (SDLK_KP2),
396	const_iv (SDLK_KP3),	473	const_iv (SDLK_KP3),
397	const_iv (SDLK_KP4),	474	const_iv (SDLK_KP4),
…		…
452	const_iv (SDLK_BREAK),	529	const_iv (SDLK_BREAK),
453	const_iv (SDLK_MENU),	530	const_iv (SDLK_MENU),
454	const_iv (SDLK_POWER),	531	const_iv (SDLK_POWER),
455	const_iv (SDLK_EURO),	532	const_iv (SDLK_EURO),
456	const_iv (SDLK_UNDO),	533	const_iv (SDLK_UNDO),
		534
457	const_iv (KMOD_NONE),	535	const_iv (KMOD_NONE),
		536	const_iv (KMOD_SHIFT),
458	const_iv (KMOD_LSHIFT),	537	const_iv (KMOD_LSHIFT),
459	const_iv (KMOD_RSHIFT),	538	const_iv (KMOD_RSHIFT),
		539	const_iv (KMOD_CTRL),
460	const_iv (KMOD_LCTRL),	540	const_iv (KMOD_LCTRL),
461	const_iv (KMOD_RCTRL),	541	const_iv (KMOD_RCTRL),
		542	const_iv (KMOD_ALT),
462	const_iv (KMOD_LALT),	543	const_iv (KMOD_LALT),
463	const_iv (KMOD_RALT),	544	const_iv (KMOD_RALT),
		545	const_iv (KMOD_META),
464	const_iv (KMOD_LMETA),	546	const_iv (KMOD_LMETA),
465	const_iv (KMOD_RMETA),	547	const_iv (KMOD_RMETA),
466	const_iv (KMOD_NUM),	548	const_iv (KMOD_NUM),
467	const_iv (KMOD_CAPS),	549	const_iv (KMOD_CAPS),
468	const_iv (KMOD_MODE),	550	const_iv (KMOD_MODE),
469	const_iv (KMOD_CTRL),
470	const_iv (KMOD_SHIFT),
471	const_iv (KMOD_ALT),
472	const_iv (KMOD_META)
473	# undef const_iv	551	# undef const_iv
474	};	552	};
475		553
476	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	554	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
477	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	555	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		556
		557	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		558	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
478	}	559	}
		560
		561	void
		562	weaken (SV *rv)
		563	PROTOTYPE: $
		564	CODE:
		565	sv_rvweaken (rv);
479		566
480	int	567	int
481	in_destruct ()	568	in_destruct ()
482	CODE:	569	CODE:
483	RETVAL = PL_main_cv == Nullcv;	570	RETVAL = PL_main_cv == Nullcv;
…		…
554	RETVAL = !!SDL_SetVideoMode (	641	RETVAL = !!SDL_SetVideoMode (
555	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	642	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
556	);	643	);
557	if (RETVAL)	644	if (RETVAL)
558	{	645	{
		646	av_clear (texture_av);
		647
559	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	648	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
560	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	649	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
561	# include "glfunc.h"	650	# include "glfunc.h"
562	# undef GL_FUNC	651	# undef GL_FUNC
		652
563	}	653	}
564	OUTPUT:	654	OUTPUT:
565	RETVAL	655	RETVAL
566		656
567	void	657	void
…		…
586	case SDL_KEYDOWN:	676	case SDL_KEYDOWN:
587	case SDL_KEYUP:	677	case SDL_KEYUP:
588	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	678	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
589	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	679	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
590	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	680	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		681	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
591	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	682	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
592	break;	683	break;
593		684
594	case SDL_ACTIVEEVENT:	685	case SDL_ACTIVEEVENT:
595	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	686	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
640	Mix_AllocateChannels (int numchans = -1)	731	Mix_AllocateChannels (int numchans = -1)
641		732
642	void	733	void
643	lowdelay (int fd, int val = 1)	734	lowdelay (int fd, int val = 1)
644	CODE:	735	CODE:
		736	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		737
		738	void
		739	win32_proxy_info ()
		740	PPCODE:
		741	{
645	#ifndef _WIN32	742	#ifdef _WIN32
646	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	743	char buffer[2048];
		744	DWORD buflen;
		745
		746	EXTEND (SP, 3);
		747
		748	buflen = sizeof (buffer);
		749	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		750	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		751	{
		752	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		753
		754	buflen = sizeof (buffer);
		755	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		756	{
		757	PUSHs (newSVpv (buffer, 0));
		758
		759	buflen = sizeof (buffer);
		760	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		761	PUSHs (newSVpv (buffer, 0));
		762	}
		763	}
647	#endif	764	#endif
		765	}
648		766
649	void	767	void
650	add_font (char *file)	768	add_font (char *file)
651	CODE:	769	CODE:
652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	770	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
756	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	874	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
757	#endif	875	#endif
758	_exit (1);	876	_exit (1);
759		877
760	void	878	void
761	_exit (int retval)	879	_exit (int retval = 0)
762	CODE:	880	CODE:
		881	#ifdef WIN32
		882	ExitThread (retval); // unclean, please beam me up
		883	#else
763	_exit (retval);	884	_exit (retval);
		885	#endif
764		886
765	MODULE = CFPlus PACKAGE = CFPlus::Font	887	MODULE = CFPlus PACKAGE = CFPlus::Font
766		888
767	CFPlus::Font	889	CFPlus::Font
768	new_from_file (SV class, char path, int id = 0)	890	new_from_file (SV class, char path, int id = 0)
…		…
1015	xy_to_index (CFPlus::Layout self, int x, int y)	1137	xy_to_index (CFPlus::Layout self, int x, int y)
1016	CODE:	1138	CODE:
1017	{	1139	{
1018	int index, trailing;	1140	int index, trailing;
1019	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1141	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1020	RETVAL = index;	1142	RETVAL = index + trailing;
1021	}	1143	}
1022	OUTPUT:	1144	OUTPUT:
1023	RETVAL	1145	RETVAL
1024		1146
1025	void	1147	void
…		…
1031		1153
1032	EXTEND (SP, 3);	1154	EXTEND (SP, 3);
1033	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1155	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1156	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1157	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1158	}
		1159
		1160	void
		1161	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1162	PPCODE:
		1163	{
		1164	int line, x;
		1165
		1166	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1167	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1168
		1169	EXTEND (SP, 2);
		1170	PUSHs (sv_2mortal (newSViv (line - 1)));
		1171	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1172	}
		1173
		1174	void
		1175	line_x_to_index (CFPlus::Layout self, int line, int x)
		1176	PPCODE:
		1177	{
		1178	PangoLayoutLine *lp;
		1179	int index, trailing;
		1180
		1181	if (line < 0)
		1182	XSRETURN_EMPTY;
		1183
		1184	if (!(lp = pango_layout_get_line (self->pl, line)))
		1185	XSRETURN_EMPTY; /* do better */
		1186
		1187	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1188
		1189	EXTEND (SP, 2);
		1190	if (GIMME_V == G_SCALAR)
		1191	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1192	else
		1193	{
		1194	PUSHs (sv_2mortal (newSViv (index)));
		1195	PUSHs (sv_2mortal (newSViv (trailing)));
		1196	}
1036	}	1197	}
1037		1198
1038	void	1199	void
1039	render (CFPlus::Layout self, float x, float y, int flags = 0)	1200	render (CFPlus::Layout self, float x, float y, int flags = 0)
1040	PPCODE:	1201	PPCODE:
…		…
1134	}	1295	}
1135		1296
1136	MODULE = CFPlus PACKAGE = CFPlus::Map	1297	MODULE = CFPlus PACKAGE = CFPlus::Map
1137		1298
1138	CFPlus::Map	1299	CFPlus::Map
1139	new (SV *class, int map_width, int map_height)	1300	new (SV *class)
1140	CODE:	1301	CODE:
1141	New (0, RETVAL, 1, struct map);	1302	New (0, RETVAL, 1, struct map);
1142	RETVAL->x = 0;	1303	RETVAL->x = 0;
1143	RETVAL->y = 0;	1304	RETVAL->y = 0;
1144	RETVAL->w = map_width;	1305	RETVAL->w = 0;
1145	RETVAL->h = map_height;	1306	RETVAL->h = 0;
1146	RETVAL->ox = 0;	1307	RETVAL->ox = 0;
1147	RETVAL->oy = 0;	1308	RETVAL->oy = 0;
1148	RETVAL->faces = 8192;	1309	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1149	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1310	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1150	RETVAL->texs = 8192;
1151	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1152	RETVAL->rows = 0;	1311	RETVAL->rows = 0;
1153	RETVAL->row = 0;	1312	RETVAL->row = 0;
1154	OUTPUT:	1313	OUTPUT:
1155	RETVAL	1314	RETVAL
1156		1315
1157	void	1316	void
1158	DESTROY (CFPlus::Map self)	1317	DESTROY (CFPlus::Map self)
1159	CODE:	1318	CODE:
1160	{	1319	{
1161	map_clear (self);	1320	map_clear (self);
1162	Safefree (self->face);	1321	Safefree (self->face2tile);
1163	Safefree (self->tex);	1322	Safefree (self->tex);
1164	Safefree (self);	1323	Safefree (self);
1165	}	1324	}
1166		1325
1167	void	1326	void
		1327	resize (CFPlus::Map self, int map_width, int map_height)
		1328	CODE:
		1329	self->w = map_width;
		1330	self->h = map_height;
		1331
		1332	void
1168	clear (CFPlus::Map self)	1333	clear (CFPlus::Map self)
1169	CODE:	1334	CODE:
1170	map_clear (self);	1335	map_clear (self);
1171		1336
1172	void	1337	void
1173	set_face (CFPlus::Map self, int face, int texid)	1338	set_tileid (CFPlus::Map self, int face, int tile)
1174	CODE:	1339	CODE:
1175	{	1340	{
1176	while (self->faces <= face)	1341	need_facenum (self, face); self->face2tile [face] = tile;
1177	{	1342	need_texid (self, tile);
1178	Append (mapface, self->face, self->faces, self->faces);	1343	}
1179	self->faces *= 2;
1180	}
1181		1344
1182	self->face [face] = texid;	1345	void
		1346	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1347	CODE:
		1348	{
		1349	tileid texid;
		1350	maptex *tex;
		1351
		1352	if (face < 0 \|\| face >= self->faces)
		1353	return;
		1354
		1355	if (smooth < 0 \|\| smooth >= self->faces)
		1356	return;
		1357
		1358	texid = self->face2tile [face];
		1359
		1360	if (!texid)
		1361	return;
		1362
		1363	tex = self->tex + texid;
		1364	tex->smoothtile = self->face2tile [smooth];
		1365	tex->smoothlevel = level;
1183	}	1366	}
1184		1367
1185	void	1368	void
1186	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1369	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1187	CODE:	1370	CODE:
1188	{	1371	{
1189	while (self->texs <= texid)	1372	need_texid (self, texid);
1190	{
1191	Append (maptex, self->tex, self->texs, self->texs);
1192	self->texs *= 2;
1193	}
1194		1373
1195	{	1374	{
1196	maptex *tex = self->tex + texid;	1375	maptex *tex = self->tex + texid;
1197		1376
1198	tex->name = name;	1377	tex->name = name;
…		…
1240	void	1419	void
1241	scroll (CFPlus::Map self, int dx, int dy)	1420	scroll (CFPlus::Map self, int dx, int dy)
1242	CODE:	1421	CODE:
1243	{	1422	{
1244	if (dx > 0)	1423	if (dx > 0)
1245	map_blank (self, self->x, self->y, dx - 1, self->h);	1424	map_blank (self, self->x, self->y, dx, self->h);
1246	else if (dx < 0)	1425	else if (dx < 0)
1247	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1426	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1248		1427
1249	if (dy > 0)	1428	if (dy > 0)
1250	map_blank (self, self->x, self->y, self->w, dy - 1);	1429	map_blank (self, self->x, self->y, self->w, dy);
1251	else if (dy < 0)	1430	else if (dy < 0)
1252	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1431	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1253		1432
1254	self->ox += dx; self->x += dx;	1433	self->ox += dx; self->x += dx;
1255	self->oy += dy; self->y += dy;	1434	self->oy += dy; self->y += dy;
1256		1435
1257	while (self->y < 0)	1436	while (self->y < 0)
…		…
1262	self->y += MAP_EXTEND_Y;	1441	self->y += MAP_EXTEND_Y;
1263	}	1442	}
1264	}	1443	}
1265		1444
1266	void	1445	void
1267	map1a_update (CFPlus::Map self, SV *data_)	1446	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1268	CODE:	1447	CODE:
1269	{	1448	{
1270	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1449	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1271	uint8_t data_end = (uint8_t )SvEND (data_);	1450	uint8_t data_end = (uint8_t )SvEND (data_);
1272	mapcell *cell;	1451	mapcell *cell;
1273	int x, y, flags;	1452	int x, y, flags;
1274		1453
1275	while (data < data_end)	1454	while (data < data_end - 1)
1276	{	1455	{
1277	flags = (data [0] << 8) + data [1]; data += 2;	1456	flags = (data [0] << 8) + data [1]; data += 2;
1278		1457
1279	x = self->x + ((flags >> 10) & 63);	1458	x = self->x + ((flags >> 10) & 63);
1280	y = self->y + ((flags >> 4) & 63);	1459	y = self->y + ((flags >> 4) & 63);
1281		1460
1282	cell = map_get_cell (self, x, y);	1461	cell = map_get_cell (self, x, y);
1283		1462
1284	if (flags & 15)	1463	if (flags & 15)
1285	{	1464	{
1286	if (cell->darkness < 0)	1465	if (!cell->darkness)
1287	{	1466	{
		1467	memset (cell, 0, sizeof (*cell));
1288	cell->darkness = 0;	1468	cell->darkness = 256;
1289	cell->face [0] = 0;
1290	cell->face [1] = 0;
1291	cell->face [2] = 0;
1292	}	1469	}
1293		1470
1294	cell->darkness = flags & 8 ? *data++ : 255;
1295
1296	//TODO: don't trust server data to be in-range(!)	1471	//TODO: don't trust server data to be in-range(!)
		1472
		1473	if (flags & 8)
		1474	{
		1475	if (extmap)
		1476	{
		1477	uint8_t ext, cmd;
		1478
		1479	do
		1480	{
		1481	ext = *data++;
		1482	cmd = ext & 0x3f;
		1483
		1484	if (cmd < 4)
		1485	cell->darkness = 255 - ext * 64 + 1;
		1486	else if (cmd == 5) // health
		1487	{
		1488	cell->stat_width = 1;
		1489	cell->stat_hp = *data++;
		1490	}
		1491	else if (cmd == 6) // monster width
		1492	cell->stat_width = *data++ + 1;
		1493	else if (cmd == 0x47)
		1494	{
		1495	if (*data == 4)
		1496	; // decode player count
		1497
		1498	data += *data + 1;
		1499	}
		1500	else if (cmd == 8) // cell flags
		1501	cell->flags = *data++;
		1502	else if (ext & 0x40) // unknown, multibyte => skip
		1503	data += *data + 1;
		1504	else
		1505	data++;
		1506	}
		1507	while (ext & 0x80);
		1508	}
		1509	else
		1510	cell->darkness = *data++ + 1;
		1511	}
1297		1512
1298	if (flags & 4)	1513	if (flags & 4)
1299	{	1514	{
1300	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1515	faceid face = (data [0] << 8) + data [1]; data += 2;
		1516	need_facenum (self, face);
		1517	cell->tile [0] = self->face2tile [face];
1301	}	1518	}
1302		1519
1303	if (flags & 2)	1520	if (flags & 2)
1304	{	1521	{
1305	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1522	faceid face = (data [0] << 8) + data [1]; data += 2;
		1523	need_facenum (self, face);
		1524	cell->tile [1] = self->face2tile [face];
1306	}	1525	}
1307		1526
1308	if (flags & 1)	1527	if (flags & 1)
1309	{	1528	{
1310	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1529	faceid face = (data [0] << 8) + data [1]; data += 2;
		1530	need_facenum (self, face);
		1531	cell->tile [2] = self->face2tile [face];
1311	}	1532	}
1312	}	1533	}
1313	else	1534	else
1314	cell->darkness = -1;	1535	cell->darkness = 0;
1315	}	1536	}
1316	}	1537	}
1317		1538
1318	SV *	1539	SV *
1319	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1540	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
…		…
1345	{	1566	{
1346	mapcell *cell = row->col + (x - row->c0);	1567	mapcell *cell = row->col + (x - row->c0);
1347		1568
1348	for (z = 0; z <= 0; z++)	1569	for (z = 0; z <= 0; z++)
1349	{	1570	{
1350	mapface face = cell->face [z];
1351
1352	if (face)
1353	{
1354	maptex tex = self->tex [face];	1571	maptex tex = self->tex [cell->tile [z]];
1355	int a0 = 255 - tex.a;	1572	int a0 = 255 - tex.a;
1356	int a1 = tex.a;	1573	int a1 = tex.a;
1357		1574
1358	r = (r * a0 + tex.r * a1) / 255;	1575	r = (r * a0 + tex.r * a1) / 255;
1359	g = (g * a0 + tex.g * a1) / 255;	1576	g = (g * a0 + tex.g * a1) / 255;
1360	b = (b * a0 + tex.b * a1) / 255;	1577	b = (b * a0 + tex.b * a1) / 255;
1361	a = (a * a0 + tex.a * a1) / 255;	1578	a = (a * a0 + tex.a * a1) / 255;
1362	}
1363	}	1579	}
1364	}	1580	}
1365		1581
1366	*map++ = (r )	1582	*map++ = (r )
1367	\| (g << 8)	1583	\| (g << 8)
…		…
1374	}	1590	}
1375	OUTPUT:	1591	OUTPUT:
1376	RETVAL	1592	RETVAL
1377		1593
1378	void	1594	void
1379	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1595	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1380	CODE:	1596	CODE:
1381	{	1597	{
1382	int vx, vy;	1598	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1599	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1600	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1601	smooth_key skey;
1383	int x, y, z;	1602	int x, y, z;
1384	int last_name;	1603	int last_name;
1385	mapface face;
1386		1604
1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1605	// thats current max. sorry.
1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1606	if (sw > 255) sw = 255;
		1607	if (sh > 255) sh = 255;
1389		1608
1390	/*	1609	// clear key, in case of extra padding
1391	int vx = self->vx = self->w >= sw	1610	memset (&skey, 0, sizeof (skey));
1392	? self->x + (self->w - sw) / 2
1393	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1394
1395	int vy = self->vy = self->h >= sh
1396	? self->y + (self->h - sh) / 2
1397	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1398	*/
1399		1611
1400	glColor4ub (255, 255, 255, 255);	1612	glColor4ub (255, 255, 255, 255);
1401		1613
1402	glEnable (GL_BLEND);	1614	glEnable (GL_BLEND);
1403	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1615	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1406		1618
1407	glBegin (GL_QUADS);	1619	glBegin (GL_QUADS);
1408		1620
1409	last_name = 0;	1621	last_name = 0;
1410		1622
		1623	mx += self->x;
		1624	my += self->y;
		1625
		1626	// first pass: determine smooth_max
		1627	// rather ugly, if you ask me
		1628	// could also be stored inside mapcell and updated on change
		1629	memset (smooth_max, 0, sizeof (smooth_max));
		1630
		1631	for (y = 0; y < sh; y++)
		1632	if (0 <= y + my && y + my < self->rows)
		1633	{
		1634	maprow *row = self->row + (y + my);
		1635
		1636	for (x = 0; x < sw; x++)
		1637	if (row->c0 <= x + mx && x + mx < row->c1)
		1638	{
		1639	mapcell *cell = row->col + (x + mx - row->c0);
		1640
		1641	smooth_max[x + 1][y + 1] =
		1642	MAX (self->tex [cell->tile [0]].smoothlevel,
		1643	MAX (self->tex [cell->tile [1]].smoothlevel,
		1644	self->tex [cell->tile [2]].smoothlevel));
		1645	}
		1646	}
		1647
1411	for (z = 0; z < 3; z++)	1648	for (z = 0; z <= 2; z++)
		1649	{
		1650	memset (smooth_level, 0, sizeof (smooth_level));
		1651
1412	for (y = 0; y < sh; y++)	1652	for (y = 0; y < sh; y++)
1413	if (0 <= y + vy && y + vy < self->rows)	1653	if (0 <= y + my && y + my < self->rows)
1414	{	1654	{
1415	maprow *row = self->row + (y + vy);	1655	maprow *row = self->row + (y + my);
1416		1656
1417	for (x = 0; x < sw; x++)	1657	for (x = 0; x < sw; x++)
1418	if (row->c0 <= x + vx && x + vx < row->c1)	1658	if (row->c0 <= x + mx && x + mx < row->c1)
1419	{	1659	{
1420	mapcell *cell = row->col + (x + vx - row->c0);	1660	mapcell *cell = row->col + (x + mx - row->c0);
1421
1422	face = cell->face [z];	1661	tileid tile = cell->tile [z];
1423		1662
1424	if (face)	1663	if (tile)
		1664	{
		1665	maptex tex = self->tex [tile];
		1666	int px = (x + 1) * T - tex.w;
		1667	int py = (y + 1) * T - tex.h;
		1668
		1669	// suppressing texture state switches here
		1670	// is only moderately effective, but worth the extra effort
		1671	if (last_name != tex.name)
		1672	{
		1673	if (!tex.name)
		1674	tex = self->tex [2]; /* missing, replace by noface */
		1675
		1676	glEnd ();
		1677	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1678	glBegin (GL_QUADS);
		1679	}
		1680
		1681	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1682	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1683	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1684	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1685
		1686	if (cell->flags && z == 2)
		1687	{
		1688	if (cell->flags & 1)
		1689	{
		1690	maptex tex = self->tex [1];
		1691	int px = x * T + T * 2 / 32;
		1692	int py = y * T - T * 6 / 32;
		1693
		1694	glEnd ();
		1695	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1696	glBegin (GL_QUADS);
		1697
		1698	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1699	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1700	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1701	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1702	}
		1703	}
		1704
		1705	// update smooth hash
		1706	if (tex.smoothtile)
		1707	{
		1708	skey.tile = tex.smoothtile;
		1709	skey.level = tex.smoothlevel;
		1710
		1711	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1712
		1713	// add bits to current tile and all neighbours. skey.x\|y is
		1714	// shifted +1\|+1 so we always stay positive.
		1715
		1716	// bits is ___n cccc CCCC bbbb
		1717	// n do not draw borders&corners
		1718	// c draw these corners, but...
		1719	// C ... not these
		1720	// b draw these borders
		1721
		1722	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1723	// ┃· ·· ·┃ ━━
		1724
		1725	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1726	// ·· ·· ·┏ ┓·
		1727
		1728	// full tile
		1729	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1730
		1731	// borders
		1732	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1733	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1734	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1735	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1736
		1737	// corners
		1738	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1739	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1740	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1741	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1742	}
		1743	}
		1744	}
		1745	}
		1746
		1747	// go through all smoothlevels, lowest to highest, then draw.
		1748	// this is basically counting sort
		1749	{
		1750	int w, b;
		1751
		1752	for (w = 0; w < 256 / 32; ++w)
		1753	{
		1754	uint32_t smask = smooth_level [w];
		1755	if (smask)
		1756	for (b = 0; b < 32; ++b)
		1757	if (smask & (((uint32_t)1) << b))
1425	{	1758	{
1426	maptex tex = self->tex [face];	1759	int level = (w << 5) \| b;
		1760	HE *he;
1427		1761
1428	int px = (x + 1) * 32 - tex.w;	1762	hv_iterinit (smooth);
1429	int py = (y + 1) * 32 - tex.h;	1763	while ((he = hv_iternext (smooth)))
1430
1431	if (last_name != tex.name)
1432	{	1764	{
		1765	smooth_key skey = (smooth_key )HeKEY (he);
		1766	IV bits = SvIVX (HeVAL (he));
		1767
		1768	if (!(bits & 0x1000)
		1769	&& skey->level == level
		1770	&& level > smooth_max [skey->x][skey->y])
		1771	{
		1772	maptex tex = self->tex [skey->tile];
		1773	int px = (((int)skey->x) - 1) * T;
		1774	int py = (((int)skey->y) - 1) * T;
		1775	int border = bits & 15;
		1776	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1777	float dx = tex.s * .0625f; // 16 images/row
		1778	float dy = tex.t * .5f ; // 2 images/column
		1779
		1780	// this time naively avoiding texture state changes
		1781	// save gobs of state changes.
		1782	if (last_name != tex.name)
		1783	{
		1784	if (!tex.name)
		1785	continue; // smoothing not yet available
		1786
1433	glEnd ();	1787	glEnd ();
1434	last_name = tex.name;
1435	glBindTexture (GL_TEXTURE_2D, last_name);	1788	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1436	glBegin (GL_QUADS);	1789	glBegin (GL_QUADS);
		1790	}
		1791
		1792	if (border)
		1793	{
		1794	float ox = border * dx;
		1795
		1796	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1797	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1798	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1799	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1800	}
		1801
		1802	if (corner)
		1803	{
		1804	float ox = corner * dx;
		1805
		1806	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1807	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1808	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1809	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1810	}
		1811	}
1437	}	1812	}
1438
1439	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1442	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443	}	1813	}
1444	}
1445	}	1814	}
		1815	}
		1816
		1817	hv_clear (smooth);
		1818	}
1446		1819
1447	glEnd ();	1820	glEnd ();
1448		1821
1449	glDisable (GL_TEXTURE_2D);	1822	glDisable (GL_TEXTURE_2D);
1450	glDisable (GL_BLEND);	1823	glDisable (GL_BLEND);
		1824
		1825	// top layer: overlays such as the health bar
		1826	for (y = 0; y < sh; y++)
		1827	if (0 <= y + my && y + my < self->rows)
		1828	{
		1829	maprow *row = self->row + (y + my);
		1830
		1831	for (x = 0; x < sw; x++)
		1832	if (row->c0 <= x + mx && x + mx < row->c1)
		1833	{
		1834	mapcell *cell = row->col + (x + mx - row->c0);
		1835
		1836	int px = x * T;
		1837	int py = y * T;
		1838
		1839	if (cell->stat_hp)
		1840	{
		1841	int width = cell->stat_width * T;
		1842	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
		1843
		1844	glColor3ub (0, 0, 0);
		1845	glRectf (px + 1, py - thick - 2,
		1846	px + width - 1, py);
		1847
		1848	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1849	glRectf (px + 2,
		1850	py - thick - 1,
		1851	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1852	}
		1853	}
		1854	}
1451	}	1855	}
1452		1856
1453	void	1857	void
1454	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	1858	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1455	CODE:	1859	CODE:
…		…
1509	glDisable (GL_BLEND);	1913	glDisable (GL_BLEND);
1510	glDisable (GL_TEXTURE_2D);	1914	glDisable (GL_TEXTURE_2D);
1511	}	1915	}
1512		1916
1513	void	1917	void
1514	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1918	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1515	PPCODE:	1919	PPCODE:
1516	{	1920	{
1517	int vx, vy;
1518	int x, y;	1921	int x, y;
1519	int sw4 = (sw + 3) & ~3;	1922	int sw4 = (sw + 3) & ~3;
1520	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1923	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1521	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1924	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1522		1925
1523	memset (darkness, 255, sw4 * sh);	1926	memset (darkness, 255, sw4 * sh);
1524	SvPOK_only (darkness_sv);	1927	SvPOK_only (darkness_sv);
1525	SvCUR_set (darkness_sv, sw4 * sh);	1928	SvCUR_set (darkness_sv, sw4 * sh);
1526		1929
1527	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1930	mx += self->x;
1528	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1931	my += self->y;
1529		1932
1530	for (y = 0; y < sh; y++)	1933	for (y = 0; y < sh; y++)
1531	if (0 <= y + vy && y + vy < self->rows)	1934	if (0 <= y + my && y + my < self->rows)
1532	{	1935	{
1533	maprow *row = self->row + (y + vy);	1936	maprow *row = self->row + (y + my);
1534		1937
1535	for (x = 0; x < sw; x++)	1938	for (x = 0; x < sw; x++)
1536	if (row->c0 <= x + vx && x + vx < row->c1)	1939	if (row->c0 <= x + mx && x + mx < row->c1)
1537	{	1940	{
1538	mapcell *cell = row->col + (x + vx - row->c0);	1941	mapcell *cell = row->col + (x + mx - row->c0);
1539		1942
1540	darkness[y * sw4 + x] = cell->darkness < 0	1943	darkness[y * sw4 + x] = cell->darkness
		1944	? 255 - (cell->darkness - 1)
1541	? 255 - FOW_DARKNESS	1945	: 255 - FOW_DARKNESS;
1542	: 255 - cell->darkness;
1543	}	1946	}
1544	}	1947	}
1545		1948
1546	EXTEND (SP, 3);	1949	EXTEND (SP, 3);
1547	PUSHs (sv_2mortal (newSViv (sw4)));	1950	PUSHs (sv_2mortal (newSViv (sw4)));
…		…
1583	if (row && row->c0 <= x && x < row->c1)	1986	if (row && row->c0 <= x && x < row->c1)
1584	{	1987	{
1585	mapcell *cell = row->col + (x - row->c0);	1988	mapcell *cell = row->col + (x - row->c0);
1586	uint8_t flags = 0;	1989	uint8_t flags = 0;
1587		1990
1588	if (cell->face [0]) flags \|= 1;	1991	if (cell->tile [0]) flags \|= 1;
1589	if (cell->face [1]) flags \|= 2;	1992	if (cell->tile [1]) flags \|= 2;
1590	if (cell->face [2]) flags \|= 4;	1993	if (cell->tile [2]) flags \|= 4;
1591		1994
1592	*data++ = flags;	1995	*data++ = flags;
1593		1996
1594	if (flags & 1)	1997	if (flags & 1)
1595	{	1998	{
		1999	tileid tile = cell->tile [0];
1596	*data++ = cell->face [0] >> 8;	2000	*data++ = tile >> 8;
1597	*data++ = cell->face [0];	2001	*data++ = tile;
1598	}	2002	}
1599		2003
1600	if (flags & 2)	2004	if (flags & 2)
1601	{	2005	{
		2006	tileid tile = cell->tile [1];
1602	*data++ = cell->face [1] >> 8;	2007	*data++ = tile >> 8;
1603	*data++ = cell->face [1];	2008	*data++ = tile;
1604	}	2009	}
1605		2010
1606	if (flags & 4)	2011	if (flags & 4)
1607	{	2012	{
		2013	tileid tile = cell->tile [2];
1608	*data++ = cell->face [2] >> 8;	2014	*data++ = tile >> 8;
1609	*data++ = cell->face [2];	2015	*data++ = tile;
1610	}	2016	}
1611	}	2017	}
1612	else	2018	else
1613	*data++ = 0;	2019	*data++ = 0;
1614	}	2020	}
…		…
1654	{	2060	{
1655	uint8_t flags = *data++;	2061	uint8_t flags = *data++;
1656		2062
1657	if (flags)	2063	if (flags)
1658	{	2064	{
1659	mapface face[3] = { 0, 0, 0 };
1660
1661	mapcell *cell = row_get_cell (row, x);	2065	mapcell *cell = row_get_cell (row, x);
		2066	tileid tile[3] = { 0, 0, 0 };
1662		2067
1663	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2068	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1664	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2069	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1665	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2070	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1666		2071
1667	if (cell->darkness <= 0)	2072	if (cell->darkness == 0)
1668	{	2073	{
1669	cell->darkness = -1;	2074	cell->darkness = 0;
1670		2075
1671	for (z = 0; z <= 2; z++)	2076	for (z = 0; z <= 2; z++)
1672	{	2077	{
1673	cell->face[z] = face[z];	2078	tileid t = tile [z];
1674		2079
1675	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2080	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2081	{
1676	XPUSHs (sv_2mortal (newSViv (face[z])));	2082	XPUSHs (sv_2mortal (newSViv (t)));
		2083	need_texid (self, t);
		2084	}
		2085
		2086	cell->tile [z] = t;
1677	}	2087	}
1678	}	2088	}
1679	}	2089	}
1680	}	2090	}
1681	}	2091	}
…		…
1830	# undef const_iv	2240	# undef const_iv
1831	};	2241	};
1832		2242
1833	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2243	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1834	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2244	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2245
		2246	texture_av = newAV ();
		2247	AvREAL_off (texture_av);
1835	}	2248	}
1836		2249
1837	char *	2250	char *
1838	gl_vendor ()	2251	gl_vendor ()
1839	CODE:	2252	CODE:
…		…
1988		2401
1989	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2402	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1990		2403
1991	int glGenTexture ()	2404	int glGenTexture ()
1992	CODE:	2405	CODE:
1993	{	2406	RETVAL = gen_texture ();
1994	GLuint name;
1995	glGenTextures (1, &name);
1996	RETVAL = name;
1997	}
1998	OUTPUT:	2407	OUTPUT:
1999	RETVAL	2408	RETVAL
2000		2409
2001	void glDeleteTexture (int name)	2410	void glDeleteTexture (int name)
2002	CODE:	2411	CODE:
2003	{
2004	GLuint name_ = name;
2005	glDeleteTextures (1, &name_);	2412	del_texture (name);
2006	}	2413
2007
2008	int glGenList ()	2414	int glGenList ()
2009	CODE:	2415	CODE:
2010	RETVAL = glGenLists (1);	2416	RETVAL = glGenLists (1);
2011	OUTPUT:	2417	OUTPUT:
2012	RETVAL	2418	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC vs. Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC