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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.95 by root, Wed May 24 01:46:53 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 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 ()
…		…
564	lowdelay (int fd, int val = 1)	572	lowdelay (int fd, int val = 1)
565	CODE:	573	CODE:
566	#ifndef _WIN32	574	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	576	#endif
569
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590		577
591	void	578	void
592	add_font (char *file)	579	add_font (char *file)
593	CODE:	580	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
731		718
732	CFClient::Layout	719	CFClient::Layout
733	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
734	CODE:	721	CODE:
735	#if _WIN32	722	#if _WIN32
736	rgba = 0;//D	723	//rgba = 0;//D makes text nicer, breaks TextView
737	#endif	724	#endif
		725	rgba=1;//D
738	New (0, RETVAL, 1, struct cf_layout);	726	New (0, RETVAL, 1, struct cf_layout);
739		727
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
741	RETVAL->rgba = rgba;	729	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	730	RETVAL->r = 1.;
…		…
988	{	976	{
989	HV hv = (HV )SvRV (self);	977	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	978	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	979	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	980	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		981
995	if (items < 5)	982	if (items < 5)
996	{	983	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	984	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	985	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	986	}
1000		987
1001	if (ix)	988	if (ix)
1002	{	989	{
1003	glEnable (GL_BLEND);	990	glEnable (GL_BLEND);
		991
		992	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	993	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		994	else
		995	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		996	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		997
1005	glEnable (GL_ALPHA_TEST);	998	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	999	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1000	}
1008		1001
1009	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1003
1017	glBegin (GL_QUADS);	1004	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1005	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1006	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1007	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1101	}	1088	}
1102		1089
1103	// somewhat hackish, but for textures that require it, it really	1090	// somewhat hackish, but for textures that require it, it really
1104	// improves the look, and most others don't suffer.	1091	// improves the look, and most others don't suffer.
1105	glBindTexture (GL_TEXTURE_2D, name);	1092	glBindTexture (GL_TEXTURE_2D, name);
1106	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1094	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1095	// use uglier nearest interpolation because linear suffers
		1096	// from transparent color bleeding and ugly wrapping effects.
		1097	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1098	}
1109		1099
1110	int	1100	int
1111	ox (CFClient::Map self)	1101	ox (CFClient::Map self)
1112	ALIAS:	1102	ALIAS:
1113	oy = 1	1103	oy = 1
		1104	x = 2
		1105	y = 3
		1106	w = 4
		1107	h = 5
1114	CODE:	1108	CODE:
1115	switch (ix)	1109	switch (ix)
1116	{	1110	{
1117	case 0: RETVAL = self->ox; break;	1111	case 0: RETVAL = self->ox; break;
1118	case 1: RETVAL = self->oy; break;	1112	case 1: RETVAL = self->oy; break;
		1113	case 2: RETVAL = self->x; break;
		1114	case 3: RETVAL = self->y; break;
		1115	case 4: RETVAL = self->w; break;
		1116	case 5: RETVAL = self->h; break;
1119	}	1117	}
1120	OUTPUT:	1118	OUTPUT:
1121	RETVAL	1119	RETVAL
1122		1120
1123	void	1121	void
…		…
1560	const_iv (GL_RESCALE_NORMAL),	1558	const_iv (GL_RESCALE_NORMAL),
1561	const_iv (GL_AND),	1559	const_iv (GL_AND),
1562	const_iv (GL_ONE),	1560	const_iv (GL_ONE),
1563	const_iv (GL_ZERO),	1561	const_iv (GL_ZERO),
1564	const_iv (GL_SRC_ALPHA),	1562	const_iv (GL_SRC_ALPHA),
1565	const_iv (GL_SRC_ALPHA_SATURATE),	1563	const_iv (GL_DST_ALPHA),
1566	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567	const_iv (GL_ONE_MINUS_DST_ALPHA),	1565	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1566	const_iv (GL_SRC_ALPHA_SATURATE),
1568	const_iv (GL_RGB),	1567	const_iv (GL_RGB),
1569	const_iv (GL_RGBA),	1568	const_iv (GL_RGBA),
1570	const_iv (GL_UNSIGNED_BYTE),	1569	const_iv (GL_UNSIGNED_BYTE),
1571	const_iv (GL_UNSIGNED_SHORT),	1570	const_iv (GL_UNSIGNED_SHORT),
1572	const_iv (GL_UNSIGNED_INT),	1571	const_iv (GL_UNSIGNED_INT),
…		…
1583	const_iv (GL_TEXTURE_MAG_FILTER),	1582	const_iv (GL_TEXTURE_MAG_FILTER),
1584	const_iv (GL_TEXTURE_MIN_FILTER),	1583	const_iv (GL_TEXTURE_MIN_FILTER),
1585	const_iv (GL_TEXTURE_ENV_MODE),	1584	const_iv (GL_TEXTURE_ENV_MODE),
1586	const_iv (GL_TEXTURE_WRAP_S),	1585	const_iv (GL_TEXTURE_WRAP_S),
1587	const_iv (GL_TEXTURE_WRAP_T),	1586	const_iv (GL_TEXTURE_WRAP_T),
		1587	const_iv (GL_REPEAT),
1588	const_iv (GL_CLAMP),	1588	const_iv (GL_CLAMP),
1589	const_iv (GL_REPEAT),	1589	const_iv (GL_CLAMP_TO_EDGE),
1590	const_iv (GL_NEAREST),	1590	const_iv (GL_NEAREST),
1591	const_iv (GL_LINEAR),	1591	const_iv (GL_LINEAR),
1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1624		1624
1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627	}	1627	}
1628		1628
		1629	char *
		1630	gl_vendor ()
		1631	CODE:
		1632	RETVAL = (char *)glGetString (GL_VENDOR);
		1633	OUTPUT:
		1634	RETVAL
		1635
		1636	char *
		1637	gl_version ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VERSION);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_extensions ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1647	OUTPUT:
		1648	RETVAL
		1649
1629	int glGetError ()	1650	int glGetError ()
1630		1651
1631	void glClear (int mask)	1652	void glClear (int mask)
1632		1653
1633	void glClearColor (float r, float g, float b, float a = 1.0)	1654	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1640	void glShadeModel (int mode)	1661	void glShadeModel (int mode)
1641		1662
1642	void glHint (int target, int mode)	1663	void glHint (int target, int mode)
1643		1664
1644	void glBlendFunc (int sfactor, int dfactor)	1665	void glBlendFunc (int sfactor, int dfactor)
		1666
		1667	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1668	CODE:
		1669	gl_BlendFuncSeparate (sa, da, saa, daa);
1645		1670
1646	void glDepthMask (int flag)	1671	void glDepthMask (int flag)
1647		1672
1648	void glLogicOp (int opcode)	1673	void glLogicOp (int opcode)
1649		1674
…		…
1683		1708
1684	void glEnd ()	1709	void glEnd ()
1685		1710
1686	void glColor (float r, float g, float b, float a = 1.0)	1711	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	1712	PROTOTYPE: @
		1713	ALIAS:
		1714	glColor_premultiply = 1
1688	CODE:	1715	CODE:
		1716	if (ix)
		1717	{
		1718	r *= a;
		1719	g *= a;
		1720	b *= a;
		1721	}
1689	// microsoft visual "c" rounds instead of truncating...	1722	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	1723	glColor4ub (MIN ((int)(r * 256.f), 255),
1691	MIN ((int)(g * 255.f), 255),	1724	MIN ((int)(g * 256.f), 255),
1692	MIN ((int)(b * 255.f), 255),	1725	MIN ((int)(b * 256.f), 255),
1693	MIN ((int)(a * 255.f), 255));	1726	MIN ((int)(a * 256.f), 255));
1694		1727
1695	void glInterleavedArrays (int format, int stride, char *data)	1728	void glInterleavedArrays (int format, int stride, char *data)
1696		1729
1697	void glDrawElements (int mode, int count, int type, char *indices)	1730	void glDrawElements (int mode, int count, int type, char *indices)
1698		1731
…		…
1721		1754
1722	void glBindTexture (int target, int name)	1755	void glBindTexture (int target, int name)
1723		1756
1724	void glConvolutionParameter (int target, int pname, float params)	1757	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	1758	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1759	if (gl.ConvolutionParameterf)
		1760	gl.ConvolutionParameterf (target, pname, params);
1727		1761
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1762	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	1763	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1764	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	1765	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		1766
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1767	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1734	CODE:	1768	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1769	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	1770	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		1771
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1772	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		1773
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1774	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		1775

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.95 by root, Wed May 24 01:46:53 2006 UTC vs. Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.95 by root, Wed May 24 01:46:53 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC