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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
25	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
26	#include <SDL_endian.h>	32	#include <SDL_endian.h>
27	#include <SDL_image.h>	33	#include <SDL_image.h>
28	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
30		36
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	63	#else
58	# define PARACHUTE 0	64	# define PARACHUTE 0
59	#endif	65	#endif
60		66
		67	static AV *texture_av;
		68
61	static struct	69	static struct
62	{	70	{
63	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	72	#include "glfunc.h"
65	#undef GL_FUNC	73	#undef GL_FUNC
66	} gl;	74	} gl;
67		75
		76	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	78	{
70	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	83	else
75	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
76	}	85	}
77		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
		109	}
		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
81	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
82	#include "pango-render.c"	115	#include "pango-render.c"
…		…
155		188
156	*w = rect.width;	189	*w = rect.width;
157	*h = rect.height;	190	*h = rect.height;
158	}	191	}
159		192
		193	typedef uint16_t tileid;
160	typedef uint16_t mapface;	194	typedef uint16_t faceid;
161		195
162	typedef struct {	196	typedef struct {
163	GLint name;	197	int name;
164	int w, h;	198	int w, h;
165	float s, t;	199	float s, t;
166	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
167	} maptex;	203	} maptex;
168		204
169	typedef struct {	205	typedef struct {
170	uint32_t player;	206	uint32_t player;
171	mapface face[3];	207	tileid tile[3];
172	uint16_t darkness;	208	uint16_t darkness;
173	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
174	} mapcell;	210	} mapcell;
175		211
176	typedef struct {	212	typedef struct {
177	int32_t c0, c1;	213	int32_t c0, c1;
178	mapcell *col;	214	mapcell *col;
179	} maprow;	215	} maprow;
180		216
181	typedef struct map {	217	typedef struct map {
182	int x, y, w, h;	218	int x, y, w, h;
183	int ox, oy; /* offset to virtual global coordinate system */	219	int ox, oy; /* offset to virtual global coordinate system */
184	int faces;	220	int faces; tileid *face2tile; // [faceid]
185	mapface *face;	221	int texs; maptex *tex; // [tileid]
186
187	int texs;
188	maptex *tex;
189		222
190	int32_t rows;	223	int32_t rows;
191	maprow *row;	224	maprow *row;
192	} *CFPlus__Map;	225	} *CFPlus__Map;
193		226
…		…
213	return ptr;	246	return ptr;
214	}	247	}
215		248
216	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
217	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	250	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		251
		252	static void
		253	need_facenum (struct map *self, faceid face)
		254	{
		255	while (self->faces <= face)
		256	{
		257	Append (tileid, self->face2tile, self->faces, self->faces);
		258	self->faces *= 2;
		259	}
		260	}
		261
		262	static void
		263	need_texid (struct map *self, int texid)
		264	{
		265	while (self->texs <= texid)
		266	{
		267	Append (maptex, self->tex, self->texs, self->texs);
		268	self->texs *= 2;
		269	}
		270	}
218		271
219	static maprow *	272	static maprow *
220	map_get_row (CFPlus__Map self, int y)	273	map_get_row (CFPlus__Map self, int y)
221	{	274	{
222	if (0 > y)	275	if (0 > y)
…		…
315	cell->stat_hp = 0;	368	cell->stat_hp = 0;
316	cell->flags = 0;	369	cell->flags = 0;
317	cell->player = 0;	370	cell->player = 0;
318	}	371	}
319	}	372	}
		373	}
		374
		375	typedef struct {
		376	tileid tile;
		377	uint8_t x, y, level;
		378	} smooth_key;
		379
		380	static void
		381	smooth_or_bits (HV hv, smooth_key key, IV bits)
		382	{
		383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		384
		385	if (SvIOK (*sv))
		386	SvIV_set (sv, SvIVX (sv) \| bits);
		387	else
		388	sv_setiv (*sv, bits);
320	}	389	}
321		390
322	static void	391	static void
323	music_finished (void)	392	music_finished (void)
324	{	393	{
…		…
519	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
520	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	589	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
522	}	591	}
523		592
		593	char *
		594	SDL_GetError ()
		595
524	int	596	int
525	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
526		598
527	void	599	void
528	SDL_Quit ()	600	SDL_Quit ()
529		601
530	void	602	void
531	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
532	PPCODE:	604	PPCODE:
533	{	605	{
534	SDL_Rect **m;	606	SDL_Rect **m;
535		607
536	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
540		612
541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
543		615
544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
548		620
549	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
551	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553	#endif	625	#endif
554		626
555	SDL_EnableUNICODE (1);
556	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
557
558	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
559		628
560	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
561	while (*m)	630	while (*m)
562	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
563	AV *av = newAV ();	634	AV *av = newAV ();
564	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
565	av_push (av, newSViv ((*m)->h));	636	av_push (av, newSViv ((*m)->h));
		637	av_push (av, newSViv (rgb));
		638	av_push (av, newSViv (alpha));
566	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
567		641
568	++m;	642	++m;
569	}	643	}
570	}	644	}
571		645
572	char *
573	SDL_GetError ()
574
575	int	646	int
576	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
577	CODE:	648	CODE:
		649	{
		650	SDL_EnableUNICODE (1);
		651	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		652
		653	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		654	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		655	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		656	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		657
578	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	660	);
		661
581	if (RETVAL)	662	if (RETVAL)
582	{	663	{
		664	av_clear (texture_av);
		665
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	667	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
585	# include "glfunc.h"	668	#include "glfunc.h"
586	# undef GL_FUNC	669	#undef GL_FUNC
587	}	670	}
		671	}
588	OUTPUT:	672	OUTPUT:
589	RETVAL	673	RETVAL
590		674
591	void	675	void
592	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
593		677
594	char *	678	char *
595	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
596		680
		681	int
		682	SDL_GetAppState ()
		683
597	void	684	void
598	SDL_PollEvent ()	685	poll_events ()
599	PPCODE:	686	PPCODE:
600	{	687	{
601	SDL_Event ev;	688	SDL_Event ev;
602		689
603	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
604	{	692	{
605	HV *hv = newHV ();	693	HV *hv = newHV ();
606	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
607		695
608	switch (ev.type)	696	switch (ev.type)
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	710	break;
623		711
624	case SDL_MOUSEMOTION:	712	case SDL_MOUSEMOTION:
		713	{
		714	int state = ev.motion.state;
		715	int x = ev.motion.x;
		716	int y = ev.motion.y;
		717	int xrel = ev.motion.xrel;
		718	int yrel = ev.motion.yrel;
		719
		720	/* do simplistic event compression */
		721	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		722	&& state == ev.motion.state)
		723	{
		724	xrel += ev.motion.xrel;
		725	yrel += ev.motion.yrel;
		726	x = ev.motion.x;
		727	y = ev.motion.y;
		728	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		729	}
		730
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
632	break;	738	break;
633		739
634	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
666		772
667	void	773	void
668	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
669	CODE:	775	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		777
674	void	778	void
675	win32_proxy_info ()	779	win32_proxy_info ()
676	PPCODE:	780	PPCODE:
677	{	781	{
…		…
818	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
819	#else	923	#else
820	_exit (retval);	924	_exit (retval);
821	#endif	925	#endif
822		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
823	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
824		937
825	CFPlus::Font	938	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	939	new_from_file (SV class, char path, int id = 0)
827	CODE:	940	CODE:
…		…
1142	flags	1255	flags
1143	);	1256	);
1144		1257
1145	MODULE = CFPlus PACKAGE = CFPlus::Texture	1258	MODULE = CFPlus PACKAGE = CFPlus::Texture
1146		1259
1147	void	1260	int minpot (int n)
1148	pad2pot (SV data_, SV w_, SV *h_)
1149	CODE:
1150	{
1151	int ow = SvIV (w_);
1152	int oh = SvIV (h_);
1153		1261
1154	if (ow && oh)	1262	void
		1263	pad (SV *data_, int ow, int oh, int nw, int nh)
		1264	CODE:
		1265	{
		1266	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1155	{	1267	{
1156	int nw = minpot (ow);
1157	int nh = minpot (oh);
1158
1159	if (nw != ow \|\| nh != oh)
1160	{
1161	if (SvOK (data_))
1162	{
1163	STRLEN datalen;	1268	STRLEN datalen;
1164	char *data = SvPVbyte (data_, datalen);	1269	char *data = SvPVbyte (data_, datalen);
1165	int bpp = datalen / (ow * oh);	1270	int bpp = datalen / (ow * oh);
1166	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1271	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1167		1272
1168	SvPOK_only (result_);	1273	SvPOK_only (result_);
1169	SvCUR_set (result_, nw * nh * bpp);	1274	SvCUR_set (result_, nw * nh * bpp);
1170		1275
1171	memset (SvPVX (result_), 0, nw * nh * bpp);	1276	memset (SvPVX (result_), 0, nw * nh * bpp);
1172	while (oh--)	1277	while (oh--)
1173	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1278	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1174		1279
1175	sv_setsv (data_, result_);	1280	sv_setsv (data_, result_);
1176	}
1177
1178	sv_setiv (w_, nw);
1179	sv_setiv (h_, nh);
1180	}
1181	}	1281	}
1182	}	1282	}
1183		1283
1184	void	1284	void
1185	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1285	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1227	{	1327	{
1228	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1229	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1230	}	1330	}
1231	}	1331	}
		1332
		1333	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1334	CODE:
		1335	{
		1336	GLint width;
		1337	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1338	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1339	RETVAL = width > 0;
		1340	}
		1341	OUTPUT:
		1342	RETVAL
1232		1343
1233	MODULE = CFPlus PACKAGE = CFPlus::Map	1344	MODULE = CFPlus PACKAGE = CFPlus::Map
1234		1345
1235	CFPlus::Map	1346	CFPlus::Map
1236	new (SV *class)	1347	new (SV *class)
…		…
1240	RETVAL->y = 0;	1351	RETVAL->y = 0;
1241	RETVAL->w = 0;	1352	RETVAL->w = 0;
1242	RETVAL->h = 0;	1353	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1354	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1355	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1356	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1357	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1247	RETVAL->texs = 8192;
1248	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1249	RETVAL->rows = 0;	1358	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1359	RETVAL->row = 0;
1251	OUTPUT:	1360	OUTPUT:
1252	RETVAL	1361	RETVAL
1253		1362
1254	void	1363	void
1255	DESTROY (CFPlus::Map self)	1364	DESTROY (CFPlus::Map self)
1256	CODE:	1365	CODE:
1257	{	1366	{
1258	map_clear (self);	1367	map_clear (self);
1259	Safefree (self->face);	1368	Safefree (self->face2tile);
1260	Safefree (self->tex);	1369	Safefree (self->tex);
1261	Safefree (self);	1370	Safefree (self);
1262	}	1371	}
1263		1372
1264	void	1373	void
…		…
1271	clear (CFPlus::Map self)	1380	clear (CFPlus::Map self)
1272	CODE:	1381	CODE:
1273	map_clear (self);	1382	map_clear (self);
1274		1383
1275	void	1384	void
1276	set_face (CFPlus::Map self, int face, int texid)	1385	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1386	CODE:
1278	{	1387	{
1279	while (self->faces <= face)	1388	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1389	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1390	}
1282	self->faces *= 2;
1283	}
1284		1391
1285	self->face [face] = texid;	1392	void
		1393	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1394	CODE:
		1395	{
		1396	tileid texid;
		1397	maptex *tex;
		1398
		1399	if (face < 0 \|\| face >= self->faces)
		1400	return;
		1401
		1402	if (smooth < 0 \|\| smooth >= self->faces)
		1403	return;
		1404
		1405	texid = self->face2tile [face];
		1406
		1407	if (!texid)
		1408	return;
		1409
		1410	tex = self->tex + texid;
		1411	tex->smoothtile = self->face2tile [smooth];
		1412	tex->smoothlevel = level;
1286	}	1413	}
1287		1414
1288	void	1415	void
1289	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)	1416	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)
1290	CODE:	1417	CODE:
1291	{	1418	{
1292	while (self->texs <= texid)	1419	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1420
1298	{	1421	{
1299	maptex *tex = self->tex + texid;	1422	maptex *tex = self->tex + texid;
1300		1423
1301	tex->name = name;	1424	tex->name = name;
…		…
1345	CODE:	1468	CODE:
1346	{	1469	{
1347	if (dx > 0)	1470	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1471	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1472	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1473	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1474
1352	if (dy > 0)	1475	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1476	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1477	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1478	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1479
1357	self->ox += dx; self->x += dx;	1480	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1481	self->oy += dy; self->y += dy;
1359		1482
1360	while (self->y < 0)	1483	while (self->y < 0)
…		…
1414	}	1537	}
1415	else if (cmd == 6) // monster width	1538	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1539	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1540	else if (cmd == 0x47)
1418	{	1541	{
1419	if (*data == 8)	1542	if (*data == 4)
1420	; // decode player uuid	1543	; // decode player count
1421		1544
1422	data += *data + 1;	1545	data += *data + 1;
1423	}	1546	}
1424	else if (cmd == 8) // cell flags	1547	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1548	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1557	cell->darkness = *data++ + 1;
1435	}	1558	}
1436		1559
1437	if (flags & 4)	1560	if (flags & 4)
1438	{	1561	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1562	faceid face = (data [0] << 8) + data [1]; data += 2;
		1563	need_facenum (self, face);
		1564	cell->tile [0] = self->face2tile [face];
1440	}	1565	}
1441		1566
1442	if (flags & 2)	1567	if (flags & 2)
1443	{	1568	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1569	faceid face = (data [0] << 8) + data [1]; data += 2;
		1570	need_facenum (self, face);
		1571	cell->tile [1] = self->face2tile [face];
1445	}	1572	}
1446		1573
1447	if (flags & 1)	1574	if (flags & 1)
1448	{	1575	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1576	faceid face = (data [0] << 8) + data [1]; data += 2;
		1577	need_facenum (self, face);
		1578	cell->tile [2] = self->face2tile [face];
1450	}	1579	}
1451	}	1580	}
1452	else	1581	else
1453	cell->darkness = 0;	1582	cell->darkness = 0;
1454	}	1583	}
…		…
1484	{	1613	{
1485	mapcell *cell = row->col + (x - row->c0);	1614	mapcell *cell = row->col + (x - row->c0);
1486		1615
1487	for (z = 0; z <= 0; z++)	1616	for (z = 0; z <= 0; z++)
1488	{	1617	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1618	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1619	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1620	int a1 = tex.a;
1496		1621
1497	r = (r * a0 + tex.r * a1) / 255;	1622	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1623	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1624	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1625	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1626	}
1503	}	1627	}
1504		1628
1505	*map++ = (r )	1629	*map++ = (r )
1506	\| (g << 8)	1630	\| (g << 8)
…		…
1516		1640
1517	void	1641	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1642	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1643	CODE:
1520	{	1644	{
		1645	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1646	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1647	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1648	smooth_key skey;
1521	int x, y, z;	1649	int x, y, z;
1522	int last_name;	1650	int last_name;
1523	mapface face;	1651
		1652	// thats current max. sorry.
		1653	if (sw > 255) sw = 255;
		1654	if (sh > 255) sh = 255;
		1655
		1656	// clear key, in case of extra padding
		1657	memset (&skey, 0, sizeof (skey));
1524		1658
1525	glColor4ub (255, 255, 255, 255);	1659	glColor4ub (255, 255, 255, 255);
1526		1660
1527	glEnable (GL_BLEND);	1661	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1662	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1668	last_name = 0;
1535		1669
1536	mx += self->x;	1670	mx += self->x;
1537	my += self->y;	1671	my += self->y;
1538		1672
		1673	// first pass: determine smooth_max
		1674	// rather ugly, if you ask me
		1675	// could also be stored inside mapcell and updated on change
		1676	memset (smooth_max, 0, sizeof (smooth_max));
		1677
		1678	for (y = 0; y < sh; y++)
		1679	if (0 <= y + my && y + my < self->rows)
		1680	{
		1681	maprow *row = self->row + (y + my);
		1682
		1683	for (x = 0; x < sw; x++)
		1684	if (row->c0 <= x + mx && x + mx < row->c1)
		1685	{
		1686	mapcell *cell = row->col + (x + mx - row->c0);
		1687
		1688	smooth_max[x + 1][y + 1] =
		1689	MAX (self->tex [cell->tile [0]].smoothlevel,
		1690	MAX (self->tex [cell->tile [1]].smoothlevel,
		1691	self->tex [cell->tile [2]].smoothlevel));
		1692	}
		1693	}
		1694
1539	for (z = 0; z < 3; z++)	1695	for (z = 0; z <= 2; z++)
		1696	{
		1697	memset (smooth_level, 0, sizeof (smooth_level));
		1698
1540	for (y = 0; y < sh; y++)	1699	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1700	if (0 <= y + my && y + my < self->rows)
1542	{	1701	{
1543	maprow *row = self->row + (y + my);	1702	maprow *row = self->row + (y + my);
1544		1703
1545	for (x = 0; x < sw; x++)	1704	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1705	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1706	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1707	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1708	tileid tile = cell->tile [z];
		1709
		1710	if (tile)
		1711	{
		1712	maptex tex = self->tex [tile];
		1713	int px = (x + 1) * T - tex.w;
		1714	int py = (y + 1) * T - tex.h;
1551		1715
1552	if (face && face < self->texs)	1716	// suppressing texture state switches here
		1717	// is only moderately effective, but worth the extra effort
		1718	if (last_name != tex.name)
		1719	{
		1720	if (!tex.name)
		1721	tex = self->tex [2]; /* missing, replace by noface */
		1722
		1723	glEnd ();
		1724	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1725	glBegin (GL_QUADS);
		1726	}
		1727
		1728	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1729	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1730	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1731	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1732
		1733	if (cell->flags && z == 2)
		1734	{
		1735	if (cell->flags & 1)
		1736	{
		1737	maptex tex = self->tex [1];
		1738	int px = x * T + T * 2 / 32;
		1739	int py = y * T - T * 6 / 32;
		1740
		1741	glEnd ();
		1742	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1743	glBegin (GL_QUADS);
		1744
		1745	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1746	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1747	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1748	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1749	}
		1750	}
		1751
		1752	// update smooth hash
		1753	if (tex.smoothtile)
		1754	{
		1755	skey.tile = tex.smoothtile;
		1756	skey.level = tex.smoothlevel;
		1757
		1758	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1759
		1760	// add bits to current tile and all neighbours. skey.x\|y is
		1761	// shifted +1\|+1 so we always stay positive.
		1762
		1763	// bits is ___n cccc CCCC bbbb
		1764	// n do not draw borders&corners
		1765	// c draw these corners, but...
		1766	// C ... not these
		1767	// b draw these borders
		1768
		1769	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1770	// ┃· ·· ·┃ ━━
		1771
		1772	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1773	// ·· ·· ·┏ ┓·
		1774
		1775	// full tile
		1776	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1777
		1778	// borders
		1779	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1780	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1781	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1782	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1783
		1784	// corners
		1785	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1786	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1787	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1788	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1789	}
		1790	}
		1791	}
		1792	}
		1793
		1794	// go through all smoothlevels, lowest to highest, then draw.
		1795	// this is basically counting sort
		1796	{
		1797	int w, b;
		1798
		1799	for (w = 0; w < 256 / 32; ++w)
		1800	{
		1801	uint32_t smask = smooth_level [w];
		1802	if (smask)
		1803	for (b = 0; b < 32; ++b)
		1804	if (smask & (((uint32_t)1) << b))
1553	{	1805	{
1554	maptex tex = self->tex [face];	1806	int level = (w << 5) \| b;
1555	int px = (x + 1) * T - tex.w;	1807	HE *he;
1556	int py = (y + 1) * T - tex.h;
1557		1808
1558	if (last_name != tex.name)	1809	hv_iterinit (smooth);
		1810	while ((he = hv_iternext (smooth)))
1559	{	1811	{
		1812	smooth_key skey = (smooth_key )HeKEY (he);
		1813	IV bits = SvIVX (HeVAL (he));
		1814
		1815	if (!(bits & 0x1000)
		1816	&& skey->level == level
		1817	&& level > smooth_max [skey->x][skey->y])
		1818	{
		1819	maptex tex = self->tex [skey->tile];
		1820	int px = (((int)skey->x) - 1) * T;
		1821	int py = (((int)skey->y) - 1) * T;
		1822	int border = bits & 15;
		1823	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1824	float dx = tex.s * .0625f; // 16 images/row
		1825	float dy = tex.t * .5f ; // 2 images/column
		1826
		1827	// this time naively avoiding texture state changes
		1828	// save gobs of state changes.
		1829	if (last_name != tex.name)
		1830	{
		1831	if (!tex.name)
		1832	continue; // smoothing not yet available
		1833
1560	glEnd ();	1834	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1835	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1836	glBegin (GL_QUADS);
		1837	}
		1838
		1839	if (border)
		1840	{
		1841	float ox = border * dx;
		1842
		1843	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1844	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1846	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1847	}
		1848
		1849	if (corner)
		1850	{
		1851	float ox = corner * dx;
		1852
		1853	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1854	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1855	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1856	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1857	}
1563	}	1858	}
1564
1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1567	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1569	}
1570
1571	if (cell->flags && z == 2)
1572	{
1573	if (cell->flags & 1)
1574	{
1575	maptex tex = self->tex [1];
1576	int px = (x + 1) * T - tex.w + 2;
1577	int py = (y + 1) * T - tex.h - 6;
1578
1579	glEnd ();
1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581	glBegin (GL_QUADS);
1582
1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587	}	1859	}
1588	}	1860	}
1589	}
1590	}	1861	}
		1862	}
		1863
		1864	hv_clear (smooth);
		1865	}
1591		1866
1592	glEnd ();	1867	glEnd ();
1593		1868
1594	glDisable (GL_TEXTURE_2D);	1869	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1870	glDisable (GL_BLEND);
…		…
1609	int py = y * T;	1884	int py = y * T;
1610		1885
1611	if (cell->stat_hp)	1886	if (cell->stat_hp)
1612	{	1887	{
1613	int width = cell->stat_width * T;	1888	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1889	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1890
1616	glColor3ub (0, 0, 0);	1891	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1892	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1893	px + width - 1, py);
1619		1894
…		…
1685	glDisable (GL_BLEND);	1960	glDisable (GL_BLEND);
1686	glDisable (GL_TEXTURE_2D);	1961	glDisable (GL_TEXTURE_2D);
1687	}	1962	}
1688		1963
1689	void	1964	void
1690	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1965	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1691	PPCODE:	1966	PPCODE:
1692	{	1967	{
1693	int x, y;	1968	int x, y;
1694	int sw4 = (sw + 3) & ~3;	1969	int sw4 = (sw + 3) & ~3;
1695	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1970	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1715	darkness[y * sw4 + x] = cell->darkness	1990	darkness[y * sw4 + x] = cell->darkness
1716	? 255 - (cell->darkness - 1)	1991	? 255 - (cell->darkness - 1)
1717	: 255 - FOW_DARKNESS;	1992	: 255 - FOW_DARKNESS;
1718	}	1993	}
1719	}	1994	}
		1995
		1996	if (smoothing)
		1997	{
		1998	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		1999	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2000
		2001	SvPOK_only (darkness2_sv);
		2002	SvCUR_set (darkness2_sv, sw4 * sh);
		2003
		2004	for (y = 0; y < sh; ++y)
		2005	for (x = 0; x < sw4; ++x)
		2006	{
		2007	float f = (float )matrix;
		2008	int dx, dy;
		2009	float sum = 0.f;
		2010
		2011	for (dy = -1; dy <= 1; ++dy)
		2012	for (dx = -1; dx <= 1; ++dx)
		2013	{
		2014	unsigned int x2 = x + dx;
		2015	unsigned int y2 = y + dy;
		2016
		2017	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2018	}
		2019
		2020	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2021	}
		2022
		2023	darkness_sv = darkness2_sv;
		2024	}
1720		2025
1721	EXTEND (SP, 3);	2026	EXTEND (SP, 3);
1722	PUSHs (sv_2mortal (newSViv (sw4)));	2027	PUSHs (sv_2mortal (newSViv (sw4)));
1723	PUSHs (sv_2mortal (newSViv (sh)));	2028	PUSHs (sv_2mortal (newSViv (sh)));
1724	PUSHs (darkness_sv);	2029	PUSHs (darkness_sv);
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2063	if (row && row->c0 <= x && x < row->c1)
1759	{	2064	{
1760	mapcell *cell = row->col + (x - row->c0);	2065	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2066	uint8_t flags = 0;
1762		2067
1763	if (cell->face [0]) flags \|= 1;	2068	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2069	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2070	if (cell->tile [2]) flags \|= 4;
1766		2071
1767	*data++ = flags;	2072	*data++ = flags;
1768		2073
1769	if (flags & 1)	2074	if (flags & 1)
1770	{	2075	{
		2076	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2077	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2078	*data++ = tile;
1773	}	2079	}
1774		2080
1775	if (flags & 2)	2081	if (flags & 2)
1776	{	2082	{
		2083	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2084	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2085	*data++ = tile;
1779	}	2086	}
1780		2087
1781	if (flags & 4)	2088	if (flags & 4)
1782	{	2089	{
		2090	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2091	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2092	*data++ = tile;
1785	}	2093	}
1786	}	2094	}
1787	else	2095	else
1788	*data++ = 0;	2096	*data++ = 0;
1789	}	2097	}
…		…
1829	{	2137	{
1830	uint8_t flags = *data++;	2138	uint8_t flags = *data++;
1831		2139
1832	if (flags)	2140	if (flags)
1833	{	2141	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2142	mapcell *cell = row_get_cell (row, x);
		2143	tileid tile[3] = { 0, 0, 0 };
1837		2144
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2145	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2146	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2147	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2148
1842	if (cell->darkness == 0)	2149	if (cell->darkness == 0)
1843	{	2150	{
1844	cell->darkness = 0;	2151	cell->darkness = 0;
1845		2152
1846	for (z = 0; z <= 2; z++)	2153	for (z = 0; z <= 2; z++)
1847	{	2154	{
1848	cell->face[z] = face[z];	2155	tileid t = tile [z];
1849		2156
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2157	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2158	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2159	XPUSHs (sv_2mortal (newSViv (t)));
		2160	need_texid (self, t);
		2161	}
		2162
		2163	cell->tile [z] = t;
1852	}	2164	}
1853	}	2165	}
1854	}	2166	}
1855	}	2167	}
1856	}	2168	}
…		…
1891	CODE:	2203	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2204	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2205	OUTPUT:
1894	RETVAL	2206	RETVAL
1895		2207
		2208	int
		2209	fade_out (int ms)
		2210	CODE:
		2211	RETVAL = Mix_FadeOutMusic (ms);
		2212	OUTPUT:
		2213	RETVAL
		2214
1896	CFPlus::MixMusic	2215	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2216	new_from_file (SV class, char path)
1898	CODE:	2217	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2218	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2219	OUTPUT:
…		…
1907		2226
1908	int	2227	int
1909	play (CFPlus::MixMusic self, int loops = -1)	2228	play (CFPlus::MixMusic self, int loops = -1)
1910	CODE:	2229	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2230	RETVAL = Mix_PlayMusic (self, loops);
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2236	CODE:
		2237	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1912	OUTPUT:	2238	OUTPUT:
1913	RETVAL	2239	RETVAL
1914		2240
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2241	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1916		2242
…		…
1920	static const struct {	2246	static const struct {
1921	const char *name;	2247	const char *name;
1922	IV iv;	2248	IV iv;
1923	} *civ, const_iv[] = {	2249	} *civ, const_iv[] = {
1924	# define const_iv(name) { # name, (IV)name }	2250	# define const_iv(name) { # name, (IV)name }
		2251	const_iv (GL_VENDOR),
		2252	const_iv (GL_VERSION),
		2253	const_iv (GL_EXTENSIONS),
1925	const_iv (GL_COLOR_MATERIAL),	2254	const_iv (GL_COLOR_MATERIAL),
1926	const_iv (GL_SMOOTH),	2255	const_iv (GL_SMOOTH),
1927	const_iv (GL_FLAT),	2256	const_iv (GL_FLAT),
1928	const_iv (GL_DITHER),	2257	const_iv (GL_DITHER),
1929	const_iv (GL_BLEND),	2258	const_iv (GL_BLEND),
…		…
1956	const_iv (GL_LUMINANCE),	2285	const_iv (GL_LUMINANCE),
1957	const_iv (GL_LUMINANCE_ALPHA),	2286	const_iv (GL_LUMINANCE_ALPHA),
1958	const_iv (GL_FLOAT),	2287	const_iv (GL_FLOAT),
1959	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2288	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1960	const_iv (GL_COMPILE),	2289	const_iv (GL_COMPILE),
		2290	const_iv (GL_PROXY_TEXTURE_1D),
		2291	const_iv (GL_PROXY_TEXTURE_2D),
1961	const_iv (GL_TEXTURE_1D),	2292	const_iv (GL_TEXTURE_1D),
1962	const_iv (GL_TEXTURE_2D),	2293	const_iv (GL_TEXTURE_2D),
1963	const_iv (GL_TEXTURE_ENV),	2294	const_iv (GL_TEXTURE_ENV),
1964	const_iv (GL_TEXTURE_MAG_FILTER),	2295	const_iv (GL_TEXTURE_MAG_FILTER),
1965	const_iv (GL_TEXTURE_MIN_FILTER),	2296	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2005	# undef const_iv	2336	# undef const_iv
2006	};	2337	};
2007		2338
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2339	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2340	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2341
		2342	texture_av = newAV ();
		2343	AvREAL_off (texture_av);
2010	}	2344	}
2011		2345
2012	char *	2346	char *
2013	gl_vendor ()	2347	gl_vendor ()
2014	CODE:	2348	CODE:
…		…
2025		2359
2026	char *	2360	char *
2027	gl_extensions ()	2361	gl_extensions ()
2028	CODE:	2362	CODE:
2029	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2363	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2364	OUTPUT:
		2365	RETVAL
		2366
		2367	const char *glGetString (GLenum pname)
		2368
		2369	GLint glGetInteger (GLenum pname)
		2370	CODE:
		2371	glGetIntegerv (pname, &RETVAL);
		2372	OUTPUT:
		2373	RETVAL
		2374
		2375	GLdouble glGetDouble (GLenum pname)
		2376	CODE:
		2377	glGetDoublev (pname, &RETVAL);
2030	OUTPUT:	2378	OUTPUT:
2031	RETVAL	2379	RETVAL
2032		2380
2033	int glGetError ()	2381	int glGetError ()
2034		2382
…		…
2159		2507
2160	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2508	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2161		2509
2162	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2510	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2163		2511
		2512	void glPixelZoom (float x, float y)
		2513
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2514	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2515
2166	int glGenTexture ()	2516	int glGenTexture ()
2167	CODE:	2517	CODE:
2168	{	2518	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2519	OUTPUT:
2174	RETVAL	2520	RETVAL
2175		2521
2176	void glDeleteTexture (int name)	2522	void glDeleteTexture (int name)
2177	CODE:	2523	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2524	del_texture (name);
2181	}	2525
2182
2183	int glGenList ()	2526	int glGenList ()
2184	CODE:	2527	CODE:
2185	RETVAL = glGenLists (1);	2528	RETVAL = glGenLists (1);
2186	OUTPUT:	2529	OUTPUT:
2187	RETVAL	2530	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs. Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC