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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.114 by root, Wed Jun 14 18:02:00 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
…		…
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, 1);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		484
		485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		487
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		492
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
456		494
457	SDL_EnableUNICODE (1);	495	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		497
460	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
469		507
470	++m;	508	++m;
471	}	509	}
472	}	510	}
473		511
		512	char *
		513	SDL_GetError ()
		514
474	int	515	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	517	CODE:
477	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
479	);	520	);
		521	if (RETVAL)
		522	{
480	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	}
481	OUTPUT:	528	OUTPUT:
482	RETVAL	529	RETVAL
483		530
484	void	531	void
485	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
486		536
487	void	537	void
488	SDL_PollEvent ()	538	SDL_PollEvent ()
489	PPCODE:	539	PPCODE:
490	{	540	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	561	break;
512		562
513	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
		564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		565
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	571	break;
520		572
521	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
		575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		576
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	581	break;
…		…
553	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
554	CODE:	608	CODE:
555	#ifndef _WIN32	609	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	611	#endif
558
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572		612
573	void	613	void
574	add_font (char *file)	614	add_font (char *file)
575	CODE:	615	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
669	}	709	}
670		710
671	void	711	void
672	error (char *message)	712	error (char *message)
673	CODE:	713	CODE:
		714	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	715	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	716	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	717	#endif
679		718
680	void	719	void
681	fatal (char *message)	720	fatal (char *message)
682	CODE:	721	CODE:
		722	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	723	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	725	#endif
688	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
689		732
690	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
691		734
692	CFClient::Font	735	CFClient::Font
693	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
767		810
768	SV *	811	SV *
769	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
770	CODE:	813	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
773	OUTPUT:	816	OUTPUT:
774	RETVAL	817	RETVAL
775		818
776	void	819	void
777	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.)
…		…
803	set_width (CFClient::Layout self, int max_width = -1)	846	set_width (CFClient::Layout self, int max_width = -1)
804	CODE:	847	CODE:
805	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	848	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
806		849
807	void	850	void
		851	set_indent (CFClient::Layout self, int indent)
		852	CODE:
		853	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		854
		855	void
		856	set_spacing (CFClient::Layout self, int spacing)
		857	CODE:
		858	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		859
		860	void
		861	set_ellipsise (CFClient::Layout self, int ellipsise)
		862	CODE:
		863	pango_layout_set_ellipsize (self->pl,
		864	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		865	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		866	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		867	: PANGO_ELLIPSIZE_NONE
		868	);
		869
		870	void
		871	set_single_paragraph_mode (CFClient::Layout self, int spm)
		872	CODE:
		873	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		874
		875	void
808	size (CFClient::Layout self)	876	size (CFClient::Layout self)
809	PPCODE:	877	PPCODE:
810	{	878	{
811	int w, h;	879	int w, h;
812		880
…		…
878		946
879	while (p < e)	947	while (p < e)
880	{	948	{
881	uint32_t rgba = *p;	949	uint32_t rgba = *p;
882	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
883	rgba = SDL_SwapBE32 (rgba);	963	rgba = SDL_SwapBE32 (rgba);
884	*p++ = rgba;	964	*p++ = rgba;
885	}	965	}
886	}	966	}
887		967
…		…
921	}	1001	}
922		1002
923	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
924		1004
925	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
926	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.)
927	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
928	ALIAS:	1045	ALIAS:
929	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
930	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
931	CODE:	1048	CODE:
932	{	1049	{
933	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
936	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
937	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
938		1054
939	if (items < 5)	1055	if (items < 5)
940	{	1056	{
941	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
942	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
943	}	1059	}
944		1060
945	if (ix)	1061	if (ix)
946	{	1062	{
947	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
948	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
		1071	glEnable (GL_ALPHA_TEST);
		1072	glAlphaFunc (GL_GREATER, 0.01f);
949	}	1073	}
950		1074
951	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
952
953	if (wrap_mode)
954	{
955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
957	}
958		1076
959	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
960	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
961	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1081	glTexCoord2f (s, 0); glVertex2f (x + w, y );
964	glEnd ();	1082	glEnd ();
965		1083
966	if (ix)	1084	if (ix)
		1085	{
		1086	glDisable (GL_ALPHA_TEST);
967	glDisable (GL_BLEND);	1087	glDisable (GL_BLEND);
		1088	}
968	}	1089	}
969		1090
970	MODULE = CFClient PACKAGE = CFClient::Map	1091	MODULE = CFClient PACKAGE = CFClient::Map
971		1092
972	CFClient::Map	1093	CFClient::Map
…		…
992	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
993	CODE:	1114	CODE:
994	{	1115	{
995	map_clear (self);	1116	map_clear (self);
996	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
997	Safefree (self);	1119	Safefree (self);
998	}	1120	}
999		1121
1000	void	1122	void
1001	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1036	tex->r = r;	1158	tex->r = r;
1037	tex->g = g;	1159	tex->g = g;
1038	tex->b = b;	1160	tex->b = b;
1039	tex->a = a;	1161	tex->a = a;
1040	}	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);
1041	}	1172	}
1042		1173
1043	int	1174	int
1044	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1045	ALIAS:	1176	ALIAS:
1046	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1047	CODE:	1182	CODE:
1048	switch (ix)	1183	switch (ix)
1049	{	1184	{
1050	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1051	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;
1052	}	1191	}
1053	OUTPUT:	1192	OUTPUT:
1054	RETVAL	1193	RETVAL
1055		1194
1056	void	1195	void
…		…
1483	const_iv (GL_COLOR_MATERIAL),	1622	const_iv (GL_COLOR_MATERIAL),
1484	const_iv (GL_SMOOTH),	1623	const_iv (GL_SMOOTH),
1485	const_iv (GL_FLAT),	1624	const_iv (GL_FLAT),
1486	const_iv (GL_DITHER),	1625	const_iv (GL_DITHER),
1487	const_iv (GL_BLEND),	1626	const_iv (GL_BLEND),
		1627	const_iv (GL_CULL_FACE),
1488	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),
1489	const_iv (GL_AND),	1633	const_iv (GL_AND),
1490	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1491	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1492	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1493	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1496	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1497	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
1498	const_iv (GL_UNSIGNED_BYTE),	1643	const_iv (GL_UNSIGNED_BYTE),
		1644	const_iv (GL_UNSIGNED_SHORT),
		1645	const_iv (GL_UNSIGNED_INT),
1499	const_iv (GL_ALPHA),	1646	const_iv (GL_ALPHA),
		1647	const_iv (GL_INTENSITY),
1500	const_iv (GL_LUMINANCE),	1648	const_iv (GL_LUMINANCE),
		1649	const_iv (GL_LUMINANCE_ALPHA),
1501	const_iv (GL_FLOAT),	1650	const_iv (GL_FLOAT),
1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1651	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503	const_iv (GL_COMPILE),	1652	const_iv (GL_COMPILE),
1504	const_iv (GL_TEXTURE_1D),	1653	const_iv (GL_TEXTURE_1D),
1505	const_iv (GL_TEXTURE_2D),	1654	const_iv (GL_TEXTURE_2D),
…		…
1507	const_iv (GL_TEXTURE_MAG_FILTER),	1656	const_iv (GL_TEXTURE_MAG_FILTER),
1508	const_iv (GL_TEXTURE_MIN_FILTER),	1657	const_iv (GL_TEXTURE_MIN_FILTER),
1509	const_iv (GL_TEXTURE_ENV_MODE),	1658	const_iv (GL_TEXTURE_ENV_MODE),
1510	const_iv (GL_TEXTURE_WRAP_S),	1659	const_iv (GL_TEXTURE_WRAP_S),
1511	const_iv (GL_TEXTURE_WRAP_T),	1660	const_iv (GL_TEXTURE_WRAP_T),
		1661	const_iv (GL_REPEAT),
1512	const_iv (GL_CLAMP),	1662	const_iv (GL_CLAMP),
1513	const_iv (GL_REPEAT),	1663	const_iv (GL_CLAMP_TO_EDGE),
1514	const_iv (GL_NEAREST),	1664	const_iv (GL_NEAREST),
1515	const_iv (GL_LINEAR),	1665	const_iv (GL_LINEAR),
1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1666	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1667	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1668	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1669	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520	const_iv (GL_GENERATE_MIPMAP),	1670	const_iv (GL_GENERATE_MIPMAP),
1521	const_iv (GL_MODULATE),	1671	const_iv (GL_MODULATE),
1522	const_iv (GL_DECAL),	1672	const_iv (GL_DECAL),
1523	const_iv (GL_REPLACE),	1673	const_iv (GL_REPLACE),
		1674	const_iv (GL_DEPTH_BUFFER_BIT),
1524	const_iv (GL_COLOR_BUFFER_BIT),	1675	const_iv (GL_COLOR_BUFFER_BIT),
1525	const_iv (GL_PROJECTION),	1676	const_iv (GL_PROJECTION),
1526	const_iv (GL_MODELVIEW),	1677	const_iv (GL_MODELVIEW),
1527	const_iv (GL_COLOR_LOGIC_OP),	1678	const_iv (GL_COLOR_LOGIC_OP),
1528	const_iv (GL_SEPARABLE_2D),	1679	const_iv (GL_SEPARABLE_2D),
1529	const_iv (GL_CONVOLUTION_2D),	1680	const_iv (GL_CONVOLUTION_2D),
1530	const_iv (GL_CONVOLUTION_BORDER_MODE),	1681	const_iv (GL_CONVOLUTION_BORDER_MODE),
1531	const_iv (GL_CONSTANT_BORDER),	1682	const_iv (GL_CONSTANT_BORDER),
1532	const_iv (GL_LINES),	1683	const_iv (GL_LINES),
		1684	const_iv (GL_LINE_LOOP),
1533	const_iv (GL_QUADS),	1685	const_iv (GL_QUADS),
1534	const_iv (GL_LINE_LOOP),	1686	const_iv (GL_QUAD_STRIP),
		1687	const_iv (GL_TRIANGLES),
		1688	const_iv (GL_TRIANGLE_STRIP),
		1689	const_iv (GL_TRIANGLE_FAN),
1535	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1690	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536	const_iv (GL_FASTEST),	1691	const_iv (GL_FASTEST),
		1692	const_iv (GL_V2F),
		1693	const_iv (GL_V3F),
		1694	const_iv (GL_T2F_V3F),
		1695	const_iv (GL_T2F_N3F_V3F),
1537	# undef const_iv	1696	# undef const_iv
1538	};	1697	};
1539		1698
1540	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; )
1541	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1700	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1542	}	1701	}
1543		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
1544	int glGetError ()	1724	int glGetError ()
		1725
		1726	void glFinish ()
1545		1727
1546	void glClear (int mask)	1728	void glClear (int mask)
1547		1729
1548	void glClearColor (float r, float g, float b, float a = 1.0)	1730	void glClearColor (float r, float g, float b, float a = 1.0)
1549	PROTOTYPE: @	1731	PROTOTYPE: @
…		…
1556		1738
1557	void glHint (int target, int mode)	1739	void glHint (int target, int mode)
1558		1740
1559	void glBlendFunc (int sfactor, int dfactor)	1741	void glBlendFunc (int sfactor, int dfactor)
1560		1742
		1743	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1744	CODE:
		1745	gl_BlendFuncSeparate (sa, da, saa, daa);
		1746
		1747	void glDepthMask (int flag)
		1748
1561	void glLogicOp (int opcode)	1749	void glLogicOp (int opcode)
1562		1750
1563	void glColorMask (int red, int green, int blue, int alpha)	1751	void glColorMask (int red, int green, int blue, int alpha)
1564		1752
1565	void glMatrixMode (int mode)	1753	void glMatrixMode (int mode)
…		…
1568		1756
1569	void glPopMatrix ()	1757	void glPopMatrix ()
1570		1758
1571	void glLoadIdentity ()	1759	void glLoadIdentity ()
1572		1760
1573	# near and far are due to microsofts buggy c compiler	1761	# near_ and far_ are due to microsofts buggy "c" compiler
		1762	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1763
		1764	# near_ and far_ are due to microsofts buggy "c" compiler
1574	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1765	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575		1766
1576	void glViewport (int x, int y, int width, int height)	1767	void glViewport (int x, int y, int width, int height)
1577		1768
1578	void glScissor (int x, int y, int width, int height)	1769	void glScissor (int x, int y, int width, int height)
…		…
1593		1784
1594	void glEnd ()	1785	void glEnd ()
1595		1786
1596	void glColor (float r, float g, float b, float a = 1.0)	1787	void glColor (float r, float g, float b, float a = 1.0)
1597	PROTOTYPE: @	1788	PROTOTYPE: @
		1789	ALIAS:
		1790	glColor_premultiply = 1
1598	CODE:	1791	CODE:
		1792	if (ix)
		1793	{
		1794	r *= a;
		1795	g *= a;
		1796	b *= a;
		1797	}
		1798	// microsoft visual "c" rounds instead of truncating...
1599	glColor4ub (MIN ((int)(r * 255.f), 255),	1799	glColor4ub (MIN ((int)(r * 256.f), 255),
1600	MIN ((int)(g * 255.f), 255),	1800	MIN ((int)(g * 256.f), 255),
1601	MIN ((int)(b * 255.f), 255),	1801	MIN ((int)(b * 256.f), 255),
1602	MIN ((int)(a * 255.f), 255));	1802	MIN ((int)(a * 256.f), 255));
		1803
		1804	void glInterleavedArrays (int format, int stride, char *data)
		1805
		1806	void glDrawElements (int mode, int count, int type, char *indices)
		1807
		1808	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1809
		1810	void glRasterPos (float x, float y, float z = 0.)
		1811	CODE:
		1812	glRasterPos3f (0, 0, z);
		1813	glBitmap (0, 0, 0, 0, x, y, 0);
1603		1814
1604	void glVertex (float x, float y, float z = 0.)	1815	void glVertex (float x, float y, float z = 0.)
1605	CODE:	1816	CODE:
1606	glVertex3f (x, y, z);	1817	glVertex3f (x, y, z);
1607		1818
…		…
1619		1830
1620	void glBindTexture (int target, int name)	1831	void glBindTexture (int target, int name)
1621		1832
1622	void glConvolutionParameter (int target, int pname, float params)	1833	void glConvolutionParameter (int target, int pname, float params)
1623	CODE:	1834	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1835	if (gl.ConvolutionParameterf)
		1836	gl.ConvolutionParameterf (target, pname, params);
1625		1837
1626	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1838	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627	CODE:	1839	CODE:
1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1840	if (gl.ConvolutionFilter2D)
1629	(target, internalformat, width, height, format, type, data));	1841	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1630		1842
1631	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	1843	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1632	CODE:	1844	CODE:
1633	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1845	if (gl.SeparableFilter2D)
1634	(target, internalformat, width, height, format, type, row, column));	1846	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1635		1847
1636	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	1848	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637		1849
1638	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	1850	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639		1851
1640	void glRasterPos (int x, int y)	1852	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641	CODE:
1642	glRasterPos2i (x, y);
1643		1853
1644	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	1854	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645		1855
1646	int glGenTexture ()	1856	int glGenTexture ()
1647	CODE:	1857	CODE:
…		…
1674		1884
1675	void glEndList ()	1885	void glEndList ()
1676		1886
1677	void glCallList (int list)	1887	void glCallList (int list)
1678		1888
		1889

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs. Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC