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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
41	typedef signed int int32_t;	42	typedef signed int int32_t;
42	#endif	43	#endif
43		44
44	#include "glext.h"	45	#include "glext.h"
45		46
		47	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		48
46	#define FOW_DARKNESS 32	49	#define FOW_DARKNESS 32
47		50
48	#define MAP_EXTEND_X 32	51	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	52	#define MAP_EXTEND_Y 512
50		53
51	#define MIN_FONT_HEIGHT 10	54	#define MIN_FONT_HEIGHT 10
52		55
53	#define GL_CALL(type,func,args) \	56	static struct
54	{ \	57	{
55	static int init_; \	58	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	59	#include "glfunc.h"
57	\	60	#undef GL_FUNC
58	if (!init_) \	61	} gl;
59	{ \	62
60	init_ = 1; \	63	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	64	{
62	} \	65	if (gl.BlendFuncSeparate)
63	\	66	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	67	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	68	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	69	else
		70	glBlendFunc (sa, da);
		71	}
67		72
68	typedef Mix_Chunk *CFClient__MixChunk;	73	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	74	typedef Mix_Music *CFClient__MixMusic;
70		75
71	typedef PangoFontDescription *CFClient__Font;	76	typedef PangoFontDescription *CFClient__Font;
		77
		78	static int
		79	shape_attr_p (PangoLayoutRun *run)
		80	{
		81	GSList *attrs = run->item->analysis.extra_attrs;
		82
		83	while (attrs)
		84	{
		85	PangoAttribute *attr = attrs->data;
		86
		87	if (attr->klass->type == PANGO_ATTR_SHAPE)
		88	return 1;
		89
		90	attrs = attrs->next;
		91	}
		92
		93	return 0;
		94	}
72		95
73	typedef struct cf_layout {	96	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	97	PangoLayout *pl; // either derived from a cairo or ft2 context
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)	98	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	99	float r, g, b, a; // default color for rgba mode
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	106	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		107
85	static void	108	static void
86	substitute_func (FcPattern *pattern, gpointer data)	109	substitute_func (FcPattern *pattern, gpointer data)
87	{	110	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	111	FcPatternAddBool (pattern, FC_HINTING, 1);
		112	#ifdef FC_HINT_STYLE
		113	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		114	#endif
89	#ifdef _WIN32	115	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	116	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	117	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	118	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	119	#endif
…		…
294	ev.code = 1;	320	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	321	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	322	ev.data2 = 0;
297		323
298	SDL_PushEvent ((SDL_Event *)&ev);	324	SDL_PushEvent ((SDL_Event *)&ev);
		325	}
		326
		327	static unsigned int
		328	minpot (unsigned int n)
		329	{
		330	if (!n)
		331	return 0;
		332
		333	--n;
		334
		335	n \|= n >> 1;
		336	n \|= n >> 2;
		337	n \|= n >> 4;
		338	n \|= n >> 8;
		339	n \|= n >> 16;
		340
		341	return n + 1;
299	}	342	}
300		343
301	MODULE = CFClient PACKAGE = CFClient	344	MODULE = CFClient PACKAGE = CFClient
302		345
303	PROTOTYPES: ENABLE	346	PROTOTYPES: ENABLE
…		…
413		456
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	457	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	458	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	459	}
417		460
		461	NV floor (NV x)
		462
		463	NV ceil (NV x)
		464
418	void	465	void
419	pango_init ()	466	pango_init ()
420	CODE:	467	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	468	// delayed, so it can pick up new fonts added by AddFontResourceEx
		469	{
		470	{
423	ft2_fontmap = pango_ft2_font_map_new ();	471	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	472	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	473	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		474	}
		475	{
		476	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	477	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	478	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		479	#ifdef _WIN32
		480	// cairo looks like shit eaten twice on windows
		481	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		482	#else
		483	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		484	#endif
		485	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		486	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		487	pango_cairo_context_set_font_options (cairo_context, fopt);
		488	cairo_font_options_destroy (fopt);
		489	}
429	}	490	}
430		491
431	int	492	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	493	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		494
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	505	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	506	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	507	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		508
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	509	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	510	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		511
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	512	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	513	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	514	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	515	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	540	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	541	CODE:
481	RETVAL = !!SDL_SetVideoMode (	542	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	543	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	544	);
		545	if (RETVAL)
		546	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	547	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		548	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		549	# include "glfunc.h"
		550	# undef GL_FUNC
		551	}
485	OUTPUT:	552	OUTPUT:
486	RETVAL	553	RETVAL
487		554
488	void	555	void
489	SDL_GL_SwapBuffers ()	556	SDL_GL_SwapBuffers ()
…		…
678	CODE:	745	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	746	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	747	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	749	#endif
683	exit (1);	750	_exit (1);
		751
		752	void
		753	_exit (int retval)
		754	CODE:
		755	_exit (retval);
684		756
685	MODULE = CFClient PACKAGE = CFClient::Font	757	MODULE = CFClient PACKAGE = CFClient::Font
686		758
687	CFClient::Font	759	CFClient::Font
688	new_from_file (SV class, char path, int id = 0)	760	new_from_file (SV class, char path, int id = 0)
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	781	MODULE = CFClient PACKAGE = CFClient::Layout
710		782
711	CFClient::Layout	783	CFClient::Layout
712	new (SV *class, int rgba = 0)	784	new (SV *class, int rgba = 0)
713	CODE:	785	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	786	New (0, RETVAL, 1, struct cf_layout);
718		787
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	789	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	790	RETVAL->r = 1.;
…		…
761	char *text = SvPVutf8 (text_, textlen);	830	char *text = SvPVutf8 (text_, textlen);
762		831
763	pango_layout_set_markup (self->pl, text, textlen);	832	pango_layout_set_markup (self->pl, text, textlen);
764	}	833	}
765		834
		835	void
		836	set_shapes (CFClient::Layout self, ...)
		837	CODE:
		838	{
		839	PangoAttrList *attrs = 0;
		840	const char *text = pango_layout_get_text (self->pl);
		841	const char *pos = text;
		842	int arg = 2;
		843
		844	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		845	{
		846	PangoRectangle rect;
		847	PangoAttribute *attr;
		848
		849	int w = SvIV (ST (arg - 1));
		850	int h = SvIV (ST (arg));
		851
		852	arg += 2;
		853
		854	rect.x = 0;
		855	rect.y = -h * PANGO_SCALE;
		856	rect.width = w * PANGO_SCALE;
		857	rect.height = h * PANGO_SCALE;
		858
		859	if (!attrs)
		860	attrs = pango_layout_get_attributes (self->pl);
		861
		862	attr = pango_attr_shape_new (&rect, &rect);
		863	attr->start_index = pos - text;
		864	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		865	pango_attr_list_insert (attrs, attr);
		866
		867	pos += sizeof (OBJ_STR) - 1;
		868	}
		869
		870	if (attrs)
		871	pango_layout_set_attributes (self->pl, attrs);
		872	}
		873
		874	void
		875	get_shapes (CFClient::Layout self)
		876	PPCODE:
		877	{
		878	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		879
		880	do
		881	{
		882	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		883
		884	if (run && shape_attr_p (run))
		885	{
		886	PangoRectangle extents;
		887	pango_layout_iter_get_run_extents (iter, 0, &extents);
		888
		889	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		890	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		891	}
		892	}
		893	while (pango_layout_iter_next_run (iter));
		894
		895	pango_layout_iter_free (iter);
		896	}
		897
		898	int
		899	has_wrapped (CFClient::Layout self)
		900	CODE:
		901	{
		902	int lines = 1;
		903	const char *text = pango_layout_get_text (self->pl);
		904
		905	while (*text)
		906	lines += *text++ == '\n';
		907
		908	RETVAL = lines < pango_layout_get_line_count (self->pl);
		909	}
		910	OUTPUT:
		911	RETVAL
		912
766	SV *	913	SV *
767	get_text (CFClient::Layout self)	914	get_text (CFClient::Layout self)
768	CODE:	915	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	916	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	917	sv_utf8_decode (RETVAL);
771	OUTPUT:	918	OUTPUT:
772	RETVAL	919	RETVAL
773		920
774	void	921	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	922	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
956	}	1103	}
957		1104
958	MODULE = CFClient PACKAGE = CFClient::Texture	1105	MODULE = CFClient PACKAGE = CFClient::Texture
959		1106
960	void	1107	void
		1108	pad2pot (SV data_, SV w_, SV *h_)
		1109	CODE:
		1110	{
		1111	int ow = SvIV (w_);
		1112	int oh = SvIV (h_);
		1113
		1114	if (ow && oh)
		1115	{
		1116	int nw = minpot (ow);
		1117	int nh = minpot (oh);
		1118
		1119	if (nw != ow \|\| nh != oh)
		1120	{
		1121	if (SvOK (data_))
		1122	{
		1123	STRLEN datalen;
		1124	char *data = SvPVbyte (data_, datalen);
		1125	int bpp = datalen / (ow * oh);
		1126	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1127
		1128	SvPOK_only (result_);
		1129	SvCUR_set (result_, nw * nh * bpp);
		1130
		1131	memset (SvPVX (result_), 0, nw * nh * bpp);
		1132	while (oh--)
		1133	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1134
		1135	sv_setsv (data_, result_);
		1136	}
		1137
		1138	sv_setiv (w_, nw);
		1139	sv_setiv (h_, nh);
		1140	}
		1141	}
		1142	}
		1143
		1144	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1145	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1146	PROTOTYPE: $$$;$$
963	ALIAS:	1147	ALIAS:
964	draw_quad_alpha = 1	1148	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1149	draw_quad_alpha_premultiplied = 2
966	CODE:	1150	CODE:
…		…
977	}	1161	}
978		1162
979	if (ix)	1163	if (ix)
980	{	1164	{
981	glEnable (GL_BLEND);	1165	glEnable (GL_BLEND);
		1166
		1167	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1168	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1169	else
		1170	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1171	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1172
983	glEnable (GL_ALPHA_TEST);	1173	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1174	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1175	}
986		1176
987	glBindTexture (GL_TEXTURE_2D, name);	1177	glBindTexture (GL_TEXTURE_2D, name);
…		…
1025	DESTROY (CFClient::Map self)	1215	DESTROY (CFClient::Map self)
1026	CODE:	1216	CODE:
1027	{	1217	{
1028	map_clear (self);	1218	map_clear (self);
1029	Safefree (self->face);	1219	Safefree (self->face);
		1220	Safefree (self->tex);
1030	Safefree (self);	1221	Safefree (self);
1031	}	1222	}
1032		1223
1033	void	1224	void
1034	clear (CFClient::Map self)	1225	clear (CFClient::Map self)
…		…
1073	}	1264	}
1074		1265
1075	// somewhat hackish, but for textures that require it, it really	1266	// somewhat hackish, but for textures that require it, it really
1076	// improves the look, and most others don't suffer.	1267	// improves the look, and most others don't suffer.
1077	glBindTexture (GL_TEXTURE_2D, name);	1268	glBindTexture (GL_TEXTURE_2D, name);
1078	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1269	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1270	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1271	// use uglier nearest interpolation because linear suffers
		1272	// from transparent color bleeding and ugly wrapping effects.
		1273	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080	}	1274	}
1081		1275
1082	int	1276	int
1083	ox (CFClient::Map self)	1277	ox (CFClient::Map self)
1084	ALIAS:	1278	ALIAS:
1085	oy = 1	1279	oy = 1
		1280	x = 2
		1281	y = 3
		1282	w = 4
		1283	h = 5
1086	CODE:	1284	CODE:
1087	switch (ix)	1285	switch (ix)
1088	{	1286	{
1089	case 0: RETVAL = self->ox; break;	1287	case 0: RETVAL = self->ox; break;
1090	case 1: RETVAL = self->oy; break;	1288	case 1: RETVAL = self->oy; break;
		1289	case 2: RETVAL = self->x; break;
		1290	case 3: RETVAL = self->y; break;
		1291	case 4: RETVAL = self->w; break;
		1292	case 5: RETVAL = self->h; break;
1091	}	1293	}
1092	OUTPUT:	1294	OUTPUT:
1093	RETVAL	1295	RETVAL
1094		1296
1095	void	1297	void
…		…
1129		1331
1130	while (data < data_end)	1332	while (data < data_end)
1131	{	1333	{
1132	flags = (data [0] << 8) + data [1]; data += 2;	1334	flags = (data [0] << 8) + data [1]; data += 2;
1133		1335
1134	x = ((flags >> 10) & 63) + self->x;	1336	x = self->x + ((flags >> 10) & 63);
1135	y = ((flags >> 4) & 63) + self->y;	1337	y = self->y + ((flags >> 4) & 63);
1136		1338
1137	cell = map_get_cell (self, x, y);	1339	cell = map_get_cell (self, x, y);
1138		1340
1139	if (flags & 15)	1341	if (flags & 15)
1140	{	1342	{
…		…
1230	OUTPUT:	1432	OUTPUT:
1231	RETVAL	1433	RETVAL
1232		1434
1233	void	1435	void
1234	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1436	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1235	PPCODE:	1437	CODE:
1236	{	1438	{
1237	int vx, vy;	1439	int vx, vy;
1238	int x, y, z;	1440	int x, y, z;
1239	int last_name;	1441	int last_name;
1240	mapface face;	1442	mapface face;
1241	int sw4 = (sw + 3) & ~3;
1242	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1243	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1244		1443
1245	memset (darkness, 255, sw4 * sh);
1246	SvPOK_only (darkness_sv);
1247	SvCUR_set (darkness_sv, sw4 * sh);
1248
1249	vx = self->x + (self->w - sw) / 2 - shift_x;	1444	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1250	vy = self->y + (self->h - sh) / 2 - shift_y;	1445	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1251		1446
1252	/*	1447	/*
1253	int vx = self->vx = self->w >= sw	1448	int vx = self->vx = self->w >= sw
1254	? self->x + (self->w - sw) / 2	1449	? self->x + (self->w - sw) / 2
1255	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1450	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1259	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1454	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1260	*/	1455	*/
1261		1456
1262	glColor4ub (255, 255, 255, 255);	1457	glColor4ub (255, 255, 255, 255);
1263		1458
		1459	glEnable (GL_BLEND);
1264	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1460	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1265	glEnable (GL_BLEND);
1266	glEnable (GL_TEXTURE_2D);	1461	glEnable (GL_TEXTURE_2D);
1267	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1462	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1268		1463
1269	glBegin (GL_QUADS);	1464	glBegin (GL_QUADS);
1270		1465
…		…
1278		1473
1279	for (x = 0; x < sw; x++)	1474	for (x = 0; x < sw; x++)
1280	if (row->c0 <= x + vx && x + vx < row->c1)	1475	if (row->c0 <= x + vx && x + vx < row->c1)
1281	{	1476	{
1282	mapcell *cell = row->col + (x + vx - row->c0);	1477	mapcell *cell = row->col + (x + vx - row->c0);
1283
1284	darkness[y * sw4 + x] = cell->darkness < 0
1285	? 255 - FOW_DARKNESS
1286	: 255 - cell->darkness;
1287		1478
1288	face = cell->face [z];	1479	face = cell->face [z];
1289		1480
1290	if (face)	1481	if (face)
1291	{	1482	{
…		…
1312		1503
1313	glEnd ();	1504	glEnd ();
1314		1505
1315	glDisable (GL_TEXTURE_2D);	1506	glDisable (GL_TEXTURE_2D);
1316	glDisable (GL_BLEND);	1507	glDisable (GL_BLEND);
		1508	}
		1509
		1510	void
		1511	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1512	CODE:
		1513	{
		1514	static float color[16][3] = {
		1515	{ 0.00, 0.00, 0.00 },
		1516	{ 1.00, 1.00, 1.00 },
		1517	{ 0.00, 0.00, 0.55 },
		1518	{ 1.00, 0.00, 0.00 },
		1519
		1520	{ 1.00, 0.54, 0.00 },
		1521	{ 0.11, 0.56, 1.00 },
		1522	{ 0.93, 0.46, 0.00 },
		1523	{ 0.18, 0.54, 0.34 },
		1524
		1525	{ 0.56, 0.73, 0.56 },
		1526	{ 0.80, 0.80, 0.80 },
		1527	{ 0.55, 0.41, 0.13 },
		1528	{ 0.99, 0.77, 0.26 },
		1529
		1530	{ 0.74, 0.65, 0.41 },
		1531
		1532	{ 0.00, 1.00, 1.00 },
		1533	{ 1.00, 0.00, 1.00 },
		1534	{ 1.00, 1.00, 0.00 },
		1535	};
		1536
		1537	int x, y;
		1538
		1539	glEnable (GL_TEXTURE_2D);
		1540	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1541	glEnable (GL_BLEND);
		1542	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1543	glBegin (GL_QUADS);
		1544
		1545	for (y = 0; y < h; y++)
		1546	for (x = 0; x < w; x++)
		1547	{
		1548	unsigned char m = data [x + y * w];
		1549
		1550	if (m)
		1551	{
		1552	float *c = color [m & 15];
		1553
		1554	float tx1 = m & 0x40 ? 0.5 : 0.;
		1555	float tx2 = tx1 + 0.5;
		1556
		1557	glColor4f (c[0], c[1], c[2], 0.75);
		1558	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1559	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1560	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1561	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1562	}
		1563	}
		1564
		1565	glEnd ();
		1566	glDisable (GL_BLEND);
		1567	glDisable (GL_TEXTURE_2D);
		1568	}
		1569
		1570	void
		1571	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1572	PPCODE:
		1573	{
		1574	int vx, vy;
		1575	int x, y;
		1576	int sw4 = (sw + 3) & ~3;
		1577	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1578	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1579
		1580	memset (darkness, 255, sw4 * sh);
		1581	SvPOK_only (darkness_sv);
		1582	SvCUR_set (darkness_sv, sw4 * sh);
		1583
		1584	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1585	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1586
		1587	for (y = 0; y < sh; y++)
		1588	if (0 <= y + vy && y + vy < self->rows)
		1589	{
		1590	maprow *row = self->row + (y + vy);
		1591
		1592	for (x = 0; x < sw; x++)
		1593	if (row->c0 <= x + vx && x + vx < row->c1)
		1594	{
		1595	mapcell *cell = row->col + (x + vx - row->c0);
		1596
		1597	darkness[y * sw4 + x] = cell->darkness < 0
		1598	? 255 - FOW_DARKNESS
		1599	: 255 - cell->darkness;
		1600	}
		1601	}
1317		1602
1318	EXTEND (SP, 3);	1603	EXTEND (SP, 3);
1319	PUSHs (sv_2mortal (newSViv (sw4)));	1604	PUSHs (sv_2mortal (newSViv (sw4)));
1320	PUSHs (sv_2mortal (newSViv (sh)));	1605	PUSHs (sv_2mortal (newSViv (sh)));
1321	PUSHs (darkness_sv);	1606	PUSHs (darkness_sv);
…		…
1528	const_iv (GL_SCISSOR_TEST),	1813	const_iv (GL_SCISSOR_TEST),
1529	const_iv (GL_DEPTH_TEST),	1814	const_iv (GL_DEPTH_TEST),
1530	const_iv (GL_ALPHA_TEST),	1815	const_iv (GL_ALPHA_TEST),
1531	const_iv (GL_NORMALIZE),	1816	const_iv (GL_NORMALIZE),
1532	const_iv (GL_RESCALE_NORMAL),	1817	const_iv (GL_RESCALE_NORMAL),
		1818	const_iv (GL_FRONT),
		1819	const_iv (GL_BACK),
1533	const_iv (GL_AND),	1820	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1821	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1822	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1823	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1824	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1825	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1826	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1827	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1828	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1829	const_iv (GL_RGBA),
		1830	const_iv (GL_RGBA4),
		1831	const_iv (GL_RGBA8),
		1832	const_iv (GL_RGB5_A1),
1542	const_iv (GL_UNSIGNED_BYTE),	1833	const_iv (GL_UNSIGNED_BYTE),
1543	const_iv (GL_UNSIGNED_SHORT),	1834	const_iv (GL_UNSIGNED_SHORT),
1544	const_iv (GL_UNSIGNED_INT),	1835	const_iv (GL_UNSIGNED_INT),
1545	const_iv (GL_ALPHA),	1836	const_iv (GL_ALPHA),
1546	const_iv (GL_INTENSITY),	1837	const_iv (GL_INTENSITY),
…		…
1620	OUTPUT:	1911	OUTPUT:
1621	RETVAL	1912	RETVAL
1622		1913
1623	int glGetError ()	1914	int glGetError ()
1624		1915
		1916	void glFinish ()
		1917
1625	void glClear (int mask)	1918	void glClear (int mask)
1626		1919
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1920	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1921	PROTOTYPE: @
1629		1922
…		…
1635		1928
1636	void glHint (int target, int mode)	1929	void glHint (int target, int mode)
1637		1930
1638	void glBlendFunc (int sfactor, int dfactor)	1931	void glBlendFunc (int sfactor, int dfactor)
1639		1932
		1933	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1934	CODE:
		1935	gl_BlendFuncSeparate (sa, da, saa, daa);
		1936
1640	void glDepthMask (int flag)	1937	void glDepthMask (int flag)
1641		1938
1642	void glLogicOp (int opcode)	1939	void glLogicOp (int opcode)
1643		1940
1644	void glColorMask (int red, int green, int blue, int alpha)	1941	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1945	void glPushMatrix ()
1649		1946
1650	void glPopMatrix ()	1947	void glPopMatrix ()
1651		1948
1652	void glLoadIdentity ()	1949	void glLoadIdentity ()
		1950
		1951	void glDrawBuffer (int buffer)
		1952
		1953	void glReadBuffer (int buffer)
1653		1954
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1955	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1956	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1957
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1958	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1978
1678	void glEnd ()	1979	void glEnd ()
1679		1980
1680	void glColor (float r, float g, float b, float a = 1.0)	1981	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1982	PROTOTYPE: @
		1983	ALIAS:
		1984	glColor_premultiply = 1
1682	CODE:	1985	CODE:
		1986	if (ix)
		1987	{
		1988	r *= a;
		1989	g *= a;
		1990	b *= a;
		1991	}
1683	// microsoft visual "c" rounds instead of truncating...	1992	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1993	glColor4ub (MIN ((int)(r * 256.f), 255),
1685	MIN ((int)(g * 255.f), 255),	1994	MIN ((int)(g * 256.f), 255),
1686	MIN ((int)(b * 255.f), 255),	1995	MIN ((int)(b * 256.f), 255),
1687	MIN ((int)(a * 255.f), 255));	1996	MIN ((int)(a * 256.f), 255));
1688		1997
1689	void glInterleavedArrays (int format, int stride, char *data)	1998	void glInterleavedArrays (int format, int stride, char *data)
1690		1999
1691	void glDrawElements (int mode, int count, int type, char *indices)	2000	void glDrawElements (int mode, int count, int type, char *indices)
1692		2001
…		…
1715		2024
1716	void glBindTexture (int target, int name)	2025	void glBindTexture (int target, int name)
1717		2026
1718	void glConvolutionParameter (int target, int pname, float params)	2027	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	2028	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2029	if (gl.ConvolutionParameterf)
		2030	gl.ConvolutionParameterf (target, pname, params);
1721		2031
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2032	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	2033	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2034	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	2035	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		2036
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2037	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	2038	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2039	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	2040	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		2041
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2042	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		2043
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2044	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		2045

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs. Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.98 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.121 by root, Fri Jun 23 20:28:19 2006 UTC