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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
2	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
4	# include <malloc.h>	4	# include <malloc.h>
5	# include <windows.h>	5	# include <windows.h>
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
8	#endif	14	#endif
9		15
10	#include "EXTERN.h"	16	#include "EXTERN.h"
11	#include "perl.h"	17	#include "perl.h"
12	#include "XSUB.h"	18	#include "XSUB.h"
13		19
14	#ifdef _WIN32	20	#ifdef _WIN32
15	# undef pipe	21	# undef pipe
16	#endif	22	#endif
17		23
		24	#include <assert.h>
18	#include <math.h>	25	#include <math.h>
19	#include <string.h>	26	#include <string.h>
20	#include <stdio.h>	27	#include <stdio.h>
21	#include <stdlib.h>	28	#include <stdlib.h>
22		29
37	# include <sys/types.h>	44	# include <sys/types.h>
38	# include <sys/socket.h>	45	# include <sys/socket.h>
39	# include <netinet/in.h>	46	# include <netinet/in.h>
40	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
41	# include <inttypes.h>	48	# include <inttypes.h>
42	#else
43	typedef unsigned char uint8_t;
44	typedef unsigned short uint16_t;
45	typedef unsigned int uint32_t;
46	typedef signed char int8_t;
47	typedef signed short int16_t;
48	typedef signed int int32_t;
49	#endif	49	#endif
50		50
51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
52		52
53	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
54		54
55	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
56	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
61	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
62	#else	62	#else
63	# define PARACHUTE 0	63	# define PARACHUTE 0
64	#endif	64	#endif
65		65
		66	static AV *texture_av;
		67
66	static struct	68	static struct
67	{	69	{
68	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
69	#include "glfunc.h"	71	#include "glfunc.h"
70	#undef GL_FUNC	72	#undef GL_FUNC
71	} gl;	73	} gl;
72		74
		75	static void
73	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
74	{	77	{
75	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
76	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
77	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
79	else	82	else
80	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
81	}	84	}
82		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
83	#include "texcache.c"	110	#include "texcache.c"
84		111
85	#include "pango-font.c"	112	#include "pango-font.c"
86	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
87	#include "pango-render.c"	114	#include "pango-render.c"
…		…
160		187
161	*w = rect.width;	188	*w = rect.width;
162	*h = rect.height;	189	*h = rect.height;
163	}	190	}
164		191
		192	typedef uint16_t tileid;
165	typedef uint16_t mapface;	193	typedef uint16_t faceid;
166		194
167	typedef struct {	195	typedef struct {
168	GLint name;	196	int name;
169	int w, h;	197	int w, h;
170	float s, t;	198	float s, t;
171	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
172	} maptex;	202	} maptex;
173		203
174	typedef struct {	204	typedef struct {
175	uint32_t player;	205	uint32_t player;
176	mapface face[3];	206	tileid tile[3];
177	uint16_t darkness;	207	uint16_t darkness;
178	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
179	} mapcell;	209	} mapcell;
180		210
181	typedef struct {	211	typedef struct {
182	int32_t c0, c1;	212	int32_t c0, c1;
183	mapcell *col;	213	mapcell *col;
184	} maprow;	214	} maprow;
185		215
186	typedef struct map {	216	typedef struct map {
187	int x, y, w, h;	217	int x, y, w, h;
188	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
189	int faces;	219	int faces; tileid *face2tile; // [faceid]
190	mapface *face;	220	int texs; maptex *tex; // [tileid]
191
192	int texs;
193	maptex *tex;
194		221
195	int32_t rows;	222	int32_t rows;
196	maprow *row;	223	maprow *row;
197	} *CFPlus__Map;	224	} *CFPlus__Map;
198		225
…		…
218	return ptr;	245	return ptr;
219	}	246	}
220		247
221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	248	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	249	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		250
		251	static void
		252	need_facenum (struct map *self, faceid face)
		253	{
		254	while (self->faces <= face)
		255	{
		256	Append (tileid, self->face2tile, self->faces, self->faces);
		257	self->faces *= 2;
		258	}
		259	}
		260
		261	static void
		262	need_texid (struct map *self, int texid)
		263	{
		264	while (self->texs <= texid)
		265	{
		266	Append (maptex, self->tex, self->texs, self->texs);
		267	self->texs *= 2;
		268	}
		269	}
223		270
224	static maprow *	271	static maprow *
225	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
226	{	273	{
227	if (0 > y)	274	if (0 > y)
…		…
322	cell->player = 0;	369	cell->player = 0;
323	}	370	}
324	}	371	}
325	}	372	}
326		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);
		388	}
		389
327	static void	390	static void
328	music_finished (void)	391	music_finished (void)
329	{	392	{
330	SDL_UserEvent ev;	393	SDL_UserEvent ev;
331		394
…		…
364	n \|= n >> 8;	427	n \|= n >> 8;
365	n \|= n >> 16;	428	n \|= n >> 16;
366		429
367	return n + 1;	430	return n + 1;
368	}	431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
369		436
370	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
371		438
372	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
373		440
…		…
377	static const struct {	444	static const struct {
378	const char *name;	445	const char *name;
379	IV iv;	446	IV iv;
380	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
381	# define const_iv(name) { # name, (IV)name }	448	# define const_iv(name) { # name, (IV)name }
		449	const_iv (SDLK_MODIFIER_MIN),
		450	const_iv (SDLK_MODIFIER_MAX),
		451
382	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
383	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
384	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
385	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
386	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
395	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
396	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
397	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
398	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
399	const_iv (SDL_USEREVENT),	469	const_iv (SDL_USEREVENT),
		470
		471	const_iv (SDL_APPINPUTFOCUS),
		472	const_iv (SDL_APPMOUSEFOCUS),
		473	const_iv (SDL_APPACTIVE),
		474
400	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
401	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
402	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
403	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
404	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
459	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
460	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
461	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
462	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
463	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
464	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
465	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
466	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
467	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
468	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
469	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
470	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
471	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
472	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
473	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
474	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
475	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
476	const_iv (KMOD_CTRL),
477	const_iv (KMOD_SHIFT),
478	const_iv (KMOD_ALT),
479	const_iv (KMOD_META)
480	# undef const_iv	556	# undef const_iv
481	};	557	};
482		558
483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	559	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	560	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		561
		562	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		563	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
485	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
486		571
487	int	572	int
488	in_destruct ()	573	in_destruct ()
489	CODE:	574	CODE:
490	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
561	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
562	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
563	);	648	);
564	if (RETVAL)	649	if (RETVAL)
565	{	650	{
		651	av_clear (texture_av);
		652
566	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
567	# 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);
568	# include "glfunc.h"	655	# include "glfunc.h"
569	# undef GL_FUNC	656	# undef GL_FUNC
		657
570	}	658	}
571	OUTPUT:	659	OUTPUT:
572	RETVAL	660	RETVAL
573		661
574	void	662	void
575	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
576		664
577	char *	665	char *
578	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
579		667
		668	int
		669	SDL_GetAppState ()
		670
580	void	671	void
581	SDL_PollEvent ()	672	poll_events ()
582	PPCODE:	673	PPCODE:
583	{	674	{
584	SDL_Event ev;	675	SDL_Event ev;
585		676
586	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
587	{	679	{
588	HV *hv = newHV ();	680	HV *hv = newHV ();
589	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
590		682
591	switch (ev.type)	683	switch (ev.type)
…		…
593	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
594	case SDL_KEYUP:	686	case SDL_KEYUP:
595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
596	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
597	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	689	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		690	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
598	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
599	break;	692	break;
600		693
601	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
604	break;	697	break;
605		698
606	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
607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
608
609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
614	break;	725	break;
615		726
616	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
617	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
647	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
648		759
649	void	760	void
650	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
651	CODE:	762	CODE:
652	#ifndef _WIN32
653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
654	#endif
655		764
656	void	765	void
657	win32_proxy_info ()	766	win32_proxy_info ()
658	PPCODE:	767	PPCODE:
659	{	768	{
…		…
794	_exit (1);	903	_exit (1);
795		904
796	void	905	void
797	_exit (int retval = 0)	906	_exit (int retval = 0)
798	CODE:	907	CODE:
		908	#ifdef WIN32
		909	ExitThread (retval); // unclean, please beam me up
		910	#else
799	_exit (retval);	911	_exit (retval);
		912	#endif
		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
800		922
801	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
802		924
803	CFPlus::Font	925	CFPlus::Font
804	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
…		…
1051	xy_to_index (CFPlus::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
1052	CODE:	1174	CODE:
1053	{	1175	{
1054	int index, trailing;	1176	int index, trailing;
1055	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1177	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1056	RETVAL = index;	1178	RETVAL = index + trailing;
1057	}	1179	}
1058	OUTPUT:	1180	OUTPUT:
1059	RETVAL	1181	RETVAL
1060		1182
1061	void	1183	void
…		…
1067		1189
1068	EXTEND (SP, 3);	1190	EXTEND (SP, 3);
1069	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1191	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1070	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1071	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1193	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1194	}
		1195
		1196	void
		1197	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1198	PPCODE:
		1199	{
		1200	int line, x;
		1201
		1202	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1203	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1204
		1205	EXTEND (SP, 2);
		1206	PUSHs (sv_2mortal (newSViv (line - 1)));
		1207	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1208	}
		1209
		1210	void
		1211	line_x_to_index (CFPlus::Layout self, int line, int x)
		1212	PPCODE:
		1213	{
		1214	PangoLayoutLine *lp;
		1215	int index, trailing;
		1216
		1217	if (line < 0)
		1218	XSRETURN_EMPTY;
		1219
		1220	if (!(lp = pango_layout_get_line (self->pl, line)))
		1221	XSRETURN_EMPTY; /* do better */
		1222
		1223	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1224
		1225	EXTEND (SP, 2);
		1226	if (GIMME_V == G_SCALAR)
		1227	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1228	else
		1229	{
		1230	PUSHs (sv_2mortal (newSViv (index)));
		1231	PUSHs (sv_2mortal (newSViv (trailing)));
		1232	}
1072	}	1233	}
1073		1234
1074	void	1235	void
1075	render (CFPlus::Layout self, float x, float y, int flags = 0)	1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
1076	PPCODE:	1237	PPCODE:
…		…
1081	flags	1242	flags
1082	);	1243	);
1083		1244
1084	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1085		1246
		1247	int minpot (int n)
		1248
1086	void	1249	void
1087	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1088	CODE:	1251	CODE:
1089	{	1252	{
1090	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1167	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1168	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1169	}	1332	}
1170	}	1333	}
1171		1334
		1335	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1336	CODE:
		1337	{
		1338	GLint width;
		1339	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1340	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1341	RETVAL = width > 0;
		1342	}
		1343	OUTPUT:
		1344	RETVAL
		1345
1172	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1173		1347
1174	CFPlus::Map	1348	CFPlus::Map
1175	new (SV *class, int map_width, int map_height)	1349	new (SV *class)
1176	CODE:	1350	CODE:
1177	New (0, RETVAL, 1, struct map);	1351	New (0, RETVAL, 1, struct map);
1178	RETVAL->x = 0;	1352	RETVAL->x = 0;
1179	RETVAL->y = 0;	1353	RETVAL->y = 0;
1180	RETVAL->w = map_width;	1354	RETVAL->w = 0;
1181	RETVAL->h = map_height;	1355	RETVAL->h = 0;
1182	RETVAL->ox = 0;	1356	RETVAL->ox = 0;
1183	RETVAL->oy = 0;	1357	RETVAL->oy = 0;
1184	RETVAL->faces = 8192;	1358	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1185	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1359	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1186	RETVAL->texs = 8192;
1187	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1188	RETVAL->rows = 0;	1360	RETVAL->rows = 0;
1189	RETVAL->row = 0;	1361	RETVAL->row = 0;
1190	OUTPUT:	1362	OUTPUT:
1191	RETVAL	1363	RETVAL
1192		1364
1193	void	1365	void
1194	DESTROY (CFPlus::Map self)	1366	DESTROY (CFPlus::Map self)
1195	CODE:	1367	CODE:
1196	{	1368	{
1197	map_clear (self);	1369	map_clear (self);
1198	Safefree (self->face);	1370	Safefree (self->face2tile);
1199	Safefree (self->tex);	1371	Safefree (self->tex);
1200	Safefree (self);	1372	Safefree (self);
1201	}	1373	}
1202		1374
1203	void	1375	void
		1376	resize (CFPlus::Map self, int map_width, int map_height)
		1377	CODE:
		1378	self->w = map_width;
		1379	self->h = map_height;
		1380
		1381	void
1204	clear (CFPlus::Map self)	1382	clear (CFPlus::Map self)
1205	CODE:	1383	CODE:
1206	map_clear (self);	1384	map_clear (self);
1207		1385
1208	void	1386	void
1209	set_face (CFPlus::Map self, int face, int texid)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1210	CODE:	1388	CODE:
1211	{	1389	{
1212	while (self->faces <= face)	1390	need_facenum (self, face); self->face2tile [face] = tile;
1213	{	1391	need_texid (self, tile);
1214	Append (mapface, self->face, self->faces, self->faces);	1392	}
1215	self->faces *= 2;
1216	}
1217		1393
1218	self->face [face] = texid;	1394	void
		1395	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1396	CODE:
		1397	{
		1398	tileid texid;
		1399	maptex *tex;
		1400
		1401	if (face < 0 \|\| face >= self->faces)
		1402	return;
		1403
		1404	if (smooth < 0 \|\| smooth >= self->faces)
		1405	return;
		1406
		1407	texid = self->face2tile [face];
		1408
		1409	if (!texid)
		1410	return;
		1411
		1412	tex = self->tex + texid;
		1413	tex->smoothtile = self->face2tile [smooth];
		1414	tex->smoothlevel = level;
1219	}	1415	}
1220		1416
1221	void	1417	void
1222	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)
1223	CODE:	1419	CODE:
1224	{	1420	{
1225	while (self->texs <= texid)	1421	need_texid (self, texid);
1226	{
1227	Append (maptex, self->tex, self->texs, self->texs);
1228	self->texs *= 2;
1229	}
1230		1422
1231	{	1423	{
1232	maptex *tex = self->tex + texid;	1424	maptex *tex = self->tex + texid;
1233		1425
1234	tex->name = name;	1426	tex->name = name;
…		…
1278	CODE:	1470	CODE:
1279	{	1471	{
1280	if (dx > 0)	1472	if (dx > 0)
1281	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1282	else if (dx < 0)	1474	else if (dx < 0)
1283	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);
1284		1476
1285	if (dy > 0)	1477	if (dy > 0)
1286	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1287	else if (dy < 0)	1479	else if (dy < 0)
1288	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);
1289		1481
1290	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1291	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1292		1484
1293	while (self->y < 0)	1485	while (self->y < 0)
…		…
1345	cell->stat_width = 1;	1537	cell->stat_width = 1;
1346	cell->stat_hp = *data++;	1538	cell->stat_hp = *data++;
1347	}	1539	}
1348	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1349	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1350	else if (cmd == 0x47) // monster width	1542	else if (cmd == 0x47)
1351	{	1543	{
1352	if (*data == 4)	1544	if (*data == 4)
1353	; // decode player tag	1545	; // decode player count
1354		1546
1355	data += *data + 1;	1547	data += *data + 1;
1356	}	1548	}
1357	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1358	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1367	cell->darkness = *data++ + 1;	1559	cell->darkness = *data++ + 1;
1368	}	1560	}
1369		1561
1370	if (flags & 4)	1562	if (flags & 4)
1371	{	1563	{
1372	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1564	faceid face = (data [0] << 8) + data [1]; data += 2;
		1565	need_facenum (self, face);
		1566	cell->tile [0] = self->face2tile [face];
1373	}	1567	}
1374		1568
1375	if (flags & 2)	1569	if (flags & 2)
1376	{	1570	{
1377	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1571	faceid face = (data [0] << 8) + data [1]; data += 2;
		1572	need_facenum (self, face);
		1573	cell->tile [1] = self->face2tile [face];
1378	}	1574	}
1379		1575
1380	if (flags & 1)	1576	if (flags & 1)
1381	{	1577	{
1382	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1578	faceid face = (data [0] << 8) + data [1]; data += 2;
		1579	need_facenum (self, face);
		1580	cell->tile [2] = self->face2tile [face];
1383	}	1581	}
1384	}	1582	}
1385	else	1583	else
1386	cell->darkness = 0;	1584	cell->darkness = 0;
1387	}	1585	}
…		…
1417	{	1615	{
1418	mapcell *cell = row->col + (x - row->c0);	1616	mapcell *cell = row->col + (x - row->c0);
1419		1617
1420	for (z = 0; z <= 0; z++)	1618	for (z = 0; z <= 0; z++)
1421	{	1619	{
1422	mapface face = cell->face [z];
1423
1424	if (face)
1425	{
1426	maptex tex = self->tex [face];	1620	maptex tex = self->tex [cell->tile [z]];
1427	int a0 = 255 - tex.a;	1621	int a0 = 255 - tex.a;
1428	int a1 = tex.a;	1622	int a1 = tex.a;
1429		1623
1430	r = (r * a0 + tex.r * a1) / 255;	1624	r = (r * a0 + tex.r * a1) / 255;
1431	g = (g * a0 + tex.g * a1) / 255;	1625	g = (g * a0 + tex.g * a1) / 255;
1432	b = (b * a0 + tex.b * a1) / 255;	1626	b = (b * a0 + tex.b * a1) / 255;
1433	a = (a * a0 + tex.a * a1) / 255;	1627	a = (a * a0 + tex.a * a1) / 255;
1434	}
1435	}	1628	}
1436	}	1629	}
1437		1630
1438	*map++ = (r )	1631	*map++ = (r )
1439	\| (g << 8)	1632	\| (g << 8)
…		…
1446	}	1639	}
1447	OUTPUT:	1640	OUTPUT:
1448	RETVAL	1641	RETVAL
1449		1642
1450	void	1643	void
1451	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1644	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1452	CODE:	1645	CODE:
1453	{	1646	{
1454	int vx, vy;	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;
1455	int x, y, z;	1651	int x, y, z;
1456	int last_name;	1652	int last_name;
1457	mapface face;
1458		1653
1459	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1654	// thats current max. sorry.
1460	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1655	if (sw > 255) sw = 255;
		1656	if (sh > 255) sh = 255;
1461		1657
1462	/*	1658	// clear key, in case of extra padding
1463	int vx = self->vx = self->w >= sw	1659	memset (&skey, 0, sizeof (skey));
1464	? self->x + (self->w - sw) / 2
1465	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1466
1467	int vy = self->vy = self->h >= sh
1468	? self->y + (self->h - sh) / 2
1469	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1470	*/
1471		1660
1472	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1473		1662
1474	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1478		1667
1479	glBegin (GL_QUADS);	1668	glBegin (GL_QUADS);
1480		1669
1481	last_name = 0;	1670	last_name = 0;
1482		1671
		1672	mx += self->x;
		1673	my += self->y;
		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
1483	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1484	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1485	if (0 <= y + vy && y + vy < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1486	{	1703	{
1487	maprow *row = self->row + (y + vy);	1704	maprow *row = self->row + (y + my);
1488		1705
1489	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1490	if (row->c0 <= x + vx && x + vx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1491	{	1708	{
1492	mapcell *cell = row->col + (x + vx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1493
1494	face = cell->face [z];	1710	tileid tile = cell->tile [z];
		1711
		1712	if (tile)
		1713	{
		1714	maptex tex = self->tex [tile];
		1715	int px = (x + 1) * T - tex.w;
		1716	int py = (y + 1) * T - tex.h;
1495		1717
1496	if (face && face < self->texs)	1718	// suppressing texture state switches here
		1719	// is only moderately effective, but worth the extra effort
		1720	if (last_name != tex.name)
		1721	{
		1722	if (!tex.name)
		1723	tex = self->tex [2]; /* missing, replace by noface */
		1724
		1725	glEnd ();
		1726	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1727	glBegin (GL_QUADS);
		1728	}
		1729
		1730	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1731	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1732	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1733	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1734
		1735	if (cell->flags && z == 2)
		1736	{
		1737	if (cell->flags & 1)
		1738	{
		1739	maptex tex = self->tex [1];
		1740	int px = x * T + T * 2 / 32;
		1741	int py = y * T - T * 6 / 32;
		1742
		1743	glEnd ();
		1744	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1745	glBegin (GL_QUADS);
		1746
		1747	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1748	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1749	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1750	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1751	}
		1752	}
		1753
		1754	// update smooth hash
		1755	if (tex.smoothtile)
		1756	{
		1757	skey.tile = tex.smoothtile;
		1758	skey.level = tex.smoothlevel;
		1759
		1760	smooth_level [tex.smoothlevel >> 5] \|= ((uint32_t)1) << (tex.smoothlevel & 31);
		1761
		1762	// add bits to current tile and all neighbours. skey.x\|y is
		1763	// shifted +1\|+1 so we always stay positive.
		1764
		1765	// bits is ___n cccc CCCC bbbb
		1766	// n do not draw borders&corners
		1767	// c draw these corners, but...
		1768	// C ... not these
		1769	// b draw these borders
		1770
		1771	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1772	// ┃· ·· ·┃ ━━
		1773
		1774	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1775	// ·· ·· ·┏ ┓·
		1776
		1777	// full tile
		1778	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1779
		1780	// borders
		1781	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1782	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1783	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1784	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1785
		1786	// corners
		1787	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1788	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1789	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1790	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1791	}
		1792	}
		1793	}
		1794	}
		1795
		1796	// go through all smoothlevels, lowest to highest, then draw.
		1797	// this is basically counting sort
		1798	{
		1799	int w, b;
		1800
		1801	for (w = 0; w < 256 / 32; ++w)
		1802	{
		1803	uint32_t smask = smooth_level [w];
		1804	if (smask)
		1805	for (b = 0; b < 32; ++b)
		1806	if (smask & (((uint32_t)1) << b))
1497	{	1807	{
1498	maptex tex = self->tex [face];	1808	int level = (w << 5) \| b;
1499	int px = (x + 1) * 32 - tex.w;	1809	HE *he;
1500	int py = (y + 1) * 32 - tex.h;
1501		1810
1502	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1503	{	1813	{
		1814	smooth_key skey = (smooth_key )HeKEY (he);
		1815	IV bits = SvIVX (HeVAL (he));
		1816
		1817	if (!(bits & 0x1000)
		1818	&& skey->level == level
		1819	&& level > smooth_max [skey->x][skey->y])
		1820	{
		1821	maptex tex = self->tex [skey->tile];
		1822	int px = (((int)skey->x) - 1) * T;
		1823	int py = (((int)skey->y) - 1) * T;
		1824	int border = bits & 15;
		1825	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1826	float dx = tex.s * .0625f; // 16 images/row
		1827	float dy = tex.t * .5f ; // 2 images/column
		1828
		1829	// this time naively avoiding texture state changes
		1830	// save gobs of state changes.
		1831	if (last_name != tex.name)
		1832	{
		1833	if (!tex.name)
		1834	continue; // smoothing not yet available
		1835
1504	glEnd ();	1836	glEnd ();
1505	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1506	glBegin (GL_QUADS);	1838	glBegin (GL_QUADS);
		1839	}
		1840
		1841	if (border)
		1842	{
		1843	float ox = border * dx;
		1844
		1845	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1846	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1847	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1848	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1849	}
		1850
		1851	if (corner)
		1852	{
		1853	float ox = corner * dx;
		1854
		1855	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1856	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1857	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1858	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1859	}
1507	}	1860	}
1508
1509	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1510	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1511	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1512	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1513	}
1514
1515	if (cell->flags && z == 2)
1516	{
1517	if (cell->flags & 1)
1518	{
1519	maptex tex = self->tex [1];
1520	int px = (x + 1) * 32 - tex.w + 2;
1521	int py = (y + 1) * 32 - tex.h - 6;
1522
1523	glEnd ();
1524	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1525	glBegin (GL_QUADS);
1526
1527	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1528	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1529	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1530	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1531	}	1861	}
1532	}	1862	}
1533	}
1534	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1535		1868
1536	glEnd ();	1869	glEnd ();
1537		1870
1538	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1539	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
1540		1873
1541	// top layer: overlays such as the health bar	1874	// top layer: overlays such as the health bar
1542	for (y = 0; y < sh; y++)	1875	for (y = 0; y < sh; y++)
1543	if (0 <= y + vy && y + vy < self->rows)	1876	if (0 <= y + my && y + my < self->rows)
1544	{	1877	{
1545	maprow *row = self->row + (y + vy);	1878	maprow *row = self->row + (y + my);
1546		1879
1547	for (x = 0; x < sw; x++)	1880	for (x = 0; x < sw; x++)
1548	if (row->c0 <= x + vx && x + vx < row->c1)	1881	if (row->c0 <= x + mx && x + mx < row->c1)
1549	{	1882	{
1550	mapcell *cell = row->col + (x + vx - row->c0);	1883	mapcell *cell = row->col + (x + mx - row->c0);
1551		1884
1552	int px = x * 32;	1885	int px = x * T;
1553	int py = y * 32;	1886	int py = y * T;
1554		1887
1555	if (cell->stat_hp)	1888	if (cell->stat_hp)
1556	{	1889	{
1557	int width = cell->stat_width * 32;	1890	int width = cell->stat_width * T;
1558	int thick = sh / 28 + 1 + cell->stat_width;	1891	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1559		1892
1560	glColor3ub (0, 0, 0);	1893	glColor3ub (0, 0, 0);
1561	glRectf (px + 1, py - thick - 2,	1894	glRectf (px + 1, py - thick - 2,
1562	px + width - 1, py);	1895	px + width - 1, py);
1563		1896
…		…
1629	glDisable (GL_BLEND);	1962	glDisable (GL_BLEND);
1630	glDisable (GL_TEXTURE_2D);	1963	glDisable (GL_TEXTURE_2D);
1631	}	1964	}
1632		1965
1633	void	1966	void
1634	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1967	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1635	PPCODE:	1968	PPCODE:
1636	{	1969	{
1637	int vx, vy;
1638	int x, y;	1970	int x, y;
1639	int sw4 = (sw + 3) & ~3;	1971	int sw4 = (sw + 3) & ~3;
1640	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1972	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1641	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1973	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1642		1974
1643	memset (darkness, 255, sw4 * sh);	1975	memset (darkness, 255, sw4 * sh);
1644	SvPOK_only (darkness_sv);	1976	SvPOK_only (darkness_sv);
1645	SvCUR_set (darkness_sv, sw4 * sh);	1977	SvCUR_set (darkness_sv, sw4 * sh);
1646		1978
1647	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1979	mx += self->x;
1648	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1980	my += self->y;
1649		1981
1650	for (y = 0; y < sh; y++)	1982	for (y = 0; y < sh; y++)
1651	if (0 <= y + vy && y + vy < self->rows)	1983	if (0 <= y + my && y + my < self->rows)
1652	{	1984	{
1653	maprow *row = self->row + (y + vy);	1985	maprow *row = self->row + (y + my);
1654		1986
1655	for (x = 0; x < sw; x++)	1987	for (x = 0; x < sw; x++)
1656	if (row->c0 <= x + vx && x + vx < row->c1)	1988	if (row->c0 <= x + mx && x + mx < row->c1)
1657	{	1989	{
1658	mapcell *cell = row->col + (x + vx - row->c0);	1990	mapcell *cell = row->col + (x + mx - row->c0);
1659		1991
1660	darkness[y * sw4 + x] = cell->darkness	1992	darkness[y * sw4 + x] = cell->darkness
1661	? 255 - (cell->darkness - 1)	1993	? 255 - (cell->darkness - 1)
1662	: 255 - FOW_DARKNESS;	1994	: 255 - FOW_DARKNESS;
1663	}	1995	}
…		…
1703	if (row && row->c0 <= x && x < row->c1)	2035	if (row && row->c0 <= x && x < row->c1)
1704	{	2036	{
1705	mapcell *cell = row->col + (x - row->c0);	2037	mapcell *cell = row->col + (x - row->c0);
1706	uint8_t flags = 0;	2038	uint8_t flags = 0;
1707		2039
1708	if (cell->face [0]) flags \|= 1;	2040	if (cell->tile [0]) flags \|= 1;
1709	if (cell->face [1]) flags \|= 2;	2041	if (cell->tile [1]) flags \|= 2;
1710	if (cell->face [2]) flags \|= 4;	2042	if (cell->tile [2]) flags \|= 4;
1711		2043
1712	*data++ = flags;	2044	*data++ = flags;
1713		2045
1714	if (flags & 1)	2046	if (flags & 1)
1715	{	2047	{
		2048	tileid tile = cell->tile [0];
1716	*data++ = cell->face [0] >> 8;	2049	*data++ = tile >> 8;
1717	*data++ = cell->face [0];	2050	*data++ = tile;
1718	}	2051	}
1719		2052
1720	if (flags & 2)	2053	if (flags & 2)
1721	{	2054	{
		2055	tileid tile = cell->tile [1];
1722	*data++ = cell->face [1] >> 8;	2056	*data++ = tile >> 8;
1723	*data++ = cell->face [1];	2057	*data++ = tile;
1724	}	2058	}
1725		2059
1726	if (flags & 4)	2060	if (flags & 4)
1727	{	2061	{
		2062	tileid tile = cell->tile [2];
1728	*data++ = cell->face [2] >> 8;	2063	*data++ = tile >> 8;
1729	*data++ = cell->face [2];	2064	*data++ = tile;
1730	}	2065	}
1731	}	2066	}
1732	else	2067	else
1733	*data++ = 0;	2068	*data++ = 0;
1734	}	2069	}
…		…
1774	{	2109	{
1775	uint8_t flags = *data++;	2110	uint8_t flags = *data++;
1776		2111
1777	if (flags)	2112	if (flags)
1778	{	2113	{
1779	mapface face[3] = { 0, 0, 0 };
1780
1781	mapcell *cell = row_get_cell (row, x);	2114	mapcell *cell = row_get_cell (row, x);
		2115	tileid tile[3] = { 0, 0, 0 };
1782		2116
1783	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2117	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1784	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2118	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1785	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2119	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1786		2120
1787	if (cell->darkness == 0)	2121	if (cell->darkness == 0)
1788	{	2122	{
1789	cell->darkness = 0;	2123	cell->darkness = 0;
1790		2124
1791	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1792	{	2126	{
1793	cell->face[z] = face[z];	2127	tileid t = tile [z];
1794		2128
1795	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2130	{
1796	XPUSHs (sv_2mortal (newSViv (face[z])));	2131	XPUSHs (sv_2mortal (newSViv (t)));
		2132	need_texid (self, t);
		2133	}
		2134
		2135	cell->tile [z] = t;
1797	}	2136	}
1798	}	2137	}
1799	}	2138	}
1800	}	2139	}
1801	}	2140	}
…		…
1836	CODE:	2175	CODE:
1837	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1838	OUTPUT:	2177	OUTPUT:
1839	RETVAL	2178	RETVAL
1840		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1841	CFPlus::MixMusic	2187	CFPlus::MixMusic
1842	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1843	CODE:	2189	CODE:
1844	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1845	OUTPUT:	2191	OUTPUT:
…		…
1852		2198
1853	int	2199	int
1854	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1855	CODE:	2201	CODE:
1856	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);
1857	OUTPUT:	2210	OUTPUT:
1858	RETVAL	2211	RETVAL
1859		2212
1860	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1861		2214
…		…
1865	static const struct {	2218	static const struct {
1866	const char *name;	2219	const char *name;
1867	IV iv;	2220	IV iv;
1868	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1869	# 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),
1870	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1871	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1872	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1873	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1874	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1901	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1902	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1903	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1904	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1905	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1906	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1907	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1908	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1909	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1910	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1950	# undef const_iv	2308	# undef const_iv
1951	};	2309	};
1952		2310
1953	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; )
1954	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);
1955	}	2316	}
1956		2317
1957	char *	2318	char *
1958	gl_vendor ()	2319	gl_vendor ()
1959	CODE:	2320	CODE:
…		…
1970		2331
1971	char *	2332	char *
1972	gl_extensions ()	2333	gl_extensions ()
1973	CODE:	2334	CODE:
1974	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);
1975	OUTPUT:	2350	OUTPUT:
1976	RETVAL	2351	RETVAL
1977		2352
1978	int glGetError ()	2353	int glGetError ()
1979		2354
…		…
2104		2479
2105	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)
2106		2481
2107	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)
2108		2483
		2484	void glPixelZoom (float x, float y)
		2485
2109	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)
2110		2487
2111	int glGenTexture ()	2488	int glGenTexture ()
2112	CODE:	2489	CODE:
2113	{	2490	RETVAL = gen_texture ();
2114	GLuint name;
2115	glGenTextures (1, &name);
2116	RETVAL = name;
2117	}
2118	OUTPUT:	2491	OUTPUT:
2119	RETVAL	2492	RETVAL
2120		2493
2121	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2122	CODE:	2495	CODE:
2123	{
2124	GLuint name_ = name;
2125	glDeleteTextures (1, &name_);	2496	del_texture (name);
2126	}	2497
2127
2128	int glGenList ()	2498	int glGenList ()
2129	CODE:	2499	CODE:
2130	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2131	OUTPUT:	2501	OUTPUT:
2132	RETVAL	2502	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC vs. Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC