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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 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 ()
…		…
564	lowdelay (int fd, int val = 1)	631	lowdelay (int fd, int val = 1)
565	CODE:	632	CODE:
566	#ifndef _WIN32	633	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	634	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	635	#endif
569
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590		636
591	void	637	void
592	add_font (char *file)	638	add_font (char *file)
593	CODE:	639	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	640	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
699	CODE:	745	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	746	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	747	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	748	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	749	#endif
704	exit (1);	750	_exit (1);
		751
		752	void
		753	_exit (int retval)
		754	CODE:
		755	_exit (retval);
705		756
706	MODULE = CFClient PACKAGE = CFClient::Font	757	MODULE = CFClient PACKAGE = CFClient::Font
707		758
708	CFClient::Font	759	CFClient::Font
709	new_from_file (SV class, char path, int id = 0)	760	new_from_file (SV class, char path, int id = 0)
…		…
730	MODULE = CFClient PACKAGE = CFClient::Layout	781	MODULE = CFClient PACKAGE = CFClient::Layout
731		782
732	CFClient::Layout	783	CFClient::Layout
733	new (SV *class, int rgba = 0)	784	new (SV *class, int rgba = 0)
734	CODE:	785	CODE:
735	#if _WIN32
736	rgba = 0;//D
737	#endif
738	New (0, RETVAL, 1, struct cf_layout);	786	New (0, RETVAL, 1, struct cf_layout);
739		787
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	788	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
741	RETVAL->rgba = rgba;	789	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	790	RETVAL->r = 1.;
…		…
782	char *text = SvPVutf8 (text_, textlen);	830	char *text = SvPVutf8 (text_, textlen);
783		831
784	pango_layout_set_markup (self->pl, text, textlen);	832	pango_layout_set_markup (self->pl, text, textlen);
785	}	833	}
786		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 = 4;
		843
		844	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		845	{
		846	PangoRectangle inkrect, rect;
		847	PangoAttribute *attr;
		848
		849	int x = SvIV (ST (arg - 3));
		850	int y = SvIV (ST (arg - 2));
		851	int w = SvIV (ST (arg - 1));
		852	int h = SvIV (ST (arg ));
		853
		854	inkrect.x = 0;
		855	inkrect.y = 0;
		856	inkrect.width = 0;
		857	inkrect.height = 0;
		858
		859	rect.x = x * PANGO_SCALE;
		860	rect.y = y * PANGO_SCALE;
		861	rect.width = w * PANGO_SCALE;
		862	rect.height = h * PANGO_SCALE;
		863
		864	if (!attrs)
		865	attrs = pango_layout_get_attributes (self->pl);
		866
		867	attr = pango_attr_shape_new (&inkrect, &rect);
		868	attr->start_index = pos - text;
		869	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		870	pango_attr_list_insert (attrs, attr);
		871
		872	arg += 4;
		873	pos += sizeof (OBJ_STR) - 1;
		874	}
		875
		876	if (attrs)
		877	pango_layout_set_attributes (self->pl, attrs);
		878	}
		879
		880	void
		881	get_shapes (CFClient::Layout self)
		882	PPCODE:
		883	{
		884	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		885
		886	do
		887	{
		888	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		889
		890	if (run && shape_attr_p (run))
		891	{
		892	PangoRectangle extents;
		893	pango_layout_iter_get_run_extents (iter, 0, &extents);
		894
		895	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		896	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		897	}
		898	}
		899	while (pango_layout_iter_next_run (iter));
		900
		901	pango_layout_iter_free (iter);
		902	}
		903
		904	int
		905	has_wrapped (CFClient::Layout self)
		906	CODE:
		907	{
		908	int lines = 1;
		909	const char *text = pango_layout_get_text (self->pl);
		910
		911	while (*text)
		912	lines += *text++ == '\n';
		913
		914	RETVAL = lines < pango_layout_get_line_count (self->pl);
		915	}
		916	OUTPUT:
		917	RETVAL
		918
787	SV *	919	SV *
788	get_text (CFClient::Layout self)	920	get_text (CFClient::Layout self)
789	CODE:	921	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	922	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	923	sv_utf8_decode (RETVAL);
792	OUTPUT:	924	OUTPUT:
793	RETVAL	925	RETVAL
794		926
795	void	927	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	928	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
858		990
859	EXTEND (SP, 2);	991	EXTEND (SP, 2);
860	PUSHs (sv_2mortal (newSViv (w)));	992	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	993	PUSHs (sv_2mortal (newSViv (h)));
862	}	994	}
		995
		996	int
		997	descent (CFClient::Layout self)
		998	CODE:
		999	{
		1000	PangoRectangle rect;
		1001	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1002	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1003	RETVAL = PANGO_DESCENT (rect);
		1004	}
		1005	OUTPUT:
		1006	RETVAL
863		1007
864	int	1008	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1009	xy_to_index (CFClient::Layout self, int x, int y)
866	CODE:	1010	CODE:
867	{	1011	{
…		…
977	}	1121	}
978		1122
979	MODULE = CFClient PACKAGE = CFClient::Texture	1123	MODULE = CFClient PACKAGE = CFClient::Texture
980		1124
981	void	1125	void
		1126	pad2pot (SV data_, SV w_, SV *h_)
		1127	CODE:
		1128	{
		1129	int ow = SvIV (w_);
		1130	int oh = SvIV (h_);
		1131
		1132	if (ow && oh)
		1133	{
		1134	int nw = minpot (ow);
		1135	int nh = minpot (oh);
		1136
		1137	if (nw != ow \|\| nh != oh)
		1138	{
		1139	if (SvOK (data_))
		1140	{
		1141	STRLEN datalen;
		1142	char *data = SvPVbyte (data_, datalen);
		1143	int bpp = datalen / (ow * oh);
		1144	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1145
		1146	SvPOK_only (result_);
		1147	SvCUR_set (result_, nw * nh * bpp);
		1148
		1149	memset (SvPVX (result_), 0, nw * nh * bpp);
		1150	while (oh--)
		1151	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1152
		1153	sv_setsv (data_, result_);
		1154	}
		1155
		1156	sv_setiv (w_, nw);
		1157	sv_setiv (h_, nh);
		1158	}
		1159	}
		1160	}
		1161
		1162	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1163	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1164	PROTOTYPE: $$$;$$
984	ALIAS:	1165	ALIAS:
985	draw_quad_alpha = 1	1166	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1167	draw_quad_alpha_premultiplied = 2
987	CODE:	1168	CODE:
988	{	1169	{
989	HV hv = (HV )SvRV (self);	1170	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1171	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1172	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1173	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1174
995	if (items < 5)	1175	if (items < 5)
996	{	1176	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1177	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1178	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1179	}
1000		1180
1001	if (ix)	1181	if (ix)
1002	{	1182	{
1003	glEnable (GL_BLEND);	1183	glEnable (GL_BLEND);
		1184
		1185	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1186	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1187	else
		1188	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1189	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1190
1005	glEnable (GL_ALPHA_TEST);	1191	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1192	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1193	}
1008		1194
1009	glBindTexture (GL_TEXTURE_2D, name);	1195	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1196
1017	glBegin (GL_QUADS);	1197	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1198	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1199	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1200	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1053	DESTROY (CFClient::Map self)	1233	DESTROY (CFClient::Map self)
1054	CODE:	1234	CODE:
1055	{	1235	{
1056	map_clear (self);	1236	map_clear (self);
1057	Safefree (self->face);	1237	Safefree (self->face);
		1238	Safefree (self->tex);
1058	Safefree (self);	1239	Safefree (self);
1059	}	1240	}
1060		1241
1061	void	1242	void
1062	clear (CFClient::Map self)	1243	clear (CFClient::Map self)
…		…
1097	tex->r = r;	1278	tex->r = r;
1098	tex->g = g;	1279	tex->g = g;
1099	tex->b = b;	1280	tex->b = b;
1100	tex->a = a;	1281	tex->a = a;
1101	}	1282	}
		1283
		1284	// somewhat hackish, but for textures that require it, it really
		1285	// improves the look, and most others don't suffer.
		1286	glBindTexture (GL_TEXTURE_2D, name);
		1287	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1288	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1289	// use uglier nearest interpolation because linear suffers
		1290	// from transparent color bleeding and ugly wrapping effects.
		1291	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102	}	1292	}
1103		1293
1104	int	1294	int
1105	ox (CFClient::Map self)	1295	ox (CFClient::Map self)
1106	ALIAS:	1296	ALIAS:
1107	oy = 1	1297	oy = 1
		1298	x = 2
		1299	y = 3
		1300	w = 4
		1301	h = 5
1108	CODE:	1302	CODE:
1109	switch (ix)	1303	switch (ix)
1110	{	1304	{
1111	case 0: RETVAL = self->ox; break;	1305	case 0: RETVAL = self->ox; break;
1112	case 1: RETVAL = self->oy; break;	1306	case 1: RETVAL = self->oy; break;
		1307	case 2: RETVAL = self->x; break;
		1308	case 3: RETVAL = self->y; break;
		1309	case 4: RETVAL = self->w; break;
		1310	case 5: RETVAL = self->h; break;
1113	}	1311	}
1114	OUTPUT:	1312	OUTPUT:
1115	RETVAL	1313	RETVAL
1116		1314
1117	void	1315	void
…		…
1151		1349
1152	while (data < data_end)	1350	while (data < data_end)
1153	{	1351	{
1154	flags = (data [0] << 8) + data [1]; data += 2;	1352	flags = (data [0] << 8) + data [1]; data += 2;
1155		1353
1156	x = ((flags >> 10) & 63) + self->x;	1354	x = self->x + ((flags >> 10) & 63);
1157	y = ((flags >> 4) & 63) + self->y;	1355	y = self->y + ((flags >> 4) & 63);
1158		1356
1159	cell = map_get_cell (self, x, y);	1357	cell = map_get_cell (self, x, y);
1160		1358
1161	if (flags & 15)	1359	if (flags & 15)
1162	{	1360	{
…		…
1252	OUTPUT:	1450	OUTPUT:
1253	RETVAL	1451	RETVAL
1254		1452
1255	void	1453	void
1256	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1454	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257	PPCODE:	1455	CODE:
1258	{	1456	{
1259	int vx, vy;	1457	int vx, vy;
1260	int x, y, z;	1458	int x, y, z;
1261	int last_name;	1459	int last_name;
1262	mapface face;	1460	mapface face;
1263	int sw4 = (sw + 3) & ~3;
1264	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1265	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1266		1461
1267	memset (darkness, 255, sw4 * sh);
1268	SvPOK_only (darkness_sv);
1269	SvCUR_set (darkness_sv, sw4 * sh);
1270
1271	vx = self->x + (self->w - sw) / 2 - shift_x;	1462	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272	vy = self->y + (self->h - sh) / 2 - shift_y;	1463	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273		1464
1274	/*	1465	/*
1275	int vx = self->vx = self->w >= sw	1466	int vx = self->vx = self->w >= sw
1276	? self->x + (self->w - sw) / 2	1467	? self->x + (self->w - sw) / 2
1277	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1468	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1281	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1472	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282	*/	1473	*/
1283		1474
1284	glColor4ub (255, 255, 255, 255);	1475	glColor4ub (255, 255, 255, 255);
1285		1476
		1477	glEnable (GL_BLEND);
1286	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1478	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287	glEnable (GL_BLEND);
1288	glEnable (GL_TEXTURE_2D);	1479	glEnable (GL_TEXTURE_2D);
1289	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1480	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290		1481
1291	glBegin (GL_QUADS);	1482	glBegin (GL_QUADS);
1292		1483
…		…
1300		1491
1301	for (x = 0; x < sw; x++)	1492	for (x = 0; x < sw; x++)
1302	if (row->c0 <= x + vx && x + vx < row->c1)	1493	if (row->c0 <= x + vx && x + vx < row->c1)
1303	{	1494	{
1304	mapcell *cell = row->col + (x + vx - row->c0);	1495	mapcell *cell = row->col + (x + vx - row->c0);
1305
1306	darkness[y * sw4 + x] = cell->darkness < 0
1307	? 255 - FOW_DARKNESS
1308	: 255 - cell->darkness;
1309		1496
1310	face = cell->face [z];	1497	face = cell->face [z];
1311		1498
1312	if (face)	1499	if (face)
1313	{	1500	{
…		…
1334		1521
1335	glEnd ();	1522	glEnd ();
1336		1523
1337	glDisable (GL_TEXTURE_2D);	1524	glDisable (GL_TEXTURE_2D);
1338	glDisable (GL_BLEND);	1525	glDisable (GL_BLEND);
		1526	}
		1527
		1528	void
		1529	draw_magicmap (CFClient::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1530	CODE:
		1531	{
		1532	static float color[16][3] = {
		1533	{ 0.00F, 0.00F, 0.00F },
		1534	{ 1.00F, 1.00F, 1.00F },
		1535	{ 0.00F, 0.00F, 0.55F },
		1536	{ 1.00F, 0.00F, 0.00F },
		1537
		1538	{ 1.00F, 0.54F, 0.00F },
		1539	{ 0.11F, 0.56F, 1.00F },
		1540	{ 0.93F, 0.46F, 0.00F },
		1541	{ 0.18F, 0.54F, 0.34F },
		1542
		1543	{ 0.56F, 0.73F, 0.56F },
		1544	{ 0.80F, 0.80F, 0.80F },
		1545	{ 0.55F, 0.41F, 0.13F },
		1546	{ 0.99F, 0.77F, 0.26F },
		1547
		1548	{ 0.74F, 0.65F, 0.41F },
		1549
		1550	{ 0.00F, 1.00F, 1.00F },
		1551	{ 1.00F, 0.00F, 1.00F },
		1552	{ 1.00F, 1.00F, 0.00F },
		1553	};
		1554
		1555	int x, y;
		1556
		1557	glEnable (GL_TEXTURE_2D);
		1558	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1559	glEnable (GL_BLEND);
		1560	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1561	glBegin (GL_QUADS);
		1562
		1563	for (y = 0; y < h; y++)
		1564	for (x = 0; x < w; x++)
		1565	{
		1566	unsigned char m = data [x + y * w];
		1567
		1568	if (m)
		1569	{
		1570	float *c = color [m & 15];
		1571
		1572	float tx1 = m & 0x40 ? 0.5 : 0.;
		1573	float tx2 = tx1 + 0.5;
		1574
		1575	glColor4f (c[0], c[1], c[2], 0.75);
		1576	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1577	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1578	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1579	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1580	}
		1581	}
		1582
		1583	glEnd ();
		1584	glDisable (GL_BLEND);
		1585	glDisable (GL_TEXTURE_2D);
		1586	}
		1587
		1588	void
		1589	fow_texture (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1590	PPCODE:
		1591	{
		1592	int vx, vy;
		1593	int x, y;
		1594	int sw4 = (sw + 3) & ~3;
		1595	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1596	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1597
		1598	memset (darkness, 255, sw4 * sh);
		1599	SvPOK_only (darkness_sv);
		1600	SvCUR_set (darkness_sv, sw4 * sh);
		1601
		1602	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1603	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1604
		1605	for (y = 0; y < sh; y++)
		1606	if (0 <= y + vy && y + vy < self->rows)
		1607	{
		1608	maprow *row = self->row + (y + vy);
		1609
		1610	for (x = 0; x < sw; x++)
		1611	if (row->c0 <= x + vx && x + vx < row->c1)
		1612	{
		1613	mapcell *cell = row->col + (x + vx - row->c0);
		1614
		1615	darkness[y * sw4 + x] = cell->darkness < 0
		1616	? 255 - FOW_DARKNESS
		1617	: 255 - cell->darkness;
		1618	}
		1619	}
1339		1620
1340	EXTEND (SP, 3);	1621	EXTEND (SP, 3);
1341	PUSHs (sv_2mortal (newSViv (sw4)));	1622	PUSHs (sv_2mortal (newSViv (sw4)));
1342	PUSHs (sv_2mortal (newSViv (sh)));	1623	PUSHs (sv_2mortal (newSViv (sh)));
1343	PUSHs (darkness_sv);	1624	PUSHs (darkness_sv);
…		…
1550	const_iv (GL_SCISSOR_TEST),	1831	const_iv (GL_SCISSOR_TEST),
1551	const_iv (GL_DEPTH_TEST),	1832	const_iv (GL_DEPTH_TEST),
1552	const_iv (GL_ALPHA_TEST),	1833	const_iv (GL_ALPHA_TEST),
1553	const_iv (GL_NORMALIZE),	1834	const_iv (GL_NORMALIZE),
1554	const_iv (GL_RESCALE_NORMAL),	1835	const_iv (GL_RESCALE_NORMAL),
		1836	const_iv (GL_FRONT),
		1837	const_iv (GL_BACK),
1555	const_iv (GL_AND),	1838	const_iv (GL_AND),
1556	const_iv (GL_ONE),	1839	const_iv (GL_ONE),
1557	const_iv (GL_ZERO),	1840	const_iv (GL_ZERO),
1558	const_iv (GL_SRC_ALPHA),	1841	const_iv (GL_SRC_ALPHA),
1559	const_iv (GL_SRC_ALPHA_SATURATE),	1842	const_iv (GL_DST_ALPHA),
1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1843	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561	const_iv (GL_ONE_MINUS_DST_ALPHA),	1844	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1845	const_iv (GL_SRC_ALPHA_SATURATE),
1562	const_iv (GL_RGB),	1846	const_iv (GL_RGB),
1563	const_iv (GL_RGBA),	1847	const_iv (GL_RGBA),
		1848	const_iv (GL_RGBA4),
		1849	const_iv (GL_RGBA8),
		1850	const_iv (GL_RGB5_A1),
1564	const_iv (GL_UNSIGNED_BYTE),	1851	const_iv (GL_UNSIGNED_BYTE),
1565	const_iv (GL_UNSIGNED_SHORT),	1852	const_iv (GL_UNSIGNED_SHORT),
1566	const_iv (GL_UNSIGNED_INT),	1853	const_iv (GL_UNSIGNED_INT),
1567	const_iv (GL_ALPHA),	1854	const_iv (GL_ALPHA),
1568	const_iv (GL_INTENSITY),	1855	const_iv (GL_INTENSITY),
…		…
1577	const_iv (GL_TEXTURE_MAG_FILTER),	1864	const_iv (GL_TEXTURE_MAG_FILTER),
1578	const_iv (GL_TEXTURE_MIN_FILTER),	1865	const_iv (GL_TEXTURE_MIN_FILTER),
1579	const_iv (GL_TEXTURE_ENV_MODE),	1866	const_iv (GL_TEXTURE_ENV_MODE),
1580	const_iv (GL_TEXTURE_WRAP_S),	1867	const_iv (GL_TEXTURE_WRAP_S),
1581	const_iv (GL_TEXTURE_WRAP_T),	1868	const_iv (GL_TEXTURE_WRAP_T),
		1869	const_iv (GL_REPEAT),
1582	const_iv (GL_CLAMP),	1870	const_iv (GL_CLAMP),
1583	const_iv (GL_REPEAT),	1871	const_iv (GL_CLAMP_TO_EDGE),
1584	const_iv (GL_NEAREST),	1872	const_iv (GL_NEAREST),
1585	const_iv (GL_LINEAR),	1873	const_iv (GL_LINEAR),
1586	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1874	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1875	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1876	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1618		1906
1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1907	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1908	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621	}	1909	}
1622		1910
		1911	char *
		1912	gl_vendor ()
		1913	CODE:
		1914	RETVAL = (char *)glGetString (GL_VENDOR);
		1915	OUTPUT:
		1916	RETVAL
		1917
		1918	char *
		1919	gl_version ()
		1920	CODE:
		1921	RETVAL = (char *)glGetString (GL_VERSION);
		1922	OUTPUT:
		1923	RETVAL
		1924
		1925	char *
		1926	gl_extensions ()
		1927	CODE:
		1928	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1929	OUTPUT:
		1930	RETVAL
		1931
1623	int glGetError ()	1932	int glGetError ()
		1933
		1934	void glFinish ()
1624		1935
1625	void glClear (int mask)	1936	void glClear (int mask)
1626		1937
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1938	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1939	PROTOTYPE: @
…		…
1635		1946
1636	void glHint (int target, int mode)	1947	void glHint (int target, int mode)
1637		1948
1638	void glBlendFunc (int sfactor, int dfactor)	1949	void glBlendFunc (int sfactor, int dfactor)
1639		1950
		1951	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1952	CODE:
		1953	gl_BlendFuncSeparate (sa, da, saa, daa);
		1954
1640	void glDepthMask (int flag)	1955	void glDepthMask (int flag)
1641		1956
1642	void glLogicOp (int opcode)	1957	void glLogicOp (int opcode)
1643		1958
1644	void glColorMask (int red, int green, int blue, int alpha)	1959	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	1963	void glPushMatrix ()
1649		1964
1650	void glPopMatrix ()	1965	void glPopMatrix ()
1651		1966
1652	void glLoadIdentity ()	1967	void glLoadIdentity ()
		1968
		1969	void glDrawBuffer (int buffer)
		1970
		1971	void glReadBuffer (int buffer)
1653		1972
1654	# near_ and far_ are due to microsofts buggy "c" compiler	1973	# 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_)	1974	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		1975
1657	# near_ and far_ are due to microsofts buggy "c" compiler	1976	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		1996
1678	void glEnd ()	1997	void glEnd ()
1679		1998
1680	void glColor (float r, float g, float b, float a = 1.0)	1999	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	2000	PROTOTYPE: @
		2001	ALIAS:
		2002	glColor_premultiply = 1
1682	CODE:	2003	CODE:
		2004	if (ix)
		2005	{
		2006	r *= a;
		2007	g *= a;
		2008	b *= a;
		2009	}
1683	// microsoft visual "c" rounds instead of truncating...	2010	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	2011	glColor4ub (MIN ((int)(r * 256.f), 255),
1685	MIN ((int)(g * 255.f), 255),	2012	MIN ((int)(g * 256.f), 255),
1686	MIN ((int)(b * 255.f), 255),	2013	MIN ((int)(b * 256.f), 255),
1687	MIN ((int)(a * 255.f), 255));	2014	MIN ((int)(a * 256.f), 255));
1688		2015
1689	void glInterleavedArrays (int format, int stride, char *data)	2016	void glInterleavedArrays (int format, int stride, char *data)
1690		2017
1691	void glDrawElements (int mode, int count, int type, char *indices)	2018	void glDrawElements (int mode, int count, int type, char *indices)
1692		2019
…		…
1715		2042
1716	void glBindTexture (int target, int name)	2043	void glBindTexture (int target, int name)
1717		2044
1718	void glConvolutionParameter (int target, int pname, float params)	2045	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	2046	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2047	if (gl.ConvolutionParameterf)
		2048	gl.ConvolutionParameterf (target, pname, params);
1721		2049
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2050	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	2051	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2052	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	2053	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		2054
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2055	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	2056	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2057	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	2058	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		2059
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2060	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		2061
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2062	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		2063

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs. Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.123 by root, Wed Jun 28 23:41:11 2006 UTC