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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.154 by root, Tue Sep 19 22:23:30 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	# 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>
7	#endif	14	#endif
8		15
9	#include "EXTERN.h"	16	#include "EXTERN.h"
10	#include "perl.h"	17	#include "perl.h"
11	#include "XSUB.h"	18	#include "XSUB.h"
12		19
13	#ifdef _WIN32	20	#ifdef _WIN32
14	# undef pipe	21	# undef pipe
15	#endif	22	#endif
16		23
		24	#include <assert.h>
17	#include <math.h>	25	#include <math.h>
18	#include <string.h>	26	#include <string.h>
19	#include <stdio.h>	27	#include <stdio.h>
20	#include <stdlib.h>	28	#include <stdlib.h>
21		29
36	# include <sys/types.h>	44	# include <sys/types.h>
37	# include <sys/socket.h>	45	# include <sys/socket.h>
38	# include <netinet/in.h>	46	# include <netinet/in.h>
39	# include <netinet/tcp.h>	47	# include <netinet/tcp.h>
40	# include <inttypes.h>	48	# include <inttypes.h>
41	#else
42	typedef unsigned char uint8_t;
43	typedef unsigned short uint16_t;
44	typedef unsigned int uint32_t;
45	typedef signed char int8_t;
46	typedef signed short int16_t;
47	typedef signed int int32_t;
48	#endif	49	#endif
49		50
50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51		52
52	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
53		54
54	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
55	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
…		…
60	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
61	#else	62	#else
62	# define PARACHUTE 0	63	# define PARACHUTE 0
63	#endif	64	#endif
64		65
		66	static AV *texture_av;
		67
65	static struct	68	static struct
66	{	69	{
67	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
68	#include "glfunc.h"	71	#include "glfunc.h"
69	#undef GL_FUNC	72	#undef GL_FUNC
70	} gl;	73	} gl;
71		74
		75	static void
72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
73	{	77	{
74	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
75	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
76	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
78	else	82	else
79	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
80	}	84	}
81		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
82	#include "texcache.c"	110	#include "texcache.c"
83		111
84	#include "pango-font.c"	112	#include "pango-font.c"
85	#include "pango-fontmap.c"	113	#include "pango-fontmap.c"
86	#include "pango-render.c"	114	#include "pango-render.c"
…		…
159		187
160	*w = rect.width;	188	*w = rect.width;
161	*h = rect.height;	189	*h = rect.height;
162	}	190	}
163		191
		192	typedef uint16_t tileid;
164	typedef uint16_t mapface;	193	typedef uint16_t faceid;
165		194
166	typedef struct {	195	typedef struct {
167	GLint name;	196	int name;
168	int w, h;	197	int w, h;
169	float s, t;	198	float s, t;
170	uint8_t r, g, b, a;	199	uint8_t r, g, b, a;
		200	tileid smoothtile;
		201	uint8_t smoothlevel;
171	} maptex;	202	} maptex;
172		203
173	typedef struct {	204	typedef struct {
174	uint32_t player;	205	uint32_t player;
175	mapface face[3];	206	tileid tile[3];
176	uint16_t darkness;	207	uint16_t darkness;
177	uint8_t stat_width, stat_hp, flags;	208	uint8_t stat_width, stat_hp, flags, smoothmax;
178	} mapcell;	209	} mapcell;
179		210
180	typedef struct {	211	typedef struct {
181	int32_t c0, c1;	212	int32_t c0, c1;
182	mapcell *col;	213	mapcell *col;
183	} maprow;	214	} maprow;
184		215
185	typedef struct map {	216	typedef struct map {
186	int x, y, w, h;	217	int x, y, w, h;
187	int ox, oy; /* offset to virtual global coordinate system */	218	int ox, oy; /* offset to virtual global coordinate system */
188	int faces;	219	int faces; tileid *face2tile; // [faceid]
189	mapface *face;	220	int texs; maptex *tex; // [tileid]
190
191	int texs;
192	maptex *tex;
193		221
194	int32_t rows;	222	int32_t rows;
195	maprow *row;	223	maprow *row;
196	} *CFPlus__Map;	224	} *CFPlus__Map;
197		225
…		…
217	return ptr;	245	return ptr;
218	}	246	}
219		247
220	#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))
221	#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	}
222		270
223	static maprow *	271	static maprow *
224	map_get_row (CFPlus__Map self, int y)	272	map_get_row (CFPlus__Map self, int y)
225	{	273	{
226	if (0 > y)	274	if (0 > y)
…		…
321	cell->player = 0;	369	cell->player = 0;
322	}	370	}
323	}	371	}
324	}	372	}
325		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
326	static void	390	static void
327	music_finished (void)	391	music_finished (void)
328	{	392	{
329	SDL_UserEvent ev;	393	SDL_UserEvent ev;
330		394
…		…
363	n \|= n >> 8;	427	n \|= n >> 8;
364	n \|= n >> 16;	428	n \|= n >> 16;
365		429
366	return n + 1;	430	return n + 1;
367	}	431	}
		432
		433	/* SDL should provide this, really. */
		434	#define SDLK_MODIFIER_MIN 300
		435	#define SDLK_MODIFIER_MAX 314
368		436
369	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
370		438
371	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
372		440
…		…
376	static const struct {	444	static const struct {
377	const char *name;	445	const char *name;
378	IV iv;	446	IV iv;
379	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
380	# 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
381	const_iv (SDL_ACTIVEEVENT),	452	const_iv (SDL_ACTIVEEVENT),
382	const_iv (SDL_KEYDOWN),	453	const_iv (SDL_KEYDOWN),
383	const_iv (SDL_KEYUP),	454	const_iv (SDL_KEYUP),
384	const_iv (SDL_MOUSEMOTION),	455	const_iv (SDL_MOUSEMOTION),
385	const_iv (SDL_MOUSEBUTTONDOWN),	456	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
394	const_iv (SDL_EVENT_RESERVEDA),	465	const_iv (SDL_EVENT_RESERVEDA),
395	const_iv (SDL_EVENT_RESERVEDB),	466	const_iv (SDL_EVENT_RESERVEDB),
396	const_iv (SDL_VIDEORESIZE),	467	const_iv (SDL_VIDEORESIZE),
397	const_iv (SDL_VIDEOEXPOSE),	468	const_iv (SDL_VIDEOEXPOSE),
398	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
399	const_iv (SDLK_KP0),	475	const_iv (SDLK_KP0),
400	const_iv (SDLK_KP1),	476	const_iv (SDLK_KP1),
401	const_iv (SDLK_KP2),	477	const_iv (SDLK_KP2),
402	const_iv (SDLK_KP3),	478	const_iv (SDLK_KP3),
403	const_iv (SDLK_KP4),	479	const_iv (SDLK_KP4),
…		…
458	const_iv (SDLK_BREAK),	534	const_iv (SDLK_BREAK),
459	const_iv (SDLK_MENU),	535	const_iv (SDLK_MENU),
460	const_iv (SDLK_POWER),	536	const_iv (SDLK_POWER),
461	const_iv (SDLK_EURO),	537	const_iv (SDLK_EURO),
462	const_iv (SDLK_UNDO),	538	const_iv (SDLK_UNDO),
		539
463	const_iv (KMOD_NONE),	540	const_iv (KMOD_NONE),
		541	const_iv (KMOD_SHIFT),
464	const_iv (KMOD_LSHIFT),	542	const_iv (KMOD_LSHIFT),
465	const_iv (KMOD_RSHIFT),	543	const_iv (KMOD_RSHIFT),
		544	const_iv (KMOD_CTRL),
466	const_iv (KMOD_LCTRL),	545	const_iv (KMOD_LCTRL),
467	const_iv (KMOD_RCTRL),	546	const_iv (KMOD_RCTRL),
		547	const_iv (KMOD_ALT),
468	const_iv (KMOD_LALT),	548	const_iv (KMOD_LALT),
469	const_iv (KMOD_RALT),	549	const_iv (KMOD_RALT),
		550	const_iv (KMOD_META),
470	const_iv (KMOD_LMETA),	551	const_iv (KMOD_LMETA),
471	const_iv (KMOD_RMETA),	552	const_iv (KMOD_RMETA),
472	const_iv (KMOD_NUM),	553	const_iv (KMOD_NUM),
473	const_iv (KMOD_CAPS),	554	const_iv (KMOD_CAPS),
474	const_iv (KMOD_MODE),	555	const_iv (KMOD_MODE),
475	const_iv (KMOD_CTRL),
476	const_iv (KMOD_SHIFT),
477	const_iv (KMOD_ALT),
478	const_iv (KMOD_META)
479	# undef const_iv	556	# undef const_iv
480	};	557	};
481		558
482	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; )
483	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);
484	}	564	}
		565
		566	void
		567	weaken (SV *rv)
		568	PROTOTYPE: $
		569	CODE:
		570	sv_rvweaken (rv);
485		571
486	int	572	int
487	in_destruct ()	573	in_destruct ()
488	CODE:	574	CODE:
489	RETVAL = PL_main_cv == Nullcv;	575	RETVAL = PL_main_cv == Nullcv;
…		…
560	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
562	);	648	);
563	if (RETVAL)	649	if (RETVAL)
564	{	650	{
		651	av_clear (texture_av);
		652
565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
566	# 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);
567	# include "glfunc.h"	655	# include "glfunc.h"
568	# undef GL_FUNC	656	# undef GL_FUNC
		657
569	}	658	}
570	OUTPUT:	659	OUTPUT:
571	RETVAL	660	RETVAL
572		661
573	void	662	void
574	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
575		664
576	char *	665	char *
577	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
578		667
		668	int
		669	SDL_GetAppState ()
		670
579	void	671	void
580	SDL_PollEvent ()	672	poll_events ()
581	PPCODE:	673	PPCODE:
582	{	674	{
583	SDL_Event ev;	675	SDL_Event ev;
584		676
585	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
586	{	679	{
587	HV *hv = newHV ();	680	HV *hv = newHV ();
588	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
589		682
590	switch (ev.type)	683	switch (ev.type)
…		…
592	case SDL_KEYDOWN:	685	case SDL_KEYDOWN:
593	case SDL_KEYUP:	686	case SDL_KEYUP:
594	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	687	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
595	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	688	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
596	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 */
597	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	691	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
598	break;	692	break;
599		693
600	case SDL_ACTIVEEVENT:	694	case SDL_ACTIVEEVENT:
601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
603	break;	697	break;
604		698
605	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
606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
607
608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
613	break;	725	break;
614		726
615	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
616	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
646	Mix_AllocateChannels (int numchans = -1)	758	Mix_AllocateChannels (int numchans = -1)
647		759
648	void	760	void
649	lowdelay (int fd, int val = 1)	761	lowdelay (int fd, int val = 1)
650	CODE:	762	CODE:
		763	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
		764
		765	void
		766	win32_proxy_info ()
		767	PPCODE:
		768	{
651	#ifndef _WIN32	769	#ifdef _WIN32
652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	770	char buffer[2048];
		771	DWORD buflen;
		772
		773	EXTEND (SP, 3);
		774
		775	buflen = sizeof (buffer);
		776	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
		777	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
		778	{
		779	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		780
		781	buflen = sizeof (buffer);
		782	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		783	{
		784	PUSHs (newSVpv (buffer, 0));
		785
		786	buflen = sizeof (buffer);
		787	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		788	PUSHs (newSVpv (buffer, 0));
		789	}
		790	}
653	#endif	791	#endif
		792	}
654		793
655	void	794	void
656	add_font (char *file)	795	add_font (char *file)
657	CODE:	796	CODE:
658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	797	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
…		…
762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	901	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
763	#endif	902	#endif
764	_exit (1);	903	_exit (1);
765		904
766	void	905	void
767	_exit (int retval)	906	_exit (int retval = 0)
768	CODE:	907	CODE:
		908	#ifdef WIN32
		909	ExitThread (retval); // unclean, please beam me up
		910	#else
769	_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	}
770		922
771	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
772		924
773	CFPlus::Font	925	CFPlus::Font
774	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
…		…
1021	xy_to_index (CFPlus::Layout self, int x, int y)	1173	xy_to_index (CFPlus::Layout self, int x, int y)
1022	CODE:	1174	CODE:
1023	{	1175	{
1024	int index, trailing;	1176	int index, trailing;
1025	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);
1026	RETVAL = index;	1178	RETVAL = index + trailing;
1027	}	1179	}
1028	OUTPUT:	1180	OUTPUT:
1029	RETVAL	1181	RETVAL
1030		1182
1031	void	1183	void
…		…
1037		1189
1038	EXTEND (SP, 3);	1190	EXTEND (SP, 3);
1039	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1191	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1192	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1041	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	}
1042	}	1233	}
1043		1234
1044	void	1235	void
1045	render (CFPlus::Layout self, float x, float y, int flags = 0)	1236	render (CFPlus::Layout self, float x, float y, int flags = 0)
1046	PPCODE:	1237	PPCODE:
…		…
1051	flags	1242	flags
1052	);	1243	);
1053		1244
1054	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1055		1246
		1247	int minpot (int n)
		1248
1056	void	1249	void
1057	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1058	CODE:	1251	CODE:
1059	{	1252	{
1060	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1137	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1138	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1139	}	1332	}
1140	}	1333	}
1141		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
1142	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1143		1347
1144	CFPlus::Map	1348	CFPlus::Map
1145	new (SV *class, int map_width, int map_height)	1349	new (SV *class)
1146	CODE:	1350	CODE:
1147	New (0, RETVAL, 1, struct map);	1351	New (0, RETVAL, 1, struct map);
1148	RETVAL->x = 0;	1352	RETVAL->x = 0;
1149	RETVAL->y = 0;	1353	RETVAL->y = 0;
1150	RETVAL->w = map_width;	1354	RETVAL->w = 0;
1151	RETVAL->h = map_height;	1355	RETVAL->h = 0;
1152	RETVAL->ox = 0;	1356	RETVAL->ox = 0;
1153	RETVAL->oy = 0;	1357	RETVAL->oy = 0;
1154	RETVAL->faces = 8192;	1358	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1155	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1359	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1156	RETVAL->texs = 8192;
1157	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1158	RETVAL->rows = 0;	1360	RETVAL->rows = 0;
1159	RETVAL->row = 0;	1361	RETVAL->row = 0;
1160	OUTPUT:	1362	OUTPUT:
1161	RETVAL	1363	RETVAL
1162		1364
1163	void	1365	void
1164	DESTROY (CFPlus::Map self)	1366	DESTROY (CFPlus::Map self)
1165	CODE:	1367	CODE:
1166	{	1368	{
1167	map_clear (self);	1369	map_clear (self);
1168	Safefree (self->face);	1370	Safefree (self->face2tile);
1169	Safefree (self->tex);	1371	Safefree (self->tex);
1170	Safefree (self);	1372	Safefree (self);
1171	}	1373	}
1172		1374
1173	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
1174	clear (CFPlus::Map self)	1382	clear (CFPlus::Map self)
1175	CODE:	1383	CODE:
1176	map_clear (self);	1384	map_clear (self);
1177		1385
1178	void	1386	void
1179	set_face (CFPlus::Map self, int face, int texid)	1387	set_tileid (CFPlus::Map self, int face, int tile)
1180	CODE:	1388	CODE:
1181	{	1389	{
1182	while (self->faces <= face)	1390	need_facenum (self, face); self->face2tile [face] = tile;
1183	{	1391	need_texid (self, tile);
1184	Append (mapface, self->face, self->faces, self->faces);	1392	}
1185	self->faces *= 2;
1186	}
1187		1393
1188	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;
1189	}	1415	}
1190		1416
1191	void	1417	void
1192	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)
1193	CODE:	1419	CODE:
1194	{	1420	{
1195	while (self->texs <= texid)	1421	need_texid (self, texid);
1196	{
1197	Append (maptex, self->tex, self->texs, self->texs);
1198	self->texs *= 2;
1199	}
1200		1422
1201	{	1423	{
1202	maptex *tex = self->tex + texid;	1424	maptex *tex = self->tex + texid;
1203		1425
1204	tex->name = name;	1426	tex->name = name;
…		…
1248	CODE:	1470	CODE:
1249	{	1471	{
1250	if (dx > 0)	1472	if (dx > 0)
1251	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1252	else if (dx < 0)	1474	else if (dx < 0)
1253	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);
1254		1476
1255	if (dy > 0)	1477	if (dy > 0)
1256	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1257	else if (dy < 0)	1479	else if (dy < 0)
1258	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);
1259		1481
1260	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1261	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1262		1484
1263	while (self->y < 0)	1485	while (self->y < 0)
…		…
1315	cell->stat_width = 1;	1537	cell->stat_width = 1;
1316	cell->stat_hp = *data++;	1538	cell->stat_hp = *data++;
1317	}	1539	}
1318	else if (cmd == 6) // monster width	1540	else if (cmd == 6) // monster width
1319	cell->stat_width = *data++ + 1;	1541	cell->stat_width = *data++ + 1;
1320	else if (cmd == 0x47) // monster width	1542	else if (cmd == 0x47)
1321	{	1543	{
1322	if (*data == 4)	1544	if (*data == 4)
1323	; // decode player tag	1545	; // decode player count
1324		1546
1325	data += *data + 1;	1547	data += *data + 1;
1326	}	1548	}
1327	else if (cmd == 8) // cell flags	1549	else if (cmd == 8) // cell flags
1328	cell->flags = *data++;	1550	cell->flags = *data++;
…		…
1333	}	1555	}
1334	while (ext & 0x80);	1556	while (ext & 0x80);
1335	}	1557	}
1336	else	1558	else
1337	cell->darkness = *data++ + 1;	1559	cell->darkness = *data++ + 1;
1338
1339	}	1560	}
1340		1561
1341	if (flags & 4)	1562	if (flags & 4)
1342	{	1563	{
1343	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];
1344	}	1567	}
1345		1568
1346	if (flags & 2)	1569	if (flags & 2)
1347	{	1570	{
1348	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];
1349	}	1574	}
1350		1575
1351	if (flags & 1)	1576	if (flags & 1)
1352	{	1577	{
1353	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];
1354	}	1581	}
1355	}	1582	}
1356	else	1583	else
1357	{
1358	cell->darkness = 0;	1584	cell->darkness = 0;
1359	cell->stat_hp = 0;
1360	cell->flags = 0;
1361	cell->player = 0;
1362	}
1363	}	1585	}
1364	}	1586	}
1365		1587
1366	SV *	1588	SV *
1367	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1589	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
…		…
1393	{	1615	{
1394	mapcell *cell = row->col + (x - row->c0);	1616	mapcell *cell = row->col + (x - row->c0);
1395		1617
1396	for (z = 0; z <= 0; z++)	1618	for (z = 0; z <= 0; z++)
1397	{	1619	{
1398	mapface face = cell->face [z];
1399
1400	if (face)
1401	{
1402	maptex tex = self->tex [face];	1620	maptex tex = self->tex [cell->tile [z]];
1403	int a0 = 255 - tex.a;	1621	int a0 = 255 - tex.a;
1404	int a1 = tex.a;	1622	int a1 = tex.a;
1405		1623
1406	r = (r * a0 + tex.r * a1) / 255;	1624	r = (r * a0 + tex.r * a1) / 255;
1407	g = (g * a0 + tex.g * a1) / 255;	1625	g = (g * a0 + tex.g * a1) / 255;
1408	b = (b * a0 + tex.b * a1) / 255;	1626	b = (b * a0 + tex.b * a1) / 255;
1409	a = (a * a0 + tex.a * a1) / 255;	1627	a = (a * a0 + tex.a * a1) / 255;
1410	}
1411	}	1628	}
1412	}	1629	}
1413		1630
1414	*map++ = (r )	1631	*map++ = (r )
1415	\| (g << 8)	1632	\| (g << 8)
…		…
1422	}	1639	}
1423	OUTPUT:	1640	OUTPUT:
1424	RETVAL	1641	RETVAL
1425		1642
1426	void	1643	void
1427	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)
1428	CODE:	1645	CODE:
1429	{	1646	{
1430	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;
1431	int x, y, z;	1651	int x, y, z;
1432	int last_name;	1652	int last_name;
1433	mapface face;
1434		1653
1435	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1654	// thats current max. sorry.
1436	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1655	if (sw > 255) sw = 255;
		1656	if (sh > 255) sh = 255;
1437		1657
1438	/*	1658	// clear key, in case of extra padding
1439	int vx = self->vx = self->w >= sw	1659	memset (&skey, 0, sizeof (skey));
1440	? self->x + (self->w - sw) / 2
1441	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1442
1443	int vy = self->vy = self->h >= sh
1444	? self->y + (self->h - sh) / 2
1445	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1446	*/
1447		1660
1448	glColor4ub (255, 255, 255, 255);	1661	glColor4ub (255, 255, 255, 255);
1449		1662
1450	glEnable (GL_BLEND);	1663	glEnable (GL_BLEND);
1451	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1664	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1454		1667
1455	glBegin (GL_QUADS);	1668	glBegin (GL_QUADS);
1456		1669
1457	last_name = 0;	1670	last_name = 0;
1458		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
1459	for (z = 0; z < 3; z++)	1697	for (z = 0; z <= 2; z++)
		1698	{
		1699	memset (smooth_level, 0, sizeof (smooth_level));
		1700
1460	for (y = 0; y < sh; y++)	1701	for (y = 0; y < sh; y++)
1461	if (0 <= y + vy && y + vy < self->rows)	1702	if (0 <= y + my && y + my < self->rows)
1462	{	1703	{
1463	maprow *row = self->row + (y + vy);	1704	maprow *row = self->row + (y + my);
1464		1705
1465	for (x = 0; x < sw; x++)	1706	for (x = 0; x < sw; x++)
1466	if (row->c0 <= x + vx && x + vx < row->c1)	1707	if (row->c0 <= x + mx && x + mx < row->c1)
1467	{	1708	{
1468	mapcell *cell = row->col + (x + vx - row->c0);	1709	mapcell *cell = row->col + (x + mx - row->c0);
1469
1470	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;
1471		1717
1472	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))
1473	{	1807	{
1474	maptex tex = self->tex [face];	1808	int level = (w << 5) \| b;
1475	int px = (x + 1) * 32 - tex.w;	1809	HE *he;
1476	int py = (y + 1) * 32 - tex.h;
1477		1810
1478	if (last_name != tex.name)	1811	hv_iterinit (smooth);
		1812	while ((he = hv_iternext (smooth)))
1479	{	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
1480	glEnd ();	1836	glEnd ();
1481	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1837	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1482	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	}
1483	}	1860	}
1484
1485	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1486	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1487	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1488	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1489	}
1490
1491	if (cell->flags && z == 2)
1492	{
1493	if (cell->flags & 1)
1494	{
1495	maptex tex = self->tex [1];
1496	int px = (x + 1) * 32 - tex.w + 2;
1497	int py = (y + 1) * 32 - tex.h - 6;
1498
1499	glEnd ();
1500	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1501	glBegin (GL_QUADS);
1502
1503	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1504	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1505	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1506	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1507	}	1861	}
1508	}	1862	}
1509	}
1510	}	1863	}
		1864	}
		1865
		1866	hv_clear (smooth);
		1867	}
1511		1868
1512	glEnd ();	1869	glEnd ();
1513		1870
1514	glDisable (GL_TEXTURE_2D);	1871	glDisable (GL_TEXTURE_2D);
1515	glDisable (GL_BLEND);	1872	glDisable (GL_BLEND);
1516		1873
1517	// top layer: overlays such as the health bar	1874	// top layer: overlays such as the health bar
1518	for (y = 0; y < sh; y++)	1875	for (y = 0; y < sh; y++)
1519	if (0 <= y + vy && y + vy < self->rows)	1876	if (0 <= y + my && y + my < self->rows)
1520	{	1877	{
1521	maprow *row = self->row + (y + vy);	1878	maprow *row = self->row + (y + my);
1522		1879
1523	for (x = 0; x < sw; x++)	1880	for (x = 0; x < sw; x++)
1524	if (row->c0 <= x + vx && x + vx < row->c1)	1881	if (row->c0 <= x + mx && x + mx < row->c1)
1525	{	1882	{
1526	mapcell *cell = row->col + (x + vx - row->c0);	1883	mapcell *cell = row->col + (x + mx - row->c0);
1527		1884
1528	int px = x * 32;	1885	int px = x * T;
1529	int py = y * 32;	1886	int py = y * T;
1530		1887
1531	if (cell->stat_hp)	1888	if (cell->stat_hp)
1532	{	1889	{
1533	int width = cell->stat_width * 32;	1890	int width = cell->stat_width * T;
1534	int thick = sh / 28 + 1 + cell->stat_width;	1891	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1535		1892
1536	glColor3ub (0, 0, 0);	1893	glColor3ub (0, 0, 0);
1537	glRectf (px + 1, py - thick - 2,	1894	glRectf (px + 1, py - thick - 2,
1538	px + width - 1, py);	1895	px + width - 1, py);
1539		1896
…		…
1605	glDisable (GL_BLEND);	1962	glDisable (GL_BLEND);
1606	glDisable (GL_TEXTURE_2D);	1963	glDisable (GL_TEXTURE_2D);
1607	}	1964	}
1608		1965
1609	void	1966	void
1610	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)
1611	PPCODE:	1968	PPCODE:
1612	{	1969	{
1613	int vx, vy;
1614	int x, y;	1970	int x, y;
1615	int sw4 = (sw + 3) & ~3;	1971	int sw4 = (sw + 3) & ~3;
1616	SV darkness_sv = sv_2mortal (newSV (sw4 sh));	1972	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1617	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);	1973	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1618		1974
1619	memset (darkness, 255, sw4 * sh);	1975	memset (darkness, 255, sw4 * sh);
1620	SvPOK_only (darkness_sv);	1976	SvPOK_only (darkness_sv);
1621	SvCUR_set (darkness_sv, sw4 * sh);	1977	SvCUR_set (darkness_sv, sw4 * sh);
1622		1978
1623	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	1979	mx += self->x;
1624	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	1980	my += self->y;
1625		1981
1626	for (y = 0; y < sh; y++)	1982	for (y = 0; y < sh; y++)
1627	if (0 <= y + vy && y + vy < self->rows)	1983	if (0 <= y + my && y + my < self->rows)
1628	{	1984	{
1629	maprow *row = self->row + (y + vy);	1985	maprow *row = self->row + (y + my);
1630		1986
1631	for (x = 0; x < sw; x++)	1987	for (x = 0; x < sw; x++)
1632	if (row->c0 <= x + vx && x + vx < row->c1)	1988	if (row->c0 <= x + mx && x + mx < row->c1)
1633	{	1989	{
1634	mapcell *cell = row->col + (x + vx - row->c0);	1990	mapcell *cell = row->col + (x + mx - row->c0);
1635		1991
1636	darkness[y * sw4 + x] = cell->darkness	1992	darkness[y * sw4 + x] = cell->darkness
1637	? 255 - (cell->darkness - 1)	1993	? 255 - (cell->darkness - 1)
1638	: 255 - FOW_DARKNESS;	1994	: 255 - FOW_DARKNESS;
1639	}	1995	}
…		…
1679	if (row && row->c0 <= x && x < row->c1)	2035	if (row && row->c0 <= x && x < row->c1)
1680	{	2036	{
1681	mapcell *cell = row->col + (x - row->c0);	2037	mapcell *cell = row->col + (x - row->c0);
1682	uint8_t flags = 0;	2038	uint8_t flags = 0;
1683		2039
1684	if (cell->face [0]) flags \|= 1;	2040	if (cell->tile [0]) flags \|= 1;
1685	if (cell->face [1]) flags \|= 2;	2041	if (cell->tile [1]) flags \|= 2;
1686	if (cell->face [2]) flags \|= 4;	2042	if (cell->tile [2]) flags \|= 4;
1687		2043
1688	*data++ = flags;	2044	*data++ = flags;
1689		2045
1690	if (flags & 1)	2046	if (flags & 1)
1691	{	2047	{
		2048	tileid tile = cell->tile [0];
1692	*data++ = cell->face [0] >> 8;	2049	*data++ = tile >> 8;
1693	*data++ = cell->face [0];	2050	*data++ = tile;
1694	}	2051	}
1695		2052
1696	if (flags & 2)	2053	if (flags & 2)
1697	{	2054	{
		2055	tileid tile = cell->tile [1];
1698	*data++ = cell->face [1] >> 8;	2056	*data++ = tile >> 8;
1699	*data++ = cell->face [1];	2057	*data++ = tile;
1700	}	2058	}
1701		2059
1702	if (flags & 4)	2060	if (flags & 4)
1703	{	2061	{
		2062	tileid tile = cell->tile [2];
1704	*data++ = cell->face [2] >> 8;	2063	*data++ = tile >> 8;
1705	*data++ = cell->face [2];	2064	*data++ = tile;
1706	}	2065	}
1707	}	2066	}
1708	else	2067	else
1709	*data++ = 0;	2068	*data++ = 0;
1710	}	2069	}
…		…
1750	{	2109	{
1751	uint8_t flags = *data++;	2110	uint8_t flags = *data++;
1752		2111
1753	if (flags)	2112	if (flags)
1754	{	2113	{
1755	mapface face[3] = { 0, 0, 0 };
1756
1757	mapcell *cell = row_get_cell (row, x);	2114	mapcell *cell = row_get_cell (row, x);
		2115	tileid tile[3] = { 0, 0, 0 };
1758		2116
1759	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	2117	if (flags & 1) { tile[0] = data++ << 8; tile[0] \|= data++; }
1760	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	2118	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
1761	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	2119	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
1762		2120
1763	if (cell->darkness == 0)	2121	if (cell->darkness == 0)
1764	{	2122	{
1765	cell->darkness = 0;	2123	cell->darkness = 0;
1766		2124
1767	for (z = 0; z <= 2; z++)	2125	for (z = 0; z <= 2; z++)
1768	{	2126	{
1769	cell->face[z] = face[z];	2127	tileid t = tile [z];
1770		2128
1771	if (face[z] && (face[z] >= self->texs \|\| !self->tex[face [z]].name))	2129	if (t >= self->texs \|\| (t && !self->tex [t].name))
		2130	{
1772	XPUSHs (sv_2mortal (newSViv (face[z])));	2131	XPUSHs (sv_2mortal (newSViv (t)));
		2132	need_texid (self, t);
		2133	}
		2134
		2135	cell->tile [z] = t;
1773	}	2136	}
1774	}	2137	}
1775	}	2138	}
1776	}	2139	}
1777	}	2140	}
…		…
1812	CODE:	2175	CODE:
1813	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
1814	OUTPUT:	2177	OUTPUT:
1815	RETVAL	2178	RETVAL
1816		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
1817	CFPlus::MixMusic	2187	CFPlus::MixMusic
1818	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
1819	CODE:	2189	CODE:
1820	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
1821	OUTPUT:	2191	OUTPUT:
…		…
1828		2198
1829	int	2199	int
1830	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
1831	CODE:	2201	CODE:
1832	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);
1833	OUTPUT:	2210	OUTPUT:
1834	RETVAL	2211	RETVAL
1835		2212
1836	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1837		2214
…		…
1841	static const struct {	2218	static const struct {
1842	const char *name;	2219	const char *name;
1843	IV iv;	2220	IV iv;
1844	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
1845	# 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),
1846	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
1847	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
1848	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
1849	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
1850	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
1877	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
1878	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
1879	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
1880	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1881	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
1882	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
1883	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
1884	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
1885	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
1886	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1926	# undef const_iv	2308	# undef const_iv
1927	};	2309	};
1928		2310
1929	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; )
1930	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);
1931	}	2316	}
1932		2317
1933	char *	2318	char *
1934	gl_vendor ()	2319	gl_vendor ()
1935	CODE:	2320	CODE:
…		…
1946		2331
1947	char *	2332	char *
1948	gl_extensions ()	2333	gl_extensions ()
1949	CODE:	2334	CODE:
1950	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);
1951	OUTPUT:	2350	OUTPUT:
1952	RETVAL	2351	RETVAL
1953		2352
1954	int glGetError ()	2353	int glGetError ()
1955		2354
…		…
2080		2479
2081	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)
2082		2481
2083	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)
2084		2483
		2484	void glPixelZoom (float x, float y)
		2485
2085	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)
2086		2487
2087	int glGenTexture ()	2488	int glGenTexture ()
2088	CODE:	2489	CODE:
2089	{	2490	RETVAL = gen_texture ();
2090	GLuint name;
2091	glGenTextures (1, &name);
2092	RETVAL = name;
2093	}
2094	OUTPUT:	2491	OUTPUT:
2095	RETVAL	2492	RETVAL
2096		2493
2097	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2098	CODE:	2495	CODE:
2099	{
2100	GLuint name_ = name;
2101	glDeleteTextures (1, &name_);	2496	del_texture (name);
2102	}	2497
2103
2104	int glGenList ()	2498	int glGenList ()
2105	CODE:	2499	CODE:
2106	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2107	OUTPUT:	2501	OUTPUT:
2108	RETVAL	2502	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.154 by root, Tue Sep 19 22:23:30 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.154 by root, Tue Sep 19 22:23:30 2006 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC