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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	56	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	57	#else
58	# define PARACHUTE 0	58	# define PARACHUTE 0
59	#endif	59	#endif
60		60
		61	static AV *texture_av;
		62
61	static struct	63	static struct
62	{	64	{
63	#define GL_FUNC(ptr,name) ptr name;	65	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	66	#include "glfunc.h"
65	#undef GL_FUNC	67	#undef GL_FUNC
66	} gl;	68	} gl;
67		69
		70	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	71	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	72	{
70	if (gl.BlendFuncSeparate)	73	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	74	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	75	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	76	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	77	else
75	glBlendFunc (sa, da);	78	glBlendFunc (sa, da);
76	}	79	}
77		80
		81	static GLuint
		82	gen_texture ()
		83	{
		84	GLuint name;
		85
		86	if (AvFILL (texture_av) >= 0)
		87	name = (GLuint)(size_t)av_pop (texture_av);
		88	else
		89	glGenTextures (1, &name);
		90
		91	return name;
		92	}
		93
		94	static void
		95	del_texture (GLuint name)
		96	{
		97	/* make a half-assed attempt at returning the memory used by the texture */
		98	/* textures are frequently being reused by cfplus anyway */
		99	/glBindTexture (GL_TEXTURE_2D, name);/
		100	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		101	av_push (texture_av, (SV *)(size_t)name);
		102	glDeleteTextures (1, &name);
		103	}
		104
78	#include "texcache.c"	105	#include "texcache.c"
79		106
80	#include "pango-font.c"	107	#include "pango-font.c"
81	#include "pango-fontmap.c"	108	#include "pango-fontmap.c"
82	#include "pango-render.c"	109	#include "pango-render.c"
…		…
155		182
156	*w = rect.width;	183	*w = rect.width;
157	*h = rect.height;	184	*h = rect.height;
158	}	185	}
159		186
		187	typedef uint16_t tileid;
160	typedef uint16_t mapface;	188	typedef uint16_t faceid;
161		189
162	typedef struct {	190	typedef struct {
163	GLint name;	191	int name;
164	int w, h;	192	int w, h;
165	float s, t;	193	float s, t;
166	uint8_t r, g, b, a;	194	uint8_t r, g, b, a;
		195	tileid smoothtile;
		196	uint8_t smoothlevel;
167	} maptex;	197	} maptex;
168		198
169	typedef struct {	199	typedef struct {
170	uint32_t player;	200	uint32_t player;
171	mapface face[3];	201	tileid tile[3];
172	uint16_t darkness;	202	uint16_t darkness;
173	uint8_t stat_width, stat_hp, flags;	203	uint8_t stat_width, stat_hp, flags, smoothmax;
174	} mapcell;	204	} mapcell;
175		205
176	typedef struct {	206	typedef struct {
177	int32_t c0, c1;	207	int32_t c0, c1;
178	mapcell *col;	208	mapcell *col;
179	} maprow;	209	} maprow;
180		210
181	typedef struct map {	211	typedef struct map {
182	int x, y, w, h;	212	int x, y, w, h;
183	int ox, oy; /* offset to virtual global coordinate system */	213	int ox, oy; /* offset to virtual global coordinate system */
184	int faces;	214	int faces; tileid *face2tile; // [faceid]
185	mapface *face;	215	int texs; maptex *tex; // [tileid]
186
187	int texs;
188	maptex *tex;
189		216
190	int32_t rows;	217	int32_t rows;
191	maprow *row;	218	maprow *row;
192	} *CFPlus__Map;	219	} *CFPlus__Map;
193		220
…		…
213	return ptr;	240	return ptr;
214	}	241	}
215		242
216	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	243	#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))	244	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		245
		246	static void
		247	need_facenum (struct map *self, faceid face)
		248	{
		249	while (self->faces <= face)
		250	{
		251	Append (tileid, self->face2tile, self->faces, self->faces);
		252	self->faces *= 2;
		253	}
		254	}
		255
		256	static void
		257	need_texid (struct map *self, int texid)
		258	{
		259	while (self->texs <= texid)
		260	{
		261	Append (maptex, self->tex, self->texs, self->texs);
		262	self->texs *= 2;
		263	}
		264	}
218		265
219	static maprow *	266	static maprow *
220	map_get_row (CFPlus__Map self, int y)	267	map_get_row (CFPlus__Map self, int y)
221	{	268	{
222	if (0 > y)	269	if (0 > y)
…		…
315	cell->stat_hp = 0;	362	cell->stat_hp = 0;
316	cell->flags = 0;	363	cell->flags = 0;
317	cell->player = 0;	364	cell->player = 0;
318	}	365	}
319	}	366	}
		367	}
		368
		369	typedef struct {
		370	tileid tile;
		371	uint8_t x, y, level;
		372	} smooth_key;
		373
		374	static void
		375	smooth_or_bits (HV hv, smooth_key key, IV bits)
		376	{
		377	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		378
		379	if (SvIOK (*sv))
		380	SvIV_set (sv, SvIVX (sv) \| bits);
		381	else
		382	sv_setiv (*sv, bits);
320	}	383	}
321		384
322	static void	385	static void
323	music_finished (void)	386	music_finished (void)
324	{	387	{
…		…
578	RETVAL = !!SDL_SetVideoMode (	641	RETVAL = !!SDL_SetVideoMode (
579	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	642	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
580	);	643	);
581	if (RETVAL)	644	if (RETVAL)
582	{	645	{
		646	av_clear (texture_av);
		647
583	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	648	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
584	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	649	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
585	# include "glfunc.h"	650	# include "glfunc.h"
586	# undef GL_FUNC	651	# undef GL_FUNC
		652
587	}	653	}
588	OUTPUT:	654	OUTPUT:
589	RETVAL	655	RETVAL
590		656
591	void	657	void
…		…
665	Mix_AllocateChannels (int numchans = -1)	731	Mix_AllocateChannels (int numchans = -1)
666		732
667	void	733	void
668	lowdelay (int fd, int val = 1)	734	lowdelay (int fd, int val = 1)
669	CODE:	735	CODE:
670	#ifndef _WIN32
671	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	736	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
672	#endif
673		737
674	void	738	void
675	win32_proxy_info ()	739	win32_proxy_info ()
676	PPCODE:	740	PPCODE:
677	{	741	{
…		…
1240	RETVAL->y = 0;	1304	RETVAL->y = 0;
1241	RETVAL->w = 0;	1305	RETVAL->w = 0;
1242	RETVAL->h = 0;	1306	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1307	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1308	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1309	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1310	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;	1311	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1312	RETVAL->row = 0;
1251	OUTPUT:	1313	OUTPUT:
1252	RETVAL	1314	RETVAL
1253		1315
1254	void	1316	void
1255	DESTROY (CFPlus::Map self)	1317	DESTROY (CFPlus::Map self)
1256	CODE:	1318	CODE:
1257	{	1319	{
1258	map_clear (self);	1320	map_clear (self);
1259	Safefree (self->face);	1321	Safefree (self->face2tile);
1260	Safefree (self->tex);	1322	Safefree (self->tex);
1261	Safefree (self);	1323	Safefree (self);
1262	}	1324	}
1263		1325
1264	void	1326	void
…		…
1271	clear (CFPlus::Map self)	1333	clear (CFPlus::Map self)
1272	CODE:	1334	CODE:
1273	map_clear (self);	1335	map_clear (self);
1274		1336
1275	void	1337	void
1276	set_face (CFPlus::Map self, int face, int texid)	1338	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1339	CODE:
1278	{	1340	{
1279	while (self->faces <= face)	1341	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1342	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1343	}
1282	self->faces *= 2;
1283	}
1284		1344
1285	self->face [face] = texid;	1345	void
		1346	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1347	CODE:
		1348	{
		1349	tileid texid;
		1350	maptex *tex;
		1351
		1352	if (face < 0 \|\| face >= self->faces)
		1353	return;
		1354
		1355	if (smooth < 0 \|\| smooth >= self->faces)
		1356	return;
		1357
		1358	texid = self->face2tile [face];
		1359
		1360	if (!texid)
		1361	return;
		1362
		1363	tex = self->tex + texid;
		1364	tex->smoothtile = self->face2tile [smooth];
		1365	tex->smoothlevel = level;
1286	}	1366	}
1287		1367
1288	void	1368	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)	1369	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:	1370	CODE:
1291	{	1371	{
1292	while (self->texs <= texid)	1372	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1373
1298	{	1374	{
1299	maptex *tex = self->tex + texid;	1375	maptex *tex = self->tex + texid;
1300		1376
1301	tex->name = name;	1377	tex->name = name;
…		…
1345	CODE:	1421	CODE:
1346	{	1422	{
1347	if (dx > 0)	1423	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1424	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1425	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1426	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1427
1352	if (dy > 0)	1428	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1429	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1430	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1431	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1432
1357	self->ox += dx; self->x += dx;	1433	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1434	self->oy += dy; self->y += dy;
1359		1435
1360	while (self->y < 0)	1436	while (self->y < 0)
…		…
1414	}	1490	}
1415	else if (cmd == 6) // monster width	1491	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1492	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47)	1493	else if (cmd == 0x47)
1418	{	1494	{
1419	if (*data == 8)	1495	if (*data == 4)
1420	; // decode player uuid	1496	; // decode player count
1421		1497
1422	data += *data + 1;	1498	data += *data + 1;
1423	}	1499	}
1424	else if (cmd == 8) // cell flags	1500	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1501	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1510	cell->darkness = *data++ + 1;
1435	}	1511	}
1436		1512
1437	if (flags & 4)	1513	if (flags & 4)
1438	{	1514	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1515	faceid face = (data [0] << 8) + data [1]; data += 2;
		1516	need_facenum (self, face);
		1517	cell->tile [0] = self->face2tile [face];
1440	}	1518	}
1441		1519
1442	if (flags & 2)	1520	if (flags & 2)
1443	{	1521	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1522	faceid face = (data [0] << 8) + data [1]; data += 2;
		1523	need_facenum (self, face);
		1524	cell->tile [1] = self->face2tile [face];
1445	}	1525	}
1446		1526
1447	if (flags & 1)	1527	if (flags & 1)
1448	{	1528	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1529	faceid face = (data [0] << 8) + data [1]; data += 2;
		1530	need_facenum (self, face);
		1531	cell->tile [2] = self->face2tile [face];
1450	}	1532	}
1451	}	1533	}
1452	else	1534	else
1453	cell->darkness = 0;	1535	cell->darkness = 0;
1454	}	1536	}
…		…
1484	{	1566	{
1485	mapcell *cell = row->col + (x - row->c0);	1567	mapcell *cell = row->col + (x - row->c0);
1486		1568
1487	for (z = 0; z <= 0; z++)	1569	for (z = 0; z <= 0; z++)
1488	{	1570	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1571	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1572	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1573	int a1 = tex.a;
1496		1574
1497	r = (r * a0 + tex.r * a1) / 255;	1575	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1576	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1577	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1578	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1579	}
1503	}	1580	}
1504		1581
1505	*map++ = (r )	1582	*map++ = (r )
1506	\| (g << 8)	1583	\| (g << 8)
…		…
1516		1593
1517	void	1594	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1595	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1596	CODE:
1520	{	1597	{
		1598	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1599	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1600	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1601	smooth_key skey;
1521	int x, y, z;	1602	int x, y, z;
1522	int last_name;	1603	int last_name;
1523	mapface face;	1604
		1605	// thats current max. sorry.
		1606	if (sw > 255) sw = 255;
		1607	if (sh > 255) sh = 255;
		1608
		1609	// clear key, in case of extra padding
		1610	memset (&skey, 0, sizeof (skey));
1524		1611
1525	glColor4ub (255, 255, 255, 255);	1612	glColor4ub (255, 255, 255, 255);
1526		1613
1527	glEnable (GL_BLEND);	1614	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1615	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1621	last_name = 0;
1535		1622
1536	mx += self->x;	1623	mx += self->x;
1537	my += self->y;	1624	my += self->y;
1538		1625
		1626	// first pass: determine smooth_max
		1627	// rather ugly, if you ask me
		1628	// could also be stored inside mapcell and updated on change
		1629	memset (smooth_max, 0, sizeof (smooth_max));
		1630
		1631	for (y = 0; y < sh; y++)
		1632	if (0 <= y + my && y + my < self->rows)
		1633	{
		1634	maprow *row = self->row + (y + my);
		1635
		1636	for (x = 0; x < sw; x++)
		1637	if (row->c0 <= x + mx && x + mx < row->c1)
		1638	{
		1639	mapcell *cell = row->col + (x + mx - row->c0);
		1640
		1641	smooth_max[x + 1][y + 1] =
		1642	MAX (self->tex [cell->tile [0]].smoothlevel,
		1643	MAX (self->tex [cell->tile [1]].smoothlevel,
		1644	self->tex [cell->tile [2]].smoothlevel));
		1645	}
		1646	}
		1647
1539	for (z = 0; z < 3; z++)	1648	for (z = 0; z <= 2; z++)
		1649	{
		1650	memset (smooth_level, 0, sizeof (smooth_level));
		1651
1540	for (y = 0; y < sh; y++)	1652	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1653	if (0 <= y + my && y + my < self->rows)
1542	{	1654	{
1543	maprow *row = self->row + (y + my);	1655	maprow *row = self->row + (y + my);
1544		1656
1545	for (x = 0; x < sw; x++)	1657	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1658	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1659	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1660	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1661	tileid tile = cell->tile [z];
		1662
		1663	if (tile)
		1664	{
		1665	maptex tex = self->tex [tile];
		1666	int px = (x + 1) * T - tex.w;
		1667	int py = (y + 1) * T - tex.h;
1551		1668
1552	if (face && face < self->texs)	1669	// suppressing texture state switches here
		1670	// is only moderately effective, but worth the extra effort
		1671	if (last_name != tex.name)
		1672	{
		1673	if (!tex.name)
		1674	tex = self->tex [2]; /* missing, replace by noface */
		1675
		1676	glEnd ();
		1677	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1678	glBegin (GL_QUADS);
		1679	}
		1680
		1681	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1682	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1683	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1684	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1685
		1686	if (cell->flags && z == 2)
		1687	{
		1688	if (cell->flags & 1)
		1689	{
		1690	maptex tex = self->tex [1];
		1691	int px = x * T + T * 2 / 32;
		1692	int py = y * T - T * 6 / 32;
		1693
		1694	glEnd ();
		1695	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1696	glBegin (GL_QUADS);
		1697
		1698	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1699	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1700	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1701	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1702	}
		1703	}
		1704
		1705	// update smooth hash
		1706	if (tex.smoothtile)
		1707	{
		1708	skey.tile = tex.smoothtile;
		1709	skey.level = tex.smoothlevel;
		1710
		1711	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1712
		1713	// add bits to current tile and all neighbours. skey.x\|y is
		1714	// shifted +1\|+1 so we always stay positive.
		1715
		1716	// bits is ___n cccc CCCC bbbb
		1717	// n do not draw borders&corners
		1718	// c draw these corners, but...
		1719	// C ... not these
		1720	// b draw these borders
		1721
		1722	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1723	// ┃· ·· ·┃ ━━
		1724
		1725	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1726	// ·· ·· ·┏ ┓·
		1727
		1728	// full tile
		1729	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1730
		1731	// borders
		1732	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1733	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1734	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1735	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1736
		1737	// corners
		1738	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1739	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1740	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1741	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1742	}
		1743	}
		1744	}
		1745	}
		1746
		1747	// go through all smoothlevels, lowest to highest, then draw.
		1748	// this is basically counting sort
		1749	{
		1750	int w, b;
		1751
		1752	for (w = 0; w < 256 / 32; ++w)
		1753	{
		1754	uint32_t smask = smooth_level [w];
		1755	if (smask)
		1756	for (b = 0; b < 32; ++b)
		1757	if (smask & (((uint32_t)1) << b))
1553	{	1758	{
1554	maptex tex = self->tex [face];	1759	int level = (w << 5) \| b;
1555	int px = (x + 1) * T - tex.w;	1760	HE *he;
1556	int py = (y + 1) * T - tex.h;
1557		1761
1558	if (last_name != tex.name)	1762	hv_iterinit (smooth);
		1763	while ((he = hv_iternext (smooth)))
1559	{	1764	{
		1765	smooth_key skey = (smooth_key )HeKEY (he);
		1766	IV bits = SvIVX (HeVAL (he));
		1767
		1768	if (!(bits & 0x1000)
		1769	&& skey->level == level
		1770	&& level > smooth_max [skey->x][skey->y])
		1771	{
		1772	maptex tex = self->tex [skey->tile];
		1773	int px = (((int)skey->x) - 1) * T;
		1774	int py = (((int)skey->y) - 1) * T;
		1775	int border = bits & 15;
		1776	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1777	float dx = tex.s * .0625f; // 16 images/row
		1778	float dy = tex.t * .5f ; // 2 images/column
		1779
		1780	// this time naively avoiding texture state changes
		1781	// save gobs of state changes.
		1782	if (last_name != tex.name)
		1783	{
		1784	if (!tex.name)
		1785	continue; // smoothing not yet available
		1786
1560	glEnd ();	1787	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1788	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1789	glBegin (GL_QUADS);
		1790	}
		1791
		1792	if (border)
		1793	{
		1794	float ox = border * dx;
		1795
		1796	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1797	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1798	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1799	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1800	}
		1801
		1802	if (corner)
		1803	{
		1804	float ox = corner * dx;
		1805
		1806	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1807	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1808	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1809	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1810	}
1563	}	1811	}
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) * T - tex.w + 2;
1577	int py = (y + 1) * T - 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	}	1812	}
1588	}	1813	}
1589	}
1590	}	1814	}
		1815	}
		1816
		1817	hv_clear (smooth);
		1818	}
1591		1819
1592	glEnd ();	1820	glEnd ();
1593		1821
1594	glDisable (GL_TEXTURE_2D);	1822	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1823	glDisable (GL_BLEND);
…		…
1609	int py = y * T;	1837	int py = y * T;
1610		1838
1611	if (cell->stat_hp)	1839	if (cell->stat_hp)
1612	{	1840	{
1613	int width = cell->stat_width * T;	1841	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1842	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1843
1616	glColor3ub (0, 0, 0);	1844	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1845	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1846	px + width - 1, py);
1619		1847
…		…
1758	if (row && row->c0 <= x && x < row->c1)	1986	if (row && row->c0 <= x && x < row->c1)
1759	{	1987	{
1760	mapcell *cell = row->col + (x - row->c0);	1988	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	1989	uint8_t flags = 0;
1762		1990
1763	if (cell->face [0]) flags \|= 1;	1991	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	1992	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	1993	if (cell->tile [2]) flags \|= 4;
1766		1994
1767	*data++ = flags;	1995	*data++ = flags;
1768		1996
1769	if (flags & 1)	1997	if (flags & 1)
1770	{	1998	{
		1999	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2000	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2001	*data++ = tile;
1773	}	2002	}
1774		2003
1775	if (flags & 2)	2004	if (flags & 2)
1776	{	2005	{
		2006	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2007	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2008	*data++ = tile;
1779	}	2009	}
1780		2010
1781	if (flags & 4)	2011	if (flags & 4)
1782	{	2012	{
		2013	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2014	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2015	*data++ = tile;
1785	}	2016	}
1786	}	2017	}
1787	else	2018	else
1788	*data++ = 0;	2019	*data++ = 0;
1789	}	2020	}
…		…
1829	{	2060	{
1830	uint8_t flags = *data++;	2061	uint8_t flags = *data++;
1831		2062
1832	if (flags)	2063	if (flags)
1833	{	2064	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2065	mapcell *cell = row_get_cell (row, x);
		2066	tileid tile[3] = { 0, 0, 0 };
1837		2067
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2068	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2069	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2070	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2071
1842	if (cell->darkness == 0)	2072	if (cell->darkness == 0)
1843	{	2073	{
1844	cell->darkness = 0;	2074	cell->darkness = 0;
1845		2075
1846	for (z = 0; z <= 2; z++)	2076	for (z = 0; z <= 2; z++)
1847	{	2077	{
1848	cell->face[z] = face[z];	2078	tileid t = tile [z];
1849		2079
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2080	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2081	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2082	XPUSHs (sv_2mortal (newSViv (t)));
		2083	need_texid (self, t);
		2084	}
		2085
		2086	cell->tile [z] = t;
1852	}	2087	}
1853	}	2088	}
1854	}	2089	}
1855	}	2090	}
1856	}	2091	}
…		…
2005	# undef const_iv	2240	# undef const_iv
2006	};	2241	};
2007		2242
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2243	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2244	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2245
		2246	texture_av = newAV ();
		2247	AvREAL_off (texture_av);
2010	}	2248	}
2011		2249
2012	char *	2250	char *
2013	gl_vendor ()	2251	gl_vendor ()
2014	CODE:	2252	CODE:
…		…
2163		2401
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2402	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2403
2166	int glGenTexture ()	2404	int glGenTexture ()
2167	CODE:	2405	CODE:
2168	{	2406	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2407	OUTPUT:
2174	RETVAL	2408	RETVAL
2175		2409
2176	void glDeleteTexture (int name)	2410	void glDeleteTexture (int name)
2177	CODE:	2411	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2412	del_texture (name);
2181	}	2413
2182
2183	int glGenList ()	2414	int glGenList ()
2184	CODE:	2415	CODE:
2185	RETVAL = glGenLists (1);	2416	RETVAL = glGenLists (1);
2186	OUTPUT:	2417	OUTPUT:
2187	RETVAL	2418	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs. Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.171 by root, Sun Apr 1 01:19:18 2007 UTC vs.
Revision 1.192 by root, Fri Apr 27 21:27:51 2007 UTC