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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	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
89	#ifndef _WIN32	95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
90	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
91	#endif	99	#endif
92	}	100	}
93		101
94	static void	102	static void
…		…
292	ev.code = 1;	300	ev.code = 1;
293	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
294	ev.data2 = 0;	302	ev.data2 = 0;
295		303
296	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;
297	}	322	}
298		323
299	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
300		325
301	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
411		436
412	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; )
413	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
414	}	439	}
415		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
416	void	445	void
417	pango_init ()	446	pango_init ()
418	CODE:	447	CODE:
419	{
420	// delayed, so it can pick up new fonts added by AddFontResourceEx	448	// delayed, so it can pick up new fonts added by AddFontResourceEx
		449	{
		450	{
421	ft2_fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
422	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);
423	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
424		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
425	cairo_fontmap = pango_cairo_font_map_get_default ();	457	cairo_fontmap = pango_cairo_font_map_get_default ();
426	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	}
427	}	470	}
428		471
429	int	472	int
430	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
431		474
…		…
441	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	484	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
443	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
445		488
		489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		491
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
450		496
451	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
452	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
453	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
454		498
455	SDL_EnableUNICODE (1);	499	SDL_EnableUNICODE (1);
456	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
457		501
458	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
467		511
468	++m;	512	++m;
469	}	513	}
470	}	514	}
471		515
		516	char *
		517	SDL_GetError ()
		518
472	int	519	int
473	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
474	CODE:	521	CODE:
475	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
476	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
477	);	524	);
		525	if (RETVAL)
		526	{
478	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	}
479	OUTPUT:	532	OUTPUT:
480	RETVAL	533	RETVAL
481		534
482	void	535	void
483	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
		537
		538	char *
		539	SDL_GetKeyName (int sym)
484		540
485	void	541	void
486	SDL_PollEvent ()	542	SDL_PollEvent ()
487	PPCODE:	543	PPCODE:
488	{	544	{
…		…
507	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
508	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	564	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
509	break;	565	break;
510		566
511	case SDL_MOUSEMOTION:	567	case SDL_MOUSEMOTION:
		568	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		569
512	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	570	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
513	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	571	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
514	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	572	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
515	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	573	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
516	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	574	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
517	break;	575	break;
518		576
519	case SDL_MOUSEBUTTONDOWN:	577	case SDL_MOUSEBUTTONDOWN:
520	case SDL_MOUSEBUTTONUP:	578	case SDL_MOUSEBUTTONUP:
		579	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		580
521	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	581	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
522	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	582	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
523	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	583	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
524	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	584	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
525	break;	585	break;
…		…
551	lowdelay (int fd, int val = 1)	611	lowdelay (int fd, int val = 1)
552	CODE:	612	CODE:
553	#ifndef _WIN32	613	#ifndef _WIN32
554	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
555	#endif	615	#endif
556
557	char *
558	gl_version ()
559	CODE:
560	RETVAL = (char *)glGetString (GL_VERSION);
561	OUTPUT:
562	RETVAL
563
564	char *
565	gl_extensions ()
566	CODE:
567	RETVAL = (char *)glGetString (GL_EXTENSIONS);
568	OUTPUT:
569	RETVAL
570		616
571	void	617	void
572	add_font (char *file)	618	add_font (char *file)
573	CODE:	619	CODE:
574	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
667	}	713	}
668		714
669	void	715	void
670	error (char *message)	716	error (char *message)
671	CODE:	717	CODE:
		718	fprintf (stderr, "ERROR: %s\n", message);
672	#ifdef _WIN32	719	#ifdef _WIN32
673	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	720	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
674	#else
675	fprintf (stderr, "ERROR: %s\n", message);
676	#endif	721	#endif
677		722
678	void	723	void
679	fatal (char *message)	724	fatal (char *message)
680	CODE:	725	CODE:
		726	fprintf (stderr, "FATAL: %s\n", message);
681	#ifdef _WIN32	727	#ifdef _WIN32
682	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
683	#else
684	fprintf (stderr, "FATAL: %s\n", message);
685	#endif	729	#endif
686	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
687		736
688	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
689		738
690	CFClient::Font	739	CFClient::Font
691	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
765		814
766	SV *	815	SV *
767	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
768	CODE:	817	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
771	OUTPUT:	820	OUTPUT:
772	RETVAL	821	RETVAL
773		822
774	void	823	void
775	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.)
…		…
801	set_width (CFClient::Layout self, int max_width = -1)	850	set_width (CFClient::Layout self, int max_width = -1)
802	CODE:	851	CODE:
803	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);
804		853
805	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
806	size (CFClient::Layout self)	880	size (CFClient::Layout self)
807	PPCODE:	881	PPCODE:
808	{	882	{
809	int w, h;	883	int w, h;
810		884
…		…
876		950
877	while (p < e)	951	while (p < e)
878	{	952	{
879	uint32_t rgba = *p;	953	uint32_t rgba = *p;
880	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
881	rgba = SDL_SwapBE32 (rgba);	967	rgba = SDL_SwapBE32 (rgba);
882	*p++ = rgba;	968	*p++ = rgba;
883	}	969	}
884	}	970	}
885		971
…		…
919	}	1005	}
920		1006
921	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
922		1008
923	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
924	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.)
925	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
926	ALIAS:	1049	ALIAS:
927	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
928	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
929	CODE:	1052	CODE:
930	{	1053	{
931	HV hv = (HV )SvRV (self);	1054	HV hv = (HV )SvRV (self);
932	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1055	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
933	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1056	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
934	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1057	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
935	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
936		1058
937	if (items < 5)	1059	if (items < 5)
938	{	1060	{
939	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1061	w = SvNV (*hv_fetch (hv, "w", 1, 1));
940	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1062	h = SvNV (*hv_fetch (hv, "h", 1, 1));
941	}	1063	}
942		1064
943	if (ix)	1065	if (ix)
944	{	1066	{
945	glEnable (GL_BLEND);	1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
946	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);
947	}	1077	}
948		1078
949	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
950
951	if (wrap_mode)
952	{
953	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
954	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
955	}
956		1080
957	glBegin (GL_QUADS);	1081	glBegin (GL_QUADS);
958	glTexCoord2f (0, 0); glVertex2f (x , y );	1082	glTexCoord2f (0, 0); glVertex2f (x , y );
959	glTexCoord2f (0, t); glVertex2f (x , y + h);	1083	glTexCoord2f (0, t); glVertex2f (x , y + h);
960	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1084	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
961	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1085	glTexCoord2f (s, 0); glVertex2f (x + w, y );
962	glEnd ();	1086	glEnd ();
963		1087
964	if (ix)	1088	if (ix)
		1089	{
		1090	glDisable (GL_ALPHA_TEST);
965	glDisable (GL_BLEND);	1091	glDisable (GL_BLEND);
		1092	}
966	}	1093	}
967		1094
968	MODULE = CFClient PACKAGE = CFClient::Map	1095	MODULE = CFClient PACKAGE = CFClient::Map
969		1096
970	CFClient::Map	1097	CFClient::Map
…		…
990	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
991	CODE:	1118	CODE:
992	{	1119	{
993	map_clear (self);	1120	map_clear (self);
994	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
995	Safefree (self);	1123	Safefree (self);
996	}	1124	}
997		1125
998	void	1126	void
999	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1034	tex->r = r;	1162	tex->r = r;
1035	tex->g = g;	1163	tex->g = g;
1036	tex->b = b;	1164	tex->b = b;
1037	tex->a = a;	1165	tex->a = a;
1038	}	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);
1039	}	1176	}
1040		1177
1041	int	1178	int
1042	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
1043	ALIAS:	1180	ALIAS:
1044	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
1045	CODE:	1186	CODE:
1046	switch (ix)	1187	switch (ix)
1047	{	1188	{
1048	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
1049	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;
1050	}	1195	}
1051	OUTPUT:	1196	OUTPUT:
1052	RETVAL	1197	RETVAL
1053		1198
1054	void	1199	void
…		…
1189	OUTPUT:	1334	OUTPUT:
1190	RETVAL	1335	RETVAL
1191		1336
1192	void	1337	void
1193	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)
1194	PPCODE:	1339	CODE:
1195	{	1340	{
1196	int vx, vy;	1341	int vx, vy;
1197	int x, y, z;	1342	int x, y, z;
1198	int last_name;	1343	int last_name;
1199	mapface face;	1344	mapface face;
1200	int sw4 = (sw + 3) & ~3;
1201	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1202	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1203		1345
1204	memset (darkness, 255, sw4 * sh);
1205	SvPOK_only (darkness_sv);
1206	SvCUR_set (darkness_sv, sw4 * sh);
1207
1208	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1209	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1210		1348
1211	/*	1349	/*
1212	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1213	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1214	: 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));
…		…
1237		1375
1238	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1239	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1240	{	1378	{
1241	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1242
1243	darkness[y * sw4 + x] = cell->darkness < 0
1244	? 255 - FOW_DARKNESS
1245	: 255 - cell->darkness;
1246		1380
1247	face = cell->face [z];	1381	face = cell->face [z];
1248		1382
1249	if (face)	1383	if (face)
1250	{	1384	{
…		…
1271		1405
1272	glEnd ();	1406	glEnd ();
1273		1407
1274	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1275	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	}
1276		1444
1277	EXTEND (SP, 3);	1445	EXTEND (SP, 3);
1278	PUSHs (sv_2mortal (newSViv (sw4)));	1446	PUSHs (sv_2mortal (newSViv (sw4)));
1279	PUSHs (sv_2mortal (newSViv (sh)));	1447	PUSHs (sv_2mortal (newSViv (sh)));
1280	PUSHs (darkness_sv);	1448	PUSHs (darkness_sv);
…		…
1481	const_iv (GL_COLOR_MATERIAL),	1649	const_iv (GL_COLOR_MATERIAL),
1482	const_iv (GL_SMOOTH),	1650	const_iv (GL_SMOOTH),
1483	const_iv (GL_FLAT),	1651	const_iv (GL_FLAT),
1484	const_iv (GL_DITHER),	1652	const_iv (GL_DITHER),
1485	const_iv (GL_BLEND),	1653	const_iv (GL_BLEND),
		1654	const_iv (GL_CULL_FACE),
1486	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),
1487	const_iv (GL_AND),	1660	const_iv (GL_AND),
1488	const_iv (GL_ONE),	1661	const_iv (GL_ONE),
1489	const_iv (GL_ZERO),	1662	const_iv (GL_ZERO),
1490	const_iv (GL_SRC_ALPHA),	1663	const_iv (GL_SRC_ALPHA),
1491	const_iv (GL_SRC_ALPHA_SATURATE),	1664	const_iv (GL_DST_ALPHA),
1492	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1665	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1493	const_iv (GL_ONE_MINUS_DST_ALPHA),	1666	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1667	const_iv (GL_SRC_ALPHA_SATURATE),
1494	const_iv (GL_RGB),	1668	const_iv (GL_RGB),
1495	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),
1496	const_iv (GL_UNSIGNED_BYTE),	1673	const_iv (GL_UNSIGNED_BYTE),
		1674	const_iv (GL_UNSIGNED_SHORT),
		1675	const_iv (GL_UNSIGNED_INT),
1497	const_iv (GL_ALPHA),	1676	const_iv (GL_ALPHA),
		1677	const_iv (GL_INTENSITY),
1498	const_iv (GL_LUMINANCE),	1678	const_iv (GL_LUMINANCE),
		1679	const_iv (GL_LUMINANCE_ALPHA),
1499	const_iv (GL_FLOAT),	1680	const_iv (GL_FLOAT),
1500	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1681	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1501	const_iv (GL_COMPILE),	1682	const_iv (GL_COMPILE),
1502	const_iv (GL_TEXTURE_1D),	1683	const_iv (GL_TEXTURE_1D),
1503	const_iv (GL_TEXTURE_2D),	1684	const_iv (GL_TEXTURE_2D),
…		…
1505	const_iv (GL_TEXTURE_MAG_FILTER),	1686	const_iv (GL_TEXTURE_MAG_FILTER),
1506	const_iv (GL_TEXTURE_MIN_FILTER),	1687	const_iv (GL_TEXTURE_MIN_FILTER),
1507	const_iv (GL_TEXTURE_ENV_MODE),	1688	const_iv (GL_TEXTURE_ENV_MODE),
1508	const_iv (GL_TEXTURE_WRAP_S),	1689	const_iv (GL_TEXTURE_WRAP_S),
1509	const_iv (GL_TEXTURE_WRAP_T),	1690	const_iv (GL_TEXTURE_WRAP_T),
		1691	const_iv (GL_REPEAT),
1510	const_iv (GL_CLAMP),	1692	const_iv (GL_CLAMP),
1511	const_iv (GL_REPEAT),	1693	const_iv (GL_CLAMP_TO_EDGE),
1512	const_iv (GL_NEAREST),	1694	const_iv (GL_NEAREST),
1513	const_iv (GL_LINEAR),	1695	const_iv (GL_LINEAR),
1514	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1696	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1515	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1697	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1516	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1698	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1517	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1699	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1518	const_iv (GL_GENERATE_MIPMAP),	1700	const_iv (GL_GENERATE_MIPMAP),
1519	const_iv (GL_MODULATE),	1701	const_iv (GL_MODULATE),
1520	const_iv (GL_DECAL),	1702	const_iv (GL_DECAL),
1521	const_iv (GL_REPLACE),	1703	const_iv (GL_REPLACE),
		1704	const_iv (GL_DEPTH_BUFFER_BIT),
1522	const_iv (GL_COLOR_BUFFER_BIT),	1705	const_iv (GL_COLOR_BUFFER_BIT),
1523	const_iv (GL_PROJECTION),	1706	const_iv (GL_PROJECTION),
1524	const_iv (GL_MODELVIEW),	1707	const_iv (GL_MODELVIEW),
1525	const_iv (GL_COLOR_LOGIC_OP),	1708	const_iv (GL_COLOR_LOGIC_OP),
1526	const_iv (GL_SEPARABLE_2D),	1709	const_iv (GL_SEPARABLE_2D),
1527	const_iv (GL_CONVOLUTION_2D),	1710	const_iv (GL_CONVOLUTION_2D),
1528	const_iv (GL_CONVOLUTION_BORDER_MODE),	1711	const_iv (GL_CONVOLUTION_BORDER_MODE),
1529	const_iv (GL_CONSTANT_BORDER),	1712	const_iv (GL_CONSTANT_BORDER),
1530	const_iv (GL_LINES),	1713	const_iv (GL_LINES),
		1714	const_iv (GL_LINE_LOOP),
1531	const_iv (GL_QUADS),	1715	const_iv (GL_QUADS),
1532	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),
1533	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1720	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1534	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),
1535	# undef const_iv	1726	# undef const_iv
1536	};	1727	};
1537		1728
1538	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; )
1539	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1730	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1540	}	1731	}
1541		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
1542	int glGetError ()	1754	int glGetError ()
		1755
		1756	void glFinish ()
1543		1757
1544	void glClear (int mask)	1758	void glClear (int mask)
1545		1759
1546	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)
1547	PROTOTYPE: @	1761	PROTOTYPE: @
…		…
1554		1768
1555	void glHint (int target, int mode)	1769	void glHint (int target, int mode)
1556		1770
1557	void glBlendFunc (int sfactor, int dfactor)	1771	void glBlendFunc (int sfactor, int dfactor)
1558		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
1559	void glLogicOp (int opcode)	1779	void glLogicOp (int opcode)
1560		1780
1561	void glColorMask (int red, int green, int blue, int alpha)	1781	void glColorMask (int red, int green, int blue, int alpha)
1562		1782
1563	void glMatrixMode (int mode)	1783	void glMatrixMode (int mode)
…		…
1566		1786
1567	void glPopMatrix ()	1787	void glPopMatrix ()
1568		1788
1569	void glLoadIdentity ()	1789	void glLoadIdentity ()
1570		1790
1571	# 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
1572	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_)
1573		1796
1574	void glViewport (int x, int y, int width, int height)	1797	void glViewport (int x, int y, int width, int height)
1575		1798
1576	void glScissor (int x, int y, int width, int height)	1799	void glScissor (int x, int y, int width, int height)
…		…
1591		1814
1592	void glEnd ()	1815	void glEnd ()
1593		1816
1594	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)
1595	PROTOTYPE: @	1818	PROTOTYPE: @
		1819	ALIAS:
		1820	glColor_premultiply = 1
1596	CODE:	1821	CODE:
		1822	if (ix)
		1823	{
		1824	r *= a;
		1825	g *= a;
		1826	b *= a;
		1827	}
		1828	// microsoft visual "c" rounds instead of truncating...
1597	glColor4ub (MIN ((int)(r * 255.f), 255),	1829	glColor4ub (MIN ((int)(r * 256.f), 255),
1598	MIN ((int)(g * 255.f), 255),	1830	MIN ((int)(g * 256.f), 255),
1599	MIN ((int)(b * 255.f), 255),	1831	MIN ((int)(b * 256.f), 255),
1600	MIN ((int)(a * 255.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);
1601		1844
1602	void glVertex (float x, float y, float z = 0.)	1845	void glVertex (float x, float y, float z = 0.)
1603	CODE:	1846	CODE:
1604	glVertex3f (x, y, z);	1847	glVertex3f (x, y, z);
1605		1848
…		…
1617		1860
1618	void glBindTexture (int target, int name)	1861	void glBindTexture (int target, int name)
1619		1862
1620	void glConvolutionParameter (int target, int pname, float params)	1863	void glConvolutionParameter (int target, int pname, float params)
1621	CODE:	1864	CODE:
1622	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1865	if (gl.ConvolutionParameterf)
		1866	gl.ConvolutionParameterf (target, pname, params);
1623		1867
1624	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)
1625	CODE:	1869	CODE:
1626	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1870	if (gl.ConvolutionFilter2D)
1627	(target, internalformat, width, height, format, type, data));	1871	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1628		1872
1629	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)
1630	CODE:	1874	CODE:
1631	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1875	if (gl.SeparableFilter2D)
1632	(target, internalformat, width, height, format, type, row, column));	1876	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1633		1877
1634	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)
1635		1879
1636	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)
1637		1881
1638	void glRasterPos (int x, int y)	1882	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1639	CODE:
1640	glRasterPos2i (x, y);
1641		1883
1642	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)
1643		1885
1644	int glGenTexture ()	1886	int glGenTexture ()
1645	CODE:	1887	CODE:
…		…
1672		1914
1673	void glEndList ()	1915	void glEndList ()
1674		1916
1675	void glCallList (int list)	1917	void glCallList (int list)
1676		1918
		1919

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.82 by root, Mon May 15 00:15:08 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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC