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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.107 by root, Mon Jun 5 05:23:19 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
…		…
441	SDL_Rect **m;	457	SDL_Rect **m;
442		458
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	459	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	460	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	461	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 16);	462	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		463
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	464	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	465	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
450		466
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	467	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	468	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	469	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	470	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
470		486
471	++m;	487	++m;
472	}	488	}
473	}	489	}
474		490
		491	char *
		492	SDL_GetError ()
		493
475	int	494	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	495	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	496	CODE:
478	RETVAL = !!SDL_SetVideoMode (	497	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	498	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	499	);
		500	if (RETVAL)
		501	{
481	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	}
482	OUTPUT:	507	OUTPUT:
483	RETVAL	508	RETVAL
484		509
485	void	510	void
486	SDL_GL_SwapBuffers ()	511	SDL_GL_SwapBuffers ()
		512
		513	char *
		514	SDL_GetKeyName (int sym)
487		515
488	void	516	void
489	SDL_PollEvent ()	517	SDL_PollEvent ()
490	PPCODE:	518	PPCODE:
491	{	519	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	538	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	539	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	540	break;
513		541
514	case SDL_MOUSEMOTION:	542	case SDL_MOUSEMOTION:
		543	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		544
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	545	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	546	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	547	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	548	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	549	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	550	break;
521		551
522	case SDL_MOUSEBUTTONDOWN:	552	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	553	case SDL_MOUSEBUTTONUP:
		554	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		555
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	556	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	557	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	558	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	559	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	560	break;
…		…
554	lowdelay (int fd, int val = 1)	586	lowdelay (int fd, int val = 1)
555	CODE:	587	CODE:
556	#ifndef _WIN32	588	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	589	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	590	#endif
559
560	char *
561	gl_version ()
562	CODE:
563	RETVAL = (char *)glGetString (GL_VERSION);
564	OUTPUT:
565	RETVAL
566
567	char *
568	gl_extensions ()
569	CODE:
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);
571	OUTPUT:
572	RETVAL
573		591
574	void	592	void
575	add_font (char *file)	593	add_font (char *file)
576	CODE:	594	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	595	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
713	MODULE = CFClient PACKAGE = CFClient::Layout	731	MODULE = CFClient PACKAGE = CFClient::Layout
714		732
715	CFClient::Layout	733	CFClient::Layout
716	new (SV *class, int rgba = 0)	734	new (SV *class, int rgba = 0)
717	CODE:	735	CODE:
718	#if _WIN32
719	rgba = 0;//D
720	#endif
721	New (0, RETVAL, 1, struct cf_layout);	736	New (0, RETVAL, 1, struct cf_layout);
722		737
723	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	738	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
724	RETVAL->rgba = rgba;	739	RETVAL->rgba = rgba;
725	RETVAL->r = 1.;	740	RETVAL->r = 1.;
…		…
769		784
770	SV *	785	SV *
771	get_text (CFClient::Layout self)	786	get_text (CFClient::Layout self)
772	CODE:	787	CODE:
773	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	788	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
774	SvUTF8_on (RETVAL);	789	sv_utf8_decode (RETVAL);
775	OUTPUT:	790	OUTPUT:
776	RETVAL	791	RETVAL
777		792
778	void	793	void
779	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	794	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
971	{	986	{
972	HV hv = (HV )SvRV (self);	987	HV hv = (HV )SvRV (self);
973	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	988	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	989	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	990	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977		991
978	if (items < 5)	992	if (items < 5)
979	{	993	{
980	w = SvNV (*hv_fetch (hv, "w", 1, 1));	994	w = SvNV (*hv_fetch (hv, "w", 1, 1));
981	h = SvNV (*hv_fetch (hv, "h", 1, 1));	995	h = SvNV (*hv_fetch (hv, "h", 1, 1));
982	}	996	}
983		997
984	if (ix)	998	if (ix)
985	{	999	{
986	glEnable (GL_BLEND);	1000	glEnable (GL_BLEND);
		1001
		1002	if (ix == 2)
987	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
988	glEnable (GL_ALPHA_TEST);	1008	glEnable (GL_ALPHA_TEST);
989	glAlphaFunc (GL_GREATER, 0.01f);	1009	glAlphaFunc (GL_GREATER, 0.01f);
990	}	1010	}
991		1011
992	glBindTexture (GL_TEXTURE_2D, name);	1012	glBindTexture (GL_TEXTURE_2D, name);
993
994	if (wrap_mode)
995	{
996	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998	}
999		1013
1000	glBegin (GL_QUADS);	1014	glBegin (GL_QUADS);
1001	glTexCoord2f (0, 0); glVertex2f (x , y );	1015	glTexCoord2f (0, 0); glVertex2f (x , y );
1002	glTexCoord2f (0, t); glVertex2f (x , y + h);	1016	glTexCoord2f (0, t); glVertex2f (x , y + h);
1003	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1017	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1080	tex->r = r;	1094	tex->r = r;
1081	tex->g = g;	1095	tex->g = g;
1082	tex->b = b;	1096	tex->b = b;
1083	tex->a = a;	1097	tex->a = a;
1084	}	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);
1085	}	1108	}
1086		1109
1087	int	1110	int
1088	ox (CFClient::Map self)	1111	ox (CFClient::Map self)
1089	ALIAS:	1112	ALIAS:
1090	oy = 1	1113	oy = 1
		1114	x = 2
		1115	y = 3
		1116	w = 4
		1117	h = 5
1091	CODE:	1118	CODE:
1092	switch (ix)	1119	switch (ix)
1093	{	1120	{
1094	case 0: RETVAL = self->ox; break;	1121	case 0: RETVAL = self->ox; break;
1095	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;
1096	}	1127	}
1097	OUTPUT:	1128	OUTPUT:
1098	RETVAL	1129	RETVAL
1099		1130
1100	void	1131	void
…		…
1527	const_iv (GL_COLOR_MATERIAL),	1558	const_iv (GL_COLOR_MATERIAL),
1528	const_iv (GL_SMOOTH),	1559	const_iv (GL_SMOOTH),
1529	const_iv (GL_FLAT),	1560	const_iv (GL_FLAT),
1530	const_iv (GL_DITHER),	1561	const_iv (GL_DITHER),
1531	const_iv (GL_BLEND),	1562	const_iv (GL_BLEND),
		1563	const_iv (GL_CULL_FACE),
1532	const_iv (GL_SCISSOR_TEST),	1564	const_iv (GL_SCISSOR_TEST),
		1565	const_iv (GL_DEPTH_TEST),
		1566	const_iv (GL_ALPHA_TEST),
		1567	const_iv (GL_NORMALIZE),
		1568	const_iv (GL_RESCALE_NORMAL),
1533	const_iv (GL_AND),	1569	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1570	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1571	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1572	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1573	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1574	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1575	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1576	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1577	const_iv (GL_RGB),
1541	const_iv (GL_RGBA),	1578	const_iv (GL_RGBA),
1542	const_iv (GL_UNSIGNED_BYTE),	1579	const_iv (GL_UNSIGNED_BYTE),
		1580	const_iv (GL_UNSIGNED_SHORT),
		1581	const_iv (GL_UNSIGNED_INT),
1543	const_iv (GL_ALPHA),	1582	const_iv (GL_ALPHA),
1544	const_iv (GL_INTENSITY),	1583	const_iv (GL_INTENSITY),
1545	const_iv (GL_LUMINANCE),	1584	const_iv (GL_LUMINANCE),
1546	const_iv (GL_LUMINANCE_ALPHA),	1585	const_iv (GL_LUMINANCE_ALPHA),
1547	const_iv (GL_FLOAT),	1586	const_iv (GL_FLOAT),
…		…
1553	const_iv (GL_TEXTURE_MAG_FILTER),	1592	const_iv (GL_TEXTURE_MAG_FILTER),
1554	const_iv (GL_TEXTURE_MIN_FILTER),	1593	const_iv (GL_TEXTURE_MIN_FILTER),
1555	const_iv (GL_TEXTURE_ENV_MODE),	1594	const_iv (GL_TEXTURE_ENV_MODE),
1556	const_iv (GL_TEXTURE_WRAP_S),	1595	const_iv (GL_TEXTURE_WRAP_S),
1557	const_iv (GL_TEXTURE_WRAP_T),	1596	const_iv (GL_TEXTURE_WRAP_T),
		1597	const_iv (GL_REPEAT),
1558	const_iv (GL_CLAMP),	1598	const_iv (GL_CLAMP),
1559	const_iv (GL_REPEAT),	1599	const_iv (GL_CLAMP_TO_EDGE),
1560	const_iv (GL_NEAREST),	1600	const_iv (GL_NEAREST),
1561	const_iv (GL_LINEAR),	1601	const_iv (GL_LINEAR),
1562	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1602	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1603	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1604	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1605	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566	const_iv (GL_GENERATE_MIPMAP),	1606	const_iv (GL_GENERATE_MIPMAP),
1567	const_iv (GL_MODULATE),	1607	const_iv (GL_MODULATE),
1568	const_iv (GL_DECAL),	1608	const_iv (GL_DECAL),
1569	const_iv (GL_REPLACE),	1609	const_iv (GL_REPLACE),
		1610	const_iv (GL_DEPTH_BUFFER_BIT),
1570	const_iv (GL_COLOR_BUFFER_BIT),	1611	const_iv (GL_COLOR_BUFFER_BIT),
1571	const_iv (GL_PROJECTION),	1612	const_iv (GL_PROJECTION),
1572	const_iv (GL_MODELVIEW),	1613	const_iv (GL_MODELVIEW),
1573	const_iv (GL_COLOR_LOGIC_OP),	1614	const_iv (GL_COLOR_LOGIC_OP),
1574	const_iv (GL_SEPARABLE_2D),	1615	const_iv (GL_SEPARABLE_2D),
1575	const_iv (GL_CONVOLUTION_2D),	1616	const_iv (GL_CONVOLUTION_2D),
1576	const_iv (GL_CONVOLUTION_BORDER_MODE),	1617	const_iv (GL_CONVOLUTION_BORDER_MODE),
1577	const_iv (GL_CONSTANT_BORDER),	1618	const_iv (GL_CONSTANT_BORDER),
1578	const_iv (GL_LINES),	1619	const_iv (GL_LINES),
		1620	const_iv (GL_LINE_LOOP),
1579	const_iv (GL_QUADS),	1621	const_iv (GL_QUADS),
1580	const_iv (GL_LINE_LOOP),	1622	const_iv (GL_QUAD_STRIP),
		1623	const_iv (GL_TRIANGLES),
		1624	const_iv (GL_TRIANGLE_STRIP),
		1625	const_iv (GL_TRIANGLE_FAN),
1581	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1626	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582	const_iv (GL_FASTEST),	1627	const_iv (GL_FASTEST),
		1628	const_iv (GL_V2F),
		1629	const_iv (GL_V3F),
		1630	const_iv (GL_T2F_V3F),
		1631	const_iv (GL_T2F_N3F_V3F),
1583	# undef const_iv	1632	# undef const_iv
1584	};	1633	};
1585		1634
1586	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; )
1587	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1636	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588	}	1637	}
1589		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
1590	int glGetError ()	1660	int glGetError ()
1591		1661
1592	void glClear (int mask)	1662	void glClear (int mask)
1593		1663
1594	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)
…		…
1602		1672
1603	void glHint (int target, int mode)	1673	void glHint (int target, int mode)
1604		1674
1605	void glBlendFunc (int sfactor, int dfactor)	1675	void glBlendFunc (int sfactor, int dfactor)
1606		1676
		1677	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1678	CODE:
		1679	gl_BlendFuncSeparate (sa, da, saa, daa);
		1680
		1681	void glDepthMask (int flag)
		1682
1607	void glLogicOp (int opcode)	1683	void glLogicOp (int opcode)
1608		1684
1609	void glColorMask (int red, int green, int blue, int alpha)	1685	void glColorMask (int red, int green, int blue, int alpha)
1610		1686
1611	void glMatrixMode (int mode)	1687	void glMatrixMode (int mode)
…		…
1614		1690
1615	void glPopMatrix ()	1691	void glPopMatrix ()
1616		1692
1617	void glLoadIdentity ()	1693	void glLoadIdentity ()
1618		1694
1619	# near and far are due to microsofts buggy c compiler	1695	# near_ and far_ are due to microsofts buggy "c" compiler
		1696	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1697
		1698	# near_ and far_ are due to microsofts buggy "c" compiler
1620	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1699	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1621		1700
1622	void glViewport (int x, int y, int width, int height)	1701	void glViewport (int x, int y, int width, int height)
1623		1702
1624	void glScissor (int x, int y, int width, int height)	1703	void glScissor (int x, int y, int width, int height)
…		…
1639		1718
1640	void glEnd ()	1719	void glEnd ()
1641		1720
1642	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)
1643	PROTOTYPE: @	1722	PROTOTYPE: @
		1723	ALIAS:
		1724	glColor_premultiply = 1
1644	CODE:	1725	CODE:
		1726	if (ix)
		1727	{
		1728	r *= a;
		1729	g *= a;
		1730	b *= a;
		1731	}
		1732	// microsoft visual "c" rounds instead of truncating...
1645	glColor4ub (MIN ((int)(r * 255.f), 255),	1733	glColor4ub (MIN ((int)(r * 256.f), 255),
1646	MIN ((int)(g * 255.f), 255),	1734	MIN ((int)(g * 256.f), 255),
1647	MIN ((int)(b * 255.f), 255),	1735	MIN ((int)(b * 256.f), 255),
1648	MIN ((int)(a * 255.f), 255));	1736	MIN ((int)(a * 256.f), 255));
		1737
		1738	void glInterleavedArrays (int format, int stride, char *data)
		1739
		1740	void glDrawElements (int mode, int count, int type, char *indices)
		1741
		1742	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1743
		1744	void glRasterPos (float x, float y, float z = 0.)
		1745	CODE:
		1746	glRasterPos3f (0, 0, z);
		1747	glBitmap (0, 0, 0, 0, x, y, 0);
1649		1748
1650	void glVertex (float x, float y, float z = 0.)	1749	void glVertex (float x, float y, float z = 0.)
1651	CODE:	1750	CODE:
1652	glVertex3f (x, y, z);	1751	glVertex3f (x, y, z);
1653		1752
…		…
1665		1764
1666	void glBindTexture (int target, int name)	1765	void glBindTexture (int target, int name)
1667		1766
1668	void glConvolutionParameter (int target, int pname, float params)	1767	void glConvolutionParameter (int target, int pname, float params)
1669	CODE:	1768	CODE:
1670	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1769	if (gl.ConvolutionParameterf)
		1770	gl.ConvolutionParameterf (target, pname, params);
1671		1771
1672	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)
1673	CODE:	1773	CODE:
1674	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1774	if (gl.ConvolutionFilter2D)
1675	(target, internalformat, width, height, format, type, data));	1775	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1676		1776
1677	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)
1678	CODE:	1778	CODE:
1679	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1779	if (gl.SeparableFilter2D)
1680	(target, internalformat, width, height, format, type, row, column));	1780	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1681		1781
1682	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)
1683		1783
1684	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)
1685		1785
1686	void glRasterPos (int x, int y)	1786	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687	CODE:
1688	glRasterPos2i (x, y);
1689		1787
1690	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1788	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1691		1789
1692	int glGenTexture ()	1790	int glGenTexture ()
1693	CODE:	1791	CODE:
…		…
1720		1818
1721	void glEndList ()	1819	void glEndList ()
1722		1820
1723	void glCallList (int list)	1821	void glCallList (int list)
1724		1822
		1823

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.107 by root, Mon Jun 5 05:23:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.107 by root, Mon Jun 5 05:23:19 2006 UTC