[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.201 by root, Tue Jul 17 17:39:06 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
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
76	}	84	}
77		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
81	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
82	#include "pango-render.c"	114	#include "pango-render.c"
…		…
163	typedef struct {	195	typedef struct {
164	int name;	196	int name;
165	int w, h;	197	int w, h;
166	float s, t;	198	float s, t;
167	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
168	} maptex;	202	} maptex;
169		203
170	typedef struct {	204	typedef struct {
171	uint32_t player;	205	uint32_t player;
172	tileid tile[3];	206	tileid tile[3];
173	uint16_t darkness;	207	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	209	} mapcell;
176		210
177	typedef struct {	211	typedef struct {
178	int32_t c0, c1;	212	int32_t c0, c1;
179	mapcell *col;	213	mapcell *col;
…		…
333	cell->stat_hp = 0;	367	cell->stat_hp = 0;
334	cell->flags = 0;	368	cell->flags = 0;
335	cell->player = 0;	369	cell->player = 0;
336	}	370	}
337	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
338	}	388	}
339		389
340	static void	390	static void
341	music_finished (void)	391	music_finished (void)
342	{	392	{
…		…
537	opengl_fontmap = pango_opengl_font_map_new ();	587	opengl_fontmap = pango_opengl_font_map_new ();
538	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	588	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	589	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540	}	590	}
541		591
		592	char *
		593	SDL_GetError ()
		594
542	int	595	int
543	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	596	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
544		597
545	void	598	void
546	SDL_Quit ()	599	SDL_Quit ()
547		600
548	void	601	void
549	SDL_ListModes ()	602	SDL_ListModes (int rgb, int alpha)
550	PPCODE:	603	PPCODE:
551	{	604	{
552	SDL_Rect **m;	605	SDL_Rect **m;
553		606
554	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	607	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	610	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558		611
559	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	612	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	613	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561		614
562	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	615	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566		619
567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	620	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568	#if SDL_VERSION_ATLEAST(1,2,10)	621	#if SDL_VERSION_ATLEAST(1,2,10)
569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	622	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	623	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571	#endif	624	#endif
572		625
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);	626	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
577		627
578	if (m && m != (SDL_Rect **)-1)	628	if (m && m != (SDL_Rect **)-1)
579	while (*m)	629	while (*m)
580	{	630	{
		631	if ((m)->w >= 640 && (m)->h >= 480)
		632	{
581	AV *av = newAV ();	633	AV *av = newAV ();
582	av_push (av, newSViv ((*m)->w));	634	av_push (av, newSViv ((*m)->w));
583	av_push (av, newSViv ((*m)->h));	635	av_push (av, newSViv ((*m)->h));
		636	av_push (av, newSViv (rgb));
		637	av_push (av, newSViv (alpha));
584	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	638	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		639	}
585		640
586	++m;	641	++m;
587	}	642	}
588	}	643	}
589		644
590	char *
591	SDL_GetError ()
592
593	int	645	int
594	SDL_SetVideoMode (int w, int h, int fullscreen)	646	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595	CODE:	647	CODE:
		648	{
		649	SDL_EnableUNICODE (1);
		650	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		651
		652	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		653	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		654	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		655	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		656
596	RETVAL = !!SDL_SetVideoMode (	657	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	658	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
598	);	659	);
		660
599	if (RETVAL)	661	if (RETVAL)
600	{	662	{
		663	av_clear (texture_av);
		664
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	665	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	666	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
603	# include "glfunc.h"	667	#include "glfunc.h"
604	# undef GL_FUNC	668	#undef GL_FUNC
605	}	669	}
		670	}
606	OUTPUT:	671	OUTPUT:
607	RETVAL	672	RETVAL
608		673
609	void	674	void
610	SDL_GL_SwapBuffers ()	675	SDL_GL_SwapBuffers ()
611		676
612	char *	677	char *
613	SDL_GetKeyName (int sym)	678	SDL_GetKeyName (int sym)
614		679
		680	int
		681	SDL_GetAppState ()
		682
615	void	683	void
616	SDL_PollEvent ()	684	poll_events ()
617	PPCODE:	685	PPCODE:
618	{	686	{
619	SDL_Event ev;	687	SDL_Event ev;
620		688
621	while (SDL_PollEvent (&ev))	689	SDL_PumpEvents ();
		690	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	691	{
623	HV *hv = newHV ();	692	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	693	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		694
626	switch (ev.type)	695	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	707	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	708	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	709	break;
641		710
642	case SDL_MOUSEMOTION:	711	case SDL_MOUSEMOTION:
		712	{
		713	int state = ev.motion.state;
		714	int x = ev.motion.x;
		715	int y = ev.motion.y;
		716	int xrel = ev.motion.xrel;
		717	int yrel = ev.motion.yrel;
		718
		719	/* do simplistic event compression */
		720	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		721	&& state == ev.motion.state)
		722	{
		723	xrel += ev.motion.xrel;
		724	yrel += ev.motion.yrel;
		725	x = ev.motion.x;
		726	y = ev.motion.y;
		727	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		728	}
		729
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	730	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	731	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	732	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	733	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	734	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	735	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		736	}
650	break;	737	break;
651		738
652	case SDL_MOUSEBUTTONDOWN:	739	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	740	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	741	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	770	Mix_AllocateChannels (int numchans = -1)
684		771
685	void	772	void
686	lowdelay (int fd, int val = 1)	773	lowdelay (int fd, int val = 1)
687	CODE:	774	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	775	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		776
692	void	777	void
693	win32_proxy_info ()	778	win32_proxy_info ()
694	PPCODE:	779	PPCODE:
695	{	780	{
…		…
836	ExitThread (retval); // unclean, please beam me up	921	ExitThread (retval); // unclean, please beam me up
837	#else	922	#else
838	_exit (retval);	923	_exit (retval);
839	#endif	924	#endif
840		925
		926	void
		927	debug ()
		928	CODE:
		929	{
		930	#if DEBUG
		931	VALGRIND_DO_LEAK_CHECK;
		932	#endif
		933	}
		934
841	MODULE = CFPlus PACKAGE = CFPlus::Font	935	MODULE = CFPlus PACKAGE = CFPlus::Font
842		936
843	CFPlus::Font	937	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	938	new_from_file (SV class, char path, int id = 0)
845	CODE:	939	CODE:
…		…
1160	flags	1254	flags
1161	);	1255	);
1162		1256
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1257	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1258
		1259	int minpot (int n)
		1260
1165	void	1261	void
1166	pad2pot (SV data_, SV w_, SV *h_)	1262	pad2pot (SV data_, SV w_, SV *h_)
1167	CODE:	1263	CODE:
1168	{	1264	{
1169	int ow = SvIV (w_);	1265	int ow = SvIV (w_);
…		…
1245	{	1341	{
1246	glDisable (GL_ALPHA_TEST);	1342	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1343	glDisable (GL_BLEND);
1248	}	1344	}
1249	}	1345	}
		1346
		1347	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1348	CODE:
		1349	{
		1350	GLint width;
		1351	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1352	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1353	RETVAL = width > 0;
		1354	}
		1355	OUTPUT:
		1356	RETVAL
1250		1357
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1358	MODULE = CFPlus PACKAGE = CFPlus::Map
1252		1359
1253	CFPlus::Map	1360	CFPlus::Map
1254	new (SV *class)	1361	new (SV *class)
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1399	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1400	CODE:
1294	{	1401	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1402	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1403	need_texid (self, tile);
		1404	}
		1405
		1406	void
		1407	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1408	CODE:
		1409	{
		1410	tileid texid;
		1411	maptex *tex;
		1412
		1413	if (face < 0 \|\| face >= self->faces)
		1414	return;
		1415
		1416	if (smooth < 0 \|\| smooth >= self->faces)
		1417	return;
		1418
		1419	texid = self->face2tile [face];
		1420
		1421	if (!texid)
		1422	return;
		1423
		1424	tex = self->tex + texid;
		1425	tex->smoothtile = self->face2tile [smooth];
		1426	tex->smoothlevel = level;
1297	}	1427	}
1298		1428
1299	void	1429	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)	1430	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1301	CODE:	1431	CODE:
…		…
1352	CODE:	1482	CODE:
1353	{	1483	{
1354	if (dx > 0)	1484	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1485	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1486	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1487	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1488
1359	if (dy > 0)	1489	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1490	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1491	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1492	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1493
1364	self->ox += dx; self->x += dx;	1494	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1495	self->oy += dy; self->y += dy;
1366		1496
1367	while (self->y < 0)	1497	while (self->y < 0)
…		…
1421	}	1551	}
1422	else if (cmd == 6) // monster width	1552	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1553	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1554	else if (cmd == 0x47)
1425	{	1555	{
1426	if (*data == 8)	1556	if (*data == 4)
1427	; // decode player uuid	1557	; // decode player count
1428		1558
1429	data += *data + 1;	1559	data += *data + 1;
1430	}	1560	}
1431	else if (cmd == 8) // cell flags	1561	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1562	cell->flags = *data++;
…		…
1524		1654
1525	void	1655	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1656	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1657	CODE:
1528	{	1658	{
		1659	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1660	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1661	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1662	smooth_key skey;
1529	int x, y, z;	1663	int x, y, z;
1530	int last_name;	1664	int last_name;
		1665
		1666	// thats current max. sorry.
		1667	if (sw > 255) sw = 255;
		1668	if (sh > 255) sh = 255;
		1669
		1670	// clear key, in case of extra padding
		1671	memset (&skey, 0, sizeof (skey));
1531		1672
1532	glColor4ub (255, 255, 255, 255);	1673	glColor4ub (255, 255, 255, 255);
1533		1674
1534	glEnable (GL_BLEND);	1675	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1676	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1682	last_name = 0;
1542		1683
1543	mx += self->x;	1684	mx += self->x;
1544	my += self->y;	1685	my += self->y;
1545		1686
		1687	// first pass: determine smooth_max
		1688	// rather ugly, if you ask me
		1689	// could also be stored inside mapcell and updated on change
		1690	memset (smooth_max, 0, sizeof (smooth_max));
		1691
		1692	for (y = 0; y < sh; y++)
		1693	if (0 <= y + my && y + my < self->rows)
		1694	{
		1695	maprow *row = self->row + (y + my);
		1696
		1697	for (x = 0; x < sw; x++)
		1698	if (row->c0 <= x + mx && x + mx < row->c1)
		1699	{
		1700	mapcell *cell = row->col + (x + mx - row->c0);
		1701
		1702	smooth_max[x + 1][y + 1] =
		1703	MAX (self->tex [cell->tile [0]].smoothlevel,
		1704	MAX (self->tex [cell->tile [1]].smoothlevel,
		1705	self->tex [cell->tile [2]].smoothlevel));
		1706	}
		1707	}
		1708
1546	for (z = 0; z < 3; z++)	1709	for (z = 0; z <= 2; z++)
		1710	{
		1711	memset (smooth_level, 0, sizeof (smooth_level));
		1712
1547	for (y = 0; y < sh; y++)	1713	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1714	if (0 <= y + my && y + my < self->rows)
1549	{	1715	{
1550	maprow *row = self->row + (y + my);	1716	maprow *row = self->row + (y + my);
1551		1717
1552	for (x = 0; x < sw; x++)	1718	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1719	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1720	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1721	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1722	tileid tile = cell->tile [z];
		1723
		1724	if (tile)
		1725	{
		1726	maptex tex = self->tex [tile];
		1727	int px = (x + 1) * T - tex.w;
		1728	int py = (y + 1) * T - tex.h;
		1729
		1730	// suppressing texture state switches here
		1731	// is only moderately effective, but worth the extra effort
		1732	if (last_name != tex.name)
		1733	{
		1734	if (!tex.name)
		1735	tex = self->tex [2]; /* missing, replace by noface */
		1736
		1737	glEnd ();
		1738	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1739	glBegin (GL_QUADS);
		1740	}
		1741
		1742	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1743	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1744	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1745	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1746
		1747	if (cell->flags && z == 2)
		1748	{
		1749	if (cell->flags & 1)
		1750	{
		1751	maptex tex = self->tex [1];
		1752	int px = x * T + T * 2 / 32;
		1753	int py = y * T - T * 6 / 32;
		1754
		1755	glEnd ();
		1756	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1757	glBegin (GL_QUADS);
		1758
		1759	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1760	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1761	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1762	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1763	}
		1764	}
		1765
		1766	// update smooth hash
		1767	if (tex.smoothtile)
		1768	{
		1769	skey.tile = tex.smoothtile;
		1770	skey.level = tex.smoothlevel;
		1771
		1772	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1773
		1774	// add bits to current tile and all neighbours. skey.x\|y is
		1775	// shifted +1\|+1 so we always stay positive.
		1776
		1777	// bits is ___n cccc CCCC bbbb
		1778	// n do not draw borders&corners
		1779	// c draw these corners, but...
		1780	// C ... not these
		1781	// b draw these borders
		1782
		1783	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1784	// ┃· ·· ·┃ ━━
		1785
		1786	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1787	// ·· ·· ·┏ ┓·
		1788
		1789	// full tile
		1790	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1791
		1792	// borders
		1793	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1794	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1795	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1796	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1797
		1798	// corners
		1799	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1800	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1801	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1802	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1803	}
		1804	}
1557		1805	}
		1806	}
		1807
		1808	// go through all smoothlevels, lowest to highest, then draw.
		1809	// this is basically counting sort
		1810	{
		1811	int w, b;
		1812
		1813	for (w = 0; w < 256 / 32; ++w)
		1814	{
		1815	uint32_t smask = smooth_level [w];
1558	if (tile)	1816	if (smask)
		1817	for (b = 0; b < 32; ++b)
		1818	if (smask & (((uint32_t)1) << b))
1559	{	1819	{
1560	maptex tex = self->tex [tile];	1820	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1821	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1822
1564	if (last_name != tex.name)	1823	hv_iterinit (smooth);
		1824	while ((he = hv_iternext (smooth)))
1565	{	1825	{
		1826	smooth_key skey = (smooth_key )HeKEY (he);
		1827	IV bits = SvIVX (HeVAL (he));
		1828
1566	if (!tex.name)	1829	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1830	&& skey->level == level
1568		1831	&& 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	{	1832	{
1583	maptex tex = self->tex [1];	1833	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1834	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1835	int py = (((int)skey->y) - 1) * T;
		1836	int border = bits & 15;
		1837	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1838	float dx = tex.s * .0625f; // 16 images/row
		1839	float dy = tex.t * .5f ; // 2 images/column
1586		1840
		1841	// this time naively avoiding texture state changes
		1842	// save gobs of state changes.
		1843	if (last_name != tex.name)
		1844	{
		1845	if (!tex.name)
		1846	continue; // smoothing not yet available
		1847
1587	glEnd ();	1848	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1849	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1850	glBegin (GL_QUADS);
		1851	}
1590		1852
		1853	if (border)
		1854	{
		1855	float ox = border * dx;
		1856
		1857	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1858	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1859	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1860	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1861	}
		1862
		1863	if (corner)
		1864	{
		1865	float ox = corner * dx;
		1866
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1867	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1868	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1869	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1870	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1871	}
1595	}	1872	}
1596	}	1873	}
1597	}	1874	}
1598	}
1599	}	1875	}
		1876	}
		1877
		1878	hv_clear (smooth);
		1879	}
1600		1880
1601	glEnd ();	1881	glEnd ();
1602		1882
1603	glDisable (GL_TEXTURE_2D);	1883	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1884	glDisable (GL_BLEND);
…		…
1694	glDisable (GL_BLEND);	1974	glDisable (GL_BLEND);
1695	glDisable (GL_TEXTURE_2D);	1975	glDisable (GL_TEXTURE_2D);
1696	}	1976	}
1697		1977
1698	void	1978	void
1699	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1979	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1700	PPCODE:	1980	PPCODE:
1701	{	1981	{
1702	int x, y;	1982	int x, y;
1703	int sw4 = (sw + 3) & ~3;	1983	int sw4 = (sw + 3) & ~3;
1704	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1984	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1724	darkness[y * sw4 + x] = cell->darkness	2004	darkness[y * sw4 + x] = cell->darkness
1725	? 255 - (cell->darkness - 1)	2005	? 255 - (cell->darkness - 1)
1726	: 255 - FOW_DARKNESS;	2006	: 255 - FOW_DARKNESS;
1727	}	2007	}
1728	}	2008	}
		2009
		2010	if (smoothing)
		2011	{
		2012	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		2013	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2014
		2015	SvPOK_only (darkness2_sv);
		2016	SvCUR_set (darkness2_sv, sw4 * sh);
		2017
		2018	for (y = 0; y < sh; ++y)
		2019	for (x = 0; x < sw4; ++x)
		2020	{
		2021	float f = (float )matrix;
		2022	int dx, dy;
		2023	float sum = 0.f;
		2024
		2025	for (dy = -1; dy <= 1; ++dy)
		2026	for (dx = -1; dx <= 1; ++dx)
		2027	{
		2028	unsigned int x2 = x + dx;
		2029	unsigned int y2 = y + dy;
		2030
		2031	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2032	}
		2033
		2034	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2035	}
		2036
		2037	darkness_sv = darkness2_sv;
		2038	}
1729		2039
1730	EXTEND (SP, 3);	2040	EXTEND (SP, 3);
1731	PUSHs (sv_2mortal (newSViv (sw4)));	2041	PUSHs (sv_2mortal (newSViv (sw4)));
1732	PUSHs (sv_2mortal (newSViv (sh)));	2042	PUSHs (sv_2mortal (newSViv (sh)));
1733	PUSHs (darkness_sv);	2043	PUSHs (darkness_sv);
…		…
1907	CODE:	2217	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2218	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2219	OUTPUT:
1910	RETVAL	2220	RETVAL
1911		2221
		2222	int
		2223	fade_out (int ms)
		2224	CODE:
		2225	RETVAL = Mix_FadeOutMusic (ms);
		2226	OUTPUT:
		2227	RETVAL
		2228
1912	CFPlus::MixMusic	2229	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2230	new_from_file (SV class, char path)
1914	CODE:	2231	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2232	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2233	OUTPUT:
…		…
1923		2240
1924	int	2241	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2242	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2243	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2244	RETVAL = Mix_PlayMusic (self, loops);
		2245	OUTPUT:
		2246	RETVAL
		2247
		2248	int
		2249	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2250	CODE:
		2251	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1928	OUTPUT:	2252	OUTPUT:
1929	RETVAL	2253	RETVAL
1930		2254
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2255	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2256
…		…
1936	static const struct {	2260	static const struct {
1937	const char *name;	2261	const char *name;
1938	IV iv;	2262	IV iv;
1939	} *civ, const_iv[] = {	2263	} *civ, const_iv[] = {
1940	# define const_iv(name) { # name, (IV)name }	2264	# define const_iv(name) { # name, (IV)name }
		2265	const_iv (GL_VENDOR),
		2266	const_iv (GL_VERSION),
		2267	const_iv (GL_EXTENSIONS),
1941	const_iv (GL_COLOR_MATERIAL),	2268	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2269	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2270	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2271	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2272	const_iv (GL_BLEND),
…		…
1972	const_iv (GL_LUMINANCE),	2299	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2300	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2301	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2302	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2303	const_iv (GL_COMPILE),
		2304	const_iv (GL_PROXY_TEXTURE_1D),
		2305	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2306	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2307	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2308	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2309	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2310	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2021	# undef const_iv	2350	# undef const_iv
2022	};	2351	};
2023		2352
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2353	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2354	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2355
		2356	texture_av = newAV ();
		2357	AvREAL_off (texture_av);
2026	}	2358	}
2027		2359
2028	char *	2360	char *
2029	gl_vendor ()	2361	gl_vendor ()
2030	CODE:	2362	CODE:
…		…
2041		2373
2042	char *	2374	char *
2043	gl_extensions ()	2375	gl_extensions ()
2044	CODE:	2376	CODE:
2045	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2377	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2378	OUTPUT:
		2379	RETVAL
		2380
		2381	const char *glGetString (GLenum pname)
		2382
		2383	GLint glGetInteger (GLenum pname)
		2384	CODE:
		2385	glGetIntegerv (pname, &RETVAL);
		2386	OUTPUT:
		2387	RETVAL
		2388
		2389	GLdouble glGetDouble (GLenum pname)
		2390	CODE:
		2391	glGetDoublev (pname, &RETVAL);
2046	OUTPUT:	2392	OUTPUT:
2047	RETVAL	2393	RETVAL
2048		2394
2049	int glGetError ()	2395	int glGetError ()
2050		2396
…		…
2175		2521
2176	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2522	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2177		2523
2178	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2524	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179		2525
		2526	void glPixelZoom (float x, float y)
		2527
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2528	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2529
2182	int glGenTexture ()	2530	int glGenTexture ()
2183	CODE:	2531	CODE:
2184	{	2532	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2533	OUTPUT:
2190	RETVAL	2534	RETVAL
2191		2535
2192	void glDeleteTexture (int name)	2536	void glDeleteTexture (int name)
2193	CODE:	2537	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2538	del_texture (name);
2197	}	2539
2198
2199	int glGenList ()	2540	int glGenList ()
2200	CODE:	2541	CODE:
2201	RETVAL = glGenLists (1);	2542	RETVAL = glGenLists (1);
2202	OUTPUT:	2543	OUTPUT:
2203	RETVAL	2544	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.201 by root, Tue Jul 17 17:39:06 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.201 by root, Tue Jul 17 17:39:06 2007 UTC