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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 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	# 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
16	# undef pipe	21	# undef pipe
17	#endif	22	#endif
18		23
		24	#include <assert.h>
19	#include <math.h>	25	#include <math.h>
20	#include <string.h>	26	#include <string.h>
21	#include <stdio.h>	27	#include <stdio.h>
22	#include <stdlib.h>	28	#include <stdlib.h>
23		29
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	62	#else
57	# define PARACHUTE 0	63	# define PARACHUTE 0
58	#endif	64	#endif
59		65
		66	static AV *texture_av;
		67
60	static struct	68	static struct
61	{	69	{
62	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	71	#include "glfunc.h"
64	#undef GL_FUNC	72	#undef GL_FUNC
65	} gl;	73	} gl;
66		74
		75	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	77	{
69	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	82	else
74	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
75	}	84	}
76		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
77	#include "texcache.c"	110	#include "texcache.c"
78		111
79	#include "pango-font.c"	112	#include "pango-font.c"
80	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
81	#include "pango-render.c"	114	#include "pango-render.c"
…		…
154		187
155	*w = rect.width;	188	*w = rect.width;
156	*h = rect.height;	189	*h = rect.height;
157	}	190	}
158		191
		192	typedef uint16_t tileid;
159	typedef uint16_t mapface;	193	typedef uint16_t faceid;
160		194
161	typedef struct {	195	typedef struct {
162	GLint name;	196	int name;
163	int w, h;	197	int w, h;
164	float s, t;	198	float s, t;
165	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
166	} maptex;	202	} maptex;
167		203
168	typedef struct {	204	typedef struct {
169	uint32_t player;	205	uint32_t player;
170	mapface face[3];	206	tileid tile[3];
171	uint16_t darkness;	207	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	209	} mapcell;
174		210
175	typedef struct {	211	typedef struct {
176	int32_t c0, c1;	212	int32_t c0, c1;
177	mapcell *col;	213	mapcell *col;
178	} maprow;	214	} maprow;
179		215
180	typedef struct map {	216	typedef struct map {
181	int x, y, w, h;	217	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	219	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	220	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		221
189	int32_t rows;	222	int32_t rows;
190	maprow *row;	223	maprow *row;
191	} *CFPlus__Map;	224	} *CFPlus__Map;
192		225
…		…
212	return ptr;	245	return ptr;
213	}	246	}
214		247
215	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
216	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
217		270
218	static maprow *	271	static maprow *
219	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
220	{	273	{
221	if (0 > y)	274	if (0 > y)
…		…
314	cell->stat_hp = 0;	367	cell->stat_hp = 0;
315	cell->flags = 0;	368	cell->flags = 0;
316	cell->player = 0;	369	cell->player = 0;
317	}	370	}
318	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
319	}	388	}
320		389
321	static void	390	static void
322	music_finished (void)	391	music_finished (void)
323	{	392	{
…		…
492		561
493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495	}	564	}
496		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
497	int	572	int
498	in_destruct ()	573	in_destruct ()
499	CODE:	574	CODE:
500	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
501	OUTPUT:	576	OUTPUT:
…		…
512	opengl_fontmap = pango_opengl_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
513	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
514	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
515	}	590	}
516		591
		592	char *
		593	SDL_GetError ()
		594
517	int	595	int
518	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
519		597
520	void	598	void
521	SDL_Quit ()	599	SDL_Quit ()
522		600
523	void	601	void
524	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
525	PPCODE:	603	PPCODE:
526	{	604	{
527	SDL_Rect **m;	605	SDL_Rect **m;
528		606
529	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
530	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
531	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
532	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
533		611
534	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
535	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
536		614
537	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
538	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
539	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
540	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
541		619
542	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
543	#if SDL_VERSION_ATLEAST(1,2,10)	621	#if SDL_VERSION_ATLEAST(1,2,10)
544	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
545	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
546	#endif	624	#endif
547		625
548	SDL_EnableUNICODE (1);
549	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
550
551	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
552		627
553	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
554	while (*m)	629	while (*m)
555	{	630	{
		631	if ((m)->w >= 640 && (m)->h >= 480)
		632	{
556	AV *av = newAV ();	633	AV *av = newAV ();
557	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
558	av_push (av, newSViv ((*m)->h));	635	av_push (av, newSViv ((*m)->h));
		636	av_push (av, newSViv (rgb));
		637	av_push (av, newSViv (alpha));
559	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
560		640
561	++m;	641	++m;
562	}	642	}
563	}	643	}
564		644
565	char *
566	SDL_GetError ()
567
568	int	645	int
569	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
570	CODE:	647	CODE:
		648	{
		649	SDL_EnableUNICODE (1);
		650	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		651
		652	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		653	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		654	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		655	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		656
571	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
573	);	659	);
		660
574	if (RETVAL)	661	if (RETVAL)
575	{	662	{
		663	av_clear (texture_av);
		664
576	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	666	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
578	# include "glfunc.h"	667	#include "glfunc.h"
579	# undef GL_FUNC	668	#undef GL_FUNC
580	}	669	}
		670	}
581	OUTPUT:	671	OUTPUT:
582	RETVAL	672	RETVAL
583		673
584	void	674	void
585	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
586		676
587	char *	677	char *
588	SDL_GetKeyName (int sym)	678	SDL_GetKeyName (int sym)
589		679
		680	int
		681	SDL_GetAppState ()
		682
590	void	683	void
591	SDL_PollEvent ()	684	poll_events ()
592	PPCODE:	685	PPCODE:
593	{	686	{
594	SDL_Event ev;	687	SDL_Event ev;
595		688
596	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
597	{	691	{
598	HV *hv = newHV ();	692	HV *hv = newHV ();
599	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
600		694
601	switch (ev.type)	695	switch (ev.type)
…		…
613	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
614	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
615	break;	709	break;
616		710
617	case SDL_MOUSEMOTION:	711	case SDL_MOUSEMOTION:
		712	{
		713	int state = ev.motion.state;
		714	int x = ev.motion.x;
		715	int y = ev.motion.y;
		716	int xrel = ev.motion.xrel;
		717	int yrel = ev.motion.yrel;
		718
		719	/* do simplistic event compression */
		720	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		721	&& state == ev.motion.state)
		722	{
		723	xrel += ev.motion.xrel;
		724	yrel += ev.motion.yrel;
		725	x = ev.motion.x;
		726	y = ev.motion.y;
		727	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		728	}
		729
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
619
620	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
621	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
622	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
623	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
624	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
625	break;	737	break;
626		738
627	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
628	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
629	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
658	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
659		771
660	void	772	void
661	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
662	CODE:	774	CODE:
663	#ifndef _WIN32
664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665	#endif
666		776
667	void	777	void
668	win32_proxy_info ()	778	win32_proxy_info ()
669	PPCODE:	779	PPCODE:
670	{	780	{
…		…
811	ExitThread (retval); // unclean, please beam me up	921	ExitThread (retval); // unclean, please beam me up
812	#else	922	#else
813	_exit (retval);	923	_exit (retval);
814	#endif	924	#endif
815		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
816	MODULE = CFPlus PACKAGE = CFPlus::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
817		936
818	CFPlus::Font	937	CFPlus::Font
819	new_from_file (SV class, char path, int id = 0)	938	new_from_file (SV class, char path, int id = 0)
820	CODE:	939	CODE:
…		…
1135	flags	1254	flags
1136	);	1255	);
1137		1256
1138	MODULE = CFPlus PACKAGE = CFPlus::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
1139		1258
		1259	int minpot (int n)
		1260
1140	void	1261	void
1141	pad2pot (SV data_, SV w_, SV *h_)	1262	pad2pot (SV data_, SV w_, SV *h_)
1142	CODE:	1263	CODE:
1143	{	1264	{
1144	int ow = SvIV (w_);	1265	int ow = SvIV (w_);
…		…
1221	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
1222	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
1223	}	1344	}
1224	}	1345	}
1225		1346
		1347	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1348	CODE:
		1349	{
		1350	GLint width;
		1351	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1352	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1353	RETVAL = width > 0;
		1354	}
		1355	OUTPUT:
		1356	RETVAL
		1357
1226	MODULE = CFPlus PACKAGE = CFPlus::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1227		1359
1228	CFPlus::Map	1360	CFPlus::Map
1229	new (SV *class)	1361	new (SV *class)
1230	CODE:	1362	CODE:
…		…
1233	RETVAL->y = 0;	1365	RETVAL->y = 0;
1234	RETVAL->w = 0;	1366	RETVAL->w = 0;
1235	RETVAL->h = 0;	1367	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240	RETVAL->texs = 8192;
1241	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242	RETVAL->rows = 0;	1372	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1373	RETVAL->row = 0;
1244	OUTPUT:	1374	OUTPUT:
1245	RETVAL	1375	RETVAL
1246		1376
1247	void	1377	void
1248	DESTROY (CFPlus::Map self)	1378	DESTROY (CFPlus::Map self)
1249	CODE:	1379	CODE:
1250	{	1380	{
1251	map_clear (self);	1381	map_clear (self);
1252	Safefree (self->face);	1382	Safefree (self->face2tile);
1253	Safefree (self->tex);	1383	Safefree (self->tex);
1254	Safefree (self);	1384	Safefree (self);
1255	}	1385	}
1256		1386
1257	void	1387	void
…		…
1264	clear (CFPlus::Map self)	1394	clear (CFPlus::Map self)
1265	CODE:	1395	CODE:
1266	map_clear (self);	1396	map_clear (self);
1267		1397
1268	void	1398	void
1269	set_face (CFPlus::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1400	CODE:
1271	{	1401	{
1272	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1403	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1404	}
1275	self->faces *= 2;
1276	}
1277		1405
1278	self->face [face] = texid;	1406	void
		1407	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1408	CODE:
		1409	{
		1410	tileid texid;
		1411	maptex *tex;
		1412
		1413	if (face < 0 \|\| face >= self->faces)
		1414	return;
		1415
		1416	if (smooth < 0 \|\| smooth >= self->faces)
		1417	return;
		1418
		1419	texid = self->face2tile [face];
		1420
		1421	if (!texid)
		1422	return;
		1423
		1424	tex = self->tex + texid;
		1425	tex->smoothtile = self->face2tile [smooth];
		1426	tex->smoothlevel = level;
1279	}	1427	}
1280		1428
1281	void	1429	void
1282	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)	1430	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)
1283	CODE:	1431	CODE:
1284	{	1432	{
1285	while (self->texs <= texid)	1433	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1434
1291	{	1435	{
1292	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1293		1437
1294	tex->name = name;	1438	tex->name = name;
…		…
1338	CODE:	1482	CODE:
1339	{	1483	{
1340	if (dx > 0)	1484	if (dx > 0)
1341	map_blank (self, self->x, self->y, dx, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1342	else if (dx < 0)	1486	else if (dx < 0)
1343	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1487	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344		1488
1345	if (dy > 0)	1489	if (dy > 0)
1346	map_blank (self, self->x, self->y, self->w, dy);	1490	map_blank (self, self->x, self->y, self->w, dy);
1347	else if (dy < 0)	1491	else if (dy < 0)
1348	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1492	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349		1493
1350	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1351	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1352		1496
1353	while (self->y < 0)	1497	while (self->y < 0)
…		…
1405	cell->stat_width = 1;	1549	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1550	cell->stat_hp = *data++;
1407	}	1551	}
1408	else if (cmd == 6) // monster width	1552	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1553	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1554	else if (cmd == 0x47)
1411	{	1555	{
1412	if (*data == 4)	1556	if (*data == 4)
1413	; // decode player tag	1557	; // decode player count
1414		1558
1415	data += *data + 1;	1559	data += *data + 1;
1416	}	1560	}
1417	else if (cmd == 8) // cell flags	1561	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1562	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1571	cell->darkness = *data++ + 1;
1428	}	1572	}
1429		1573
1430	if (flags & 4)	1574	if (flags & 4)
1431	{	1575	{
1432	cell->face [0] = 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 [0] = self->face2tile [face];
1433	}	1579	}
1434		1580
1435	if (flags & 2)	1581	if (flags & 2)
1436	{	1582	{
1437	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1583	faceid face = (data [0] << 8) + data [1]; data += 2;
		1584	need_facenum (self, face);
		1585	cell->tile [1] = self->face2tile [face];
1438	}	1586	}
1439		1587
1440	if (flags & 1)	1588	if (flags & 1)
1441	{	1589	{
1442	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1590	faceid face = (data [0] << 8) + data [1]; data += 2;
		1591	need_facenum (self, face);
		1592	cell->tile [2] = self->face2tile [face];
1443	}	1593	}
1444	}	1594	}
1445	else	1595	else
1446	cell->darkness = 0;	1596	cell->darkness = 0;
1447	}	1597	}
…		…
1477	{	1627	{
1478	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1479		1629
1480	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1481	{	1631	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1634	int a1 = tex.a;
1489		1635
1490	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1640	}
1496	}	1641	}
1497		1642
1498	*map++ = (r )	1643	*map++ = (r )
1499	\| (g << 8)	1644	\| (g << 8)
…		…
1506	}	1651	}
1507	OUTPUT:	1652	OUTPUT:
1508	RETVAL	1653	RETVAL
1509		1654
1510	void	1655	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1656	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1657	CODE:
1513	{	1658	{
		1659	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1660	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1661	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1662	smooth_key skey;
1514	int x, y, z;	1663	int x, y, z;
1515	int last_name;	1664	int last_name;
1516	mapface face;	1665
		1666	// thats current max. sorry.
		1667	if (sw > 255) sw = 255;
		1668	if (sh > 255) sh = 255;
		1669
		1670	// clear key, in case of extra padding
		1671	memset (&skey, 0, sizeof (skey));
1517		1672
1518	glColor4ub (255, 255, 255, 255);	1673	glColor4ub (255, 255, 255, 255);
1519		1674
1520	glEnable (GL_BLEND);	1675	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1676	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1682	last_name = 0;
1528		1683
1529	mx += self->x;	1684	mx += self->x;
1530	my += self->y;	1685	my += self->y;
1531		1686
		1687	// first pass: determine smooth_max
		1688	// rather ugly, if you ask me
		1689	// could also be stored inside mapcell and updated on change
		1690	memset (smooth_max, 0, sizeof (smooth_max));
		1691
		1692	for (y = 0; y < sh; y++)
		1693	if (0 <= y + my && y + my < self->rows)
		1694	{
		1695	maprow *row = self->row + (y + my);
		1696
		1697	for (x = 0; x < sw; x++)
		1698	if (row->c0 <= x + mx && x + mx < row->c1)
		1699	{
		1700	mapcell *cell = row->col + (x + mx - row->c0);
		1701
		1702	smooth_max[x + 1][y + 1] =
		1703	MAX (self->tex [cell->tile [0]].smoothlevel,
		1704	MAX (self->tex [cell->tile [1]].smoothlevel,
		1705	self->tex [cell->tile [2]].smoothlevel));
		1706	}
		1707	}
		1708
1532	for (z = 0; z < 3; z++)	1709	for (z = 0; z <= 2; z++)
		1710	{
		1711	memset (smooth_level, 0, sizeof (smooth_level));
		1712
1533	for (y = 0; y < sh; y++)	1713	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1714	if (0 <= y + my && y + my < self->rows)
1535	{	1715	{
1536	maprow *row = self->row + (y + my);	1716	maprow *row = self->row + (y + my);
1537		1717
1538	for (x = 0; x < sw; x++)	1718	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1719	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1720	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1721	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	face = cell->face [z];	1722	tileid tile = cell->tile [z];
		1723
		1724	if (tile)
		1725	{
		1726	maptex tex = self->tex [tile];
		1727	int px = (x + 1) * T - tex.w;
		1728	int py = (y + 1) * T - tex.h;
1544		1729
1545	if (face && face < self->texs)	1730	// suppressing texture state switches here
		1731	// is only moderately effective, but worth the extra effort
		1732	if (last_name != tex.name)
		1733	{
		1734	if (!tex.name)
		1735	tex = self->tex [2]; /* missing, replace by noface */
		1736
		1737	glEnd ();
		1738	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1739	glBegin (GL_QUADS);
		1740	}
		1741
		1742	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1743	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1744	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1745	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1746
		1747	if (cell->flags && z == 2)
		1748	{
		1749	if (cell->flags & 1)
		1750	{
		1751	maptex tex = self->tex [1];
		1752	int px = x * T + T * 2 / 32;
		1753	int py = y * T - T * 6 / 32;
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758
		1759	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1760	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1761	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1762	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1763	}
		1764	}
		1765
		1766	// update smooth hash
		1767	if (tex.smoothtile)
		1768	{
		1769	skey.tile = tex.smoothtile;
		1770	skey.level = tex.smoothlevel;
		1771
		1772	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1773
		1774	// add bits to current tile and all neighbours. skey.x\|y is
		1775	// shifted +1\|+1 so we always stay positive.
		1776
		1777	// bits is ___n cccc CCCC bbbb
		1778	// n do not draw borders&corners
		1779	// c draw these corners, but...
		1780	// C ... not these
		1781	// b draw these borders
		1782
		1783	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1784	// ┃· ·· ·┃ ━━
		1785
		1786	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1787	// ·· ·· ·┏ ┓·
		1788
		1789	// full tile
		1790	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1791
		1792	// borders
		1793	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1794	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1795	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1796	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1797
		1798	// corners
		1799	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1800	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1801	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1802	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1803	}
		1804	}
		1805	}
		1806	}
		1807
		1808	// go through all smoothlevels, lowest to highest, then draw.
		1809	// this is basically counting sort
		1810	{
		1811	int w, b;
		1812
		1813	for (w = 0; w < 256 / 32; ++w)
		1814	{
		1815	uint32_t smask = smooth_level [w];
		1816	if (smask)
		1817	for (b = 0; b < 32; ++b)
		1818	if (smask & (((uint32_t)1) << b))
1546	{	1819	{
1547	maptex tex = self->tex [face];	1820	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1821	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1822
1551	if (last_name != tex.name)	1823	hv_iterinit (smooth);
		1824	while ((he = hv_iternext (smooth)))
1552	{	1825	{
		1826	smooth_key skey = (smooth_key )HeKEY (he);
		1827	IV bits = SvIVX (HeVAL (he));
		1828
		1829	if (!(bits & 0x1000)
		1830	&& skey->level == level
		1831	&& level > smooth_max [skey->x][skey->y])
		1832	{
		1833	maptex tex = self->tex [skey->tile];
		1834	int px = (((int)skey->x) - 1) * T;
		1835	int py = (((int)skey->y) - 1) * T;
		1836	int border = bits & 15;
		1837	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1838	float dx = tex.s * .0625f; // 16 images/row
		1839	float dy = tex.t * .5f ; // 2 images/column
		1840
		1841	// this time naively avoiding texture state changes
		1842	// save gobs of state changes.
		1843	if (last_name != tex.name)
		1844	{
		1845	if (!tex.name)
		1846	continue; // smoothing not yet available
		1847
1553	glEnd ();	1848	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1849	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	glBegin (GL_QUADS);	1850	glBegin (GL_QUADS);
		1851	}
		1852
		1853	if (border)
		1854	{
		1855	float ox = border * dx;
		1856
		1857	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1858	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1859	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1860	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1861	}
		1862
		1863	if (corner)
		1864	{
		1865	float ox = corner * dx;
		1866
		1867	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1868	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1869	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1870	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1871	}
1556	}	1872	}
1557
1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562	}
1563
1564	if (cell->flags && z == 2)
1565	{
1566	if (cell->flags & 1)
1567	{
1568	maptex tex = self->tex [1];
1569	int px = (x + 1) * 32 - tex.w + 2;
1570	int py = (y + 1) * 32 - tex.h - 6;
1571
1572	glEnd ();
1573	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574	glBegin (GL_QUADS);
1575
1576	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580	}	1873	}
1581	}	1874	}
1582	}
1583	}	1875	}
		1876	}
		1877
		1878	hv_clear (smooth);
		1879	}
1584		1880
1585	glEnd ();	1881	glEnd ();
1586		1882
1587	glDisable (GL_TEXTURE_2D);	1883	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1884	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1892	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1893	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1894	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1895	mapcell *cell = row->col + (x + mx - row->c0);
1600		1896
1601	int px = x * 32;	1897	int px = x * T;
1602	int py = y * 32;	1898	int py = y * T;
1603		1899
1604	if (cell->stat_hp)	1900	if (cell->stat_hp)
1605	{	1901	{
1606	int width = cell->stat_width * 32;	1902	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1903	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1904
1609	glColor3ub (0, 0, 0);	1905	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1906	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1907	px + width - 1, py);
1612		1908
…		…
1678	glDisable (GL_BLEND);	1974	glDisable (GL_BLEND);
1679	glDisable (GL_TEXTURE_2D);	1975	glDisable (GL_TEXTURE_2D);
1680	}	1976	}
1681		1977
1682	void	1978	void
1683	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1979	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1684	PPCODE:	1980	PPCODE:
1685	{	1981	{
1686	int x, y;	1982	int x, y;
1687	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1688	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1708	darkness[y * sw4 + x] = cell->darkness	2004	darkness[y * sw4 + x] = cell->darkness
1709	? 255 - (cell->darkness - 1)	2005	? 255 - (cell->darkness - 1)
1710	: 255 - FOW_DARKNESS;	2006	: 255 - FOW_DARKNESS;
1711	}	2007	}
1712	}	2008	}
		2009
		2010	if (smoothing)
		2011	{
		2012	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		2013	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2014
		2015	SvPOK_only (darkness2_sv);
		2016	SvCUR_set (darkness2_sv, sw4 * sh);
		2017
		2018	for (y = 0; y < sh; ++y)
		2019	for (x = 0; x < sw4; ++x)
		2020	{
		2021	float f = (float )matrix;
		2022	int dx, dy;
		2023	float sum = 0.f;
		2024
		2025	for (dy = -1; dy <= 1; ++dy)
		2026	for (dx = -1; dx <= 1; ++dx)
		2027	{
		2028	unsigned int x2 = x + dx;
		2029	unsigned int y2 = y + dy;
		2030
		2031	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2032	}
		2033
		2034	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2035	}
		2036
		2037	darkness_sv = darkness2_sv;
		2038	}
1713		2039
1714	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1715	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1716	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1717	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
…		…
1751	if (row && row->c0 <= x && x < row->c1)	2077	if (row && row->c0 <= x && x < row->c1)
1752	{	2078	{
1753	mapcell *cell = row->col + (x - row->c0);	2079	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	2080	uint8_t flags = 0;
1755		2081
1756	if (cell->face [0]) flags \|= 1;	2082	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	2083	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	2084	if (cell->tile [2]) flags \|= 4;
1759		2085
1760	*data++ = flags;	2086	*data++ = flags;
1761		2087
1762	if (flags & 1)	2088	if (flags & 1)
1763	{	2089	{
		2090	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	2091	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	2092	*data++ = tile;
1766	}	2093	}
1767		2094
1768	if (flags & 2)	2095	if (flags & 2)
1769	{	2096	{
		2097	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	2098	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	2099	*data++ = tile;
1772	}	2100	}
1773		2101
1774	if (flags & 4)	2102	if (flags & 4)
1775	{	2103	{
		2104	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	2105	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	2106	*data++ = tile;
1778	}	2107	}
1779	}	2108	}
1780	else	2109	else
1781	*data++ = 0;	2110	*data++ = 0;
1782	}	2111	}
…		…
1822	{	2151	{
1823	uint8_t flags = *data++;	2152	uint8_t flags = *data++;
1824		2153
1825	if (flags)	2154	if (flags)
1826	{	2155	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2156	mapcell *cell = row_get_cell (row, x);
		2157	tileid tile[3] = { 0, 0, 0 };
1830		2158
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2159	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2160	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2161	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2162
1835	if (cell->darkness == 0)	2163	if (cell->darkness == 0)
1836	{	2164	{
1837	cell->darkness = 0;	2165	cell->darkness = 0;
1838		2166
1839	for (z = 0; z <= 2; z++)	2167	for (z = 0; z <= 2; z++)
1840	{	2168	{
1841	cell->face[z] = face[z];	2169	tileid t = tile [z];
1842		2170
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2171	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2172	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2173	XPUSHs (sv_2mortal (newSViv (t)));
		2174	need_texid (self, t);
		2175	}
		2176
		2177	cell->tile [z] = t;
1845	}	2178	}
1846	}	2179	}
1847	}	2180	}
1848	}	2181	}
1849	}	2182	}
…		…
1884	CODE:	2217	CODE:
1885	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
1886	OUTPUT:	2219	OUTPUT:
1887	RETVAL	2220	RETVAL
1888		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
1889	CFPlus::MixMusic	2229	CFPlus::MixMusic
1890	new_from_file (SV class, char path)	2230	new_from_file (SV class, char path)
1891	CODE:	2231	CODE:
1892	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
1893	OUTPUT:	2233	OUTPUT:
…		…
1900		2240
1901	int	2241	int
1902	play (CFPlus::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
1903	CODE:	2243	CODE:
1904	RETVAL = Mix_PlayMusic (self, loops);	2244	RETVAL = Mix_PlayMusic (self, loops);
		2245	OUTPUT:
		2246	RETVAL
		2247
		2248	int
		2249	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2250	CODE:
		2251	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1905	OUTPUT:	2252	OUTPUT:
1906	RETVAL	2253	RETVAL
1907		2254
1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1909		2256
…		…
1913	static const struct {	2260	static const struct {
1914	const char *name;	2261	const char *name;
1915	IV iv;	2262	IV iv;
1916	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
1917	# define const_iv(name) { # name, (IV)name }	2264	# define const_iv(name) { # name, (IV)name }
		2265	const_iv (GL_VENDOR),
		2266	const_iv (GL_VERSION),
		2267	const_iv (GL_EXTENSIONS),
1918	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
1919	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
1920	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
1921	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
1922	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
…		…
1949	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
1950	const_iv (GL_LUMINANCE_ALPHA),	2300	const_iv (GL_LUMINANCE_ALPHA),
1951	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
1952	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1953	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
1954	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
1955	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
1956	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
1957	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
1958	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1998	# undef const_iv	2350	# undef const_iv
1999	};	2351	};
2000		2352
2001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2355
		2356	texture_av = newAV ();
		2357	AvREAL_off (texture_av);
2003	}	2358	}
2004		2359
2005	char *	2360	char *
2006	gl_vendor ()	2361	gl_vendor ()
2007	CODE:	2362	CODE:
…		…
2018		2373
2019	char *	2374	char *
2020	gl_extensions ()	2375	gl_extensions ()
2021	CODE:	2376	CODE:
2022	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2377	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2378	OUTPUT:
		2379	RETVAL
		2380
		2381	const char *glGetString (GLenum pname)
		2382
		2383	GLint glGetInteger (GLenum pname)
		2384	CODE:
		2385	glGetIntegerv (pname, &RETVAL);
		2386	OUTPUT:
		2387	RETVAL
		2388
		2389	GLdouble glGetDouble (GLenum pname)
		2390	CODE:
		2391	glGetDoublev (pname, &RETVAL);
2023	OUTPUT:	2392	OUTPUT:
2024	RETVAL	2393	RETVAL
2025		2394
2026	int glGetError ()	2395	int glGetError ()
2027		2396
…		…
2152		2521
2153	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2522	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154		2523
2155	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2524	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2156		2525
		2526	void glPixelZoom (float x, float y)
		2527
2157	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2528	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158		2529
2159	int glGenTexture ()	2530	int glGenTexture ()
2160	CODE:	2531	CODE:
2161	{	2532	RETVAL = gen_texture ();
2162	GLuint name;
2163	glGenTextures (1, &name);
2164	RETVAL = name;
2165	}
2166	OUTPUT:	2533	OUTPUT:
2167	RETVAL	2534	RETVAL
2168		2535
2169	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
2170	CODE:	2537	CODE:
2171	{
2172	GLuint name_ = name;
2173	glDeleteTextures (1, &name_);	2538	del_texture (name);
2174	}	2539
2175
2176	int glGenList ()	2540	int glGenList ()
2177	CODE:	2541	CODE:
2178	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
2179	OUTPUT:	2543	OUTPUT:
2180	RETVAL	2544	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs. Revision 1.201 by root, Tue Jul 17 17:39:06 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 2007 UTC