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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.86 by root, Fri May 19 16:43:56 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
…		…
441	SDL_Rect **m;	478	SDL_Rect **m;
442		479
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	480	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
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, 16);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		484
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	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);
…		…
470		507
471	++m;	508	++m;
472	}	509	}
473	}	510	}
474		511
		512	char *
		513	SDL_GetError ()
		514
475	int	515	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	517	CODE:
478	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	520	);
		521	if (RETVAL)
		522	{
481	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	}
482	OUTPUT:	528	OUTPUT:
483	RETVAL	529	RETVAL
484		530
485	void	531	void
486	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
487		536
488	void	537	void
489	SDL_PollEvent ()	538	SDL_PollEvent ()
490	PPCODE:	539	PPCODE:
491	{	540	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	561	break;
513		562
514	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
		564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		565
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	571	break;
521		572
522	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
		575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		576
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	581	break;
…		…
554	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
555	CODE:	608	CODE:
556	#ifndef _WIN32	609	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	611	#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		612
574	void	613	void
575	add_font (char *file)	614	add_font (char *file)
576	CODE:	615	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	673	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	674	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);	675	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
638	SDL_UnlockSurface (surface2);	677	SDL_UnlockSurface (surface2);
639	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)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
642		681
643	SDL_FreeSurface (surface);	682	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	683	SDL_FreeSurface (surface2);
…		…
682	CODE:	721	CODE:
683	fprintf (stderr, "FATAL: %s\n", message);	722	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	723	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#endif	725	#endif
687	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
688		732
689	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
690		734
691	CFClient::Font	735	CFClient::Font
692	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
766		810
767	SV *	811	SV *
768	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
769	CODE:	813	CODE:
770	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
772	OUTPUT:	816	OUTPUT:
773	RETVAL	817	RETVAL
774		818
775	void	819	void
776	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.)
…		…
902		946
903	while (p < e)	947	while (p < e)
904	{	948	{
905	uint32_t rgba = *p;	949	uint32_t rgba = *p;
906	rgba = (rgba >> 24) \| (rgba << 8);	950	rgba = (rgba >> 24) \| (rgba << 8);
		951	#if 0
		952	#ifdef _WIN32
		953	{//D
		954	uint8_t r = rgba >> 24;
		955	uint8_t g = rgba >> 16;
		956	uint8_t b = rgba >> 8;
		957	uint8_t a = rgba >> 0;
		958
		959	rgba = (rgba & 0xffffff00) \| a;
		960	}
		961	#endif
		962	#endif
907	rgba = SDL_SwapBE32 (rgba);	963	rgba = SDL_SwapBE32 (rgba);
908	*p++ = rgba;	964	*p++ = rgba;
909	}	965	}
910	}	966	}
911		967
912	EXTEND (SP, 5);	968	EXTEND (SP, 5);
913	PUSHs (sv_2mortal (newSViv (w)));	969	PUSHs (sv_2mortal (newSViv (w)));
914	PUSHs (sv_2mortal (newSViv (h)));	970	PUSHs (sv_2mortal (newSViv (h)));
915	PUSHs (sv_2mortal (retval));	971	PUSHs (sv_2mortal (retval));
916	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	972	PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918	}	974	}
919	else	975	else
920	{	976	{
921	FT_Bitmap bitmap;	977	FT_Bitmap bitmap;
…		…
945	}	1001	}
946		1002
947	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
948		1004
949	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
950	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.)
951	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
952	ALIAS:	1045	ALIAS:
953	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
954	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
955	CODE:	1048	CODE:
956	{	1049	{
957	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962		1054
963	if (items < 5)	1055	if (items < 5)
964	{	1056	{
965	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
966	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
967	}	1059	}
968		1060
969	if (ix)	1061	if (ix)
970	{	1062	{
971	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
972	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
973	glEnable (GL_ALPHA_TEST);	1071	glEnable (GL_ALPHA_TEST);
974	glAlphaFunc (GL_GREATER, 0.01f);	1072	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1073	}
976		1074
977	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1076
985	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1021	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
1022	CODE:	1114	CODE:
1023	{	1115	{
1024	map_clear (self);	1116	map_clear (self);
1025	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
1026	Safefree (self);	1119	Safefree (self);
1027	}	1120	}
1028		1121
1029	void	1122	void
1030	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1065	tex->r = r;	1158	tex->r = r;
1066	tex->g = g;	1159	tex->g = g;
1067	tex->b = b;	1160	tex->b = b;
1068	tex->a = a;	1161	tex->a = a;
1069	}	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);
1070	}	1172	}
1071		1173
1072	int	1174	int
1073	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1074	ALIAS:	1176	ALIAS:
1075	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1076	CODE:	1182	CODE:
1077	switch (ix)	1183	switch (ix)
1078	{	1184	{
1079	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1080	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;
1081	}	1191	}
1082	OUTPUT:	1192	OUTPUT:
1083	RETVAL	1193	RETVAL
1084		1194
1085	void	1195	void
…		…
1512	const_iv (GL_COLOR_MATERIAL),	1622	const_iv (GL_COLOR_MATERIAL),
1513	const_iv (GL_SMOOTH),	1623	const_iv (GL_SMOOTH),
1514	const_iv (GL_FLAT),	1624	const_iv (GL_FLAT),
1515	const_iv (GL_DITHER),	1625	const_iv (GL_DITHER),
1516	const_iv (GL_BLEND),	1626	const_iv (GL_BLEND),
		1627	const_iv (GL_CULL_FACE),
1517	const_iv (GL_SCISSOR_TEST),	1628	const_iv (GL_SCISSOR_TEST),
		1629	const_iv (GL_DEPTH_TEST),
		1630	const_iv (GL_ALPHA_TEST),
		1631	const_iv (GL_NORMALIZE),
		1632	const_iv (GL_RESCALE_NORMAL),
1518	const_iv (GL_AND),	1633	const_iv (GL_AND),
1519	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1520	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1521	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1522	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1525	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1526	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),
1527	const_iv (GL_UNSIGNED_BYTE),	1646	const_iv (GL_UNSIGNED_BYTE),
		1647	const_iv (GL_UNSIGNED_SHORT),
		1648	const_iv (GL_UNSIGNED_INT),
1528	const_iv (GL_ALPHA),	1649	const_iv (GL_ALPHA),
1529	const_iv (GL_INTENSITY),	1650	const_iv (GL_INTENSITY),
1530	const_iv (GL_LUMINANCE),	1651	const_iv (GL_LUMINANCE),
1531	const_iv (GL_LUMINANCE_ALPHA),	1652	const_iv (GL_LUMINANCE_ALPHA),
1532	const_iv (GL_FLOAT),	1653	const_iv (GL_FLOAT),
…		…
1538	const_iv (GL_TEXTURE_MAG_FILTER),	1659	const_iv (GL_TEXTURE_MAG_FILTER),
1539	const_iv (GL_TEXTURE_MIN_FILTER),	1660	const_iv (GL_TEXTURE_MIN_FILTER),
1540	const_iv (GL_TEXTURE_ENV_MODE),	1661	const_iv (GL_TEXTURE_ENV_MODE),
1541	const_iv (GL_TEXTURE_WRAP_S),	1662	const_iv (GL_TEXTURE_WRAP_S),
1542	const_iv (GL_TEXTURE_WRAP_T),	1663	const_iv (GL_TEXTURE_WRAP_T),
		1664	const_iv (GL_REPEAT),
1543	const_iv (GL_CLAMP),	1665	const_iv (GL_CLAMP),
1544	const_iv (GL_REPEAT),	1666	const_iv (GL_CLAMP_TO_EDGE),
1545	const_iv (GL_NEAREST),	1667	const_iv (GL_NEAREST),
1546	const_iv (GL_LINEAR),	1668	const_iv (GL_LINEAR),
1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1669	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1670	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1671	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1672	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551	const_iv (GL_GENERATE_MIPMAP),	1673	const_iv (GL_GENERATE_MIPMAP),
1552	const_iv (GL_MODULATE),	1674	const_iv (GL_MODULATE),
1553	const_iv (GL_DECAL),	1675	const_iv (GL_DECAL),
1554	const_iv (GL_REPLACE),	1676	const_iv (GL_REPLACE),
		1677	const_iv (GL_DEPTH_BUFFER_BIT),
1555	const_iv (GL_COLOR_BUFFER_BIT),	1678	const_iv (GL_COLOR_BUFFER_BIT),
1556	const_iv (GL_PROJECTION),	1679	const_iv (GL_PROJECTION),
1557	const_iv (GL_MODELVIEW),	1680	const_iv (GL_MODELVIEW),
1558	const_iv (GL_COLOR_LOGIC_OP),	1681	const_iv (GL_COLOR_LOGIC_OP),
1559	const_iv (GL_SEPARABLE_2D),	1682	const_iv (GL_SEPARABLE_2D),
1560	const_iv (GL_CONVOLUTION_2D),	1683	const_iv (GL_CONVOLUTION_2D),
1561	const_iv (GL_CONVOLUTION_BORDER_MODE),	1684	const_iv (GL_CONVOLUTION_BORDER_MODE),
1562	const_iv (GL_CONSTANT_BORDER),	1685	const_iv (GL_CONSTANT_BORDER),
1563	const_iv (GL_LINES),	1686	const_iv (GL_LINES),
		1687	const_iv (GL_LINE_LOOP),
1564	const_iv (GL_QUADS),	1688	const_iv (GL_QUADS),
1565	const_iv (GL_LINE_LOOP),	1689	const_iv (GL_QUAD_STRIP),
		1690	const_iv (GL_TRIANGLES),
		1691	const_iv (GL_TRIANGLE_STRIP),
		1692	const_iv (GL_TRIANGLE_FAN),
1566	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1693	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567	const_iv (GL_FASTEST),	1694	const_iv (GL_FASTEST),
		1695	const_iv (GL_V2F),
		1696	const_iv (GL_V3F),
		1697	const_iv (GL_T2F_V3F),
		1698	const_iv (GL_T2F_N3F_V3F),
1568	# undef const_iv	1699	# undef const_iv
1569	};	1700	};
1570		1701
1571	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; )
1572	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1703	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573	}	1704	}
1574		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
1575	int glGetError ()	1727	int glGetError ()
		1728
		1729	void glFinish ()
1576		1730
1577	void glClear (int mask)	1731	void glClear (int mask)
1578		1732
1579	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)
1580	PROTOTYPE: @	1734	PROTOTYPE: @
…		…
1587		1741
1588	void glHint (int target, int mode)	1742	void glHint (int target, int mode)
1589		1743
1590	void glBlendFunc (int sfactor, int dfactor)	1744	void glBlendFunc (int sfactor, int dfactor)
1591		1745
		1746	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1747	CODE:
		1748	gl_BlendFuncSeparate (sa, da, saa, daa);
		1749
		1750	void glDepthMask (int flag)
		1751
1592	void glLogicOp (int opcode)	1752	void glLogicOp (int opcode)
1593		1753
1594	void glColorMask (int red, int green, int blue, int alpha)	1754	void glColorMask (int red, int green, int blue, int alpha)
1595		1755
1596	void glMatrixMode (int mode)	1756	void glMatrixMode (int mode)
…		…
1599		1759
1600	void glPopMatrix ()	1760	void glPopMatrix ()
1601		1761
1602	void glLoadIdentity ()	1762	void glLoadIdentity ()
1603		1763
1604	# near and far are due to microsofts buggy c compiler	1764	# near_ and far_ are due to microsofts buggy "c" compiler
		1765	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1766
		1767	# near_ and far_ are due to microsofts buggy "c" compiler
1605	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1768	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606		1769
1607	void glViewport (int x, int y, int width, int height)	1770	void glViewport (int x, int y, int width, int height)
1608		1771
1609	void glScissor (int x, int y, int width, int height)	1772	void glScissor (int x, int y, int width, int height)
…		…
1624		1787
1625	void glEnd ()	1788	void glEnd ()
1626		1789
1627	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)
1628	PROTOTYPE: @	1791	PROTOTYPE: @
		1792	ALIAS:
		1793	glColor_premultiply = 1
1629	CODE:	1794	CODE:
		1795	if (ix)
		1796	{
		1797	r *= a;
		1798	g *= a;
		1799	b *= a;
		1800	}
		1801	// microsoft visual "c" rounds instead of truncating...
1630	glColor4ub (MIN ((int)(r * 255.f), 255),	1802	glColor4ub (MIN ((int)(r * 256.f), 255),
1631	MIN ((int)(g * 255.f), 255),	1803	MIN ((int)(g * 256.f), 255),
1632	MIN ((int)(b * 255.f), 255),	1804	MIN ((int)(b * 256.f), 255),
1633	MIN ((int)(a * 255.f), 255));	1805	MIN ((int)(a * 256.f), 255));
		1806
		1807	void glInterleavedArrays (int format, int stride, char *data)
		1808
		1809	void glDrawElements (int mode, int count, int type, char *indices)
		1810
		1811	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1812
		1813	void glRasterPos (float x, float y, float z = 0.)
		1814	CODE:
		1815	glRasterPos3f (0, 0, z);
		1816	glBitmap (0, 0, 0, 0, x, y, 0);
1634		1817
1635	void glVertex (float x, float y, float z = 0.)	1818	void glVertex (float x, float y, float z = 0.)
1636	CODE:	1819	CODE:
1637	glVertex3f (x, y, z);	1820	glVertex3f (x, y, z);
1638		1821
…		…
1650		1833
1651	void glBindTexture (int target, int name)	1834	void glBindTexture (int target, int name)
1652		1835
1653	void glConvolutionParameter (int target, int pname, float params)	1836	void glConvolutionParameter (int target, int pname, float params)
1654	CODE:	1837	CODE:
1655	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1838	if (gl.ConvolutionParameterf)
		1839	gl.ConvolutionParameterf (target, pname, params);
1656		1840
1657	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)
1658	CODE:	1842	CODE:
1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1843	if (gl.ConvolutionFilter2D)
1660	(target, internalformat, width, height, format, type, data));	1844	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661		1845
1662	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)
1663	CODE:	1847	CODE:
1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1848	if (gl.SeparableFilter2D)
1665	(target, internalformat, width, height, format, type, row, column));	1849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666		1850
1667	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)
1668		1852
1669	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)
1670		1854
1671	void glRasterPos (int x, int y)	1855	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672	CODE:
1673	glRasterPos2i (x, y);
1674		1856
1675	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1857	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676		1858
1677	int glGenTexture ()	1859	int glGenTexture ()
1678	CODE:	1860	CODE:
…		…
1705		1887
1706	void glEndList ()	1888	void glEndList ()
1707		1889
1708	void glCallList (int list)	1890	void glCallList (int list)
1709		1891
		1892

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.86 by root, Fri May 19 16:43:56 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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC