[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.113 by root, Wed Jun 14 16:20:21 2006 UTC

…		…
10	#include "XSUB.h"	10	#include "XSUB.h"
11		11
12	#include <math.h>	12	#include <math.h>
13	#include <string.h>	13	#include <string.h>
14	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
15		16
16	#include <SDL.h>	17	#include <SDL.h>
17	#include <SDL_endian.h>	18	#include <SDL_endian.h>
18	#include <SDL_image.h>	19	#include <SDL_image.h>
19	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
…		…
48	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
50		51
51	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
52		53
53	#define GL_CALL(type,func,args) \	54	static struct
54	{ \	55	{
55	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
56	static type fptr_; \	57	#include "glfunc.h"
57	\	58	#undef GL_FUNC
58	if (!init_) \	59	} gl;
59	{ \	60
60	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
62	} \	63	if (gl.BlendFuncSeparate)
63	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
64	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
65	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
66	}	67	else
		68	glBlendFunc (sa, da);
		69	}
67		70
68	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
70		73
71	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
84		87
85	static void	88	static void
86	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
87	{	90	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	91	FcPatternAddBool (pattern, FC_HINTING, 1);
		92	#ifdef FC_HINT_STYLE
		93	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		94	#endif
89	#ifdef _WIN32	95	#ifdef _WIN32
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
91	#else	97	#else
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif	99	#endif
…		…
294	ev.code = 1;	300	ev.code = 1;
295	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
296	ev.data2 = 0;	302	ev.data2 = 0;
297		303
298	SDL_PushEvent ((SDL_Event *)&ev);	304	SDL_PushEvent ((SDL_Event *)&ev);
		305	}
		306
		307	static unsigned int
		308	minpot (unsigned int n)
		309	{
		310	if (!n)
		311	return 0;
		312
		313	--n;
		314
		315	n \|= n >> 1;
		316	n \|= n >> 2;
		317	n \|= n >> 4;
		318	n \|= n >> 8;
		319	n \|= n >> 16;
		320
		321	return n + 1;
299	}	322	}
300		323
301	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
302		325
303	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
416	}	439	}
417		440
418	void	441	void
419	pango_init ()	442	pango_init ()
420	CODE:	443	CODE:
421	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx	444	// delayed, so it can pick up new fonts added by AddFontResourceEx
		445	{
		446	{
423	ft2_fontmap = pango_ft2_font_map_new ();	447	ft2_fontmap = pango_ft2_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	448	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);	449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
426		450	}
		451	{
		452	cairo_font_options_t *fopt = cairo_font_options_create ();
427	cairo_fontmap = pango_cairo_font_map_get_default ();	453	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);	454	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
		455	#ifdef _WIN32
		456	// cairo looks like shit eaten twice on windows
		457	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_NONE);
		458	#else
		459	cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
		460	#endif
		461	cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
		462	cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
		463	pango_cairo_context_set_font_options (cairo_context, fopt);
		464	cairo_font_options_destroy (fopt);
		465	}
429	}	466	}
430		467
431	int	468	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
433		470
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	517	CODE:
481	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	520	);
		521	if (RETVAL)
		522	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	523	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		524	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		525	# include "glfunc.h"
		526	# undef GL_FUNC
		527	}
485	OUTPUT:	528	OUTPUT:
486	RETVAL	529	RETVAL
487		530
488	void	531	void
489	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
490		536
491	void	537	void
492	SDL_PollEvent ()	538	SDL_PollEvent ()
493	PPCODE:	539	PPCODE:
494	{	540	{
…		…
513	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
514	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
515	break;	561	break;
516		562
517	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
		564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		565
518	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
519	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
520	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
521	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
522	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
523	break;	571	break;
524		572
525	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
526	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
		575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		576
527	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
528	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
529	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
530	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
531	break;	581	break;
…		…
557	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
558	CODE:	608	CODE:
559	#ifndef _WIN32	609	#ifndef _WIN32
560	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
561	#endif	611	#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		612
577	void	613	void
578	add_font (char *file)	614	add_font (char *file)
579	CODE:	615	CODE:
580	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
685	CODE:	721	CODE:
686	fprintf (stderr, "FATAL: %s\n", message);	722	fprintf (stderr, "FATAL: %s\n", message);
687	#ifdef _WIN32	723	#ifdef _WIN32
688	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
689	#endif	725	#endif
690	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
691		732
692	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
693		734
694	CFClient::Font	735	CFClient::Font
695	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
716	MODULE = CFClient PACKAGE = CFClient::Layout	757	MODULE = CFClient PACKAGE = CFClient::Layout
717		758
718	CFClient::Layout	759	CFClient::Layout
719	new (SV *class, int rgba = 0)	760	new (SV *class, int rgba = 0)
720	CODE:	761	CODE:
721	#if _WIN32
722	rgba = 0;//D
723	#endif
724	New (0, RETVAL, 1, struct cf_layout);	762	New (0, RETVAL, 1, struct cf_layout);
725		763
726	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
727	RETVAL->rgba = rgba;	765	RETVAL->rgba = rgba;
728	RETVAL->r = 1.;	766	RETVAL->r = 1.;
…		…
772		810
773	SV *	811	SV *
774	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
775	CODE:	813	CODE:
776	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
777	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
778	OUTPUT:	816	OUTPUT:
779	RETVAL	817	RETVAL
780		818
781	void	819	void
782	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	820	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)
…		…
963	}	1001	}
964		1002
965	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
966		1004
967	void	1005	void
		1006	pad2pot (SV data_, SV w_, SV *h_)
		1007	CODE:
		1008	{
		1009	int ow = SvIV (w_);
		1010	int oh = SvIV (h_);
		1011
		1012	if (ow && oh)
		1013	{
		1014	int nw = minpot (ow);
		1015	int nh = minpot (oh);
		1016
		1017	if (nw != ow \|\| nh != oh)
		1018	{
		1019	if (SvOK (data_))
		1020	{
		1021	STRLEN datalen;
		1022	char *data = SvPVbyte (data_, datalen);
		1023	int bpp = datalen / (ow * oh);
		1024	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1025
		1026	SvPOK_only (result_);
		1027	SvCUR_set (result_, nw * nh * bpp);
		1028
		1029	memset (SvPVX (result_), 0, nw * nh * bpp);
		1030	while (oh--)
		1031	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1032
		1033	sv_setsv (data_, result_);
		1034	}
		1035
		1036	sv_setiv (w_, nw);
		1037	sv_setiv (h_, nh);
		1038	}
		1039	}
		1040	}
		1041
		1042	void
968	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1043	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)
969	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
970	ALIAS:	1045	ALIAS:
971	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
972	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
…		…
974	{	1049	{
975	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
976	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
977	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
978	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
979	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
980		1054
981	if (items < 5)	1055	if (items < 5)
982	{	1056	{
983	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
984	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
985	}	1059	}
986		1060
987	if (ix)	1061	if (ix)
988	{	1062	{
989	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
990	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1066	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1067	else
		1068	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1069	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1070
991	glEnable (GL_ALPHA_TEST);	1071	glEnable (GL_ALPHA_TEST);
992	glAlphaFunc (GL_GREATER, 0.01f);	1072	glAlphaFunc (GL_GREATER, 0.01f);
993	}	1073	}
994		1074
995	glBindTexture (GL_TEXTURE_2D, name);	1075	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		1076
1003	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
1004	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
1005	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
1006	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1039	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
1040	CODE:	1114	CODE:
1041	{	1115	{
1042	map_clear (self);	1116	map_clear (self);
1043	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
1044	Safefree (self);	1119	Safefree (self);
1045	}	1120	}
1046		1121
1047	void	1122	void
1048	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1083	tex->r = r;	1158	tex->r = r;
1084	tex->g = g;	1159	tex->g = g;
1085	tex->b = b;	1160	tex->b = b;
1086	tex->a = a;	1161	tex->a = a;
1087	}	1162	}
		1163
		1164	// somewhat hackish, but for textures that require it, it really
		1165	// improves the look, and most others don't suffer.
		1166	glBindTexture (GL_TEXTURE_2D, name);
		1167	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1168	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1169	// use uglier nearest interpolation because linear suffers
		1170	// from transparent color bleeding and ugly wrapping effects.
		1171	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1088	}	1172	}
1089		1173
1090	int	1174	int
1091	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1092	ALIAS:	1176	ALIAS:
1093	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1094	CODE:	1182	CODE:
1095	switch (ix)	1183	switch (ix)
1096	{	1184	{
1097	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1098	case 1: RETVAL = self->oy; break;	1186	case 1: RETVAL = self->oy; break;
		1187	case 2: RETVAL = self->x; break;
		1188	case 3: RETVAL = self->y; break;
		1189	case 4: RETVAL = self->w; break;
		1190	case 5: RETVAL = self->h; break;
1099	}	1191	}
1100	OUTPUT:	1192	OUTPUT:
1101	RETVAL	1193	RETVAL
1102		1194
1103	void	1195	void
…		…
1540	const_iv (GL_RESCALE_NORMAL),	1632	const_iv (GL_RESCALE_NORMAL),
1541	const_iv (GL_AND),	1633	const_iv (GL_AND),
1542	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1543	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1544	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1545	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1546	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1547	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1548	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1549	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
1550	const_iv (GL_UNSIGNED_BYTE),	1643	const_iv (GL_UNSIGNED_BYTE),
1551	const_iv (GL_UNSIGNED_SHORT),	1644	const_iv (GL_UNSIGNED_SHORT),
1552	const_iv (GL_UNSIGNED_INT),	1645	const_iv (GL_UNSIGNED_INT),
…		…
1563	const_iv (GL_TEXTURE_MAG_FILTER),	1656	const_iv (GL_TEXTURE_MAG_FILTER),
1564	const_iv (GL_TEXTURE_MIN_FILTER),	1657	const_iv (GL_TEXTURE_MIN_FILTER),
1565	const_iv (GL_TEXTURE_ENV_MODE),	1658	const_iv (GL_TEXTURE_ENV_MODE),
1566	const_iv (GL_TEXTURE_WRAP_S),	1659	const_iv (GL_TEXTURE_WRAP_S),
1567	const_iv (GL_TEXTURE_WRAP_T),	1660	const_iv (GL_TEXTURE_WRAP_T),
		1661	const_iv (GL_REPEAT),
1568	const_iv (GL_CLAMP),	1662	const_iv (GL_CLAMP),
1569	const_iv (GL_REPEAT),	1663	const_iv (GL_CLAMP_TO_EDGE),
1570	const_iv (GL_NEAREST),	1664	const_iv (GL_NEAREST),
1571	const_iv (GL_LINEAR),	1665	const_iv (GL_LINEAR),
1572	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1666	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1573	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1667	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1574	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1668	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1604		1698
1605	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1699	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1606	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1700	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1607	}	1701	}
1608		1702
		1703	char *
		1704	gl_vendor ()
		1705	CODE:
		1706	RETVAL = (char *)glGetString (GL_VENDOR);
		1707	OUTPUT:
		1708	RETVAL
		1709
		1710	char *
		1711	gl_version ()
		1712	CODE:
		1713	RETVAL = (char *)glGetString (GL_VERSION);
		1714	OUTPUT:
		1715	RETVAL
		1716
		1717	char *
		1718	gl_extensions ()
		1719	CODE:
		1720	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1721	OUTPUT:
		1722	RETVAL
		1723
1609	int glGetError ()	1724	int glGetError ()
1610		1725
1611	void glClear (int mask)	1726	void glClear (int mask)
1612		1727
1613	void glClearColor (float r, float g, float b, float a = 1.0)	1728	void glClearColor (float r, float g, float b, float a = 1.0)
…		…
1620	void glShadeModel (int mode)	1735	void glShadeModel (int mode)
1621		1736
1622	void glHint (int target, int mode)	1737	void glHint (int target, int mode)
1623		1738
1624	void glBlendFunc (int sfactor, int dfactor)	1739	void glBlendFunc (int sfactor, int dfactor)
		1740
		1741	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1742	CODE:
		1743	gl_BlendFuncSeparate (sa, da, saa, daa);
1625		1744
1626	void glDepthMask (int flag)	1745	void glDepthMask (int flag)
1627		1746
1628	void glLogicOp (int opcode)	1747	void glLogicOp (int opcode)
1629		1748
…		…
1663		1782
1664	void glEnd ()	1783	void glEnd ()
1665		1784
1666	void glColor (float r, float g, float b, float a = 1.0)	1785	void glColor (float r, float g, float b, float a = 1.0)
1667	PROTOTYPE: @	1786	PROTOTYPE: @
		1787	ALIAS:
		1788	glColor_premultiply = 1
1668	CODE:	1789	CODE:
		1790	if (ix)
		1791	{
		1792	r *= a;
		1793	g *= a;
		1794	b *= a;
		1795	}
1669	// microsoft visual "c" rounds instead of truncating...	1796	// microsoft visual "c" rounds instead of truncating...
1670	glColor4ub (MIN ((int)(r * 255.f), 255),	1797	glColor4ub (MIN ((int)(r * 256.f), 255),
1671	MIN ((int)(g * 255.f), 255),	1798	MIN ((int)(g * 256.f), 255),
1672	MIN ((int)(b * 255.f), 255),	1799	MIN ((int)(b * 256.f), 255),
1673	MIN ((int)(a * 255.f), 255));	1800	MIN ((int)(a * 256.f), 255));
1674		1801
1675	void glInterleavedArrays (int format, int stride, char *data)	1802	void glInterleavedArrays (int format, int stride, char *data)
1676		1803
1677	void glDrawElements (int mode, int count, int type, char *indices)	1804	void glDrawElements (int mode, int count, int type, char *indices)
1678		1805
…		…
1701		1828
1702	void glBindTexture (int target, int name)	1829	void glBindTexture (int target, int name)
1703		1830
1704	void glConvolutionParameter (int target, int pname, float params)	1831	void glConvolutionParameter (int target, int pname, float params)
1705	CODE:	1832	CODE:
1706	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1833	if (gl.ConvolutionParameterf)
		1834	gl.ConvolutionParameterf (target, pname, params);
1707		1835
1708	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1836	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1709	CODE:	1837	CODE:
1710	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1838	if (gl.ConvolutionFilter2D)
1711	(target, internalformat, width, height, format, type, data));	1839	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1712		1840
1713	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1841	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1714	CODE:	1842	CODE:
1715	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1843	if (gl.SeparableFilter2D)
1716	(target, internalformat, width, height, format, type, row, column));	1844	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1717		1845
1718	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1846	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1719		1847
1720	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1848	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1721		1849

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.113 by root, Wed Jun 14 16:20:21 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.113 by root, Wed Jun 14 16:20:21 2006 UTC