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