[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.199 by root, Tue Jul 17 13:53: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:
…		…
1160	flags	1242	flags
1161	);	1243	);
1162		1244
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1246
		1247	int minpot (int n)
		1248
1165	void	1249	void
1166	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1167	CODE:	1251	CODE:
1168	{	1252	{
1169	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1245	{	1329	{
1246	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1248	}	1332	}
1249	}	1333	}
		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
1250		1345
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1252		1347
1253	CFPlus::Map	1348	CFPlus::Map
1254	new (SV *class)	1349	new (SV *class)
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1388	CODE:
1294	{	1389	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1390	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1391	need_texid (self, tile);
		1392	}
		1393
		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;
1297	}	1415	}
1298		1416
1299	void	1417	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)	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)
1301	CODE:	1419	CODE:
…		…
1352	CODE:	1470	CODE:
1353	{	1471	{
1354	if (dx > 0)	1472	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1474	else if (dx < 0)
1357	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);
1358		1476
1359	if (dy > 0)	1477	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1479	else if (dy < 0)
1362	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);
1363		1481
1364	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1366		1484
1367	while (self->y < 0)	1485	while (self->y < 0)
…		…
1421	}	1539	}
1422	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1542	else if (cmd == 0x47)
1425	{	1543	{
1426	if (*data == 8)	1544	if (*data == 4)
1427	; // decode player uuid	1545	; // decode player count
1428		1546
1429	data += *data + 1;	1547	data += *data + 1;
1430	}	1548	}
1431	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1524		1642
1525	void	1643	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1644	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1645	CODE:
1528	{	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;
1529	int x, y, z;	1651	int x, y, z;
1530	int last_name;	1652	int last_name;
		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));
1531		1660
1532	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1533		1662
1534	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1670	last_name = 0;
1542		1671
1543	mx += self->x;	1672	mx += self->x;
1544	my += self->y;	1673	my += self->y;
1545		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
1546	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1547	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1549	{	1703	{
1550	maprow *row = self->row + (y + my);	1704	maprow *row = self->row + (y + my);
1551		1705
1552	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1708	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [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;
		1717
		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	}
1557		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];
1558	if (tile)	1804	if (smask)
		1805	for (b = 0; b < 32; ++b)
		1806	if (smask & (((uint32_t)1) << b))
1559	{	1807	{
1560	maptex tex = self->tex [tile];	1808	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1809	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1810
1564	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1565	{	1813	{
		1814	smooth_key skey = (smooth_key )HeKEY (he);
		1815	IV bits = SvIVX (HeVAL (he));
		1816
1566	if (!tex.name)	1817	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1818	&& skey->level == level
1568		1819	&& 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	{	1820	{
1583	maptex tex = self->tex [1];	1821	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1822	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	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
1586		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
1587	glEnd ();	1836	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1838	glBegin (GL_QUADS);
		1839	}
1590		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
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1855	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1856	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1857	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1858	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1859	}
1595	}	1860	}
1596	}	1861	}
1597	}	1862	}
1598	}
1599	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1600		1868
1601	glEnd ();	1869	glEnd ();
1602		1870
1603	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
…		…
1856		2124
1857	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1858	{	2126	{
1859	tileid t = tile [z];	2127	tileid t = tile [z];
1860		2128
1861	if (t >= self->texs \|\| !self->tex [t].name)	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
1862	{	2130	{
1863	XPUSHs (sv_2mortal (newSViv (t)));	2131	XPUSHs (sv_2mortal (newSViv (t)));
1864	need_texid (self, t);	2132	need_texid (self, t);
1865	}	2133	}
1866		2134
…		…
1907	CODE:	2175	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2177	OUTPUT:
1910	RETVAL	2178	RETVAL
1911		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1912	CFPlus::MixMusic	2187	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1914	CODE:	2189	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2191	OUTPUT:
…		…
1923		2198
1924	int	2199	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2201	CODE:
1927	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);
1928	OUTPUT:	2210	OUTPUT:
1929	RETVAL	2211	RETVAL
1930		2212
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2214
…		…
1936	static const struct {	2218	static const struct {
1937	const char *name;	2219	const char *name;
1938	IV iv;	2220	IV iv;
1939	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1940	# 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),
1941	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1972	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2021	# undef const_iv	2308	# undef const_iv
2022	};	2309	};
2023		2310
2024	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; )
2025	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);
2026	}	2316	}
2027		2317
2028	char *	2318	char *
2029	gl_vendor ()	2319	gl_vendor ()
2030	CODE:	2320	CODE:
…		…
2041		2331
2042	char *	2332	char *
2043	gl_extensions ()	2333	gl_extensions ()
2044	CODE:	2334	CODE:
2045	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);
2046	OUTPUT:	2350	OUTPUT:
2047	RETVAL	2351	RETVAL
2048		2352
2049	int glGetError ()	2353	int glGetError ()
2050		2354
…		…
2175		2479
2176	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)
2177		2481
2178	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)
2179		2483
		2484	void glPixelZoom (float x, float y)
		2485
2180	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)
2181		2487
2182	int glGenTexture ()	2488	int glGenTexture ()
2183	CODE:	2489	CODE:
2184	{	2490	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2491	OUTPUT:
2190	RETVAL	2492	RETVAL
2191		2493
2192	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2193	CODE:	2495	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2496	del_texture (name);
2197	}	2497
2198
2199	int glGenList ()	2498	int glGenList ()
2200	CODE:	2499	CODE:
2201	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2202	OUTPUT:	2501	OUTPUT:
2203	RETVAL	2502	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.199 by root, Tue Jul 17 13:53: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.199 by root, Tue Jul 17 13:53:02 2007 UTC