[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.124 by root, Tue Jul 4 23:23:31 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);
		123	#ifdef FC_HINT_STYLE
		124	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		125	#endif
91	#ifdef _WIN32	126	#ifdef _WIN32
92	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	127	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
93	#else	128	#else
94	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
95	#endif	130	#endif
…		…
296	ev.code = 1;	331	ev.code = 1;
297	ev.data1 = (void *)(long)channel;	332	ev.data1 = (void *)(long)channel;
298	ev.data2 = 0;	333	ev.data2 = 0;
299		334
300	SDL_PushEvent ((SDL_Event *)&ev);	335	SDL_PushEvent ((SDL_Event *)&ev);
		336	}
		337
		338	static unsigned int
		339	minpot (unsigned int n)
		340	{
		341	if (!n)
		342	return 0;
		343
		344	--n;
		345
		346	n \|= n >> 1;
		347	n \|= n >> 2;
		348	n \|= n >> 4;
		349	n \|= n >> 8;
		350	n \|= n >> 16;
		351
		352	return n + 1;
301	}	353	}
302		354
303	MODULE = CFClient PACKAGE = CFClient	355	MODULE = CFClient PACKAGE = CFClient
304		356
305	PROTOTYPES: ENABLE	357	PROTOTYPES: ENABLE
…		…
415		467
416	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	468	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
417	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	469	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
418	}	470	}
419		471
		472	NV floor (NV x)
		473
		474	NV ceil (NV x)
		475
420	void	476	void
421	pango_init ()	477	pango_init ()
422	CODE:	478	CODE:
423	{	479	{
424	// delayed, so it can pick up new fonts added by AddFontResourceEx
425	ft2_fontmap = pango_ft2_font_map_new ();	480	opengl_fontmap = pango_opengl_font_map_new ();
426	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	481	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);	482	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	}	483	}
432		484
433	int	485	int
434	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	486	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
435		487
436	void	488	void
437	SDL_Quit ()	489	SDL_Quit ()
438		490
439	void	491	void
…		…
446	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	498	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
447	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	499	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
448	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	500	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
449		501
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	502	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	503	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		504
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	505	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	506	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
455	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	507	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
456	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
577		629
578	void	630	void
579	add_font (char *file)	631	add_font (char *file)
580	CODE:	632	CODE:
581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	633	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		634
587	void	635	void
588	load_image_inline (SV *image_)	636	load_image_inline (SV *image_)
589	ALIAS:	637	ALIAS:
590	load_image_file = 1	638	load_image_file = 1
…		…
686	CODE:	734	CODE:
687	fprintf (stderr, "FATAL: %s\n", message);	735	fprintf (stderr, "FATAL: %s\n", message);
688	#ifdef _WIN32	736	#ifdef _WIN32
689	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	737	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
690	#endif	738	#endif
691	exit (1);	739	_exit (1);
		740
		741	void
		742	_exit (int retval)
		743	CODE:
		744	_exit (retval);
692		745
693	MODULE = CFClient PACKAGE = CFClient::Font	746	MODULE = CFClient PACKAGE = CFClient::Font
694		747
695	CFClient::Font	748	CFClient::Font
696	new_from_file (SV class, char path, int id = 0)	749	new_from_file (SV class, char path, int id = 0)
…		…
714	CODE:	767	CODE:
715	default_font = self;	768	default_font = self;
716		769
717	MODULE = CFClient PACKAGE = CFClient::Layout	770	MODULE = CFClient PACKAGE = CFClient::Layout
718		771
		772	void
		773	clear_font_cache ()
		774	CODE:
		775	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		776	tc_clear ();
		777
719	CFClient::Layout	778	CFClient::Layout
720	new (SV *class, int rgba = 0)	779	new (SV *class, int type = 0)
721	CODE:	780	CODE:
722	#if _WIN32
723	//rgba = 0;//D makes text nicer, breaks TextView
724	#endif
725	New (0, RETVAL, 1, struct cf_layout);	781	New (0, RETVAL, 1, struct cf_layout);
726		782
727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	783	RETVAL->pl = pango_layout_new (opengl_context);
728	RETVAL->rgba = rgba;
729	RETVAL->r = 1.;	784	RETVAL->r = 1.;
730	RETVAL->g = 1.;	785	RETVAL->g = 1.;
731	RETVAL->b = 1.;	786	RETVAL->b = 1.;
732	RETVAL->a = 1.;	787	RETVAL->a = 1.;
733	RETVAL->base_height = MIN_FONT_HEIGHT;	788	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
742	DESTROY (CFClient::Layout self)	797	DESTROY (CFClient::Layout self)
743	CODE:	798	CODE:
744	g_object_unref (self->pl);	799	g_object_unref (self->pl);
745	Safefree (self);	800	Safefree (self);
746		801
747	int
748	is_rgba (CFClient::Layout self)
749	CODE:
750	RETVAL = self->rgba;
751	OUTPUT:
752	RETVAL
753
754	void	802	void
755	set_text (CFClient::Layout self, SV *text_)	803	set_text (CFClient::Layout self, SV *text_)
756	CODE:	804	CODE:
757	{	805	{
758	STRLEN textlen;	806	STRLEN textlen;
…		…
769	char *text = SvPVutf8 (text_, textlen);	817	char *text = SvPVutf8 (text_, textlen);
770		818
771	pango_layout_set_markup (self->pl, text, textlen);	819	pango_layout_set_markup (self->pl, text, textlen);
772	}	820	}
773		821
		822	void
		823	set_shapes (CFClient::Layout self, ...)
		824	CODE:
		825	{
		826	PangoAttrList *attrs = 0;
		827	const char *text = pango_layout_get_text (self->pl);
		828	const char *pos = text;
		829	int arg = 4;
		830
		831	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		832	{
		833	PangoRectangle inkrect, rect;
		834	PangoAttribute *attr;
		835
		836	int x = SvIV (ST (arg - 3));
		837	int y = SvIV (ST (arg - 2));
		838	int w = SvIV (ST (arg - 1));
		839	int h = SvIV (ST (arg ));
		840
		841	inkrect.x = 0;
		842	inkrect.y = 0;
		843	inkrect.width = 0;
		844	inkrect.height = 0;
		845
		846	rect.x = x * PANGO_SCALE;
		847	rect.y = y * PANGO_SCALE;
		848	rect.width = w * PANGO_SCALE;
		849	rect.height = h * PANGO_SCALE;
		850
		851	if (!attrs)
		852	attrs = pango_layout_get_attributes (self->pl);
		853
		854	attr = pango_attr_shape_new (&inkrect, &rect);
		855	attr->start_index = pos - text;
		856	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		857	pango_attr_list_insert (attrs, attr);
		858
		859	arg += 4;
		860	pos += sizeof (OBJ_STR) - 1;
		861	}
		862
		863	if (attrs)
		864	pango_layout_set_attributes (self->pl, attrs);
		865	}
		866
		867	void
		868	get_shapes (CFClient::Layout self)
		869	PPCODE:
		870	{
		871	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		872
		873	do
		874	{
		875	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		876
		877	if (run && shape_attr_p (run))
		878	{
		879	PangoRectangle extents;
		880	pango_layout_iter_get_run_extents (iter, 0, &extents);
		881
		882	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		883	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		884	}
		885	}
		886	while (pango_layout_iter_next_run (iter));
		887
		888	pango_layout_iter_free (iter);
		889	}
		890
		891	int
		892	has_wrapped (CFClient::Layout self)
		893	CODE:
		894	{
		895	int lines = 1;
		896	const char *text = pango_layout_get_text (self->pl);
		897
		898	while (*text)
		899	lines += *text++ == '\n';
		900
		901	RETVAL = lines < pango_layout_get_line_count (self->pl);
		902	}
		903	OUTPUT:
		904	RETVAL
		905
774	SV *	906	SV *
775	get_text (CFClient::Layout self)	907	get_text (CFClient::Layout self)
776	CODE:	908	CODE:
777	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	909	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
778	SvUTF8_on (RETVAL);	910	sv_utf8_decode (RETVAL);
779	OUTPUT:	911	OUTPUT:
780	RETVAL	912	RETVAL
781		913
782	void	914	void
783	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	915	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
847	PUSHs (sv_2mortal (newSViv (w)));	979	PUSHs (sv_2mortal (newSViv (w)));
848	PUSHs (sv_2mortal (newSViv (h)));	980	PUSHs (sv_2mortal (newSViv (h)));
849	}	981	}
850		982
851	int	983	int
		984	descent (CFClient::Layout self)
		985	CODE:
		986	{
		987	PangoRectangle rect;
		988	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		989	pango_layout_line_get_pixel_extents (line, 0, &rect);
		990	RETVAL = PANGO_DESCENT (rect);
		991	}
		992	OUTPUT:
		993	RETVAL
		994
		995	int
852	xy_to_index (CFClient::Layout self, int x, int y)	996	xy_to_index (CFClient::Layout self, int x, int y)
853	CODE:	997	CODE:
854	{	998	{
855	int index, trailing;	999	int index, trailing;
856	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1000	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)));	1015	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
872	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1016	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
873	}	1017	}
874		1018
875	void	1019	void
876	render (CFClient::Layout self)	1020	render (CFClient::Layout self, float x, float y)
877	PPCODE:	1021	PPCODE:
878	{	1022	pango_opengl_render_layout_subpixel (
879	SV *retval;	1023	self->pl,
880	int w, h;	1024	x * PANGO_SCALE, y * PANGO_SCALE,
		1025	self->r, self->g, self->b, self->a
		1026	);
881		1027
882	layout_get_pixel_size (self, &w, &h);	1028	MODULE = CFClient PACKAGE = CFClient::Texture
883		1029
884	if (self->rgba)	1030	void
		1031	pad2pot (SV data_, SV w_, SV *h_)
		1032	CODE:
		1033	{
		1034	int ow = SvIV (w_);
		1035	int oh = SvIV (h_);
		1036
		1037	if (ow && oh)
885	{	1038	{
886	cairo_surface_t *surface;	1039	int nw = minpot (ow);
887	cairo_t *cairo;	1040	int nh = minpot (oh);
888		1041
889	retval = newSV (w * h * 4);	1042	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	{	1043	{
907	uint32_t p = (uint32_t )SvPVX (retval);	1044	if (SvOK (data_))
908	uint32_t e = p + w h;
909
910	while (p < e)
911	{	1045	{
912	uint32_t rgba = *p;	1046	STRLEN datalen;
913	rgba = (rgba >> 24) \| (rgba << 8);	1047	char *data = SvPVbyte (data_, datalen);
914	#if 0	1048	int bpp = datalen / (ow * oh);
915	#ifdef _WIN32	1049	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		1050
922	rgba = (rgba & 0xffffff00) \| a;	1051	SvPOK_only (result_);
		1052	SvCUR_set (result_, nw * nh * bpp);
		1053
		1054	memset (SvPVX (result_), 0, nw * nh * bpp);
		1055	while (oh--)
		1056	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1057
		1058	sv_setsv (data_, result_);
923	}	1059	}
924	#endif	1060
925	#endif	1061	sv_setiv (w_, nw);
926	rgba = SDL_SwapBE32 (rgba);	1062	sv_setiv (h_, nh);
927	*p++ = rgba;
928	}	1063	}
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	}	1064	}
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	}	1065	}
965		1066
966	MODULE = CFClient PACKAGE = CFClient::Texture
967
968	void	1067	void
969	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1068	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
970	PROTOTYPE: $$$;$$	1069	PROTOTYPE: $$$;$$
971	ALIAS:	1070	ALIAS:
972	draw_quad_alpha = 1	1071	draw_quad_alpha = 1
973	draw_quad_alpha_premultiplied = 2	1072	draw_quad_alpha_premultiplied = 2
974	CODE:	1073	CODE:
…		…
990		1089
991	if (ix == 2)	1090	if (ix == 2)
992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1091	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
993	else	1092	else
994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,	1093	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);	1094	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
996		1095
997	glEnable (GL_ALPHA_TEST);	1096	glEnable (GL_ALPHA_TEST);
998	glAlphaFunc (GL_GREATER, 0.01f);	1097	glAlphaFunc (GL_GREATER, 0.01f);
999	}	1098	}
1000		1099
…		…
1039	DESTROY (CFClient::Map self)	1138	DESTROY (CFClient::Map self)
1040	CODE:	1139	CODE:
1041	{	1140	{
1042	map_clear (self);	1141	map_clear (self);
1043	Safefree (self->face);	1142	Safefree (self->face);
		1143	Safefree (self->tex);
1044	Safefree (self);	1144	Safefree (self);
1045	}	1145	}
1046		1146
1047	void	1147	void
1048	clear (CFClient::Map self)	1148	clear (CFClient::Map self)
…		…
1154		1254
1155	while (data < data_end)	1255	while (data < data_end)
1156	{	1256	{
1157	flags = (data [0] << 8) + data [1]; data += 2;	1257	flags = (data [0] << 8) + data [1]; data += 2;
1158		1258
1159	x = ((flags >> 10) & 63) + self->x;	1259	x = self->x + ((flags >> 10) & 63);
1160	y = ((flags >> 4) & 63) + self->y;	1260	y = self->y + ((flags >> 4) & 63);
1161		1261
1162	cell = map_get_cell (self, x, y);	1262	cell = map_get_cell (self, x, y);
1163		1263
1164	if (flags & 15)	1264	if (flags & 15)
1165	{	1265	{
…		…
1255	OUTPUT:	1355	OUTPUT:
1256	RETVAL	1356	RETVAL
1257		1357
1258	void	1358	void
1259	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1359	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1260	PPCODE:	1360	CODE:
1261	{	1361	{
1262	int vx, vy;	1362	int vx, vy;
1263	int x, y, z;	1363	int x, y, z;
1264	int last_name;	1364	int last_name;
1265	mapface face;	1365	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		1366
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;	1367	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1275	vy = self->y + (self->h - sh) / 2 - shift_y;	1368	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1276		1369
1277	/*	1370	/*
1278	int vx = self->vx = self->w >= sw	1371	int vx = self->vx = self->w >= sw
1279	? self->x + (self->w - sw) / 2	1372	? self->x + (self->w - sw) / 2
1280	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1373	: 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));	1377	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1285	*/	1378	*/
1286		1379
1287	glColor4ub (255, 255, 255, 255);	1380	glColor4ub (255, 255, 255, 255);
1288		1381
		1382	glEnable (GL_BLEND);
1289	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1383	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1290	glEnable (GL_BLEND);
1291	glEnable (GL_TEXTURE_2D);	1384	glEnable (GL_TEXTURE_2D);
1292	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1385	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1293		1386
1294	glBegin (GL_QUADS);	1387	glBegin (GL_QUADS);
1295		1388
…		…
1303		1396
1304	for (x = 0; x < sw; x++)	1397	for (x = 0; x < sw; x++)
1305	if (row->c0 <= x + vx && x + vx < row->c1)	1398	if (row->c0 <= x + vx && x + vx < row->c1)
1306	{	1399	{
1307	mapcell *cell = row->col + (x + vx - row->c0);	1400	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		1401
1313	face = cell->face [z];	1402	face = cell->face [z];
1314		1403
1315	if (face)	1404	if (face)
1316	{	1405	{
…		…
1337		1426
1338	glEnd ();	1427	glEnd ();
1339		1428
1340	glDisable (GL_TEXTURE_2D);	1429	glDisable (GL_TEXTURE_2D);
1341	glDisable (GL_BLEND);	1430	glDisable (GL_BLEND);
		1431	}
		1432
		1433	void
		1434	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1435	CODE:
		1436	{
		1437	static float color[16][3] = {
		1438	{ 0.00F, 0.00F, 0.00F },
		1439	{ 1.00F, 1.00F, 1.00F },
		1440	{ 0.00F, 0.00F, 0.55F },
		1441	{ 1.00F, 0.00F, 0.00F },
		1442
		1443	{ 1.00F, 0.54F, 0.00F },
		1444	{ 0.11F, 0.56F, 1.00F },
		1445	{ 0.93F, 0.46F, 0.00F },
		1446	{ 0.18F, 0.54F, 0.34F },
		1447
		1448	{ 0.56F, 0.73F, 0.56F },
		1449	{ 0.80F, 0.80F, 0.80F },
		1450	{ 0.55F, 0.41F, 0.13F },
		1451	{ 0.99F, 0.77F, 0.26F },
		1452
		1453	{ 0.74F, 0.65F, 0.41F },
		1454
		1455	{ 0.00F, 1.00F, 1.00F },
		1456	{ 1.00F, 0.00F, 1.00F },
		1457	{ 1.00F, 1.00F, 0.00F },
		1458	};
		1459
		1460	int x, y;
		1461
		1462	glEnable (GL_TEXTURE_2D);
		1463	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1464	glEnable (GL_BLEND);
		1465	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1466	glBegin (GL_QUADS);
		1467
		1468	for (y = 0; y < h; y++)
		1469	for (x = 0; x < w; x++)
		1470	{
		1471	unsigned char m = data [x + y * w];
		1472
		1473	if (m)
		1474	{
		1475	float *c = color [m & 15];
		1476
		1477	float tx1 = m & 0x40 ? 0.5 : 0.;
		1478	float tx2 = tx1 + 0.5;
		1479
		1480	glColor4f (c[0], c[1], c[2], 0.75);
		1481	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1482	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1483	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1484	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1485	}
		1486	}
		1487
		1488	glEnd ();
		1489	glDisable (GL_BLEND);
		1490	glDisable (GL_TEXTURE_2D);
		1491	}
		1492
		1493	void
		1494	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1495	PPCODE:
		1496	{
		1497	int vx, vy;
		1498	int x, y;
		1499	int sw4 = (sw + 3) & ~3;
		1500	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1501	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1502
		1503	memset (darkness, 255, sw4 * sh);
		1504	SvPOK_only (darkness_sv);
		1505	SvCUR_set (darkness_sv, sw4 * sh);
		1506
		1507	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1508	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1509
		1510	for (y = 0; y < sh; y++)
		1511	if (0 <= y + vy && y + vy < self->rows)
		1512	{
		1513	maprow *row = self->row + (y + vy);
		1514
		1515	for (x = 0; x < sw; x++)
		1516	if (row->c0 <= x + vx && x + vx < row->c1)
		1517	{
		1518	mapcell *cell = row->col + (x + vx - row->c0);
		1519
		1520	darkness[y * sw4 + x] = cell->darkness < 0
		1521	? 255 - FOW_DARKNESS
		1522	: 255 - cell->darkness;
		1523	}
		1524	}
1342		1525
1343	EXTEND (SP, 3);	1526	EXTEND (SP, 3);
1344	PUSHs (sv_2mortal (newSViv (sw4)));	1527	PUSHs (sv_2mortal (newSViv (sw4)));
1345	PUSHs (sv_2mortal (newSViv (sh)));	1528	PUSHs (sv_2mortal (newSViv (sh)));
1346	PUSHs (darkness_sv);	1529	PUSHs (darkness_sv);
…		…
1553	const_iv (GL_SCISSOR_TEST),	1736	const_iv (GL_SCISSOR_TEST),
1554	const_iv (GL_DEPTH_TEST),	1737	const_iv (GL_DEPTH_TEST),
1555	const_iv (GL_ALPHA_TEST),	1738	const_iv (GL_ALPHA_TEST),
1556	const_iv (GL_NORMALIZE),	1739	const_iv (GL_NORMALIZE),
1557	const_iv (GL_RESCALE_NORMAL),	1740	const_iv (GL_RESCALE_NORMAL),
		1741	const_iv (GL_FRONT),
		1742	const_iv (GL_BACK),
1558	const_iv (GL_AND),	1743	const_iv (GL_AND),
1559	const_iv (GL_ONE),	1744	const_iv (GL_ONE),
1560	const_iv (GL_ZERO),	1745	const_iv (GL_ZERO),
1561	const_iv (GL_SRC_ALPHA),	1746	const_iv (GL_SRC_ALPHA),
1562	const_iv (GL_SRC_ALPHA_SATURATE),	1747	const_iv (GL_DST_ALPHA),
1563	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1748	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1564	const_iv (GL_ONE_MINUS_DST_ALPHA),	1749	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1750	const_iv (GL_SRC_ALPHA_SATURATE),
1565	const_iv (GL_RGB),	1751	const_iv (GL_RGB),
1566	const_iv (GL_RGBA),	1752	const_iv (GL_RGBA),
		1753	const_iv (GL_RGBA4),
		1754	const_iv (GL_RGBA8),
		1755	const_iv (GL_RGB5_A1),
1567	const_iv (GL_UNSIGNED_BYTE),	1756	const_iv (GL_UNSIGNED_BYTE),
1568	const_iv (GL_UNSIGNED_SHORT),	1757	const_iv (GL_UNSIGNED_SHORT),
1569	const_iv (GL_UNSIGNED_INT),	1758	const_iv (GL_UNSIGNED_INT),
1570	const_iv (GL_ALPHA),	1759	const_iv (GL_ALPHA),
1571	const_iv (GL_INTENSITY),	1760	const_iv (GL_INTENSITY),
…		…
1645	OUTPUT:	1834	OUTPUT:
1646	RETVAL	1835	RETVAL
1647		1836
1648	int glGetError ()	1837	int glGetError ()
1649		1838
		1839	void glFinish ()
		1840
1650	void glClear (int mask)	1841	void glClear (int mask)
1651		1842
1652	void glClearColor (float r, float g, float b, float a = 1.0)	1843	void glClearColor (float r, float g, float b, float a = 1.0)
1653	PROTOTYPE: @	1844	PROTOTYPE: @
1654		1845
…		…
1677	void glPushMatrix ()	1868	void glPushMatrix ()
1678		1869
1679	void glPopMatrix ()	1870	void glPopMatrix ()
1680		1871
1681	void glLoadIdentity ()	1872	void glLoadIdentity ()
		1873
		1874	void glDrawBuffer (int buffer)
		1875
		1876	void glReadBuffer (int buffer)
1682		1877
1683	# near_ and far_ are due to microsofts buggy "c" compiler	1878	# 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_)	1879	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1685		1880
1686	# near_ and far_ are due to microsofts buggy "c" compiler	1881	# 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.124 by root, Tue Jul 4 23:23:31 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.124 by root, Tue Jul 4 23:23:31 2006 UTC