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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.127 by root, Wed Jul 5 00:16:44 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 0
		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
…		…
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
…		…
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	682	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	683	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);	684	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	685	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);	686	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));	687	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	688	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	689	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
681		690
682	SDL_FreeSurface (surface);	691	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	692	SDL_FreeSurface (surface2);
…		…
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	tc_clear ();
		772
759	CFClient::Layout	773	CFClient::Layout
760	new (SV *class, int rgba = 0)	774	new (SV *class, int type = 0)
761	CODE:	775	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	776	New (0, RETVAL, 1, struct cf_layout);
763		777
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	778	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	779	RETVAL->r = 1.;
767	RETVAL->g = 1.;	780	RETVAL->g = 1.;
768	RETVAL->b = 1.;	781	RETVAL->b = 1.;
769	RETVAL->a = 1.;	782	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	783	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
779	DESTROY (CFClient::Layout self)	792	DESTROY (CFClient::Layout self)
780	CODE:	793	CODE:
781	g_object_unref (self->pl);	794	g_object_unref (self->pl);
782	Safefree (self);	795	Safefree (self);
783		796
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	797	void
792	set_text (CFClient::Layout self, SV *text_)	798	set_text (CFClient::Layout self, SV *text_)
793	CODE:	799	CODE:
794	{	800	{
795	STRLEN textlen;	801	STRLEN textlen;
…		…
805	STRLEN textlen;	811	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	812	char *text = SvPVutf8 (text_, textlen);
807		813
808	pango_layout_set_markup (self->pl, text, textlen);	814	pango_layout_set_markup (self->pl, text, textlen);
809	}	815	}
		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
810		900
811	SV *	901	SV *
812	get_text (CFClient::Layout self)	902	get_text (CFClient::Layout self)
813	CODE:	903	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	904	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	974	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	975	PUSHs (sv_2mortal (newSViv (h)));
886	}	976	}
887		977
888	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
889	xy_to_index (CFClient::Layout self, int x, int y)	991	xy_to_index (CFClient::Layout self, int x, int y)
890	CODE:	992	CODE:
891	{	993	{
892	int index, trailing;	994	int index, trailing;
893	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);
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1010	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1011	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1012	}
911		1013
912	void	1014	void
913	render (CFClient::Layout self)	1015	render (CFClient::Layout self, float x, float y)
914	PPCODE:	1016	PPCODE:
915	{	1017	pango_opengl_render_layout_subpixel (
916	SV *retval;	1018	self->pl,
917	int w, h;	1019	x * PANGO_SCALE, y * PANGO_SCALE,
918		1020	self->r, self->g, self->b, self->a
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1021	);
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_RGBA8)));
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		1022
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1023	MODULE = CFClient PACKAGE = CFClient::Texture
1004		1024
1005	void	1025	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1026	pad2pot (SV data_, SV w_, SV *h_)
…		…
1229		1249
1230	while (data < data_end)	1250	while (data < data_end)
1231	{	1251	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1252	flags = (data [0] << 8) + data [1]; data += 2;
1233		1253
1234	x = ((flags >> 10) & 63) + self->x;	1254	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1255	y = self->y + ((flags >> 4) & 63);
1236		1256
1237	cell = map_get_cell (self, x, y);	1257	cell = map_get_cell (self, x, y);
1238		1258
1239	if (flags & 15)	1259	if (flags & 15)
1240	{	1260	{
…		…
1330	OUTPUT:	1350	OUTPUT:
1331	RETVAL	1351	RETVAL
1332		1352
1333	void	1353	void
1334	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)
1335	PPCODE:	1355	CODE:
1336	{	1356	{
1337	int vx, vy;	1357	int vx, vy;
1338	int x, y, z;	1358	int x, y, z;
1339	int last_name;	1359	int last_name;
1340	mapface face;	1360	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		1361
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;	1362	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1363	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1364
1352	/*	1365	/*
1353	int vx = self->vx = self->w >= sw	1366	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1367	? self->x + (self->w - sw) / 2
1355	: 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));
…		…
1359	: 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));
1360	*/	1373	*/
1361		1374
1362	glColor4ub (255, 255, 255, 255);	1375	glColor4ub (255, 255, 255, 255);
1363		1376
		1377	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1378	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1379	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1380	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1381
1369	glBegin (GL_QUADS);	1382	glBegin (GL_QUADS);
1370		1383
…		…
1378		1391
1379	for (x = 0; x < sw; x++)	1392	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1393	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1394	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1395	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		1396
1388	face = cell->face [z];	1397	face = cell->face [z];
1389		1398
1390	if (face)	1399	if (face)
1391	{	1400	{
…		…
1412		1421
1413	glEnd ();	1422	glEnd ();
1414		1423
1415	glDisable (GL_TEXTURE_2D);	1424	glDisable (GL_TEXTURE_2D);
1416	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	}
1417		1520
1418	EXTEND (SP, 3);	1521	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1522	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1523	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1524	PUSHs (darkness_sv);
…		…
1628	const_iv (GL_SCISSOR_TEST),	1731	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1732	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1733	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1734	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1735	const_iv (GL_RESCALE_NORMAL),
		1736	const_iv (GL_FRONT),
		1737	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1738	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1739	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1740	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1741	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1742	const_iv (GL_DST_ALPHA),
…		…
1759		1864
1760	void glPopMatrix ()	1865	void glPopMatrix ()
1761		1866
1762	void glLoadIdentity ()	1867	void glLoadIdentity ()
1763		1868
		1869	void glDrawBuffer (int buffer)
		1870
		1871	void glReadBuffer (int buffer)
		1872
1764	# near_ and far_ are due to microsofts buggy "c" compiler	1873	# near_ and far_ are due to microsofts buggy "c" compiler
1765	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_)
1766		1875
1767	# near_ and far_ are due to microsofts buggy "c" compiler	1876	# near_ and far_ are due to microsofts buggy "c" compiler
1768	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1877	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC vs. Revision 1.127 by root, Wed Jul 5 00:16:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC vs.
Revision 1.127 by root, Wed Jul 5 00:16:44 2006 UTC