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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.170 by root, Sun Mar 4 19:36:08 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 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"
…		…
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
592	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
593		664
594	char *	665	char *
595	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
596		667
		668	int
		669	SDL_GetAppState ()
		670
597	void	671	void
598	SDL_PollEvent ()	672	poll_events ()
599	PPCODE:	673	PPCODE:
600	{	674	{
601	SDL_Event ev;	675	SDL_Event ev;
602		676
603	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
604	{	679	{
605	HV *hv = newHV ();	680	HV *hv = newHV ();
606	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
607		682
608	switch (ev.type)	683	switch (ev.type)
…		…
620	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
621	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
622	break;	697	break;
623		698
624	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
625	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
626
627	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
628	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
629	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
630	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
631	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
632	break;	725	break;
633		726
634	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
635	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
636	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
665	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
666		759
667	void	760	void
668	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
669	CODE:	762	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		764
674	void	765	void
675	win32_proxy_info ()	766	win32_proxy_info ()
676	PPCODE:	767	PPCODE:
677	{	768	{
…		…
818	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
819	#else	910	#else
820	_exit (retval);	911	_exit (retval);
821	#endif	912	#endif
822		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
823	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
824		924
825	CFPlus::Font	925	CFPlus::Font
826	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
827	CODE:	927	CODE:
…		…
1240	RETVAL->y = 0;	1340	RETVAL->y = 0;
1241	RETVAL->w = 0;	1341	RETVAL->w = 0;
1242	RETVAL->h = 0;	1342	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1343	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1344	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1345	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1346	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;	1347	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1348	RETVAL->row = 0;
1251	OUTPUT:	1349	OUTPUT:
1252	RETVAL	1350	RETVAL
1253		1351
1254	void	1352	void
1255	DESTROY (CFPlus::Map self)	1353	DESTROY (CFPlus::Map self)
1256	CODE:	1354	CODE:
1257	{	1355	{
1258	map_clear (self);	1356	map_clear (self);
1259	Safefree (self->face);	1357	Safefree (self->face2tile);
1260	Safefree (self->tex);	1358	Safefree (self->tex);
1261	Safefree (self);	1359	Safefree (self);
1262	}	1360	}
1263		1361
1264	void	1362	void
…		…
1271	clear (CFPlus::Map self)	1369	clear (CFPlus::Map self)
1272	CODE:	1370	CODE:
1273	map_clear (self);	1371	map_clear (self);
1274		1372
1275	void	1373	void
1276	set_face (CFPlus::Map self, int face, int texid)	1374	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1375	CODE:
1278	{	1376	{
1279	while (self->faces <= face)	1377	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1378	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1379	}
1282	self->faces *= 2;
1283	}
1284		1380
1285	self->face [face] = texid;	1381	void
		1382	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1383	CODE:
		1384	{
		1385	tileid texid;
		1386	maptex *tex;
		1387
		1388	if (face < 0 \|\| face >= self->faces)
		1389	return;
		1390
		1391	if (smooth < 0 \|\| smooth >= self->faces)
		1392	return;
		1393
		1394	texid = self->face2tile [face];
		1395
		1396	if (!texid)
		1397	return;
		1398
		1399	tex = self->tex + texid;
		1400	tex->smoothtile = self->face2tile [smooth];
		1401	tex->smoothlevel = level;
1286	}	1402	}
1287		1403
1288	void	1404	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)	1405	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:	1406	CODE:
1291	{	1407	{
1292	while (self->texs <= texid)	1408	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1409
1298	{	1410	{
1299	maptex *tex = self->tex + texid;	1411	maptex *tex = self->tex + texid;
1300		1412
1301	tex->name = name;	1413	tex->name = name;
…		…
1345	CODE:	1457	CODE:
1346	{	1458	{
1347	if (dx > 0)	1459	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1461	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1463
1352	if (dy > 0)	1464	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1465	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1466	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1468
1357	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1359		1471
1360	while (self->y < 0)	1472	while (self->y < 0)
…		…
1414	}	1526	}
1415	else if (cmd == 6) // monster width	1527	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1528	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1529	else if (cmd == 0x47)
1418	{	1530	{
1419	if (*data == 8)	1531	if (*data == 4)
1420	; // decode player uuid	1532	; // decode player count
1421		1533
1422	data += *data + 1;	1534	data += *data + 1;
1423	}	1535	}
1424	else if (cmd == 8) // cell flags	1536	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1537	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1546	cell->darkness = *data++ + 1;
1435	}	1547	}
1436		1548
1437	if (flags & 4)	1549	if (flags & 4)
1438	{	1550	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1551	faceid face = (data [0] << 8) + data [1]; data += 2;
		1552	need_facenum (self, face);
		1553	cell->tile [0] = self->face2tile [face];
1440	}	1554	}
1441		1555
1442	if (flags & 2)	1556	if (flags & 2)
1443	{	1557	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1558	faceid face = (data [0] << 8) + data [1]; data += 2;
		1559	need_facenum (self, face);
		1560	cell->tile [1] = self->face2tile [face];
1445	}	1561	}
1446		1562
1447	if (flags & 1)	1563	if (flags & 1)
1448	{	1564	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1565	faceid face = (data [0] << 8) + data [1]; data += 2;
		1566	need_facenum (self, face);
		1567	cell->tile [2] = self->face2tile [face];
1450	}	1568	}
1451	}	1569	}
1452	else	1570	else
1453	cell->darkness = 0;	1571	cell->darkness = 0;
1454	}	1572	}
…		…
1484	{	1602	{
1485	mapcell *cell = row->col + (x - row->c0);	1603	mapcell *cell = row->col + (x - row->c0);
1486		1604
1487	for (z = 0; z <= 0; z++)	1605	for (z = 0; z <= 0; z++)
1488	{	1606	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1607	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1608	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1609	int a1 = tex.a;
1496		1610
1497	r = (r * a0 + tex.r * a1) / 255;	1611	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1612	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1613	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1614	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1615	}
1503	}	1616	}
1504		1617
1505	*map++ = (r )	1618	*map++ = (r )
1506	\| (g << 8)	1619	\| (g << 8)
…		…
1513	}	1626	}
1514	OUTPUT:	1627	OUTPUT:
1515	RETVAL	1628	RETVAL
1516		1629
1517	void	1630	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1632	CODE:
1520	{	1633	{
		1634	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1637	smooth_key skey;
1521	int x, y, z;	1638	int x, y, z;
1522	int last_name;	1639	int last_name;
1523	mapface face;	1640
		1641	// thats current max. sorry.
		1642	if (sw > 255) sw = 255;
		1643	if (sh > 255) sh = 255;
		1644
		1645	// clear key, in case of extra padding
		1646	memset (&skey, 0, sizeof (skey));
1524		1647
1525	glColor4ub (255, 255, 255, 255);	1648	glColor4ub (255, 255, 255, 255);
1526		1649
1527	glEnable (GL_BLEND);	1650	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1651	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1657	last_name = 0;
1535		1658
1536	mx += self->x;	1659	mx += self->x;
1537	my += self->y;	1660	my += self->y;
1538		1661
		1662	// first pass: determine smooth_max
		1663	// rather ugly, if you ask me
		1664	// could also be stored inside mapcell and updated on change
		1665	memset (smooth_max, 0, sizeof (smooth_max));
		1666
		1667	for (y = 0; y < sh; y++)
		1668	if (0 <= y + my && y + my < self->rows)
		1669	{
		1670	maprow *row = self->row + (y + my);
		1671
		1672	for (x = 0; x < sw; x++)
		1673	if (row->c0 <= x + mx && x + mx < row->c1)
		1674	{
		1675	mapcell *cell = row->col + (x + mx - row->c0);
		1676
		1677	smooth_max[x + 1][y + 1] =
		1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
		1681	}
		1682	}
		1683
1539	for (z = 0; z < 3; z++)	1684	for (z = 0; z <= 2; z++)
		1685	{
		1686	memset (smooth_level, 0, sizeof (smooth_level));
		1687
1540	for (y = 0; y < sh; y++)	1688	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1689	if (0 <= y + my && y + my < self->rows)
1542	{	1690	{
1543	maprow *row = self->row + (y + my);	1691	maprow *row = self->row + (y + my);
1544		1692
1545	for (x = 0; x < sw; x++)	1693	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1694	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1695	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1696	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1697	tileid tile = cell->tile [z];
		1698
		1699	if (tile)
		1700	{
		1701	maptex tex = self->tex [tile];
		1702	int px = (x + 1) * T - tex.w;
		1703	int py = (y + 1) * T - tex.h;
1551		1704
1552	if (face && face < self->texs)	1705	// suppressing texture state switches here
		1706	// is only moderately effective, but worth the extra effort
		1707	if (last_name != tex.name)
		1708	{
		1709	if (!tex.name)
		1710	tex = self->tex [2]; /* missing, replace by noface */
		1711
		1712	glEnd ();
		1713	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1714	glBegin (GL_QUADS);
		1715	}
		1716
		1717	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1718	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1719	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1720	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1721
		1722	if (cell->flags && z == 2)
		1723	{
		1724	if (cell->flags & 1)
		1725	{
		1726	maptex tex = self->tex [1];
		1727	int px = x * T + T * 2 / 32;
		1728	int py = y * T - T * 6 / 32;
		1729
		1730	glEnd ();
		1731	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1732	glBegin (GL_QUADS);
		1733
		1734	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1735	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1736	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1737	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1738	}
		1739	}
		1740
		1741	// update smooth hash
		1742	if (tex.smoothtile)
		1743	{
		1744	skey.tile = tex.smoothtile;
		1745	skey.level = tex.smoothlevel;
		1746
		1747	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1748
		1749	// add bits to current tile and all neighbours. skey.x\|y is
		1750	// shifted +1\|+1 so we always stay positive.
		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
		1764	// full tile
		1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1766
		1767	// borders
		1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1772
		1773	// corners
		1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1775	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1776	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1777	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1778	}
		1779	}
		1780	}
		1781	}
		1782
		1783	// go through all smoothlevels, lowest to highest, then draw.
		1784	// this is basically counting sort
		1785	{
		1786	int w, b;
		1787
		1788	for (w = 0; w < 256 / 32; ++w)
		1789	{
		1790	uint32_t smask = smooth_level [w];
		1791	if (smask)
		1792	for (b = 0; b < 32; ++b)
		1793	if (smask & (((uint32_t)1) << b))
1553	{	1794	{
1554	maptex tex = self->tex [face];	1795	int level = (w << 5) \| b;
1555	int px = (x + 1) * 32 - tex.w;	1796	HE *he;
1556	int py = (y + 1) * 32 - tex.h;
1557		1797
1558	if (last_name != tex.name)	1798	hv_iterinit (smooth);
		1799	while ((he = hv_iternext (smooth)))
1559	{	1800	{
		1801	smooth_key skey = (smooth_key )HeKEY (he);
		1802	IV bits = SvIVX (HeVAL (he));
		1803
		1804	if (!(bits & 0x1000)
		1805	&& skey->level == level
		1806	&& level > smooth_max [skey->x][skey->y])
		1807	{
		1808	maptex tex = self->tex [skey->tile];
		1809	int px = (((int)skey->x) - 1) * T;
		1810	int py = (((int)skey->y) - 1) * T;
		1811	int border = bits & 15;
		1812	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1813	float dx = tex.s * .0625f; // 16 images/row
		1814	float dy = tex.t * .5f ; // 2 images/column
		1815
		1816	// this time naively avoiding texture state changes
		1817	// save gobs of state changes.
		1818	if (last_name != tex.name)
		1819	{
		1820	if (!tex.name)
		1821	continue; // smoothing not yet available
		1822
1560	glEnd ();	1823	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1824	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1825	glBegin (GL_QUADS);
		1826	}
		1827
		1828	if (border)
		1829	{
		1830	float ox = border * dx;
		1831
		1832	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1833	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1834	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1835	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1836	}
		1837
		1838	if (corner)
		1839	{
		1840	float ox = corner * dx;
		1841
		1842	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1843	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1844	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1846	}
1563	}	1847	}
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	}	1848	}
1588	}	1849	}
1589	}
1590	}	1850	}
		1851	}
		1852
		1853	hv_clear (smooth);
		1854	}
1591		1855
1592	glEnd ();	1856	glEnd ();
1593		1857
1594	glDisable (GL_TEXTURE_2D);	1858	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1859	glDisable (GL_BLEND);
…		…
1603	for (x = 0; x < sw; x++)	1867	for (x = 0; x < sw; x++)
1604	if (row->c0 <= x + mx && x + mx < row->c1)	1868	if (row->c0 <= x + mx && x + mx < row->c1)
1605	{	1869	{
1606	mapcell *cell = row->col + (x + mx - row->c0);	1870	mapcell *cell = row->col + (x + mx - row->c0);
1607		1871
1608	int px = x * 32;	1872	int px = x * T;
1609	int py = y * 32;	1873	int py = y * T;
1610		1874
1611	if (cell->stat_hp)	1875	if (cell->stat_hp)
1612	{	1876	{
1613	int width = cell->stat_width * 32;	1877	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1878	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1879
1616	glColor3ub (0, 0, 0);	1880	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1881	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1882	px + width - 1, py);
1619		1883
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2022	if (row && row->c0 <= x && x < row->c1)
1759	{	2023	{
1760	mapcell *cell = row->col + (x - row->c0);	2024	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2025	uint8_t flags = 0;
1762		2026
1763	if (cell->face [0]) flags \|= 1;	2027	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2028	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2029	if (cell->tile [2]) flags \|= 4;
1766		2030
1767	*data++ = flags;	2031	*data++ = flags;
1768		2032
1769	if (flags & 1)	2033	if (flags & 1)
1770	{	2034	{
		2035	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2036	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2037	*data++ = tile;
1773	}	2038	}
1774		2039
1775	if (flags & 2)	2040	if (flags & 2)
1776	{	2041	{
		2042	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2043	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2044	*data++ = tile;
1779	}	2045	}
1780		2046
1781	if (flags & 4)	2047	if (flags & 4)
1782	{	2048	{
		2049	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2050	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2051	*data++ = tile;
1785	}	2052	}
1786	}	2053	}
1787	else	2054	else
1788	*data++ = 0;	2055	*data++ = 0;
1789	}	2056	}
…		…
1829	{	2096	{
1830	uint8_t flags = *data++;	2097	uint8_t flags = *data++;
1831		2098
1832	if (flags)	2099	if (flags)
1833	{	2100	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2101	mapcell *cell = row_get_cell (row, x);
		2102	tileid tile[3] = { 0, 0, 0 };
1837		2103
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2104	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2105	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2106	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2107
1842	if (cell->darkness == 0)	2108	if (cell->darkness == 0)
1843	{	2109	{
1844	cell->darkness = 0;	2110	cell->darkness = 0;
1845		2111
1846	for (z = 0; z <= 2; z++)	2112	for (z = 0; z <= 2; z++)
1847	{	2113	{
1848	cell->face[z] = face[z];	2114	tileid t = tile [z];
1849		2115
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2116	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2117	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2118	XPUSHs (sv_2mortal (newSViv (t)));
		2119	need_texid (self, t);
		2120	}
		2121
		2122	cell->tile [z] = t;
1852	}	2123	}
1853	}	2124	}
1854	}	2125	}
1855	}	2126	}
1856	}	2127	}
…		…
1891	CODE:	2162	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2164	OUTPUT:
1894	RETVAL	2165	RETVAL
1895		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
1896	CFPlus::MixMusic	2174	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2175	new_from_file (SV class, char path)
1898	CODE:	2176	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2178	OUTPUT:
…		…
1907		2185
1908	int	2186	int
1909	play (CFPlus::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
1910	CODE:	2188	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
		2190	OUTPUT:
		2191	RETVAL
		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1912	OUTPUT:	2197	OUTPUT:
1913	RETVAL	2198	RETVAL
1914		2199
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1916		2201
…		…
2005	# undef const_iv	2290	# undef const_iv
2006	};	2291	};
2007		2292
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
2010	}	2298	}
2011		2299
2012	char *	2300	char *
2013	gl_vendor ()	2301	gl_vendor ()
2014	CODE:	2302	CODE:
…		…
2163		2451
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2453
2166	int glGenTexture ()	2454	int glGenTexture ()
2167	CODE:	2455	CODE:
2168	{	2456	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2457	OUTPUT:
2174	RETVAL	2458	RETVAL
2175		2459
2176	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
2177	CODE:	2461	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2462	del_texture (name);
2181	}	2463
2182
2183	int glGenList ()	2464	int glGenList ()
2184	CODE:	2465	CODE:
2185	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
2186	OUTPUT:	2467	OUTPUT:
2187	RETVAL	2468	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.170 by root, Sun Mar 4 19:36:08 2007 UTC vs. Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.170 by root, Sun Mar 4 19:36:08 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC