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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
12		16
13	#include <SDL.h>	17	#include <SDL.h>
14	#include <SDL_endian.h>	18	#include <SDL_endian.h>
15	#include <SDL_image.h>	19	#include <SDL_image.h>
16	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
45	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
46	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
47		51
48	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
49		53
50	#define GL_CALL(type,func,args) \	54	static struct
51	{ \	55	{
52	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
53	static type fptr_; \	57	#include "glfunc.h"
54	\	58	#undef GL_FUNC
55	if (!init_) \	59	} gl;
56	{ \	60
57	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
59	} \	63	if (gl.BlendFuncSeparate)
60	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
61	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
62	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
63	}	67	else
		68	glBlendFunc (sa, da);
		69	}
64		70
65	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
66	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
67		73
68	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
80	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
81		87
82	static void	88	static void
83	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
84	{	90	{
85	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
		95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
87	}	100	}
88		101
89	static void	102	static void
90	layout_update_font (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
91	{	104	{
…		…
287	ev.code = 1;	300	ev.code = 1;
288	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
289	ev.data2 = 0;	302	ev.data2 = 0;
290		303
291	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
292	}	322	}
293		323
294	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
295		325
296	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
404	# undef const_iv	434	# undef const_iv
405	};	435	};
406		436
407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		439	}
409		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
		445	void
		446	pango_init ()
		447	CODE:
		448	// delayed, so it can pick up new fonts added by AddFontResourceEx
		449	{
		450	{
410	ft2_fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	452	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
414	cairo_fontmap = pango_cairo_font_map_get_default ();	457	cairo_fontmap = pango_cairo_font_map_get_default ();
415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	458	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		459	#ifdef _WIN32
		460	// cairo looks like shit eaten twice on windows
		461	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		462	#else
		463	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		464	#endif
		465	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		466	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		467	pango_cairo_context_set_font_options (cairo_context, fopt);
		468	cairo_font_options_destroy (fopt);
		469	}
416	}	470	}
417		471
418	int	472	int
419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
420		474
…		…
430	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	484	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434		488
		489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		491
435	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439		496
440	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443		498
444	SDL_EnableUNICODE (1);	499	SDL_EnableUNICODE (1);
445	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446		501
447	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
456		511
457	++m;	512	++m;
458	}	513	}
459	}	514	}
460		515
		516	char *
		517	SDL_GetError ()
		518
461	int	519	int
462	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
463	CODE:	521	CODE:
464	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
465	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
466	);	524	);
		525	if (RETVAL)
		526	{
467	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	527	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		528	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		529	# include "glfunc.h"
		530	# undef GL_FUNC
		531	}
468	OUTPUT:	532	OUTPUT:
469	RETVAL	533	RETVAL
470		534
471	void	535	void
472	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
		537
		538	char *
		539	SDL_GetKeyName (int sym)
473		540
474	void	541	void
475	SDL_PollEvent ()	542	SDL_PollEvent ()
476	PPCODE:	543	PPCODE:
477	{	544	{
…		…
496	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	564	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498	break;	565	break;
499		566
500	case SDL_MOUSEMOTION:	567	case SDL_MOUSEMOTION:
		568	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		569
501	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	570	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	571	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	572	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	573	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	574	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506	break;	575	break;
507		576
508	case SDL_MOUSEBUTTONDOWN:	577	case SDL_MOUSEBUTTONDOWN:
509	case SDL_MOUSEBUTTONUP:	578	case SDL_MOUSEBUTTONUP:
		579	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		580
510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	581	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	582	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	583	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	584	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514	break;	585	break;
…		…
541	CODE:	612	CODE:
542	#ifndef _WIN32	613	#ifndef _WIN32
543	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544	#endif	615	#endif
545		616
546	char *
547	gl_version ()
548	CODE:
549	RETVAL = (char *)glGetString (GL_VERSION);
550	OUTPUT:
551	RETVAL
552
553	char *
554	gl_extensions ()
555	CODE:
556	RETVAL = (char *)glGetString (GL_EXTENSIONS);
557	OUTPUT:
558	RETVAL
559
560	void	617	void
561	add_font (char *file)	618	add_font (char *file)
562	CODE:	619	CODE:
563	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		621	#ifdef _WIN32
		622	// cairo... sigh... requires win2000
		623	AddFontResourceEx (file, FR_PRIVATE, 0);
		624	#endif
564		625
565	void	626	void
566	load_image_inline (SV *image_)	627	load_image_inline (SV *image_)
567	ALIAS:	628	ALIAS:
568	load_image_file = 1	629	load_image_file = 1
…		…
652	}	713	}
653		714
654	void	715	void
655	error (char *message)	716	error (char *message)
656	CODE:	717	CODE:
		718	fprintf (stderr, "ERROR: %s\n", message);
657	#ifdef _WIN32	719	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	720	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "ERROR: %s\n", message);
661	#endif	721	#endif
662		722
663	void	723	void
664	fatal (char *message)	724	fatal (char *message)
665	CODE:	725	CODE:
		726	fprintf (stderr, "FATAL: %s\n", message);
666	#ifdef _WIN32	727	#ifdef _WIN32
667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
668	#else
669	fprintf (stderr, "FATAL: %s\n", message);
670	#endif	729	#endif
671	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
672		736
673	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
674		738
675	CFClient::Font	739	CFClient::Font
676	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
750		814
751	SV *	815	SV *
752	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
753	CODE:	817	CODE:
754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
756	OUTPUT:	820	OUTPUT:
757	RETVAL	821	RETVAL
758		822
759	void	823	void
760	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	824	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
786	set_width (CFClient::Layout self, int max_width = -1)	850	set_width (CFClient::Layout self, int max_width = -1)
787	CODE:	851	CODE:
788	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	852	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
789		853
790	void	854	void
		855	set_indent (CFClient::Layout self, int indent)
		856	CODE:
		857	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		858
		859	void
		860	set_spacing (CFClient::Layout self, int spacing)
		861	CODE:
		862	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		863
		864	void
		865	set_ellipsise (CFClient::Layout self, int ellipsise)
		866	CODE:
		867	pango_layout_set_ellipsize (self->pl,
		868	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		869	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		870	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		871	: PANGO_ELLIPSIZE_NONE
		872	);
		873
		874	void
		875	set_single_paragraph_mode (CFClient::Layout self, int spm)
		876	CODE:
		877	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		878
		879	void
791	size (CFClient::Layout self)	880	size (CFClient::Layout self)
792	PPCODE:	881	PPCODE:
793	{	882	{
794	int w, h;	883	int w, h;
795		884
…		…
861		950
862	while (p < e)	951	while (p < e)
863	{	952	{
864	uint32_t rgba = *p;	953	uint32_t rgba = *p;
865	rgba = (rgba >> 24) \| (rgba << 8);	954	rgba = (rgba >> 24) \| (rgba << 8);
		955	#if 0
		956	#ifdef _WIN32
		957	{//D
		958	uint8_t r = rgba >> 24;
		959	uint8_t g = rgba >> 16;
		960	uint8_t b = rgba >> 8;
		961	uint8_t a = rgba >> 0;
		962
		963	rgba = (rgba & 0xffffff00) \| a;
		964	}
		965	#endif
		966	#endif
866	rgba = SDL_SwapBE32 (rgba);	967	rgba = SDL_SwapBE32 (rgba);
867	*p++ = rgba;	968	*p++ = rgba;
868	}	969	}
869	}	970	}
870		971
…		…
904	}	1005	}
905		1006
906	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
907		1008
908	void	1009	void
		1010	pad2pot (SV data_, SV w_, SV *h_)
		1011	CODE:
		1012	{
		1013	int ow = SvIV (w_);
		1014	int oh = SvIV (h_);
		1015
		1016	if (ow && oh)
		1017	{
		1018	int nw = minpot (ow);
		1019	int nh = minpot (oh);
		1020
		1021	if (nw != ow \|\| nh != oh)
		1022	{
		1023	if (SvOK (data_))
		1024	{
		1025	STRLEN datalen;
		1026	char *data = SvPVbyte (data_, datalen);
		1027	int bpp = datalen / (ow * oh);
		1028	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1029
		1030	SvPOK_only (result_);
		1031	SvCUR_set (result_, nw * nh * bpp);
		1032
		1033	memset (SvPVX (result_), 0, nw * nh * bpp);
		1034	while (oh--)
		1035	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1036
		1037	sv_setsv (data_, result_);
		1038	}
		1039
		1040	sv_setiv (w_, nw);
		1041	sv_setiv (h_, nh);
		1042	}
		1043	}
		1044	}
		1045
		1046	void
909	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1047	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
910	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
911	ALIAS:	1049	ALIAS:
912	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
913	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
914	CODE:	1052	CODE:
915	{	1053	{
916	HV hv = (HV )SvRV (self);	1054	HV hv = (HV )SvRV (self);
917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1055	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1056	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1057	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921		1058
922	if (items < 5)	1059	if (items < 5)
923	{	1060	{
924	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1061	w = SvNV (*hv_fetch (hv, "w", 1, 1));
925	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1062	h = SvNV (*hv_fetch (hv, "h", 1, 1));
926	}	1063	}
927		1064
928	if (ix)	1065	if (ix)
929	{	1066	{
930	glEnable (GL_BLEND);	1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
931	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1070	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1071	else
		1072	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1073	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1074
		1075	glEnable (GL_ALPHA_TEST);
		1076	glAlphaFunc (GL_GREATER, 0.01f);
932	}	1077	}
933		1078
934	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
935
936	if (wrap_mode)
937	{
938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940	}
941		1080
942	glBegin (GL_QUADS);	1081	glBegin (GL_QUADS);
943	glTexCoord2f (0, 0); glVertex2f (x , y );	1082	glTexCoord2f (0, 0); glVertex2f (x , y );
944	glTexCoord2f (0, t); glVertex2f (x , y + h);	1083	glTexCoord2f (0, t); glVertex2f (x , y + h);
945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1084	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1085	glTexCoord2f (s, 0); glVertex2f (x + w, y );
947	glEnd ();	1086	glEnd ();
948		1087
949	if (ix)	1088	if (ix)
		1089	{
		1090	glDisable (GL_ALPHA_TEST);
950	glDisable (GL_BLEND);	1091	glDisable (GL_BLEND);
		1092	}
951	}	1093	}
952		1094
953	MODULE = CFClient PACKAGE = CFClient::Map	1095	MODULE = CFClient PACKAGE = CFClient::Map
954		1096
955	CFClient::Map	1097	CFClient::Map
…		…
975	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
976	CODE:	1118	CODE:
977	{	1119	{
978	map_clear (self);	1120	map_clear (self);
979	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
980	Safefree (self);	1123	Safefree (self);
981	}	1124	}
982		1125
983	void	1126	void
984	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1019	tex->r = r;	1162	tex->r = r;
1020	tex->g = g;	1163	tex->g = g;
1021	tex->b = b;	1164	tex->b = b;
1022	tex->a = a;	1165	tex->a = a;
1023	}	1166	}
		1167
		1168	// somewhat hackish, but for textures that require it, it really
		1169	// improves the look, and most others don't suffer.
		1170	glBindTexture (GL_TEXTURE_2D, name);
		1171	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1172	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1173	// use uglier nearest interpolation because linear suffers
		1174	// from transparent color bleeding and ugly wrapping effects.
		1175	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1024	}	1176	}
1025		1177
1026	int	1178	int
1027	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
1028	ALIAS:	1180	ALIAS:
1029	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
1030	CODE:	1186	CODE:
1031	switch (ix)	1187	switch (ix)
1032	{	1188	{
1033	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
1034	case 1: RETVAL = self->oy; break;	1190	case 1: RETVAL = self->oy; break;
		1191	case 2: RETVAL = self->x; break;
		1192	case 3: RETVAL = self->y; break;
		1193	case 4: RETVAL = self->w; break;
		1194	case 5: RETVAL = self->h; break;
1035	}	1195	}
1036	OUTPUT:	1196	OUTPUT:
1037	RETVAL	1197	RETVAL
1038		1198
1039	void	1199	void
…		…
1174	OUTPUT:	1334	OUTPUT:
1175	RETVAL	1335	RETVAL
1176		1336
1177	void	1337	void
1178	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1338	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1179	PPCODE:	1339	CODE:
1180	{	1340	{
1181	int vx, vy;	1341	int vx, vy;
1182	int x, y, z;	1342	int x, y, z;
1183	int last_name;	1343	int last_name;
1184	mapface face;	1344	mapface face;
1185	int sw4 = (sw + 3) & ~3;
1186	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1187	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1188		1345
1189	memset (darkness, 255, sw4 * sh);
1190	SvPOK_only (darkness_sv);
1191	SvCUR_set (darkness_sv, sw4 * sh);
1192
1193	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1194	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1195		1348
1196	/*	1349	/*
1197	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1198	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1199	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1352	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1222		1375
1223	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1224	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1225	{	1378	{
1226	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1227
1228	darkness[y * sw4 + x] = cell->darkness < 0
1229	? 255 - FOW_DARKNESS
1230	: 255 - cell->darkness;
1231		1380
1232	face = cell->face [z];	1381	face = cell->face [z];
1233		1382
1234	if (face)	1383	if (face)
1235	{	1384	{
…		…
1256		1405
1257	glEnd ();	1406	glEnd ();
1258		1407
1259	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1260	glDisable (GL_BLEND);	1409	glDisable (GL_BLEND);
		1410	}
		1411
		1412	void
		1413	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1414	PPCODE:
		1415	{
		1416	int vx, vy;
		1417	int x, y;
		1418	int sw4 = (sw + 3) & ~3;
		1419	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1420	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1421
		1422	memset (darkness, 255, sw4 * sh);
		1423	SvPOK_only (darkness_sv);
		1424	SvCUR_set (darkness_sv, sw4 * sh);
		1425
		1426	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1427	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1428
		1429	for (y = 0; y < sh; y++)
		1430	if (0 <= y + vy && y + vy < self->rows)
		1431	{
		1432	maprow *row = self->row + (y + vy);
		1433
		1434	for (x = 0; x < sw; x++)
		1435	if (row->c0 <= x + vx && x + vx < row->c1)
		1436	{
		1437	mapcell *cell = row->col + (x + vx - row->c0);
		1438
		1439	darkness[y * sw4 + x] = cell->darkness < 0
		1440	? 255 - FOW_DARKNESS
		1441	: 255 - cell->darkness;
		1442	}
		1443	}
1261		1444
1262	EXTEND (SP, 3);	1445	EXTEND (SP, 3);
1263	PUSHs (sv_2mortal (newSViv (sw4)));	1446	PUSHs (sv_2mortal (newSViv (sw4)));
1264	PUSHs (sv_2mortal (newSViv (sh)));	1447	PUSHs (sv_2mortal (newSViv (sh)));
1265	PUSHs (darkness_sv);	1448	PUSHs (darkness_sv);
…		…
1466	const_iv (GL_COLOR_MATERIAL),	1649	const_iv (GL_COLOR_MATERIAL),
1467	const_iv (GL_SMOOTH),	1650	const_iv (GL_SMOOTH),
1468	const_iv (GL_FLAT),	1651	const_iv (GL_FLAT),
1469	const_iv (GL_DITHER),	1652	const_iv (GL_DITHER),
1470	const_iv (GL_BLEND),	1653	const_iv (GL_BLEND),
		1654	const_iv (GL_CULL_FACE),
1471	const_iv (GL_SCISSOR_TEST),	1655	const_iv (GL_SCISSOR_TEST),
		1656	const_iv (GL_DEPTH_TEST),
		1657	const_iv (GL_ALPHA_TEST),
		1658	const_iv (GL_NORMALIZE),
		1659	const_iv (GL_RESCALE_NORMAL),
1472	const_iv (GL_AND),	1660	const_iv (GL_AND),
1473	const_iv (GL_ONE),	1661	const_iv (GL_ONE),
1474	const_iv (GL_ZERO),	1662	const_iv (GL_ZERO),
1475	const_iv (GL_SRC_ALPHA),	1663	const_iv (GL_SRC_ALPHA),
1476	const_iv (GL_SRC_ALPHA_SATURATE),	1664	const_iv (GL_DST_ALPHA),
1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1665	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478	const_iv (GL_ONE_MINUS_DST_ALPHA),	1666	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1667	const_iv (GL_SRC_ALPHA_SATURATE),
1479	const_iv (GL_RGB),	1668	const_iv (GL_RGB),
1480	const_iv (GL_RGBA),	1669	const_iv (GL_RGBA),
		1670	const_iv (GL_RGBA4),
		1671	const_iv (GL_RGBA8),
		1672	const_iv (GL_RGB5_A1),
1481	const_iv (GL_UNSIGNED_BYTE),	1673	const_iv (GL_UNSIGNED_BYTE),
		1674	const_iv (GL_UNSIGNED_SHORT),
		1675	const_iv (GL_UNSIGNED_INT),
1482	const_iv (GL_ALPHA),	1676	const_iv (GL_ALPHA),
		1677	const_iv (GL_INTENSITY),
1483	const_iv (GL_LUMINANCE),	1678	const_iv (GL_LUMINANCE),
		1679	const_iv (GL_LUMINANCE_ALPHA),
1484	const_iv (GL_FLOAT),	1680	const_iv (GL_FLOAT),
1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1681	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486	const_iv (GL_COMPILE),	1682	const_iv (GL_COMPILE),
1487	const_iv (GL_TEXTURE_1D),	1683	const_iv (GL_TEXTURE_1D),
1488	const_iv (GL_TEXTURE_2D),	1684	const_iv (GL_TEXTURE_2D),
…		…
1490	const_iv (GL_TEXTURE_MAG_FILTER),	1686	const_iv (GL_TEXTURE_MAG_FILTER),
1491	const_iv (GL_TEXTURE_MIN_FILTER),	1687	const_iv (GL_TEXTURE_MIN_FILTER),
1492	const_iv (GL_TEXTURE_ENV_MODE),	1688	const_iv (GL_TEXTURE_ENV_MODE),
1493	const_iv (GL_TEXTURE_WRAP_S),	1689	const_iv (GL_TEXTURE_WRAP_S),
1494	const_iv (GL_TEXTURE_WRAP_T),	1690	const_iv (GL_TEXTURE_WRAP_T),
		1691	const_iv (GL_REPEAT),
1495	const_iv (GL_CLAMP),	1692	const_iv (GL_CLAMP),
1496	const_iv (GL_REPEAT),	1693	const_iv (GL_CLAMP_TO_EDGE),
1497	const_iv (GL_NEAREST),	1694	const_iv (GL_NEAREST),
1498	const_iv (GL_LINEAR),	1695	const_iv (GL_LINEAR),
1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1696	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1697	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1698	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1699	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503	const_iv (GL_GENERATE_MIPMAP),	1700	const_iv (GL_GENERATE_MIPMAP),
1504	const_iv (GL_MODULATE),	1701	const_iv (GL_MODULATE),
1505	const_iv (GL_DECAL),	1702	const_iv (GL_DECAL),
1506	const_iv (GL_REPLACE),	1703	const_iv (GL_REPLACE),
		1704	const_iv (GL_DEPTH_BUFFER_BIT),
1507	const_iv (GL_COLOR_BUFFER_BIT),	1705	const_iv (GL_COLOR_BUFFER_BIT),
1508	const_iv (GL_PROJECTION),	1706	const_iv (GL_PROJECTION),
1509	const_iv (GL_MODELVIEW),	1707	const_iv (GL_MODELVIEW),
1510	const_iv (GL_COLOR_LOGIC_OP),	1708	const_iv (GL_COLOR_LOGIC_OP),
1511	const_iv (GL_SEPARABLE_2D),	1709	const_iv (GL_SEPARABLE_2D),
1512	const_iv (GL_CONVOLUTION_2D),	1710	const_iv (GL_CONVOLUTION_2D),
1513	const_iv (GL_CONVOLUTION_BORDER_MODE),	1711	const_iv (GL_CONVOLUTION_BORDER_MODE),
1514	const_iv (GL_CONSTANT_BORDER),	1712	const_iv (GL_CONSTANT_BORDER),
1515	const_iv (GL_LINES),	1713	const_iv (GL_LINES),
		1714	const_iv (GL_LINE_LOOP),
1516	const_iv (GL_QUADS),	1715	const_iv (GL_QUADS),
1517	const_iv (GL_LINE_LOOP),	1716	const_iv (GL_QUAD_STRIP),
		1717	const_iv (GL_TRIANGLES),
		1718	const_iv (GL_TRIANGLE_STRIP),
		1719	const_iv (GL_TRIANGLE_FAN),
1518	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1720	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519	const_iv (GL_FASTEST),	1721	const_iv (GL_FASTEST),
		1722	const_iv (GL_V2F),
		1723	const_iv (GL_V3F),
		1724	const_iv (GL_T2F_V3F),
		1725	const_iv (GL_T2F_N3F_V3F),
1520	# undef const_iv	1726	# undef const_iv
1521	};	1727	};
1522		1728
1523	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1729	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1524	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1730	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525	}	1731	}
1526		1732
		1733	char *
		1734	gl_vendor ()
		1735	CODE:
		1736	RETVAL = (char *)glGetString (GL_VENDOR);
		1737	OUTPUT:
		1738	RETVAL
		1739
		1740	char *
		1741	gl_version ()
		1742	CODE:
		1743	RETVAL = (char *)glGetString (GL_VERSION);
		1744	OUTPUT:
		1745	RETVAL
		1746
		1747	char *
		1748	gl_extensions ()
		1749	CODE:
		1750	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1751	OUTPUT:
		1752	RETVAL
		1753
1527	int glGetError ()	1754	int glGetError ()
		1755
		1756	void glFinish ()
1528		1757
1529	void glClear (int mask)	1758	void glClear (int mask)
1530		1759
1531	void glClearColor (float r, float g, float b, float a = 1.0)	1760	void glClearColor (float r, float g, float b, float a = 1.0)
1532	PROTOTYPE: @	1761	PROTOTYPE: @
…		…
1539		1768
1540	void glHint (int target, int mode)	1769	void glHint (int target, int mode)
1541		1770
1542	void glBlendFunc (int sfactor, int dfactor)	1771	void glBlendFunc (int sfactor, int dfactor)
1543		1772
		1773	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1774	CODE:
		1775	gl_BlendFuncSeparate (sa, da, saa, daa);
		1776
		1777	void glDepthMask (int flag)
		1778
1544	void glLogicOp (int opcode)	1779	void glLogicOp (int opcode)
1545		1780
1546	void glColorMask (int red, int green, int blue, int alpha)	1781	void glColorMask (int red, int green, int blue, int alpha)
1547		1782
1548	void glMatrixMode (int mode)	1783	void glMatrixMode (int mode)
…		…
1551		1786
1552	void glPopMatrix ()	1787	void glPopMatrix ()
1553		1788
1554	void glLoadIdentity ()	1789	void glLoadIdentity ()
1555		1790
1556	# near and far are due to microsofts buggy c compiler	1791	# near_ and far_ are due to microsofts buggy "c" compiler
		1792	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1793
		1794	# near_ and far_ are due to microsofts buggy "c" compiler
1557	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1795	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1558		1796
1559	void glViewport (int x, int y, int width, int height)	1797	void glViewport (int x, int y, int width, int height)
1560		1798
1561	void glScissor (int x, int y, int width, int height)	1799	void glScissor (int x, int y, int width, int height)
…		…
1576		1814
1577	void glEnd ()	1815	void glEnd ()
1578		1816
1579	void glColor (float r, float g, float b, float a = 1.0)	1817	void glColor (float r, float g, float b, float a = 1.0)
1580	PROTOTYPE: @	1818	PROTOTYPE: @
		1819	ALIAS:
		1820	glColor_premultiply = 1
1581	CODE:	1821	CODE:
1582	// 255.999 is close enough to correctness (256 and clamp)	1822	if (ix)
1583	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	1823	{
		1824	r *= a;
		1825	g *= a;
		1826	b *= a;
		1827	}
		1828	// microsoft visual "c" rounds instead of truncating...
		1829	glColor4ub (MIN ((int)(r * 256.f), 255),
		1830	MIN ((int)(g * 256.f), 255),
		1831	MIN ((int)(b * 256.f), 255),
		1832	MIN ((int)(a * 256.f), 255));
		1833
		1834	void glInterleavedArrays (int format, int stride, char *data)
		1835
		1836	void glDrawElements (int mode, int count, int type, char *indices)
		1837
		1838	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1839
		1840	void glRasterPos (float x, float y, float z = 0.)
		1841	CODE:
		1842	glRasterPos3f (0, 0, z);
		1843	glBitmap (0, 0, 0, 0, x, y, 0);
1584		1844
1585	void glVertex (float x, float y, float z = 0.)	1845	void glVertex (float x, float y, float z = 0.)
1586	CODE:	1846	CODE:
1587	glVertex3f (x, y, z);	1847	glVertex3f (x, y, z);
1588		1848
…		…
1600		1860
1601	void glBindTexture (int target, int name)	1861	void glBindTexture (int target, int name)
1602		1862
1603	void glConvolutionParameter (int target, int pname, float params)	1863	void glConvolutionParameter (int target, int pname, float params)
1604	CODE:	1864	CODE:
1605	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1865	if (gl.ConvolutionParameterf)
		1866	gl.ConvolutionParameterf (target, pname, params);
1606		1867
1607	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1868	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1608	CODE:	1869	CODE:
1609	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1870	if (gl.ConvolutionFilter2D)
1610	(target, internalformat, width, height, format, type, data));	1871	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1611		1872
1612	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1873	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1613	CODE:	1874	CODE:
1614	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1875	if (gl.SeparableFilter2D)
1615	(target, internalformat, width, height, format, type, row, column));	1876	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1616		1877
1617	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1878	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1618		1879
1619	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1880	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1620		1881
1621	void glRasterPos (int x, int y)	1882	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1622	CODE:
1623	glRasterPos2i (x, y);
1624		1883
1625	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1884	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1626		1885
1627	int glGenTexture ()	1886	int glGenTexture ()
1628	CODE:	1887	CODE:
…		…
1655		1914
1656	void glEndList ()	1915	void glEndList ()
1657		1916
1658	void glCallList (int list)	1917	void glCallList (int list)
1659		1918
		1919

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC vs. Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.78 by root, Fri May 12 01:47:03 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC