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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 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
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		484
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		487
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
…		…
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 ()
…		…
564	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
565	CODE:	608	CODE:
566	#ifndef _WIN32	609	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	611	#endif
569
570	char *
571	gl_vendor ()
572	CODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);
574	OUTPUT:
575	RETVAL
576
577	char *
578	gl_version ()
579	CODE:
580	RETVAL = (char *)glGetString (GL_VERSION);
581	OUTPUT:
582	RETVAL
583
584	char *
585	gl_extensions ()
586	CODE:
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);
588	OUTPUT:
589	RETVAL
590		612
591	void	613	void
592	add_font (char *file)	614	add_font (char *file)
593	CODE:	615	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	673	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	674	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);	675	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);	677	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	678	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA8 : GL_RGB8)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
659		681
660	SDL_FreeSurface (surface);	682	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	683	SDL_FreeSurface (surface2);
…		…
699	CODE:	721	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	722	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	723	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	725	#endif
704	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
705		732
706	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
707		734
708	CFClient::Font	735	CFClient::Font
709	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
730	MODULE = CFClient PACKAGE = CFClient::Layout	757	MODULE = CFClient PACKAGE = CFClient::Layout
731		758
732	CFClient::Layout	759	CFClient::Layout
733	new (SV *class, int rgba = 0)	760	new (SV *class, int rgba = 0)
734	CODE:	761	CODE:
735	#if _WIN32
736	rgba = 0;//D
737	#endif
738	New (0, RETVAL, 1, struct cf_layout);	762	New (0, RETVAL, 1, struct cf_layout);
739		763
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	764	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);
741	RETVAL->rgba = rgba;	765	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	766	RETVAL->r = 1.;
…		…
786		810
787	SV *	811	SV *
788	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
789	CODE:	813	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
792	OUTPUT:	816	OUTPUT:
793	RETVAL	817	RETVAL
794		818
795	void	819	void
796	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.)
…		…
943		967
944	EXTEND (SP, 5);	968	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));	969	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));	970	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));	971	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	972	PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	974	}
951	else	975	else
952	{	976	{
953	FT_Bitmap bitmap;	977	FT_Bitmap bitmap;
…		…
977	}	1001	}
978		1002
979	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
980		1004
981	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
982	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.)
983	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
984	ALIAS:	1045	ALIAS:
985	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
987	CODE:	1048	CODE:
988	{	1049	{
989	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1054
995	if (items < 5)	1055	if (items < 5)
996	{	1056	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1059	}
1000		1060
1001	if (ix)	1061	if (ix)
1002	{	1062	{
1003	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
1004	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
1005	glEnable (GL_ALPHA_TEST);	1071	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1072	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1073	}
1008		1074
1009	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1076
1017	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1053	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
1054	CODE:	1114	CODE:
1055	{	1115	{
1056	map_clear (self);	1116	map_clear (self);
1057	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
1058	Safefree (self);	1119	Safefree (self);
1059	}	1120	}
1060		1121
1061	void	1122	void
1062	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1097	tex->r = r;	1158	tex->r = r;
1098	tex->g = g;	1159	tex->g = g;
1099	tex->b = b;	1160	tex->b = b;
1100	tex->a = a;	1161	tex->a = a;
1101	}	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);
1102	}	1172	}
1103		1173
1104	int	1174	int
1105	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1106	ALIAS:	1176	ALIAS:
1107	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1108	CODE:	1182	CODE:
1109	switch (ix)	1183	switch (ix)
1110	{	1184	{
1111	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1112	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;
1113	}	1191	}
1114	OUTPUT:	1192	OUTPUT:
1115	RETVAL	1193	RETVAL
1116		1194
1117	void	1195	void
…		…
1554	const_iv (GL_RESCALE_NORMAL),	1632	const_iv (GL_RESCALE_NORMAL),
1555	const_iv (GL_AND),	1633	const_iv (GL_AND),
1556	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1557	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1558	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1559	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1562	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1563	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
		1643	const_iv (GL_RGBA4),
		1644	const_iv (GL_RGBA8),
		1645	const_iv (GL_RGB5_A1),
1564	const_iv (GL_UNSIGNED_BYTE),	1646	const_iv (GL_UNSIGNED_BYTE),
1565	const_iv (GL_UNSIGNED_SHORT),	1647	const_iv (GL_UNSIGNED_SHORT),
1566	const_iv (GL_UNSIGNED_INT),	1648	const_iv (GL_UNSIGNED_INT),
1567	const_iv (GL_ALPHA),	1649	const_iv (GL_ALPHA),
1568	const_iv (GL_INTENSITY),	1650	const_iv (GL_INTENSITY),
…		…
1577	const_iv (GL_TEXTURE_MAG_FILTER),	1659	const_iv (GL_TEXTURE_MAG_FILTER),
1578	const_iv (GL_TEXTURE_MIN_FILTER),	1660	const_iv (GL_TEXTURE_MIN_FILTER),
1579	const_iv (GL_TEXTURE_ENV_MODE),	1661	const_iv (GL_TEXTURE_ENV_MODE),
1580	const_iv (GL_TEXTURE_WRAP_S),	1662	const_iv (GL_TEXTURE_WRAP_S),
1581	const_iv (GL_TEXTURE_WRAP_T),	1663	const_iv (GL_TEXTURE_WRAP_T),
		1664	const_iv (GL_REPEAT),
1582	const_iv (GL_CLAMP),	1665	const_iv (GL_CLAMP),
1583	const_iv (GL_REPEAT),	1666	const_iv (GL_CLAMP_TO_EDGE),
1584	const_iv (GL_NEAREST),	1667	const_iv (GL_NEAREST),
1585	const_iv (GL_LINEAR),	1668	const_iv (GL_LINEAR),
1586	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1669	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1670	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1671	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1618		1701
1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1702	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1703	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621	}	1704	}
1622		1705
		1706	char *
		1707	gl_vendor ()
		1708	CODE:
		1709	RETVAL = (char *)glGetString (GL_VENDOR);
		1710	OUTPUT:
		1711	RETVAL
		1712
		1713	char *
		1714	gl_version ()
		1715	CODE:
		1716	RETVAL = (char *)glGetString (GL_VERSION);
		1717	OUTPUT:
		1718	RETVAL
		1719
		1720	char *
		1721	gl_extensions ()
		1722	CODE:
		1723	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1724	OUTPUT:
		1725	RETVAL
		1726
1623	int glGetError ()	1727	int glGetError ()
		1728
		1729	void glFinish ()
1624		1730
1625	void glClear (int mask)	1731	void glClear (int mask)
1626		1732
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1733	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1734	PROTOTYPE: @
…		…
1634	void glShadeModel (int mode)	1740	void glShadeModel (int mode)
1635		1741
1636	void glHint (int target, int mode)	1742	void glHint (int target, int mode)
1637		1743
1638	void glBlendFunc (int sfactor, int dfactor)	1744	void glBlendFunc (int sfactor, int dfactor)
		1745
		1746	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1747	CODE:
		1748	gl_BlendFuncSeparate (sa, da, saa, daa);
1639		1749
1640	void glDepthMask (int flag)	1750	void glDepthMask (int flag)
1641		1751
1642	void glLogicOp (int opcode)	1752	void glLogicOp (int opcode)
1643		1753
…		…
1677		1787
1678	void glEnd ()	1788	void glEnd ()
1679		1789
1680	void glColor (float r, float g, float b, float a = 1.0)	1790	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	1791	PROTOTYPE: @
		1792	ALIAS:
		1793	glColor_premultiply = 1
1682	CODE:	1794	CODE:
		1795	if (ix)
		1796	{
		1797	r *= a;
		1798	g *= a;
		1799	b *= a;
		1800	}
1683	// microsoft visual "c" rounds instead of truncating...	1801	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	1802	glColor4ub (MIN ((int)(r * 256.f), 255),
1685	MIN ((int)(g * 255.f), 255),	1803	MIN ((int)(g * 256.f), 255),
1686	MIN ((int)(b * 255.f), 255),	1804	MIN ((int)(b * 256.f), 255),
1687	MIN ((int)(a * 255.f), 255));	1805	MIN ((int)(a * 256.f), 255));
1688		1806
1689	void glInterleavedArrays (int format, int stride, char *data)	1807	void glInterleavedArrays (int format, int stride, char *data)
1690		1808
1691	void glDrawElements (int mode, int count, int type, char *indices)	1809	void glDrawElements (int mode, int count, int type, char *indices)
1692		1810
…		…
1715		1833
1716	void glBindTexture (int target, int name)	1834	void glBindTexture (int target, int name)
1717		1835
1718	void glConvolutionParameter (int target, int pname, float params)	1836	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	1837	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1838	if (gl.ConvolutionParameterf)
		1839	gl.ConvolutionParameterf (target, pname, params);
1721		1840
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1841	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	1842	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1843	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	1844	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		1845
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1846	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	1847	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1848	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	1849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		1850
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1851	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		1852
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1853	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		1854

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs. Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC