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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.113 by root, Wed Jun 14 16:20:21 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	{
…		…
436		463
437	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; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	465	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	466	}
440		467
		468	NV floor (NV x)
		469
		470	NV ceil (NV x)
		471
441	void	472	void
442	pango_init ()	473	pango_init ()
443	CODE:	474	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	475	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	476	opengl_fontmap = pango_opengl_font_map_new ();
448	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);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	478	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
450	}
451	{
452	cairo_font_options_t *fopt = cairo_font_options_create ();
453	cairo_fontmap = pango_cairo_font_map_get_default ();
454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
455	#ifdef _WIN32
456	// cairo looks like shit eaten twice on windows
457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
458	#else
459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
460	#endif
461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
463	pango_cairo_context_set_font_options (cairo_context, fopt);
464	cairo_font_options_destroy (fopt);
465	}
466	}	479	}
467		480
468	int	481	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	482	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		483
471	void	484	void
472	SDL_Quit ()	485	SDL_Quit ()
473		486
474	void	487	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	494	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	495	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	496	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		497
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	498	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	499	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		500
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	501	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	502	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	503	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	504	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
612		625
613	void	626	void
614	add_font (char *file)	627	add_font (char *file)
615	CODE:	628	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	629	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		630
622	void	631	void
623	load_image_inline (SV *image_)	632	load_image_inline (SV *image_)
624	ALIAS:	633	ALIAS:
625	load_image_file = 1	634	load_image_file = 1
…		…
754	CODE:	763	CODE:
755	default_font = self;	764	default_font = self;
756		765
757	MODULE = CFClient PACKAGE = CFClient::Layout	766	MODULE = CFClient PACKAGE = CFClient::Layout
758		767
		768	void
		769	clear_font_cache ()
		770	CODE:
		771	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		772	tc_clear ();
		773
759	CFClient::Layout	774	CFClient::Layout
760	new (SV *class, int rgba = 0)	775	new (SV *class, int type = 0)
761	CODE:	776	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	777	New (0, RETVAL, 1, struct cf_layout);
763		778
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	779	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	780	RETVAL->r = 1.;
767	RETVAL->g = 1.;	781	RETVAL->g = 1.;
768	RETVAL->b = 1.;	782	RETVAL->b = 1.;
769	RETVAL->a = 1.;	783	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	784	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
779	DESTROY (CFClient::Layout self)	793	DESTROY (CFClient::Layout self)
780	CODE:	794	CODE:
781	g_object_unref (self->pl);	795	g_object_unref (self->pl);
782	Safefree (self);	796	Safefree (self);
783		797
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	798	void
792	set_text (CFClient::Layout self, SV *text_)	799	set_text (CFClient::Layout self, SV *text_)
793	CODE:	800	CODE:
794	{	801	{
795	STRLEN textlen;	802	STRLEN textlen;
…		…
805	STRLEN textlen;	812	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	813	char *text = SvPVutf8 (text_, textlen);
807		814
808	pango_layout_set_markup (self->pl, text, textlen);	815	pango_layout_set_markup (self->pl, text, textlen);
809	}	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
810		901
811	SV *	902	SV *
812	get_text (CFClient::Layout self)	903	get_text (CFClient::Layout self)
813	CODE:	904	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	905	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	975	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	976	PUSHs (sv_2mortal (newSViv (h)));
886	}	977	}
887		978
888	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
889	xy_to_index (CFClient::Layout self, int x, int y)	992	xy_to_index (CFClient::Layout self, int x, int y)
890	CODE:	993	CODE:
891	{	994	{
892	int index, trailing;	995	int index, trailing;
893	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);
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1012	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1013	}
911		1014
912	void	1015	void
913	render (CFClient::Layout self)	1016	render (CFClient::Layout self, float x, float y)
914	PPCODE:	1017	PPCODE:
915	{	1018	pango_opengl_render_layout_subpixel (
916	SV *retval;	1019	self->pl,
917	int w, h;	1020	x * PANGO_SCALE, y * PANGO_SCALE,
918		1021	self->r, self->g, self->b, self->a
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1022	);
923	cairo_surface_t *surface;
924	cairo_t *cairo;
925
926	retval = newSV (w * h * 4);
927	SvPOK_only (retval);
928	SvCUR_set (retval, w * h * 4);
929
930	memset (SvPVX (retval), 0, w * h * 4);
931
932	surface = cairo_image_surface_create_for_data (
933	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
934	cairo = cairo_create (surface);
935	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
936
937	pango_cairo_show_layout (cairo, self->pl);
938
939	cairo_destroy (cairo);
940	cairo_surface_destroy (surface);
941
942	// what a mess, and its premultiplied, too :(
943	{
944	uint32_t p = (uint32_t )SvPVX (retval);
945	uint32_t e = p + w h;
946
947	while (p < e)
948	{
949	uint32_t rgba = *p;
950	rgba = (rgba >> 24) \| (rgba << 8);
951	#if 0
952	#ifdef _WIN32
953	{//D
954	uint8_t r = rgba >> 24;
955	uint8_t g = rgba >> 16;
956	uint8_t b = rgba >> 8;
957	uint8_t a = rgba >> 0;
958
959	rgba = (rgba & 0xffffff00) \| a;
960	}
961	#endif
962	#endif
963	rgba = SDL_SwapBE32 (rgba);
964	*p++ = rgba;
965	}
966	}
967
968	EXTEND (SP, 5);
969	PUSHs (sv_2mortal (newSViv (w)));
970	PUSHs (sv_2mortal (newSViv (h)));
971	PUSHs (sv_2mortal (retval));
972	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
974	}
975	else
976	{
977	FT_Bitmap bitmap;
978
979	retval = newSV (w * h);
980	SvPOK_only (retval);
981	SvCUR_set (retval, w * h);
982
983	bitmap.rows = h;
984	bitmap.width = w;
985	bitmap.pitch = w;
986	bitmap.buffer = (unsigned char*)SvPVX (retval);
987	bitmap.num_grays = 256;
988	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
989
990	memset (bitmap.buffer, 0, w * h);
991
992	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
993
994	EXTEND (SP, 5);
995	PUSHs (sv_2mortal (newSViv (w)));
996	PUSHs (sv_2mortal (newSViv (h)));
997	PUSHs (sv_2mortal (retval));
998	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
999	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
1000	}
1001	}
1002		1023
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1024	MODULE = CFClient PACKAGE = CFClient::Texture
1004		1025
1005	void	1026	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1027	pad2pot (SV data_, SV w_, SV *h_)
…		…
1038	}	1059	}
1039	}	1060	}
1040	}	1061	}
1041		1062
1042	void	1063	void
1043	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.)
1044	PROTOTYPE: $$$;$$	1065	PROTOTYPE: $$$;$$
1045	ALIAS:	1066	ALIAS:
1046	draw_quad_alpha = 1	1067	draw_quad_alpha = 1
1047	draw_quad_alpha_premultiplied = 2	1068	draw_quad_alpha_premultiplied = 2
1048	CODE:	1069	CODE:
…		…
1229		1250
1230	while (data < data_end)	1251	while (data < data_end)
1231	{	1252	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1253	flags = (data [0] << 8) + data [1]; data += 2;
1233		1254
1234	x = ((flags >> 10) & 63) + self->x;	1255	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1256	y = self->y + ((flags >> 4) & 63);
1236		1257
1237	cell = map_get_cell (self, x, y);	1258	cell = map_get_cell (self, x, y);
1238		1259
1239	if (flags & 15)	1260	if (flags & 15)
1240	{	1261	{
…		…
1330	OUTPUT:	1351	OUTPUT:
1331	RETVAL	1352	RETVAL
1332		1353
1333	void	1354	void
1334	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)
1335	PPCODE:	1356	CODE:
1336	{	1357	{
1337	int vx, vy;	1358	int vx, vy;
1338	int x, y, z;	1359	int x, y, z;
1339	int last_name;	1360	int last_name;
1340	mapface face;	1361	mapface face;
1341	int sw4 = (sw + 3) & ~3;
1342	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1343	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1344		1362
1345	memset (darkness, 255, sw4 * sh);
1346	SvPOK_only (darkness_sv);
1347	SvCUR_set (darkness_sv, sw4 * sh);
1348
1349	vx = self->x + (self->w - sw) / 2 - shift_x;	1363	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1364	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1365
1352	/*	1366	/*
1353	int vx = self->vx = self->w >= sw	1367	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1368	? self->x + (self->w - sw) / 2
1355	: 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));
…		…
1359	: 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));
1360	*/	1374	*/
1361		1375
1362	glColor4ub (255, 255, 255, 255);	1376	glColor4ub (255, 255, 255, 255);
1363		1377
		1378	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1379	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1380	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1381	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1382
1369	glBegin (GL_QUADS);	1383	glBegin (GL_QUADS);
1370		1384
…		…
1378		1392
1379	for (x = 0; x < sw; x++)	1393	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1394	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1395	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1396	mapcell *cell = row->col + (x + vx - row->c0);
1383
1384	darkness[y * sw4 + x] = cell->darkness < 0
1385	? 255 - FOW_DARKNESS
1386	: 255 - cell->darkness;
1387		1397
1388	face = cell->face [z];	1398	face = cell->face [z];
1389		1399
1390	if (face)	1400	if (face)
1391	{	1401	{
…		…
1412		1422
1413	glEnd ();	1423	glEnd ();
1414		1424
1415	glDisable (GL_TEXTURE_2D);	1425	glDisable (GL_TEXTURE_2D);
1416	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	}
1417		1521
1418	EXTEND (SP, 3);	1522	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1523	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1524	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1525	PUSHs (darkness_sv);
…		…
1628	const_iv (GL_SCISSOR_TEST),	1732	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1733	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1734	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1735	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1736	const_iv (GL_RESCALE_NORMAL),
		1737	const_iv (GL_FRONT),
		1738	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1739	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1740	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1741	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1742	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1743	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1744	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1745	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1746	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1747	const_iv (GL_RGB),
1642	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),
1643	const_iv (GL_UNSIGNED_BYTE),	1752	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1753	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1754	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1755	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1756	const_iv (GL_INTENSITY),
…		…
1721	OUTPUT:	1830	OUTPUT:
1722	RETVAL	1831	RETVAL
1723		1832
1724	int glGetError ()	1833	int glGetError ()
1725		1834
		1835	void glFinish ()
		1836
1726	void glClear (int mask)	1837	void glClear (int mask)
1727		1838
1728	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)
1729	PROTOTYPE: @	1840	PROTOTYPE: @
1730		1841
…		…
1753	void glPushMatrix ()	1864	void glPushMatrix ()
1754		1865
1755	void glPopMatrix ()	1866	void glPopMatrix ()
1756		1867
1757	void glLoadIdentity ()	1868	void glLoadIdentity ()
		1869
		1870	void glDrawBuffer (int buffer)
		1871
		1872	void glReadBuffer (int buffer)
1758		1873
1759	# near_ and far_ are due to microsofts buggy "c" compiler	1874	# near_ and far_ are due to microsofts buggy "c" compiler
1760	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_)
1761		1876
1762	# 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.113 by root, Wed Jun 14 16:20:21 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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.125 by root, Tue Jul 4 23:44:23 2006 UTC