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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.168 by root, Sat Dec 9 21:26:45 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
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
9	#endif	14	#endif
10		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"
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
76	}	84	}
77		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
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
81	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
82	#include "pango-render.c"	114	#include "pango-render.c"
…		…
155		187
156	*w = rect.width;	188	*w = rect.width;
157	*h = rect.height;	189	*h = rect.height;
158	}	190	}
159		191
		192	typedef uint16_t tileid;
160	typedef uint16_t mapface;	193	typedef uint16_t faceid;
161		194
162	typedef struct {	195	typedef struct {
163	GLint name;	196	int name;
164	int w, h;	197	int w, h;
165	float s, t;	198	float s, t;
166	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
167	} maptex;	202	} maptex;
168		203
169	typedef struct {	204	typedef struct {
170	uint32_t player;	205	uint32_t player;
171	mapface face[3];	206	tileid tile[3];
172	uint16_t darkness;	207	uint16_t darkness;
173	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
174	} mapcell;	209	} mapcell;
175		210
176	typedef struct {	211	typedef struct {
177	int32_t c0, c1;	212	int32_t c0, c1;
178	mapcell *col;	213	mapcell *col;
179	} maprow;	214	} maprow;
180		215
181	typedef struct map {	216	typedef struct map {
182	int x, y, w, h;	217	int x, y, w, h;
183	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
184	int faces;	219	int faces; tileid *face2tile; // [faceid]
185	mapface *face;	220	int texs; maptex *tex; // [tileid]
186
187	int texs;
188	maptex *tex;
189		221
190	int32_t rows;	222	int32_t rows;
191	maprow *row;	223	maprow *row;
192	} *CFPlus__Map;	224	} *CFPlus__Map;
193		225
…		…
213	return ptr;	245	return ptr;
214	}	246	}
215		247
216	#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))
217	#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	}
218		270
219	static maprow *	271	static maprow *
220	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
221	{	273	{
222	if (0 > y)	274	if (0 > y)
…		…
315	cell->stat_hp = 0;	367	cell->stat_hp = 0;
316	cell->flags = 0;	368	cell->flags = 0;
317	cell->player = 0;	369	cell->player = 0;
318	}	370	}
319	}	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);
320	}	388	}
321		389
322	static void	390	static void
323	music_finished (void)	391	music_finished (void)
324	{	392	{
…		…
519	opengl_fontmap = pango_opengl_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
520	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);
521	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
522	}	590	}
523		591
		592	char *
		593	SDL_GetError ()
		594
524	int	595	int
525	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
526		597
527	void	598	void
528	SDL_Quit ()	599	SDL_Quit ()
529		600
530	void	601	void
531	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
532	PPCODE:	603	PPCODE:
533	{	604	{
534	SDL_Rect **m;	605	SDL_Rect **m;
535		606
536	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
537	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
538	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
539	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
540		611
541	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
542	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
543		614
544	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
545	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
546	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
547	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
548		619
549	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
550	#if SDL_VERSION_ATLEAST(1,2,10)	621	#if SDL_VERSION_ATLEAST(1,2,10)
551	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
552	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
553	#endif	624	#endif
554		625
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);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
559		627
560	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
561	while (*m)	629	while (*m)
562	{	630	{
		631	if ((m)->w >= 640 && (m)->h >= 480)
		632	{
563	AV *av = newAV ();	633	AV *av = newAV ();
564	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
565	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));
566	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
567		640
568	++m;	641	++m;
569	}	642	}
570	}	643	}
571		644
572	char *
573	SDL_GetError ()
574
575	int	645	int
576	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
577	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
578	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	659	);
		660
581	if (RETVAL)	661	if (RETVAL)
582	{	662	{
		663	av_clear (texture_av);
		664
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# 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);
585	# include "glfunc.h"	667	#include "glfunc.h"
586	# undef GL_FUNC	668	#undef GL_FUNC
587	}	669	}
		670	}
588	OUTPUT:	671	OUTPUT:
589	RETVAL	672	RETVAL
590		673
591	void	674	void
592	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
593		676
594	char *	677	char *
595	SDL_GetKeyName (int sym)	678	SDL_GetKeyName (int sym)
596		679
		680	int
		681	SDL_GetAppState ()
		682
597	void	683	void
598	SDL_PollEvent ()	684	poll_events ()
599	PPCODE:	685	PPCODE:
600	{	686	{
601	SDL_Event ev;	687	SDL_Event ev;
602		688
603	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
604	{	691	{
605	HV *hv = newHV ();	692	HV *hv = newHV ();
606	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
607		694
608	switch (ev.type)	695	switch (ev.type)
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	709	break;
623		710
624	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
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
632	break;	737	break;
633		738
634	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
666		771
667	void	772	void
668	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
669	CODE:	774	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		776
674	void	777	void
675	win32_proxy_info ()	778	win32_proxy_info ()
676	PPCODE:	779	PPCODE:
677	{	780	{
…		…
818	ExitThread (retval); // unclean, please beam me up	921	ExitThread (retval); // unclean, please beam me up
819	#else	922	#else
820	_exit (retval);	923	_exit (retval);
821	#endif	924	#endif
822		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
823	MODULE = CFPlus PACKAGE = CFPlus::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
824		936
825	CFPlus::Font	937	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	938	new_from_file (SV class, char path, int id = 0)
827	CODE:	939	CODE:
…		…
1142	flags	1254	flags
1143	);	1255	);
1144		1256
1145	MODULE = CFPlus PACKAGE = CFPlus::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
1146		1258
		1259	int minpot (int n)
		1260
1147	void	1261	void
1148	pad2pot (SV data_, SV w_, SV *h_)	1262	pad2pot (SV data_, SV w_, SV *h_)
1149	CODE:	1263	CODE:
1150	{	1264	{
1151	int ow = SvIV (w_);	1265	int ow = SvIV (w_);
…		…
1228	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
1229	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
1230	}	1344	}
1231	}	1345	}
1232		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
1233	MODULE = CFPlus PACKAGE = CFPlus::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1234		1359
1235	CFPlus::Map	1360	CFPlus::Map
1236	new (SV *class)	1361	new (SV *class)
1237	CODE:	1362	CODE:
…		…
1240	RETVAL->y = 0;	1365	RETVAL->y = 0;
1241	RETVAL->w = 0;	1366	RETVAL->w = 0;
1242	RETVAL->h = 0;	1367	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1368	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1369	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1370	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1371	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;	1372	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1373	RETVAL->row = 0;
1251	OUTPUT:	1374	OUTPUT:
1252	RETVAL	1375	RETVAL
1253		1376
1254	void	1377	void
1255	DESTROY (CFPlus::Map self)	1378	DESTROY (CFPlus::Map self)
1256	CODE:	1379	CODE:
1257	{	1380	{
1258	map_clear (self);	1381	map_clear (self);
1259	Safefree (self->face);	1382	Safefree (self->face2tile);
1260	Safefree (self->tex);	1383	Safefree (self->tex);
1261	Safefree (self);	1384	Safefree (self);
1262	}	1385	}
1263		1386
1264	void	1387	void
…		…
1271	clear (CFPlus::Map self)	1394	clear (CFPlus::Map self)
1272	CODE:	1395	CODE:
1273	map_clear (self);	1396	map_clear (self);
1274		1397
1275	void	1398	void
1276	set_face (CFPlus::Map self, int face, int texid)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1400	CODE:
1278	{	1401	{
1279	while (self->faces <= face)	1402	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1403	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1404	}
1282	self->faces *= 2;
1283	}
1284		1405
1285	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;
1286	}	1427	}
1287		1428
1288	void	1429	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)	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)
1290	CODE:	1431	CODE:
1291	{	1432	{
1292	while (self->texs <= texid)	1433	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1434
1298	{	1435	{
1299	maptex *tex = self->tex + texid;	1436	maptex *tex = self->tex + texid;
1300		1437
1301	tex->name = name;	1438	tex->name = name;
…		…
1345	CODE:	1482	CODE:
1346	{	1483	{
1347	if (dx > 0)	1484	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1486	else if (dx < 0)
1350	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);
1351		1488
1352	if (dy > 0)	1489	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1490	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1491	else if (dy < 0)
1355	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);
1356		1493
1357	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1359		1496
1360	while (self->y < 0)	1497	while (self->y < 0)
…		…
1412	cell->stat_width = 1;	1549	cell->stat_width = 1;
1413	cell->stat_hp = *data++;	1550	cell->stat_hp = *data++;
1414	}	1551	}
1415	else if (cmd == 6) // monster width	1552	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1553	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47) // monster width	1554	else if (cmd == 0x47)
1418	{	1555	{
1419	if (*data == 4)	1556	if (*data == 4)
1420	; // decode player tag	1557	; // decode player count
1421		1558
1422	data += *data + 1;	1559	data += *data + 1;
1423	}	1560	}
1424	else if (cmd == 8) // cell flags	1561	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1562	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1571	cell->darkness = *data++ + 1;
1435	}	1572	}
1436		1573
1437	if (flags & 4)	1574	if (flags & 4)
1438	{	1575	{
1439	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];
1440	}	1579	}
1441		1580
1442	if (flags & 2)	1581	if (flags & 2)
1443	{	1582	{
1444	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];
1445	}	1586	}
1446		1587
1447	if (flags & 1)	1588	if (flags & 1)
1448	{	1589	{
1449	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];
1450	}	1593	}
1451	}	1594	}
1452	else	1595	else
1453	cell->darkness = 0;	1596	cell->darkness = 0;
1454	}	1597	}
…		…
1484	{	1627	{
1485	mapcell *cell = row->col + (x - row->c0);	1628	mapcell *cell = row->col + (x - row->c0);
1486		1629
1487	for (z = 0; z <= 0; z++)	1630	for (z = 0; z <= 0; z++)
1488	{	1631	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1632	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1633	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1634	int a1 = tex.a;
1496		1635
1497	r = (r * a0 + tex.r * a1) / 255;	1636	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1637	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1638	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1639	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1640	}
1503	}	1641	}
1504		1642
1505	*map++ = (r )	1643	*map++ = (r )
1506	\| (g << 8)	1644	\| (g << 8)
…		…
1513	}	1651	}
1514	OUTPUT:	1652	OUTPUT:
1515	RETVAL	1653	RETVAL
1516		1654
1517	void	1655	void
1518	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)
1519	CODE:	1657	CODE:
1520	{	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;
1521	int x, y, z;	1663	int x, y, z;
1522	int last_name;	1664	int last_name;
1523	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));
1524		1672
1525	glColor4ub (255, 255, 255, 255);	1673	glColor4ub (255, 255, 255, 255);
1526		1674
1527	glEnable (GL_BLEND);	1675	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1676	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1682	last_name = 0;
1535		1683
1536	mx += self->x;	1684	mx += self->x;
1537	my += self->y;	1685	my += self->y;
1538		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
1539	for (z = 0; z < 3; z++)	1709	for (z = 0; z <= 2; z++)
		1710	{
		1711	memset (smooth_level, 0, sizeof (smooth_level));
		1712
1540	for (y = 0; y < sh; y++)	1713	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1714	if (0 <= y + my && y + my < self->rows)
1542	{	1715	{
1543	maprow *row = self->row + (y + my);	1716	maprow *row = self->row + (y + my);
1544		1717
1545	for (x = 0; x < sw; x++)	1718	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1719	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1720	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1721	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	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;
1551		1729
1552	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))
1553	{	1819	{
1554	maptex tex = self->tex [face];	1820	int level = (w << 5) \| b;
1555	int px = (x + 1) * 32 - tex.w;	1821	HE *he;
1556	int py = (y + 1) * 32 - tex.h;
1557		1822
1558	if (last_name != tex.name)	1823	hv_iterinit (smooth);
		1824	while ((he = hv_iternext (smooth)))
1559	{	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
1560	glEnd ();	1848	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1849	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	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	}
1563	}	1872	}
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) * 32 - tex.w + 2;
1577	int py = (y + 1) * 32 - 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	}	1873	}
1588	}	1874	}
1589	}
1590	}	1875	}
		1876	}
		1877
		1878	hv_clear (smooth);
		1879	}
1591		1880
1592	glEnd ();	1881	glEnd ();
1593		1882
1594	glDisable (GL_TEXTURE_2D);	1883	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1884	glDisable (GL_BLEND);
…		…
1603	for (x = 0; x < sw; x++)	1892	for (x = 0; x < sw; x++)
1604	if (row->c0 <= x + mx && x + mx < row->c1)	1893	if (row->c0 <= x + mx && x + mx < row->c1)
1605	{	1894	{
1606	mapcell *cell = row->col + (x + mx - row->c0);	1895	mapcell *cell = row->col + (x + mx - row->c0);
1607		1896
1608	int px = x * 32;	1897	int px = x * T;
1609	int py = y * 32;	1898	int py = y * T;
1610		1899
1611	if (cell->stat_hp)	1900	if (cell->stat_hp)
1612	{	1901	{
1613	int width = cell->stat_width * 32;	1902	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1903	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1904
1616	glColor3ub (0, 0, 0);	1905	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1906	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1907	px + width - 1, py);
1619		1908
…		…
1685	glDisable (GL_BLEND);	1974	glDisable (GL_BLEND);
1686	glDisable (GL_TEXTURE_2D);	1975	glDisable (GL_TEXTURE_2D);
1687	}	1976	}
1688		1977
1689	void	1978	void
1690	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)
1691	PPCODE:	1980	PPCODE:
1692	{	1981	{
1693	int x, y;	1982	int x, y;
1694	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1695	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1715	darkness[y * sw4 + x] = cell->darkness	2004	darkness[y * sw4 + x] = cell->darkness
1716	? 255 - (cell->darkness - 1)	2005	? 255 - (cell->darkness - 1)
1717	: 255 - FOW_DARKNESS;	2006	: 255 - FOW_DARKNESS;
1718	}	2007	}
1719	}	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	}
1720		2039
1721	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1722	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1723	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1724	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2077	if (row && row->c0 <= x && x < row->c1)
1759	{	2078	{
1760	mapcell *cell = row->col + (x - row->c0);	2079	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2080	uint8_t flags = 0;
1762		2081
1763	if (cell->face [0]) flags \|= 1;	2082	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2083	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2084	if (cell->tile [2]) flags \|= 4;
1766		2085
1767	*data++ = flags;	2086	*data++ = flags;
1768		2087
1769	if (flags & 1)	2088	if (flags & 1)
1770	{	2089	{
		2090	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2091	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2092	*data++ = tile;
1773	}	2093	}
1774		2094
1775	if (flags & 2)	2095	if (flags & 2)
1776	{	2096	{
		2097	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2098	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2099	*data++ = tile;
1779	}	2100	}
1780		2101
1781	if (flags & 4)	2102	if (flags & 4)
1782	{	2103	{
		2104	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2105	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2106	*data++ = tile;
1785	}	2107	}
1786	}	2108	}
1787	else	2109	else
1788	*data++ = 0;	2110	*data++ = 0;
1789	}	2111	}
…		…
1829	{	2151	{
1830	uint8_t flags = *data++;	2152	uint8_t flags = *data++;
1831		2153
1832	if (flags)	2154	if (flags)
1833	{	2155	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2156	mapcell *cell = row_get_cell (row, x);
		2157	tileid tile[3] = { 0, 0, 0 };
1837		2158
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2159	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2160	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2161	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2162
1842	if (cell->darkness == 0)	2163	if (cell->darkness == 0)
1843	{	2164	{
1844	cell->darkness = 0;	2165	cell->darkness = 0;
1845		2166
1846	for (z = 0; z <= 2; z++)	2167	for (z = 0; z <= 2; z++)
1847	{	2168	{
1848	cell->face[z] = face[z];	2169	tileid t = tile [z];
1849		2170
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2171	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2172	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2173	XPUSHs (sv_2mortal (newSViv (t)));
		2174	need_texid (self, t);
		2175	}
		2176
		2177	cell->tile [z] = t;
1852	}	2178	}
1853	}	2179	}
1854	}	2180	}
1855	}	2181	}
1856	}	2182	}
…		…
1891	CODE:	2217	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2219	OUTPUT:
1894	RETVAL	2220	RETVAL
1895		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
1896	CFPlus::MixMusic	2229	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2230	new_from_file (SV class, char path)
1898	CODE:	2231	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2233	OUTPUT:
…		…
1907		2240
1908	int	2241	int
1909	play (CFPlus::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
1910	CODE:	2243	CODE:
1911	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);
1912	OUTPUT:	2252	OUTPUT:
1913	RETVAL	2253	RETVAL
1914		2254
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1916		2256
…		…
1920	static const struct {	2260	static const struct {
1921	const char *name;	2261	const char *name;
1922	IV iv;	2262	IV iv;
1923	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
1924	# 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),
1925	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
1926	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
1927	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
1928	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
1929	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
…		…
1956	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
1957	const_iv (GL_LUMINANCE_ALPHA),	2300	const_iv (GL_LUMINANCE_ALPHA),
1958	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
1959	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1960	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
1961	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
1962	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
1963	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
1964	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
1965	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2005	# undef const_iv	2350	# undef const_iv
2006	};	2351	};
2007		2352
2008	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; )
2009	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);
2010	}	2358	}
2011		2359
2012	char *	2360	char *
2013	gl_vendor ()	2361	gl_vendor ()
2014	CODE:	2362	CODE:
…		…
2025		2373
2026	char *	2374	char *
2027	gl_extensions ()	2375	gl_extensions ()
2028	CODE:	2376	CODE:
2029	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);
2030	OUTPUT:	2392	OUTPUT:
2031	RETVAL	2393	RETVAL
2032		2394
2033	int glGetError ()	2395	int glGetError ()
2034		2396
…		…
2159		2521
2160	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)
2161		2523
2162	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)
2163		2525
		2526	void glPixelZoom (float x, float y)
		2527
2164	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)
2165		2529
2166	int glGenTexture ()	2530	int glGenTexture ()
2167	CODE:	2531	CODE:
2168	{	2532	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2533	OUTPUT:
2174	RETVAL	2534	RETVAL
2175		2535
2176	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
2177	CODE:	2537	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2538	del_texture (name);
2181	}	2539
2182
2183	int glGenList ()	2540	int glGenList ()
2184	CODE:	2541	CODE:
2185	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
2186	OUTPUT:	2543	OUTPUT:
2187	RETVAL	2544	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.168 by root, Sat Dec 9 21:26:45 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.168 by root, Sat Dec 9 21:26:45 2006 UTC vs.
Revision 1.201 by root, Tue Jul 17 17:39:06 2007 UTC