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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 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 ()
		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_vendor ()
565	CODE:
566	RETVAL = (char *)glGetString (GL_VENDOR);
567	OUTPUT:
568	RETVAL
569
570	char *
571	gl_version ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VERSION);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_extensions ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_EXTENSIONS);
581	OUTPUT:
582	RETVAL
583		577
584	void	578	void
585	add_font (char *file)	579	add_font (char *file)
586	CODE:	580	CODE:
587	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	581	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
724		718
725	CFClient::Layout	719	CFClient::Layout
726	new (SV *class, int rgba = 0)	720	new (SV *class, int rgba = 0)
727	CODE:	721	CODE:
728	#if _WIN32	722	#if _WIN32
729	rgba = 0;//D	723	//rgba = 0;//D makes text nicer, breaks TextView
730	#endif	724	#endif
731	New (0, RETVAL, 1, struct cf_layout);	725	New (0, RETVAL, 1, struct cf_layout);
732		726
733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	727	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
734	RETVAL->rgba = rgba;	728	RETVAL->rgba = rgba;
…		…
981	{	975	{
982	HV hv = (HV )SvRV (self);	976	HV hv = (HV )SvRV (self);
983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	977	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	978	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	979	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987		980
988	if (items < 5)	981	if (items < 5)
989	{	982	{
990	w = SvNV (*hv_fetch (hv, "w", 1, 1));	983	w = SvNV (*hv_fetch (hv, "w", 1, 1));
991	h = SvNV (*hv_fetch (hv, "h", 1, 1));	984	h = SvNV (*hv_fetch (hv, "h", 1, 1));
992	}	985	}
993		986
994	if (ix)	987	if (ix)
995	{	988	{
996	glEnable (GL_BLEND);	989	glEnable (GL_BLEND);
		990
		991	if (ix == 2)
997	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
998	glEnable (GL_ALPHA_TEST);	997	glEnable (GL_ALPHA_TEST);
999	glAlphaFunc (GL_GREATER, 0.01f);	998	glAlphaFunc (GL_GREATER, 0.01f);
1000	}	999	}
1001		1000
1002	glBindTexture (GL_TEXTURE_2D, name);	1001	glBindTexture (GL_TEXTURE_2D, name);
1003
1004	if (wrap_mode)
1005	{
1006	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1007	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1008	}
1009		1002
1010	glBegin (GL_QUADS);	1003	glBegin (GL_QUADS);
1011	glTexCoord2f (0, 0); glVertex2f (x , y );	1004	glTexCoord2f (0, 0); glVertex2f (x , y );
1012	glTexCoord2f (0, t); glVertex2f (x , y + h);	1005	glTexCoord2f (0, t); glVertex2f (x , y + h);
1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1090	tex->r = r;	1083	tex->r = r;
1091	tex->g = g;	1084	tex->g = g;
1092	tex->b = b;	1085	tex->b = b;
1093	tex->a = a;	1086	tex->a = a;
1094	}	1087	}
		1088
		1089	// somewhat hackish, but for textures that require it, it really
		1090	// improves the look, and most others don't suffer.
		1091	glBindTexture (GL_TEXTURE_2D, name);
		1092	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1093	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1094	// use uglier nearest interpolation because linear suffers
		1095	// from transparent color bleeding and ugly wrapping effects.
		1096	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095	}	1097	}
1096		1098
1097	int	1099	int
1098	ox (CFClient::Map self)	1100	ox (CFClient::Map self)
1099	ALIAS:	1101	ALIAS:
1100	oy = 1	1102	oy = 1
		1103	x = 2
		1104	y = 3
		1105	w = 4
		1106	h = 5
1101	CODE:	1107	CODE:
1102	switch (ix)	1108	switch (ix)
1103	{	1109	{
1104	case 0: RETVAL = self->ox; break;	1110	case 0: RETVAL = self->ox; break;
1105	case 1: RETVAL = self->oy; break;	1111	case 1: RETVAL = self->oy; break;
		1112	case 2: RETVAL = self->x; break;
		1113	case 3: RETVAL = self->y; break;
		1114	case 4: RETVAL = self->w; break;
		1115	case 5: RETVAL = self->h; break;
1106	}	1116	}
1107	OUTPUT:	1117	OUTPUT:
1108	RETVAL	1118	RETVAL
1109		1119
1110	void	1120	void
…		…
1570	const_iv (GL_TEXTURE_MAG_FILTER),	1580	const_iv (GL_TEXTURE_MAG_FILTER),
1571	const_iv (GL_TEXTURE_MIN_FILTER),	1581	const_iv (GL_TEXTURE_MIN_FILTER),
1572	const_iv (GL_TEXTURE_ENV_MODE),	1582	const_iv (GL_TEXTURE_ENV_MODE),
1573	const_iv (GL_TEXTURE_WRAP_S),	1583	const_iv (GL_TEXTURE_WRAP_S),
1574	const_iv (GL_TEXTURE_WRAP_T),	1584	const_iv (GL_TEXTURE_WRAP_T),
		1585	const_iv (GL_REPEAT),
1575	const_iv (GL_CLAMP),	1586	const_iv (GL_CLAMP),
1576	const_iv (GL_REPEAT),	1587	const_iv (GL_CLAMP_TO_EDGE),
1577	const_iv (GL_NEAREST),	1588	const_iv (GL_NEAREST),
1578	const_iv (GL_LINEAR),	1589	const_iv (GL_LINEAR),
1579	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1590	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1591	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1592	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1611		1622
1612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1623	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1624	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614	}	1625	}
1615		1626
		1627	char *
		1628	gl_vendor ()
		1629	CODE:
		1630	RETVAL = (char *)glGetString (GL_VENDOR);
		1631	OUTPUT:
		1632	RETVAL
		1633
		1634	char *
		1635	gl_version ()
		1636	CODE:
		1637	RETVAL = (char *)glGetString (GL_VERSION);
		1638	OUTPUT:
		1639	RETVAL
		1640
		1641	char *
		1642	gl_extensions ()
		1643	CODE:
		1644	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1645	OUTPUT:
		1646	RETVAL
		1647
1616	int glGetError ()	1648	int glGetError ()
1617		1649
1618	void glClear (int mask)	1650	void glClear (int mask)
1619		1651
1620	void glClearColor (float r, float g, float b, float a = 1.0)	1652	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1627	void glShadeModel (int mode)	1659	void glShadeModel (int mode)
1628		1660
1629	void glHint (int target, int mode)	1661	void glHint (int target, int mode)
1630		1662
1631	void glBlendFunc (int sfactor, int dfactor)	1663	void glBlendFunc (int sfactor, int dfactor)
		1664
		1665	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1666	CODE:
		1667	gl_BlendFuncSeparate (sa, da, saa, daa);
1632		1668
1633	void glDepthMask (int flag)	1669	void glDepthMask (int flag)
1634		1670
1635	void glLogicOp (int opcode)	1671	void glLogicOp (int opcode)
1636		1672
…		…
1670		1706
1671	void glEnd ()	1707	void glEnd ()
1672		1708
1673	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)
1674	PROTOTYPE: @	1710	PROTOTYPE: @
		1711	ALIAS:
		1712	glColor_premultiply = 1
1675	CODE:	1713	CODE:
		1714	if (ix)
		1715	{
		1716	r *= a;
		1717	g *= a;
		1718	b *= a;
		1719	}
1676	// microsoft visual "c" rounds instead of truncating...	1720	// microsoft visual "c" rounds instead of truncating...
1677	glColor4ub (MIN ((int)(r * 255.f), 255),	1721	glColor4ub (MIN ((int)(r * 256.f), 255),
1678	MIN ((int)(g * 255.f), 255),	1722	MIN ((int)(g * 256.f), 255),
1679	MIN ((int)(b * 255.f), 255),	1723	MIN ((int)(b * 256.f), 255),
1680	MIN ((int)(a * 255.f), 255));	1724	MIN ((int)(a * 256.f), 255));
1681		1725
1682	void glInterleavedArrays (int format, int stride, char *data)	1726	void glInterleavedArrays (int format, int stride, char *data)
1683		1727
1684	void glDrawElements (int mode, int count, int type, char *indices)	1728	void glDrawElements (int mode, int count, int type, char *indices)
1685		1729
…		…
1708		1752
1709	void glBindTexture (int target, int name)	1753	void glBindTexture (int target, int name)
1710		1754
1711	void glConvolutionParameter (int target, int pname, float params)	1755	void glConvolutionParameter (int target, int pname, float params)
1712	CODE:	1756	CODE:
1713	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1757	if (gl.ConvolutionParameterf)
		1758	gl.ConvolutionParameterf (target, pname, params);
1714		1759
1715	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)
1716	CODE:	1761	CODE:
1717	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1762	if (gl.ConvolutionFilter2D)
1718	(target, internalformat, width, height, format, type, data));	1763	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719		1764
1720	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)
1721	CODE:	1766	CODE:
1722	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1767	if (gl.SeparableFilter2D)
1723	(target, internalformat, width, height, format, type, row, column));	1768	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724		1769
1725	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)
1726		1771
1727	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)
1728		1773

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.92 by elmex, Tue May 23 17:30:18 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.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.103 by root, Sun Jun 4 23:05:05 2006 UTC