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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.84 by root, Wed May 17 15:18:57 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	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
294	ev.code = 1;	300	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	302	ev.data2 = 0;
297		303
298	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;
299	}	322	}
300		323
301	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
302		325
303	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
413		436
414	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; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	439	}
417		440
		441	NV floor (NV x)
		442
		443	NV ceil (NV x)
		444
418	void	445	void
419	pango_init ()	446	pango_init ()
420	CODE:	447	CODE:
421	{
422	// 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	{
423	ft2_fontmap = pango_ft2_font_map_new ();	451	ft2_fontmap = pango_ft2_font_map_new ();
424	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);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	453	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		454	}
		455	{
		456	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	457	cairo_fontmap = pango_cairo_font_map_get_default ();
428	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	}
429	}	470	}
430		471
431	int	472	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	473	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		474
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	484	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	485	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	486	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	487	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		488
		489	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		490	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		491
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	492	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	493	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	494	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	495	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		496
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	497	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		498
457	SDL_EnableUNICODE (1);	499	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	500	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		501
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	502	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		511
470	++m;	512	++m;
471	}	513	}
472	}	514	}
473		515
		516	char *
		517	SDL_GetError ()
		518
474	int	519	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	521	CODE:
477	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	524	);
		525	if (RETVAL)
		526	{
480	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	}
481	OUTPUT:	532	OUTPUT:
482	RETVAL	533	RETVAL
483		534
484	void	535	void
485	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
		537
		538	char *
		539	SDL_GetKeyName (int sym)
486		540
487	void	541	void
488	SDL_PollEvent ()	542	SDL_PollEvent ()
489	PPCODE:	543	PPCODE:
490	{	544	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	564	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	565	break;
512		566
513	case SDL_MOUSEMOTION:	567	case SDL_MOUSEMOTION:
		568	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		569
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	570	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	571	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	572	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	573	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	574	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	575	break;
520		576
521	case SDL_MOUSEBUTTONDOWN:	577	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	578	case SDL_MOUSEBUTTONUP:
		579	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		580
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	581	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	582	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	583	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	584	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	585	break;
…		…
553	lowdelay (int fd, int val = 1)	611	lowdelay (int fd, int val = 1)
554	CODE:	612	CODE:
555	#ifndef _WIN32	613	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	615	#endif
558
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		616
573	void	617	void
574	add_font (char *file)	618	add_font (char *file)
575	CODE:	619	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	713	}
670		714
671	void	715	void
672	error (char *message)	716	error (char *message)
673	CODE:	717	CODE:
		718	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	719	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	720	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	721	#endif
679		722
680	void	723	void
681	fatal (char *message)	724	fatal (char *message)
682	CODE:	725	CODE:
		726	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	727	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	729	#endif
688	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
689		736
690	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
691		738
692	CFClient::Font	739	CFClient::Font
693	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
767		814
768	SV *	815	SV *
769	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
770	CODE:	817	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
773	OUTPUT:	820	OUTPUT:
774	RETVAL	821	RETVAL
775		822
776	void	823	void
777	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.)
…		…
903		950
904	while (p < e)	951	while (p < e)
905	{	952	{
906	uint32_t rgba = *p;	953	uint32_t rgba = *p;
907	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
908	rgba = SDL_SwapBE32 (rgba);	967	rgba = SDL_SwapBE32 (rgba);
909	*p++ = rgba;	968	*p++ = rgba;
910	}	969	}
911	}	970	}
912		971
…		…
946	}	1005	}
947		1006
948	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
949		1008
950	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
951	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.)
952	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
953	ALIAS:	1049	ALIAS:
954	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
955	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
956	CODE:	1052	CODE:
957	{	1053	{
958	HV hv = (HV )SvRV (self);	1054	HV hv = (HV )SvRV (self);
959	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1055	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
960	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1056	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
961	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1057	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
962	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
963		1058
964	if (items < 5)	1059	if (items < 5)
965	{	1060	{
966	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1061	w = SvNV (*hv_fetch (hv, "w", 1, 1));
967	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1062	h = SvNV (*hv_fetch (hv, "h", 1, 1));
968	}	1063	}
969		1064
970	if (ix)	1065	if (ix)
971	{	1066	{
972	glEnable (GL_BLEND);	1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
973	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);
974	}	1077	}
975		1078
976	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
977
978	if (wrap_mode)
979	{
980	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
982	}
983		1080
984	glBegin (GL_QUADS);	1081	glBegin (GL_QUADS);
985	glTexCoord2f (0, 0); glVertex2f (x , y );	1082	glTexCoord2f (0, 0); glVertex2f (x , y );
986	glTexCoord2f (0, t); glVertex2f (x , y + h);	1083	glTexCoord2f (0, t); glVertex2f (x , y + h);
987	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1084	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
988	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1085	glTexCoord2f (s, 0); glVertex2f (x + w, y );
989	glEnd ();	1086	glEnd ();
990		1087
991	if (ix)	1088	if (ix)
		1089	{
		1090	glDisable (GL_ALPHA_TEST);
992	glDisable (GL_BLEND);	1091	glDisable (GL_BLEND);
		1092	}
993	}	1093	}
994		1094
995	MODULE = CFClient PACKAGE = CFClient::Map	1095	MODULE = CFClient PACKAGE = CFClient::Map
996		1096
997	CFClient::Map	1097	CFClient::Map
…		…
1017	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
1018	CODE:	1118	CODE:
1019	{	1119	{
1020	map_clear (self);	1120	map_clear (self);
1021	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
1022	Safefree (self);	1123	Safefree (self);
1023	}	1124	}
1024		1125
1025	void	1126	void
1026	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1061	tex->r = r;	1162	tex->r = r;
1062	tex->g = g;	1163	tex->g = g;
1063	tex->b = b;	1164	tex->b = b;
1064	tex->a = a;	1165	tex->a = a;
1065	}	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);
1066	}	1176	}
1067		1177
1068	int	1178	int
1069	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
1070	ALIAS:	1180	ALIAS:
1071	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
1072	CODE:	1186	CODE:
1073	switch (ix)	1187	switch (ix)
1074	{	1188	{
1075	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
1076	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;
1077	}	1195	}
1078	OUTPUT:	1196	OUTPUT:
1079	RETVAL	1197	RETVAL
1080		1198
1081	void	1199	void
…		…
1216	OUTPUT:	1334	OUTPUT:
1217	RETVAL	1335	RETVAL
1218		1336
1219	void	1337	void
1220	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)
1221	PPCODE:	1339	CODE:
1222	{	1340	{
1223	int vx, vy;	1341	int vx, vy;
1224	int x, y, z;	1342	int x, y, z;
1225	int last_name;	1343	int last_name;
1226	mapface face;	1344	mapface face;
1227	int sw4 = (sw + 3) & ~3;
1228	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1229	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1230		1345
1231	memset (darkness, 255, sw4 * sh);
1232	SvPOK_only (darkness_sv);
1233	SvCUR_set (darkness_sv, sw4 * sh);
1234
1235	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1236	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1237		1348
1238	/*	1349	/*
1239	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1240	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1241	: 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));
…		…
1264		1375
1265	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1266	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1267	{	1378	{
1268	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1269
1270	darkness[y * sw4 + x] = cell->darkness < 0
1271	? 255 - FOW_DARKNESS
1272	: 255 - cell->darkness;
1273		1380
1274	face = cell->face [z];	1381	face = cell->face [z];
1275		1382
1276	if (face)	1383	if (face)
1277	{	1384	{
…		…
1298		1405
1299	glEnd ();	1406	glEnd ();
1300		1407
1301	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1302	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	}
1303		1444
1304	EXTEND (SP, 3);	1445	EXTEND (SP, 3);
1305	PUSHs (sv_2mortal (newSViv (sw4)));	1446	PUSHs (sv_2mortal (newSViv (sw4)));
1306	PUSHs (sv_2mortal (newSViv (sh)));	1447	PUSHs (sv_2mortal (newSViv (sh)));
1307	PUSHs (darkness_sv);	1448	PUSHs (darkness_sv);
…		…
1508	const_iv (GL_COLOR_MATERIAL),	1649	const_iv (GL_COLOR_MATERIAL),
1509	const_iv (GL_SMOOTH),	1650	const_iv (GL_SMOOTH),
1510	const_iv (GL_FLAT),	1651	const_iv (GL_FLAT),
1511	const_iv (GL_DITHER),	1652	const_iv (GL_DITHER),
1512	const_iv (GL_BLEND),	1653	const_iv (GL_BLEND),
		1654	const_iv (GL_CULL_FACE),
1513	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),
1514	const_iv (GL_AND),	1660	const_iv (GL_AND),
1515	const_iv (GL_ONE),	1661	const_iv (GL_ONE),
1516	const_iv (GL_ZERO),	1662	const_iv (GL_ZERO),
1517	const_iv (GL_SRC_ALPHA),	1663	const_iv (GL_SRC_ALPHA),
1518	const_iv (GL_SRC_ALPHA_SATURATE),	1664	const_iv (GL_DST_ALPHA),
1519	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1665	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1520	const_iv (GL_ONE_MINUS_DST_ALPHA),	1666	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1667	const_iv (GL_SRC_ALPHA_SATURATE),
1521	const_iv (GL_RGB),	1668	const_iv (GL_RGB),
1522	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),
1523	const_iv (GL_UNSIGNED_BYTE),	1673	const_iv (GL_UNSIGNED_BYTE),
		1674	const_iv (GL_UNSIGNED_SHORT),
		1675	const_iv (GL_UNSIGNED_INT),
1524	const_iv (GL_ALPHA),	1676	const_iv (GL_ALPHA),
		1677	const_iv (GL_INTENSITY),
1525	const_iv (GL_LUMINANCE),	1678	const_iv (GL_LUMINANCE),
		1679	const_iv (GL_LUMINANCE_ALPHA),
1526	const_iv (GL_FLOAT),	1680	const_iv (GL_FLOAT),
1527	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1681	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1528	const_iv (GL_COMPILE),	1682	const_iv (GL_COMPILE),
1529	const_iv (GL_TEXTURE_1D),	1683	const_iv (GL_TEXTURE_1D),
1530	const_iv (GL_TEXTURE_2D),	1684	const_iv (GL_TEXTURE_2D),
…		…
1532	const_iv (GL_TEXTURE_MAG_FILTER),	1686	const_iv (GL_TEXTURE_MAG_FILTER),
1533	const_iv (GL_TEXTURE_MIN_FILTER),	1687	const_iv (GL_TEXTURE_MIN_FILTER),
1534	const_iv (GL_TEXTURE_ENV_MODE),	1688	const_iv (GL_TEXTURE_ENV_MODE),
1535	const_iv (GL_TEXTURE_WRAP_S),	1689	const_iv (GL_TEXTURE_WRAP_S),
1536	const_iv (GL_TEXTURE_WRAP_T),	1690	const_iv (GL_TEXTURE_WRAP_T),
		1691	const_iv (GL_REPEAT),
1537	const_iv (GL_CLAMP),	1692	const_iv (GL_CLAMP),
1538	const_iv (GL_REPEAT),	1693	const_iv (GL_CLAMP_TO_EDGE),
1539	const_iv (GL_NEAREST),	1694	const_iv (GL_NEAREST),
1540	const_iv (GL_LINEAR),	1695	const_iv (GL_LINEAR),
1541	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1696	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1542	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1697	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1543	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1698	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1544	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1699	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1545	const_iv (GL_GENERATE_MIPMAP),	1700	const_iv (GL_GENERATE_MIPMAP),
1546	const_iv (GL_MODULATE),	1701	const_iv (GL_MODULATE),
1547	const_iv (GL_DECAL),	1702	const_iv (GL_DECAL),
1548	const_iv (GL_REPLACE),	1703	const_iv (GL_REPLACE),
		1704	const_iv (GL_DEPTH_BUFFER_BIT),
1549	const_iv (GL_COLOR_BUFFER_BIT),	1705	const_iv (GL_COLOR_BUFFER_BIT),
1550	const_iv (GL_PROJECTION),	1706	const_iv (GL_PROJECTION),
1551	const_iv (GL_MODELVIEW),	1707	const_iv (GL_MODELVIEW),
1552	const_iv (GL_COLOR_LOGIC_OP),	1708	const_iv (GL_COLOR_LOGIC_OP),
1553	const_iv (GL_SEPARABLE_2D),	1709	const_iv (GL_SEPARABLE_2D),
1554	const_iv (GL_CONVOLUTION_2D),	1710	const_iv (GL_CONVOLUTION_2D),
1555	const_iv (GL_CONVOLUTION_BORDER_MODE),	1711	const_iv (GL_CONVOLUTION_BORDER_MODE),
1556	const_iv (GL_CONSTANT_BORDER),	1712	const_iv (GL_CONSTANT_BORDER),
1557	const_iv (GL_LINES),	1713	const_iv (GL_LINES),
		1714	const_iv (GL_LINE_LOOP),
1558	const_iv (GL_QUADS),	1715	const_iv (GL_QUADS),
1559	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),
1560	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1720	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1561	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),
1562	# undef const_iv	1726	# undef const_iv
1563	};	1727	};
1564		1728
1565	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; )
1566	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1730	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1567	}	1731	}
1568		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
1569	int glGetError ()	1754	int glGetError ()
		1755
		1756	void glFinish ()
1570		1757
1571	void glClear (int mask)	1758	void glClear (int mask)
1572		1759
1573	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)
1574	PROTOTYPE: @	1761	PROTOTYPE: @
…		…
1581		1768
1582	void glHint (int target, int mode)	1769	void glHint (int target, int mode)
1583		1770
1584	void glBlendFunc (int sfactor, int dfactor)	1771	void glBlendFunc (int sfactor, int dfactor)
1585		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
1586	void glLogicOp (int opcode)	1779	void glLogicOp (int opcode)
1587		1780
1588	void glColorMask (int red, int green, int blue, int alpha)	1781	void glColorMask (int red, int green, int blue, int alpha)
1589		1782
1590	void glMatrixMode (int mode)	1783	void glMatrixMode (int mode)
…		…
1593		1786
1594	void glPopMatrix ()	1787	void glPopMatrix ()
1595		1788
1596	void glLoadIdentity ()	1789	void glLoadIdentity ()
1597		1790
1598	# 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
1599	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_)
1600		1796
1601	void glViewport (int x, int y, int width, int height)	1797	void glViewport (int x, int y, int width, int height)
1602		1798
1603	void glScissor (int x, int y, int width, int height)	1799	void glScissor (int x, int y, int width, int height)
…		…
1618		1814
1619	void glEnd ()	1815	void glEnd ()
1620		1816
1621	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)
1622	PROTOTYPE: @	1818	PROTOTYPE: @
		1819	ALIAS:
		1820	glColor_premultiply = 1
1623	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...
1624	glColor4ub (MIN ((int)(r * 255.f), 255),	1829	glColor4ub (MIN ((int)(r * 256.f), 255),
1625	MIN ((int)(g * 255.f), 255),	1830	MIN ((int)(g * 256.f), 255),
1626	MIN ((int)(b * 255.f), 255),	1831	MIN ((int)(b * 256.f), 255),
1627	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);
1628		1844
1629	void glVertex (float x, float y, float z = 0.)	1845	void glVertex (float x, float y, float z = 0.)
1630	CODE:	1846	CODE:
1631	glVertex3f (x, y, z);	1847	glVertex3f (x, y, z);
1632		1848
…		…
1644		1860
1645	void glBindTexture (int target, int name)	1861	void glBindTexture (int target, int name)
1646		1862
1647	void glConvolutionParameter (int target, int pname, float params)	1863	void glConvolutionParameter (int target, int pname, float params)
1648	CODE:	1864	CODE:
1649	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1865	if (gl.ConvolutionParameterf)
		1866	gl.ConvolutionParameterf (target, pname, params);
1650		1867
1651	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)
1652	CODE:	1869	CODE:
1653	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1870	if (gl.ConvolutionFilter2D)
1654	(target, internalformat, width, height, format, type, data));	1871	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1655		1872
1656	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)
1657	CODE:	1874	CODE:
1658	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1875	if (gl.SeparableFilter2D)
1659	(target, internalformat, width, height, format, type, row, column));	1876	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1660		1877
1661	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)
1662		1879
1663	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)
1664		1881
1665	void glRasterPos (int x, int y)	1882	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1666	CODE:
1667	glRasterPos2i (x, y);
1668		1883
1669	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)
1670		1885
1671	int glGenTexture ()	1886	int glGenTexture ()
1672	CODE:	1887	CODE:
…		…
1699		1914
1700	void glEndList ()	1915	void glEndList ()
1701		1916
1702	void glCallList (int list)	1917	void glCallList (int list)
1703		1918
		1919

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.84 by root, Wed May 17 15:18:57 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.84 by root, Wed May 17 15:18:57 2006 UTC vs.
Revision 1.116 by root, Thu Jun 15 08:29:16 2006 UTC