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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
9	#endif	14	#endif
10		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
76	}	84	}
77		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
81	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
82	#include "pango-render.c"	114	#include "pango-render.c"
…		…
155		187
156	*w = rect.width;	188	*w = rect.width;
157	*h = rect.height;	189	*h = rect.height;
158	}	190	}
159		191
		192	typedef uint16_t tileid;
160	typedef uint16_t mapface;	193	typedef uint16_t faceid;
161		194
162	typedef struct {	195	typedef struct {
163	GLint name;	196	int name;
164	int w, h;	197	int w, h;
165	float s, t;	198	float s, t;
166	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
167	} maptex;	202	} maptex;
168		203
169	typedef struct {	204	typedef struct {
170	uint32_t player;	205	uint32_t player;
171	mapface face[3];	206	tileid tile[3];
172	uint16_t darkness;	207	uint16_t darkness;
173	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
174	} mapcell;	209	} mapcell;
175		210
176	typedef struct {	211	typedef struct {
177	int32_t c0, c1;	212	int32_t c0, c1;
178	mapcell *col;	213	mapcell *col;
179	} maprow;	214	} maprow;
180		215
181	typedef struct map {	216	typedef struct map {
182	int x, y, w, h;	217	int x, y, w, h;
183	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
184	int faces;	219	int faces; tileid *face2tile; // [faceid]
185	mapface *face;	220	int texs; maptex *tex; // [tileid]
186
187	int texs;
188	maptex *tex;
189		221
190	int32_t rows;	222	int32_t rows;
191	maprow *row;	223	maprow *row;
192	} *CFPlus__Map;	224	} *CFPlus__Map;
193		225
…		…
213	return ptr;	245	return ptr;
214	}	246	}
215		247
216	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
217	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
218		270
219	static maprow *	271	static maprow *
220	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
221	{	273	{
222	if (0 > y)	274	if (0 > y)
…		…
315	cell->stat_hp = 0;	367	cell->stat_hp = 0;
316	cell->flags = 0;	368	cell->flags = 0;
317	cell->player = 0;	369	cell->player = 0;
318	}	370	}
319	}	371	}
		372	}
		373
		374	typedef struct {
		375	tileid tile;
		376	uint8_t x, y, level;
		377	} smooth_key;
		378
		379	static void
		380	smooth_or_bits (HV hv, smooth_key key, IV bits)
		381	{
		382	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		383
		384	if (SvIOK (*sv))
		385	SvIV_set (sv, SvIVX (sv) \| bits);
		386	else
		387	sv_setiv (*sv, bits);
320	}	388	}
321		389
322	static void	390	static void
323	music_finished (void)	391	music_finished (void)
324	{	392	{
…		…
578	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	648	);
581	if (RETVAL)	649	if (RETVAL)
582	{	650	{
		651	av_clear (texture_av);
		652
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
585	# include "glfunc.h"	655	# include "glfunc.h"
586	# undef GL_FUNC	656	# undef GL_FUNC
		657
587	}	658	}
588	OUTPUT:	659	OUTPUT:
589	RETVAL	660	RETVAL
590		661
591	void	662	void
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	691	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	692	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	693	break;
623		694
624	case SDL_MOUSEMOTION:	695	case SDL_MOUSEMOTION:
		696	{
		697	int state = ev.motion.state;
		698	int x = ev.motion.x;
		699	int y = ev.motion.y;
		700	int xrel = ev.motion.xrel;
		701	int yrel = ev.motion.yrel;
		702
		703	/* do simplistic event compression */
		704	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		705	&& state == ev.motion.state)
		706	{
		707	xrel += ev.motion.xrel;
		708	yrel += ev.motion.yrel;
		709	x = ev.motion.x;
		710	y = ev.motion.y;
		711	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		712	}
		713
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	714	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	715	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	716	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	717	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	718	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	719	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		720	}
632	break;	721	break;
633		722
634	case SDL_MOUSEBUTTONDOWN:	723	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	724	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	725	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	754	Mix_AllocateChannels (int numchans = -1)
666		755
667	void	756	void
668	lowdelay (int fd, int val = 1)	757	lowdelay (int fd, int val = 1)
669	CODE:	758	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	759	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		760
674	void	761	void
675	win32_proxy_info ()	762	win32_proxy_info ()
676	PPCODE:	763	PPCODE:
677	{	764	{
…		…
818	ExitThread (retval); // unclean, please beam me up	905	ExitThread (retval); // unclean, please beam me up
819	#else	906	#else
820	_exit (retval);	907	_exit (retval);
821	#endif	908	#endif
822		909
		910	void
		911	debug ()
		912	CODE:
		913	{
		914	#if DEBUG
		915	VALGRIND_DO_LEAK_CHECK;
		916	#endif
		917	}
		918
823	MODULE = CFPlus PACKAGE = CFPlus::Font	919	MODULE = CFPlus PACKAGE = CFPlus::Font
824		920
825	CFPlus::Font	921	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	922	new_from_file (SV class, char path, int id = 0)
827	CODE:	923	CODE:
…		…
1240	RETVAL->y = 0;	1336	RETVAL->y = 0;
1241	RETVAL->w = 0;	1337	RETVAL->w = 0;
1242	RETVAL->h = 0;	1338	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1339	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1340	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1341	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1342	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1247	RETVAL->texs = 8192;
1248	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1249	RETVAL->rows = 0;	1343	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1344	RETVAL->row = 0;
1251	OUTPUT:	1345	OUTPUT:
1252	RETVAL	1346	RETVAL
1253		1347
1254	void	1348	void
1255	DESTROY (CFPlus::Map self)	1349	DESTROY (CFPlus::Map self)
1256	CODE:	1350	CODE:
1257	{	1351	{
1258	map_clear (self);	1352	map_clear (self);
1259	Safefree (self->face);	1353	Safefree (self->face2tile);
1260	Safefree (self->tex);	1354	Safefree (self->tex);
1261	Safefree (self);	1355	Safefree (self);
1262	}	1356	}
1263		1357
1264	void	1358	void
…		…
1271	clear (CFPlus::Map self)	1365	clear (CFPlus::Map self)
1272	CODE:	1366	CODE:
1273	map_clear (self);	1367	map_clear (self);
1274		1368
1275	void	1369	void
1276	set_face (CFPlus::Map self, int face, int texid)	1370	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1371	CODE:
1278	{	1372	{
1279	while (self->faces <= face)	1373	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1374	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1375	}
1282	self->faces *= 2;
1283	}
1284		1376
1285	self->face [face] = texid;	1377	void
		1378	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1379	CODE:
		1380	{
		1381	tileid texid;
		1382	maptex *tex;
		1383
		1384	if (face < 0 \|\| face >= self->faces)
		1385	return;
		1386
		1387	if (smooth < 0 \|\| smooth >= self->faces)
		1388	return;
		1389
		1390	texid = self->face2tile [face];
		1391
		1392	if (!texid)
		1393	return;
		1394
		1395	tex = self->tex + texid;
		1396	tex->smoothtile = self->face2tile [smooth];
		1397	tex->smoothlevel = level;
1286	}	1398	}
1287		1399
1288	void	1400	void
1289	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1401	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1290	CODE:	1402	CODE:
1291	{	1403	{
1292	while (self->texs <= texid)	1404	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1405
1298	{	1406	{
1299	maptex *tex = self->tex + texid;	1407	maptex *tex = self->tex + texid;
1300		1408
1301	tex->name = name;	1409	tex->name = name;
…		…
1345	CODE:	1453	CODE:
1346	{	1454	{
1347	if (dx > 0)	1455	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1456	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1457	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1458	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1459
1352	if (dy > 0)	1460	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1461	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1462	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1463	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1464
1357	self->ox += dx; self->x += dx;	1465	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1466	self->oy += dy; self->y += dy;
1359		1467
1360	while (self->y < 0)	1468	while (self->y < 0)
…		…
1414	}	1522	}
1415	else if (cmd == 6) // monster width	1523	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1524	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1525	else if (cmd == 0x47)
1418	{	1526	{
1419	if (*data == 8)	1527	if (*data == 4)
1420	; // decode player uuid	1528	; // decode player count
1421		1529
1422	data += *data + 1;	1530	data += *data + 1;
1423	}	1531	}
1424	else if (cmd == 8) // cell flags	1532	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1533	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1542	cell->darkness = *data++ + 1;
1435	}	1543	}
1436		1544
1437	if (flags & 4)	1545	if (flags & 4)
1438	{	1546	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1547	faceid face = (data [0] << 8) + data [1]; data += 2;
		1548	need_facenum (self, face);
		1549	cell->tile [0] = self->face2tile [face];
1440	}	1550	}
1441		1551
1442	if (flags & 2)	1552	if (flags & 2)
1443	{	1553	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1554	faceid face = (data [0] << 8) + data [1]; data += 2;
		1555	need_facenum (self, face);
		1556	cell->tile [1] = self->face2tile [face];
1445	}	1557	}
1446		1558
1447	if (flags & 1)	1559	if (flags & 1)
1448	{	1560	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1561	faceid face = (data [0] << 8) + data [1]; data += 2;
		1562	need_facenum (self, face);
		1563	cell->tile [2] = self->face2tile [face];
1450	}	1564	}
1451	}	1565	}
1452	else	1566	else
1453	cell->darkness = 0;	1567	cell->darkness = 0;
1454	}	1568	}
…		…
1484	{	1598	{
1485	mapcell *cell = row->col + (x - row->c0);	1599	mapcell *cell = row->col + (x - row->c0);
1486		1600
1487	for (z = 0; z <= 0; z++)	1601	for (z = 0; z <= 0; z++)
1488	{	1602	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1603	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1604	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1605	int a1 = tex.a;
1496		1606
1497	r = (r * a0 + tex.r * a1) / 255;	1607	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1608	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1609	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1610	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1611	}
1503	}	1612	}
1504		1613
1505	*map++ = (r )	1614	*map++ = (r )
1506	\| (g << 8)	1615	\| (g << 8)
…		…
1513	}	1622	}
1514	OUTPUT:	1623	OUTPUT:
1515	RETVAL	1624	RETVAL
1516		1625
1517	void	1626	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1627	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1628	CODE:
1520	{	1629	{
		1630	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1631	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1632	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1633	smooth_key skey;
1521	int x, y, z;	1634	int x, y, z;
1522	int last_name;	1635	int last_name;
1523	mapface face;	1636
		1637	// thats current max. sorry.
		1638	if (sw > 255) sw = 255;
		1639	if (sh > 255) sh = 255;
		1640
		1641	// clear key, in case of extra padding
		1642	memset (&skey, 0, sizeof (skey));
1524		1643
1525	glColor4ub (255, 255, 255, 255);	1644	glColor4ub (255, 255, 255, 255);
1526		1645
1527	glEnable (GL_BLEND);	1646	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1647	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1653	last_name = 0;
1535		1654
1536	mx += self->x;	1655	mx += self->x;
1537	my += self->y;	1656	my += self->y;
1538		1657
		1658	// first pass: determine smooth_max
		1659	// rather ugly, if you ask me
		1660	// could also be stored inside mapcell and updated on change
		1661	memset (smooth_max, 0, sizeof (smooth_max));
		1662
		1663	for (y = 0; y < sh; y++)
		1664	if (0 <= y + my && y + my < self->rows)
		1665	{
		1666	maprow *row = self->row + (y + my);
		1667
		1668	for (x = 0; x < sw; x++)
		1669	if (row->c0 <= x + mx && x + mx < row->c1)
		1670	{
		1671	mapcell *cell = row->col + (x + mx - row->c0);
		1672
		1673	smooth_max[x + 1][y + 1] =
		1674	MAX (self->tex [cell->tile [0]].smoothlevel,
		1675	MAX (self->tex [cell->tile [1]].smoothlevel,
		1676	self->tex [cell->tile [2]].smoothlevel));
		1677	}
		1678	}
		1679
1539	for (z = 0; z < 3; z++)	1680	for (z = 0; z <= 2; z++)
		1681	{
		1682	memset (smooth_level, 0, sizeof (smooth_level));
		1683
1540	for (y = 0; y < sh; y++)	1684	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1685	if (0 <= y + my && y + my < self->rows)
1542	{	1686	{
1543	maprow *row = self->row + (y + my);	1687	maprow *row = self->row + (y + my);
1544		1688
1545	for (x = 0; x < sw; x++)	1689	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1690	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1691	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1692	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1693	tileid tile = cell->tile [z];
		1694
		1695	if (tile)
		1696	{
		1697	maptex tex = self->tex [tile];
		1698	int px = (x + 1) * T - tex.w;
		1699	int py = (y + 1) * T - tex.h;
1551		1700
1552	if (face && face < self->texs)	1701	// suppressing texture state switches here
		1702	// is only moderately effective, but worth the extra effort
		1703	if (last_name != tex.name)
		1704	{
		1705	if (!tex.name)
		1706	tex = self->tex [2]; /* missing, replace by noface */
		1707
		1708	glEnd ();
		1709	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1710	glBegin (GL_QUADS);
		1711	}
		1712
		1713	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1714	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1715	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1716	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1717
		1718	if (cell->flags && z == 2)
		1719	{
		1720	if (cell->flags & 1)
		1721	{
		1722	maptex tex = self->tex [1];
		1723	int px = x * T + T * 2 / 32;
		1724	int py = y * T - T * 6 / 32;
		1725
		1726	glEnd ();
		1727	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1728	glBegin (GL_QUADS);
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1734	}
		1735	}
		1736
		1737	// update smooth hash
		1738	if (tex.smoothtile)
		1739	{
		1740	skey.tile = tex.smoothtile;
		1741	skey.level = tex.smoothlevel;
		1742
		1743	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1744
		1745	// add bits to current tile and all neighbours. skey.x\|y is
		1746	// shifted +1\|+1 so we always stay positive.
		1747
		1748	// bits is ___n cccc CCCC bbbb
		1749	// n do not draw borders&corners
		1750	// c draw these corners, but...
		1751	// C ... not these
		1752	// b draw these borders
		1753
		1754	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1755	// ┃· ·· ·┃ ━━
		1756
		1757	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1758	// ·· ·· ·┏ ┓·
		1759
		1760	// full tile
		1761	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1762
		1763	// borders
		1764	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1765	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1766	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1767	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1768
		1769	// corners
		1770	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1771	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1772	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1773	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1774	}
		1775	}
		1776	}
		1777	}
		1778
		1779	// go through all smoothlevels, lowest to highest, then draw.
		1780	// this is basically counting sort
		1781	{
		1782	int w, b;
		1783
		1784	for (w = 0; w < 256 / 32; ++w)
		1785	{
		1786	uint32_t smask = smooth_level [w];
		1787	if (smask)
		1788	for (b = 0; b < 32; ++b)
		1789	if (smask & (((uint32_t)1) << b))
1553	{	1790	{
1554	maptex tex = self->tex [face];	1791	int level = (w << 5) \| b;
1555	int px = (x + 1) * 32 - tex.w;	1792	HE *he;
1556	int py = (y + 1) * 32 - tex.h;
1557		1793
1558	if (last_name != tex.name)	1794	hv_iterinit (smooth);
		1795	while ((he = hv_iternext (smooth)))
1559	{	1796	{
		1797	smooth_key skey = (smooth_key )HeKEY (he);
		1798	IV bits = SvIVX (HeVAL (he));
		1799
		1800	if (!(bits & 0x1000)
		1801	&& skey->level == level
		1802	&& level > smooth_max [skey->x][skey->y])
		1803	{
		1804	maptex tex = self->tex [skey->tile];
		1805	int px = (((int)skey->x) - 1) * T;
		1806	int py = (((int)skey->y) - 1) * T;
		1807	int border = bits & 15;
		1808	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1809	float dx = tex.s * .0625f; // 16 images/row
		1810	float dy = tex.t * .5f ; // 2 images/column
		1811
		1812	// this time naively avoiding texture state changes
		1813	// save gobs of state changes.
		1814	if (last_name != tex.name)
		1815	{
		1816	if (!tex.name)
		1817	continue; // smoothing not yet available
		1818
1560	glEnd ();	1819	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1820	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1821	glBegin (GL_QUADS);
		1822	}
		1823
		1824	if (border)
		1825	{
		1826	float ox = border * dx;
		1827
		1828	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1829	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1830	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1831	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1832	}
		1833
		1834	if (corner)
		1835	{
		1836	float ox = corner * dx;
		1837
		1838	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1839	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1840	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1841	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1842	}
1563	}	1843	}
1564
1565	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1566	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1567	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1568	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1569	}
1570
1571	if (cell->flags && z == 2)
1572	{
1573	if (cell->flags & 1)
1574	{
1575	maptex tex = self->tex [1];
1576	int px = (x + 1) * 32 - tex.w + 2;
1577	int py = (y + 1) * 32 - tex.h - 6;
1578
1579	glEnd ();
1580	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1581	glBegin (GL_QUADS);
1582
1583	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1584	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1585	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1586	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1587	}	1844	}
1588	}	1845	}
1589	}
1590	}	1846	}
		1847	}
		1848
		1849	hv_clear (smooth);
		1850	}
1591		1851
1592	glEnd ();	1852	glEnd ();
1593		1853
1594	glDisable (GL_TEXTURE_2D);	1854	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1855	glDisable (GL_BLEND);
…		…
1603	for (x = 0; x < sw; x++)	1863	for (x = 0; x < sw; x++)
1604	if (row->c0 <= x + mx && x + mx < row->c1)	1864	if (row->c0 <= x + mx && x + mx < row->c1)
1605	{	1865	{
1606	mapcell *cell = row->col + (x + mx - row->c0);	1866	mapcell *cell = row->col + (x + mx - row->c0);
1607		1867
1608	int px = x * 32;	1868	int px = x * T;
1609	int py = y * 32;	1869	int py = y * T;
1610		1870
1611	if (cell->stat_hp)	1871	if (cell->stat_hp)
1612	{	1872	{
1613	int width = cell->stat_width * 32;	1873	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1874	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1875
1616	glColor3ub (0, 0, 0);	1876	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1877	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1878	px + width - 1, py);
1619		1879
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2018	if (row && row->c0 <= x && x < row->c1)
1759	{	2019	{
1760	mapcell *cell = row->col + (x - row->c0);	2020	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2021	uint8_t flags = 0;
1762		2022
1763	if (cell->face [0]) flags \|= 1;	2023	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2024	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2025	if (cell->tile [2]) flags \|= 4;
1766		2026
1767	*data++ = flags;	2027	*data++ = flags;
1768		2028
1769	if (flags & 1)	2029	if (flags & 1)
1770	{	2030	{
		2031	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2032	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2033	*data++ = tile;
1773	}	2034	}
1774		2035
1775	if (flags & 2)	2036	if (flags & 2)
1776	{	2037	{
		2038	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2039	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2040	*data++ = tile;
1779	}	2041	}
1780		2042
1781	if (flags & 4)	2043	if (flags & 4)
1782	{	2044	{
		2045	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2046	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2047	*data++ = tile;
1785	}	2048	}
1786	}	2049	}
1787	else	2050	else
1788	*data++ = 0;	2051	*data++ = 0;
1789	}	2052	}
…		…
1829	{	2092	{
1830	uint8_t flags = *data++;	2093	uint8_t flags = *data++;
1831		2094
1832	if (flags)	2095	if (flags)
1833	{	2096	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2097	mapcell *cell = row_get_cell (row, x);
		2098	tileid tile[3] = { 0, 0, 0 };
1837		2099
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2100	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2101	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2102	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2103
1842	if (cell->darkness == 0)	2104	if (cell->darkness == 0)
1843	{	2105	{
1844	cell->darkness = 0;	2106	cell->darkness = 0;
1845		2107
1846	for (z = 0; z <= 2; z++)	2108	for (z = 0; z <= 2; z++)
1847	{	2109	{
1848	cell->face[z] = face[z];	2110	tileid t = tile [z];
1849		2111
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2112	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2113	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2114	XPUSHs (sv_2mortal (newSViv (t)));
		2115	need_texid (self, t);
		2116	}
		2117
		2118	cell->tile [z] = t;
1852	}	2119	}
1853	}	2120	}
1854	}	2121	}
1855	}	2122	}
1856	}	2123	}
…		…
1891	CODE:	2158	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2159	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2160	OUTPUT:
1894	RETVAL	2161	RETVAL
1895		2162
		2163	int
		2164	fade_out (int ms)
		2165	CODE:
		2166	RETVAL = Mix_FadeOutMusic (ms);
		2167	OUTPUT:
		2168	RETVAL
		2169
1896	CFPlus::MixMusic	2170	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2171	new_from_file (SV class, char path)
1898	CODE:	2172	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2173	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2174	OUTPUT:
…		…
1907		2181
1908	int	2182	int
1909	play (CFPlus::MixMusic self, int loops = -1)	2183	play (CFPlus::MixMusic self, int loops = -1)
1910	CODE:	2184	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2185	RETVAL = Mix_PlayMusic (self, loops);
		2186	OUTPUT:
		2187	RETVAL
		2188
		2189	int
		2190	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2191	CODE:
		2192	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1912	OUTPUT:	2193	OUTPUT:
1913	RETVAL	2194	RETVAL
1914		2195
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2196	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1916		2197
…		…
2005	# undef const_iv	2286	# undef const_iv
2006	};	2287	};
2007		2288
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2289	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2290	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2291
		2292	texture_av = newAV ();
		2293	AvREAL_off (texture_av);
2010	}	2294	}
2011		2295
2012	char *	2296	char *
2013	gl_vendor ()	2297	gl_vendor ()
2014	CODE:	2298	CODE:
…		…
2163		2447
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2448	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2449
2166	int glGenTexture ()	2450	int glGenTexture ()
2167	CODE:	2451	CODE:
2168	{	2452	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2453	OUTPUT:
2174	RETVAL	2454	RETVAL
2175		2455
2176	void glDeleteTexture (int name)	2456	void glDeleteTexture (int name)
2177	CODE:	2457	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2458	del_texture (name);
2181	}	2459
2182
2183	int glGenList ()	2460	int glGenList ()
2184	CODE:	2461	CODE:
2185	RETVAL = glGenLists (1);	2462	RETVAL = glGenLists (1);
2186	OUTPUT:	2463	OUTPUT:
2187	RETVAL	2464	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC vs. Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.169 by root, Wed Dec 13 17:30:02 2006 UTC vs.
Revision 1.196 by root, Sun Jul 15 21:02:20 2007 UTC