[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.202 by root, Tue Jul 17 18:34:24 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
…		…
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
25	#include <SDL.h>	30	#include <SDL.h>
		31	#include <SDL_thread.h>
26	#include <SDL_endian.h>	32	#include <SDL_endian.h>
27	#include <SDL_image.h>	33	#include <SDL_image.h>
28	#include <SDL_mixer.h>	34	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	35	#include <SDL_opengl.h>
30		36
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	62	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	63	#else
58	# define PARACHUTE 0	64	# define PARACHUTE 0
59	#endif	65	#endif
60		66
		67	static AV *texture_av;
		68
61	static struct	69	static struct
62	{	70	{
63	#define GL_FUNC(ptr,name) ptr name;	71	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	72	#include "glfunc.h"
65	#undef GL_FUNC	73	#undef GL_FUNC
66	} gl;	74	} gl;
67		75
		76	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	77	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	78	{
70	if (gl.BlendFuncSeparate)	79	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	80	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	81	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	82	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	83	else
75	glBlendFunc (sa, da);	84	glBlendFunc (sa, da);
76	}	85	}
77		86
		87	static GLuint
		88	gen_texture ()
		89	{
		90	GLuint name;
		91
		92	if (AvFILL (texture_av) >= 0)
		93	name = (GLuint)(size_t)av_pop (texture_av);
		94	else
		95	glGenTextures (1, &name);
		96
		97	return name;
		98	}
		99
		100	static void
		101	del_texture (GLuint name)
		102	{
		103	/* make a half-assed attempt at returning the memory used by the texture */
		104	/* textures are frequently being reused by cfplus anyway */
		105	/glBindTexture (GL_TEXTURE_2D, name);/
		106	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		107	av_push (texture_av, (SV *)(size_t)name);
		108	glDeleteTextures (1, &name);
		109	}
		110
78	#include "texcache.c"	111	#include "texcache.c"
79		112
80	#include "pango-font.c"	113	#include "pango-font.c"
81	#include "pango-fontmap.c"	114	#include "pango-fontmap.c"
82	#include "pango-render.c"	115	#include "pango-render.c"
…		…
163	typedef struct {	196	typedef struct {
164	int name;	197	int name;
165	int w, h;	198	int w, h;
166	float s, t;	199	float s, t;
167	uint8_t r, g, b, a;	200	uint8_t r, g, b, a;
		201	tileid smoothtile;
		202	uint8_t smoothlevel;
168	} maptex;	203	} maptex;
169		204
170	typedef struct {	205	typedef struct {
171	uint32_t player;	206	uint32_t player;
172	tileid tile[3];	207	tileid tile[3];
173	uint16_t darkness;	208	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	209	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	210	} mapcell;
176		211
177	typedef struct {	212	typedef struct {
178	int32_t c0, c1;	213	int32_t c0, c1;
179	mapcell *col;	214	mapcell *col;
…		…
333	cell->stat_hp = 0;	368	cell->stat_hp = 0;
334	cell->flags = 0;	369	cell->flags = 0;
335	cell->player = 0;	370	cell->player = 0;
336	}	371	}
337	}	372	}
		373	}
		374
		375	typedef struct {
		376	tileid tile;
		377	uint8_t x, y, level;
		378	} smooth_key;
		379
		380	static void
		381	smooth_or_bits (HV hv, smooth_key key, IV bits)
		382	{
		383	SV *sv = hv_fetch (hv, (char )key, sizeof (*key), 1);
		384
		385	if (SvIOK (*sv))
		386	SvIV_set (sv, SvIVX (sv) \| bits);
		387	else
		388	sv_setiv (*sv, bits);
338	}	389	}
339		390
340	static void	391	static void
341	music_finished (void)	392	music_finished (void)
342	{	393	{
…		…
537	opengl_fontmap = pango_opengl_font_map_new ();	588	opengl_fontmap = pango_opengl_font_map_new ();
538	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	589	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	590	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540	}	591	}
541		592
		593	char *
		594	SDL_GetError ()
		595
542	int	596	int
543	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)	597	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
544		598
545	void	599	void
546	SDL_Quit ()	600	SDL_Quit ()
547		601
548	void	602	void
549	SDL_ListModes ()	603	SDL_ListModes (int rgb, int alpha)
550	PPCODE:	604	PPCODE:
551	{	605	{
552	SDL_Rect **m;	606	SDL_Rect **m;
553		607
554	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	608	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	609	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	610	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	611	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558		612
559	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	613	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	614	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561		615
562	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	616	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	617	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	618	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	619	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566		620
567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	621	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568	#if SDL_VERSION_ATLEAST(1,2,10)	622	#if SDL_VERSION_ATLEAST(1,2,10)
569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	623	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	624	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571	#endif	625	#endif
572		626
573	SDL_EnableUNICODE (1);
574	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
575
576	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	627	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
577		628
578	if (m && m != (SDL_Rect **)-1)	629	if (m && m != (SDL_Rect **)-1)
579	while (*m)	630	while (*m)
580	{	631	{
		632	if ((m)->w >= 640 && (m)->h >= 480)
		633	{
581	AV *av = newAV ();	634	AV *av = newAV ();
582	av_push (av, newSViv ((*m)->w));	635	av_push (av, newSViv ((*m)->w));
583	av_push (av, newSViv ((*m)->h));	636	av_push (av, newSViv ((*m)->h));
		637	av_push (av, newSViv (rgb));
		638	av_push (av, newSViv (alpha));
584	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	639	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		640	}
585		641
586	++m;	642	++m;
587	}	643	}
588	}	644	}
589		645
590	char *
591	SDL_GetError ()
592
593	int	646	int
594	SDL_SetVideoMode (int w, int h, int fullscreen)	647	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595	CODE:	648	CODE:
		649	{
		650	SDL_EnableUNICODE (1);
		651	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		652
		653	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		654	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		655	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		656	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		657
596	RETVAL = !!SDL_SetVideoMode (	658	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	659	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
598	);	660	);
		661
599	if (RETVAL)	662	if (RETVAL)
600	{	663	{
		664	av_clear (texture_av);
		665
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	666	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	667	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
603	# include "glfunc.h"	668	#include "glfunc.h"
604	# undef GL_FUNC	669	#undef GL_FUNC
605	}	670	}
		671	}
606	OUTPUT:	672	OUTPUT:
607	RETVAL	673	RETVAL
608		674
609	void	675	void
610	SDL_GL_SwapBuffers ()	676	SDL_GL_SwapBuffers ()
611		677
612	char *	678	char *
613	SDL_GetKeyName (int sym)	679	SDL_GetKeyName (int sym)
614		680
		681	int
		682	SDL_GetAppState ()
		683
615	void	684	void
616	SDL_PollEvent ()	685	poll_events ()
617	PPCODE:	686	PPCODE:
618	{	687	{
619	SDL_Event ev;	688	SDL_Event ev;
620		689
621	while (SDL_PollEvent (&ev))	690	SDL_PumpEvents ();
		691	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	692	{
623	HV *hv = newHV ();	693	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	694	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		695
626	switch (ev.type)	696	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	708	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	709	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	710	break;
641		711
642	case SDL_MOUSEMOTION:	712	case SDL_MOUSEMOTION:
		713	{
		714	int state = ev.motion.state;
		715	int x = ev.motion.x;
		716	int y = ev.motion.y;
		717	int xrel = ev.motion.xrel;
		718	int yrel = ev.motion.yrel;
		719
		720	/* do simplistic event compression */
		721	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		722	&& state == ev.motion.state)
		723	{
		724	xrel += ev.motion.xrel;
		725	yrel += ev.motion.yrel;
		726	x = ev.motion.x;
		727	y = ev.motion.y;
		728	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		729	}
		730
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	731	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	732	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	733	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	734	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	735	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	736	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		737	}
650	break;	738	break;
651		739
652	case SDL_MOUSEBUTTONDOWN:	740	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	741	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	742	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
683	Mix_AllocateChannels (int numchans = -1)	771	Mix_AllocateChannels (int numchans = -1)
684		772
685	void	773	void
686	lowdelay (int fd, int val = 1)	774	lowdelay (int fd, int val = 1)
687	CODE:	775	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	776	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		777
692	void	778	void
693	win32_proxy_info ()	779	win32_proxy_info ()
694	PPCODE:	780	PPCODE:
695	{	781	{
…		…
836	ExitThread (retval); // unclean, please beam me up	922	ExitThread (retval); // unclean, please beam me up
837	#else	923	#else
838	_exit (retval);	924	_exit (retval);
839	#endif	925	#endif
840		926
		927	void
		928	debug ()
		929	CODE:
		930	{
		931	#if DEBUG
		932	VALGRIND_DO_LEAK_CHECK;
		933	#endif
		934	}
		935
841	MODULE = CFPlus PACKAGE = CFPlus::Font	936	MODULE = CFPlus PACKAGE = CFPlus::Font
842		937
843	CFPlus::Font	938	CFPlus::Font
844	new_from_file (SV class, char path, int id = 0)	939	new_from_file (SV class, char path, int id = 0)
845	CODE:	940	CODE:
…		…
1160	flags	1255	flags
1161	);	1256	);
1162		1257
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1258	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1259
		1260	int minpot (int n)
		1261
1165	void	1262	void
1166	pad2pot (SV data_, SV w_, SV *h_)	1263	pad2pot (SV data_, SV w_, SV *h_)
1167	CODE:	1264	CODE:
1168	{	1265	{
1169	int ow = SvIV (w_);	1266	int ow = SvIV (w_);
…		…
1245	{	1342	{
1246	glDisable (GL_ALPHA_TEST);	1343	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1344	glDisable (GL_BLEND);
1248	}	1345	}
1249	}	1346	}
		1347
		1348	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1349	CODE:
		1350	{
		1351	GLint width;
		1352	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1353	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1354	RETVAL = width > 0;
		1355	}
		1356	OUTPUT:
		1357	RETVAL
1250		1358
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1359	MODULE = CFPlus PACKAGE = CFPlus::Map
1252		1360
1253	CFPlus::Map	1361	CFPlus::Map
1254	new (SV *class)	1362	new (SV *class)
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1400	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1401	CODE:
1294	{	1402	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1403	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1404	need_texid (self, tile);
		1405	}
		1406
		1407	void
		1408	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1409	CODE:
		1410	{
		1411	tileid texid;
		1412	maptex *tex;
		1413
		1414	if (face < 0 \|\| face >= self->faces)
		1415	return;
		1416
		1417	if (smooth < 0 \|\| smooth >= self->faces)
		1418	return;
		1419
		1420	texid = self->face2tile [face];
		1421
		1422	if (!texid)
		1423	return;
		1424
		1425	tex = self->tex + texid;
		1426	tex->smoothtile = self->face2tile [smooth];
		1427	tex->smoothlevel = level;
1297	}	1428	}
1298		1429
1299	void	1430	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)	1431	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:	1432	CODE:
…		…
1352	CODE:	1483	CODE:
1353	{	1484	{
1354	if (dx > 0)	1485	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1486	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1487	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1488	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1489
1359	if (dy > 0)	1490	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1491	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1492	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1493	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1494
1364	self->ox += dx; self->x += dx;	1495	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1496	self->oy += dy; self->y += dy;
1366		1497
1367	while (self->y < 0)	1498	while (self->y < 0)
…		…
1421	}	1552	}
1422	else if (cmd == 6) // monster width	1553	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1554	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1555	else if (cmd == 0x47)
1425	{	1556	{
1426	if (*data == 8)	1557	if (*data == 4)
1427	; // decode player uuid	1558	; // decode player count
1428		1559
1429	data += *data + 1;	1560	data += *data + 1;
1430	}	1561	}
1431	else if (cmd == 8) // cell flags	1562	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1563	cell->flags = *data++;
…		…
1524		1655
1525	void	1656	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1657	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1658	CODE:
1528	{	1659	{
		1660	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
		1661	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1662	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1663	smooth_key skey;
1529	int x, y, z;	1664	int x, y, z;
1530	int last_name;	1665	int last_name;
		1666
		1667	// thats current max. sorry.
		1668	if (sw > 255) sw = 255;
		1669	if (sh > 255) sh = 255;
		1670
		1671	// clear key, in case of extra padding
		1672	memset (&skey, 0, sizeof (skey));
1531		1673
1532	glColor4ub (255, 255, 255, 255);	1674	glColor4ub (255, 255, 255, 255);
1533		1675
1534	glEnable (GL_BLEND);	1676	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1677	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1683	last_name = 0;
1542		1684
1543	mx += self->x;	1685	mx += self->x;
1544	my += self->y;	1686	my += self->y;
1545		1687
		1688	// first pass: determine smooth_max
		1689	// rather ugly, if you ask me
		1690	// could also be stored inside mapcell and updated on change
		1691	memset (smooth_max, 0, sizeof (smooth_max));
		1692
		1693	for (y = 0; y < sh; y++)
		1694	if (0 <= y + my && y + my < self->rows)
		1695	{
		1696	maprow *row = self->row + (y + my);
		1697
		1698	for (x = 0; x < sw; x++)
		1699	if (row->c0 <= x + mx && x + mx < row->c1)
		1700	{
		1701	mapcell *cell = row->col + (x + mx - row->c0);
		1702
		1703	smooth_max[x + 1][y + 1] =
		1704	MAX (self->tex [cell->tile [0]].smoothlevel,
		1705	MAX (self->tex [cell->tile [1]].smoothlevel,
		1706	self->tex [cell->tile [2]].smoothlevel));
		1707	}
		1708	}
		1709
1546	for (z = 0; z < 3; z++)	1710	for (z = 0; z <= 2; z++)
		1711	{
		1712	memset (smooth_level, 0, sizeof (smooth_level));
		1713
1547	for (y = 0; y < sh; y++)	1714	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1715	if (0 <= y + my && y + my < self->rows)
1549	{	1716	{
1550	maprow *row = self->row + (y + my);	1717	maprow *row = self->row + (y + my);
1551		1718
1552	for (x = 0; x < sw; x++)	1719	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1720	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1721	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1722	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1723	tileid tile = cell->tile [z];
		1724
		1725	if (tile)
		1726	{
		1727	maptex tex = self->tex [tile];
		1728	int px = (x + 1) * T - tex.w;
		1729	int py = (y + 1) * T - tex.h;
		1730
		1731	// suppressing texture state switches here
		1732	// is only moderately effective, but worth the extra effort
		1733	if (last_name != tex.name)
		1734	{
		1735	if (!tex.name)
		1736	tex = self->tex [2]; /* missing, replace by noface */
		1737
		1738	glEnd ();
		1739	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1740	glBegin (GL_QUADS);
		1741	}
		1742
		1743	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1744	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1745	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1746	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1747
		1748	if (cell->flags && z == 2)
		1749	{
		1750	if (cell->flags & 1)
		1751	{
		1752	maptex tex = self->tex [1];
		1753	int px = x * T + T * 2 / 32;
		1754	int py = y * T - T * 6 / 32;
		1755
		1756	glEnd ();
		1757	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1758	glBegin (GL_QUADS);
		1759
		1760	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1761	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1762	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1763	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1764	}
		1765	}
		1766
		1767	// update smooth hash
		1768	if (tex.smoothtile)
		1769	{
		1770	skey.tile = tex.smoothtile;
		1771	skey.level = tex.smoothlevel;
		1772
		1773	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1774
		1775	// add bits to current tile and all neighbours. skey.x\|y is
		1776	// shifted +1\|+1 so we always stay positive.
		1777
		1778	// bits is ___n cccc CCCC bbbb
		1779	// n do not draw borders&corners
		1780	// c draw these corners, but...
		1781	// C ... not these
		1782	// b draw these borders
		1783
		1784	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1785	// ┃· ·· ·┃ ━━
		1786
		1787	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1788	// ·· ·· ·┏ ┓·
		1789
		1790	// full tile
		1791	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1792
		1793	// borders
		1794	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1795	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1796	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1797	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1798
		1799	// corners
		1800	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1801	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1802	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1803	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1804	}
		1805	}
1557		1806	}
		1807	}
		1808
		1809	// go through all smoothlevels, lowest to highest, then draw.
		1810	// this is basically counting sort
		1811	{
		1812	int w, b;
		1813
		1814	for (w = 0; w < 256 / 32; ++w)
		1815	{
		1816	uint32_t smask = smooth_level [w];
1558	if (tile)	1817	if (smask)
		1818	for (b = 0; b < 32; ++b)
		1819	if (smask & (((uint32_t)1) << b))
1559	{	1820	{
1560	maptex tex = self->tex [tile];	1821	int level = (w << 5) \| b;
1561	int px = (x + 1) * T - tex.w;	1822	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1823
1564	if (last_name != tex.name)	1824	hv_iterinit (smooth);
		1825	while ((he = hv_iternext (smooth)))
1565	{	1826	{
		1827	smooth_key skey = (smooth_key )HeKEY (he);
		1828	IV bits = SvIVX (HeVAL (he));
		1829
1566	if (!tex.name)	1830	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1831	&& skey->level == level
1568		1832	&& 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	{	1833	{
1583	maptex tex = self->tex [1];	1834	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1835	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1836	int py = (((int)skey->y) - 1) * T;
		1837	int border = bits & 15;
		1838	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1839	float dx = tex.s * .0625f; // 16 images/row
		1840	float dy = tex.t * .5f ; // 2 images/column
1586		1841
		1842	// this time naively avoiding texture state changes
		1843	// save gobs of state changes.
		1844	if (last_name != tex.name)
		1845	{
		1846	if (!tex.name)
		1847	continue; // smoothing not yet available
		1848
1587	glEnd ();	1849	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1850	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1851	glBegin (GL_QUADS);
		1852	}
1590		1853
		1854	if (border)
		1855	{
		1856	float ox = border * dx;
		1857
		1858	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1859	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1860	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1861	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1862	}
		1863
		1864	if (corner)
		1865	{
		1866	float ox = corner * dx;
		1867
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1868	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1869	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1870	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1871	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1872	}
1595	}	1873	}
1596	}	1874	}
1597	}	1875	}
1598	}
1599	}	1876	}
		1877	}
		1878
		1879	hv_clear (smooth);
		1880	}
1600		1881
1601	glEnd ();	1882	glEnd ();
1602		1883
1603	glDisable (GL_TEXTURE_2D);	1884	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1885	glDisable (GL_BLEND);
…		…
1694	glDisable (GL_BLEND);	1975	glDisable (GL_BLEND);
1695	glDisable (GL_TEXTURE_2D);	1976	glDisable (GL_TEXTURE_2D);
1696	}	1977	}
1697		1978
1698	void	1979	void
1699	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	1980	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh, int smoothing, const char *matrix)
1700	PPCODE:	1981	PPCODE:
1701	{	1982	{
1702	int x, y;	1983	int x, y;
1703	int sw4 = (sw + 3) & ~3;	1984	int sw4 = (sw + 3) & ~3;
1704	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1985	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
…		…
1724	darkness[y * sw4 + x] = cell->darkness	2005	darkness[y * sw4 + x] = cell->darkness
1725	? 255 - (cell->darkness - 1)	2006	? 255 - (cell->darkness - 1)
1726	: 255 - FOW_DARKNESS;	2007	: 255 - FOW_DARKNESS;
1727	}	2008	}
1728	}	2009	}
		2010
		2011	if (smoothing)
		2012	{
		2013	SV darkness2_sv = sv_2mortal (newSV (sw4 sh));
		2014	uint8_t darkness2 = (uint8_t )SvPVX (darkness2_sv);
		2015
		2016	SvPOK_only (darkness2_sv);
		2017	SvCUR_set (darkness2_sv, sw4 * sh);
		2018
		2019	for (y = 0; y < sh; ++y)
		2020	for (x = 0; x < sw4; ++x)
		2021	{
		2022	float f = (float )matrix;
		2023	int dx, dy;
		2024	float sum = 0.f;
		2025
		2026	for (dy = -1; dy <= 1; ++dy)
		2027	for (dx = -1; dx <= 1; ++dx)
		2028	{
		2029	unsigned int x2 = x + dx;
		2030	unsigned int y2 = y + dy;
		2031
		2032	sum += (x2 < sw && y2 < sh ? darkness [y2 * sw4 + x2] : 255) * *f++;
		2033	}
		2034
		2035	darkness2 [y * sw4 + x] = sum > 255. ? 255. : sum;
		2036	}
		2037
		2038	darkness_sv = darkness2_sv;
		2039	}
1729		2040
1730	EXTEND (SP, 3);	2041	EXTEND (SP, 3);
1731	PUSHs (sv_2mortal (newSViv (sw4)));	2042	PUSHs (sv_2mortal (newSViv (sw4)));
1732	PUSHs (sv_2mortal (newSViv (sh)));	2043	PUSHs (sv_2mortal (newSViv (sh)));
1733	PUSHs (darkness_sv);	2044	PUSHs (darkness_sv);
…		…
1856		2167
1857	for (z = 0; z <= 2; z++)	2168	for (z = 0; z <= 2; z++)
1858	{	2169	{
1859	tileid t = tile [z];	2170	tileid t = tile [z];
1860		2171
1861	if (t >= self->texs \|\| !self->tex [t].name)	2172	if (t >= self->texs \|\| (t && !self->tex [t].name))
1862	{	2173	{
1863	XPUSHs (sv_2mortal (newSViv (t)));	2174	XPUSHs (sv_2mortal (newSViv (t)));
1864	need_texid (self, t);	2175	need_texid (self, t);
1865	}	2176	}
1866		2177
…		…
1907	CODE:	2218	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2219	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2220	OUTPUT:
1910	RETVAL	2221	RETVAL
1911		2222
		2223	int
		2224	fade_out (int ms)
		2225	CODE:
		2226	RETVAL = Mix_FadeOutMusic (ms);
		2227	OUTPUT:
		2228	RETVAL
		2229
1912	CFPlus::MixMusic	2230	CFPlus::MixMusic
1913	new_from_file (SV class, char path)	2231	new_from_file (SV class, char path)
1914	CODE:	2232	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2233	RETVAL = Mix_LoadMUS (path);
1916	OUTPUT:	2234	OUTPUT:
…		…
1923		2241
1924	int	2242	int
1925	play (CFPlus::MixMusic self, int loops = -1)	2243	play (CFPlus::MixMusic self, int loops = -1)
1926	CODE:	2244	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2245	RETVAL = Mix_PlayMusic (self, loops);
		2246	OUTPUT:
		2247	RETVAL
		2248
		2249	int
		2250	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2251	CODE:
		2252	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
1928	OUTPUT:	2253	OUTPUT:
1929	RETVAL	2254	RETVAL
1930		2255
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2256	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1932		2257
…		…
1936	static const struct {	2261	static const struct {
1937	const char *name;	2262	const char *name;
1938	IV iv;	2263	IV iv;
1939	} *civ, const_iv[] = {	2264	} *civ, const_iv[] = {
1940	# define const_iv(name) { # name, (IV)name }	2265	# define const_iv(name) { # name, (IV)name }
		2266	const_iv (GL_VENDOR),
		2267	const_iv (GL_VERSION),
		2268	const_iv (GL_EXTENSIONS),
1941	const_iv (GL_COLOR_MATERIAL),	2269	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2270	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2271	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2272	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2273	const_iv (GL_BLEND),
…		…
1972	const_iv (GL_LUMINANCE),	2300	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2301	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2302	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2303	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2304	const_iv (GL_COMPILE),
		2305	const_iv (GL_PROXY_TEXTURE_1D),
		2306	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2307	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2308	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2309	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2310	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2311	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2021	# undef const_iv	2351	# undef const_iv
2022	};	2352	};
2023		2353
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2354	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2355	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2356
		2357	texture_av = newAV ();
		2358	AvREAL_off (texture_av);
2026	}	2359	}
2027		2360
2028	char *	2361	char *
2029	gl_vendor ()	2362	gl_vendor ()
2030	CODE:	2363	CODE:
…		…
2041		2374
2042	char *	2375	char *
2043	gl_extensions ()	2376	gl_extensions ()
2044	CODE:	2377	CODE:
2045	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2378	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2379	OUTPUT:
		2380	RETVAL
		2381
		2382	const char *glGetString (GLenum pname)
		2383
		2384	GLint glGetInteger (GLenum pname)
		2385	CODE:
		2386	glGetIntegerv (pname, &RETVAL);
		2387	OUTPUT:
		2388	RETVAL
		2389
		2390	GLdouble glGetDouble (GLenum pname)
		2391	CODE:
		2392	glGetDoublev (pname, &RETVAL);
2046	OUTPUT:	2393	OUTPUT:
2047	RETVAL	2394	RETVAL
2048		2395
2049	int glGetError ()	2396	int glGetError ()
2050		2397
…		…
2175		2522
2176	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2523	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2177		2524
2178	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2525	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179		2526
		2527	void glPixelZoom (float x, float y)
		2528
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2529	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2530
2182	int glGenTexture ()	2531	int glGenTexture ()
2183	CODE:	2532	CODE:
2184	{	2533	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2534	OUTPUT:
2190	RETVAL	2535	RETVAL
2191		2536
2192	void glDeleteTexture (int name)	2537	void glDeleteTexture (int name)
2193	CODE:	2538	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2539	del_texture (name);
2197	}	2540
2198
2199	int glGenList ()	2541	int glGenList ()
2200	CODE:	2542	CODE:
2201	RETVAL = glGenLists (1);	2543	RETVAL = glGenLists (1);
2202	OUTPUT:	2544	OUTPUT:
2203	RETVAL	2545	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.202 by root, Tue Jul 17 18:34:24 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.202 by root, Tue Jul 17 18:34:24 2007 UTC