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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.109 by root, Wed Jun 7 23:29:13 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;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	85	static PangoFontMap ft2_fontmap, cairo_fontmap;
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);
		91	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
89	#ifdef _WIN32	92	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	93	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	94	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	95	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	96	#endif
…		…
416	}	419	}
417		420
418	void	421	void
419	pango_init ()	422	pango_init ()
420	CODE:	423	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	424	// delayed, so it can pick up new fonts added by AddFontResourceEx
		425	{
		426	{
423	ft2_fontmap = pango_ft2_font_map_new ();	427	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	428	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);	429	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		430	}
		431	{
		432	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	433	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	434	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		435	#ifdef _WIN32
		436	// cairo looks like shit eaten twice on windows
		437	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		438	#else
		439	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		440	#endif
		441	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		442	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		443	pango_cairo_context_set_font_options (cairo_context, fopt);
		444	cairo_font_options_destroy (fopt);
		445	}
429	}	446	}
430		447
431	int	448	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	449	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		450
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	496	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	497	CODE:
481	RETVAL = !!SDL_SetVideoMode (	498	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	499	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	500	);
		501	if (RETVAL)
		502	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	503	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		504	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		505	# include "glfunc.h"
		506	# undef GL_FUNC
		507	}
485	OUTPUT:	508	OUTPUT:
486	RETVAL	509	RETVAL
487		510
488	void	511	void
489	SDL_GL_SwapBuffers ()	512	SDL_GL_SwapBuffers ()
		513
		514	char *
		515	SDL_GetKeyName (int sym)
490		516
491	void	517	void
492	SDL_PollEvent ()	518	SDL_PollEvent ()
493	PPCODE:	519	PPCODE:
494	{	520	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	539	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	540	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	541	break;
516		542
517	case SDL_MOUSEMOTION:	543	case SDL_MOUSEMOTION:
		544	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		545
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	546	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	547	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	548	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	549	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	550	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	551	break;
524		552
525	case SDL_MOUSEBUTTONDOWN:	553	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	554	case SDL_MOUSEBUTTONUP:
		555	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		556
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	557	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	558	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	559	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	560	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	561	break;
…		…
557	lowdelay (int fd, int val = 1)	587	lowdelay (int fd, int val = 1)
558	CODE:	588	CODE:
559	#ifndef _WIN32	589	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	590	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	591	#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		592
577	void	593	void
578	add_font (char *file)	594	add_font (char *file)
579	CODE:	595	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	596	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
716	MODULE = CFClient PACKAGE = CFClient::Layout	732	MODULE = CFClient PACKAGE = CFClient::Layout
717		733
718	CFClient::Layout	734	CFClient::Layout
719	new (SV *class, int rgba = 0)	735	new (SV *class, int rgba = 0)
720	CODE:	736	CODE:
721	#if _WIN32
722	rgba = 0;//D
723	#endif
724	New (0, RETVAL, 1, struct cf_layout);	737	New (0, RETVAL, 1, struct cf_layout);
725		738
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	739	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727	RETVAL->rgba = rgba;	740	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	741	RETVAL->r = 1.;
…		…
772		785
773	SV *	786	SV *
774	get_text (CFClient::Layout self)	787	get_text (CFClient::Layout self)
775	CODE:	788	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	789	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	790	sv_utf8_decode (RETVAL);
778	OUTPUT:	791	OUTPUT:
779	RETVAL	792	RETVAL
780		793
781	void	794	void
782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	795	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
974	{	987	{
975	HV hv = (HV )SvRV (self);	988	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	989	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	990	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	991	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		992
981	if (items < 5)	993	if (items < 5)
982	{	994	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	995	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	996	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	997	}
986		998
987	if (ix)	999	if (ix)
988	{	1000	{
989	glEnable (GL_BLEND);	1001	glEnable (GL_BLEND);
		1002
		1003	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1004	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1005	else
		1006	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1007	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1008
991	glEnable (GL_ALPHA_TEST);	1009	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1010	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1011	}
994		1012
995	glBindTexture (GL_TEXTURE_2D, name);	1013	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		1014
1003	glBegin (GL_QUADS);	1015	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1016	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1017	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1018	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1083	tex->r = r;	1095	tex->r = r;
1084	tex->g = g;	1096	tex->g = g;
1085	tex->b = b;	1097	tex->b = b;
1086	tex->a = a;	1098	tex->a = a;
1087	}	1099	}
		1100
		1101	// somewhat hackish, but for textures that require it, it really
		1102	// improves the look, and most others don't suffer.
		1103	glBindTexture (GL_TEXTURE_2D, name);
		1104	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1105	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1106	// use uglier nearest interpolation because linear suffers
		1107	// from transparent color bleeding and ugly wrapping effects.
		1108	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1109	}
1089		1110
1090	int	1111	int
1091	ox (CFClient::Map self)	1112	ox (CFClient::Map self)
1092	ALIAS:	1113	ALIAS:
1093	oy = 1	1114	oy = 1
		1115	x = 2
		1116	y = 3
		1117	w = 4
		1118	h = 5
1094	CODE:	1119	CODE:
1095	switch (ix)	1120	switch (ix)
1096	{	1121	{
1097	case 0: RETVAL = self->ox; break;	1122	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1123	case 1: RETVAL = self->oy; break;
		1124	case 2: RETVAL = self->x; break;
		1125	case 3: RETVAL = self->y; break;
		1126	case 4: RETVAL = self->w; break;
		1127	case 5: RETVAL = self->h; break;
1099	}	1128	}
1100	OUTPUT:	1129	OUTPUT:
1101	RETVAL	1130	RETVAL
1102		1131
1103	void	1132	void
…		…
1540	const_iv (GL_RESCALE_NORMAL),	1569	const_iv (GL_RESCALE_NORMAL),
1541	const_iv (GL_AND),	1570	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1571	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1572	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1573	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1574	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1575	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1576	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1577	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1578	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1579	const_iv (GL_RGBA),
1550	const_iv (GL_UNSIGNED_BYTE),	1580	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1581	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1582	const_iv (GL_UNSIGNED_INT),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1593	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1594	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1595	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1596	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1597	const_iv (GL_TEXTURE_WRAP_T),
		1598	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1599	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1600	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1601	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1602	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1603	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1604	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1605	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1604		1635
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1636	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1637	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1638	}
1608		1639
		1640	char *
		1641	gl_vendor ()
		1642	CODE:
		1643	RETVAL = (char *)glGetString (GL_VENDOR);
		1644	OUTPUT:
		1645	RETVAL
		1646
		1647	char *
		1648	gl_version ()
		1649	CODE:
		1650	RETVAL = (char *)glGetString (GL_VERSION);
		1651	OUTPUT:
		1652	RETVAL
		1653
		1654	char *
		1655	gl_extensions ()
		1656	CODE:
		1657	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1658	OUTPUT:
		1659	RETVAL
		1660
1609	int glGetError ()	1661	int glGetError ()
1610		1662
1611	void glClear (int mask)	1663	void glClear (int mask)
1612		1664
1613	void glClearColor (float r, float g, float b, float a = 1.0)	1665	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1621		1673
1622	void glHint (int target, int mode)	1674	void glHint (int target, int mode)
1623		1675
1624	void glBlendFunc (int sfactor, int dfactor)	1676	void glBlendFunc (int sfactor, int dfactor)
1625		1677
		1678	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1679	CODE:
		1680	gl_BlendFuncSeparate (sa, da, saa, daa);
		1681
1626	void glDepthMask (int flag)	1682	void glDepthMask (int flag)
1627		1683
1628	void glLogicOp (int opcode)	1684	void glLogicOp (int opcode)
1629		1685
1630	void glColorMask (int red, int green, int blue, int alpha)	1686	void glColorMask (int red, int green, int blue, int alpha)
…		…
1635		1691
1636	void glPopMatrix ()	1692	void glPopMatrix ()
1637		1693
1638	void glLoadIdentity ()	1694	void glLoadIdentity ()
1639		1695
1640	# near and far are due to microsofts buggy c compiler	1696	# near_ and far_ are due to microsofts buggy "c" compiler
		1697	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1698
		1699	# near_ and far_ are due to microsofts buggy "c" compiler
1641	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1700	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1642		1701
1643	void glViewport (int x, int y, int width, int height)	1702	void glViewport (int x, int y, int width, int height)
1644		1703
1645	void glScissor (int x, int y, int width, int height)	1704	void glScissor (int x, int y, int width, int height)
…		…
1660		1719
1661	void glEnd ()	1720	void glEnd ()
1662		1721
1663	void glColor (float r, float g, float b, float a = 1.0)	1722	void glColor (float r, float g, float b, float a = 1.0)
1664	PROTOTYPE: @	1723	PROTOTYPE: @
		1724	ALIAS:
		1725	glColor_premultiply = 1
1665	CODE:	1726	CODE:
		1727	if (ix)
		1728	{
		1729	r *= a;
		1730	g *= a;
		1731	b *= a;
		1732	}
		1733	// microsoft visual "c" rounds instead of truncating...
1666	glColor4ub (MIN ((int)(r * 255.f), 255),	1734	glColor4ub (MIN ((int)(r * 256.f), 255),
1667	MIN ((int)(g * 255.f), 255),	1735	MIN ((int)(g * 256.f), 255),
1668	MIN ((int)(b * 255.f), 255),	1736	MIN ((int)(b * 256.f), 255),
1669	MIN ((int)(a * 255.f), 255));	1737	MIN ((int)(a * 256.f), 255));
1670		1738
1671	void glInterleavedArrays (int format, int stride, char *data)	1739	void glInterleavedArrays (int format, int stride, char *data)
1672		1740
1673	void glDrawElements (int mode, int count, int type, char *indices)	1741	void glDrawElements (int mode, int count, int type, char *indices)
1674		1742
1675	# 1.2 void glDrawRangeElements (int mode, int start, int end	1743	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1744
		1745	void glRasterPos (float x, float y, float z = 0.)
		1746	CODE:
		1747	glRasterPos3f (0, 0, z);
		1748	glBitmap (0, 0, 0, 0, x, y, 0);
1676		1749
1677	void glVertex (float x, float y, float z = 0.)	1750	void glVertex (float x, float y, float z = 0.)
1678	CODE:	1751	CODE:
1679	glVertex3f (x, y, z);	1752	glVertex3f (x, y, z);
1680		1753
…		…
1692		1765
1693	void glBindTexture (int target, int name)	1766	void glBindTexture (int target, int name)
1694		1767
1695	void glConvolutionParameter (int target, int pname, float params)	1768	void glConvolutionParameter (int target, int pname, float params)
1696	CODE:	1769	CODE:
1697	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1770	if (gl.ConvolutionParameterf)
		1771	gl.ConvolutionParameterf (target, pname, params);
1698		1772
1699	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1773	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1700	CODE:	1774	CODE:
1701	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1775	if (gl.ConvolutionFilter2D)
1702	(target, internalformat, width, height, format, type, data));	1776	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1703		1777
1704	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1778	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1705	CODE:	1779	CODE:
1706	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1780	if (gl.SeparableFilter2D)
1707	(target, internalformat, width, height, format, type, row, column));	1781	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1708		1782
1709	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1783	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1710		1784
1711	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1785	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1712		1786
1713	void glRasterPos (int x, int y)	1787	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1714	CODE:
1715	glRasterPos2i (x, y);
1716		1788
1717	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1789	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1718		1790
1719	int glGenTexture ()	1791	int glGenTexture ()
1720	CODE:	1792	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs. Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.109 by root, Wed Jun 7 23:29:13 2006 UTC