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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.126 by root, Tue Jul 4 23:56:34 2006 UTC

…		…
18	#include <SDL_endian.h>	18	#include <SDL_endian.h>
19	#include <SDL_image.h>	19	#include <SDL_image.h>
20	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
21	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
22		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
23	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
24		27
25	#include <pango/pango.h>	28	#include <pango/pango.h>
26	#include <pango/pangofc-fontmap.h>
27	#include <pango/pangoft2.h>
28	#include <pango/pangocairo.h>
29		29
30	#ifndef _WIN32	30	#ifndef _WIN32
31	# include <sys/types.h>	31	# include <sys/types.h>
32	# include <sys/socket.h>	32	# include <sys/socket.h>
33	# include <netinet/in.h>	33	# include <netinet/in.h>
…		…
42	typedef signed int int32_t;	42	typedef signed int int32_t;
43	#endif	43	#endif
44		44
45	#include "glext.h"	45	#include "glext.h"
46		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
47	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
48		50
49	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
50	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
51		53
52	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
		55
		56	#if 1
		57	# define PARACHUTE SDL_INIT_NOPARACHUTE
		58	#else
		59	# define PARACHUTE 0
		60	#endif
53		61
54	static struct	62	static struct
55	{	63	{
56	#define GL_FUNC(ptr,name) ptr name;	64	#define GL_FUNC(ptr,name) ptr name;
57	#include "glfunc.h"	65	#include "glfunc.h"
…		…
66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
67	else	75	else
68	glBlendFunc (sa, da);	76	glBlendFunc (sa, da);
69	}	77	}
70		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
		84
71	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
72	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
73		87
74	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
75		89
		90	static int
		91	shape_attr_p (PangoLayoutRun *run)
		92	{
		93	GSList *attrs = run->item->analysis.extra_attrs;
		94
		95	while (attrs)
		96	{
		97	PangoAttribute *attr = attrs->data;
		98
		99	if (attr->klass->type == PANGO_ATTR_SHAPE)
		100	return 1;
		101
		102	attrs = attrs->next;
		103	}
		104
		105	return 0;
		106	}
		107
76	typedef struct cf_layout {	108	typedef struct cf_layout {
77	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
78	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
79	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
80	int base_height;	111	int base_height;
81	CFClient__Font font;	112	CFClient__Font font;
82	} *CFClient__Layout;	113	} *CFClient__Layout;
83		114
84	static CFClient__Font default_font;	115	static CFClient__Font default_font;
85	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
86	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
87		118
88	static void	119	static void
89	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
90	{	121	{
91	FcPatternAddBool (pattern, FC_HINTING, 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
92	#ifdef FC_HINT_STYLE	123	#ifdef FC_HINT_STYLE
93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
94	#endif	125	#endif
95	#ifdef _WIN32
96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
97	#else
98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
99	#endif
100	}	127	}
101		128
102	static void	129	static void
103	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
104	{	131	{
…		…
300	ev.code = 1;	327	ev.code = 1;
301	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
302	ev.data2 = 0;	329	ev.data2 = 0;
303		330
304	SDL_PushEvent ((SDL_Event *)&ev);	331	SDL_PushEvent ((SDL_Event *)&ev);
		332	}
		333
		334	static unsigned int
		335	minpot (unsigned int n)
		336	{
		337	if (!n)
		338	return 0;
		339
		340	--n;
		341
		342	n \|= n >> 1;
		343	n \|= n >> 2;
		344	n \|= n >> 4;
		345	n \|= n >> 8;
		346	n \|= n >> 16;
		347
		348	return n + 1;
305	}	349	}
306		350
307	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
308		352
309	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
419		463
420	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	464	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
421	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
422	}	466	}
423		467
		468	NV floor (NV x)
		469
		470	NV ceil (NV x)
		471
424	void	472	void
425	pango_init ()	473	pango_init ()
426	CODE:	474	CODE:
427	// delayed, so it can pick up new fonts added by AddFontResourceEx
428	{	475	{
429	{
430	ft2_fontmap = pango_ft2_font_map_new ();	476	opengl_fontmap = pango_opengl_font_map_new ();
431	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	477	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
432	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	478	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
433	}
434	{
435	cairo_font_options_t *fopt = cairo_font_options_create ();
436	cairo_fontmap = pango_cairo_font_map_get_default ();
437	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
438	#ifdef _WIN32
439	// cairo looks like shit eaten twice on windows
440	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
441	#else
442	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
443	#endif
444	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
445	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
446	pango_cairo_context_set_font_options (cairo_context, fopt);
447	cairo_font_options_destroy (fopt);
448	}
449	}	479	}
450		480
451	int	481	int
452	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	482	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
453		483
454	void	484	void
455	SDL_Quit ()	485	SDL_Quit ()
456		486
457	void	487	void
…		…
464	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	494	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
465	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	495	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
466	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	496	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
467		497
468	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	498	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
469	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	499	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
470		500
471	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	501	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
472	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	502	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
473	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	503	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
474	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	504	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
595		625
596	void	626	void
597	add_font (char *file)	627	add_font (char *file)
598	CODE:	628	CODE:
599	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
600	#ifdef _WIN32
601	// cairo... sigh... requires win2000
602	AddFontResourceEx (file, FR_PRIVATE, 0);
603	#endif
604		630
605	void	631	void
606	load_image_inline (SV *image_)	632	load_image_inline (SV *image_)
607	ALIAS:	633	ALIAS:
608	load_image_file = 1	634	load_image_file = 1
…		…
704	CODE:	730	CODE:
705	fprintf (stderr, "FATAL: %s\n", message);	731	fprintf (stderr, "FATAL: %s\n", message);
706	#ifdef _WIN32	732	#ifdef _WIN32
707	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	733	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
708	#endif	734	#endif
709	_Exit (1);	735	_exit (1);
710		736
711	void	737	void
712	_exit (int retval)	738	_exit (int retval)
713	CODE:	739	CODE:
714	_Exit (retval);	740	_exit (retval);
715		741
716	MODULE = CFClient PACKAGE = CFClient::Font	742	MODULE = CFClient PACKAGE = CFClient::Font
717		743
718	CFClient::Font	744	CFClient::Font
719	new_from_file (SV class, char path, int id = 0)	745	new_from_file (SV class, char path, int id = 0)
…		…
737	CODE:	763	CODE:
738	default_font = self;	764	default_font = self;
739		765
740	MODULE = CFClient PACKAGE = CFClient::Layout	766	MODULE = CFClient PACKAGE = CFClient::Layout
741		767
		768	void
		769	clear_font_cache ()
		770	CODE:
		771	tc_clear ();
		772
742	CFClient::Layout	773	CFClient::Layout
743	new (SV *class, int rgba = 0)	774	new (SV *class, int type = 0)
744	CODE:	775	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	776	New (0, RETVAL, 1, struct cf_layout);
746		777
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	778	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	779	RETVAL->r = 1.;
750	RETVAL->g = 1.;	780	RETVAL->g = 1.;
751	RETVAL->b = 1.;	781	RETVAL->b = 1.;
752	RETVAL->a = 1.;	782	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	783	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
762	DESTROY (CFClient::Layout self)	792	DESTROY (CFClient::Layout self)
763	CODE:	793	CODE:
764	g_object_unref (self->pl);	794	g_object_unref (self->pl);
765	Safefree (self);	795	Safefree (self);
766		796
767	int
768	is_rgba (CFClient::Layout self)
769	CODE:
770	RETVAL = self->rgba;
771	OUTPUT:
772	RETVAL
773
774	void	797	void
775	set_text (CFClient::Layout self, SV *text_)	798	set_text (CFClient::Layout self, SV *text_)
776	CODE:	799	CODE:
777	{	800	{
778	STRLEN textlen;	801	STRLEN textlen;
…		…
788	STRLEN textlen;	811	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);	812	char *text = SvPVutf8 (text_, textlen);
790		813
791	pango_layout_set_markup (self->pl, text, textlen);	814	pango_layout_set_markup (self->pl, text, textlen);
792	}	815	}
		816
		817	void
		818	set_shapes (CFClient::Layout self, ...)
		819	CODE:
		820	{
		821	PangoAttrList *attrs = 0;
		822	const char *text = pango_layout_get_text (self->pl);
		823	const char *pos = text;
		824	int arg = 4;
		825
		826	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		827	{
		828	PangoRectangle inkrect, rect;
		829	PangoAttribute *attr;
		830
		831	int x = SvIV (ST (arg - 3));
		832	int y = SvIV (ST (arg - 2));
		833	int w = SvIV (ST (arg - 1));
		834	int h = SvIV (ST (arg ));
		835
		836	inkrect.x = 0;
		837	inkrect.y = 0;
		838	inkrect.width = 0;
		839	inkrect.height = 0;
		840
		841	rect.x = x * PANGO_SCALE;
		842	rect.y = y * PANGO_SCALE;
		843	rect.width = w * PANGO_SCALE;
		844	rect.height = h * PANGO_SCALE;
		845
		846	if (!attrs)
		847	attrs = pango_layout_get_attributes (self->pl);
		848
		849	attr = pango_attr_shape_new (&inkrect, &rect);
		850	attr->start_index = pos - text;
		851	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		852	pango_attr_list_insert (attrs, attr);
		853
		854	arg += 4;
		855	pos += sizeof (OBJ_STR) - 1;
		856	}
		857
		858	if (attrs)
		859	pango_layout_set_attributes (self->pl, attrs);
		860	}
		861
		862	void
		863	get_shapes (CFClient::Layout self)
		864	PPCODE:
		865	{
		866	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		867
		868	do
		869	{
		870	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		871
		872	if (run && shape_attr_p (run))
		873	{
		874	PangoRectangle extents;
		875	pango_layout_iter_get_run_extents (iter, 0, &extents);
		876
		877	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		878	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		879	}
		880	}
		881	while (pango_layout_iter_next_run (iter));
		882
		883	pango_layout_iter_free (iter);
		884	}
		885
		886	int
		887	has_wrapped (CFClient::Layout self)
		888	CODE:
		889	{
		890	int lines = 1;
		891	const char *text = pango_layout_get_text (self->pl);
		892
		893	while (*text)
		894	lines += *text++ == '\n';
		895
		896	RETVAL = lines < pango_layout_get_line_count (self->pl);
		897	}
		898	OUTPUT:
		899	RETVAL
793		900
794	SV *	901	SV *
795	get_text (CFClient::Layout self)	902	get_text (CFClient::Layout self)
796	CODE:	903	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	974	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	975	PUSHs (sv_2mortal (newSViv (h)));
869	}	976	}
870		977
871	int	978	int
		979	descent (CFClient::Layout self)
		980	CODE:
		981	{
		982	PangoRectangle rect;
		983	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		984	pango_layout_line_get_pixel_extents (line, 0, &rect);
		985	RETVAL = PANGO_DESCENT (rect);
		986	}
		987	OUTPUT:
		988	RETVAL
		989
		990	int
872	xy_to_index (CFClient::Layout self, int x, int y)	991	xy_to_index (CFClient::Layout self, int x, int y)
873	CODE:	992	CODE:
874	{	993	{
875	int index, trailing;	994	int index, trailing;
876	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	995	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
…		…
891	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1012	}
894		1013
895	void	1014	void
896	render (CFClient::Layout self)	1015	render (CFClient::Layout self, float x, float y)
897	PPCODE:	1016	PPCODE:
898	{	1017	pango_opengl_render_layout_subpixel (
899	SV *retval;	1018	self->pl,
900	int w, h;	1019	x * PANGO_SCALE, y * PANGO_SCALE,
		1020	self->r, self->g, self->b, self->a
		1021	);
901		1022
902	layout_get_pixel_size (self, &w, &h);	1023	MODULE = CFClient PACKAGE = CFClient::Texture
903		1024
904	if (self->rgba)	1025	void
		1026	pad2pot (SV data_, SV w_, SV *h_)
		1027	CODE:
		1028	{
		1029	int ow = SvIV (w_);
		1030	int oh = SvIV (h_);
		1031
		1032	if (ow && oh)
905	{	1033	{
906	cairo_surface_t *surface;	1034	int nw = minpot (ow);
907	cairo_t *cairo;	1035	int nh = minpot (oh);
908		1036
909	retval = newSV (w * h * 4);	1037	if (nw != ow \|\| nh != oh)
910	SvPOK_only (retval);
911	SvCUR_set (retval, w * h * 4);
912
913	memset (SvPVX (retval), 0, w * h * 4);
914
915	surface = cairo_image_surface_create_for_data (
916	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
917	cairo = cairo_create (surface);
918	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
919
920	pango_cairo_show_layout (cairo, self->pl);
921
922	cairo_destroy (cairo);
923	cairo_surface_destroy (surface);
924
925	// what a mess, and its premultiplied, too :(
926	{	1038	{
927	uint32_t p = (uint32_t )SvPVX (retval);	1039	if (SvOK (data_))
928	uint32_t e = p + w h;
929
930	while (p < e)
931	{	1040	{
932	uint32_t rgba = *p;	1041	STRLEN datalen;
933	rgba = (rgba >> 24) \| (rgba << 8);	1042	char *data = SvPVbyte (data_, datalen);
934	#if 0	1043	int bpp = datalen / (ow * oh);
935	#ifdef _WIN32	1044	SV result_ = sv_2mortal (newSV (nw nh * bpp));
936	{//D
937	uint8_t r = rgba >> 24;
938	uint8_t g = rgba >> 16;
939	uint8_t b = rgba >> 8;
940	uint8_t a = rgba >> 0;
941		1045
942	rgba = (rgba & 0xffffff00) \| a;	1046	SvPOK_only (result_);
		1047	SvCUR_set (result_, nw * nh * bpp);
		1048
		1049	memset (SvPVX (result_), 0, nw * nh * bpp);
		1050	while (oh--)
		1051	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1052
		1053	sv_setsv (data_, result_);
943	}	1054	}
944	#endif	1055
945	#endif	1056	sv_setiv (w_, nw);
946	rgba = SDL_SwapBE32 (rgba);	1057	sv_setiv (h_, nh);
947	*p++ = rgba;
948	}	1058	}
949	}
950
951	EXTEND (SP, 5);
952	PUSHs (sv_2mortal (newSViv (w)));
953	PUSHs (sv_2mortal (newSViv (h)));
954	PUSHs (sv_2mortal (retval));
955	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
956	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
957	}	1059	}
958	else
959	{
960	FT_Bitmap bitmap;
961
962	retval = newSV (w * h);
963	SvPOK_only (retval);
964	SvCUR_set (retval, w * h);
965
966	bitmap.rows = h;
967	bitmap.width = w;
968	bitmap.pitch = w;
969	bitmap.buffer = (unsigned char*)SvPVX (retval);
970	bitmap.num_grays = 256;
971	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
972
973	memset (bitmap.buffer, 0, w * h);
974
975	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
976
977	EXTEND (SP, 5);
978	PUSHs (sv_2mortal (newSViv (w)));
979	PUSHs (sv_2mortal (newSViv (h)));
980	PUSHs (sv_2mortal (retval));
981	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
982	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
983	}
984	}	1060	}
985		1061
986	MODULE = CFClient PACKAGE = CFClient::Texture
987
988	void	1062	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1063	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1064	PROTOTYPE: $$$;$$
991	ALIAS:	1065	ALIAS:
992	draw_quad_alpha = 1	1066	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1067	draw_quad_alpha_premultiplied = 2
994	CODE:	1068	CODE:
…		…
1175		1249
1176	while (data < data_end)	1250	while (data < data_end)
1177	{	1251	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1252	flags = (data [0] << 8) + data [1]; data += 2;
1179		1253
1180	x = ((flags >> 10) & 63) + self->x;	1254	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1255	y = self->y + ((flags >> 4) & 63);
1182		1256
1183	cell = map_get_cell (self, x, y);	1257	cell = map_get_cell (self, x, y);
1184		1258
1185	if (flags & 15)	1259	if (flags & 15)
1186	{	1260	{
…		…
1276	OUTPUT:	1350	OUTPUT:
1277	RETVAL	1351	RETVAL
1278		1352
1279	void	1353	void
1280	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1354	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1281	PPCODE:	1355	CODE:
1282	{	1356	{
1283	int vx, vy;	1357	int vx, vy;
1284	int x, y, z;	1358	int x, y, z;
1285	int last_name;	1359	int last_name;
1286	mapface face;	1360	mapface face;
1287	int sw4 = (sw + 3) & ~3;
1288	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1289	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1290		1361
1291	memset (darkness, 255, sw4 * sh);
1292	SvPOK_only (darkness_sv);
1293	SvCUR_set (darkness_sv, sw4 * sh);
1294
1295	vx = self->x + (self->w - sw) / 2 - shift_x;	1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297		1364
1298	/*	1365	/*
1299	int vx = self->vx = self->w >= sw	1366	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1367	? self->x + (self->w - sw) / 2
1301	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1368	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1305	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1372	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306	*/	1373	*/
1307		1374
1308	glColor4ub (255, 255, 255, 255);	1375	glColor4ub (255, 255, 255, 255);
1309		1376
		1377	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1378	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1379	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1380	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1381
1315	glBegin (GL_QUADS);	1382	glBegin (GL_QUADS);
1316		1383
…		…
1324		1391
1325	for (x = 0; x < sw; x++)	1392	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1393	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1394	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1395	mapcell *cell = row->col + (x + vx - row->c0);
1329
1330	darkness[y * sw4 + x] = cell->darkness < 0
1331	? 255 - FOW_DARKNESS
1332	: 255 - cell->darkness;
1333		1396
1334	face = cell->face [z];	1397	face = cell->face [z];
1335		1398
1336	if (face)	1399	if (face)
1337	{	1400	{
…		…
1358		1421
1359	glEnd ();	1422	glEnd ();
1360		1423
1361	glDisable (GL_TEXTURE_2D);	1424	glDisable (GL_TEXTURE_2D);
1362	glDisable (GL_BLEND);	1425	glDisable (GL_BLEND);
		1426	}
		1427
		1428	void
		1429	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1430	CODE:
		1431	{
		1432	static float color[16][3] = {
		1433	{ 0.00F, 0.00F, 0.00F },
		1434	{ 1.00F, 1.00F, 1.00F },
		1435	{ 0.00F, 0.00F, 0.55F },
		1436	{ 1.00F, 0.00F, 0.00F },
		1437
		1438	{ 1.00F, 0.54F, 0.00F },
		1439	{ 0.11F, 0.56F, 1.00F },
		1440	{ 0.93F, 0.46F, 0.00F },
		1441	{ 0.18F, 0.54F, 0.34F },
		1442
		1443	{ 0.56F, 0.73F, 0.56F },
		1444	{ 0.80F, 0.80F, 0.80F },
		1445	{ 0.55F, 0.41F, 0.13F },
		1446	{ 0.99F, 0.77F, 0.26F },
		1447
		1448	{ 0.74F, 0.65F, 0.41F },
		1449
		1450	{ 0.00F, 1.00F, 1.00F },
		1451	{ 1.00F, 0.00F, 1.00F },
		1452	{ 1.00F, 1.00F, 0.00F },
		1453	};
		1454
		1455	int x, y;
		1456
		1457	glEnable (GL_TEXTURE_2D);
		1458	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1459	glEnable (GL_BLEND);
		1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1461	glBegin (GL_QUADS);
		1462
		1463	for (y = 0; y < h; y++)
		1464	for (x = 0; x < w; x++)
		1465	{
		1466	unsigned char m = data [x + y * w];
		1467
		1468	if (m)
		1469	{
		1470	float *c = color [m & 15];
		1471
		1472	float tx1 = m & 0x40 ? 0.5 : 0.;
		1473	float tx2 = tx1 + 0.5;
		1474
		1475	glColor4f (c[0], c[1], c[2], 0.75);
		1476	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1477	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1478	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1479	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1480	}
		1481	}
		1482
		1483	glEnd ();
		1484	glDisable (GL_BLEND);
		1485	glDisable (GL_TEXTURE_2D);
		1486	}
		1487
		1488	void
		1489	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1490	PPCODE:
		1491	{
		1492	int vx, vy;
		1493	int x, y;
		1494	int sw4 = (sw + 3) & ~3;
		1495	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1496	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1497
		1498	memset (darkness, 255, sw4 * sh);
		1499	SvPOK_only (darkness_sv);
		1500	SvCUR_set (darkness_sv, sw4 * sh);
		1501
		1502	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1503	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1504
		1505	for (y = 0; y < sh; y++)
		1506	if (0 <= y + vy && y + vy < self->rows)
		1507	{
		1508	maprow *row = self->row + (y + vy);
		1509
		1510	for (x = 0; x < sw; x++)
		1511	if (row->c0 <= x + vx && x + vx < row->c1)
		1512	{
		1513	mapcell *cell = row->col + (x + vx - row->c0);
		1514
		1515	darkness[y * sw4 + x] = cell->darkness < 0
		1516	? 255 - FOW_DARKNESS
		1517	: 255 - cell->darkness;
		1518	}
		1519	}
1363		1520
1364	EXTEND (SP, 3);	1521	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1522	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1523	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1524	PUSHs (darkness_sv);
…		…
1574	const_iv (GL_SCISSOR_TEST),	1731	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1732	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1733	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1734	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1735	const_iv (GL_RESCALE_NORMAL),
		1736	const_iv (GL_FRONT),
		1737	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1738	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1739	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1740	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1741	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1742	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1743	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1744	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1745	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1746	const_iv (GL_RGB),
1588	const_iv (GL_RGBA),	1747	const_iv (GL_RGBA),
		1748	const_iv (GL_RGBA4),
		1749	const_iv (GL_RGBA8),
		1750	const_iv (GL_RGB5_A1),
1589	const_iv (GL_UNSIGNED_BYTE),	1751	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1752	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1753	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1754	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1755	const_iv (GL_INTENSITY),
…		…
1667	OUTPUT:	1829	OUTPUT:
1668	RETVAL	1830	RETVAL
1669		1831
1670	int glGetError ()	1832	int glGetError ()
1671		1833
		1834	void glFinish ()
		1835
1672	void glClear (int mask)	1836	void glClear (int mask)
1673		1837
1674	void glClearColor (float r, float g, float b, float a = 1.0)	1838	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	1839	PROTOTYPE: @
1676		1840
…		…
1699	void glPushMatrix ()	1863	void glPushMatrix ()
1700		1864
1701	void glPopMatrix ()	1865	void glPopMatrix ()
1702		1866
1703	void glLoadIdentity ()	1867	void glLoadIdentity ()
		1868
		1869	void glDrawBuffer (int buffer)
		1870
		1871	void glReadBuffer (int buffer)
1704		1872
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1873	# near_ and far_ are due to microsofts buggy "c" compiler
1706	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1874	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707		1875
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1876	# near_ and far_ are due to microsofts buggy "c" compiler

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs. Revision 1.126 by root, Tue Jul 4 23:56:34 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.111 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.126 by root, Tue Jul 4 23:56:34 2006 UTC