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

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.106 by root, Mon Jun 5 03:48:49 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.106 by root, Mon Jun 5 03:48:49 2006 UTC