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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC

…		…
48	#define MAP_EXTEND_X 32	48	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	49	#define MAP_EXTEND_Y 512
50		50
51	#define MIN_FONT_HEIGHT 10	51	#define MIN_FONT_HEIGHT 10
52		52
53	#define GL_CALL(type,func,args) \	53	static struct
54	{ \	54	{
55	static int init_; \	55	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	56	#include "glfunc.h"
57	\	57	#undef GL_FUNC
58	if (!init_) \	58	} gl;
59	{ \	59
60	init_ = 1; \	60	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	61	{
62	} \	62	if (gl.BlendFuncSeparate)
63	\	63	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	64	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	65	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	66	else
		67	glBlendFunc (sa, da);
		68	}
67		69
68	typedef Mix_Chunk *CFClient__MixChunk;	70	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	71	typedef Mix_Music *CFClient__MixMusic;
70		72
71	typedef PangoFontDescription *CFClient__Font;	73	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		86
85	static void	87	static void
86	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
87	{	89	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING, 1);
		91	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
89	#ifdef _WIN32	92	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	94	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	96	#endif
…		…
416	}	419	}
417		420
418	void	421	void
419	pango_init ()	422	pango_init ()
420	CODE:	423	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	424	// delayed, so it can pick up new fonts added by AddFontResourceEx
		425	{
		426	{
423	ft2_fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	428	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);	429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		430	}
		431	{
		432	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	433	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	434	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		435	#ifdef _WIN32
		436	// cairo looks like shit eaten twice on windows
		437	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		438	#else
		439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		440	#endif
		441	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		442	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		443	pango_cairo_context_set_font_options (cairo_context, fopt);
		444	cairo_font_options_destroy (fopt);
		445	}
429	}	446	}
430		447
431	int	448	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		450
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	497	CODE:
481	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	500	);
		501	if (RETVAL)
		502	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	503	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		504	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		505	# include "glfunc.h"
		506	# undef GL_FUNC
		507	}
485	OUTPUT:	508	OUTPUT:
486	RETVAL	509	RETVAL
487		510
488	void	511	void
489	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	732	MODULE = CFClient PACKAGE = CFClient::Layout
710		733
711	CFClient::Layout	734	CFClient::Layout
712	new (SV *class, int rgba = 0)	735	new (SV *class, int rgba = 0)
713	CODE:	736	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	737	New (0, RETVAL, 1, struct cf_layout);
718		738
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	739	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	740	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	741	RETVAL->r = 1.;
…		…
765		785
766	SV *	786	SV *
767	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
768	CODE:	788	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
771	OUTPUT:	791	OUTPUT:
772	RETVAL	792	RETVAL
773		793
774	void	794	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	795	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
967	{	987	{
968	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
969	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
970	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
971	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
972	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
973		992
974	if (items < 5)	993	if (items < 5)
975	{	994	{
976	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
977	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
978	}	997	}
979		998
980	if (ix)	999	if (ix)
981	{	1000	{
982	glEnable (GL_BLEND);	1001	glEnable (GL_BLEND);
		1002
		1003	if (ix == 2)
983	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1004	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	else
		1006	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1007	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1008
984	glEnable (GL_ALPHA_TEST);	1009	glEnable (GL_ALPHA_TEST);
985	glAlphaFunc (GL_GREATER, 0.01f);	1010	glAlphaFunc (GL_GREATER, 0.01f);
986	}	1011	}
987		1012
988	glBindTexture (GL_TEXTURE_2D, name);	1013	glBindTexture (GL_TEXTURE_2D, name);
989
990	if (wrap_mode)
991	{
992	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
993	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
994	}
995		1014
996	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
997	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
998	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
999	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1080	}	1099	}
1081		1100
1082	// somewhat hackish, but for textures that require it, it really	1101	// somewhat hackish, but for textures that require it, it really
1083	// improves the look, and most others don't suffer.	1102	// improves the look, and most others don't suffer.
1084	glBindTexture (GL_TEXTURE_2D, name);	1103	glBindTexture (GL_TEXTURE_2D, name);
1085	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1086	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1105	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1106	// use uglier nearest interpolation because linear suffers
		1107	// from transparent color bleeding and ugly wrapping effects.
		1108	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1087	}	1109	}
1088		1110
1089	int	1111	int
1090	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
1091	ALIAS:	1113	ALIAS:
1092	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
1093	CODE:	1119	CODE:
1094	switch (ix)	1120	switch (ix)
1095	{	1121	{
1096	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
1097	case 1: RETVAL = self->oy; break;	1123	case 1: RETVAL = self->oy; break;
		1124	case 2: RETVAL = self->x; break;
		1125	case 3: RETVAL = self->y; break;
		1126	case 4: RETVAL = self->w; break;
		1127	case 5: RETVAL = self->h; break;
1098	}	1128	}
1099	OUTPUT:	1129	OUTPUT:
1100	RETVAL	1130	RETVAL
1101		1131
1102	void	1132	void
…		…
1539	const_iv (GL_RESCALE_NORMAL),	1569	const_iv (GL_RESCALE_NORMAL),
1540	const_iv (GL_AND),	1570	const_iv (GL_AND),
1541	const_iv (GL_ONE),	1571	const_iv (GL_ONE),
1542	const_iv (GL_ZERO),	1572	const_iv (GL_ZERO),
1543	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
1544	const_iv (GL_SRC_ALPHA_SATURATE),	1574	const_iv (GL_DST_ALPHA),
1545	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1546	const_iv (GL_ONE_MINUS_DST_ALPHA),	1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1547	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1548	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1549	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
1550	const_iv (GL_UNSIGNED_SHORT),	1581	const_iv (GL_UNSIGNED_SHORT),
1551	const_iv (GL_UNSIGNED_INT),	1582	const_iv (GL_UNSIGNED_INT),
…		…
1562	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1563	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1564	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1565	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1566	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1567	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1568	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1569	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1570	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1571	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1572	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1573	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1641		1673
1642	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1643		1675
1644	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
1645		1677
		1678	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1679	CODE:
		1680	gl_BlendFuncSeparate (sa, da, saa, daa);
		1681
1646	void glDepthMask (int flag)	1682	void glDepthMask (int flag)
1647		1683
1648	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1649		1685
1650	void glColorMask (int red, int green, int blue, int alpha)	1686	void glColorMask (int red, int green, int blue, int alpha)
…		…
1683		1719
1684	void glEnd ()	1720	void glEnd ()
1685		1721
1686	void glColor (float r, float g, float b, float a = 1.0)	1722	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1688	CODE:	1726	CODE:
		1727	if (ix)
		1728	{
		1729	r *= a;
		1730	g *= a;
		1731	b *= a;
		1732	}
1689	// microsoft visual "c" rounds instead of truncating...	1733	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	1734	glColor4ub (MIN ((int)(r * 256.f), 255),
1691	MIN ((int)(g * 255.f), 255),	1735	MIN ((int)(g * 256.f), 255),
1692	MIN ((int)(b * 255.f), 255),	1736	MIN ((int)(b * 256.f), 255),
1693	MIN ((int)(a * 255.f), 255));	1737	MIN ((int)(a * 256.f), 255));
1694		1738
1695	void glInterleavedArrays (int format, int stride, char *data)	1739	void glInterleavedArrays (int format, int stride, char *data)
1696		1740
1697	void glDrawElements (int mode, int count, int type, char *indices)	1741	void glDrawElements (int mode, int count, int type, char *indices)
1698		1742
…		…
1721		1765
1722	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1723		1767
1724	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	1769	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1770	if (gl.ConvolutionParameterf)
		1771	gl.ConvolutionParameterf (target, pname, params);
1727		1772
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1773	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	1774	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1775	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		1777
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1778	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1734	CODE:	1779	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1780	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		1782
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1783	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		1784
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1785	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		1786

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs. Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.97 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC