[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.124 by root, Tue Jul 4 23:23:31 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);
…		…
436		467
437	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; )
438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	469	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
439	}	470	}
440		471
		472	NV floor (NV x)
		473
		474	NV ceil (NV x)
		475
441	void	476	void
442	pango_init ()	477	pango_init ()
443	CODE:	478	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	479	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	480	opengl_fontmap = pango_opengl_font_map_new ();
448	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);
449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	482	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	}	483	}
467		484
468	int	485	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	486	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		487
471	void	488	void
472	SDL_Quit ()	489	SDL_Quit ()
473		490
474	void	491	void
…		…
481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	498	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	499	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	500	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
484		501
485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	502	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	503	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
487		504
488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	505	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	506	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	507	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	508	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
612		629
613	void	630	void
614	add_font (char *file)	631	add_font (char *file)
615	CODE:	632	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	633	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		634
622	void	635	void
623	load_image_inline (SV *image_)	636	load_image_inline (SV *image_)
624	ALIAS:	637	ALIAS:
625	load_image_file = 1	638	load_image_file = 1
…		…
754	CODE:	767	CODE:
755	default_font = self;	768	default_font = self;
756		769
757	MODULE = CFClient PACKAGE = CFClient::Layout	770	MODULE = CFClient PACKAGE = CFClient::Layout
758		771
		772	void
		773	clear_font_cache ()
		774	CODE:
		775	pango_fc_font_map_cache_clear ((PangoFcFontMap *)opengl_fontmap);
		776	tc_clear ();
		777
759	CFClient::Layout	778	CFClient::Layout
760	new (SV *class, int rgba = 0)	779	new (SV *class, int type = 0)
761	CODE:	780	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	781	New (0, RETVAL, 1, struct cf_layout);
763		782
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	783	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	784	RETVAL->r = 1.;
767	RETVAL->g = 1.;	785	RETVAL->g = 1.;
768	RETVAL->b = 1.;	786	RETVAL->b = 1.;
769	RETVAL->a = 1.;	787	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	788	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
779	DESTROY (CFClient::Layout self)	797	DESTROY (CFClient::Layout self)
780	CODE:	798	CODE:
781	g_object_unref (self->pl);	799	g_object_unref (self->pl);
782	Safefree (self);	800	Safefree (self);
783		801
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	802	void
792	set_text (CFClient::Layout self, SV *text_)	803	set_text (CFClient::Layout self, SV *text_)
793	CODE:	804	CODE:
794	{	805	{
795	STRLEN textlen;	806	STRLEN textlen;
…		…
805	STRLEN textlen;	816	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	817	char *text = SvPVutf8 (text_, textlen);
807		818
808	pango_layout_set_markup (self->pl, text, textlen);	819	pango_layout_set_markup (self->pl, text, textlen);
809	}	820	}
		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
810		905
811	SV *	906	SV *
812	get_text (CFClient::Layout self)	907	get_text (CFClient::Layout self)
813	CODE:	908	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	909	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	979	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	980	PUSHs (sv_2mortal (newSViv (h)));
886	}	981	}
887		982
888	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
889	xy_to_index (CFClient::Layout self, int x, int y)	996	xy_to_index (CFClient::Layout self, int x, int y)
890	CODE:	997	CODE:
891	{	998	{
892	int index, trailing;	999	int index, trailing;
893	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);
…		…
908	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1015	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1016	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1017	}
911		1018
912	void	1019	void
913	render (CFClient::Layout self)	1020	render (CFClient::Layout self, float x, float y)
914	PPCODE:	1021	PPCODE:
915	{	1022	pango_opengl_render_layout_subpixel (
916	SV *retval;	1023	self->pl,
917	int w, h;	1024	x * PANGO_SCALE, y * PANGO_SCALE,
918		1025	self->r, self->g, self->b, self->a
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1026	);
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		1027
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1028	MODULE = CFClient PACKAGE = CFClient::Texture
1004		1029
1005	void	1030	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1031	pad2pot (SV data_, SV w_, SV *h_)
…		…
1038	}	1063	}
1039	}	1064	}
1040	}	1065	}
1041		1066
1042	void	1067	void
1043	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.)
1044	PROTOTYPE: $$$;$$	1069	PROTOTYPE: $$$;$$
1045	ALIAS:	1070	ALIAS:
1046	draw_quad_alpha = 1	1071	draw_quad_alpha = 1
1047	draw_quad_alpha_premultiplied = 2	1072	draw_quad_alpha_premultiplied = 2
1048	CODE:	1073	CODE:
…		…
1229		1254
1230	while (data < data_end)	1255	while (data < data_end)
1231	{	1256	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1257	flags = (data [0] << 8) + data [1]; data += 2;
1233		1258
1234	x = ((flags >> 10) & 63) + self->x;	1259	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1260	y = self->y + ((flags >> 4) & 63);
1236		1261
1237	cell = map_get_cell (self, x, y);	1262	cell = map_get_cell (self, x, y);
1238		1263
1239	if (flags & 15)	1264	if (flags & 15)
1240	{	1265	{
…		…
1330	OUTPUT:	1355	OUTPUT:
1331	RETVAL	1356	RETVAL
1332		1357
1333	void	1358	void
1334	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)
1335	PPCODE:	1360	CODE:
1336	{	1361	{
1337	int vx, vy;	1362	int vx, vy;
1338	int x, y, z;	1363	int x, y, z;
1339	int last_name;	1364	int last_name;
1340	mapface face;	1365	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		1366
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;	1367	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1368	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1369
1352	/*	1370	/*
1353	int vx = self->vx = self->w >= sw	1371	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1372	? self->x + (self->w - sw) / 2
1355	: 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));
…		…
1359	: 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));
1360	*/	1378	*/
1361		1379
1362	glColor4ub (255, 255, 255, 255);	1380	glColor4ub (255, 255, 255, 255);
1363		1381
		1382	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1383	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1384	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1385	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1386
1369	glBegin (GL_QUADS);	1387	glBegin (GL_QUADS);
1370		1388
…		…
1378		1396
1379	for (x = 0; x < sw; x++)	1397	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1398	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1399	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1400	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		1401
1388	face = cell->face [z];	1402	face = cell->face [z];
1389		1403
1390	if (face)	1404	if (face)
1391	{	1405	{
…		…
1412		1426
1413	glEnd ();	1427	glEnd ();
1414		1428
1415	glDisable (GL_TEXTURE_2D);	1429	glDisable (GL_TEXTURE_2D);
1416	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	}
1417		1525
1418	EXTEND (SP, 3);	1526	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1527	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1528	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1529	PUSHs (darkness_sv);
…		…
1628	const_iv (GL_SCISSOR_TEST),	1736	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1737	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1738	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1739	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1740	const_iv (GL_RESCALE_NORMAL),
		1741	const_iv (GL_FRONT),
		1742	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1743	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1744	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1745	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1746	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1747	const_iv (GL_DST_ALPHA),
1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1748	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1639	const_iv (GL_ONE_MINUS_DST_ALPHA),	1749	const_iv (GL_ONE_MINUS_DST_ALPHA),
1640	const_iv (GL_SRC_ALPHA_SATURATE),	1750	const_iv (GL_SRC_ALPHA_SATURATE),
1641	const_iv (GL_RGB),	1751	const_iv (GL_RGB),
1642	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),
1643	const_iv (GL_UNSIGNED_BYTE),	1756	const_iv (GL_UNSIGNED_BYTE),
1644	const_iv (GL_UNSIGNED_SHORT),	1757	const_iv (GL_UNSIGNED_SHORT),
1645	const_iv (GL_UNSIGNED_INT),	1758	const_iv (GL_UNSIGNED_INT),
1646	const_iv (GL_ALPHA),	1759	const_iv (GL_ALPHA),
1647	const_iv (GL_INTENSITY),	1760	const_iv (GL_INTENSITY),
…		…
1721	OUTPUT:	1834	OUTPUT:
1722	RETVAL	1835	RETVAL
1723		1836
1724	int glGetError ()	1837	int glGetError ()
1725		1838
		1839	void glFinish ()
		1840
1726	void glClear (int mask)	1841	void glClear (int mask)
1727		1842
1728	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)
1729	PROTOTYPE: @	1844	PROTOTYPE: @
1730		1845
…		…
1753	void glPushMatrix ()	1868	void glPushMatrix ()
1754		1869
1755	void glPopMatrix ()	1870	void glPopMatrix ()
1756		1871
1757	void glLoadIdentity ()	1872	void glLoadIdentity ()
		1873
		1874	void glDrawBuffer (int buffer)
		1875
		1876	void glReadBuffer (int buffer)
1758		1877
1759	# near_ and far_ are due to microsofts buggy "c" compiler	1878	# 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_)	1879	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1761		1880
1762	# 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.113 by root, Wed Jun 14 16:20:21 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.113 by root, Wed Jun 14 16:20:21 2006 UTC vs.
Revision 1.124 by root, Tue Jul 4 23:23:31 2006 UTC