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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	3	# include <malloc.h>
		4	# include <windows.h>
3	# pragma warning(disable:4244)	5	# pragma warning(disable:4244)
4	#endif	6	#endif
5		7
6	#include "EXTERN.h"	8	#include "EXTERN.h"
7	#include "perl.h"	9	#include "perl.h"
8	#include "XSUB.h"	10	#include "XSUB.h"
9		11
		12	#include <math.h>
10	#include <string.h>	13	#include <string.h>
11	#include <stdio.h>	14	#include <stdio.h>
		15	#include <stdlib.h>
12		16
13	#include <SDL.h>	17	#include <SDL.h>
14	#include <SDL_endian.h>	18	#include <SDL_endian.h>
15	#include <SDL_image.h>	19	#include <SDL_image.h>
16	#include <SDL_mixer.h>	20	#include <SDL_mixer.h>
45	#define MAP_EXTEND_X 32	49	#define MAP_EXTEND_X 32
46	#define MAP_EXTEND_Y 512	50	#define MAP_EXTEND_Y 512
47		51
48	#define MIN_FONT_HEIGHT 10	52	#define MIN_FONT_HEIGHT 10
49		53
50	#define GL_CALL(type,func,args) \	54	static struct
51	{ \	55	{
52	static int init_; \	56	#define GL_FUNC(ptr,name) ptr name;
53	static type fptr_; \	57	#include "glfunc.h"
54	\	58	#undef GL_FUNC
55	if (!init_) \	59	} gl;
56	{ \	60
57	init_ = 1; \	61	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \	62	{
59	} \	63	if (gl.BlendFuncSeparate)
60	\	64	gl.BlendFuncSeparate (sa, da, saa, daa);
61	if (fptr_) \	65	else if (gl.BlendFuncSeparateEXT)
62	fptr_ args; \	66	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
63	}	67	else
		68	glBlendFunc (sa, da);
		69	}
64		70
65	typedef Mix_Chunk *CFClient__MixChunk;	71	typedef Mix_Chunk *CFClient__MixChunk;
66	typedef Mix_Music *CFClient__MixMusic;	72	typedef Mix_Music *CFClient__MixMusic;
67		73
68	typedef PangoFontDescription *CFClient__Font;	74	typedef PangoFontDescription *CFClient__Font;
…		…
80	static PangoFontMap ft2_fontmap, cairo_fontmap;	86	static PangoFontMap ft2_fontmap, cairo_fontmap;
81		87
82	static void	88	static void
83	substitute_func (FcPattern *pattern, gpointer data)	89	substitute_func (FcPattern *pattern, gpointer data)
84	{	90	{
85	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
		95	#ifdef _WIN32
		96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
87	}	100	}
88		101
89	static void	102	static void
90	layout_update_font (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
91	{	104	{
…		…
287	ev.code = 1;	300	ev.code = 1;
288	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
289	ev.data2 = 0;	302	ev.data2 = 0;
290		303
291	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;
292	}	322	}
293		323
294	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
295		325
296	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
404	# undef const_iv	434	# undef const_iv
405	};	435	};
406		436
407	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	437	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	438	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		439	}
409		440
		441	void
		442	pango_init ()
		443	CODE:
		444	// delayed, so it can pick up new fonts added by AddFontResourceEx
		445	{
		446	{
410	ft2_fontmap = pango_ft2_font_map_new ();	447	ft2_fontmap = pango_ft2_font_map_new ();
411	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);
412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413		450	}
		451	{
		452	cairo_font_options_t *fopt = cairo_font_options_create ();
414	cairo_fontmap = pango_cairo_font_map_get_default ();	453	cairo_fontmap = pango_cairo_font_map_get_default ();
415	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	}
416	}	466	}
417		467
418	int	468	int
419	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
420		470
…		…
430	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	480	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434		484
		485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);
		487
435	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439		492
440	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
441	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
442	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
443		494
444	SDL_EnableUNICODE (1);	495	SDL_EnableUNICODE (1);
445	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446		497
447	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
456		507
457	++m;	508	++m;
458	}	509	}
459	}	510	}
460		511
		512	char *
		513	SDL_GetError ()
		514
461	int	515	int
462	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
463	CODE:	517	CODE:
464	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
465	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
466	);	520	);
		521	if (RETVAL)
		522	{
467	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	}
468	OUTPUT:	528	OUTPUT:
469	RETVAL	529	RETVAL
470		530
471	void	531	void
472	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
473		536
474	void	537	void
475	SDL_PollEvent ()	538	SDL_PollEvent ()
476	PPCODE:	539	PPCODE:
477	{	540	{
…		…
496	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498	break;	561	break;
499		562
500	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
		564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		565
501	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506	break;	571	break;
507		572
508	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
509	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
		575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		576
510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514	break;	581	break;
…		…
541	CODE:	608	CODE:
542	#ifndef _WIN32	609	#ifndef _WIN32
543	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544	#endif	611	#endif
545		612
546	char *
547	gl_version ()
548	CODE:
549	RETVAL = (char *)glGetString (GL_VERSION);
550	OUTPUT:
551	RETVAL
552
553	char *
554	gl_extensions ()
555	CODE:
556	RETVAL = (char *)glGetString (GL_EXTENSIONS);
557	OUTPUT:
558	RETVAL
559
560	void	613	void
561	add_font (char *file)	614	add_font (char *file)
562	CODE:	615	CODE:
563	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
		617	#ifdef _WIN32
		618	// cairo... sigh... requires win2000
		619	AddFontResourceEx (file, FR_PRIVATE, 0);
		620	#endif
564		621
565	void	622	void
566	load_image_inline (SV *image_)	623	load_image_inline (SV *image_)
567	ALIAS:	624	ALIAS:
568	load_image_file = 1	625	load_image_file = 1
…		…
652	}	709	}
653		710
654	void	711	void
655	error (char *message)	712	error (char *message)
656	CODE:	713	CODE:
		714	fprintf (stderr, "ERROR: %s\n", message);
657	#ifdef _WIN32	715	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	716	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
659	#else
660	fprintf (stderr, "ERROR: %s\n", message);
661	#endif	717	#endif
662		718
663	void	719	void
664	fatal (char *message)	720	fatal (char *message)
665	CODE:	721	CODE:
		722	fprintf (stderr, "FATAL: %s\n", message);
666	#ifdef _WIN32	723	#ifdef _WIN32
667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
668	#else
669	fprintf (stderr, "FATAL: %s\n", message);
670	#endif	725	#endif
671	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
672		732
673	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
674		734
675	CFClient::Font	735	CFClient::Font
676	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
750		810
751	SV *	811	SV *
752	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
753	CODE:	813	CODE:
754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
756	OUTPUT:	816	OUTPUT:
757	RETVAL	817	RETVAL
758		818
759	void	819	void
760	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.)
…		…
786	set_width (CFClient::Layout self, int max_width = -1)	846	set_width (CFClient::Layout self, int max_width = -1)
787	CODE:	847	CODE:
788	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);
789		849
790	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
791	size (CFClient::Layout self)	876	size (CFClient::Layout self)
792	PPCODE:	877	PPCODE:
793	{	878	{
794	int w, h;	879	int w, h;
795		880
…		…
861		946
862	while (p < e)	947	while (p < e)
863	{	948	{
864	uint32_t rgba = *p;	949	uint32_t rgba = *p;
865	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
866	rgba = SDL_SwapBE32 (rgba);	963	rgba = SDL_SwapBE32 (rgba);
867	*p++ = rgba;	964	*p++ = rgba;
868	}	965	}
869	}	966	}
870		967
…		…
904	}	1001	}
905		1002
906	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
907		1004
908	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
909	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.)
910	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
911	ALIAS:	1045	ALIAS:
912	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
913	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
914	CODE:	1048	CODE:
915	{	1049	{
916	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921		1054
922	if (items < 5)	1055	if (items < 5)
923	{	1056	{
924	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
925	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
926	}	1059	}
927		1060
928	if (ix)	1061	if (ix)
929	{	1062	{
930	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
931	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);
932	}	1073	}
933		1074
934	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
935
936	if (wrap_mode)
937	{
938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940	}
941		1076
942	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
943	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
944	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1081	glTexCoord2f (s, 0); glVertex2f (x + w, y );
947	glEnd ();	1082	glEnd ();
948		1083
949	if (ix)	1084	if (ix)
		1085	{
		1086	glDisable (GL_ALPHA_TEST);
950	glDisable (GL_BLEND);	1087	glDisable (GL_BLEND);
		1088	}
951	}	1089	}
952		1090
953	MODULE = CFClient PACKAGE = CFClient::Map	1091	MODULE = CFClient PACKAGE = CFClient::Map
954		1092
955	CFClient::Map	1093	CFClient::Map
…		…
975	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
976	CODE:	1114	CODE:
977	{	1115	{
978	map_clear (self);	1116	map_clear (self);
979	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
980	Safefree (self);	1119	Safefree (self);
981	}	1120	}
982		1121
983	void	1122	void
984	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1019	tex->r = r;	1158	tex->r = r;
1020	tex->g = g;	1159	tex->g = g;
1021	tex->b = b;	1160	tex->b = b;
1022	tex->a = a;	1161	tex->a = a;
1023	}	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);
1024	}	1172	}
1025		1173
1026	int	1174	int
1027	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1028	ALIAS:	1176	ALIAS:
1029	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1030	CODE:	1182	CODE:
1031	switch (ix)	1183	switch (ix)
1032	{	1184	{
1033	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1034	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;
1035	}	1191	}
1036	OUTPUT:	1192	OUTPUT:
1037	RETVAL	1193	RETVAL
1038		1194
1039	void	1195	void
…		…
1466	const_iv (GL_COLOR_MATERIAL),	1622	const_iv (GL_COLOR_MATERIAL),
1467	const_iv (GL_SMOOTH),	1623	const_iv (GL_SMOOTH),
1468	const_iv (GL_FLAT),	1624	const_iv (GL_FLAT),
1469	const_iv (GL_DITHER),	1625	const_iv (GL_DITHER),
1470	const_iv (GL_BLEND),	1626	const_iv (GL_BLEND),
		1627	const_iv (GL_CULL_FACE),
1471	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),
1472	const_iv (GL_AND),	1633	const_iv (GL_AND),
1473	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1474	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1475	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1476	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1479	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1480	const_iv (GL_RGBA),	1642	const_iv (GL_RGBA),
1481	const_iv (GL_UNSIGNED_BYTE),	1643	const_iv (GL_UNSIGNED_BYTE),
		1644	const_iv (GL_UNSIGNED_SHORT),
		1645	const_iv (GL_UNSIGNED_INT),
1482	const_iv (GL_ALPHA),	1646	const_iv (GL_ALPHA),
		1647	const_iv (GL_INTENSITY),
1483	const_iv (GL_LUMINANCE),	1648	const_iv (GL_LUMINANCE),
		1649	const_iv (GL_LUMINANCE_ALPHA),
1484	const_iv (GL_FLOAT),	1650	const_iv (GL_FLOAT),
1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1651	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486	const_iv (GL_COMPILE),	1652	const_iv (GL_COMPILE),
1487	const_iv (GL_TEXTURE_1D),	1653	const_iv (GL_TEXTURE_1D),
1488	const_iv (GL_TEXTURE_2D),	1654	const_iv (GL_TEXTURE_2D),
…		…
1490	const_iv (GL_TEXTURE_MAG_FILTER),	1656	const_iv (GL_TEXTURE_MAG_FILTER),
1491	const_iv (GL_TEXTURE_MIN_FILTER),	1657	const_iv (GL_TEXTURE_MIN_FILTER),
1492	const_iv (GL_TEXTURE_ENV_MODE),	1658	const_iv (GL_TEXTURE_ENV_MODE),
1493	const_iv (GL_TEXTURE_WRAP_S),	1659	const_iv (GL_TEXTURE_WRAP_S),
1494	const_iv (GL_TEXTURE_WRAP_T),	1660	const_iv (GL_TEXTURE_WRAP_T),
		1661	const_iv (GL_REPEAT),
1495	const_iv (GL_CLAMP),	1662	const_iv (GL_CLAMP),
1496	const_iv (GL_REPEAT),	1663	const_iv (GL_CLAMP_TO_EDGE),
1497	const_iv (GL_NEAREST),	1664	const_iv (GL_NEAREST),
1498	const_iv (GL_LINEAR),	1665	const_iv (GL_LINEAR),
1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1666	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1667	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1668	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1669	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503	const_iv (GL_GENERATE_MIPMAP),	1670	const_iv (GL_GENERATE_MIPMAP),
1504	const_iv (GL_MODULATE),	1671	const_iv (GL_MODULATE),
1505	const_iv (GL_DECAL),	1672	const_iv (GL_DECAL),
1506	const_iv (GL_REPLACE),	1673	const_iv (GL_REPLACE),
		1674	const_iv (GL_DEPTH_BUFFER_BIT),
1507	const_iv (GL_COLOR_BUFFER_BIT),	1675	const_iv (GL_COLOR_BUFFER_BIT),
1508	const_iv (GL_PROJECTION),	1676	const_iv (GL_PROJECTION),
1509	const_iv (GL_MODELVIEW),	1677	const_iv (GL_MODELVIEW),
1510	const_iv (GL_COLOR_LOGIC_OP),	1678	const_iv (GL_COLOR_LOGIC_OP),
1511	const_iv (GL_SEPARABLE_2D),	1679	const_iv (GL_SEPARABLE_2D),
1512	const_iv (GL_CONVOLUTION_2D),	1680	const_iv (GL_CONVOLUTION_2D),
1513	const_iv (GL_CONVOLUTION_BORDER_MODE),	1681	const_iv (GL_CONVOLUTION_BORDER_MODE),
1514	const_iv (GL_CONSTANT_BORDER),	1682	const_iv (GL_CONSTANT_BORDER),
1515	const_iv (GL_LINES),	1683	const_iv (GL_LINES),
		1684	const_iv (GL_LINE_LOOP),
1516	const_iv (GL_QUADS),	1685	const_iv (GL_QUADS),
1517	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),
1518	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1690	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519	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),
1520	# undef const_iv	1696	# undef const_iv
1521	};	1697	};
1522		1698
1523	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; )
1524	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1700	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525	}	1701	}
1526		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
1527	int glGetError ()	1724	int glGetError ()
		1725
		1726	void glFinish ()
1528		1727
1529	void glClear (int mask)	1728	void glClear (int mask)
1530		1729
1531	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)
1532	PROTOTYPE: @	1731	PROTOTYPE: @
…		…
1539		1738
1540	void glHint (int target, int mode)	1739	void glHint (int target, int mode)
1541		1740
1542	void glBlendFunc (int sfactor, int dfactor)	1741	void glBlendFunc (int sfactor, int dfactor)
1543		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
1544	void glLogicOp (int opcode)	1749	void glLogicOp (int opcode)
1545		1750
1546	void glColorMask (int red, int green, int blue, int alpha)	1751	void glColorMask (int red, int green, int blue, int alpha)
1547		1752
1548	void glMatrixMode (int mode)	1753	void glMatrixMode (int mode)
…		…
1551		1756
1552	void glPopMatrix ()	1757	void glPopMatrix ()
1553		1758
1554	void glLoadIdentity ()	1759	void glLoadIdentity ()
1555		1760
1556	# 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
1557	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_)
1558		1766
1559	void glViewport (int x, int y, int width, int height)	1767	void glViewport (int x, int y, int width, int height)
1560		1768
1561	void glScissor (int x, int y, int width, int height)	1769	void glScissor (int x, int y, int width, int height)
…		…
1576		1784
1577	void glEnd ()	1785	void glEnd ()
1578		1786
1579	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)
1580	PROTOTYPE: @	1788	PROTOTYPE: @
		1789	ALIAS:
		1790	glColor_premultiply = 1
1581	CODE:	1791	CODE:
1582	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	1792	if (ix)
		1793	{
		1794	r *= a;
		1795	g *= a;
		1796	b *= a;
		1797	}
		1798	// microsoft visual "c" rounds instead of truncating...
		1799	glColor4ub (MIN ((int)(r * 256.f), 255),
		1800	MIN ((int)(g * 256.f), 255),
		1801	MIN ((int)(b * 256.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);
1583		1814
1584	void glVertex (float x, float y, float z = 0.)	1815	void glVertex (float x, float y, float z = 0.)
1585	CODE:	1816	CODE:
1586	glVertex3f (x, y, z);	1817	glVertex3f (x, y, z);
1587		1818
…		…
1599		1830
1600	void glBindTexture (int target, int name)	1831	void glBindTexture (int target, int name)
1601		1832
1602	void glConvolutionParameter (int target, int pname, float params)	1833	void glConvolutionParameter (int target, int pname, float params)
1603	CODE:	1834	CODE:
1604	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1835	if (gl.ConvolutionParameterf)
		1836	gl.ConvolutionParameterf (target, pname, params);
1605		1837
1606	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)
1607	CODE:	1839	CODE:
1608	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1840	if (gl.ConvolutionFilter2D)
1609	(target, internalformat, width, height, format, type, data));	1841	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1610		1842
1611	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)
1612	CODE:	1844	CODE:
1613	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1845	if (gl.SeparableFilter2D)
1614	(target, internalformat, width, height, format, type, row, column));	1846	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1615		1847
1616	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)
1617		1849
1618	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)
1619		1851
1620	void glRasterPos (int x, int y)	1852	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1621	CODE:
1622	glRasterPos2i (x, y);
1623		1853
1624	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)
1625		1855
1626	int glGenTexture ()	1856	int glGenTexture ()
1627	CODE:	1857	CODE:
…		…
1654		1884
1655	void glEndList ()	1885	void glEndList ()
1656		1886
1657	void glCallList (int list)	1887	void glCallList (int list)
1658		1888
		1889

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.76 by root, Thu May 11 23:41:45 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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.114 by root, Wed Jun 14 18:02:00 2006 UTC