[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.105 by root, Mon Jun 5 03:33:09 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;
…		…
84		86
85	static void	87	static void
86	substitute_func (FcPattern *pattern, gpointer data)	88	substitute_func (FcPattern *pattern, gpointer data)
87	{	89	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	90	FcPatternAddBool (pattern, FC_HINTING , 1);
89	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	91	//FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	93	}
95		94
96	static void	95	static void
97	layout_update_font (CFClient__Layout self)	96	layout_update_font (CFClient__Layout self)
98	{	97	{
…		…
416	}	415	}
417		416
418	void	417	void
419	pango_init ()	418	pango_init ()
420	CODE:	419	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	420	// delayed, so it can pick up new fonts added by AddFontResourceEx
		421	{
		422	{
423	ft2_fontmap = pango_ft2_font_map_new ();	423	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	424	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);	425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
		426	}
426		427
		428	{
		429	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	430	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	431	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		432	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		433	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		434	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		435	pango_cairo_context_set_font_options (cairo_context, fopt);
		436	cairo_font_options_destroy (fopt);
		437	}
429	}	438	}
430		439
431	int	440	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	441	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		442
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	488	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	489	CODE:
481	RETVAL = !!SDL_SetVideoMode (	490	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	491	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	492	);
		493	if (RETVAL)
		494	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	495	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		496	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		497	# include "glfunc.h"
		498	# undef GL_FUNC
		499	}
485	OUTPUT:	500	OUTPUT:
486	RETVAL	501	RETVAL
487		502
488	void	503	void
489	SDL_GL_SwapBuffers ()	504	SDL_GL_SwapBuffers ()
		505
		506	char *
		507	SDL_GetKeyName (int sym)
490		508
491	void	509	void
492	SDL_PollEvent ()	510	SDL_PollEvent ()
493	PPCODE:	511	PPCODE:
494	{	512	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	531	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	532	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	533	break;
516		534
517	case SDL_MOUSEMOTION:	535	case SDL_MOUSEMOTION:
		536	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		537
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	538	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	539	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	540	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	541	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	542	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	543	break;
524		544
525	case SDL_MOUSEBUTTONDOWN:	545	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	546	case SDL_MOUSEBUTTONUP:
		547	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		548
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	549	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	550	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	551	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	552	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	553	break;
…		…
557	lowdelay (int fd, int val = 1)	579	lowdelay (int fd, int val = 1)
558	CODE:	580	CODE:
559	#ifndef _WIN32	581	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	582	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	583	#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		584
577	void	585	void
578	add_font (char *file)	586	add_font (char *file)
579	CODE:	587	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	588	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
717		725
718	CFClient::Layout	726	CFClient::Layout
719	new (SV *class, int rgba = 0)	727	new (SV *class, int rgba = 0)
720	CODE:	728	CODE:
721	#if _WIN32	729	#if _WIN32
722	rgba = 0;//D	730	//rgba = 0;//D makes text nicer, breaks TextView
723	#endif	731	#endif
		732	rgba=1;//D
724	New (0, RETVAL, 1, struct cf_layout);	733	New (0, RETVAL, 1, struct cf_layout);
725		734
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	735	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727	RETVAL->rgba = rgba;	736	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	737	RETVAL->r = 1.;
…		…
974	{	983	{
975	HV hv = (HV )SvRV (self);	984	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	985	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	986	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	987	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		988
981	if (items < 5)	989	if (items < 5)
982	{	990	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	991	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	992	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	993	}
986		994
987	if (ix)	995	if (ix)
988	{	996	{
989	glEnable (GL_BLEND);	997	glEnable (GL_BLEND);
		998
		999	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1000	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1001	else
		1002	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1003	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1004
991	glEnable (GL_ALPHA_TEST);	1005	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1006	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1007	}
994		1008
995	glBindTexture (GL_TEXTURE_2D, name);	1009	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		1010
1003	glBegin (GL_QUADS);	1011	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1012	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1013	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1014	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1083	tex->r = r;	1091	tex->r = r;
1084	tex->g = g;	1092	tex->g = g;
1085	tex->b = b;	1093	tex->b = b;
1086	tex->a = a;	1094	tex->a = a;
1087	}	1095	}
		1096
		1097	// somewhat hackish, but for textures that require it, it really
		1098	// improves the look, and most others don't suffer.
		1099	glBindTexture (GL_TEXTURE_2D, name);
		1100	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1101	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1102	// use uglier nearest interpolation because linear suffers
		1103	// from transparent color bleeding and ugly wrapping effects.
		1104	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1105	}
1089		1106
1090	int	1107	int
1091	ox (CFClient::Map self)	1108	ox (CFClient::Map self)
1092	ALIAS:	1109	ALIAS:
1093	oy = 1	1110	oy = 1
		1111	x = 2
		1112	y = 3
		1113	w = 4
		1114	h = 5
1094	CODE:	1115	CODE:
1095	switch (ix)	1116	switch (ix)
1096	{	1117	{
1097	case 0: RETVAL = self->ox; break;	1118	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1119	case 1: RETVAL = self->oy; break;
		1120	case 2: RETVAL = self->x; break;
		1121	case 3: RETVAL = self->y; break;
		1122	case 4: RETVAL = self->w; break;
		1123	case 5: RETVAL = self->h; break;
1099	}	1124	}
1100	OUTPUT:	1125	OUTPUT:
1101	RETVAL	1126	RETVAL
1102		1127
1103	void	1128	void
…		…
1540	const_iv (GL_RESCALE_NORMAL),	1565	const_iv (GL_RESCALE_NORMAL),
1541	const_iv (GL_AND),	1566	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1567	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1568	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1569	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1570	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1571	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1572	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1573	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1574	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1575	const_iv (GL_RGBA),
1550	const_iv (GL_UNSIGNED_BYTE),	1576	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1577	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1578	const_iv (GL_UNSIGNED_INT),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1589	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1590	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1591	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1592	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1593	const_iv (GL_TEXTURE_WRAP_T),
		1594	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1595	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1596	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1597	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1598	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1599	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1600	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1601	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1604		1631
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1632	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1633	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1634	}
1608		1635
		1636	char *
		1637	gl_vendor ()
		1638	CODE:
		1639	RETVAL = (char *)glGetString (GL_VENDOR);
		1640	OUTPUT:
		1641	RETVAL
		1642
		1643	char *
		1644	gl_version ()
		1645	CODE:
		1646	RETVAL = (char *)glGetString (GL_VERSION);
		1647	OUTPUT:
		1648	RETVAL
		1649
		1650	char *
		1651	gl_extensions ()
		1652	CODE:
		1653	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1654	OUTPUT:
		1655	RETVAL
		1656
1609	int glGetError ()	1657	int glGetError ()
1610		1658
1611	void glClear (int mask)	1659	void glClear (int mask)
1612		1660
1613	void glClearColor (float r, float g, float b, float a = 1.0)	1661	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1620	void glShadeModel (int mode)	1668	void glShadeModel (int mode)
1621		1669
1622	void glHint (int target, int mode)	1670	void glHint (int target, int mode)
1623		1671
1624	void glBlendFunc (int sfactor, int dfactor)	1672	void glBlendFunc (int sfactor, int dfactor)
		1673
		1674	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1675	CODE:
		1676	gl_BlendFuncSeparate (sa, da, saa, daa);
1625		1677
1626	void glDepthMask (int flag)	1678	void glDepthMask (int flag)
1627		1679
1628	void glLogicOp (int opcode)	1680	void glLogicOp (int opcode)
1629		1681
…		…
1663		1715
1664	void glEnd ()	1716	void glEnd ()
1665		1717
1666	void glColor (float r, float g, float b, float a = 1.0)	1718	void glColor (float r, float g, float b, float a = 1.0)
1667	PROTOTYPE: @	1719	PROTOTYPE: @
		1720	ALIAS:
		1721	glColor_premultiply = 1
1668	CODE:	1722	CODE:
		1723	if (ix)
		1724	{
		1725	r *= a;
		1726	g *= a;
		1727	b *= a;
		1728	}
1669	// microsoft visual "c" rounds instead of truncating...	1729	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	1730	glColor4ub (MIN ((int)(r * 256.f), 255),
1671	MIN ((int)(g * 255.f), 255),	1731	MIN ((int)(g * 256.f), 255),
1672	MIN ((int)(b * 255.f), 255),	1732	MIN ((int)(b * 256.f), 255),
1673	MIN ((int)(a * 255.f), 255));	1733	MIN ((int)(a * 256.f), 255));
1674		1734
1675	void glInterleavedArrays (int format, int stride, char *data)	1735	void glInterleavedArrays (int format, int stride, char *data)
1676		1736
1677	void glDrawElements (int mode, int count, int type, char *indices)	1737	void glDrawElements (int mode, int count, int type, char *indices)
1678		1738
…		…
1701		1761
1702	void glBindTexture (int target, int name)	1762	void glBindTexture (int target, int name)
1703		1763
1704	void glConvolutionParameter (int target, int pname, float params)	1764	void glConvolutionParameter (int target, int pname, float params)
1705	CODE:	1765	CODE:
1706	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1766	if (gl.ConvolutionParameterf)
		1767	gl.ConvolutionParameterf (target, pname, params);
1707		1768
1708	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1769	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1709	CODE:	1770	CODE:
1710	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1771	if (gl.ConvolutionFilter2D)
1711	(target, internalformat, width, height, format, type, data));	1772	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1712		1773
1713	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1774	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1714	CODE:	1775	CODE:
1715	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1776	if (gl.SeparableFilter2D)
1716	(target, internalformat, width, height, format, type, row, column));	1777	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1717		1778
1718	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1779	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1719		1780
1720	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1781	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1721		1782

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.105 by root, Mon Jun 5 03:33:09 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.105 by root, Mon Jun 5 03:33:09 2006 UTC