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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.128 by root, Wed Jul 5 03:01:01 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 0
		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	tc_clear ();
		772
719	CFClient::Layout	773	CFClient::Layout
720	new (SV *class, int rgba = 0)	774	new (SV *class)
721	CODE:	775	CODE:
722	#if _WIN32
723	//rgba = 0;//D makes text nicer, breaks TextView
724	#endif
725	New (0, RETVAL, 1, struct cf_layout);	776	New (0, RETVAL, 1, struct cf_layout);
726		777
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	778	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	779	RETVAL->r = 1.;
730	RETVAL->g = 1.;	780	RETVAL->g = 1.;
731	RETVAL->b = 1.;	781	RETVAL->b = 1.;
732	RETVAL->a = 1.;	782	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	783	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
742	DESTROY (CFClient::Layout self)	792	DESTROY (CFClient::Layout self)
743	CODE:	793	CODE:
744	g_object_unref (self->pl);	794	g_object_unref (self->pl);
745	Safefree (self);	795	Safefree (self);
746		796
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	797	void
755	set_text (CFClient::Layout self, SV *text_)	798	set_text (CFClient::Layout self, SV *text_)
756	CODE:	799	CODE:
757	{	800	{
758	STRLEN textlen;	801	STRLEN textlen;
…		…
769	char *text = SvPVutf8 (text_, textlen);	812	char *text = SvPVutf8 (text_, textlen);
770		813
771	pango_layout_set_markup (self->pl, text, textlen);	814	pango_layout_set_markup (self->pl, text, textlen);
772	}	815	}
773		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
		900
774	SV *	901	SV *
775	get_text (CFClient::Layout self)	902	get_text (CFClient::Layout self)
776	CODE:	903	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	905	sv_utf8_decode (RETVAL);
779	OUTPUT:	906	OUTPUT:
780	RETVAL	907	RETVAL
781		908
782	void	909	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	910	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	974	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	975	PUSHs (sv_2mortal (newSViv (h)));
849	}	976	}
850		977
851	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
852	xy_to_index (CFClient::Layout self, int x, int y)	991	xy_to_index (CFClient::Layout self, int x, int y)
853	CODE:	992	CODE:
854	{	993	{
855	int index, trailing;	994	int index, trailing;
856	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);
…		…
871	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1012	}
874		1013
875	void	1014	void
876	render (CFClient::Layout self)	1015	render (CFClient::Layout self, float x, float y)
877	PPCODE:	1016	PPCODE:
878	{	1017	pango_opengl_render_layout_subpixel (
879	SV *retval;	1018	self->pl,
880	int w, h;	1019	x * PANGO_SCALE, y * PANGO_SCALE,
		1020	self->r, self->g, self->b, self->a
		1021	);
881		1022
882	layout_get_pixel_size (self, &w, &h);	1023	MODULE = CFClient PACKAGE = CFClient::Texture
883		1024
884	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)
885	{	1033	{
886	cairo_surface_t *surface;	1034	int nw = minpot (ow);
887	cairo_t *cairo;	1035	int nh = minpot (oh);
888		1036
889	retval = newSV (w * h * 4);	1037	if (nw != ow \|\| nh != oh)
890	SvPOK_only (retval);
891	SvCUR_set (retval, w * h * 4);
892
893	memset (SvPVX (retval), 0, w * h * 4);
894
895	surface = cairo_image_surface_create_for_data (
896	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
897	cairo = cairo_create (surface);
898	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
899
900	pango_cairo_show_layout (cairo, self->pl);
901
902	cairo_destroy (cairo);
903	cairo_surface_destroy (surface);
904
905	// what a mess, and its premultiplied, too :(
906	{	1038	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1039	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1040	{
912	uint32_t rgba = *p;	1041	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1042	char *data = SvPVbyte (data_, datalen);
914	#if 0	1043	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1044	SV result_ = sv_2mortal (newSV (nw nh * bpp));
916	{//D
917	uint8_t r = rgba >> 24;
918	uint8_t g = rgba >> 16;
919	uint8_t b = rgba >> 8;
920	uint8_t a = rgba >> 0;
921		1045
922	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_);
923	}	1054	}
924	#endif	1055
925	#endif	1056	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1057	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1058	}
929	}
930
931	EXTEND (SP, 5);
932	PUSHs (sv_2mortal (newSViv (w)));
933	PUSHs (sv_2mortal (newSViv (h)));
934	PUSHs (sv_2mortal (retval));
935	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
936	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
937	}	1059	}
938	else
939	{
940	FT_Bitmap bitmap;
941
942	retval = newSV (w * h);
943	SvPOK_only (retval);
944	SvCUR_set (retval, w * h);
945
946	bitmap.rows = h;
947	bitmap.width = w;
948	bitmap.pitch = w;
949	bitmap.buffer = (unsigned char*)SvPVX (retval);
950	bitmap.num_grays = 256;
951	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
952
953	memset (bitmap.buffer, 0, w * h);
954
955	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
956
957	EXTEND (SP, 5);
958	PUSHs (sv_2mortal (newSViv (w)));
959	PUSHs (sv_2mortal (newSViv (h)));
960	PUSHs (sv_2mortal (retval));
961	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
962	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
963	}
964	}	1060	}
965		1061
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1062	void
969	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.)
970	PROTOTYPE: $$$;$$	1064	PROTOTYPE: $$$;$$
971	ALIAS:	1065	ALIAS:
972	draw_quad_alpha = 1	1066	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1067	draw_quad_alpha_premultiplied = 2
974	CODE:	1068	CODE:
…		…
990		1084
991	if (ix == 2)	1085	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1086	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1087	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1088	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1089	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1090
997	glEnable (GL_ALPHA_TEST);	1091	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1092	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1093	}
1000		1094
…		…
1039	DESTROY (CFClient::Map self)	1133	DESTROY (CFClient::Map self)
1040	CODE:	1134	CODE:
1041	{	1135	{
1042	map_clear (self);	1136	map_clear (self);
1043	Safefree (self->face);	1137	Safefree (self->face);
		1138	Safefree (self->tex);
1044	Safefree (self);	1139	Safefree (self);
1045	}	1140	}
1046		1141
1047	void	1142	void
1048	clear (CFClient::Map self)	1143	clear (CFClient::Map self)
…		…
1154		1249
1155	while (data < data_end)	1250	while (data < data_end)
1156	{	1251	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1252	flags = (data [0] << 8) + data [1]; data += 2;
1158		1253
1159	x = ((flags >> 10) & 63) + self->x;	1254	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1255	y = self->y + ((flags >> 4) & 63);
1161		1256
1162	cell = map_get_cell (self, x, y);	1257	cell = map_get_cell (self, x, y);
1163		1258
1164	if (flags & 15)	1259	if (flags & 15)
1165	{	1260	{
…		…
1255	OUTPUT:	1350	OUTPUT:
1256	RETVAL	1351	RETVAL
1257		1352
1258	void	1353	void
1259	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)
1260	PPCODE:	1355	CODE:
1261	{	1356	{
1262	int vx, vy;	1357	int vx, vy;
1263	int x, y, z;	1358	int x, y, z;
1264	int last_name;	1359	int last_name;
1265	mapface face;	1360	mapface face;
1266	int sw4 = (sw + 3) & ~3;
1267	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1268	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1269		1361
1270	memset (darkness, 255, sw4 * sh);
1271	SvPOK_only (darkness_sv);
1272	SvCUR_set (darkness_sv, sw4 * sh);
1273
1274	vx = self->x + (self->w - sw) / 2 - shift_x;	1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1364
1277	/*	1365	/*
1278	int vx = self->vx = self->w >= sw	1366	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1367	? self->x + (self->w - sw) / 2
1280	: 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));
…		…
1284	: 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));
1285	*/	1373	*/
1286		1374
1287	glColor4ub (255, 255, 255, 255);	1375	glColor4ub (255, 255, 255, 255);
1288		1376
		1377	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1378	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1379	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1380	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1381
1294	glBegin (GL_QUADS);	1382	glBegin (GL_QUADS);
1295		1383
…		…
1303		1391
1304	for (x = 0; x < sw; x++)	1392	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1393	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1394	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1395	mapcell *cell = row->col + (x + vx - row->c0);
1308
1309	darkness[y * sw4 + x] = cell->darkness < 0
1310	? 255 - FOW_DARKNESS
1311	: 255 - cell->darkness;
1312		1396
1313	face = cell->face [z];	1397	face = cell->face [z];
1314		1398
1315	if (face)	1399	if (face)
1316	{	1400	{
…		…
1337		1421
1338	glEnd ();	1422	glEnd ();
1339		1423
1340	glDisable (GL_TEXTURE_2D);	1424	glDisable (GL_TEXTURE_2D);
1341	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	}
1342		1520
1343	EXTEND (SP, 3);	1521	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1522	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1523	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1524	PUSHs (darkness_sv);
…		…
1553	const_iv (GL_SCISSOR_TEST),	1731	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1732	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1733	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1734	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1735	const_iv (GL_RESCALE_NORMAL),
		1736	const_iv (GL_FRONT),
		1737	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1738	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1739	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1740	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1741	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1742	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1743	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1744	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1745	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1746	const_iv (GL_RGB),
1566	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),
1567	const_iv (GL_UNSIGNED_BYTE),	1751	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1752	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1753	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1754	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1755	const_iv (GL_INTENSITY),
…		…
1645	OUTPUT:	1829	OUTPUT:
1646	RETVAL	1830	RETVAL
1647		1831
1648	int glGetError ()	1832	int glGetError ()
1649		1833
		1834	void glFinish ()
		1835
1650	void glClear (int mask)	1836	void glClear (int mask)
1651		1837
1652	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)
1653	PROTOTYPE: @	1839	PROTOTYPE: @
1654		1840
…		…
1677	void glPushMatrix ()	1863	void glPushMatrix ()
1678		1864
1679	void glPopMatrix ()	1865	void glPopMatrix ()
1680		1866
1681	void glLoadIdentity ()	1867	void glLoadIdentity ()
		1868
		1869	void glDrawBuffer (int buffer)
		1870
		1871	void glReadBuffer (int buffer)
1682		1872
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1873	# near_ and far_ are due to microsofts buggy "c" compiler
1684	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_)
1685		1875
1686	# 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.103 by root, Sun Jun 4 23:05:05 2006 UTC vs. Revision 1.128 by root, Wed Jul 5 03:01:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC vs.
Revision 1.128 by root, Wed Jul 5 03:01:01 2006 UTC