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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
25	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
26	#include <SDL_endian.h>	32	#include <SDL_endian.h>
27	#include <SDL_image.h>	33	#include <SDL_image.h>
28	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
30		36
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	63	#else
58	# define PARACHUTE 0	64	# define PARACHUTE 0
59	#endif	65	#endif
60		66
		67	static AV *texture_av;
		68
61	static struct	69	static struct
62	{	70	{
63	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	72	#include "glfunc.h"
65	#undef GL_FUNC	73	#undef GL_FUNC
66	} gl;	74	} gl;
67		75
		76	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	78	{
70	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	83	else
75	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
76	}	85	}
77		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
		109	}
		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
81	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
82	#include "pango-render.c"	115	#include "pango-render.c"
…		…
163	typedef struct {	196	typedef struct {
164	int name;	197	int name;
165	int w, h;	198	int w, h;
166	float s, t;	199	float s, t;
167	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
168	} maptex;	203	} maptex;
169		204
170	typedef struct {	205	typedef struct {
171	uint32_t player;	206	uint32_t player;
172	tileid tile[3];	207	tileid tile[3];
173	uint16_t darkness;	208	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	210	} mapcell;
176		211
177	typedef struct {	212	typedef struct {
178	int32_t c0, c1;	213	int32_t c0, c1;
179	mapcell *col;	214	mapcell *col;
…		…
333	cell->stat_hp = 0;	368	cell->stat_hp = 0;
334	cell->flags = 0;	369	cell->flags = 0;
335	cell->player = 0;	370	cell->player = 0;
336	}	371	}
337	}	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);
338	}	389	}
339		390
340	static void	391	static void
341	music_finished (void)	392	music_finished (void)
342	{	393	{
…		…
537	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
538	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);
539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540	}	591	}
541		592
		593	char *
		594	SDL_GetError ()
		595
542	int	596	int
543	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
544		598
545	void	599	void
546	SDL_Quit ()	600	SDL_Quit ()
547		601
548	void	602	void
549	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
550	PPCODE:	604	PPCODE:
551	{	605	{
552	SDL_Rect **m;	606	SDL_Rect **m;
553		607
554	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558		612
559	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561		615
562	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566		620
567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571	#endif	625	#endif
572		626
573	SDL_EnableUNICODE (1);
574	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
575
576	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
577		628
578	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
579	while (*m)	630	while (*m)
580	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
581	AV *av = newAV ();	634	AV *av = newAV ();
582	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
583	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));
584	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
585		641
586	++m;	642	++m;
587	}	643	}
588	}	644	}
589		645
590	char *
591	SDL_GetError ()
592
593	int	646	int
594	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595	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
596	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
598	);	660	);
		661
599	if (RETVAL)	662	if (RETVAL)
600	{	663	{
		664	av_clear (texture_av);
		665
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# 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);
603	# include "glfunc.h"	668	#include "glfunc.h"
604	# undef GL_FUNC	669	#undef GL_FUNC
605	}	670	}
		671	}
606	OUTPUT:	672	OUTPUT:
607	RETVAL	673	RETVAL
608		674
609	void	675	void
610	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
611		677
612	char *	678	char *
613	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
614		680
		681	int
		682	SDL_GetAppState ()
		683
615	void	684	void
616	SDL_PollEvent ()	685	poll_events ()
617	PPCODE:	686	PPCODE:
618	{	687	{
619	SDL_Event ev;	688	SDL_Event ev;
620		689
621	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	692	{
623	HV *hv = newHV ();	693	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		695
626	switch (ev.type)	696	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	710	break;
641		711
642	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
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
650	break;	738	break;
651		739
652	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
684		772
685	void	773	void
686	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
687	CODE:	775	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		777
692	void	778	void
693	win32_proxy_info ()	779	win32_proxy_info ()
694	PPCODE:	780	PPCODE:
695	{	781	{
…		…
836	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
837	#else	923	#else
838	_exit (retval);	924	_exit (retval);
839	#endif	925	#endif
840		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
841	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
842		937
843	CFPlus::Font	938	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	939	new_from_file (SV class, char path, int id = 0)
845	CODE:	940	CODE:
…		…
1160	flags	1255	flags
1161	);	1256	);
1162		1257
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1258	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1259
1165	void	1260	int minpot (int n)
1166	pad2pot (SV data_, SV w_, SV *h_)
1167	CODE:
1168	{
1169	int ow = SvIV (w_);
1170	int oh = SvIV (h_);
1171		1261
1172	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_))
1173	{	1267	{
1174	int nw = minpot (ow);
1175	int nh = minpot (oh);
1176
1177	if (nw != ow \|\| nh != oh)
1178	{
1179	if (SvOK (data_))
1180	{
1181	STRLEN datalen;	1268	STRLEN datalen;
1182	char *data = SvPVbyte (data_, datalen);	1269	char *data = SvPVbyte (data_, datalen);
1183	int bpp = datalen / (ow * oh);	1270	int bpp = datalen / (ow * oh);
1184	SV result_ = sv_2mortal (newSV (nw nh * bpp));	1271	SV result_ = sv_2mortal (newSV (nw nh * bpp));
1185		1272
1186	SvPOK_only (result_);	1273	SvPOK_only (result_);
1187	SvCUR_set (result_, nw * nh * bpp);	1274	SvCUR_set (result_, nw * nh * bpp);
1188		1275
1189	memset (SvPVX (result_), 0, nw * nh * bpp);	1276	memset (SvPVX (result_), 0, nw * nh * bpp);
1190	while (oh--)	1277	while (oh--)
1191	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);
1192		1279
1193	sv_setsv (data_, result_);	1280	sv_setsv (data_, result_);
1194	}
1195
1196	sv_setiv (w_, nw);
1197	sv_setiv (h_, nh);
1198	}
1199	}	1281	}
1200	}	1282	}
1201		1283
1202	void	1284	void
1203	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.)
…		…
1245	{	1327	{
1246	glDisable (GL_ALPHA_TEST);	1328	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1329	glDisable (GL_BLEND);
1248	}	1330	}
1249	}	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
1250		1343
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1344	MODULE = CFPlus PACKAGE = CFPlus::Map
1252		1345
1253	CFPlus::Map	1346	CFPlus::Map
1254	new (SV *class)	1347	new (SV *class)
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1385	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1386	CODE:
1294	{	1387	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1388	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1389	need_texid (self, tile);
		1390	}
		1391
		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;
1297	}	1413	}
1298		1414
1299	void	1415	void
1300	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)
1301	CODE:	1417	CODE:
…		…
1352	CODE:	1468	CODE:
1353	{	1469	{
1354	if (dx > 0)	1470	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1471	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1472	else if (dx < 0)
1357	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);
1358		1474
1359	if (dy > 0)	1475	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1476	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1477	else if (dy < 0)
1362	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);
1363		1479
1364	self->ox += dx; self->x += dx;	1480	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1481	self->oy += dy; self->y += dy;
1366		1482
1367	while (self->y < 0)	1483	while (self->y < 0)
…		…
1421	}	1537	}
1422	else if (cmd == 6) // monster width	1538	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1539	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1540	else if (cmd == 0x47)
1425	{	1541	{
1426	if (*data == 8)	1542	if (*data == 4)
1427	; // decode player uuid	1543	; // decode player count
1428		1544
1429	data += *data + 1;	1545	data += *data + 1;
1430	}	1546	}
1431	else if (cmd == 8) // cell flags	1547	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1548	cell->flags = *data++;
…		…
1524		1640
1525	void	1641	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1642	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1643	CODE:
1528	{	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;
1529	int x, y, z;	1649	int x, y, z;
1530	int last_name;	1650	int last_name;
		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));
1531		1658
1532	glColor4ub (255, 255, 255, 255);	1659	glColor4ub (255, 255, 255, 255);
1533		1660
1534	glEnable (GL_BLEND);	1661	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1662	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1668	last_name = 0;
1542		1669
1543	mx += self->x;	1670	mx += self->x;
1544	my += self->y;	1671	my += self->y;
1545		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
1546	for (z = 0; z < 3; z++)	1695	for (z = 0; z <= 2; z++)
		1696	{
		1697	memset (smooth_level, 0, sizeof (smooth_level));
		1698
1547	for (y = 0; y < sh; y++)	1699	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1700	if (0 <= y + my && y + my < self->rows)
1549	{	1701	{
1550	maprow *row = self->row + (y + my);	1702	maprow *row = self->row + (y + my);
1551		1703
1552	for (x = 0; x < sw; x++)	1704	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1705	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1706	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1707	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [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;
		1715
		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	}
1557		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];
1558	if (tile)	1802	if (smask)
		1803	for (b = 0; b < 32; ++b)
		1804	if (smask & (((uint32_t)1) << b))
1559	{	1805	{
1560	maptex tex = self->tex [tile];	1806	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1807	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1808
1564	if (last_name != tex.name)	1809	hv_iterinit (smooth);
		1810	while ((he = hv_iternext (smooth)))
1565	{	1811	{
		1812	smooth_key skey = (smooth_key )HeKEY (he);
		1813	IV bits = SvIVX (HeVAL (he));
		1814
1566	if (!tex.name)	1815	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1816	&& skey->level == level
1568		1817	&& level > smooth_max [skey->x][skey->y])
1569	glEnd ();
1570	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1571	glBegin (GL_QUADS);
1572	}
1573
1574	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1575	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1576	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1577	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579	if (cell->flags && z == 2)
1580	{
1581	if (cell->flags & 1)
1582	{	1818	{
1583	maptex tex = self->tex [1];	1819	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1820	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	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
1586		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
1587	glEnd ();	1834	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1835	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1836	glBegin (GL_QUADS);
		1837	}
1590		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
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1853	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1854	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1855	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1856	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1857	}
1595	}	1858	}
1596	}	1859	}
1597	}	1860	}
1598	}
1599	}	1861	}
		1862	}
		1863
		1864	hv_clear (smooth);
		1865	}
1600		1866
1601	glEnd ();	1867	glEnd ();
1602		1868
1603	glDisable (GL_TEXTURE_2D);	1869	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1870	glDisable (GL_BLEND);
…		…
1694	glDisable (GL_BLEND);	1960	glDisable (GL_BLEND);
1695	glDisable (GL_TEXTURE_2D);	1961	glDisable (GL_TEXTURE_2D);
1696	}	1962	}
1697		1963
1698	void	1964	void
1699	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)
1700	PPCODE:	1966	PPCODE:
1701	{	1967	{
1702	int x, y;	1968	int x, y;
1703	int sw4 = (sw + 3) & ~3;	1969	int sw4 = (sw + 3) & ~3;
1704	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1970	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1724	darkness[y * sw4 + x] = cell->darkness	1990	darkness[y * sw4 + x] = cell->darkness
1725	? 255 - (cell->darkness - 1)	1991	? 255 - (cell->darkness - 1)
1726	: 255 - FOW_DARKNESS;	1992	: 255 - FOW_DARKNESS;
1727	}	1993	}
1728	}	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	}
1729		2025
1730	EXTEND (SP, 3);	2026	EXTEND (SP, 3);
1731	PUSHs (sv_2mortal (newSViv (sw4)));	2027	PUSHs (sv_2mortal (newSViv (sw4)));
1732	PUSHs (sv_2mortal (newSViv (sh)));	2028	PUSHs (sv_2mortal (newSViv (sh)));
1733	PUSHs (darkness_sv);	2029	PUSHs (darkness_sv);
…		…
1907	CODE:	2203	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2204	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2205	OUTPUT:
1910	RETVAL	2206	RETVAL
1911		2207
		2208	int
		2209	fade_out (int ms)
		2210	CODE:
		2211	RETVAL = Mix_FadeOutMusic (ms);
		2212	OUTPUT:
		2213	RETVAL
		2214
1912	CFPlus::MixMusic	2215	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2216	new_from_file (SV class, char path)
1914	CODE:	2217	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2218	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2219	OUTPUT:
…		…
1923		2226
1924	int	2227	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2228	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2229	CODE:
1927	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);
1928	OUTPUT:	2238	OUTPUT:
1929	RETVAL	2239	RETVAL
1930		2240
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2241	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2242
…		…
1936	static const struct {	2246	static const struct {
1937	const char *name;	2247	const char *name;
1938	IV iv;	2248	IV iv;
1939	} *civ, const_iv[] = {	2249	} *civ, const_iv[] = {
1940	# 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),
1941	const_iv (GL_COLOR_MATERIAL),	2254	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2255	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2256	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2257	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2258	const_iv (GL_BLEND),
…		…
1972	const_iv (GL_LUMINANCE),	2285	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2286	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2287	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2288	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2289	const_iv (GL_COMPILE),
		2290	const_iv (GL_PROXY_TEXTURE_1D),
		2291	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2292	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2293	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2294	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2295	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2296	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2021	# undef const_iv	2336	# undef const_iv
2022	};	2337	};
2023		2338
2024	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; )
2025	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);
2026	}	2344	}
2027		2345
2028	char *	2346	char *
2029	gl_vendor ()	2347	gl_vendor ()
2030	CODE:	2348	CODE:
…		…
2041		2359
2042	char *	2360	char *
2043	gl_extensions ()	2361	gl_extensions ()
2044	CODE:	2362	CODE:
2045	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);
2046	OUTPUT:	2378	OUTPUT:
2047	RETVAL	2379	RETVAL
2048		2380
2049	int glGetError ()	2381	int glGetError ()
2050		2382
…		…
2175		2507
2176	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)
2177		2509
2178	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)
2179		2511
		2512	void glPixelZoom (float x, float y)
		2513
2180	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)
2181		2515
2182	int glGenTexture ()	2516	int glGenTexture ()
2183	CODE:	2517	CODE:
2184	{	2518	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2519	OUTPUT:
2190	RETVAL	2520	RETVAL
2191		2521
2192	void glDeleteTexture (int name)	2522	void glDeleteTexture (int name)
2193	CODE:	2523	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2524	del_texture (name);
2197	}	2525
2198
2199	int glGenList ()	2526	int glGenList ()
2200	CODE:	2527	CODE:
2201	RETVAL = glGenLists (1);	2528	RETVAL = glGenLists (1);
2202	OUTPUT:	2529	OUTPUT:
2203	RETVAL	2530	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs. Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.203 by root, Thu Jul 19 13:45:16 2007 UTC