[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.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 ()
		512
		513	char *
		514	SDL_GetKeyName (int sym)
490		515
491	void	516	void
492	SDL_PollEvent ()	517	SDL_PollEvent ()
493	PPCODE:	518	PPCODE:
494	{	519	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	538	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	539	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	540	break;
516		541
517	case SDL_MOUSEMOTION:	542	case SDL_MOUSEMOTION:
		543	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		544
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	545	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	546	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	547	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	548	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	549	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	550	break;
524		551
525	case SDL_MOUSEBUTTONDOWN:	552	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	553	case SDL_MOUSEBUTTONUP:
		554	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		555
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	556	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	557	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	558	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	559	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	560	break;
…		…
557	lowdelay (int fd, int val = 1)	586	lowdelay (int fd, int val = 1)
558	CODE:	587	CODE:
559	#ifndef _WIN32	588	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	589	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	590	#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		591
584	void	592	void
585	add_font (char *file)	593	add_font (char *file)
586	CODE:	594	CODE:
587	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	595	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
723	MODULE = CFClient PACKAGE = CFClient::Layout	731	MODULE = CFClient PACKAGE = CFClient::Layout
724		732
725	CFClient::Layout	733	CFClient::Layout
726	new (SV *class, int rgba = 0)	734	new (SV *class, int rgba = 0)
727	CODE:	735	CODE:
728	#if _WIN32
729	rgba = 0;//D
730	#endif
731	New (0, RETVAL, 1, struct cf_layout);	736	New (0, RETVAL, 1, struct cf_layout);
732		737
733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	738	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
734	RETVAL->rgba = rgba;	739	RETVAL->rgba = rgba;
735	RETVAL->r = 1.;	740	RETVAL->r = 1.;
…		…
981	{	986	{
982	HV hv = (HV )SvRV (self);	987	HV hv = (HV )SvRV (self);
983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	988	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	989	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	990	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987		991
988	if (items < 5)	992	if (items < 5)
989	{	993	{
990	w = SvNV (*hv_fetch (hv, "w", 1, 1));	994	w = SvNV (*hv_fetch (hv, "w", 1, 1));
991	h = SvNV (*hv_fetch (hv, "h", 1, 1));	995	h = SvNV (*hv_fetch (hv, "h", 1, 1));
992	}	996	}
993		997
994	if (ix)	998	if (ix)
995	{	999	{
996	glEnable (GL_BLEND);	1000	glEnable (GL_BLEND);
		1001
		1002	if (ix == 2)
997	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
998	glEnable (GL_ALPHA_TEST);	1008	glEnable (GL_ALPHA_TEST);
999	glAlphaFunc (GL_GREATER, 0.01f);	1009	glAlphaFunc (GL_GREATER, 0.01f);
1000	}	1010	}
1001		1011
1002	glBindTexture (GL_TEXTURE_2D, name);	1012	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		1013
1010	glBegin (GL_QUADS);	1014	glBegin (GL_QUADS);
1011	glTexCoord2f (0, 0); glVertex2f (x , y );	1015	glTexCoord2f (0, 0); glVertex2f (x , y );
1012	glTexCoord2f (0, t); glVertex2f (x , y + h);	1016	glTexCoord2f (0, t); glVertex2f (x , y + h);
1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1017	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1090	tex->r = r;	1094	tex->r = r;
1091	tex->g = g;	1095	tex->g = g;
1092	tex->b = b;	1096	tex->b = b;
1093	tex->a = a;	1097	tex->a = a;
1094	}	1098	}
		1099
		1100	// somewhat hackish, but for textures that require it, it really
		1101	// improves the look, and most others don't suffer.
		1102	glBindTexture (GL_TEXTURE_2D, name);
		1103	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		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);
1095	}	1108	}
1096		1109
1097	int	1110	int
1098	ox (CFClient::Map self)	1111	ox (CFClient::Map self)
1099	ALIAS:	1112	ALIAS:
1100	oy = 1	1113	oy = 1
		1114	x = 2
		1115	y = 3
		1116	w = 4
		1117	h = 5
1101	CODE:	1118	CODE:
1102	switch (ix)	1119	switch (ix)
1103	{	1120	{
1104	case 0: RETVAL = self->ox; break;	1121	case 0: RETVAL = self->ox; break;
1105	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;
1106	}	1127	}
1107	OUTPUT:	1128	OUTPUT:
1108	RETVAL	1129	RETVAL
1109		1130
1110	void	1131	void
…		…
1547	const_iv (GL_RESCALE_NORMAL),	1568	const_iv (GL_RESCALE_NORMAL),
1548	const_iv (GL_AND),	1569	const_iv (GL_AND),
1549	const_iv (GL_ONE),	1570	const_iv (GL_ONE),
1550	const_iv (GL_ZERO),	1571	const_iv (GL_ZERO),
1551	const_iv (GL_SRC_ALPHA),	1572	const_iv (GL_SRC_ALPHA),
1552	const_iv (GL_SRC_ALPHA_SATURATE),	1573	const_iv (GL_DST_ALPHA),
1553	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554	const_iv (GL_ONE_MINUS_DST_ALPHA),	1575	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1576	const_iv (GL_SRC_ALPHA_SATURATE),
1555	const_iv (GL_RGB),	1577	const_iv (GL_RGB),
1556	const_iv (GL_RGBA),	1578	const_iv (GL_RGBA),
1557	const_iv (GL_UNSIGNED_BYTE),	1579	const_iv (GL_UNSIGNED_BYTE),
1558	const_iv (GL_UNSIGNED_SHORT),	1580	const_iv (GL_UNSIGNED_SHORT),
1559	const_iv (GL_UNSIGNED_INT),	1581	const_iv (GL_UNSIGNED_INT),
…		…
1570	const_iv (GL_TEXTURE_MAG_FILTER),	1592	const_iv (GL_TEXTURE_MAG_FILTER),
1571	const_iv (GL_TEXTURE_MIN_FILTER),	1593	const_iv (GL_TEXTURE_MIN_FILTER),
1572	const_iv (GL_TEXTURE_ENV_MODE),	1594	const_iv (GL_TEXTURE_ENV_MODE),
1573	const_iv (GL_TEXTURE_WRAP_S),	1595	const_iv (GL_TEXTURE_WRAP_S),
1574	const_iv (GL_TEXTURE_WRAP_T),	1596	const_iv (GL_TEXTURE_WRAP_T),
		1597	const_iv (GL_REPEAT),
1575	const_iv (GL_CLAMP),	1598	const_iv (GL_CLAMP),
1576	const_iv (GL_REPEAT),	1599	const_iv (GL_CLAMP_TO_EDGE),
1577	const_iv (GL_NEAREST),	1600	const_iv (GL_NEAREST),
1578	const_iv (GL_LINEAR),	1601	const_iv (GL_LINEAR),
1579	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1602	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1603	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1604	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1611		1634
1612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1635	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1636	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614	}	1637	}
1615		1638
		1639	char *
		1640	gl_vendor ()
		1641	CODE:
		1642	RETVAL = (char *)glGetString (GL_VENDOR);
		1643	OUTPUT:
		1644	RETVAL
		1645
		1646	char *
		1647	gl_version ()
		1648	CODE:
		1649	RETVAL = (char *)glGetString (GL_VERSION);
		1650	OUTPUT:
		1651	RETVAL
		1652
		1653	char *
		1654	gl_extensions ()
		1655	CODE:
		1656	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1657	OUTPUT:
		1658	RETVAL
		1659
1616	int glGetError ()	1660	int glGetError ()
1617		1661
1618	void glClear (int mask)	1662	void glClear (int mask)
1619		1663
1620	void glClearColor (float r, float g, float b, float a = 1.0)	1664	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1627	void glShadeModel (int mode)	1671	void glShadeModel (int mode)
1628		1672
1629	void glHint (int target, int mode)	1673	void glHint (int target, int mode)
1630		1674
1631	void glBlendFunc (int sfactor, int dfactor)	1675	void glBlendFunc (int sfactor, int dfactor)
		1676
		1677	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1678	CODE:
		1679	gl_BlendFuncSeparate (sa, da, saa, daa);
1632		1680
1633	void glDepthMask (int flag)	1681	void glDepthMask (int flag)
1634		1682
1635	void glLogicOp (int opcode)	1683	void glLogicOp (int opcode)
1636		1684
…		…
1670		1718
1671	void glEnd ()	1719	void glEnd ()
1672		1720
1673	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)
1674	PROTOTYPE: @	1722	PROTOTYPE: @
		1723	ALIAS:
		1724	glColor_premultiply = 1
1675	CODE:	1725	CODE:
		1726	if (ix)
		1727	{
		1728	r *= a;
		1729	g *= a;
		1730	b *= a;
		1731	}
1676	// microsoft visual "c" rounds instead of truncating...	1732	// microsoft visual "c" rounds instead of truncating...
1677	glColor4ub (MIN ((int)(r * 255.f), 255),	1733	glColor4ub (MIN ((int)(r * 256.f), 255),
1678	MIN ((int)(g * 255.f), 255),	1734	MIN ((int)(g * 256.f), 255),
1679	MIN ((int)(b * 255.f), 255),	1735	MIN ((int)(b * 256.f), 255),
1680	MIN ((int)(a * 255.f), 255));	1736	MIN ((int)(a * 256.f), 255));
1681		1737
1682	void glInterleavedArrays (int format, int stride, char *data)	1738	void glInterleavedArrays (int format, int stride, char *data)
1683		1739
1684	void glDrawElements (int mode, int count, int type, char *indices)	1740	void glDrawElements (int mode, int count, int type, char *indices)
1685		1741
…		…
1708		1764
1709	void glBindTexture (int target, int name)	1765	void glBindTexture (int target, int name)
1710		1766
1711	void glConvolutionParameter (int target, int pname, float params)	1767	void glConvolutionParameter (int target, int pname, float params)
1712	CODE:	1768	CODE:
1713	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1769	if (gl.ConvolutionParameterf)
		1770	gl.ConvolutionParameterf (target, pname, params);
1714		1771
1715	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)
1716	CODE:	1773	CODE:
1717	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1774	if (gl.ConvolutionFilter2D)
1718	(target, internalformat, width, height, format, type, data));	1775	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719		1776
1720	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)
1721	CODE:	1778	CODE:
1722	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1779	if (gl.SeparableFilter2D)
1723	(target, internalformat, width, height, format, type, row, column));	1780	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724		1781
1725	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)
1726		1783
1727	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)
1728		1785

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