[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.130 by root, Wed Jul 12 17:21:01 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	int
		469	in_destruct ()
		470	CODE:
		471	RETVAL = PL_main_cv == Nullcv;
		472	OUTPUT:
		473	RETVAL
		474
		475	NV floor (NV x)
		476
		477	NV ceil (NV x)
		478
441	void	479	void
442	pango_init ()	480	pango_init ()
443	CODE:	481	CODE:
444	// delayed, so it can pick up new fonts added by AddFontResourceEx
445	{	482	{
446	{
447	ft2_fontmap = pango_ft2_font_map_new ();	483	opengl_fontmap = pango_opengl_font_map_new ();
448	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	484	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);	485	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	}	486	}
467		487
468	int	488	int
469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	489	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
470		490
471	void	491	void
472	SDL_Quit ()	492	SDL_Quit ()
473		493
474	void	494	void
…		…
611	#endif	631	#endif
612		632
613	void	633	void
614	add_font (char *file)	634	add_font (char *file)
615	CODE:	635	CODE:
616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	636	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
617	#ifdef _WIN32
618	// cairo... sigh... requires win2000
619	AddFontResourceEx (file, FR_PRIVATE, 0);
620	#endif
621		637
622	void	638	void
623	load_image_inline (SV *image_)	639	load_image_inline (SV *image_)
624	ALIAS:	640	ALIAS:
625	load_image_file = 1	641	load_image_file = 1
…		…
667		683
668	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	684	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
669		685
670	assert (surface2->pitch == surface2->w * 4);	686	assert (surface2->pitch == surface2->w * 4);
671		687
		688	SDL_LockSurface (surface2);
672	EXTEND (SP, 5);	689	EXTEND (SP, 6);
673	PUSHs (sv_2mortal (newSViv (surface2->w)));	690	PUSHs (sv_2mortal (newSViv (surface2->w)));
674	PUSHs (sv_2mortal (newSViv (surface2->h)));	691	PUSHs (sv_2mortal (newSViv (surface2->h)));
675	SDL_LockSurface (surface2);
676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	692	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
677	SDL_UnlockSurface (surface2);
678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));	693	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	694	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	695	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		696	SDL_UnlockSurface (surface2);
681		697
682	SDL_FreeSurface (surface);	698	SDL_FreeSurface (surface);
683	SDL_FreeSurface (surface2);	699	SDL_FreeSurface (surface2);
684	}	700	}
685		701
…		…
754	CODE:	770	CODE:
755	default_font = self;	771	default_font = self;
756		772
757	MODULE = CFClient PACKAGE = CFClient::Layout	773	MODULE = CFClient PACKAGE = CFClient::Layout
758		774
		775	void
		776	reset_glyph_cache ()
		777	CODE:
		778	tc_clear ();
		779
759	CFClient::Layout	780	CFClient::Layout
760	new (SV *class, int rgba = 0)	781	new (SV *class)
761	CODE:	782	CODE:
762	New (0, RETVAL, 1, struct cf_layout);	783	New (0, RETVAL, 1, struct cf_layout);
763		784
764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	785	RETVAL->pl = pango_layout_new (opengl_context);
765	RETVAL->rgba = rgba;
766	RETVAL->r = 1.;	786	RETVAL->r = 1.;
767	RETVAL->g = 1.;	787	RETVAL->g = 1.;
768	RETVAL->b = 1.;	788	RETVAL->b = 1.;
769	RETVAL->a = 1.;	789	RETVAL->a = 1.;
770	RETVAL->base_height = MIN_FONT_HEIGHT;	790	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
779	DESTROY (CFClient::Layout self)	799	DESTROY (CFClient::Layout self)
780	CODE:	800	CODE:
781	g_object_unref (self->pl);	801	g_object_unref (self->pl);
782	Safefree (self);	802	Safefree (self);
783		803
784	int
785	is_rgba (CFClient::Layout self)
786	CODE:
787	RETVAL = self->rgba;
788	OUTPUT:
789	RETVAL
790
791	void	804	void
792	set_text (CFClient::Layout self, SV *text_)	805	set_text (CFClient::Layout self, SV *text_)
793	CODE:	806	CODE:
794	{	807	{
795	STRLEN textlen;	808	STRLEN textlen;
…		…
805	STRLEN textlen;	818	STRLEN textlen;
806	char *text = SvPVutf8 (text_, textlen);	819	char *text = SvPVutf8 (text_, textlen);
807		820
808	pango_layout_set_markup (self->pl, text, textlen);	821	pango_layout_set_markup (self->pl, text, textlen);
809	}	822	}
		823
		824	void
		825	set_shapes (CFClient::Layout self, ...)
		826	CODE:
		827	{
		828	PangoAttrList *attrs = 0;
		829	const char *text = pango_layout_get_text (self->pl);
		830	const char *pos = text;
		831	int arg = 4;
		832
		833	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		834	{
		835	PangoRectangle inkrect, rect;
		836	PangoAttribute *attr;
		837
		838	int x = SvIV (ST (arg - 3));
		839	int y = SvIV (ST (arg - 2));
		840	int w = SvIV (ST (arg - 1));
		841	int h = SvIV (ST (arg ));
		842
		843	inkrect.x = 0;
		844	inkrect.y = 0;
		845	inkrect.width = 0;
		846	inkrect.height = 0;
		847
		848	rect.x = x * PANGO_SCALE;
		849	rect.y = y * PANGO_SCALE;
		850	rect.width = w * PANGO_SCALE;
		851	rect.height = h * PANGO_SCALE;
		852
		853	if (!attrs)
		854	attrs = pango_layout_get_attributes (self->pl);
		855
		856	attr = pango_attr_shape_new (&inkrect, &rect);
		857	attr->start_index = pos - text;
		858	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		859	pango_attr_list_insert (attrs, attr);
		860
		861	arg += 4;
		862	pos += sizeof (OBJ_STR) - 1;
		863	}
		864
		865	if (attrs)
		866	pango_layout_set_attributes (self->pl, attrs);
		867	}
		868
		869	void
		870	get_shapes (CFClient::Layout self)
		871	PPCODE:
		872	{
		873	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		874
		875	do
		876	{
		877	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		878
		879	if (run && shape_attr_p (run))
		880	{
		881	PangoRectangle extents;
		882	pango_layout_iter_get_run_extents (iter, 0, &extents);
		883
		884	EXTEND (SP, 2);
		885	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		886	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		887	}
		888	}
		889	while (pango_layout_iter_next_run (iter));
		890
		891	pango_layout_iter_free (iter);
		892	}
		893
		894	int
		895	has_wrapped (CFClient::Layout self)
		896	CODE:
		897	{
		898	int lines = 1;
		899	const char *text = pango_layout_get_text (self->pl);
		900
		901	while (*text)
		902	lines += *text++ == '\n';
		903
		904	RETVAL = lines < pango_layout_get_line_count (self->pl);
		905	}
		906	OUTPUT:
		907	RETVAL
810		908
811	SV *	909	SV *
812	get_text (CFClient::Layout self)	910	get_text (CFClient::Layout self)
813	CODE:	911	CODE:
814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	912	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
…		…
884	PUSHs (sv_2mortal (newSViv (w)));	982	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));	983	PUSHs (sv_2mortal (newSViv (h)));
886	}	984	}
887		985
888	int	986	int
		987	descent (CFClient::Layout self)
		988	CODE:
		989	{
		990	PangoRectangle rect;
		991	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		992	pango_layout_line_get_pixel_extents (line, 0, &rect);
		993	RETVAL = PANGO_DESCENT (rect);
		994	}
		995	OUTPUT:
		996	RETVAL
		997
		998	int
889	xy_to_index (CFClient::Layout self, int x, int y)	999	xy_to_index (CFClient::Layout self, int x, int y)
890	CODE:	1000	CODE:
891	{	1001	{
892	int index, trailing;	1002	int index, trailing;
893	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1003	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)));	1018	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
909	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1019	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
910	}	1020	}
911		1021
912	void	1022	void
913	render (CFClient::Layout self)	1023	render (CFClient::Layout self, float x, float y)
914	PPCODE:	1024	PPCODE:
915	{	1025	pango_opengl_render_layout_subpixel (
916	SV *retval;	1026	self->pl,
917	int w, h;	1027	x * PANGO_SCALE, y * PANGO_SCALE,
918		1028	self->r, self->g, self->b, self->a
919	layout_get_pixel_size (self, &w, &h);
920
921	if (self->rgba)
922	{	1029	);
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		1030
1003	MODULE = CFClient PACKAGE = CFClient::Texture	1031	MODULE = CFClient PACKAGE = CFClient::Texture
1004		1032
1005	void	1033	void
1006	pad2pot (SV data_, SV w_, SV *h_)	1034	pad2pot (SV data_, SV w_, SV *h_)
…		…
1229		1257
1230	while (data < data_end)	1258	while (data < data_end)
1231	{	1259	{
1232	flags = (data [0] << 8) + data [1]; data += 2;	1260	flags = (data [0] << 8) + data [1]; data += 2;
1233		1261
1234	x = ((flags >> 10) & 63) + self->x;	1262	x = self->x + ((flags >> 10) & 63);
1235	y = ((flags >> 4) & 63) + self->y;	1263	y = self->y + ((flags >> 4) & 63);
1236		1264
1237	cell = map_get_cell (self, x, y);	1265	cell = map_get_cell (self, x, y);
1238		1266
1239	if (flags & 15)	1267	if (flags & 15)
1240	{	1268	{
…		…
1330	OUTPUT:	1358	OUTPUT:
1331	RETVAL	1359	RETVAL
1332		1360
1333	void	1361	void
1334	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1362	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1335	PPCODE:	1363	CODE:
1336	{	1364	{
1337	int vx, vy;	1365	int vx, vy;
1338	int x, y, z;	1366	int x, y, z;
1339	int last_name;	1367	int last_name;
1340	mapface face;	1368	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		1369
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;	1370	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1350	vy = self->y + (self->h - sh) / 2 - shift_y;	1371	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1351		1372
1352	/*	1373	/*
1353	int vx = self->vx = self->w >= sw	1374	int vx = self->vx = self->w >= sw
1354	? self->x + (self->w - sw) / 2	1375	? self->x + (self->w - sw) / 2
1355	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1376	: 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));	1380	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1360	*/	1381	*/
1361		1382
1362	glColor4ub (255, 255, 255, 255);	1383	glColor4ub (255, 255, 255, 255);
1363		1384
		1385	glEnable (GL_BLEND);
1364	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1386	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1365	glEnable (GL_BLEND);
1366	glEnable (GL_TEXTURE_2D);	1387	glEnable (GL_TEXTURE_2D);
1367	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1388	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1368		1389
1369	glBegin (GL_QUADS);	1390	glBegin (GL_QUADS);
1370		1391
…		…
1378		1399
1379	for (x = 0; x < sw; x++)	1400	for (x = 0; x < sw; x++)
1380	if (row->c0 <= x + vx && x + vx < row->c1)	1401	if (row->c0 <= x + vx && x + vx < row->c1)
1381	{	1402	{
1382	mapcell *cell = row->col + (x + vx - row->c0);	1403	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		1404
1388	face = cell->face [z];	1405	face = cell->face [z];
1389		1406
1390	if (face)	1407	if (face)
1391	{	1408	{
…		…
1412		1429
1413	glEnd ();	1430	glEnd ();
1414		1431
1415	glDisable (GL_TEXTURE_2D);	1432	glDisable (GL_TEXTURE_2D);
1416	glDisable (GL_BLEND);	1433	glDisable (GL_BLEND);
		1434	}
		1435
		1436	void
		1437	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1438	CODE:
		1439	{
		1440	static float color[16][3] = {
		1441	{ 0.00F, 0.00F, 0.00F },
		1442	{ 1.00F, 1.00F, 1.00F },
		1443	{ 0.00F, 0.00F, 0.55F },
		1444	{ 1.00F, 0.00F, 0.00F },
		1445
		1446	{ 1.00F, 0.54F, 0.00F },
		1447	{ 0.11F, 0.56F, 1.00F },
		1448	{ 0.93F, 0.46F, 0.00F },
		1449	{ 0.18F, 0.54F, 0.34F },
		1450
		1451	{ 0.56F, 0.73F, 0.56F },
		1452	{ 0.80F, 0.80F, 0.80F },
		1453	{ 0.55F, 0.41F, 0.13F },
		1454	{ 0.99F, 0.77F, 0.26F },
		1455
		1456	{ 0.74F, 0.65F, 0.41F },
		1457
		1458	{ 0.00F, 1.00F, 1.00F },
		1459	{ 1.00F, 0.00F, 1.00F },
		1460	{ 1.00F, 1.00F, 0.00F },
		1461	};
		1462
		1463	int x, y;
		1464
		1465	glEnable (GL_TEXTURE_2D);
		1466	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1467	glEnable (GL_BLEND);
		1468	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1469	glBegin (GL_QUADS);
		1470
		1471	for (y = 0; y < h; y++)
		1472	for (x = 0; x < w; x++)
		1473	{
		1474	unsigned char m = data [x + y * w];
		1475
		1476	if (m)
		1477	{
		1478	float *c = color [m & 15];
		1479
		1480	float tx1 = m & 0x40 ? 0.5 : 0.;
		1481	float tx2 = tx1 + 0.5;
		1482
		1483	glColor4f (c[0], c[1], c[2], 0.75);
		1484	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1485	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1486	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1487	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1488	}
		1489	}
		1490
		1491	glEnd ();
		1492	glDisable (GL_BLEND);
		1493	glDisable (GL_TEXTURE_2D);
		1494	}
		1495
		1496	void
		1497	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1498	PPCODE:
		1499	{
		1500	int vx, vy;
		1501	int x, y;
		1502	int sw4 = (sw + 3) & ~3;
		1503	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1504	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1505
		1506	memset (darkness, 255, sw4 * sh);
		1507	SvPOK_only (darkness_sv);
		1508	SvCUR_set (darkness_sv, sw4 * sh);
		1509
		1510	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1511	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1512
		1513	for (y = 0; y < sh; y++)
		1514	if (0 <= y + vy && y + vy < self->rows)
		1515	{
		1516	maprow *row = self->row + (y + vy);
		1517
		1518	for (x = 0; x < sw; x++)
		1519	if (row->c0 <= x + vx && x + vx < row->c1)
		1520	{
		1521	mapcell *cell = row->col + (x + vx - row->c0);
		1522
		1523	darkness[y * sw4 + x] = cell->darkness < 0
		1524	? 255 - FOW_DARKNESS
		1525	: 255 - cell->darkness;
		1526	}
		1527	}
1417		1528
1418	EXTEND (SP, 3);	1529	EXTEND (SP, 3);
1419	PUSHs (sv_2mortal (newSViv (sw4)));	1530	PUSHs (sv_2mortal (newSViv (sw4)));
1420	PUSHs (sv_2mortal (newSViv (sh)));	1531	PUSHs (sv_2mortal (newSViv (sh)));
1421	PUSHs (darkness_sv);	1532	PUSHs (darkness_sv);
…		…
1628	const_iv (GL_SCISSOR_TEST),	1739	const_iv (GL_SCISSOR_TEST),
1629	const_iv (GL_DEPTH_TEST),	1740	const_iv (GL_DEPTH_TEST),
1630	const_iv (GL_ALPHA_TEST),	1741	const_iv (GL_ALPHA_TEST),
1631	const_iv (GL_NORMALIZE),	1742	const_iv (GL_NORMALIZE),
1632	const_iv (GL_RESCALE_NORMAL),	1743	const_iv (GL_RESCALE_NORMAL),
		1744	const_iv (GL_FRONT),
		1745	const_iv (GL_BACK),
1633	const_iv (GL_AND),	1746	const_iv (GL_AND),
1634	const_iv (GL_ONE),	1747	const_iv (GL_ONE),
1635	const_iv (GL_ZERO),	1748	const_iv (GL_ZERO),
1636	const_iv (GL_SRC_ALPHA),	1749	const_iv (GL_SRC_ALPHA),
1637	const_iv (GL_DST_ALPHA),	1750	const_iv (GL_DST_ALPHA),
…		…
1759		1872
1760	void glPopMatrix ()	1873	void glPopMatrix ()
1761		1874
1762	void glLoadIdentity ()	1875	void glLoadIdentity ()
1763		1876
		1877	void glDrawBuffer (int buffer)
		1878
		1879	void glReadBuffer (int buffer)
		1880
1764	# near_ and far_ are due to microsofts buggy "c" compiler	1881	# 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_)	1882	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1766		1883
1767	# near_ and far_ are due to microsofts buggy "c" compiler	1884	# 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_)	1885	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
…		…
1797	r *= a;	1914	r *= a;
1798	g *= a;	1915	g *= a;
1799	b *= a;	1916	b *= a;
1800	}	1917	}
1801	// microsoft visual "c" rounds instead of truncating...	1918	// microsoft visual "c" rounds instead of truncating...
1802	glColor4ub (MIN ((int)(r * 256.f), 255),	1919	glColor4f (r, g, b, a);
1803	MIN ((int)(g * 256.f), 255),
1804	MIN ((int)(b * 256.f), 255),
1805	MIN ((int)(a * 256.f), 255));
1806		1920
1807	void glInterleavedArrays (int format, int stride, char *data)	1921	void glInterleavedArrays (int format, int stride, char *data)
1808		1922
1809	void glDrawElements (int mode, int count, int type, char *indices)	1923	void glDrawElements (int mode, int count, int type, char *indices)
1810		1924

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.130 by root, Wed Jul 12 17:21:01 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.130 by root, Wed Jul 12 17:21:01 2006 UTC