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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.100 by root, Wed May 31 17:16:47 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 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	#ifdef FC_HINT_STYLE
		92	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		93	#endif
89	#ifdef _WIN32	94	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	96	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	97	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	98	#endif
…		…
416	}	421	}
417		422
418	void	423	void
419	pango_init ()	424	pango_init ()
420	CODE:	425	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	426	// delayed, so it can pick up new fonts added by AddFontResourceEx
		427	{
		428	{
423	ft2_fontmap = pango_ft2_font_map_new ();	429	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	430	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);	431	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		432	}
		433	{
		434	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	435	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	436	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		437	#ifdef _WIN32
		438	// cairo looks like shit eaten twice on windows
		439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		440	#else
		441	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		442	#endif
		443	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		444	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		445	pango_cairo_context_set_font_options (cairo_context, fopt);
		446	cairo_font_options_destroy (fopt);
		447	}
429	}	448	}
430		449
431	int	450	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	451	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		452
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	498	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	499	CODE:
481	RETVAL = !!SDL_SetVideoMode (	500	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	501	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	502	);
		503	if (RETVAL)
		504	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	505	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		506	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		507	# include "glfunc.h"
		508	# undef GL_FUNC
		509	}
485	OUTPUT:	510	OUTPUT:
486	RETVAL	511	RETVAL
487		512
488	void	513	void
489	SDL_GL_SwapBuffers ()	514	SDL_GL_SwapBuffers ()
…		…
709	MODULE = CFClient PACKAGE = CFClient::Layout	734	MODULE = CFClient PACKAGE = CFClient::Layout
710		735
711	CFClient::Layout	736	CFClient::Layout
712	new (SV *class, int rgba = 0)	737	new (SV *class, int rgba = 0)
713	CODE:	738	CODE:
714	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView
716	#endif
717	New (0, RETVAL, 1, struct cf_layout);	739	New (0, RETVAL, 1, struct cf_layout);
718		740
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	741	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	742	RETVAL->rgba = rgba;
721	RETVAL->r = 1.;	743	RETVAL->r = 1.;
…		…
765		787
766	SV *	788	SV *
767	get_text (CFClient::Layout self)	789	get_text (CFClient::Layout self)
768	CODE:	790	CODE:
769	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	791	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
770	SvUTF8_on (RETVAL);	792	sv_utf8_decode (RETVAL);
771	OUTPUT:	793	OUTPUT:
772	RETVAL	794	RETVAL
773		795
774	void	796	void
775	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	797	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
977	}	999	}
978		1000
979	if (ix)	1001	if (ix)
980	{	1002	{
981	glEnable (GL_BLEND);	1003	glEnable (GL_BLEND);
		1004
		1005	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1006	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1007	else
		1008	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1009	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1010
983	glEnable (GL_ALPHA_TEST);	1011	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	1012	glAlphaFunc (GL_GREATER, 0.01f);
985	}	1013	}
986		1014
987	glBindTexture (GL_TEXTURE_2D, name);	1015	glBindTexture (GL_TEXTURE_2D, name);
…		…
1084		1112
1085	int	1113	int
1086	ox (CFClient::Map self)	1114	ox (CFClient::Map self)
1087	ALIAS:	1115	ALIAS:
1088	oy = 1	1116	oy = 1
		1117	x = 2
		1118	y = 3
		1119	w = 4
		1120	h = 5
1089	CODE:	1121	CODE:
1090	switch (ix)	1122	switch (ix)
1091	{	1123	{
1092	case 0: RETVAL = self->ox; break;	1124	case 0: RETVAL = self->ox; break;
1093	case 1: RETVAL = self->oy; break;	1125	case 1: RETVAL = self->oy; break;
		1126	case 2: RETVAL = self->x; break;
		1127	case 3: RETVAL = self->y; break;
		1128	case 4: RETVAL = self->w; break;
		1129	case 5: RETVAL = self->h; break;
1094	}	1130	}
1095	OUTPUT:	1131	OUTPUT:
1096	RETVAL	1132	RETVAL
1097		1133
1098	void	1134	void
…		…
1535	const_iv (GL_RESCALE_NORMAL),	1571	const_iv (GL_RESCALE_NORMAL),
1536	const_iv (GL_AND),	1572	const_iv (GL_AND),
1537	const_iv (GL_ONE),	1573	const_iv (GL_ONE),
1538	const_iv (GL_ZERO),	1574	const_iv (GL_ZERO),
1539	const_iv (GL_SRC_ALPHA),	1575	const_iv (GL_SRC_ALPHA),
1540	const_iv (GL_SRC_ALPHA_SATURATE),	1576	const_iv (GL_DST_ALPHA),
1541	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1577	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1542	const_iv (GL_ONE_MINUS_DST_ALPHA),	1578	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1579	const_iv (GL_SRC_ALPHA_SATURATE),
1543	const_iv (GL_RGB),	1580	const_iv (GL_RGB),
1544	const_iv (GL_RGBA),	1581	const_iv (GL_RGBA),
1545	const_iv (GL_UNSIGNED_BYTE),	1582	const_iv (GL_UNSIGNED_BYTE),
1546	const_iv (GL_UNSIGNED_SHORT),	1583	const_iv (GL_UNSIGNED_SHORT),
1547	const_iv (GL_UNSIGNED_INT),	1584	const_iv (GL_UNSIGNED_INT),
…		…
1638		1675
1639	void glHint (int target, int mode)	1676	void glHint (int target, int mode)
1640		1677
1641	void glBlendFunc (int sfactor, int dfactor)	1678	void glBlendFunc (int sfactor, int dfactor)
1642		1679
		1680	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1681	CODE:
		1682	gl_BlendFuncSeparate (sa, da, saa, daa);
		1683
1643	void glDepthMask (int flag)	1684	void glDepthMask (int flag)
1644		1685
1645	void glLogicOp (int opcode)	1686	void glLogicOp (int opcode)
1646		1687
1647	void glColorMask (int red, int green, int blue, int alpha)	1688	void glColorMask (int red, int green, int blue, int alpha)
…		…
1680		1721
1681	void glEnd ()	1722	void glEnd ()
1682		1723
1683	void glColor (float r, float g, float b, float a = 1.0)	1724	void glColor (float r, float g, float b, float a = 1.0)
1684	PROTOTYPE: @	1725	PROTOTYPE: @
		1726	ALIAS:
		1727	glColor_premultiply = 1
1685	CODE:	1728	CODE:
		1729	if (ix)
		1730	{
		1731	r *= a;
		1732	g *= a;
		1733	b *= a;
		1734	}
1686	// microsoft visual "c" rounds instead of truncating...	1735	// microsoft visual "c" rounds instead of truncating...
1687	glColor4ub (MIN ((int)(r * 256.f), 255),	1736	glColor4ub (MIN ((int)(r * 256.f), 255),
1688	MIN ((int)(g * 256.f), 255),	1737	MIN ((int)(g * 256.f), 255),
1689	MIN ((int)(b * 256.f), 255),	1738	MIN ((int)(b * 256.f), 255),
1690	MIN ((int)(a * 256.f), 255));	1739	MIN ((int)(a * 256.f), 255));
…		…
1718		1767
1719	void glBindTexture (int target, int name)	1768	void glBindTexture (int target, int name)
1720		1769
1721	void glConvolutionParameter (int target, int pname, float params)	1770	void glConvolutionParameter (int target, int pname, float params)
1722	CODE:	1771	CODE:
1723	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1772	if (gl.ConvolutionParameterf)
		1773	gl.ConvolutionParameterf (target, pname, params);
1724		1774
1725	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1775	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1726	CODE:	1776	CODE:
1727	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1777	if (gl.ConvolutionFilter2D)
1728	(target, internalformat, width, height, format, type, data));	1778	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1729		1779
1730	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1780	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1731	CODE:	1781	CODE:
1732	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1782	if (gl.SeparableFilter2D)
1733	(target, internalformat, width, height, format, type, row, column));	1783	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1734		1784
1735	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1785	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1736		1786
1737	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1787	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1738		1788

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.100 by root, Wed May 31 17:16:47 2006 UTC vs. Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.100 by root, Wed May 31 17:16:47 2006 UTC vs.
Revision 1.110 by root, Sat Jun 10 02:22:33 2006 UTC