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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.195 by root, Sat Jul 14 12:05:52 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	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
16	# undef pipe	21	# undef pipe
17	#endif	22	#endif
18		23
		24	#include <assert.h>
19	#include <math.h>	25	#include <math.h>
20	#include <string.h>	26	#include <string.h>
21	#include <stdio.h>	27	#include <stdio.h>
22	#include <stdlib.h>	28	#include <stdlib.h>
23		29
55	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
56	#else	62	#else
57	# define PARACHUTE 0	63	# define PARACHUTE 0
58	#endif	64	#endif
59		65
		66	static AV *texture_av;
		67
60	static struct	68	static struct
61	{	69	{
62	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
63	#include "glfunc.h"	71	#include "glfunc.h"
64	#undef GL_FUNC	72	#undef GL_FUNC
65	} gl;	73	} gl;
66		74
		75	static void
67	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
68	{	77	{
69	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
70	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
71	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
72	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
73	else	82	else
74	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
75	}	84	}
76		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
77	#include "texcache.c"	110	#include "texcache.c"
78		111
79	#include "pango-font.c"	112	#include "pango-font.c"
80	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
81	#include "pango-render.c"	114	#include "pango-render.c"
…		…
154		187
155	*w = rect.width;	188	*w = rect.width;
156	*h = rect.height;	189	*h = rect.height;
157	}	190	}
158		191
		192	typedef uint16_t tileid;
159	typedef uint16_t mapface;	193	typedef uint16_t faceid;
160		194
161	typedef struct {	195	typedef struct {
162	GLint name;	196	int name;
163	int w, h;	197	int w, h;
164	float s, t;	198	float s, t;
165	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
166	} maptex;	202	} maptex;
167		203
168	typedef struct {	204	typedef struct {
169	uint32_t player;	205	uint32_t player;
170	mapface face[3];	206	tileid tile[3];
171	uint16_t darkness;	207	uint16_t darkness;
172	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
173	} mapcell;	209	} mapcell;
174		210
175	typedef struct {	211	typedef struct {
176	int32_t c0, c1;	212	int32_t c0, c1;
177	mapcell *col;	213	mapcell *col;
178	} maprow;	214	} maprow;
179		215
180	typedef struct map {	216	typedef struct map {
181	int x, y, w, h;	217	int x, y, w, h;
182	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
183	int faces;	219	int faces; tileid *face2tile; // [faceid]
184	mapface *face;	220	int texs; maptex *tex; // [tileid]
185
186	int texs;
187	maptex *tex;
188		221
189	int32_t rows;	222	int32_t rows;
190	maprow *row;	223	maprow *row;
191	} *CFPlus__Map;	224	} *CFPlus__Map;
192		225
…		…
212	return ptr;	245	return ptr;
213	}	246	}
214		247
215	#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))
216	#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	}
217		270
218	static maprow *	271	static maprow *
219	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
220	{	273	{
221	if (0 > y)	274	if (0 > y)
…		…
314	cell->stat_hp = 0;	367	cell->stat_hp = 0;
315	cell->flags = 0;	368	cell->flags = 0;
316	cell->player = 0;	369	cell->player = 0;
317	}	370	}
318	}	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);
319	}	388	}
320		389
321	static void	390	static void
322	music_finished (void)	391	music_finished (void)
323	{	392	{
…		…
492		561
493	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
495	}	564	}
496		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
		571
497	int	572	int
498	in_destruct ()	573	in_destruct ()
499	CODE:	574	CODE:
500	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
501	OUTPUT:	576	OUTPUT:
…		…
571	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
572	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
573	);	648	);
574	if (RETVAL)	649	if (RETVAL)
575	{	650	{
		651	av_clear (texture_av);
		652
576	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
577	# 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);
578	# include "glfunc.h"	655	# include "glfunc.h"
579	# undef GL_FUNC	656	# undef GL_FUNC
		657
580	}	658	}
581	OUTPUT:	659	OUTPUT:
582	RETVAL	660	RETVAL
583		661
584	void	662	void
…		…
658	Mix_AllocateChannels (int numchans = -1)	736	Mix_AllocateChannels (int numchans = -1)
659		737
660	void	738	void
661	lowdelay (int fd, int val = 1)	739	lowdelay (int fd, int val = 1)
662	CODE:	740	CODE:
663	#ifndef _WIN32
664	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	741	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
665	#endif
666		742
667	void	743	void
668	win32_proxy_info ()	744	win32_proxy_info ()
669	PPCODE:	745	PPCODE:
670	{	746	{
…		…
811	ExitThread (retval); // unclean, please beam me up	887	ExitThread (retval); // unclean, please beam me up
812	#else	888	#else
813	_exit (retval);	889	_exit (retval);
814	#endif	890	#endif
815		891
		892	void
		893	debug ()
		894	CODE:
		895	{
		896	#if DEBUG
		897	VALGRIND_DO_LEAK_CHECK;
		898	#endif
		899	}
		900
816	MODULE = CFPlus PACKAGE = CFPlus::Font	901	MODULE = CFPlus PACKAGE = CFPlus::Font
817		902
818	CFPlus::Font	903	CFPlus::Font
819	new_from_file (SV class, char path, int id = 0)	904	new_from_file (SV class, char path, int id = 0)
820	CODE:	905	CODE:
…		…
1233	RETVAL->y = 0;	1318	RETVAL->y = 0;
1234	RETVAL->w = 0;	1319	RETVAL->w = 0;
1235	RETVAL->h = 0;	1320	RETVAL->h = 0;
1236	RETVAL->ox = 0;	1321	RETVAL->ox = 0;
1237	RETVAL->oy = 0;	1322	RETVAL->oy = 0;
1238	RETVAL->faces = 8192;	1323	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1239	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1324	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1240	RETVAL->texs = 8192;
1241	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1242	RETVAL->rows = 0;	1325	RETVAL->rows = 0;
1243	RETVAL->row = 0;	1326	RETVAL->row = 0;
1244	OUTPUT:	1327	OUTPUT:
1245	RETVAL	1328	RETVAL
1246		1329
1247	void	1330	void
1248	DESTROY (CFPlus::Map self)	1331	DESTROY (CFPlus::Map self)
1249	CODE:	1332	CODE:
1250	{	1333	{
1251	map_clear (self);	1334	map_clear (self);
1252	Safefree (self->face);	1335	Safefree (self->face2tile);
1253	Safefree (self->tex);	1336	Safefree (self->tex);
1254	Safefree (self);	1337	Safefree (self);
1255	}	1338	}
1256		1339
1257	void	1340	void
…		…
1264	clear (CFPlus::Map self)	1347	clear (CFPlus::Map self)
1265	CODE:	1348	CODE:
1266	map_clear (self);	1349	map_clear (self);
1267		1350
1268	void	1351	void
1269	set_face (CFPlus::Map self, int face, int texid)	1352	set_tileid (CFPlus::Map self, int face, int tile)
1270	CODE:	1353	CODE:
1271	{	1354	{
1272	while (self->faces <= face)	1355	need_facenum (self, face); self->face2tile [face] = tile;
1273	{	1356	need_texid (self, tile);
1274	Append (mapface, self->face, self->faces, self->faces);	1357	}
1275	self->faces *= 2;
1276	}
1277		1358
1278	self->face [face] = texid;	1359	void
		1360	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1361	CODE:
		1362	{
		1363	tileid texid;
		1364	maptex *tex;
		1365
		1366	if (face < 0 \|\| face >= self->faces)
		1367	return;
		1368
		1369	if (smooth < 0 \|\| smooth >= self->faces)
		1370	return;
		1371
		1372	texid = self->face2tile [face];
		1373
		1374	if (!texid)
		1375	return;
		1376
		1377	tex = self->tex + texid;
		1378	tex->smoothtile = self->face2tile [smooth];
		1379	tex->smoothlevel = level;
1279	}	1380	}
1280		1381
1281	void	1382	void
1282	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)	1383	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)
1283	CODE:	1384	CODE:
1284	{	1385	{
1285	while (self->texs <= texid)	1386	need_texid (self, texid);
1286	{
1287	Append (maptex, self->tex, self->texs, self->texs);
1288	self->texs *= 2;
1289	}
1290		1387
1291	{	1388	{
1292	maptex *tex = self->tex + texid;	1389	maptex *tex = self->tex + texid;
1293		1390
1294	tex->name = name;	1391	tex->name = name;
…		…
1338	CODE:	1435	CODE:
1339	{	1436	{
1340	if (dx > 0)	1437	if (dx > 0)
1341	map_blank (self, self->x, self->y, dx, self->h);	1438	map_blank (self, self->x, self->y, dx, self->h);
1342	else if (dx < 0)	1439	else if (dx < 0)
1343	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1440	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1344		1441
1345	if (dy > 0)	1442	if (dy > 0)
1346	map_blank (self, self->x, self->y, self->w, dy);	1443	map_blank (self, self->x, self->y, self->w, dy);
1347	else if (dy < 0)	1444	else if (dy < 0)
1348	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1445	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1349		1446
1350	self->ox += dx; self->x += dx;	1447	self->ox += dx; self->x += dx;
1351	self->oy += dy; self->y += dy;	1448	self->oy += dy; self->y += dy;
1352		1449
1353	while (self->y < 0)	1450	while (self->y < 0)
…		…
1405	cell->stat_width = 1;	1502	cell->stat_width = 1;
1406	cell->stat_hp = *data++;	1503	cell->stat_hp = *data++;
1407	}	1504	}
1408	else if (cmd == 6) // monster width	1505	else if (cmd == 6) // monster width
1409	cell->stat_width = *data++ + 1;	1506	cell->stat_width = *data++ + 1;
1410	else if (cmd == 0x47) // monster width	1507	else if (cmd == 0x47)
1411	{	1508	{
1412	if (*data == 4)	1509	if (*data == 4)
1413	; // decode player tag	1510	; // decode player count
1414		1511
1415	data += *data + 1;	1512	data += *data + 1;
1416	}	1513	}
1417	else if (cmd == 8) // cell flags	1514	else if (cmd == 8) // cell flags
1418	cell->flags = *data++;	1515	cell->flags = *data++;
…		…
1427	cell->darkness = *data++ + 1;	1524	cell->darkness = *data++ + 1;
1428	}	1525	}
1429		1526
1430	if (flags & 4)	1527	if (flags & 4)
1431	{	1528	{
1432	cell->face [0] = 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 [0] = self->face2tile [face];
1433	}	1532	}
1434		1533
1435	if (flags & 2)	1534	if (flags & 2)
1436	{	1535	{
1437	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1536	faceid face = (data [0] << 8) + data [1]; data += 2;
		1537	need_facenum (self, face);
		1538	cell->tile [1] = self->face2tile [face];
1438	}	1539	}
1439		1540
1440	if (flags & 1)	1541	if (flags & 1)
1441	{	1542	{
1442	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1543	faceid face = (data [0] << 8) + data [1]; data += 2;
		1544	need_facenum (self, face);
		1545	cell->tile [2] = self->face2tile [face];
1443	}	1546	}
1444	}	1547	}
1445	else	1548	else
1446	cell->darkness = 0;	1549	cell->darkness = 0;
1447	}	1550	}
…		…
1477	{	1580	{
1478	mapcell *cell = row->col + (x - row->c0);	1581	mapcell *cell = row->col + (x - row->c0);
1479		1582
1480	for (z = 0; z <= 0; z++)	1583	for (z = 0; z <= 0; z++)
1481	{	1584	{
1482	mapface face = cell->face [z];
1483
1484	if (face)
1485	{
1486	maptex tex = self->tex [face];	1585	maptex tex = self->tex [cell->tile [z]];
1487	int a0 = 255 - tex.a;	1586	int a0 = 255 - tex.a;
1488	int a1 = tex.a;	1587	int a1 = tex.a;
1489		1588
1490	r = (r * a0 + tex.r * a1) / 255;	1589	r = (r * a0 + tex.r * a1) / 255;
1491	g = (g * a0 + tex.g * a1) / 255;	1590	g = (g * a0 + tex.g * a1) / 255;
1492	b = (b * a0 + tex.b * a1) / 255;	1591	b = (b * a0 + tex.b * a1) / 255;
1493	a = (a * a0 + tex.a * a1) / 255;	1592	a = (a * a0 + tex.a * a1) / 255;
1494	}
1495	}	1593	}
1496	}	1594	}
1497		1595
1498	*map++ = (r )	1596	*map++ = (r )
1499	\| (g << 8)	1597	\| (g << 8)
…		…
1506	}	1604	}
1507	OUTPUT:	1605	OUTPUT:
1508	RETVAL	1606	RETVAL
1509		1607
1510	void	1608	void
1511	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1609	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1512	CODE:	1610	CODE:
1513	{	1611	{
		1612	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1613	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1614	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1615	smooth_key skey;
1514	int x, y, z;	1616	int x, y, z;
1515	int last_name;	1617	int last_name;
1516	mapface face;	1618
		1619	// thats current max. sorry.
		1620	if (sw > 255) sw = 255;
		1621	if (sh > 255) sh = 255;
		1622
		1623	// clear key, in case of extra padding
		1624	memset (&skey, 0, sizeof (skey));
1517		1625
1518	glColor4ub (255, 255, 255, 255);	1626	glColor4ub (255, 255, 255, 255);
1519		1627
1520	glEnable (GL_BLEND);	1628	glEnable (GL_BLEND);
1521	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1629	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1527	last_name = 0;	1635	last_name = 0;
1528		1636
1529	mx += self->x;	1637	mx += self->x;
1530	my += self->y;	1638	my += self->y;
1531		1639
		1640	// first pass: determine smooth_max
		1641	// rather ugly, if you ask me
		1642	// could also be stored inside mapcell and updated on change
		1643	memset (smooth_max, 0, sizeof (smooth_max));
		1644
		1645	for (y = 0; y < sh; y++)
		1646	if (0 <= y + my && y + my < self->rows)
		1647	{
		1648	maprow *row = self->row + (y + my);
		1649
		1650	for (x = 0; x < sw; x++)
		1651	if (row->c0 <= x + mx && x + mx < row->c1)
		1652	{
		1653	mapcell *cell = row->col + (x + mx - row->c0);
		1654
		1655	smooth_max[x + 1][y + 1] =
		1656	MAX (self->tex [cell->tile [0]].smoothlevel,
		1657	MAX (self->tex [cell->tile [1]].smoothlevel,
		1658	self->tex [cell->tile [2]].smoothlevel));
		1659	}
		1660	}
		1661
1532	for (z = 0; z < 3; z++)	1662	for (z = 0; z <= 2; z++)
		1663	{
		1664	memset (smooth_level, 0, sizeof (smooth_level));
		1665
1533	for (y = 0; y < sh; y++)	1666	for (y = 0; y < sh; y++)
1534	if (0 <= y + my && y + my < self->rows)	1667	if (0 <= y + my && y + my < self->rows)
1535	{	1668	{
1536	maprow *row = self->row + (y + my);	1669	maprow *row = self->row + (y + my);
1537		1670
1538	for (x = 0; x < sw; x++)	1671	for (x = 0; x < sw; x++)
1539	if (row->c0 <= x + mx && x + mx < row->c1)	1672	if (row->c0 <= x + mx && x + mx < row->c1)
1540	{	1673	{
1541	mapcell *cell = row->col + (x + mx - row->c0);	1674	mapcell *cell = row->col + (x + mx - row->c0);
1542
1543	face = cell->face [z];	1675	tileid tile = cell->tile [z];
		1676
		1677	if (tile)
		1678	{
		1679	maptex tex = self->tex [tile];
		1680	int px = (x + 1) * T - tex.w;
		1681	int py = (y + 1) * T - tex.h;
1544		1682
1545	if (face && face < self->texs)	1683	// suppressing texture state switches here
		1684	// is only moderately effective, but worth the extra effort
		1685	if (last_name != tex.name)
		1686	{
		1687	if (!tex.name)
		1688	tex = self->tex [2]; /* missing, replace by noface */
		1689
		1690	glEnd ();
		1691	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1692	glBegin (GL_QUADS);
		1693	}
		1694
		1695	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1696	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1697	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1698	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1699
		1700	if (cell->flags && z == 2)
		1701	{
		1702	if (cell->flags & 1)
		1703	{
		1704	maptex tex = self->tex [1];
		1705	int px = x * T + T * 2 / 32;
		1706	int py = y * T - T * 6 / 32;
		1707
		1708	glEnd ();
		1709	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1710	glBegin (GL_QUADS);
		1711
		1712	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1713	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1714	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1715	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1716	}
		1717	}
		1718
		1719	// update smooth hash
		1720	if (tex.smoothtile)
		1721	{
		1722	skey.tile = tex.smoothtile;
		1723	skey.level = tex.smoothlevel;
		1724
		1725	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1726
		1727	// add bits to current tile and all neighbours. skey.x\|y is
		1728	// shifted +1\|+1 so we always stay positive.
		1729
		1730	// bits is ___n cccc CCCC bbbb
		1731	// n do not draw borders&corners
		1732	// c draw these corners, but...
		1733	// C ... not these
		1734	// b draw these borders
		1735
		1736	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1737	// ┃· ·· ·┃ ━━
		1738
		1739	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1740	// ·· ·· ·┏ ┓·
		1741
		1742	// full tile
		1743	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1744
		1745	// borders
		1746	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1747	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1748	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1749	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1750
		1751	// corners
		1752	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1753	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1754	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1755	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1756	}
		1757	}
		1758	}
		1759	}
		1760
		1761	// go through all smoothlevels, lowest to highest, then draw.
		1762	// this is basically counting sort
		1763	{
		1764	int w, b;
		1765
		1766	for (w = 0; w < 256 / 32; ++w)
		1767	{
		1768	uint32_t smask = smooth_level [w];
		1769	if (smask)
		1770	for (b = 0; b < 32; ++b)
		1771	if (smask & (((uint32_t)1) << b))
1546	{	1772	{
1547	maptex tex = self->tex [face];	1773	int level = (w << 5) \| b;
1548	int px = (x + 1) * 32 - tex.w;	1774	HE *he;
1549	int py = (y + 1) * 32 - tex.h;
1550		1775
1551	if (last_name != tex.name)	1776	hv_iterinit (smooth);
		1777	while ((he = hv_iternext (smooth)))
1552	{	1778	{
		1779	smooth_key skey = (smooth_key )HeKEY (he);
		1780	IV bits = SvIVX (HeVAL (he));
		1781
		1782	if (!(bits & 0x1000)
		1783	&& skey->level == level
		1784	&& level > smooth_max [skey->x][skey->y])
		1785	{
		1786	maptex tex = self->tex [skey->tile];
		1787	int px = (((int)skey->x) - 1) * T;
		1788	int py = (((int)skey->y) - 1) * T;
		1789	int border = bits & 15;
		1790	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1791	float dx = tex.s * .0625f; // 16 images/row
		1792	float dy = tex.t * .5f ; // 2 images/column
		1793
		1794	// this time naively avoiding texture state changes
		1795	// save gobs of state changes.
		1796	if (last_name != tex.name)
		1797	{
		1798	if (!tex.name)
		1799	continue; // smoothing not yet available
		1800
1553	glEnd ();	1801	glEnd ();
1554	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1555	glBegin (GL_QUADS);	1803	glBegin (GL_QUADS);
		1804	}
		1805
		1806	if (border)
		1807	{
		1808	float ox = border * dx;
		1809
		1810	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1811	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1812	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1813	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1814	}
		1815
		1816	if (corner)
		1817	{
		1818	float ox = corner * dx;
		1819
		1820	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1821	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1822	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1823	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1824	}
1556	}	1825	}
1557
1558	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1559	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1560	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1561	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1562	}
1563
1564	if (cell->flags && z == 2)
1565	{
1566	if (cell->flags & 1)
1567	{
1568	maptex tex = self->tex [1];
1569	int px = (x + 1) * 32 - tex.w + 2;
1570	int py = (y + 1) * 32 - tex.h - 6;
1571
1572	glEnd ();
1573	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1574	glBegin (GL_QUADS);
1575
1576	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1577	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1578	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1579	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1580	}	1826	}
1581	}	1827	}
1582	}
1583	}	1828	}
		1829	}
		1830
		1831	hv_clear (smooth);
		1832	}
1584		1833
1585	glEnd ();	1834	glEnd ();
1586		1835
1587	glDisable (GL_TEXTURE_2D);	1836	glDisable (GL_TEXTURE_2D);
1588	glDisable (GL_BLEND);	1837	glDisable (GL_BLEND);
…		…
1596	for (x = 0; x < sw; x++)	1845	for (x = 0; x < sw; x++)
1597	if (row->c0 <= x + mx && x + mx < row->c1)	1846	if (row->c0 <= x + mx && x + mx < row->c1)
1598	{	1847	{
1599	mapcell *cell = row->col + (x + mx - row->c0);	1848	mapcell *cell = row->col + (x + mx - row->c0);
1600		1849
1601	int px = x * 32;	1850	int px = x * T;
1602	int py = y * 32;	1851	int py = y * T;
1603		1852
1604	if (cell->stat_hp)	1853	if (cell->stat_hp)
1605	{	1854	{
1606	int width = cell->stat_width * 32;	1855	int width = cell->stat_width * T;
1607	int thick = sh / 28 + 1 + cell->stat_width;	1856	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1608		1857
1609	glColor3ub (0, 0, 0);	1858	glColor3ub (0, 0, 0);
1610	glRectf (px + 1, py - thick - 2,	1859	glRectf (px + 1, py - thick - 2,
1611	px + width - 1, py);	1860	px + width - 1, py);
1612		1861
…		…
1751	if (row && row->c0 <= x && x < row->c1)	2000	if (row && row->c0 <= x && x < row->c1)
1752	{	2001	{
1753	mapcell *cell = row->col + (x - row->c0);	2002	mapcell *cell = row->col + (x - row->c0);
1754	uint8_t flags = 0;	2003	uint8_t flags = 0;
1755		2004
1756	if (cell->face [0]) flags \|= 1;	2005	if (cell->tile [0]) flags \|= 1;
1757	if (cell->face [1]) flags \|= 2;	2006	if (cell->tile [1]) flags \|= 2;
1758	if (cell->face [2]) flags \|= 4;	2007	if (cell->tile [2]) flags \|= 4;
1759		2008
1760	*data++ = flags;	2009	*data++ = flags;
1761		2010
1762	if (flags & 1)	2011	if (flags & 1)
1763	{	2012	{
		2013	tileid tile = cell->tile [0];
1764	*data++ = cell->face [0] >> 8;	2014	*data++ = tile >> 8;
1765	*data++ = cell->face [0];	2015	*data++ = tile;
1766	}	2016	}
1767		2017
1768	if (flags & 2)	2018	if (flags & 2)
1769	{	2019	{
		2020	tileid tile = cell->tile [1];
1770	*data++ = cell->face [1] >> 8;	2021	*data++ = tile >> 8;
1771	*data++ = cell->face [1];	2022	*data++ = tile;
1772	}	2023	}
1773		2024
1774	if (flags & 4)	2025	if (flags & 4)
1775	{	2026	{
		2027	tileid tile = cell->tile [2];
1776	*data++ = cell->face [2] >> 8;	2028	*data++ = tile >> 8;
1777	*data++ = cell->face [2];	2029	*data++ = tile;
1778	}	2030	}
1779	}	2031	}
1780	else	2032	else
1781	*data++ = 0;	2033	*data++ = 0;
1782	}	2034	}
…		…
1822	{	2074	{
1823	uint8_t flags = *data++;	2075	uint8_t flags = *data++;
1824		2076
1825	if (flags)	2077	if (flags)
1826	{	2078	{
1827	mapface face[3] = { 0, 0, 0 };
1828
1829	mapcell *cell = row_get_cell (row, x);	2079	mapcell *cell = row_get_cell (row, x);
		2080	tileid tile[3] = { 0, 0, 0 };
1830		2081
1831	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2082	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1832	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2083	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1833	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2084	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1834		2085
1835	if (cell->darkness == 0)	2086	if (cell->darkness == 0)
1836	{	2087	{
1837	cell->darkness = 0;	2088	cell->darkness = 0;
1838		2089
1839	for (z = 0; z <= 2; z++)	2090	for (z = 0; z <= 2; z++)
1840	{	2091	{
1841	cell->face[z] = face[z];	2092	tileid t = tile [z];
1842		2093
1843	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2094	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2095	{
1844	XPUSHs (sv_2mortal (newSViv (face[z])));	2096	XPUSHs (sv_2mortal (newSViv (t)));
		2097	need_texid (self, t);
		2098	}
		2099
		2100	cell->tile [z] = t;
1845	}	2101	}
1846	}	2102	}
1847	}	2103	}
1848	}	2104	}
1849	}	2105	}
…		…
1884	CODE:	2140	CODE:
1885	RETVAL = Mix_VolumeMusic (volume);	2141	RETVAL = Mix_VolumeMusic (volume);
1886	OUTPUT:	2142	OUTPUT:
1887	RETVAL	2143	RETVAL
1888		2144
		2145	int
		2146	fade_out (int ms)
		2147	CODE:
		2148	RETVAL = Mix_FadeOutMusic (ms);
		2149	OUTPUT:
		2150	RETVAL
		2151
1889	CFPlus::MixMusic	2152	CFPlus::MixMusic
1890	new_from_file (SV class, char path)	2153	new_from_file (SV class, char path)
1891	CODE:	2154	CODE:
1892	RETVAL = Mix_LoadMUS (path);	2155	RETVAL = Mix_LoadMUS (path);
1893	OUTPUT:	2156	OUTPUT:
…		…
1900		2163
1901	int	2164	int
1902	play (CFPlus::MixMusic self, int loops = -1)	2165	play (CFPlus::MixMusic self, int loops = -1)
1903	CODE:	2166	CODE:
1904	RETVAL = Mix_PlayMusic (self, loops);	2167	RETVAL = Mix_PlayMusic (self, loops);
		2168	OUTPUT:
		2169	RETVAL
		2170
		2171	int
		2172	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2173	CODE:
		2174	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1905	OUTPUT:	2175	OUTPUT:
1906	RETVAL	2176	RETVAL
1907		2177
1908	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2178	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1909		2179
…		…
1998	# undef const_iv	2268	# undef const_iv
1999	};	2269	};
2000		2270
2001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2271	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2272	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2273
		2274	texture_av = newAV ();
		2275	AvREAL_off (texture_av);
2003	}	2276	}
2004		2277
2005	char *	2278	char *
2006	gl_vendor ()	2279	gl_vendor ()
2007	CODE:	2280	CODE:
…		…
2156		2429
2157	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2430	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2158		2431
2159	int glGenTexture ()	2432	int glGenTexture ()
2160	CODE:	2433	CODE:
2161	{	2434	RETVAL = gen_texture ();
2162	GLuint name;
2163	glGenTextures (1, &name);
2164	RETVAL = name;
2165	}
2166	OUTPUT:	2435	OUTPUT:
2167	RETVAL	2436	RETVAL
2168		2437
2169	void glDeleteTexture (int name)	2438	void glDeleteTexture (int name)
2170	CODE:	2439	CODE:
2171	{
2172	GLuint name_ = name;
2173	glDeleteTextures (1, &name_);	2440	del_texture (name);
2174	}	2441
2175
2176	int glGenList ()	2442	int glGenList ()
2177	CODE:	2443	CODE:
2178	RETVAL = glGenLists (1);	2444	RETVAL = glGenLists (1);
2179	OUTPUT:	2445	OUTPUT:
2180	RETVAL	2446	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs. Revision 1.195 by root, Sat Jul 14 12:05:52 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.167 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.195 by root, Sat Jul 14 12:05:52 2007 UTC