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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 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>
20	#include <SDL_opengl.h>	21	#include <SDL_opengl.h>
21		22
		23	#define PANGO_ENABLE_BACKEND
		24	#define G_DISABLE_CAST_CHECKS
		25
22	#include <glib/gmacros.h>	26	#include <glib/gmacros.h>
23		27
24	#include <pango/pango.h>	28	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		29
29	#ifndef _WIN32	30	#ifndef _WIN32
30	# include <sys/types.h>	31	# include <sys/types.h>
31	# include <sys/socket.h>	32	# include <sys/socket.h>
32	# include <netinet/in.h>	33	# include <netinet/in.h>
…		…
41	typedef signed int int32_t;	42	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#include "glext.h"
45		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
46	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
47		50
48	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
50		53
51	#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
52		61
53	static struct	62	static struct
54	{	63	{
55	#define GL_FUNC(ptr,name) ptr name;	64	#define GL_FUNC(ptr,name) ptr name;
56	#include "glfunc.h"	65	#include "glfunc.h"
…		…
65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	74	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	else	75	else
67	glBlendFunc (sa, da);	76	glBlendFunc (sa, da);
68	}	77	}
69		78
		79	#include "texcache.c"
		80
		81	#include "pango-font.c"
		82	#include "pango-fontmap.c"
		83	#include "pango-render.c"
		84
70	typedef Mix_Chunk *CFClient__MixChunk;	85	typedef Mix_Chunk *CFClient__MixChunk;
71	typedef Mix_Music *CFClient__MixMusic;	86	typedef Mix_Music *CFClient__MixMusic;
72		87
73	typedef PangoFontDescription *CFClient__Font;	88	typedef PangoFontDescription *CFClient__Font;
74		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
75	typedef struct cf_layout {	108	typedef struct cf_layout {
76	PangoLayout *pl; // either derived from a cairo or ft2 context	109	PangoLayout *pl;
77	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
78	float r, g, b, a; // default color for rgba mode	110	float r, g, b, a; // default color for rgba mode
79	int base_height;	111	int base_height;
80	CFClient__Font font;	112	CFClient__Font font;
81	} *CFClient__Layout;	113	} *CFClient__Layout;
82		114
83	static CFClient__Font default_font;	115	static CFClient__Font default_font;
84	static PangoContext ft2_context, cairo_context;	116	static PangoContext *opengl_context;
85	static PangoFontMap ft2_fontmap, cairo_fontmap;	117	static PangoFontMap *opengl_fontmap;
86		118
87	static void	119	static void
88	substitute_func (FcPattern *pattern, gpointer data)	120	substitute_func (FcPattern *pattern, gpointer data)
89	{	121	{
90	FcPatternAddBool (pattern, FC_HINTING , 1);	122	FcPatternAddBool (pattern, FC_HINTING, 1);
91	#ifdef _WIN32	123	#ifdef FC_HINT_STYLE
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
93	#else	125	#endif
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	126	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif
96	}	127	}
97		128
98	static void	129	static void
99	layout_update_font (CFClient__Layout self)	130	layout_update_font (CFClient__Layout self)
100	{	131	{
…		…
296	ev.code = 1;	327	ev.code = 1;
297	ev.data1 = (void *)(long)channel;	328	ev.data1 = (void *)(long)channel;
298	ev.data2 = 0;	329	ev.data2 = 0;
299		330
300	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;
301	}	349	}
302		350
303	MODULE = CFClient PACKAGE = CFClient	351	MODULE = CFClient PACKAGE = CFClient
304		352
305	PROTOTYPES: ENABLE	353	PROTOTYPES: ENABLE
…		…
415		463
416	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; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	466	}
419		467
		468	NV floor (NV x)
		469
		470	NV ceil (NV x)
		471
420	void	472	void
421	pango_init ()	473	pango_init ()
422	CODE:	474	CODE:
423	{	475	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	476	opengl_fontmap = pango_opengl_font_map_new ();
426	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);
427	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	478	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
428
429	cairo_fontmap = pango_cairo_font_map_get_default ();
430	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
431	}	479	}
432		480
433	int	481	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	482	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		483
436	void	484	void
437	SDL_Quit ()	485	SDL_Quit ()
438		486
439	void	487	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	494	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	495	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	496	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		497
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	498	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	499	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		500
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	501	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	502	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	503	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	504	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
577		625
578	void	626	void
579	add_font (char *file)	627	add_font (char *file)
580	CODE:	628	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
582	#ifdef _WIN32
583	// cairo... sigh... requires win2000
584	AddFontResourceEx (file, FR_PRIVATE, 0);
585	#endif
586		630
587	void	631	void
588	load_image_inline (SV *image_)	632	load_image_inline (SV *image_)
589	ALIAS:	633	ALIAS:
590	load_image_file = 1	634	load_image_file = 1
…		…
686	CODE:	730	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	731	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	732	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	733	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	734	#endif
691	exit (1);	735	_exit (1);
		736
		737	void
		738	_exit (int retval)
		739	CODE:
		740	_exit (retval);
692		741
693	MODULE = CFClient PACKAGE = CFClient::Font	742	MODULE = CFClient PACKAGE = CFClient::Font
694		743
695	CFClient::Font	744	CFClient::Font
696	new_from_file (SV class, char path, int id = 0)	745	new_from_file (SV class, char path, int id = 0)
…		…
714	CODE:	763	CODE:
715	default_font = self;	764	default_font = self;
716		765
717	MODULE = CFClient PACKAGE = CFClient::Layout	766	MODULE = CFClient PACKAGE = CFClient::Layout
718		767
		768	void
		769	clear_font_cache ()
		770	CODE:
		771	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		772	tc_clear ();
		773
719	CFClient::Layout	774	CFClient::Layout
720	new (SV *class, int rgba = 0)	775	new (SV *class, int type = 0)
721	CODE:	776	CODE:
722	#if _WIN32
723	//rgba = 0;//D makes text nicer, breaks TextView
724	#endif
725	rgba=1;//D
726	New (0, RETVAL, 1, struct cf_layout);	777	New (0, RETVAL, 1, struct cf_layout);
727		778
728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	779	RETVAL->pl = pango_layout_new (opengl_context);
729	RETVAL->rgba = rgba;
730	RETVAL->r = 1.;	780	RETVAL->r = 1.;
731	RETVAL->g = 1.;	781	RETVAL->g = 1.;
732	RETVAL->b = 1.;	782	RETVAL->b = 1.;
733	RETVAL->a = 1.;	783	RETVAL->a = 1.;
734	RETVAL->base_height = MIN_FONT_HEIGHT;	784	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
743	DESTROY (CFClient::Layout self)	793	DESTROY (CFClient::Layout self)
744	CODE:	794	CODE:
745	g_object_unref (self->pl);	795	g_object_unref (self->pl);
746	Safefree (self);	796	Safefree (self);
747		797
748	int
749	is_rgba (CFClient::Layout self)
750	CODE:
751	RETVAL = self->rgba;
752	OUTPUT:
753	RETVAL
754
755	void	798	void
756	set_text (CFClient::Layout self, SV *text_)	799	set_text (CFClient::Layout self, SV *text_)
757	CODE:	800	CODE:
758	{	801	{
759	STRLEN textlen;	802	STRLEN textlen;
…		…
770	char *text = SvPVutf8 (text_, textlen);	813	char *text = SvPVutf8 (text_, textlen);
771		814
772	pango_layout_set_markup (self->pl, text, textlen);	815	pango_layout_set_markup (self->pl, text, textlen);
773	}	816	}
774		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
		901
775	SV *	902	SV *
776	get_text (CFClient::Layout self)	903	get_text (CFClient::Layout self)
777	CODE:	904	CODE:
778	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	905	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
779	SvUTF8_on (RETVAL);	906	sv_utf8_decode (RETVAL);
780	OUTPUT:	907	OUTPUT:
781	RETVAL	908	RETVAL
782		909
783	void	910	void
784	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	911	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
848	PUSHs (sv_2mortal (newSViv (w)));	975	PUSHs (sv_2mortal (newSViv (w)));
849	PUSHs (sv_2mortal (newSViv (h)));	976	PUSHs (sv_2mortal (newSViv (h)));
850	}	977	}
851		978
852	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
853	xy_to_index (CFClient::Layout self, int x, int y)	992	xy_to_index (CFClient::Layout self, int x, int y)
854	CODE:	993	CODE:
855	{	994	{
856	int index, trailing;	995	int index, trailing;
857	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);
…		…
872	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
873	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1012	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
874	}	1013	}
875		1014
876	void	1015	void
877	render (CFClient::Layout self)	1016	render (CFClient::Layout self, float x, float y)
878	PPCODE:	1017	PPCODE:
879	{	1018	pango_opengl_render_layout_subpixel (
880	SV *retval;	1019	self->pl,
881	int w, h;	1020	x * PANGO_SCALE, y * PANGO_SCALE,
		1021	self->r, self->g, self->b, self->a
		1022	);
882		1023
883	layout_get_pixel_size (self, &w, &h);	1024	MODULE = CFClient PACKAGE = CFClient::Texture
884		1025
885	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)
886	{	1034	{
887	cairo_surface_t *surface;	1035	int nw = minpot (ow);
888	cairo_t *cairo;	1036	int nh = minpot (oh);
889		1037
890	retval = newSV (w * h * 4);	1038	if (nw != ow \|\| nh != oh)
891	SvPOK_only (retval);
892	SvCUR_set (retval, w * h * 4);
893
894	memset (SvPVX (retval), 0, w * h * 4);
895
896	surface = cairo_image_surface_create_for_data (
897	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
898	cairo = cairo_create (surface);
899	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
900
901	pango_cairo_show_layout (cairo, self->pl);
902
903	cairo_destroy (cairo);
904	cairo_surface_destroy (surface);
905
906	// what a mess, and its premultiplied, too :(
907	{	1039	{
908	uint32_t p = (uint32_t )SvPVX (retval);	1040	if (SvOK (data_))
909	uint32_t e = p + w h;
910
911	while (p < e)
912	{	1041	{
913	uint32_t rgba = *p;	1042	STRLEN datalen;
914	rgba = (rgba >> 24) \| (rgba << 8);	1043	char *data = SvPVbyte (data_, datalen);
915	#if 0	1044	int bpp = datalen / (ow * oh);
916	#ifdef _WIN32	1045	SV result_ = sv_2mortal (newSV (nw nh * bpp));
917	{//D
918	uint8_t r = rgba >> 24;
919	uint8_t g = rgba >> 16;
920	uint8_t b = rgba >> 8;
921	uint8_t a = rgba >> 0;
922		1046
923	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_);
924	}	1055	}
925	#endif	1056
926	#endif	1057	sv_setiv (w_, nw);
927	rgba = SDL_SwapBE32 (rgba);	1058	sv_setiv (h_, nh);
928	*p++ = rgba;
929	}	1059	}
930	}
931
932	EXTEND (SP, 5);
933	PUSHs (sv_2mortal (newSViv (w)));
934	PUSHs (sv_2mortal (newSViv (h)));
935	PUSHs (sv_2mortal (retval));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
938	}	1060	}
939	else
940	{
941	FT_Bitmap bitmap;
942
943	retval = newSV (w * h);
944	SvPOK_only (retval);
945	SvCUR_set (retval, w * h);
946
947	bitmap.rows = h;
948	bitmap.width = w;
949	bitmap.pitch = w;
950	bitmap.buffer = (unsigned char*)SvPVX (retval);
951	bitmap.num_grays = 256;
952	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
953
954	memset (bitmap.buffer, 0, w * h);
955
956	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
957
958	EXTEND (SP, 5);
959	PUSHs (sv_2mortal (newSViv (w)));
960	PUSHs (sv_2mortal (newSViv (h)));
961	PUSHs (sv_2mortal (retval));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
964	}
965	}	1061	}
966		1062
967	MODULE = CFClient PACKAGE = CFClient::Texture
968
969	void	1063	void
970	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.)
971	PROTOTYPE: $$$;$$	1065	PROTOTYPE: $$$;$$
972	ALIAS:	1066	ALIAS:
973	draw_quad_alpha = 1	1067	draw_quad_alpha = 1
974	draw_quad_alpha_premultiplied = 2	1068	draw_quad_alpha_premultiplied = 2
975	CODE:	1069	CODE:
…		…
1040	DESTROY (CFClient::Map self)	1134	DESTROY (CFClient::Map self)
1041	CODE:	1135	CODE:
1042	{	1136	{
1043	map_clear (self);	1137	map_clear (self);
1044	Safefree (self->face);	1138	Safefree (self->face);
		1139	Safefree (self->tex);
1045	Safefree (self);	1140	Safefree (self);
1046	}	1141	}
1047		1142
1048	void	1143	void
1049	clear (CFClient::Map self)	1144	clear (CFClient::Map self)
…		…
1155		1250
1156	while (data < data_end)	1251	while (data < data_end)
1157	{	1252	{
1158	flags = (data [0] << 8) + data [1]; data += 2;	1253	flags = (data [0] << 8) + data [1]; data += 2;
1159		1254
1160	x = ((flags >> 10) & 63) + self->x;	1255	x = self->x + ((flags >> 10) & 63);
1161	y = ((flags >> 4) & 63) + self->y;	1256	y = self->y + ((flags >> 4) & 63);
1162		1257
1163	cell = map_get_cell (self, x, y);	1258	cell = map_get_cell (self, x, y);
1164		1259
1165	if (flags & 15)	1260	if (flags & 15)
1166	{	1261	{
…		…
1256	OUTPUT:	1351	OUTPUT:
1257	RETVAL	1352	RETVAL
1258		1353
1259	void	1354	void
1260	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)
1261	PPCODE:	1356	CODE:
1262	{	1357	{
1263	int vx, vy;	1358	int vx, vy;
1264	int x, y, z;	1359	int x, y, z;
1265	int last_name;	1360	int last_name;
1266	mapface face;	1361	mapface face;
1267	int sw4 = (sw + 3) & ~3;
1268	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1269	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1270		1362
1271	memset (darkness, 255, sw4 * sh);
1272	SvPOK_only (darkness_sv);
1273	SvCUR_set (darkness_sv, sw4 * sh);
1274
1275	vx = self->x + (self->w - sw) / 2 - shift_x;	1363	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1276	vy = self->y + (self->h - sh) / 2 - shift_y;	1364	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1277		1365
1278	/*	1366	/*
1279	int vx = self->vx = self->w >= sw	1367	int vx = self->vx = self->w >= sw
1280	? self->x + (self->w - sw) / 2	1368	? self->x + (self->w - sw) / 2
1281	: 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));
…		…
1285	: 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));
1286	*/	1374	*/
1287		1375
1288	glColor4ub (255, 255, 255, 255);	1376	glColor4ub (255, 255, 255, 255);
1289		1377
		1378	glEnable (GL_BLEND);
1290	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1379	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1291	glEnable (GL_BLEND);
1292	glEnable (GL_TEXTURE_2D);	1380	glEnable (GL_TEXTURE_2D);
1293	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1381	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1294		1382
1295	glBegin (GL_QUADS);	1383	glBegin (GL_QUADS);
1296		1384
…		…
1304		1392
1305	for (x = 0; x < sw; x++)	1393	for (x = 0; x < sw; x++)
1306	if (row->c0 <= x + vx && x + vx < row->c1)	1394	if (row->c0 <= x + vx && x + vx < row->c1)
1307	{	1395	{
1308	mapcell *cell = row->col + (x + vx - row->c0);	1396	mapcell *cell = row->col + (x + vx - row->c0);
1309
1310	darkness[y * sw4 + x] = cell->darkness < 0
1311	? 255 - FOW_DARKNESS
1312	: 255 - cell->darkness;
1313		1397
1314	face = cell->face [z];	1398	face = cell->face [z];
1315		1399
1316	if (face)	1400	if (face)
1317	{	1401	{
…		…
1338		1422
1339	glEnd ();	1423	glEnd ();
1340		1424
1341	glDisable (GL_TEXTURE_2D);	1425	glDisable (GL_TEXTURE_2D);
1342	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	}
1343		1521
1344	EXTEND (SP, 3);	1522	EXTEND (SP, 3);
1345	PUSHs (sv_2mortal (newSViv (sw4)));	1523	PUSHs (sv_2mortal (newSViv (sw4)));
1346	PUSHs (sv_2mortal (newSViv (sh)));	1524	PUSHs (sv_2mortal (newSViv (sh)));
1347	PUSHs (darkness_sv);	1525	PUSHs (darkness_sv);
…		…
1554	const_iv (GL_SCISSOR_TEST),	1732	const_iv (GL_SCISSOR_TEST),
1555	const_iv (GL_DEPTH_TEST),	1733	const_iv (GL_DEPTH_TEST),
1556	const_iv (GL_ALPHA_TEST),	1734	const_iv (GL_ALPHA_TEST),
1557	const_iv (GL_NORMALIZE),	1735	const_iv (GL_NORMALIZE),
1558	const_iv (GL_RESCALE_NORMAL),	1736	const_iv (GL_RESCALE_NORMAL),
		1737	const_iv (GL_FRONT),
		1738	const_iv (GL_BACK),
1559	const_iv (GL_AND),	1739	const_iv (GL_AND),
1560	const_iv (GL_ONE),	1740	const_iv (GL_ONE),
1561	const_iv (GL_ZERO),	1741	const_iv (GL_ZERO),
1562	const_iv (GL_SRC_ALPHA),	1742	const_iv (GL_SRC_ALPHA),
1563	const_iv (GL_DST_ALPHA),	1743	const_iv (GL_DST_ALPHA),
1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1744	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1565	const_iv (GL_ONE_MINUS_DST_ALPHA),	1745	const_iv (GL_ONE_MINUS_DST_ALPHA),
1566	const_iv (GL_SRC_ALPHA_SATURATE),	1746	const_iv (GL_SRC_ALPHA_SATURATE),
1567	const_iv (GL_RGB),	1747	const_iv (GL_RGB),
1568	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),
1569	const_iv (GL_UNSIGNED_BYTE),	1752	const_iv (GL_UNSIGNED_BYTE),
1570	const_iv (GL_UNSIGNED_SHORT),	1753	const_iv (GL_UNSIGNED_SHORT),
1571	const_iv (GL_UNSIGNED_INT),	1754	const_iv (GL_UNSIGNED_INT),
1572	const_iv (GL_ALPHA),	1755	const_iv (GL_ALPHA),
1573	const_iv (GL_INTENSITY),	1756	const_iv (GL_INTENSITY),
…		…
1647	OUTPUT:	1830	OUTPUT:
1648	RETVAL	1831	RETVAL
1649		1832
1650	int glGetError ()	1833	int glGetError ()
1651		1834
		1835	void glFinish ()
		1836
1652	void glClear (int mask)	1837	void glClear (int mask)
1653		1838
1654	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)
1655	PROTOTYPE: @	1840	PROTOTYPE: @
1656		1841
…		…
1679	void glPushMatrix ()	1864	void glPushMatrix ()
1680		1865
1681	void glPopMatrix ()	1866	void glPopMatrix ()
1682		1867
1683	void glLoadIdentity ()	1868	void glLoadIdentity ()
		1869
		1870	void glDrawBuffer (int buffer)
		1871
		1872	void glReadBuffer (int buffer)
1684		1873
1685	# near_ and far_ are due to microsofts buggy "c" compiler	1874	# near_ and far_ are due to microsofts buggy "c" compiler
1686	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_)
1687		1876
1688	# 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.104 by root, Mon Jun 5 00:17:47 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.104 by root, Mon Jun 5 00:17:47 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC