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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.117 by root, Thu Jun 15 15:33:57 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
…		…
470		511
471	++m;	512	++m;
472	}	513	}
473	}	514	}
474		515
		516	char *
		517	SDL_GetError ()
		518
475	int	519	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	520	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	521	CODE:
478	RETVAL = !!SDL_SetVideoMode (	522	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	523	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	524	);
		525	if (RETVAL)
		526	{
481	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	}
482	OUTPUT:	532	OUTPUT:
483	RETVAL	533	RETVAL
484		534
485	void	535	void
486	SDL_GL_SwapBuffers ()	536	SDL_GL_SwapBuffers ()
		537
		538	char *
		539	SDL_GetKeyName (int sym)
487		540
488	void	541	void
489	SDL_PollEvent ()	542	SDL_PollEvent ()
490	PPCODE:	543	PPCODE:
491	{	544	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	563	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	564	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	565	break;
513		566
514	case SDL_MOUSEMOTION:	567	case SDL_MOUSEMOTION:
		568	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		569
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	570	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	571	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	572	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	573	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	574	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	575	break;
521		576
522	case SDL_MOUSEBUTTONDOWN:	577	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	578	case SDL_MOUSEBUTTONUP:
		579	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		580
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	581	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	582	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	583	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	584	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	585	break;
…		…
554	lowdelay (int fd, int val = 1)	611	lowdelay (int fd, int val = 1)
555	CODE:	612	CODE:
556	#ifndef _WIN32	613	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	614	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	615	#endif
559
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		616
574	void	617	void
575	add_font (char *file)	618	add_font (char *file)
576	CODE:	619	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	620	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
670	}	713	}
671		714
672	void	715	void
673	error (char *message)	716	error (char *message)
674	CODE:	717	CODE:
		718	fprintf (stderr, "ERROR: %s\n", message);
675	#ifdef _WIN32	719	#ifdef _WIN32
676	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	720	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
677	#else
678	fprintf (stderr, "ERROR: %s\n", message);
679	#endif	721	#endif
680		722
681	void	723	void
682	fatal (char *message)	724	fatal (char *message)
683	CODE:	725	CODE:
		726	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	727	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	728	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#else
687	fprintf (stderr, "FATAL: %s\n", message);
688	#endif	729	#endif
689	exit (1);	730	_exit (1);
		731
		732	void
		733	_exit (int retval)
		734	CODE:
		735	_exit (retval);
690		736
691	MODULE = CFClient PACKAGE = CFClient::Font	737	MODULE = CFClient PACKAGE = CFClient::Font
692		738
693	CFClient::Font	739	CFClient::Font
694	new_from_file (SV class, char path, int id = 0)	740	new_from_file (SV class, char path, int id = 0)
…		…
768		814
769	SV *	815	SV *
770	get_text (CFClient::Layout self)	816	get_text (CFClient::Layout self)
771	CODE:	817	CODE:
772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	818	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773	SvUTF8_on (RETVAL);	819	sv_utf8_decode (RETVAL);
774	OUTPUT:	820	OUTPUT:
775	RETVAL	821	RETVAL
776		822
777	void	823	void
778	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.)
…		…
904		950
905	while (p < e)	951	while (p < e)
906	{	952	{
907	uint32_t rgba = *p;	953	uint32_t rgba = *p;
908	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
909	rgba = SDL_SwapBE32 (rgba);	967	rgba = SDL_SwapBE32 (rgba);
910	*p++ = rgba;	968	*p++ = rgba;
911	}	969	}
912	}	970	}
913		971
…		…
947	}	1005	}
948		1006
949	MODULE = CFClient PACKAGE = CFClient::Texture	1007	MODULE = CFClient PACKAGE = CFClient::Texture
950		1008
951	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
952	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.)
953	PROTOTYPE: $$$;$$	1048	PROTOTYPE: $$$;$$
954	ALIAS:	1049	ALIAS:
955	draw_quad_alpha = 1	1050	draw_quad_alpha = 1
956	draw_quad_alpha_premultiplied = 2	1051	draw_quad_alpha_premultiplied = 2
957	CODE:	1052	CODE:
958	{	1053	{
959	HV hv = (HV )SvRV (self);	1054	HV hv = (HV )SvRV (self);
960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1055	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1056	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1057	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964		1058
965	if (items < 5)	1059	if (items < 5)
966	{	1060	{
967	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1061	w = SvNV (*hv_fetch (hv, "w", 1, 1));
968	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1062	h = SvNV (*hv_fetch (hv, "h", 1, 1));
969	}	1063	}
970		1064
971	if (ix)	1065	if (ix)
972	{	1066	{
973	glEnable (GL_BLEND);	1067	glEnable (GL_BLEND);
		1068
		1069	if (ix == 2)
974	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);
975	}	1077	}
976		1078
977	glBindTexture (GL_TEXTURE_2D, name);	1079	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1080
985	glBegin (GL_QUADS);	1081	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1082	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1083	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1084	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1085	glTexCoord2f (s, 0); glVertex2f (x + w, y );
990	glEnd ();	1086	glEnd ();
991		1087
992	if (ix)	1088	if (ix)
		1089	{
		1090	glDisable (GL_ALPHA_TEST);
993	glDisable (GL_BLEND);	1091	glDisable (GL_BLEND);
		1092	}
994	}	1093	}
995		1094
996	MODULE = CFClient PACKAGE = CFClient::Map	1095	MODULE = CFClient PACKAGE = CFClient::Map
997		1096
998	CFClient::Map	1097	CFClient::Map
…		…
1018	DESTROY (CFClient::Map self)	1117	DESTROY (CFClient::Map self)
1019	CODE:	1118	CODE:
1020	{	1119	{
1021	map_clear (self);	1120	map_clear (self);
1022	Safefree (self->face);	1121	Safefree (self->face);
		1122	Safefree (self->tex);
1023	Safefree (self);	1123	Safefree (self);
1024	}	1124	}
1025		1125
1026	void	1126	void
1027	clear (CFClient::Map self)	1127	clear (CFClient::Map self)
…		…
1062	tex->r = r;	1162	tex->r = r;
1063	tex->g = g;	1163	tex->g = g;
1064	tex->b = b;	1164	tex->b = b;
1065	tex->a = a;	1165	tex->a = a;
1066	}	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);
1067	}	1176	}
1068		1177
1069	int	1178	int
1070	ox (CFClient::Map self)	1179	ox (CFClient::Map self)
1071	ALIAS:	1180	ALIAS:
1072	oy = 1	1181	oy = 1
		1182	x = 2
		1183	y = 3
		1184	w = 4
		1185	h = 5
1073	CODE:	1186	CODE:
1074	switch (ix)	1187	switch (ix)
1075	{	1188	{
1076	case 0: RETVAL = self->ox; break;	1189	case 0: RETVAL = self->ox; break;
1077	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;
1078	}	1195	}
1079	OUTPUT:	1196	OUTPUT:
1080	RETVAL	1197	RETVAL
1081		1198
1082	void	1199	void
…		…
1217	OUTPUT:	1334	OUTPUT:
1218	RETVAL	1335	RETVAL
1219		1336
1220	void	1337	void
1221	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)
1222	PPCODE:	1339	CODE:
1223	{	1340	{
1224	int vx, vy;	1341	int vx, vy;
1225	int x, y, z;	1342	int x, y, z;
1226	int last_name;	1343	int last_name;
1227	mapface face;	1344	mapface face;
1228	int sw4 = (sw + 3) & ~3;
1229	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1230	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1231		1345
1232	memset (darkness, 255, sw4 * sh);
1233	SvPOK_only (darkness_sv);
1234	SvCUR_set (darkness_sv, sw4 * sh);
1235
1236	vx = self->x + (self->w - sw) / 2 - shift_x;	1346	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
1237	vy = self->y + (self->h - sh) / 2 - shift_y;	1347	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
1238		1348
1239	/*	1349	/*
1240	int vx = self->vx = self->w >= sw	1350	int vx = self->vx = self->w >= sw
1241	? self->x + (self->w - sw) / 2	1351	? self->x + (self->w - sw) / 2
1242	: 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));
…		…
1246	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1356	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247	*/	1357	*/
1248		1358
1249	glColor4ub (255, 255, 255, 255);	1359	glColor4ub (255, 255, 255, 255);
1250		1360
		1361	glEnable (GL_BLEND);
1251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1362	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252	glEnable (GL_BLEND);
1253	glEnable (GL_TEXTURE_2D);	1363	glEnable (GL_TEXTURE_2D);
1254	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1364	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255		1365
1256	glBegin (GL_QUADS);	1366	glBegin (GL_QUADS);
1257		1367
…		…
1265		1375
1266	for (x = 0; x < sw; x++)	1376	for (x = 0; x < sw; x++)
1267	if (row->c0 <= x + vx && x + vx < row->c1)	1377	if (row->c0 <= x + vx && x + vx < row->c1)
1268	{	1378	{
1269	mapcell *cell = row->col + (x + vx - row->c0);	1379	mapcell *cell = row->col + (x + vx - row->c0);
1270
1271	darkness[y * sw4 + x] = cell->darkness < 0
1272	? 255 - FOW_DARKNESS
1273	: 255 - cell->darkness;
1274		1380
1275	face = cell->face [z];	1381	face = cell->face [z];
1276		1382
1277	if (face)	1383	if (face)
1278	{	1384	{
…		…
1299		1405
1300	glEnd ();	1406	glEnd ();
1301		1407
1302	glDisable (GL_TEXTURE_2D);	1408	glDisable (GL_TEXTURE_2D);
1303	glDisable (GL_BLEND);	1409	glDisable (GL_BLEND);
		1410	}
		1411
		1412	void
		1413	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1414	CODE:
		1415	{
		1416	static float color[16][3] = {
		1417	{ 0.00, 0.00, 0.00 },
		1418	{ 1.00, 1.00, 1.00 },
		1419	{ 0.00, 0.00, 0.55 },
		1420	{ 1.00, 0.00, 0.00 },
		1421
		1422	{ 1.00, 0.54, 0.00 },
		1423	{ 0.11, 0.56, 1.00 },
		1424	{ 0.93, 0.46, 0.00 },
		1425	{ 0.18, 0.54, 0.34 },
		1426
		1427	{ 0.56, 0.73, 0.56 },
		1428	{ 0.80, 0.80, 0.80 },
		1429	{ 0.55, 0.41, 0.13 },
		1430	{ 0.99, 0.77, 0.26 },
		1431
		1432	{ 0.74, 0.65, 0.41 },
		1433
		1434	{ 0.00, 1.00, 1.00 },
		1435	{ 1.00, 0.00, 1.00 },
		1436	{ 1.00, 1.00, 0.00 },
		1437	};
		1438
		1439	int x, y;
		1440
		1441	glEnable (GL_TEXTURE_2D);
		1442	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1443	glEnable (GL_BLEND);
		1444	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1445	glBegin (GL_QUADS);
		1446
		1447	for (y = 0; y < h; y++)
		1448	for (x = 0; x < w; x++)
		1449	{
		1450	unsigned char m = data [x + y * w];
		1451
		1452	float *c = color [m & 15];
		1453
		1454	float tx1 = m & 0x40 ? 0.5 : m & 0x80 ? 0.25 : 0.;
		1455	float tx2 = tx1 + 0.25;
		1456
		1457	glColor4f (c[0], c[1], c[2], 0.75);
		1458	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1459	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1460	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1461	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1462	}
		1463
		1464	glEnd ();
		1465	glDisable (GL_BLEND);
		1466	glDisable (GL_TEXTURE_2D);
		1467	}
		1468
		1469	void
		1470	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1471	PPCODE:
		1472	{
		1473	int vx, vy;
		1474	int x, y;
		1475	int sw4 = (sw + 3) & ~3;
		1476	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1477	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1478
		1479	memset (darkness, 255, sw4 * sh);
		1480	SvPOK_only (darkness_sv);
		1481	SvCUR_set (darkness_sv, sw4 * sh);
		1482
		1483	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1484	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1485
		1486	for (y = 0; y < sh; y++)
		1487	if (0 <= y + vy && y + vy < self->rows)
		1488	{
		1489	maprow *row = self->row + (y + vy);
		1490
		1491	for (x = 0; x < sw; x++)
		1492	if (row->c0 <= x + vx && x + vx < row->c1)
		1493	{
		1494	mapcell *cell = row->col + (x + vx - row->c0);
		1495
		1496	darkness[y * sw4 + x] = cell->darkness < 0
		1497	? 255 - FOW_DARKNESS
		1498	: 255 - cell->darkness;
		1499	}
		1500	}
1304		1501
1305	EXTEND (SP, 3);	1502	EXTEND (SP, 3);
1306	PUSHs (sv_2mortal (newSViv (sw4)));	1503	PUSHs (sv_2mortal (newSViv (sw4)));
1307	PUSHs (sv_2mortal (newSViv (sh)));	1504	PUSHs (sv_2mortal (newSViv (sh)));
1308	PUSHs (darkness_sv);	1505	PUSHs (darkness_sv);
…		…
1509	const_iv (GL_COLOR_MATERIAL),	1706	const_iv (GL_COLOR_MATERIAL),
1510	const_iv (GL_SMOOTH),	1707	const_iv (GL_SMOOTH),
1511	const_iv (GL_FLAT),	1708	const_iv (GL_FLAT),
1512	const_iv (GL_DITHER),	1709	const_iv (GL_DITHER),
1513	const_iv (GL_BLEND),	1710	const_iv (GL_BLEND),
		1711	const_iv (GL_CULL_FACE),
1514	const_iv (GL_SCISSOR_TEST),	1712	const_iv (GL_SCISSOR_TEST),
		1713	const_iv (GL_DEPTH_TEST),
		1714	const_iv (GL_ALPHA_TEST),
		1715	const_iv (GL_NORMALIZE),
		1716	const_iv (GL_RESCALE_NORMAL),
1515	const_iv (GL_AND),	1717	const_iv (GL_AND),
1516	const_iv (GL_ONE),	1718	const_iv (GL_ONE),
1517	const_iv (GL_ZERO),	1719	const_iv (GL_ZERO),
1518	const_iv (GL_SRC_ALPHA),	1720	const_iv (GL_SRC_ALPHA),
1519	const_iv (GL_SRC_ALPHA_SATURATE),	1721	const_iv (GL_DST_ALPHA),
1520	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1722	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521	const_iv (GL_ONE_MINUS_DST_ALPHA),	1723	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1724	const_iv (GL_SRC_ALPHA_SATURATE),
1522	const_iv (GL_RGB),	1725	const_iv (GL_RGB),
1523	const_iv (GL_RGBA),	1726	const_iv (GL_RGBA),
		1727	const_iv (GL_RGBA4),
		1728	const_iv (GL_RGBA8),
		1729	const_iv (GL_RGB5_A1),
1524	const_iv (GL_UNSIGNED_BYTE),	1730	const_iv (GL_UNSIGNED_BYTE),
		1731	const_iv (GL_UNSIGNED_SHORT),
		1732	const_iv (GL_UNSIGNED_INT),
1525	const_iv (GL_ALPHA),	1733	const_iv (GL_ALPHA),
		1734	const_iv (GL_INTENSITY),
1526	const_iv (GL_LUMINANCE),	1735	const_iv (GL_LUMINANCE),
		1736	const_iv (GL_LUMINANCE_ALPHA),
1527	const_iv (GL_FLOAT),	1737	const_iv (GL_FLOAT),
1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1738	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529	const_iv (GL_COMPILE),	1739	const_iv (GL_COMPILE),
1530	const_iv (GL_TEXTURE_1D),	1740	const_iv (GL_TEXTURE_1D),
1531	const_iv (GL_TEXTURE_2D),	1741	const_iv (GL_TEXTURE_2D),
…		…
1533	const_iv (GL_TEXTURE_MAG_FILTER),	1743	const_iv (GL_TEXTURE_MAG_FILTER),
1534	const_iv (GL_TEXTURE_MIN_FILTER),	1744	const_iv (GL_TEXTURE_MIN_FILTER),
1535	const_iv (GL_TEXTURE_ENV_MODE),	1745	const_iv (GL_TEXTURE_ENV_MODE),
1536	const_iv (GL_TEXTURE_WRAP_S),	1746	const_iv (GL_TEXTURE_WRAP_S),
1537	const_iv (GL_TEXTURE_WRAP_T),	1747	const_iv (GL_TEXTURE_WRAP_T),
		1748	const_iv (GL_REPEAT),
1538	const_iv (GL_CLAMP),	1749	const_iv (GL_CLAMP),
1539	const_iv (GL_REPEAT),	1750	const_iv (GL_CLAMP_TO_EDGE),
1540	const_iv (GL_NEAREST),	1751	const_iv (GL_NEAREST),
1541	const_iv (GL_LINEAR),	1752	const_iv (GL_LINEAR),
1542	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1753	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1754	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1755	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1756	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546	const_iv (GL_GENERATE_MIPMAP),	1757	const_iv (GL_GENERATE_MIPMAP),
1547	const_iv (GL_MODULATE),	1758	const_iv (GL_MODULATE),
1548	const_iv (GL_DECAL),	1759	const_iv (GL_DECAL),
1549	const_iv (GL_REPLACE),	1760	const_iv (GL_REPLACE),
		1761	const_iv (GL_DEPTH_BUFFER_BIT),
1550	const_iv (GL_COLOR_BUFFER_BIT),	1762	const_iv (GL_COLOR_BUFFER_BIT),
1551	const_iv (GL_PROJECTION),	1763	const_iv (GL_PROJECTION),
1552	const_iv (GL_MODELVIEW),	1764	const_iv (GL_MODELVIEW),
1553	const_iv (GL_COLOR_LOGIC_OP),	1765	const_iv (GL_COLOR_LOGIC_OP),
1554	const_iv (GL_SEPARABLE_2D),	1766	const_iv (GL_SEPARABLE_2D),
1555	const_iv (GL_CONVOLUTION_2D),	1767	const_iv (GL_CONVOLUTION_2D),
1556	const_iv (GL_CONVOLUTION_BORDER_MODE),	1768	const_iv (GL_CONVOLUTION_BORDER_MODE),
1557	const_iv (GL_CONSTANT_BORDER),	1769	const_iv (GL_CONSTANT_BORDER),
1558	const_iv (GL_LINES),	1770	const_iv (GL_LINES),
		1771	const_iv (GL_LINE_LOOP),
1559	const_iv (GL_QUADS),	1772	const_iv (GL_QUADS),
1560	const_iv (GL_LINE_LOOP),	1773	const_iv (GL_QUAD_STRIP),
		1774	const_iv (GL_TRIANGLES),
		1775	const_iv (GL_TRIANGLE_STRIP),
		1776	const_iv (GL_TRIANGLE_FAN),
1561	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1777	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562	const_iv (GL_FASTEST),	1778	const_iv (GL_FASTEST),
		1779	const_iv (GL_V2F),
		1780	const_iv (GL_V3F),
		1781	const_iv (GL_T2F_V3F),
		1782	const_iv (GL_T2F_N3F_V3F),
1563	# undef const_iv	1783	# undef const_iv
1564	};	1784	};
1565		1785
1566	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1786	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1787	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568	}	1788	}
1569		1789
		1790	char *
		1791	gl_vendor ()
		1792	CODE:
		1793	RETVAL = (char *)glGetString (GL_VENDOR);
		1794	OUTPUT:
		1795	RETVAL
		1796
		1797	char *
		1798	gl_version ()
		1799	CODE:
		1800	RETVAL = (char *)glGetString (GL_VERSION);
		1801	OUTPUT:
		1802	RETVAL
		1803
		1804	char *
		1805	gl_extensions ()
		1806	CODE:
		1807	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1808	OUTPUT:
		1809	RETVAL
		1810
1570	int glGetError ()	1811	int glGetError ()
		1812
		1813	void glFinish ()
1571		1814
1572	void glClear (int mask)	1815	void glClear (int mask)
1573		1816
1574	void glClearColor (float r, float g, float b, float a = 1.0)	1817	void glClearColor (float r, float g, float b, float a = 1.0)
1575	PROTOTYPE: @	1818	PROTOTYPE: @
…		…
1582		1825
1583	void glHint (int target, int mode)	1826	void glHint (int target, int mode)
1584		1827
1585	void glBlendFunc (int sfactor, int dfactor)	1828	void glBlendFunc (int sfactor, int dfactor)
1586		1829
		1830	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1831	CODE:
		1832	gl_BlendFuncSeparate (sa, da, saa, daa);
		1833
		1834	void glDepthMask (int flag)
		1835
1587	void glLogicOp (int opcode)	1836	void glLogicOp (int opcode)
1588		1837
1589	void glColorMask (int red, int green, int blue, int alpha)	1838	void glColorMask (int red, int green, int blue, int alpha)
1590		1839
1591	void glMatrixMode (int mode)	1840	void glMatrixMode (int mode)
…		…
1594		1843
1595	void glPopMatrix ()	1844	void glPopMatrix ()
1596		1845
1597	void glLoadIdentity ()	1846	void glLoadIdentity ()
1598		1847
1599	# near and far are due to microsofts buggy c compiler	1848	# near_ and far_ are due to microsofts buggy "c" compiler
		1849	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1850
		1851	# near_ and far_ are due to microsofts buggy "c" compiler
1600	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1852	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1601		1853
1602	void glViewport (int x, int y, int width, int height)	1854	void glViewport (int x, int y, int width, int height)
1603		1855
1604	void glScissor (int x, int y, int width, int height)	1856	void glScissor (int x, int y, int width, int height)
…		…
1619		1871
1620	void glEnd ()	1872	void glEnd ()
1621		1873
1622	void glColor (float r, float g, float b, float a = 1.0)	1874	void glColor (float r, float g, float b, float a = 1.0)
1623	PROTOTYPE: @	1875	PROTOTYPE: @
		1876	ALIAS:
		1877	glColor_premultiply = 1
1624	CODE:	1878	CODE:
		1879	if (ix)
		1880	{
		1881	r *= a;
		1882	g *= a;
		1883	b *= a;
		1884	}
		1885	// microsoft visual "c" rounds instead of truncating...
1625	glColor4ub (MIN ((int)(r * 255.f), 255),	1886	glColor4ub (MIN ((int)(r * 256.f), 255),
1626	MIN ((int)(g * 255.f), 255),	1887	MIN ((int)(g * 256.f), 255),
1627	MIN ((int)(b * 255.f), 255),	1888	MIN ((int)(b * 256.f), 255),
1628	MIN ((int)(a * 255.f), 255));	1889	MIN ((int)(a * 256.f), 255));
		1890
		1891	void glInterleavedArrays (int format, int stride, char *data)
		1892
		1893	void glDrawElements (int mode, int count, int type, char *indices)
		1894
		1895	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1896
		1897	void glRasterPos (float x, float y, float z = 0.)
		1898	CODE:
		1899	glRasterPos3f (0, 0, z);
		1900	glBitmap (0, 0, 0, 0, x, y, 0);
1629		1901
1630	void glVertex (float x, float y, float z = 0.)	1902	void glVertex (float x, float y, float z = 0.)
1631	CODE:	1903	CODE:
1632	glVertex3f (x, y, z);	1904	glVertex3f (x, y, z);
1633		1905
…		…
1645		1917
1646	void glBindTexture (int target, int name)	1918	void glBindTexture (int target, int name)
1647		1919
1648	void glConvolutionParameter (int target, int pname, float params)	1920	void glConvolutionParameter (int target, int pname, float params)
1649	CODE:	1921	CODE:
1650	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1922	if (gl.ConvolutionParameterf)
		1923	gl.ConvolutionParameterf (target, pname, params);
1651		1924
1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1925	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653	CODE:	1926	CODE:
1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1927	if (gl.ConvolutionFilter2D)
1655	(target, internalformat, width, height, format, type, data));	1928	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656		1929
1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1930	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1658	CODE:	1931	CODE:
1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1932	if (gl.SeparableFilter2D)
1660	(target, internalformat, width, height, format, type, row, column));	1933	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661		1934
1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1935	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1663		1936
1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1937	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665		1938
1666	void glRasterPos (int x, int y)	1939	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667	CODE:
1668	glRasterPos2i (x, y);
1669		1940
1670	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1941	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671		1942
1672	int glGenTexture ()	1943	int glGenTexture ()
1673	CODE:	1944	CODE:
…		…
1700		1971
1701	void glEndList ()	1972	void glEndList ()
1702		1973
1703	void glCallList (int list)	1974	void glCallList (int list)
1704		1975
		1976

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs. Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.117 by root, Thu Jun 15 15:33:57 2006 UTC