[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.114 by root, Wed Jun 14 18:02:00 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>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
294	ev.code = 1;	300	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	302	ev.data2 = 0;
297		303
298	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
299	}	322	}
300		323
301	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
302		325
303	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
416	}	439	}
417		440
418	void	441	void
419	pango_init ()	442	pango_init ()
420	CODE:	443	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	444	// delayed, so it can pick up new fonts added by AddFontResourceEx
		445	{
		446	{
423	ft2_fontmap = pango_ft2_font_map_new ();	447	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	448	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);	449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		450	}
		451	{
		452	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	453	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	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	}
429	}	466	}
430		467
431	int	468	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		470
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	517	CODE:
481	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	520	);
		521	if (RETVAL)
		522	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	523	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		524	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		525	# include "glfunc.h"
		526	# undef GL_FUNC
		527	}
485	OUTPUT:	528	OUTPUT:
486	RETVAL	529	RETVAL
487		530
488	void	531	void
489	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
…		…
678	CODE:	721	CODE:
679	fprintf (stderr, "FATAL: %s\n", message);	722	fprintf (stderr, "FATAL: %s\n", message);
680	#ifdef _WIN32	723	#ifdef _WIN32
681	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
682	#endif	725	#endif
683	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
684		732
685	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
686		734
687	CFClient::Font	735	CFClient::Font
688	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	757	MODULE = CFClient PACKAGE = CFClient::Layout
710		758
711	CFClient::Layout	759	CFClient::Layout
712	new (SV *class, int rgba = 0)	760	new (SV *class, int rgba = 0)
713	CODE:	761	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	762	New (0, RETVAL, 1, struct cf_layout);
718		763
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	765	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	766	RETVAL->r = 1.;
…		…
765		810
766	SV *	811	SV *
767	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
768	CODE:	813	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
771	OUTPUT:	816	OUTPUT:
772	RETVAL	817	RETVAL
773		818
774	void	819	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
956	}	1001	}
957		1002
958	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
959		1004
960	void	1005	void
		1006	pad2pot (SV data_, SV w_, SV *h_)
		1007	CODE:
		1008	{
		1009	int ow = SvIV (w_);
		1010	int oh = SvIV (h_);
		1011
		1012	if (ow && oh)
		1013	{
		1014	int nw = minpot (ow);
		1015	int nh = minpot (oh);
		1016
		1017	if (nw != ow \|\| nh != oh)
		1018	{
		1019	if (SvOK (data_))
		1020	{
		1021	STRLEN datalen;
		1022	char *data = SvPVbyte (data_, datalen);
		1023	int bpp = datalen / (ow * oh);
		1024	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1025
		1026	SvPOK_only (result_);
		1027	SvCUR_set (result_, nw * nh * bpp);
		1028
		1029	memset (SvPVX (result_), 0, nw * nh * bpp);
		1030	while (oh--)
		1031	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1032
		1033	sv_setsv (data_, result_);
		1034	}
		1035
		1036	sv_setiv (w_, nw);
		1037	sv_setiv (h_, nh);
		1038	}
		1039	}
		1040	}
		1041
		1042	void
961	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1043	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
962	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
963	ALIAS:	1045	ALIAS:
964	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
965	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
966	CODE:	1048	CODE:
…		…
977	}	1059	}
978		1060
979	if (ix)	1061	if (ix)
980	{	1062	{
981	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1066	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1067	else
		1068	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1069	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1070
983	glEnable (GL_ALPHA_TEST);	1071	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1072	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1073	}
986		1074
987	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
…		…
1025	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
1026	CODE:	1114	CODE:
1027	{	1115	{
1028	map_clear (self);	1116	map_clear (self);
1029	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
1030	Safefree (self);	1119	Safefree (self);
1031	}	1120	}
1032		1121
1033	void	1122	void
1034	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1073	}	1162	}
1074		1163
1075	// somewhat hackish, but for textures that require it, it really	1164	// somewhat hackish, but for textures that require it, it really
1076	// improves the look, and most others don't suffer.	1165	// improves the look, and most others don't suffer.
1077	glBindTexture (GL_TEXTURE_2D, name);	1166	glBindTexture (GL_TEXTURE_2D, name);
1078	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1167	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1079	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1168	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1169	// use uglier nearest interpolation because linear suffers
		1170	// from transparent color bleeding and ugly wrapping effects.
		1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1080	}	1172	}
1081		1173
1082	int	1174	int
1083	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1084	ALIAS:	1176	ALIAS:
1085	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1086	CODE:	1182	CODE:
1087	switch (ix)	1183	switch (ix)
1088	{	1184	{
1089	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1090	case 1: RETVAL = self->oy; break;	1186	case 1: RETVAL = self->oy; break;
		1187	case 2: RETVAL = self->x; break;
		1188	case 3: RETVAL = self->y; break;
		1189	case 4: RETVAL = self->w; break;
		1190	case 5: RETVAL = self->h; break;
1091	}	1191	}
1092	OUTPUT:	1192	OUTPUT:
1093	RETVAL	1193	RETVAL
1094		1194
1095	void	1195	void
…		…
1532	const_iv (GL_RESCALE_NORMAL),	1632	const_iv (GL_RESCALE_NORMAL),
1533	const_iv (GL_AND),	1633	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
1542	const_iv (GL_UNSIGNED_BYTE),	1643	const_iv (GL_UNSIGNED_BYTE),
1543	const_iv (GL_UNSIGNED_SHORT),	1644	const_iv (GL_UNSIGNED_SHORT),
1544	const_iv (GL_UNSIGNED_INT),	1645	const_iv (GL_UNSIGNED_INT),
…		…
1620	OUTPUT:	1721	OUTPUT:
1621	RETVAL	1722	RETVAL
1622		1723
1623	int glGetError ()	1724	int glGetError ()
1624		1725
		1726	void glFinish ()
		1727
1625	void glClear (int mask)	1728	void glClear (int mask)
1626		1729
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1730	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1731	PROTOTYPE: @
1629		1732
…		…
1634	void glShadeModel (int mode)	1737	void glShadeModel (int mode)
1635		1738
1636	void glHint (int target, int mode)	1739	void glHint (int target, int mode)
1637		1740
1638	void glBlendFunc (int sfactor, int dfactor)	1741	void glBlendFunc (int sfactor, int dfactor)
		1742
		1743	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1744	CODE:
		1745	gl_BlendFuncSeparate (sa, da, saa, daa);
1639		1746
1640	void glDepthMask (int flag)	1747	void glDepthMask (int flag)
1641		1748
1642	void glLogicOp (int opcode)	1749	void glLogicOp (int opcode)
1643		1750
…		…
1677		1784
1678	void glEnd ()	1785	void glEnd ()
1679		1786
1680	void glColor (float r, float g, float b, float a = 1.0)	1787	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1788	PROTOTYPE: @
		1789	ALIAS:
		1790	glColor_premultiply = 1
1682	CODE:	1791	CODE:
		1792	if (ix)
		1793	{
		1794	r *= a;
		1795	g *= a;
		1796	b *= a;
		1797	}
1683	// microsoft visual "c" rounds instead of truncating...	1798	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1799	glColor4ub (MIN ((int)(r * 256.f), 255),
1685	MIN ((int)(g * 255.f), 255),	1800	MIN ((int)(g * 256.f), 255),
1686	MIN ((int)(b * 255.f), 255),	1801	MIN ((int)(b * 256.f), 255),
1687	MIN ((int)(a * 255.f), 255));	1802	MIN ((int)(a * 256.f), 255));
1688		1803
1689	void glInterleavedArrays (int format, int stride, char *data)	1804	void glInterleavedArrays (int format, int stride, char *data)
1690		1805
1691	void glDrawElements (int mode, int count, int type, char *indices)	1806	void glDrawElements (int mode, int count, int type, char *indices)
1692		1807
…		…
1715		1830
1716	void glBindTexture (int target, int name)	1831	void glBindTexture (int target, int name)
1717		1832
1718	void glConvolutionParameter (int target, int pname, float params)	1833	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1834	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1835	if (gl.ConvolutionParameterf)
		1836	gl.ConvolutionParameterf (target, pname, params);
1721		1837
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1838	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1839	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1840	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1841	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1842
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1843	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	1844	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1845	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	1846	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		1847
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1848	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		1849
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1850	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		1851

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.114 by root, Wed Jun 14 18:02:00 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.114 by root, Wed Jun 14 18:02:00 2006 UTC