[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.203 by root, Thu Jul 19 13:45:16 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
1140	void	1260	int minpot (int n)
1141	pad2pot (SV data_, SV w_, SV *h_)
1142	CODE:
1143	{
1144	int ow = SvIV (w_);
1145	int oh = SvIV (h_);
1146		1261
1147	if (ow && oh)	1262	void
		1263	pad (SV *data_, int ow, int oh, int nw, int nh)
		1264	CODE:
		1265	{
		1266	if ((nw != ow \|\| nh != oh) && SvOK (data_))
1148	{	1267	{
1149	int nw = minpot (ow);
1150	int nh = minpot (oh);
1151
1152	if (nw != ow \|\| nh != oh)
1153	{
1154	if (SvOK (data_))
1155	{
1156	STRLEN datalen;	1268	STRLEN datalen;
1157	char *data = SvPVbyte (data_, datalen);	1269	char *data = SvPVbyte (data_, datalen);
1158	int bpp = datalen / (ow * oh);	1270	int bpp = datalen / (ow * oh);
1159	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1271	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1160		1272
1161	SvPOK_only (result_);	1273	SvPOK_only (result_);
1162	SvCUR_set (result_, nw * nh * bpp);	1274	SvCUR_set (result_, nw * nh * bpp);
1163		1275
1164	memset (SvPVX (result_), 0, nw * nh * bpp);	1276	memset (SvPVX (result_), 0, nw * nh * bpp);
1165	while (oh--)	1277	while (oh--)
1166	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1278	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1167		1279
1168	sv_setsv (data_, result_);	1280	sv_setsv (data_, result_);
1169	}
1170
1171	sv_setiv (w_, nw);
1172	sv_setiv (h_, nh);
1173	}
1174	}	1281	}
1175	}	1282	}
1176		1283
1177	void	1284	void
1178	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1285	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1220	{	1327	{
1221	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1222	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1223	}	1330	}
1224	}	1331	}
		1332
		1333	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1334	CODE:
		1335	{
		1336	GLint width;
		1337	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1338	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1339	RETVAL = width > 0;
		1340	}
		1341	OUTPUT:
		1342	RETVAL
1225		1343
1226	MODULE = CFPlus PACKAGE = CFPlus::Map	1344	MODULE = CFPlus PACKAGE = CFPlus::Map
1227		1345
1228	CFPlus::Map	1346	CFPlus::Map
1229	new (SV *class)	1347	new (SV *class)
…		…
1233	RETVAL->y = 0;	1351	RETVAL->y = 0;
1234	RETVAL->w = 0;	1352	RETVAL->w = 0;
1235	RETVAL->h = 0;	1353	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1354	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1355	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1356	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1357	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;	1358	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1359	RETVAL->row = 0;
1244	OUTPUT:	1360	OUTPUT:
1245	RETVAL	1361	RETVAL
1246		1362
1247	void	1363	void
1248	DESTROY (CFPlus::Map self)	1364	DESTROY (CFPlus::Map self)
1249	CODE:	1365	CODE:
1250	{	1366	{
1251	map_clear (self);	1367	map_clear (self);
1252	Safefree (self->face);	1368	Safefree (self->face2tile);
1253	Safefree (self->tex);	1369	Safefree (self->tex);
1254	Safefree (self);	1370	Safefree (self);
1255	}	1371	}
1256		1372
1257	void	1373	void
…		…
1264	clear (CFPlus::Map self)	1380	clear (CFPlus::Map self)
1265	CODE:	1381	CODE:
1266	map_clear (self);	1382	map_clear (self);
1267		1383
1268	void	1384	void
1269	set_face (CFPlus::Map self, int face, int texid)	1385	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1386	CODE:
1271	{	1387	{
1272	while (self->faces <= face)	1388	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1389	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1390	}
1275	self->faces *= 2;
1276	}
1277		1391
1278	self->face [face] = texid;	1392	void
		1393	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1394	CODE:
		1395	{
		1396	tileid texid;
		1397	maptex *tex;
		1398
		1399	if (face < 0 \|\| face >= self->faces)
		1400	return;
		1401
		1402	if (smooth < 0 \|\| smooth >= self->faces)
		1403	return;
		1404
		1405	texid = self->face2tile [face];
		1406
		1407	if (!texid)
		1408	return;
		1409
		1410	tex = self->tex + texid;
		1411	tex->smoothtile = self->face2tile [smooth];
		1412	tex->smoothlevel = level;
1279	}	1413	}
1280		1414
1281	void	1415	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)	1416	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1283	CODE:	1417	CODE:
1284	{	1418	{
1285	while (self->texs <= texid)	1419	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1420
1291	{	1421	{
1292	maptex *tex = self->tex + texid;	1422	maptex *tex = self->tex + texid;
1293		1423
1294	tex->name = name;	1424	tex->name = name;
…		…
1338	CODE:	1468	CODE:
1339	{	1469	{
1340	if (dx > 0)	1470	if (dx > 0)
1341	map_blank (self, self->x, self->y, dx, self->h);	1471	map_blank (self, self->x, self->y, dx, self->h);
1342	else if (dx < 0)	1472	else if (dx < 0)
1343	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1473	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344		1474
1345	if (dy > 0)	1475	if (dy > 0)
1346	map_blank (self, self->x, self->y, self->w, dy);	1476	map_blank (self, self->x, self->y, self->w, dy);
1347	else if (dy < 0)	1477	else if (dy < 0)
1348	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1478	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349		1479
1350	self->ox += dx; self->x += dx;	1480	self->ox += dx; self->x += dx;
1351	self->oy += dy; self->y += dy;	1481	self->oy += dy; self->y += dy;
1352		1482
1353	while (self->y < 0)	1483	while (self->y < 0)
…		…
1405	cell->stat_width = 1;	1535	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1536	cell->stat_hp = *data++;
1407	}	1537	}
1408	else if (cmd == 6) // monster width	1538	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1539	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1540	else if (cmd == 0x47)
1411	{	1541	{
1412	if (*data == 4)	1542	if (*data == 4)
1413	; // decode player tag	1543	; // decode player count
1414		1544
1415	data += *data + 1;	1545	data += *data + 1;
1416	}	1546	}
1417	else if (cmd == 8) // cell flags	1547	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1548	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1557	cell->darkness = *data++ + 1;
1428	}	1558	}
1429		1559
1430	if (flags & 4)	1560	if (flags & 4)
1431	{	1561	{
1432	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1562	faceid face = (data [0] << 8) + data [1]; data += 2;
		1563	need_facenum (self, face);
		1564	cell->tile [0] = self->face2tile [face];
1433	}	1565	}
1434		1566
1435	if (flags & 2)	1567	if (flags & 2)
1436	{	1568	{
1437	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1569	faceid face = (data [0] << 8) + data [1]; data += 2;
		1570	need_facenum (self, face);
		1571	cell->tile [1] = self->face2tile [face];
1438	}	1572	}
1439		1573
1440	if (flags & 1)	1574	if (flags & 1)
1441	{	1575	{
1442	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1576	faceid face = (data [0] << 8) + data [1]; data += 2;
		1577	need_facenum (self, face);
		1578	cell->tile [2] = self->face2tile [face];
1443	}	1579	}
1444	}	1580	}
1445	else	1581	else
1446	cell->darkness = 0;	1582	cell->darkness = 0;
1447	}	1583	}
…		…
1477	{	1613	{
1478	mapcell *cell = row->col + (x - row->c0);	1614	mapcell *cell = row->col + (x - row->c0);
1479		1615
1480	for (z = 0; z <= 0; z++)	1616	for (z = 0; z <= 0; z++)
1481	{	1617	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1618	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1619	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1620	int a1 = tex.a;
1489		1621
1490	r = (r * a0 + tex.r * a1) / 255;	1622	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1623	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1624	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1625	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1626	}
1496	}	1627	}
1497		1628
1498	*map++ = (r )	1629	*map++ = (r )
1499	\| (g << 8)	1630	\| (g << 8)
…		…
1506	}	1637	}
1507	OUTPUT:	1638	OUTPUT:
1508	RETVAL	1639	RETVAL
1509		1640
1510	void	1641	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1642	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1643	CODE:
1513	{	1644	{
		1645	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1646	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1647	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1648	smooth_key skey;
1514	int x, y, z;	1649	int x, y, z;
1515	int last_name;	1650	int last_name;
1516	mapface face;	1651
		1652	// thats current max. sorry.
		1653	if (sw > 255) sw = 255;
		1654	if (sh > 255) sh = 255;
		1655
		1656	// clear key, in case of extra padding
		1657	memset (&skey, 0, sizeof (skey));
1517		1658
1518	glColor4ub (255, 255, 255, 255);	1659	glColor4ub (255, 255, 255, 255);
1519		1660
1520	glEnable (GL_BLEND);	1661	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1662	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1668	last_name = 0;
1528		1669
1529	mx += self->x;	1670	mx += self->x;
1530	my += self->y;	1671	my += self->y;
1531		1672
		1673	// first pass: determine smooth_max
		1674	// rather ugly, if you ask me
		1675	// could also be stored inside mapcell and updated on change
		1676	memset (smooth_max, 0, sizeof (smooth_max));
		1677
		1678	for (y = 0; y < sh; y++)
		1679	if (0 <= y + my && y + my < self->rows)
		1680	{
		1681	maprow *row = self->row + (y + my);
		1682
		1683	for (x = 0; x < sw; x++)
		1684	if (row->c0 <= x + mx && x + mx < row->c1)
		1685	{
		1686	mapcell *cell = row->col + (x + mx - row->c0);
		1687
		1688	smooth_max[x + 1][y + 1] =
		1689	MAX (self->tex [cell->tile [0]].smoothlevel,
		1690	MAX (self->tex [cell->tile [1]].smoothlevel,
		1691	self->tex [cell->tile [2]].smoothlevel));
		1692	}
		1693	}
		1694
1532	for (z = 0; z < 3; z++)	1695	for (z = 0; z <= 2; z++)
		1696	{
		1697	memset (smooth_level, 0, sizeof (smooth_level));
		1698
1533	for (y = 0; y < sh; y++)	1699	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1700	if (0 <= y + my && y + my < self->rows)
1535	{	1701	{
1536	maprow *row = self->row + (y + my);	1702	maprow *row = self->row + (y + my);
1537		1703
1538	for (x = 0; x < sw; x++)	1704	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1705	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1706	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1707	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	face = cell->face [z];	1708	tileid tile = cell->tile [z];
		1709
		1710	if (tile)
		1711	{
		1712	maptex tex = self->tex [tile];
		1713	int px = (x + 1) * T - tex.w;
		1714	int py = (y + 1) * T - tex.h;
1544		1715
1545	if (face && face < self->texs)	1716	// suppressing texture state switches here
		1717	// is only moderately effective, but worth the extra effort
		1718	if (last_name != tex.name)
		1719	{
		1720	if (!tex.name)
		1721	tex = self->tex [2]; /* missing, replace by noface */
		1722
		1723	glEnd ();
		1724	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1725	glBegin (GL_QUADS);
		1726	}
		1727
		1728	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1729	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1730	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1731	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1732
		1733	if (cell->flags && z == 2)
		1734	{
		1735	if (cell->flags & 1)
		1736	{
		1737	maptex tex = self->tex [1];
		1738	int px = x * T + T * 2 / 32;
		1739	int py = y * T - T * 6 / 32;
		1740
		1741	glEnd ();
		1742	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1743	glBegin (GL_QUADS);
		1744
		1745	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1746	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1747	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1748	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1749	}
		1750	}
		1751
		1752	// update smooth hash
		1753	if (tex.smoothtile)
		1754	{
		1755	skey.tile = tex.smoothtile;
		1756	skey.level = tex.smoothlevel;
		1757
		1758	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1759
		1760	// add bits to current tile and all neighbours. skey.x\|y is
		1761	// shifted +1\|+1 so we always stay positive.
		1762
		1763	// bits is ___n cccc CCCC bbbb
		1764	// n do not draw borders&corners
		1765	// c draw these corners, but...
		1766	// C ... not these
		1767	// b draw these borders
		1768
		1769	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1770	// ┃· ·· ·┃ ━━
		1771
		1772	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1773	// ·· ·· ·┏ ┓·
		1774
		1775	// full tile
		1776	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1777
		1778	// borders
		1779	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1780	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1781	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1782	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1783
		1784	// corners
		1785	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1786	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1787	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1788	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1789	}
		1790	}
		1791	}
		1792	}
		1793
		1794	// go through all smoothlevels, lowest to highest, then draw.
		1795	// this is basically counting sort
		1796	{
		1797	int w, b;
		1798
		1799	for (w = 0; w < 256 / 32; ++w)
		1800	{
		1801	uint32_t smask = smooth_level [w];
		1802	if (smask)
		1803	for (b = 0; b < 32; ++b)
		1804	if (smask & (((uint32_t)1) << b))
1546	{	1805	{
1547	maptex tex = self->tex [face];	1806	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1807	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1808
1551	if (last_name != tex.name)	1809	hv_iterinit (smooth);
		1810	while ((he = hv_iternext (smooth)))
1552	{	1811	{
		1812	smooth_key skey = (smooth_key )HeKEY (he);
		1813	IV bits = SvIVX (HeVAL (he));
		1814
		1815	if (!(bits & 0x1000)
		1816	&& skey->level == level
		1817	&& level > smooth_max [skey->x][skey->y])
		1818	{
		1819	maptex tex = self->tex [skey->tile];
		1820	int px = (((int)skey->x) - 1) * T;
		1821	int py = (((int)skey->y) - 1) * T;
		1822	int border = bits & 15;
		1823	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1824	float dx = tex.s * .0625f; // 16 images/row
		1825	float dy = tex.t * .5f ; // 2 images/column
		1826
		1827	// this time naively avoiding texture state changes
		1828	// save gobs of state changes.
		1829	if (last_name != tex.name)
		1830	{
		1831	if (!tex.name)
		1832	continue; // smoothing not yet available
		1833
1553	glEnd ();	1834	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1835	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	glBegin (GL_QUADS);	1836	glBegin (GL_QUADS);
		1837	}
		1838
		1839	if (border)
		1840	{
		1841	float ox = border * dx;
		1842
		1843	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1844	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1846	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1847	}
		1848
		1849	if (corner)
		1850	{
		1851	float ox = corner * dx;
		1852
		1853	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1854	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1855	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1856	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1857	}
1556	}	1858	}
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	}	1859	}
1581	}	1860	}
1582	}
1583	}	1861	}
		1862	}
		1863
		1864	hv_clear (smooth);
		1865	}
1584		1866
1585	glEnd ();	1867	glEnd ();
1586		1868
1587	glDisable (GL_TEXTURE_2D);	1869	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1870	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1878	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1879	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1880	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1881	mapcell *cell = row->col + (x + mx - row->c0);
1600		1882
1601	int px = x * 32;	1883	int px = x * T;
1602	int py = y * 32;	1884	int py = y * T;
1603		1885
1604	if (cell->stat_hp)	1886	if (cell->stat_hp)
1605	{	1887	{
1606	int width = cell->stat_width * 32;	1888	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1889	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1890
1609	glColor3ub (0, 0, 0);	1891	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1892	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1893	px + width - 1, py);
1612		1894
…		…
1678	glDisable (GL_BLEND);	1960	glDisable (GL_BLEND);
1679	glDisable (GL_TEXTURE_2D);	1961	glDisable (GL_TEXTURE_2D);
1680	}	1962	}
1681		1963
1682	void	1964	void
1683	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1965	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1684	PPCODE:	1966	PPCODE:
1685	{	1967	{
1686	int x, y;	1968	int x, y;
1687	int sw4 = (sw + 3) & ~3;	1969	int sw4 = (sw + 3) & ~3;
1688	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1970	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1708	darkness[y * sw4 + x] = cell->darkness	1990	darkness[y * sw4 + x] = cell->darkness
1709	? 255 - (cell->darkness - 1)	1991	? 255 - (cell->darkness - 1)
1710	: 255 - FOW_DARKNESS;	1992	: 255 - FOW_DARKNESS;
1711	}	1993	}
1712	}	1994	}
		1995
		1996	if (smoothing)
		1997	{
		1998	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		1999	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2000
		2001	SvPOK_only (darkness2_sv);
		2002	SvCUR_set (darkness2_sv, sw4 * sh);
		2003
		2004	for (y = 0; y < sh; ++y)
		2005	for (x = 0; x < sw4; ++x)
		2006	{
		2007	float f = (float )matrix;
		2008	int dx, dy;
		2009	float sum = 0.f;
		2010
		2011	for (dy = -1; dy <= 1; ++dy)
		2012	for (dx = -1; dx <= 1; ++dx)
		2013	{
		2014	unsigned int x2 = x + dx;
		2015	unsigned int y2 = y + dy;
		2016
		2017	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2018	}
		2019
		2020	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2021	}
		2022
		2023	darkness_sv = darkness2_sv;
		2024	}
1713		2025
1714	EXTEND (SP, 3);	2026	EXTEND (SP, 3);
1715	PUSHs (sv_2mortal (newSViv (sw4)));	2027	PUSHs (sv_2mortal (newSViv (sw4)));
1716	PUSHs (sv_2mortal (newSViv (sh)));	2028	PUSHs (sv_2mortal (newSViv (sh)));
1717	PUSHs (darkness_sv);	2029	PUSHs (darkness_sv);
…		…
1751	if (row && row->c0 <= x && x < row->c1)	2063	if (row && row->c0 <= x && x < row->c1)
1752	{	2064	{
1753	mapcell *cell = row->col + (x - row->c0);	2065	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	2066	uint8_t flags = 0;
1755		2067
1756	if (cell->face [0]) flags \|= 1;	2068	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	2069	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	2070	if (cell->tile [2]) flags \|= 4;
1759		2071
1760	*data++ = flags;	2072	*data++ = flags;
1761		2073
1762	if (flags & 1)	2074	if (flags & 1)
1763	{	2075	{
		2076	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	2077	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	2078	*data++ = tile;
1766	}	2079	}
1767		2080
1768	if (flags & 2)	2081	if (flags & 2)
1769	{	2082	{
		2083	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	2084	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	2085	*data++ = tile;
1772	}	2086	}
1773		2087
1774	if (flags & 4)	2088	if (flags & 4)
1775	{	2089	{
		2090	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	2091	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	2092	*data++ = tile;
1778	}	2093	}
1779	}	2094	}
1780	else	2095	else
1781	*data++ = 0;	2096	*data++ = 0;
1782	}	2097	}
…		…
1822	{	2137	{
1823	uint8_t flags = *data++;	2138	uint8_t flags = *data++;
1824		2139
1825	if (flags)	2140	if (flags)
1826	{	2141	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2142	mapcell *cell = row_get_cell (row, x);
		2143	tileid tile[3] = { 0, 0, 0 };
1830		2144
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2145	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2146	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2147	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2148
1835	if (cell->darkness == 0)	2149	if (cell->darkness == 0)
1836	{	2150	{
1837	cell->darkness = 0;	2151	cell->darkness = 0;
1838		2152
1839	for (z = 0; z <= 2; z++)	2153	for (z = 0; z <= 2; z++)
1840	{	2154	{
1841	cell->face[z] = face[z];	2155	tileid t = tile [z];
1842		2156
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2157	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2158	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2159	XPUSHs (sv_2mortal (newSViv (t)));
		2160	need_texid (self, t);
		2161	}
		2162
		2163	cell->tile [z] = t;
1845	}	2164	}
1846	}	2165	}
1847	}	2166	}
1848	}	2167	}
1849	}	2168	}
…		…
1884	CODE:	2203	CODE:
1885	RETVAL = Mix_VolumeMusic (volume);	2204	RETVAL = Mix_VolumeMusic (volume);
1886	OUTPUT:	2205	OUTPUT:
1887	RETVAL	2206	RETVAL
1888		2207
		2208	int
		2209	fade_out (int ms)
		2210	CODE:
		2211	RETVAL = Mix_FadeOutMusic (ms);
		2212	OUTPUT:
		2213	RETVAL
		2214
1889	CFPlus::MixMusic	2215	CFPlus::MixMusic
1890	new_from_file (SV class, char path)	2216	new_from_file (SV class, char path)
1891	CODE:	2217	CODE:
1892	RETVAL = Mix_LoadMUS (path);	2218	RETVAL = Mix_LoadMUS (path);
1893	OUTPUT:	2219	OUTPUT:
…		…
1900		2226
1901	int	2227	int
1902	play (CFPlus::MixMusic self, int loops = -1)	2228	play (CFPlus::MixMusic self, int loops = -1)
1903	CODE:	2229	CODE:
1904	RETVAL = Mix_PlayMusic (self, loops);	2230	RETVAL = Mix_PlayMusic (self, loops);
		2231	OUTPUT:
		2232	RETVAL
		2233
		2234	int
		2235	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2236	CODE:
		2237	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1905	OUTPUT:	2238	OUTPUT:
1906	RETVAL	2239	RETVAL
1907		2240
1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2241	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1909		2242
…		…
1913	static const struct {	2246	static const struct {
1914	const char *name;	2247	const char *name;
1915	IV iv;	2248	IV iv;
1916	} *civ, const_iv[] = {	2249	} *civ, const_iv[] = {
1917	# define const_iv(name) { # name, (IV)name }	2250	# define const_iv(name) { # name, (IV)name }
		2251	const_iv (GL_VENDOR),
		2252	const_iv (GL_VERSION),
		2253	const_iv (GL_EXTENSIONS),
1918	const_iv (GL_COLOR_MATERIAL),	2254	const_iv (GL_COLOR_MATERIAL),
1919	const_iv (GL_SMOOTH),	2255	const_iv (GL_SMOOTH),
1920	const_iv (GL_FLAT),	2256	const_iv (GL_FLAT),
1921	const_iv (GL_DITHER),	2257	const_iv (GL_DITHER),
1922	const_iv (GL_BLEND),	2258	const_iv (GL_BLEND),
…		…
1949	const_iv (GL_LUMINANCE),	2285	const_iv (GL_LUMINANCE),
1950	const_iv (GL_LUMINANCE_ALPHA),	2286	const_iv (GL_LUMINANCE_ALPHA),
1951	const_iv (GL_FLOAT),	2287	const_iv (GL_FLOAT),
1952	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2288	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1953	const_iv (GL_COMPILE),	2289	const_iv (GL_COMPILE),
		2290	const_iv (GL_PROXY_TEXTURE_1D),
		2291	const_iv (GL_PROXY_TEXTURE_2D),
1954	const_iv (GL_TEXTURE_1D),	2292	const_iv (GL_TEXTURE_1D),
1955	const_iv (GL_TEXTURE_2D),	2293	const_iv (GL_TEXTURE_2D),
1956	const_iv (GL_TEXTURE_ENV),	2294	const_iv (GL_TEXTURE_ENV),
1957	const_iv (GL_TEXTURE_MAG_FILTER),	2295	const_iv (GL_TEXTURE_MAG_FILTER),
1958	const_iv (GL_TEXTURE_MIN_FILTER),	2296	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1998	# undef const_iv	2336	# undef const_iv
1999	};	2337	};
2000		2338
2001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2339	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2340	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2341
		2342	texture_av = newAV ();
		2343	AvREAL_off (texture_av);
2003	}	2344	}
2004		2345
2005	char *	2346	char *
2006	gl_vendor ()	2347	gl_vendor ()
2007	CODE:	2348	CODE:
…		…
2018		2359
2019	char *	2360	char *
2020	gl_extensions ()	2361	gl_extensions ()
2021	CODE:	2362	CODE:
2022	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2363	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2364	OUTPUT:
		2365	RETVAL
		2366
		2367	const char *glGetString (GLenum pname)
		2368
		2369	GLint glGetInteger (GLenum pname)
		2370	CODE:
		2371	glGetIntegerv (pname, &RETVAL);
		2372	OUTPUT:
		2373	RETVAL
		2374
		2375	GLdouble glGetDouble (GLenum pname)
		2376	CODE:
		2377	glGetDoublev (pname, &RETVAL);
2023	OUTPUT:	2378	OUTPUT:
2024	RETVAL	2379	RETVAL
2025		2380
2026	int glGetError ()	2381	int glGetError ()
2027		2382
…		…
2152		2507
2153	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2508	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2154		2509
2155	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2510	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2156		2511
		2512	void glPixelZoom (float x, float y)
		2513
2157	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2514	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158		2515
2159	int glGenTexture ()	2516	int glGenTexture ()
2160	CODE:	2517	CODE:
2161	{	2518	RETVAL = gen_texture ();
2162	GLuint name;
2163	glGenTextures (1, &name);
2164	RETVAL = name;
2165	}
2166	OUTPUT:	2519	OUTPUT:
2167	RETVAL	2520	RETVAL
2168		2521
2169	void glDeleteTexture (int name)	2522	void glDeleteTexture (int name)
2170	CODE:	2523	CODE:
2171	{
2172	GLuint name_ = name;
2173	glDeleteTextures (1, &name_);	2524	del_texture (name);
2174	}	2525
2175
2176	int glGenList ()	2526	int glGenList ()
2177	CODE:	2527	CODE:
2178	RETVAL = glGenLists (1);	2528	RETVAL = glGenLists (1);
2179	OUTPUT:	2529	OUTPUT:
2180	RETVAL	2530	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.203 by root, Thu Jul 19 13:45:16 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.203 by root, Thu Jul 19 13:45:16 2007 UTC