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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
76	}	84	}
77		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
		108	}
		109
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
81	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
82	#include "pango-render.c"	114	#include "pango-render.c"
…		…
163	typedef struct {	195	typedef struct {
164	int name;	196	int name;
165	int w, h;	197	int w, h;
166	float s, t;	198	float s, t;
167	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
168	} maptex;	202	} maptex;
169		203
170	typedef struct {	204	typedef struct {
171	uint32_t player;	205	uint32_t player;
172	tileid tile[3];	206	tileid tile[3];
173	uint16_t darkness;	207	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	209	} mapcell;
176		210
177	typedef struct {	211	typedef struct {
178	int32_t c0, c1;	212	int32_t c0, c1;
179	mapcell *col;	213	mapcell *col;
…		…
333	cell->stat_hp = 0;	367	cell->stat_hp = 0;
334	cell->flags = 0;	368	cell->flags = 0;
335	cell->player = 0;	369	cell->player = 0;
336	}	370	}
337	}	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);
338	}	388	}
339		389
340	static void	390	static void
341	music_finished (void)	391	music_finished (void)
342	{	392	{
…		…
596	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
598	);	648	);
599	if (RETVAL)	649	if (RETVAL)
600	{	650	{
		651	av_clear (texture_av);
		652
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# 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);
603	# include "glfunc.h"	655	# include "glfunc.h"
604	# undef GL_FUNC	656	# undef GL_FUNC
		657
605	}	658	}
606	OUTPUT:	659	OUTPUT:
607	RETVAL	660	RETVAL
608		661
609	void	662	void
610	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
611		664
612	char *	665	char *
613	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
614		667
		668	int
		669	SDL_GetAppState ()
		670
615	void	671	void
616	SDL_PollEvent ()	672	poll_events ()
617	PPCODE:	673	PPCODE:
618	{	674	{
619	SDL_Event ev;	675	SDL_Event ev;
620		676
621	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	679	{
623	HV *hv = newHV ();	680	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		682
626	switch (ev.type)	683	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	697	break;
641		698
642	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
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
650	break;	725	break;
651		726
652	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
684		759
685	void	760	void
686	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
687	CODE:	762	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		764
692	void	765	void
693	win32_proxy_info ()	766	win32_proxy_info ()
694	PPCODE:	767	PPCODE:
695	{	768	{
…		…
836	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
837	#else	910	#else
838	_exit (retval);	911	_exit (retval);
839	#endif	912	#endif
840		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
841	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
842		924
843	CFPlus::Font	925	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
845	CODE:	927	CODE:
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1374	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1375	CODE:
1294	{	1376	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1377	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1378	need_texid (self, tile);
		1379	}
		1380
		1381	void
		1382	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1383	CODE:
		1384	{
		1385	tileid texid;
		1386	maptex *tex;
		1387
		1388	if (face < 0 \|\| face >= self->faces)
		1389	return;
		1390
		1391	if (smooth < 0 \|\| smooth >= self->faces)
		1392	return;
		1393
		1394	texid = self->face2tile [face];
		1395
		1396	if (!texid)
		1397	return;
		1398
		1399	tex = self->tex + texid;
		1400	tex->smoothtile = self->face2tile [smooth];
		1401	tex->smoothlevel = level;
1297	}	1402	}
1298		1403
1299	void	1404	void
1300	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1405	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1301	CODE:	1406	CODE:
…		…
1352	CODE:	1457	CODE:
1353	{	1458	{
1354	if (dx > 0)	1459	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1460	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1461	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1462	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1463
1359	if (dy > 0)	1464	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1465	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1466	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1467	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1468
1364	self->ox += dx; self->x += dx;	1469	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1470	self->oy += dy; self->y += dy;
1366		1471
1367	while (self->y < 0)	1472	while (self->y < 0)
…		…
1421	}	1526	}
1422	else if (cmd == 6) // monster width	1527	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1528	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1529	else if (cmd == 0x47)
1425	{	1530	{
1426	if (*data == 8)	1531	if (*data == 4)
1427	; // decode player uuid	1532	; // decode player count
1428		1533
1429	data += *data + 1;	1534	data += *data + 1;
1430	}	1535	}
1431	else if (cmd == 8) // cell flags	1536	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1537	cell->flags = *data++;
…		…
1524		1629
1525	void	1630	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1631	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1632	CODE:
1528	{	1633	{
		1634	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1635	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1636	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1637	smooth_key skey;
1529	int x, y, z;	1638	int x, y, z;
1530	int last_name;	1639	int last_name;
		1640
		1641	// thats current max. sorry.
		1642	if (sw > 255) sw = 255;
		1643	if (sh > 255) sh = 255;
		1644
		1645	// clear key, in case of extra padding
		1646	memset (&skey, 0, sizeof (skey));
1531		1647
1532	glColor4ub (255, 255, 255, 255);	1648	glColor4ub (255, 255, 255, 255);
1533		1649
1534	glEnable (GL_BLEND);	1650	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1651	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1657	last_name = 0;
1542		1658
1543	mx += self->x;	1659	mx += self->x;
1544	my += self->y;	1660	my += self->y;
1545		1661
		1662	// first pass: determine smooth_max
		1663	// rather ugly, if you ask me
		1664	// could also be stored inside mapcell and updated on change
		1665	memset (smooth_max, 0, sizeof (smooth_max));
		1666
		1667	for (y = 0; y < sh; y++)
		1668	if (0 <= y + my && y + my < self->rows)
		1669	{
		1670	maprow *row = self->row + (y + my);
		1671
		1672	for (x = 0; x < sw; x++)
		1673	if (row->c0 <= x + mx && x + mx < row->c1)
		1674	{
		1675	mapcell *cell = row->col + (x + mx - row->c0);
		1676
		1677	smooth_max[x + 1][y + 1] =
		1678	MAX (self->tex [cell->tile [0]].smoothlevel,
		1679	MAX (self->tex [cell->tile [1]].smoothlevel,
		1680	self->tex [cell->tile [2]].smoothlevel));
		1681	}
		1682	}
		1683
1546	for (z = 0; z < 3; z++)	1684	for (z = 0; z <= 2; z++)
		1685	{
		1686	memset (smooth_level, 0, sizeof (smooth_level));
		1687
1547	for (y = 0; y < sh; y++)	1688	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1689	if (0 <= y + my && y + my < self->rows)
1549	{	1690	{
1550	maprow *row = self->row + (y + my);	1691	maprow *row = self->row + (y + my);
1551		1692
1552	for (x = 0; x < sw; x++)	1693	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1694	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1695	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1696	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1697	tileid tile = cell->tile [z];
		1698
		1699	if (tile)
		1700	{
		1701	maptex tex = self->tex [tile];
		1702	int px = (x + 1) * T - tex.w;
		1703	int py = (y + 1) * T - tex.h;
		1704
		1705	// suppressing texture state switches here
		1706	// is only moderately effective, but worth the extra effort
		1707	if (last_name != tex.name)
		1708	{
		1709	if (!tex.name)
		1710	tex = self->tex [2]; /* missing, replace by noface */
		1711
		1712	glEnd ();
		1713	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1714	glBegin (GL_QUADS);
		1715	}
		1716
		1717	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1718	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1719	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1720	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1721
		1722	if (cell->flags && z == 2)
		1723	{
		1724	if (cell->flags & 1)
		1725	{
		1726	maptex tex = self->tex [1];
		1727	int px = x * T + T * 2 / 32;
		1728	int py = y * T - T * 6 / 32;
		1729
		1730	glEnd ();
		1731	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1732	glBegin (GL_QUADS);
		1733
		1734	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1735	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1736	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1737	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1738	}
		1739	}
		1740
		1741	// update smooth hash
		1742	if (tex.smoothtile)
		1743	{
		1744	skey.tile = tex.smoothtile;
		1745	skey.level = tex.smoothlevel;
		1746
		1747	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1748
		1749	// add bits to current tile and all neighbours. skey.x\|y is
		1750	// shifted +1\|+1 so we always stay positive.
		1751
		1752	// bits is ___n cccc CCCC bbbb
		1753	// n do not draw borders&corners
		1754	// c draw these corners, but...
		1755	// C ... not these
		1756	// b draw these borders
		1757
		1758	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1759	// ┃· ·· ·┃ ━━
		1760
		1761	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1762	// ·· ·· ·┏ ┓·
		1763
		1764	// full tile
		1765	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1766
		1767	// borders
		1768	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1769	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1770	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1771	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1772
		1773	// corners
		1774	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1775	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1776	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1777	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1778	}
		1779	}
1557		1780	}
		1781	}
		1782
		1783	// go through all smoothlevels, lowest to highest, then draw.
		1784	// this is basically counting sort
		1785	{
		1786	int w, b;
		1787
		1788	for (w = 0; w < 256 / 32; ++w)
		1789	{
		1790	uint32_t smask = smooth_level [w];
1558	if (tile)	1791	if (smask)
		1792	for (b = 0; b < 32; ++b)
		1793	if (smask & (((uint32_t)1) << b))
1559	{	1794	{
1560	maptex tex = self->tex [tile];	1795	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1796	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1797
1564	if (last_name != tex.name)	1798	hv_iterinit (smooth);
		1799	while ((he = hv_iternext (smooth)))
1565	{	1800	{
		1801	smooth_key skey = (smooth_key )HeKEY (he);
		1802	IV bits = SvIVX (HeVAL (he));
		1803
1566	if (!tex.name)	1804	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1805	&& skey->level == level
1568		1806	&& level > smooth_max [skey->x][skey->y])
1569	glEnd ();
1570	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1571	glBegin (GL_QUADS);
1572	}
1573
1574	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1575	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1576	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1577	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579	if (cell->flags && z == 2)
1580	{
1581	if (cell->flags & 1)
1582	{	1807	{
1583	maptex tex = self->tex [1];	1808	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1809	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1810	int py = (((int)skey->y) - 1) * T;
		1811	int border = bits & 15;
		1812	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1813	float dx = tex.s * .0625f; // 16 images/row
		1814	float dy = tex.t * .5f ; // 2 images/column
1586		1815
		1816	// this time naively avoiding texture state changes
		1817	// save gobs of state changes.
		1818	if (last_name != tex.name)
		1819	{
		1820	if (!tex.name)
		1821	continue; // smoothing not yet available
		1822
1587	glEnd ();	1823	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1824	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1825	glBegin (GL_QUADS);
		1826	}
1590		1827
		1828	if (border)
		1829	{
		1830	float ox = border * dx;
		1831
		1832	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1833	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1834	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1835	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1836	}
		1837
		1838	if (corner)
		1839	{
		1840	float ox = corner * dx;
		1841
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1842	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1843	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1844	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1845	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1846	}
1595	}	1847	}
1596	}	1848	}
1597	}	1849	}
1598	}
1599	}	1850	}
		1851	}
		1852
		1853	hv_clear (smooth);
		1854	}
1600		1855
1601	glEnd ();	1856	glEnd ();
1602		1857
1603	glDisable (GL_TEXTURE_2D);	1858	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1859	glDisable (GL_BLEND);
…		…
1856		2111
1857	for (z = 0; z <= 2; z++)	2112	for (z = 0; z <= 2; z++)
1858	{	2113	{
1859	tileid t = tile [z];	2114	tileid t = tile [z];
1860		2115
1861	if (t >= self->texs \|\| !self->tex [t].name)	2116	if (t >= self->texs \|\| (t && !self->tex [t].name))
1862	{	2117	{
1863	XPUSHs (sv_2mortal (newSViv (t)));	2118	XPUSHs (sv_2mortal (newSViv (t)));
1864	need_texid (self, t);	2119	need_texid (self, t);
1865	}	2120	}
1866		2121
…		…
1907	CODE:	2162	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2163	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2164	OUTPUT:
1910	RETVAL	2165	RETVAL
1911		2166
		2167	int
		2168	fade_out (int ms)
		2169	CODE:
		2170	RETVAL = Mix_FadeOutMusic (ms);
		2171	OUTPUT:
		2172	RETVAL
		2173
1912	CFPlus::MixMusic	2174	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2175	new_from_file (SV class, char path)
1914	CODE:	2176	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2177	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2178	OUTPUT:
…		…
1923		2185
1924	int	2186	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2187	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2188	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2189	RETVAL = Mix_PlayMusic (self, loops);
		2190	OUTPUT:
		2191	RETVAL
		2192
		2193	int
		2194	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2195	CODE:
		2196	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1928	OUTPUT:	2197	OUTPUT:
1929	RETVAL	2198	RETVAL
1930		2199
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2200	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2201
…		…
2021	# undef const_iv	2290	# undef const_iv
2022	};	2291	};
2023		2292
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2293	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2294	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2295
		2296	texture_av = newAV ();
		2297	AvREAL_off (texture_av);
2026	}	2298	}
2027		2299
2028	char *	2300	char *
2029	gl_vendor ()	2301	gl_vendor ()
2030	CODE:	2302	CODE:
…		…
2179		2451
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2452	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2453
2182	int glGenTexture ()	2454	int glGenTexture ()
2183	CODE:	2455	CODE:
2184	{	2456	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2457	OUTPUT:
2190	RETVAL	2458	RETVAL
2191		2459
2192	void glDeleteTexture (int name)	2460	void glDeleteTexture (int name)
2193	CODE:	2461	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2462	del_texture (name);
2197	}	2463
2198
2199	int glGenList ()	2464	int glGenList ()
2200	CODE:	2465	CODE:
2201	RETVAL = glGenLists (1);	2466	RETVAL = glGenLists (1);
2202	OUTPUT:	2467	OUTPUT:
2203	RETVAL	2468	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC vs. Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.174 by root, Fri Apr 6 07:45:34 2007 UTC vs.
Revision 1.198 by root, Sun Jul 15 21:42:02 2007 UTC