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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.103 by root, Sun Jun 4 23:05:05 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;
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	481	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	482	CODE:
481	RETVAL = !!SDL_SetVideoMode (	483	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	484	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	485	);
		486	if (RETVAL)
		487	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	488	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		489	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		490	# include "glfunc.h"
		491	# undef GL_FUNC
		492	}
485	OUTPUT:	493	OUTPUT:
486	RETVAL	494	RETVAL
487		495
488	void	496	void
489	SDL_GL_SwapBuffers ()	497	SDL_GL_SwapBuffers ()
…		…
710		718
711	CFClient::Layout	719	CFClient::Layout
712	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
713	CODE:	721	CODE:
714	#if _WIN32	722	#if _WIN32
715	//rgba = 0;//D make stext nicer, breaks TextView	723	//rgba = 0;//D makes text nicer, breaks TextView
716	#endif	724	#endif
717	New (0, RETVAL, 1, struct cf_layout);	725	New (0, RETVAL, 1, struct cf_layout);
718		726
719	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
720	RETVAL->rgba = rgba;	728	RETVAL->rgba = rgba;
…		…
977	}	985	}
978		986
979	if (ix)	987	if (ix)
980	{	988	{
981	glEnable (GL_BLEND);	989	glEnable (GL_BLEND);
		990
		991	if (ix == 2)
982	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	992	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		993	else
		994	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		995	GL_ONE_MINUS_DST_ALPHA, GL_ONE);
		996
983	glEnable (GL_ALPHA_TEST);	997	glEnable (GL_ALPHA_TEST);
984	glAlphaFunc (GL_GREATER, 0.01f);	998	glAlphaFunc (GL_GREATER, 0.01f);
985	}	999	}
986		1000
987	glBindTexture (GL_TEXTURE_2D, name);	1001	glBindTexture (GL_TEXTURE_2D, name);
…		…
1646		1660
1647	void glHint (int target, int mode)	1661	void glHint (int target, int mode)
1648		1662
1649	void glBlendFunc (int sfactor, int dfactor)	1663	void glBlendFunc (int sfactor, int dfactor)
1650		1664
		1665	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1666	CODE:
		1667	gl_BlendFuncSeparate (sa, da, saa, daa);
		1668
1651	void glDepthMask (int flag)	1669	void glDepthMask (int flag)
1652		1670
1653	void glLogicOp (int opcode)	1671	void glLogicOp (int opcode)
1654		1672
1655	void glColorMask (int red, int green, int blue, int alpha)	1673	void glColorMask (int red, int green, int blue, int alpha)
…		…
1688		1706
1689	void glEnd ()	1707	void glEnd ()
1690		1708
1691	void glColor (float r, float g, float b, float a = 1.0)	1709	void glColor (float r, float g, float b, float a = 1.0)
1692	PROTOTYPE: @	1710	PROTOTYPE: @
		1711	ALIAS:
		1712	glColor_premultiply = 1
1693	CODE:	1713	CODE:
		1714	if (ix)
		1715	{
		1716	r *= a;
		1717	g *= a;
		1718	b *= a;
		1719	}
1694	// microsoft visual "c" rounds instead of truncating...	1720	// microsoft visual "c" rounds instead of truncating...
1695	glColor4ub (MIN ((int)(r * 256.f), 255),	1721	glColor4ub (MIN ((int)(r * 256.f), 255),
1696	MIN ((int)(g * 256.f), 255),	1722	MIN ((int)(g * 256.f), 255),
1697	MIN ((int)(b * 256.f), 255),	1723	MIN ((int)(b * 256.f), 255),
1698	MIN ((int)(a * 256.f), 255));	1724	MIN ((int)(a * 256.f), 255));
…		…
1726		1752
1727	void glBindTexture (int target, int name)	1753	void glBindTexture (int target, int name)
1728		1754
1729	void glConvolutionParameter (int target, int pname, float params)	1755	void glConvolutionParameter (int target, int pname, float params)
1730	CODE:	1756	CODE:
1731	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1757	if (gl.ConvolutionParameterf)
		1758	gl.ConvolutionParameterf (target, pname, params);
1732		1759
1733	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1760	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1734	CODE:	1761	CODE:
1735	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1762	if (gl.ConvolutionFilter2D)
1736	(target, internalformat, width, height, format, type, data));	1763	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1737		1764
1738	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1765	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1739	CODE:	1766	CODE:
1740	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1767	if (gl.SeparableFilter2D)
1741	(target, internalformat, width, height, format, type, row, column));	1768	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1742		1769
1743	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1770	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1744		1771
1745	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1772	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1746		1773

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs. Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.102 by root, Sat Jun 3 23:47:46 2006 UTC vs.
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC