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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 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
…		…
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	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		772	tc_clear ();
		773
742	CFClient::Layout	774	CFClient::Layout
743	new (SV *class, int rgba = 0)	775	new (SV *class, int type = 0)
744	CODE:	776	CODE:
745	New (0, RETVAL, 1, struct cf_layout);	777	New (0, RETVAL, 1, struct cf_layout);
746		778
747	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	779	RETVAL->pl = pango_layout_new (opengl_context);
748	RETVAL->rgba = rgba;
749	RETVAL->r = 1.;	780	RETVAL->r = 1.;
750	RETVAL->g = 1.;	781	RETVAL->g = 1.;
751	RETVAL->b = 1.;	782	RETVAL->b = 1.;
752	RETVAL->a = 1.;	783	RETVAL->a = 1.;
753	RETVAL->base_height = MIN_FONT_HEIGHT;	784	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
762	DESTROY (CFClient::Layout self)	793	DESTROY (CFClient::Layout self)
763	CODE:	794	CODE:
764	g_object_unref (self->pl);	795	g_object_unref (self->pl);
765	Safefree (self);	796	Safefree (self);
766		797
767	int
768	is_rgba (CFClient::Layout self)
769	CODE:
770	RETVAL = self->rgba;
771	OUTPUT:
772	RETVAL
773
774	void	798	void
775	set_text (CFClient::Layout self, SV *text_)	799	set_text (CFClient::Layout self, SV *text_)
776	CODE:	800	CODE:
777	{	801	{
778	STRLEN textlen;	802	STRLEN textlen;
…		…
788	STRLEN textlen;	812	STRLEN textlen;
789	char *text = SvPVutf8 (text_, textlen);	813	char *text = SvPVutf8 (text_, textlen);
790		814
791	pango_layout_set_markup (self->pl, text, textlen);	815	pango_layout_set_markup (self->pl, text, textlen);
792	}	816	}
		817
		818	void
		819	set_shapes (CFClient::Layout self, ...)
		820	CODE:
		821	{
		822	PangoAttrList *attrs = 0;
		823	const char *text = pango_layout_get_text (self->pl);
		824	const char *pos = text;
		825	int arg = 4;
		826
		827	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		828	{
		829	PangoRectangle inkrect, rect;
		830	PangoAttribute *attr;
		831
		832	int x = SvIV (ST (arg - 3));
		833	int y = SvIV (ST (arg - 2));
		834	int w = SvIV (ST (arg - 1));
		835	int h = SvIV (ST (arg ));
		836
		837	inkrect.x = 0;
		838	inkrect.y = 0;
		839	inkrect.width = 0;
		840	inkrect.height = 0;
		841
		842	rect.x = x * PANGO_SCALE;
		843	rect.y = y * PANGO_SCALE;
		844	rect.width = w * PANGO_SCALE;
		845	rect.height = h * PANGO_SCALE;
		846
		847	if (!attrs)
		848	attrs = pango_layout_get_attributes (self->pl);
		849
		850	attr = pango_attr_shape_new (&inkrect, &rect);
		851	attr->start_index = pos - text;
		852	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		853	pango_attr_list_insert (attrs, attr);
		854
		855	arg += 4;
		856	pos += sizeof (OBJ_STR) - 1;
		857	}
		858
		859	if (attrs)
		860	pango_layout_set_attributes (self->pl, attrs);
		861	}
		862
		863	void
		864	get_shapes (CFClient::Layout self)
		865	PPCODE:
		866	{
		867	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		868
		869	do
		870	{
		871	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		872
		873	if (run && shape_attr_p (run))
		874	{
		875	PangoRectangle extents;
		876	pango_layout_iter_get_run_extents (iter, 0, &extents);
		877
		878	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		879	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		880	}
		881	}
		882	while (pango_layout_iter_next_run (iter));
		883
		884	pango_layout_iter_free (iter);
		885	}
		886
		887	int
		888	has_wrapped (CFClient::Layout self)
		889	CODE:
		890	{
		891	int lines = 1;
		892	const char *text = pango_layout_get_text (self->pl);
		893
		894	while (*text)
		895	lines += *text++ == '\n';
		896
		897	RETVAL = lines < pango_layout_get_line_count (self->pl);
		898	}
		899	OUTPUT:
		900	RETVAL
793		901
794	SV *	902	SV *
795	get_text (CFClient::Layout self)	903	get_text (CFClient::Layout self)
796	CODE:	904	CODE:
797	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	905	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
867	PUSHs (sv_2mortal (newSViv (w)));	975	PUSHs (sv_2mortal (newSViv (w)));
868	PUSHs (sv_2mortal (newSViv (h)));	976	PUSHs (sv_2mortal (newSViv (h)));
869	}	977	}
870		978
871	int	979	int
		980	descent (CFClient::Layout self)
		981	CODE:
		982	{
		983	PangoRectangle rect;
		984	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		985	pango_layout_line_get_pixel_extents (line, 0, &rect);
		986	RETVAL = PANGO_DESCENT (rect);
		987	}
		988	OUTPUT:
		989	RETVAL
		990
		991	int
872	xy_to_index (CFClient::Layout self, int x, int y)	992	xy_to_index (CFClient::Layout self, int x, int y)
873	CODE:	993	CODE:
874	{	994	{
875	int index, trailing;	995	int index, trailing;
876	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	996	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)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
892	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1012	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
893	}	1013	}
894		1014
895	void	1015	void
896	render (CFClient::Layout self)	1016	render (CFClient::Layout self, float x, float y)
897	PPCODE:	1017	PPCODE:
898	{	1018	pango_opengl_render_layout_subpixel (
899	SV *retval;	1019	self->pl,
900	int w, h;	1020	x * PANGO_SCALE, y * PANGO_SCALE,
		1021	self->r, self->g, self->b, self->a
		1022	);
901		1023
902	layout_get_pixel_size (self, &w, &h);	1024	MODULE = CFClient PACKAGE = CFClient::Texture
903		1025
904	if (self->rgba)	1026	void
		1027	pad2pot (SV data_, SV w_, SV *h_)
		1028	CODE:
		1029	{
		1030	int ow = SvIV (w_);
		1031	int oh = SvIV (h_);
		1032
		1033	if (ow && oh)
905	{	1034	{
906	cairo_surface_t *surface;	1035	int nw = minpot (ow);
907	cairo_t *cairo;	1036	int nh = minpot (oh);
908		1037
909	retval = newSV (w * h * 4);	1038	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	{	1039	{
927	uint32_t p = (uint32_t )SvPVX (retval);	1040	if (SvOK (data_))
928	uint32_t e = p + w h;
929
930	while (p < e)
931	{	1041	{
932	uint32_t rgba = *p;	1042	STRLEN datalen;
933	rgba = (rgba >> 24) \| (rgba << 8);	1043	char *data = SvPVbyte (data_, datalen);
934	#if 0	1044	int bpp = datalen / (ow * oh);
935	#ifdef _WIN32	1045	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		1046
942	rgba = (rgba & 0xffffff00) \| a;	1047	SvPOK_only (result_);
		1048	SvCUR_set (result_, nw * nh * bpp);
		1049
		1050	memset (SvPVX (result_), 0, nw * nh * bpp);
		1051	while (oh--)
		1052	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1053
		1054	sv_setsv (data_, result_);
943	}	1055	}
944	#endif	1056
945	#endif	1057	sv_setiv (w_, nw);
946	rgba = SDL_SwapBE32 (rgba);	1058	sv_setiv (h_, nh);
947	*p++ = rgba;
948	}	1059	}
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	}	1060	}
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	}	1061	}
985		1062
986	MODULE = CFClient PACKAGE = CFClient::Texture
987
988	void	1063	void
989	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1064	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
990	PROTOTYPE: $$$;$$	1065	PROTOTYPE: $$$;$$
991	ALIAS:	1066	ALIAS:
992	draw_quad_alpha = 1	1067	draw_quad_alpha = 1
993	draw_quad_alpha_premultiplied = 2	1068	draw_quad_alpha_premultiplied = 2
994	CODE:	1069	CODE:
…		…
1175		1250
1176	while (data < data_end)	1251	while (data < data_end)
1177	{	1252	{
1178	flags = (data [0] << 8) + data [1]; data += 2;	1253	flags = (data [0] << 8) + data [1]; data += 2;
1179		1254
1180	x = ((flags >> 10) & 63) + self->x;	1255	x = self->x + ((flags >> 10) & 63);
1181	y = ((flags >> 4) & 63) + self->y;	1256	y = self->y + ((flags >> 4) & 63);
1182		1257
1183	cell = map_get_cell (self, x, y);	1258	cell = map_get_cell (self, x, y);
1184		1259
1185	if (flags & 15)	1260	if (flags & 15)
1186	{	1261	{
…		…
1276	OUTPUT:	1351	OUTPUT:
1277	RETVAL	1352	RETVAL
1278		1353
1279	void	1354	void
1280	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1355	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1281	PPCODE:	1356	CODE:
1282	{	1357	{
1283	int vx, vy;	1358	int vx, vy;
1284	int x, y, z;	1359	int x, y, z;
1285	int last_name;	1360	int last_name;
1286	mapface face;	1361	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		1362
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;	1363	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1296	vy = self->y + (self->h - sh) / 2 - shift_y;	1364	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1297		1365
1298	/*	1366	/*
1299	int vx = self->vx = self->w >= sw	1367	int vx = self->vx = self->w >= sw
1300	? self->x + (self->w - sw) / 2	1368	? self->x + (self->w - sw) / 2
1301	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1369	: 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));	1373	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1306	*/	1374	*/
1307		1375
1308	glColor4ub (255, 255, 255, 255);	1376	glColor4ub (255, 255, 255, 255);
1309		1377
		1378	glEnable (GL_BLEND);
1310	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1379	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1311	glEnable (GL_BLEND);
1312	glEnable (GL_TEXTURE_2D);	1380	glEnable (GL_TEXTURE_2D);
1313	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1381	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1314		1382
1315	glBegin (GL_QUADS);	1383	glBegin (GL_QUADS);
1316		1384
…		…
1324		1392
1325	for (x = 0; x < sw; x++)	1393	for (x = 0; x < sw; x++)
1326	if (row->c0 <= x + vx && x + vx < row->c1)	1394	if (row->c0 <= x + vx && x + vx < row->c1)
1327	{	1395	{
1328	mapcell *cell = row->col + (x + vx - row->c0);	1396	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		1397
1334	face = cell->face [z];	1398	face = cell->face [z];
1335		1399
1336	if (face)	1400	if (face)
1337	{	1401	{
…		…
1358		1422
1359	glEnd ();	1423	glEnd ();
1360		1424
1361	glDisable (GL_TEXTURE_2D);	1425	glDisable (GL_TEXTURE_2D);
1362	glDisable (GL_BLEND);	1426	glDisable (GL_BLEND);
		1427	}
		1428
		1429	void
		1430	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1431	CODE:
		1432	{
		1433	static float color[16][3] = {
		1434	{ 0.00F, 0.00F, 0.00F },
		1435	{ 1.00F, 1.00F, 1.00F },
		1436	{ 0.00F, 0.00F, 0.55F },
		1437	{ 1.00F, 0.00F, 0.00F },
		1438
		1439	{ 1.00F, 0.54F, 0.00F },
		1440	{ 0.11F, 0.56F, 1.00F },
		1441	{ 0.93F, 0.46F, 0.00F },
		1442	{ 0.18F, 0.54F, 0.34F },
		1443
		1444	{ 0.56F, 0.73F, 0.56F },
		1445	{ 0.80F, 0.80F, 0.80F },
		1446	{ 0.55F, 0.41F, 0.13F },
		1447	{ 0.99F, 0.77F, 0.26F },
		1448
		1449	{ 0.74F, 0.65F, 0.41F },
		1450
		1451	{ 0.00F, 1.00F, 1.00F },
		1452	{ 1.00F, 0.00F, 1.00F },
		1453	{ 1.00F, 1.00F, 0.00F },
		1454	};
		1455
		1456	int x, y;
		1457
		1458	glEnable (GL_TEXTURE_2D);
		1459	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1460	glEnable (GL_BLEND);
		1461	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1462	glBegin (GL_QUADS);
		1463
		1464	for (y = 0; y < h; y++)
		1465	for (x = 0; x < w; x++)
		1466	{
		1467	unsigned char m = data [x + y * w];
		1468
		1469	if (m)
		1470	{
		1471	float *c = color [m & 15];
		1472
		1473	float tx1 = m & 0x40 ? 0.5 : 0.;
		1474	float tx2 = tx1 + 0.5;
		1475
		1476	glColor4f (c[0], c[1], c[2], 0.75);
		1477	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1478	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1479	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1480	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1481	}
		1482	}
		1483
		1484	glEnd ();
		1485	glDisable (GL_BLEND);
		1486	glDisable (GL_TEXTURE_2D);
		1487	}
		1488
		1489	void
		1490	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1491	PPCODE:
		1492	{
		1493	int vx, vy;
		1494	int x, y;
		1495	int sw4 = (sw + 3) & ~3;
		1496	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1497	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1498
		1499	memset (darkness, 255, sw4 * sh);
		1500	SvPOK_only (darkness_sv);
		1501	SvCUR_set (darkness_sv, sw4 * sh);
		1502
		1503	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1504	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1505
		1506	for (y = 0; y < sh; y++)
		1507	if (0 <= y + vy && y + vy < self->rows)
		1508	{
		1509	maprow *row = self->row + (y + vy);
		1510
		1511	for (x = 0; x < sw; x++)
		1512	if (row->c0 <= x + vx && x + vx < row->c1)
		1513	{
		1514	mapcell *cell = row->col + (x + vx - row->c0);
		1515
		1516	darkness[y * sw4 + x] = cell->darkness < 0
		1517	? 255 - FOW_DARKNESS
		1518	: 255 - cell->darkness;
		1519	}
		1520	}
1363		1521
1364	EXTEND (SP, 3);	1522	EXTEND (SP, 3);
1365	PUSHs (sv_2mortal (newSViv (sw4)));	1523	PUSHs (sv_2mortal (newSViv (sw4)));
1366	PUSHs (sv_2mortal (newSViv (sh)));	1524	PUSHs (sv_2mortal (newSViv (sh)));
1367	PUSHs (darkness_sv);	1525	PUSHs (darkness_sv);
…		…
1574	const_iv (GL_SCISSOR_TEST),	1732	const_iv (GL_SCISSOR_TEST),
1575	const_iv (GL_DEPTH_TEST),	1733	const_iv (GL_DEPTH_TEST),
1576	const_iv (GL_ALPHA_TEST),	1734	const_iv (GL_ALPHA_TEST),
1577	const_iv (GL_NORMALIZE),	1735	const_iv (GL_NORMALIZE),
1578	const_iv (GL_RESCALE_NORMAL),	1736	const_iv (GL_RESCALE_NORMAL),
		1737	const_iv (GL_FRONT),
		1738	const_iv (GL_BACK),
1579	const_iv (GL_AND),	1739	const_iv (GL_AND),
1580	const_iv (GL_ONE),	1740	const_iv (GL_ONE),
1581	const_iv (GL_ZERO),	1741	const_iv (GL_ZERO),
1582	const_iv (GL_SRC_ALPHA),	1742	const_iv (GL_SRC_ALPHA),
1583	const_iv (GL_DST_ALPHA),	1743	const_iv (GL_DST_ALPHA),
1584	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1744	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1585	const_iv (GL_ONE_MINUS_DST_ALPHA),	1745	const_iv (GL_ONE_MINUS_DST_ALPHA),
1586	const_iv (GL_SRC_ALPHA_SATURATE),	1746	const_iv (GL_SRC_ALPHA_SATURATE),
1587	const_iv (GL_RGB),	1747	const_iv (GL_RGB),
1588	const_iv (GL_RGBA),	1748	const_iv (GL_RGBA),
		1749	const_iv (GL_RGBA4),
		1750	const_iv (GL_RGBA8),
		1751	const_iv (GL_RGB5_A1),
1589	const_iv (GL_UNSIGNED_BYTE),	1752	const_iv (GL_UNSIGNED_BYTE),
1590	const_iv (GL_UNSIGNED_SHORT),	1753	const_iv (GL_UNSIGNED_SHORT),
1591	const_iv (GL_UNSIGNED_INT),	1754	const_iv (GL_UNSIGNED_INT),
1592	const_iv (GL_ALPHA),	1755	const_iv (GL_ALPHA),
1593	const_iv (GL_INTENSITY),	1756	const_iv (GL_INTENSITY),
…		…
1667	OUTPUT:	1830	OUTPUT:
1668	RETVAL	1831	RETVAL
1669		1832
1670	int glGetError ()	1833	int glGetError ()
1671		1834
		1835	void glFinish ()
		1836
1672	void glClear (int mask)	1837	void glClear (int mask)
1673		1838
1674	void glClearColor (float r, float g, float b, float a = 1.0)	1839	void glClearColor (float r, float g, float b, float a = 1.0)
1675	PROTOTYPE: @	1840	PROTOTYPE: @
1676		1841
…		…
1699	void glPushMatrix ()	1864	void glPushMatrix ()
1700		1865
1701	void glPopMatrix ()	1866	void glPopMatrix ()
1702		1867
1703	void glLoadIdentity ()	1868	void glLoadIdentity ()
		1869
		1870	void glDrawBuffer (int buffer)
		1871
		1872	void glReadBuffer (int buffer)
1704		1873
1705	# near_ and far_ are due to microsofts buggy "c" compiler	1874	# 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_)	1875	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1707		1876
1708	# near_ and far_ are due to microsofts buggy "c" compiler	1877	# 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.112 by root, Mon Jun 12 14:55:41 2006 UTC vs. Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.112 by root, Mon Jun 12 14:55:41 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC