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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 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
…		…
611		664
612	char *	665	char *
613	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
614		667
615	void	668	void
616	SDL_PollEvent ()	669	poll_events ()
617	PPCODE:	670	PPCODE:
618	{	671	{
619	SDL_Event ev;	672	SDL_Event ev;
620		673
621	while (SDL_PollEvent (&ev))	674	SDL_PumpEvents ();
		675	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	676	{
623	HV *hv = newHV ();	677	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	678	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		679
626	switch (ev.type)	680	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	692	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	693	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	694	break;
641		695
642	case SDL_MOUSEMOTION:	696	case SDL_MOUSEMOTION:
		697	{
		698	int state = ev.motion.state;
		699	int x = ev.motion.x;
		700	int y = ev.motion.y;
		701	int xrel = ev.motion.xrel;
		702	int yrel = ev.motion.yrel;
		703
		704	/* do simplistic event compression */
		705	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		706	&& state == ev.motion.state)
		707	{
		708	xrel += ev.motion.xrel;
		709	yrel += ev.motion.yrel;
		710	x = ev.motion.x;
		711	y = ev.motion.y;
		712	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		713	}
		714
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	715	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	716	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	717	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	718	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	719	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	720	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		721	}
650	break;	722	break;
651		723
652	case SDL_MOUSEBUTTONDOWN:	724	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	725	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	726	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	755	Mix_AllocateChannels (int numchans = -1)
684		756
685	void	757	void
686	lowdelay (int fd, int val = 1)	758	lowdelay (int fd, int val = 1)
687	CODE:	759	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	760	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		761
692	void	762	void
693	win32_proxy_info ()	763	win32_proxy_info ()
694	PPCODE:	764	PPCODE:
695	{	765	{
…		…
836	ExitThread (retval); // unclean, please beam me up	906	ExitThread (retval); // unclean, please beam me up
837	#else	907	#else
838	_exit (retval);	908	_exit (retval);
839	#endif	909	#endif
840		910
		911	void
		912	debug ()
		913	CODE:
		914	{
		915	#if DEBUG
		916	VALGRIND_DO_LEAK_CHECK;
		917	#endif
		918	}
		919
841	MODULE = CFPlus PACKAGE = CFPlus::Font	920	MODULE = CFPlus PACKAGE = CFPlus::Font
842		921
843	CFPlus::Font	922	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	923	new_from_file (SV class, char path, int id = 0)
845	CODE:	924	CODE:
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1371	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1372	CODE:
1294	{	1373	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1374	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1375	need_texid (self, tile);
		1376	}
		1377
		1378	void
		1379	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1380	CODE:
		1381	{
		1382	tileid texid;
		1383	maptex *tex;
		1384
		1385	if (face < 0 \|\| face >= self->faces)
		1386	return;
		1387
		1388	if (smooth < 0 \|\| smooth >= self->faces)
		1389	return;
		1390
		1391	texid = self->face2tile [face];
		1392
		1393	if (!texid)
		1394	return;
		1395
		1396	tex = self->tex + texid;
		1397	tex->smoothtile = self->face2tile [smooth];
		1398	tex->smoothlevel = level;
1297	}	1399	}
1298		1400
1299	void	1401	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)	1402	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:	1403	CODE:
…		…
1352	CODE:	1454	CODE:
1353	{	1455	{
1354	if (dx > 0)	1456	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1457	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1458	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1459	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1460
1359	if (dy > 0)	1461	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1462	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1463	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1464	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1465
1364	self->ox += dx; self->x += dx;	1466	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1467	self->oy += dy; self->y += dy;
1366		1468
1367	while (self->y < 0)	1469	while (self->y < 0)
…		…
1421	}	1523	}
1422	else if (cmd == 6) // monster width	1524	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1525	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1526	else if (cmd == 0x47)
1425	{	1527	{
1426	if (*data == 8)	1528	if (*data == 4)
1427	; // decode player uuid	1529	; // decode player count
1428		1530
1429	data += *data + 1;	1531	data += *data + 1;
1430	}	1532	}
1431	else if (cmd == 8) // cell flags	1533	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1534	cell->flags = *data++;
…		…
1524		1626
1525	void	1627	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1628	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1629	CODE:
1528	{	1630	{
		1631	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1632	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1633	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1634	smooth_key skey;
1529	int x, y, z;	1635	int x, y, z;
1530	int last_name;	1636	int last_name;
		1637
		1638	// thats current max. sorry.
		1639	if (sw > 255) sw = 255;
		1640	if (sh > 255) sh = 255;
		1641
		1642	// clear key, in case of extra padding
		1643	memset (&skey, 0, sizeof (skey));
1531		1644
1532	glColor4ub (255, 255, 255, 255);	1645	glColor4ub (255, 255, 255, 255);
1533		1646
1534	glEnable (GL_BLEND);	1647	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1648	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1654	last_name = 0;
1542		1655
1543	mx += self->x;	1656	mx += self->x;
1544	my += self->y;	1657	my += self->y;
1545		1658
		1659	// first pass: determine smooth_max
		1660	// rather ugly, if you ask me
		1661	// could also be stored inside mapcell and updated on change
		1662	memset (smooth_max, 0, sizeof (smooth_max));
		1663
		1664	for (y = 0; y < sh; y++)
		1665	if (0 <= y + my && y + my < self->rows)
		1666	{
		1667	maprow *row = self->row + (y + my);
		1668
		1669	for (x = 0; x < sw; x++)
		1670	if (row->c0 <= x + mx && x + mx < row->c1)
		1671	{
		1672	mapcell *cell = row->col + (x + mx - row->c0);
		1673
		1674	smooth_max[x + 1][y + 1] =
		1675	MAX (self->tex [cell->tile [0]].smoothlevel,
		1676	MAX (self->tex [cell->tile [1]].smoothlevel,
		1677	self->tex [cell->tile [2]].smoothlevel));
		1678	}
		1679	}
		1680
1546	for (z = 0; z < 3; z++)	1681	for (z = 0; z <= 2; z++)
		1682	{
		1683	memset (smooth_level, 0, sizeof (smooth_level));
		1684
1547	for (y = 0; y < sh; y++)	1685	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1686	if (0 <= y + my && y + my < self->rows)
1549	{	1687	{
1550	maprow *row = self->row + (y + my);	1688	maprow *row = self->row + (y + my);
1551		1689
1552	for (x = 0; x < sw; x++)	1690	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1691	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1692	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1693	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1694	tileid tile = cell->tile [z];
		1695
		1696	if (tile)
		1697	{
		1698	maptex tex = self->tex [tile];
		1699	int px = (x + 1) * T - tex.w;
		1700	int py = (y + 1) * T - tex.h;
		1701
		1702	// suppressing texture state switches here
		1703	// is only moderately effective, but worth the extra effort
		1704	if (last_name != tex.name)
		1705	{
		1706	if (!tex.name)
		1707	tex = self->tex [2]; /* missing, replace by noface */
		1708
		1709	glEnd ();
		1710	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1711	glBegin (GL_QUADS);
		1712	}
		1713
		1714	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1715	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1716	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1717	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1718
		1719	if (cell->flags && z == 2)
		1720	{
		1721	if (cell->flags & 1)
		1722	{
		1723	maptex tex = self->tex [1];
		1724	int px = x * T + T * 2 / 32;
		1725	int py = y * T - T * 6 / 32;
		1726
		1727	glEnd ();
		1728	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1729	glBegin (GL_QUADS);
		1730
		1731	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1732	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1733	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1734	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1735	}
		1736	}
		1737
		1738	// update smooth hash
		1739	if (tex.smoothtile)
		1740	{
		1741	skey.tile = tex.smoothtile;
		1742	skey.level = tex.smoothlevel;
		1743
		1744	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1745
		1746	// add bits to current tile and all neighbours. skey.x\|y is
		1747	// shifted +1\|+1 so we always stay positive.
		1748
		1749	// bits is ___n cccc CCCC bbbb
		1750	// n do not draw borders&corners
		1751	// c draw these corners, but...
		1752	// C ... not these
		1753	// b draw these borders
		1754
		1755	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1756	// ┃· ·· ·┃ ━━
		1757
		1758	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1759	// ·· ·· ·┏ ┓·
		1760
		1761	// full tile
		1762	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1763
		1764	// borders
		1765	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1766	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1767	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1768	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1769
		1770	// corners
		1771	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1772	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1773	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1774	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1775	}
		1776	}
1557		1777	}
		1778	}
		1779
		1780	// go through all smoothlevels, lowest to highest, then draw.
		1781	// this is basically counting sort
		1782	{
		1783	int w, b;
		1784
		1785	for (w = 0; w < 256 / 32; ++w)
		1786	{
		1787	uint32_t smask = smooth_level [w];
1558	if (tile)	1788	if (smask)
		1789	for (b = 0; b < 32; ++b)
		1790	if (smask & (((uint32_t)1) << b))
1559	{	1791	{
1560	maptex tex = self->tex [tile];	1792	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1793	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1794
1564	if (last_name != tex.name)	1795	hv_iterinit (smooth);
		1796	while ((he = hv_iternext (smooth)))
1565	{	1797	{
		1798	smooth_key skey = (smooth_key )HeKEY (he);
		1799	IV bits = SvIVX (HeVAL (he));
		1800
1566	if (!tex.name)	1801	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1802	&& skey->level == level
1568		1803	&& 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	{	1804	{
1583	maptex tex = self->tex [1];	1805	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1806	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1807	int py = (((int)skey->y) - 1) * T;
		1808	int border = bits & 15;
		1809	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1810	float dx = tex.s * .0625f; // 16 images/row
		1811	float dy = tex.t * .5f ; // 2 images/column
1586		1812
		1813	// this time naively avoiding texture state changes
		1814	// save gobs of state changes.
		1815	if (last_name != tex.name)
		1816	{
		1817	if (!tex.name)
		1818	continue; // smoothing not yet available
		1819
1587	glEnd ();	1820	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1821	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1822	glBegin (GL_QUADS);
		1823	}
1590		1824
		1825	if (border)
		1826	{
		1827	float ox = border * dx;
		1828
		1829	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1830	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1831	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1832	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1833	}
		1834
		1835	if (corner)
		1836	{
		1837	float ox = corner * dx;
		1838
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1839	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1840	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1841	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1842	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1843	}
1595	}	1844	}
1596	}	1845	}
1597	}	1846	}
1598	}
1599	}	1847	}
		1848	}
		1849
		1850	hv_clear (smooth);
		1851	}
1600		1852
1601	glEnd ();	1853	glEnd ();
1602		1854
1603	glDisable (GL_TEXTURE_2D);	1855	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1856	glDisable (GL_BLEND);
…		…
1907	CODE:	2159	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2160	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2161	OUTPUT:
1910	RETVAL	2162	RETVAL
1911		2163
		2164	int
		2165	fade_out (int ms)
		2166	CODE:
		2167	RETVAL = Mix_FadeOutMusic (ms);
		2168	OUTPUT:
		2169	RETVAL
		2170
1912	CFPlus::MixMusic	2171	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2172	new_from_file (SV class, char path)
1914	CODE:	2173	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2174	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2175	OUTPUT:
…		…
1923		2182
1924	int	2183	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2184	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2185	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2186	RETVAL = Mix_PlayMusic (self, loops);
		2187	OUTPUT:
		2188	RETVAL
		2189
		2190	int
		2191	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2192	CODE:
		2193	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1928	OUTPUT:	2194	OUTPUT:
1929	RETVAL	2195	RETVAL
1930		2196
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2197	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2198
…		…
2021	# undef const_iv	2287	# undef const_iv
2022	};	2288	};
2023		2289
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2290	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2291	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2292
		2293	texture_av = newAV ();
		2294	AvREAL_off (texture_av);
2026	}	2295	}
2027		2296
2028	char *	2297	char *
2029	gl_vendor ()	2298	gl_vendor ()
2030	CODE:	2299	CODE:
…		…
2179		2448
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2449	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2450
2182	int glGenTexture ()	2451	int glGenTexture ()
2183	CODE:	2452	CODE:
2184	{	2453	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2454	OUTPUT:
2190	RETVAL	2455	RETVAL
2191		2456
2192	void glDeleteTexture (int name)	2457	void glDeleteTexture (int name)
2193	CODE:	2458	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2459	del_texture (name);
2197	}	2460
2198
2199	int glGenList ()	2461	int glGenList ()
2200	CODE:	2462	CODE:
2201	RETVAL = glGenLists (1);	2463	RETVAL = glGenLists (1);
2202	OUTPUT:	2464	OUTPUT:
2203	RETVAL	2465	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs. Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.175 by root, Fri Apr 6 08:09:42 2007 UTC vs.
Revision 1.197 by root, Sun Jul 15 21:08:40 2007 UTC