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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.91 by root, Mon May 22 03:28:54 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 ()
		498
		499	char *
		500	SDL_GetKeyName (int sym)
490		501
491	void	502	void
492	SDL_PollEvent ()	503	SDL_PollEvent ()
493	PPCODE:	504	PPCODE:
494	{	505	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	524	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	525	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	526	break;
516		527
517	case SDL_MOUSEMOTION:	528	case SDL_MOUSEMOTION:
		529	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		530
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	531	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	532	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	533	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	534	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	535	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	536	break;
524		537
525	case SDL_MOUSEBUTTONDOWN:	538	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	539	case SDL_MOUSEBUTTONUP:
		540	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		541
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	542	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	543	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	544	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	545	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	546	break;
…		…
557	lowdelay (int fd, int val = 1)	572	lowdelay (int fd, int val = 1)
558	CODE:	573	CODE:
559	#ifndef _WIN32	574	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	575	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	576	#endif
562
563	char *
564	gl_version ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VERSION);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_extensions ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_EXTENSIONS);
574	OUTPUT:
575	RETVAL
576		577
577	void	578	void
578	add_font (char *file)	579	add_font (char *file)
579	CODE:	580	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
717		718
718	CFClient::Layout	719	CFClient::Layout
719	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
720	CODE:	721	CODE:
721	#if _WIN32	722	#if _WIN32
722	rgba = 0;//D	723	//rgba = 0;//D makes text nicer, breaks TextView
723	#endif	724	#endif
		725	rgba=1;//D
724	New (0, RETVAL, 1, struct cf_layout);	726	New (0, RETVAL, 1, struct cf_layout);
725		727
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	728	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727	RETVAL->rgba = rgba;	729	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	730	RETVAL->r = 1.;
…		…
974	{	976	{
975	HV hv = (HV )SvRV (self);	977	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	978	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	979	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	980	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		981
981	if (items < 5)	982	if (items < 5)
982	{	983	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	984	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	985	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	986	}
986		987
987	if (ix)	988	if (ix)
988	{	989	{
989	glEnable (GL_BLEND);	990	glEnable (GL_BLEND);
		991
		992	if (ix == 2)
990	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
991	glEnable (GL_ALPHA_TEST);	998	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	999	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1000	}
994		1001
995	glBindTexture (GL_TEXTURE_2D, name);	1002	glBindTexture (GL_TEXTURE_2D, name);
996
997	if (wrap_mode)
998	{
999	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1000	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1001	}
1002		1003
1003	glBegin (GL_QUADS);	1004	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1005	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1006	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1007	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1083	tex->r = r;	1084	tex->r = r;
1084	tex->g = g;	1085	tex->g = g;
1085	tex->b = b;	1086	tex->b = b;
1086	tex->a = a;	1087	tex->a = a;
1087	}	1088	}
		1089
		1090	// somewhat hackish, but for textures that require it, it really
		1091	// improves the look, and most others don't suffer.
		1092	glBindTexture (GL_TEXTURE_2D, name);
		1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		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);
1088	}	1098	}
1089		1099
1090	int	1100	int
1091	ox (CFClient::Map self)	1101	ox (CFClient::Map self)
1092	ALIAS:	1102	ALIAS:
1093	oy = 1	1103	oy = 1
		1104	x = 2
		1105	y = 3
		1106	w = 4
		1107	h = 5
1094	CODE:	1108	CODE:
1095	switch (ix)	1109	switch (ix)
1096	{	1110	{
1097	case 0: RETVAL = self->ox; break;	1111	case 0: RETVAL = self->ox; break;
1098	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;
1099	}	1117	}
1100	OUTPUT:	1118	OUTPUT:
1101	RETVAL	1119	RETVAL
1102		1120
1103	void	1121	void
…		…
1540	const_iv (GL_RESCALE_NORMAL),	1558	const_iv (GL_RESCALE_NORMAL),
1541	const_iv (GL_AND),	1559	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1560	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1561	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1562	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1563	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1564	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1565	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1566	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1567	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1568	const_iv (GL_RGBA),
1550	const_iv (GL_UNSIGNED_BYTE),	1569	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1570	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1571	const_iv (GL_UNSIGNED_INT),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1582	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1583	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1584	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1585	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1586	const_iv (GL_TEXTURE_WRAP_T),
		1587	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1588	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1589	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1590	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1591	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1604		1624
1605	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; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1627	}
1608		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
1609	int glGetError ()	1650	int glGetError ()
1610		1651
1611	void glClear (int mask)	1652	void glClear (int mask)
1612		1653
1613	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)
…		…
1620	void glShadeModel (int mode)	1661	void glShadeModel (int mode)
1621		1662
1622	void glHint (int target, int mode)	1663	void glHint (int target, int mode)
1623		1664
1624	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);
1625		1670
1626	void glDepthMask (int flag)	1671	void glDepthMask (int flag)
1627		1672
1628	void glLogicOp (int opcode)	1673	void glLogicOp (int opcode)
1629		1674
…		…
1663		1708
1664	void glEnd ()	1709	void glEnd ()
1665		1710
1666	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)
1667	PROTOTYPE: @	1712	PROTOTYPE: @
		1713	ALIAS:
		1714	glColor_premultiply = 1
1668	CODE:	1715	CODE:
		1716	if (ix)
		1717	{
		1718	r *= a;
		1719	g *= a;
		1720	b *= a;
		1721	}
1669	// microsoft visual "c" rounds instead of truncating...	1722	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	1723	glColor4ub (MIN ((int)(r * 256.f), 255),
1671	MIN ((int)(g * 255.f), 255),	1724	MIN ((int)(g * 256.f), 255),
1672	MIN ((int)(b * 255.f), 255),	1725	MIN ((int)(b * 256.f), 255),
1673	MIN ((int)(a * 255.f), 255));	1726	MIN ((int)(a * 256.f), 255));
1674		1727
1675	void glInterleavedArrays (int format, int stride, char *data)	1728	void glInterleavedArrays (int format, int stride, char *data)
1676		1729
1677	void glDrawElements (int mode, int count, int type, char *indices)	1730	void glDrawElements (int mode, int count, int type, char *indices)
1678		1731
…		…
1701		1754
1702	void glBindTexture (int target, int name)	1755	void glBindTexture (int target, int name)
1703		1756
1704	void glConvolutionParameter (int target, int pname, float params)	1757	void glConvolutionParameter (int target, int pname, float params)
1705	CODE:	1758	CODE:
1706	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1759	if (gl.ConvolutionParameterf)
		1760	gl.ConvolutionParameterf (target, pname, params);
1707		1761
1708	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)
1709	CODE:	1763	CODE:
1710	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1764	if (gl.ConvolutionFilter2D)
1711	(target, internalformat, width, height, format, type, data));	1765	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1712		1766
1713	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)
1714	CODE:	1768	CODE:
1715	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1769	if (gl.SeparableFilter2D)
1716	(target, internalformat, width, height, format, type, row, column));	1770	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1717		1771
1718	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)
1719		1773
1720	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)
1721		1775

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.91 by root, Mon May 22 03:28:54 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.91 by root, Mon May 22 03:28:54 2006 UTC vs.
Revision 1.104 by root, Mon Jun 5 00:17:47 2006 UTC