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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.168 by root, Sat Dec 9 21:26:45 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 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
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:
…		…
1142	flags	1242	flags
1143	);	1243	);
1144		1244
1145	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1146		1246
		1247	int minpot (int n)
		1248
1147	void	1249	void
1148	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1149	CODE:	1251	CODE:
1150	{	1252	{
1151	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1228	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1229	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1230	}	1332	}
1231	}	1333	}
1232		1334
		1335	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1336	CODE:
		1337	{
		1338	GLint width;
		1339	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1340	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1341	RETVAL = width > 0;
		1342	}
		1343	OUTPUT:
		1344	RETVAL
		1345
1233	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1234		1347
1235	CFPlus::Map	1348	CFPlus::Map
1236	new (SV *class)	1349	new (SV *class)
1237	CODE:	1350	CODE:
…		…
1240	RETVAL->y = 0;	1353	RETVAL->y = 0;
1241	RETVAL->w = 0;	1354	RETVAL->w = 0;
1242	RETVAL->h = 0;	1355	RETVAL->h = 0;
1243	RETVAL->ox = 0;	1356	RETVAL->ox = 0;
1244	RETVAL->oy = 0;	1357	RETVAL->oy = 0;
1245	RETVAL->faces = 8192;	1358	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1246	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1359	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;	1360	RETVAL->rows = 0;
1250	RETVAL->row = 0;	1361	RETVAL->row = 0;
1251	OUTPUT:	1362	OUTPUT:
1252	RETVAL	1363	RETVAL
1253		1364
1254	void	1365	void
1255	DESTROY (CFPlus::Map self)	1366	DESTROY (CFPlus::Map self)
1256	CODE:	1367	CODE:
1257	{	1368	{
1258	map_clear (self);	1369	map_clear (self);
1259	Safefree (self->face);	1370	Safefree (self->face2tile);
1260	Safefree (self->tex);	1371	Safefree (self->tex);
1261	Safefree (self);	1372	Safefree (self);
1262	}	1373	}
1263		1374
1264	void	1375	void
…		…
1271	clear (CFPlus::Map self)	1382	clear (CFPlus::Map self)
1272	CODE:	1383	CODE:
1273	map_clear (self);	1384	map_clear (self);
1274		1385
1275	void	1386	void
1276	set_face (CFPlus::Map self, int face, int texid)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1277	CODE:	1388	CODE:
1278	{	1389	{
1279	while (self->faces <= face)	1390	need_facenum (self, face); self->face2tile [face] = tile;
1280	{	1391	need_texid (self, tile);
1281	Append (mapface, self->face, self->faces, self->faces);	1392	}
1282	self->faces *= 2;
1283	}
1284		1393
1285	self->face [face] = texid;	1394	void
		1395	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1396	CODE:
		1397	{
		1398	tileid texid;
		1399	maptex *tex;
		1400
		1401	if (face < 0 \|\| face >= self->faces)
		1402	return;
		1403
		1404	if (smooth < 0 \|\| smooth >= self->faces)
		1405	return;
		1406
		1407	texid = self->face2tile [face];
		1408
		1409	if (!texid)
		1410	return;
		1411
		1412	tex = self->tex + texid;
		1413	tex->smoothtile = self->face2tile [smooth];
		1414	tex->smoothlevel = level;
1286	}	1415	}
1287		1416
1288	void	1417	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)	1418	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:	1419	CODE:
1291	{	1420	{
1292	while (self->texs <= texid)	1421	need_texid (self, texid);
1293	{
1294	Append (maptex, self->tex, self->texs, self->texs);
1295	self->texs *= 2;
1296	}
1297		1422
1298	{	1423	{
1299	maptex *tex = self->tex + texid;	1424	maptex *tex = self->tex + texid;
1300		1425
1301	tex->name = name;	1426	tex->name = name;
…		…
1345	CODE:	1470	CODE:
1346	{	1471	{
1347	if (dx > 0)	1472	if (dx > 0)
1348	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1349	else if (dx < 0)	1474	else if (dx < 0)
1350	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1475	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1351		1476
1352	if (dy > 0)	1477	if (dy > 0)
1353	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1354	else if (dy < 0)	1479	else if (dy < 0)
1355	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1480	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1356		1481
1357	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1358	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1359		1484
1360	while (self->y < 0)	1485	while (self->y < 0)
…		…
1412	cell->stat_width = 1;	1537	cell->stat_width = 1;
1413	cell->stat_hp = *data++;	1538	cell->stat_hp = *data++;
1414	}	1539	}
1415	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1416	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1417	else if (cmd == 0x47) // monster width	1542	else if (cmd == 0x47)
1418	{	1543	{
1419	if (*data == 4)	1544	if (*data == 4)
1420	; // decode player tag	1545	; // decode player count
1421		1546
1422	data += *data + 1;	1547	data += *data + 1;
1423	}	1548	}
1424	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1425	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1434	cell->darkness = *data++ + 1;	1559	cell->darkness = *data++ + 1;
1435	}	1560	}
1436		1561
1437	if (flags & 4)	1562	if (flags & 4)
1438	{	1563	{
1439	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1564	faceid face = (data [0] << 8) + data [1]; data += 2;
		1565	need_facenum (self, face);
		1566	cell->tile [0] = self->face2tile [face];
1440	}	1567	}
1441		1568
1442	if (flags & 2)	1569	if (flags & 2)
1443	{	1570	{
1444	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1571	faceid face = (data [0] << 8) + data [1]; data += 2;
		1572	need_facenum (self, face);
		1573	cell->tile [1] = self->face2tile [face];
1445	}	1574	}
1446		1575
1447	if (flags & 1)	1576	if (flags & 1)
1448	{	1577	{
1449	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1578	faceid face = (data [0] << 8) + data [1]; data += 2;
		1579	need_facenum (self, face);
		1580	cell->tile [2] = self->face2tile [face];
1450	}	1581	}
1451	}	1582	}
1452	else	1583	else
1453	cell->darkness = 0;	1584	cell->darkness = 0;
1454	}	1585	}
…		…
1484	{	1615	{
1485	mapcell *cell = row->col + (x - row->c0);	1616	mapcell *cell = row->col + (x - row->c0);
1486		1617
1487	for (z = 0; z <= 0; z++)	1618	for (z = 0; z <= 0; z++)
1488	{	1619	{
1489	mapface face = cell->face [z];
1490
1491	if (face)
1492	{
1493	maptex tex = self->tex [face];	1620	maptex tex = self->tex [cell->tile [z]];
1494	int a0 = 255 - tex.a;	1621	int a0 = 255 - tex.a;
1495	int a1 = tex.a;	1622	int a1 = tex.a;
1496		1623
1497	r = (r * a0 + tex.r * a1) / 255;	1624	r = (r * a0 + tex.r * a1) / 255;
1498	g = (g * a0 + tex.g * a1) / 255;	1625	g = (g * a0 + tex.g * a1) / 255;
1499	b = (b * a0 + tex.b * a1) / 255;	1626	b = (b * a0 + tex.b * a1) / 255;
1500	a = (a * a0 + tex.a * a1) / 255;	1627	a = (a * a0 + tex.a * a1) / 255;
1501	}
1502	}	1628	}
1503	}	1629	}
1504		1630
1505	*map++ = (r )	1631	*map++ = (r )
1506	\| (g << 8)	1632	\| (g << 8)
…		…
1513	}	1639	}
1514	OUTPUT:	1640	OUTPUT:
1515	RETVAL	1641	RETVAL
1516		1642
1517	void	1643	void
1518	draw (CFPlus::Map self, int mx, int my, int sw, int sh)	1644	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1519	CODE:	1645	CODE:
1520	{	1646	{
		1647	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1648	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1649	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1650	smooth_key skey;
1521	int x, y, z;	1651	int x, y, z;
1522	int last_name;	1652	int last_name;
1523	mapface face;	1653
		1654	// thats current max. sorry.
		1655	if (sw > 255) sw = 255;
		1656	if (sh > 255) sh = 255;
		1657
		1658	// clear key, in case of extra padding
		1659	memset (&skey, 0, sizeof (skey));
1524		1660
1525	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1526		1662
1527	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1528	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1534	last_name = 0;	1670	last_name = 0;
1535		1671
1536	mx += self->x;	1672	mx += self->x;
1537	my += self->y;	1673	my += self->y;
1538		1674
		1675	// first pass: determine smooth_max
		1676	// rather ugly, if you ask me
		1677	// could also be stored inside mapcell and updated on change
		1678	memset (smooth_max, 0, sizeof (smooth_max));
		1679
		1680	for (y = 0; y < sh; y++)
		1681	if (0 <= y + my && y + my < self->rows)
		1682	{
		1683	maprow *row = self->row + (y + my);
		1684
		1685	for (x = 0; x < sw; x++)
		1686	if (row->c0 <= x + mx && x + mx < row->c1)
		1687	{
		1688	mapcell *cell = row->col + (x + mx - row->c0);
		1689
		1690	smooth_max[x + 1][y + 1] =
		1691	MAX (self->tex [cell->tile [0]].smoothlevel,
		1692	MAX (self->tex [cell->tile [1]].smoothlevel,
		1693	self->tex [cell->tile [2]].smoothlevel));
		1694	}
		1695	}
		1696
1539	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1540	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1541	if (0 <= y + my && y + my < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1542	{	1703	{
1543	maprow *row = self->row + (y + my);	1704	maprow *row = self->row + (y + my);
1544		1705
1545	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1546	if (row->c0 <= x + mx && x + mx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1547	{	1708	{
1548	mapcell *cell = row->col + (x + mx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1549
1550	face = cell->face [z];	1710	tileid tile = cell->tile [z];
		1711
		1712	if (tile)
		1713	{
		1714	maptex tex = self->tex [tile];
		1715	int px = (x + 1) * T - tex.w;
		1716	int py = (y + 1) * T - tex.h;
1551		1717
1552	if (face && face < self->texs)	1718	// suppressing texture state switches here
		1719	// is only moderately effective, but worth the extra effort
		1720	if (last_name != tex.name)
		1721	{
		1722	if (!tex.name)
		1723	tex = self->tex [2]; /* missing, replace by noface */
		1724
		1725	glEnd ();
		1726	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1727	glBegin (GL_QUADS);
		1728	}
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1734
		1735	if (cell->flags && z == 2)
		1736	{
		1737	if (cell->flags & 1)
		1738	{
		1739	maptex tex = self->tex [1];
		1740	int px = x * T + T * 2 / 32;
		1741	int py = y * T - T * 6 / 32;
		1742
		1743	glEnd ();
		1744	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1745	glBegin (GL_QUADS);
		1746
		1747	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1748	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1749	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1750	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1751	}
		1752	}
		1753
		1754	// update smooth hash
		1755	if (tex.smoothtile)
		1756	{
		1757	skey.tile = tex.smoothtile;
		1758	skey.level = tex.smoothlevel;
		1759
		1760	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1761
		1762	// add bits to current tile and all neighbours. skey.x\|y is
		1763	// shifted +1\|+1 so we always stay positive.
		1764
		1765	// bits is ___n cccc CCCC bbbb
		1766	// n do not draw borders&corners
		1767	// c draw these corners, but...
		1768	// C ... not these
		1769	// b draw these borders
		1770
		1771	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1772	// ┃· ·· ·┃ ━━
		1773
		1774	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1775	// ·· ·· ·┏ ┓·
		1776
		1777	// full tile
		1778	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1779
		1780	// borders
		1781	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1782	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1783	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1784	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1785
		1786	// corners
		1787	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1788	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1789	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1790	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1791	}
		1792	}
		1793	}
		1794	}
		1795
		1796	// go through all smoothlevels, lowest to highest, then draw.
		1797	// this is basically counting sort
		1798	{
		1799	int w, b;
		1800
		1801	for (w = 0; w < 256 / 32; ++w)
		1802	{
		1803	uint32_t smask = smooth_level [w];
		1804	if (smask)
		1805	for (b = 0; b < 32; ++b)
		1806	if (smask & (((uint32_t)1) << b))
1553	{	1807	{
1554	maptex tex = self->tex [face];	1808	int level = (w << 5) \| b;
1555	int px = (x + 1) * 32 - tex.w;	1809	HE *he;
1556	int py = (y + 1) * 32 - tex.h;
1557		1810
1558	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1559	{	1813	{
		1814	smooth_key skey = (smooth_key )HeKEY (he);
		1815	IV bits = SvIVX (HeVAL (he));
		1816
		1817	if (!(bits & 0x1000)
		1818	&& skey->level == level
		1819	&& level > smooth_max [skey->x][skey->y])
		1820	{
		1821	maptex tex = self->tex [skey->tile];
		1822	int px = (((int)skey->x) - 1) * T;
		1823	int py = (((int)skey->y) - 1) * T;
		1824	int border = bits & 15;
		1825	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1826	float dx = tex.s * .0625f; // 16 images/row
		1827	float dy = tex.t * .5f ; // 2 images/column
		1828
		1829	// this time naively avoiding texture state changes
		1830	// save gobs of state changes.
		1831	if (last_name != tex.name)
		1832	{
		1833	if (!tex.name)
		1834	continue; // smoothing not yet available
		1835
1560	glEnd ();	1836	glEnd ();
1561	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1562	glBegin (GL_QUADS);	1838	glBegin (GL_QUADS);
		1839	}
		1840
		1841	if (border)
		1842	{
		1843	float ox = border * dx;
		1844
		1845	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1846	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1847	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1848	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1849	}
		1850
		1851	if (corner)
		1852	{
		1853	float ox = corner * dx;
		1854
		1855	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1856	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1857	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1858	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1859	}
1563	}	1860	}
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	}	1861	}
1588	}	1862	}
1589	}
1590	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1591		1868
1592	glEnd ();	1869	glEnd ();
1593		1870
1594	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1595	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
…		…
1603	for (x = 0; x < sw; x++)	1880	for (x = 0; x < sw; x++)
1604	if (row->c0 <= x + mx && x + mx < row->c1)	1881	if (row->c0 <= x + mx && x + mx < row->c1)
1605	{	1882	{
1606	mapcell *cell = row->col + (x + mx - row->c0);	1883	mapcell *cell = row->col + (x + mx - row->c0);
1607		1884
1608	int px = x * 32;	1885	int px = x * T;
1609	int py = y * 32;	1886	int py = y * T;
1610		1887
1611	if (cell->stat_hp)	1888	if (cell->stat_hp)
1612	{	1889	{
1613	int width = cell->stat_width * 32;	1890	int width = cell->stat_width * T;
1614	int thick = sh / 28 + 1 + cell->stat_width;	1891	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1615		1892
1616	glColor3ub (0, 0, 0);	1893	glColor3ub (0, 0, 0);
1617	glRectf (px + 1, py - thick - 2,	1894	glRectf (px + 1, py - thick - 2,
1618	px + width - 1, py);	1895	px + width - 1, py);
1619		1896
…		…
1758	if (row && row->c0 <= x && x < row->c1)	2035	if (row && row->c0 <= x && x < row->c1)
1759	{	2036	{
1760	mapcell *cell = row->col + (x - row->c0);	2037	mapcell *cell = row->col + (x - row->c0);
1761	uint8_t flags = 0;	2038	uint8_t flags = 0;
1762		2039
1763	if (cell->face [0]) flags \|= 1;	2040	if (cell->tile [0]) flags \|= 1;
1764	if (cell->face [1]) flags \|= 2;	2041	if (cell->tile [1]) flags \|= 2;
1765	if (cell->face [2]) flags \|= 4;	2042	if (cell->tile [2]) flags \|= 4;
1766		2043
1767	*data++ = flags;	2044	*data++ = flags;
1768		2045
1769	if (flags & 1)	2046	if (flags & 1)
1770	{	2047	{
		2048	tileid tile = cell->tile [0];
1771	*data++ = cell->face [0] >> 8;	2049	*data++ = tile >> 8;
1772	*data++ = cell->face [0];	2050	*data++ = tile;
1773	}	2051	}
1774		2052
1775	if (flags & 2)	2053	if (flags & 2)
1776	{	2054	{
		2055	tileid tile = cell->tile [1];
1777	*data++ = cell->face [1] >> 8;	2056	*data++ = tile >> 8;
1778	*data++ = cell->face [1];	2057	*data++ = tile;
1779	}	2058	}
1780		2059
1781	if (flags & 4)	2060	if (flags & 4)
1782	{	2061	{
		2062	tileid tile = cell->tile [2];
1783	*data++ = cell->face [2] >> 8;	2063	*data++ = tile >> 8;
1784	*data++ = cell->face [2];	2064	*data++ = tile;
1785	}	2065	}
1786	}	2066	}
1787	else	2067	else
1788	*data++ = 0;	2068	*data++ = 0;
1789	}	2069	}
…		…
1829	{	2109	{
1830	uint8_t flags = *data++;	2110	uint8_t flags = *data++;
1831		2111
1832	if (flags)	2112	if (flags)
1833	{	2113	{
1834	mapface face[3] = { 0, 0, 0 };
1835
1836	mapcell *cell = row_get_cell (row, x);	2114	mapcell *cell = row_get_cell (row, x);
		2115	tileid tile[3] = { 0, 0, 0 };
1837		2116
1838	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2117	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1839	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2118	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1840	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2119	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1841		2120
1842	if (cell->darkness == 0)	2121	if (cell->darkness == 0)
1843	{	2122	{
1844	cell->darkness = 0;	2123	cell->darkness = 0;
1845		2124
1846	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1847	{	2126	{
1848	cell->face[z] = face[z];	2127	tileid t = tile [z];
1849		2128
1850	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2130	{
1851	XPUSHs (sv_2mortal (newSViv (face[z])));	2131	XPUSHs (sv_2mortal (newSViv (t)));
		2132	need_texid (self, t);
		2133	}
		2134
		2135	cell->tile [z] = t;
1852	}	2136	}
1853	}	2137	}
1854	}	2138	}
1855	}	2139	}
1856	}	2140	}
…		…
1891	CODE:	2175	CODE:
1892	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1893	OUTPUT:	2177	OUTPUT:
1894	RETVAL	2178	RETVAL
1895		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1896	CFPlus::MixMusic	2187	CFPlus::MixMusic
1897	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1898	CODE:	2189	CODE:
1899	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1900	OUTPUT:	2191	OUTPUT:
…		…
1907		2198
1908	int	2199	int
1909	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1910	CODE:	2201	CODE:
1911	RETVAL = Mix_PlayMusic (self, loops);	2202	RETVAL = Mix_PlayMusic (self, loops);
		2203	OUTPUT:
		2204	RETVAL
		2205
		2206	int
		2207	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2208	CODE:
		2209	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1912	OUTPUT:	2210	OUTPUT:
1913	RETVAL	2211	RETVAL
1914		2212
1915	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1916		2214
…		…
1920	static const struct {	2218	static const struct {
1921	const char *name;	2219	const char *name;
1922	IV iv;	2220	IV iv;
1923	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1924	# define const_iv(name) { # name, (IV)name }	2222	# define const_iv(name) { # name, (IV)name }
		2223	const_iv (GL_VENDOR),
		2224	const_iv (GL_VERSION),
		2225	const_iv (GL_EXTENSIONS),
1925	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1926	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1927	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1928	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1929	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1956	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1957	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1958	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1959	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1960	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1961	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1962	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1963	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1964	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1965	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2005	# undef const_iv	2308	# undef const_iv
2006	};	2309	};
2007		2310
2008	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2311	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2009	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2312	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2313
		2314	texture_av = newAV ();
		2315	AvREAL_off (texture_av);
2010	}	2316	}
2011		2317
2012	char *	2318	char *
2013	gl_vendor ()	2319	gl_vendor ()
2014	CODE:	2320	CODE:
…		…
2025		2331
2026	char *	2332	char *
2027	gl_extensions ()	2333	gl_extensions ()
2028	CODE:	2334	CODE:
2029	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2335	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2336	OUTPUT:
		2337	RETVAL
		2338
		2339	char *glGetString (GLenum pname)
		2340
		2341	GLint glGetInteger (GLenum pname)
		2342	CODE:
		2343	glGetIntegerv (pname, &RETVAL);
		2344	OUTPUT:
		2345	RETVAL
		2346
		2347	GLdouble glGetDouble (GLenum pname)
		2348	CODE:
		2349	glGetDoublev (pname, &RETVAL);
2030	OUTPUT:	2350	OUTPUT:
2031	RETVAL	2351	RETVAL
2032		2352
2033	int glGetError ()	2353	int glGetError ()
2034		2354
…		…
2159		2479
2160	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2480	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2161		2481
2162	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2482	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2163		2483
		2484	void glPixelZoom (float x, float y)
		2485
2164	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2486	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2165		2487
2166	int glGenTexture ()	2488	int glGenTexture ()
2167	CODE:	2489	CODE:
2168	{	2490	RETVAL = gen_texture ();
2169	GLuint name;
2170	glGenTextures (1, &name);
2171	RETVAL = name;
2172	}
2173	OUTPUT:	2491	OUTPUT:
2174	RETVAL	2492	RETVAL
2175		2493
2176	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2177	CODE:	2495	CODE:
2178	{
2179	GLuint name_ = name;
2180	glDeleteTextures (1, &name_);	2496	del_texture (name);
2181	}	2497
2182
2183	int glGenList ()	2498	int glGenList ()
2184	CODE:	2499	CODE:
2185	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2186	OUTPUT:	2501	OUTPUT:
2187	RETVAL	2502	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.168 by root, Sat Dec 9 21:26:45 2006 UTC vs. Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.168 by root, Sat Dec 9 21:26:45 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC