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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 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
		95	#ifdef _WIN32
89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	96	FcPatternAddBool (pattern, FC_AUTOHINT, 1);
		97	#else
		98	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
		99	#endif
90	}	100	}
91		101
92	static void	102	static void
93	layout_update_font (CFClient__Layout self)	103	layout_update_font (CFClient__Layout self)
94	{	104	{
…		…
290	ev.code = 1;	300	ev.code = 1;
291	ev.data1 = (void *)(long)channel;	301	ev.data1 = (void *)(long)channel;
292	ev.data2 = 0;	302	ev.data2 = 0;
293		303
294	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;
295	}	322	}
296		323
297	MODULE = CFClient PACKAGE = CFClient	324	MODULE = CFClient PACKAGE = CFClient
298		325
299	PROTOTYPES: ENABLE	326	PROTOTYPES: ENABLE
…		…
412	}	439	}
413		440
414	void	441	void
415	pango_init ()	442	pango_init ()
416	CODE:	443	CODE:
417	{
418	// 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	{
419	ft2_fontmap = pango_ft2_font_map_new ();	447	ft2_fontmap = pango_ft2_font_map_new ();
420	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);
421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	449	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
422		450	}
		451	{
		452	cairo_font_options_t *fopt = cairo_font_options_create ();
423	cairo_fontmap = pango_cairo_font_map_get_default ();	453	cairo_fontmap = pango_cairo_font_map_get_default ();
424	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	}
425	}	466	}
426		467
427	int	468	int
428	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	469	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)
429		470
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	480	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	481	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	482	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	483	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		484
		485	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		486	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		487
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	488	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	489	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	490	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	491	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		492
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	493	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
452		494
453	SDL_EnableUNICODE (1);	495	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	496	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		497
456	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	498	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
465		507
466	++m;	508	++m;
467	}	509	}
468	}	510	}
469		511
		512	char *
		513	SDL_GetError ()
		514
470	int	515	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	516	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	517	CODE:
473	RETVAL = !!SDL_SetVideoMode (	518	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	519	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
475	);	520	);
		521	if (RETVAL)
		522	{
476	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	}
477	OUTPUT:	528	OUTPUT:
478	RETVAL	529	RETVAL
479		530
480	void	531	void
481	SDL_GL_SwapBuffers ()	532	SDL_GL_SwapBuffers ()
		533
		534	char *
		535	SDL_GetKeyName (int sym)
482		536
483	void	537	void
484	SDL_PollEvent ()	538	SDL_PollEvent ()
485	PPCODE:	539	PPCODE:
486	{	540	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	559	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	560	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	561	break;
508		562
509	case SDL_MOUSEMOTION:	563	case SDL_MOUSEMOTION:
		564	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		565
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	566	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	567	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	568	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	569	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	570	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	571	break;
516		572
517	case SDL_MOUSEBUTTONDOWN:	573	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	574	case SDL_MOUSEBUTTONUP:
		575	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		576
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	577	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	578	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	579	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	580	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	581	break;
…		…
549	lowdelay (int fd, int val = 1)	607	lowdelay (int fd, int val = 1)
550	CODE:	608	CODE:
551	#ifndef _WIN32	609	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	610	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	611	#endif
554
555	char *
556	gl_version ()
557	CODE:
558	RETVAL = (char *)glGetString (GL_VERSION);
559	OUTPUT:
560	RETVAL
561
562	char *
563	gl_extensions ()
564	CODE:
565	RETVAL = (char *)glGetString (GL_EXTENSIONS);
566	OUTPUT:
567	RETVAL
568		612
569	void	613	void
570	add_font (char *file)	614	add_font (char *file)
571	CODE:	615	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	616	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */
…		…
629	PUSHs (sv_2mortal (newSViv (surface2->w)));	673	PUSHs (sv_2mortal (newSViv (surface2->w)));
630	PUSHs (sv_2mortal (newSViv (surface2->h)));	674	PUSHs (sv_2mortal (newSViv (surface2->h)));
631	SDL_LockSurface (surface2);	675	SDL_LockSurface (surface2);
632	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	676	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
633	SDL_UnlockSurface (surface2);	677	SDL_UnlockSurface (surface2);
634	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)));
635	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	679	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
636	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	680	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
637		681
638	SDL_FreeSurface (surface);	682	SDL_FreeSurface (surface);
639	SDL_FreeSurface (surface2);	683	SDL_FreeSurface (surface2);
…		…
665	}	709	}
666		710
667	void	711	void
668	error (char *message)	712	error (char *message)
669	CODE:	713	CODE:
		714	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	715	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	716	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	717	#endif
675		718
676	void	719	void
677	fatal (char *message)	720	fatal (char *message)
678	CODE:	721	CODE:
		722	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	723	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	724	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	725	#endif
684	exit (1);	726	_exit (1);
		727
		728	void
		729	_exit (int retval)
		730	CODE:
		731	_exit (retval);
685		732
686	MODULE = CFClient PACKAGE = CFClient::Font	733	MODULE = CFClient PACKAGE = CFClient::Font
687		734
688	CFClient::Font	735	CFClient::Font
689	new_from_file (SV class, char path, int id = 0)	736	new_from_file (SV class, char path, int id = 0)
…		…
763		810
764	SV *	811	SV *
765	get_text (CFClient::Layout self)	812	get_text (CFClient::Layout self)
766	CODE:	813	CODE:
767	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	814	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768	SvUTF8_on (RETVAL);	815	sv_utf8_decode (RETVAL);
769	OUTPUT:	816	OUTPUT:
770	RETVAL	817	RETVAL
771		818
772	void	819	void
773	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.)
…		…
799	set_width (CFClient::Layout self, int max_width = -1)	846	set_width (CFClient::Layout self, int max_width = -1)
800	CODE:	847	CODE:
801	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);
802		849
803	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
804	size (CFClient::Layout self)	876	size (CFClient::Layout self)
805	PPCODE:	877	PPCODE:
806	{	878	{
807	int w, h;	879	int w, h;
808		880
…		…
874		946
875	while (p < e)	947	while (p < e)
876	{	948	{
877	uint32_t rgba = *p;	949	uint32_t rgba = *p;
878	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
879	rgba = SDL_SwapBE32 (rgba);	963	rgba = SDL_SwapBE32 (rgba);
880	*p++ = rgba;	964	*p++ = rgba;
881	}	965	}
882	}	966	}
883		967
884	EXTEND (SP, 5);	968	EXTEND (SP, 5);
885	PUSHs (sv_2mortal (newSViv (w)));	969	PUSHs (sv_2mortal (newSViv (w)));
886	PUSHs (sv_2mortal (newSViv (h)));	970	PUSHs (sv_2mortal (newSViv (h)));
887	PUSHs (sv_2mortal (retval));	971	PUSHs (sv_2mortal (retval));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	972	PUSHs (sv_2mortal (newSViv (GL_RGBA8)));
889	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	973	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890	}	974	}
891	else	975	else
892	{	976	{
893	FT_Bitmap bitmap;	977	FT_Bitmap bitmap;
…		…
917	}	1001	}
918		1002
919	MODULE = CFClient PACKAGE = CFClient::Texture	1003	MODULE = CFClient PACKAGE = CFClient::Texture
920		1004
921	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
922	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.)
923	PROTOTYPE: $$$;$$	1044	PROTOTYPE: $$$;$$
924	ALIAS:	1045	ALIAS:
925	draw_quad_alpha = 1	1046	draw_quad_alpha = 1
926	draw_quad_alpha_premultiplied = 2	1047	draw_quad_alpha_premultiplied = 2
927	CODE:	1048	CODE:
928	{	1049	{
929	HV hv = (HV )SvRV (self);	1050	HV hv = (HV )SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1051	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1052	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1053	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		1054
935	if (items < 5)	1055	if (items < 5)
936	{	1056	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1057	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1058	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	1059	}
940		1060
941	if (ix)	1061	if (ix)
942	{	1062	{
943	glEnable (GL_BLEND);	1063	glEnable (GL_BLEND);
		1064
		1065	if (ix == 2)
944	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);
945	}	1073	}
946		1074
947	glBindTexture (GL_TEXTURE_2D, name);	1075	glBindTexture (GL_TEXTURE_2D, name);
948
949	if (wrap_mode)
950	{
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953	}
954		1076
955	glBegin (GL_QUADS);	1077	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1078	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1079	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1080	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1081	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1082	glEnd ();
961		1083
962	if (ix)	1084	if (ix)
		1085	{
		1086	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1087	glDisable (GL_BLEND);
		1088	}
964	}	1089	}
965		1090
966	MODULE = CFClient PACKAGE = CFClient::Map	1091	MODULE = CFClient PACKAGE = CFClient::Map
967		1092
968	CFClient::Map	1093	CFClient::Map
…		…
988	DESTROY (CFClient::Map self)	1113	DESTROY (CFClient::Map self)
989	CODE:	1114	CODE:
990	{	1115	{
991	map_clear (self);	1116	map_clear (self);
992	Safefree (self->face);	1117	Safefree (self->face);
		1118	Safefree (self->tex);
993	Safefree (self);	1119	Safefree (self);
994	}	1120	}
995		1121
996	void	1122	void
997	clear (CFClient::Map self)	1123	clear (CFClient::Map self)
…		…
1032	tex->r = r;	1158	tex->r = r;
1033	tex->g = g;	1159	tex->g = g;
1034	tex->b = b;	1160	tex->b = b;
1035	tex->a = a;	1161	tex->a = a;
1036	}	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);
1037	}	1172	}
1038		1173
1039	int	1174	int
1040	ox (CFClient::Map self)	1175	ox (CFClient::Map self)
1041	ALIAS:	1176	ALIAS:
1042	oy = 1	1177	oy = 1
		1178	x = 2
		1179	y = 3
		1180	w = 4
		1181	h = 5
1043	CODE:	1182	CODE:
1044	switch (ix)	1183	switch (ix)
1045	{	1184	{
1046	case 0: RETVAL = self->ox; break;	1185	case 0: RETVAL = self->ox; break;
1047	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;
1048	}	1191	}
1049	OUTPUT:	1192	OUTPUT:
1050	RETVAL	1193	RETVAL
1051		1194
1052	void	1195	void
…		…
1479	const_iv (GL_COLOR_MATERIAL),	1622	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1623	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1624	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1625	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1626	const_iv (GL_BLEND),
		1627	const_iv (GL_CULL_FACE),
1484	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),
1485	const_iv (GL_AND),	1633	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1634	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1635	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1636	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1637	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1638	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1639	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1640	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1641	const_iv (GL_RGB),
1493	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),
1494	const_iv (GL_UNSIGNED_BYTE),	1646	const_iv (GL_UNSIGNED_BYTE),
		1647	const_iv (GL_UNSIGNED_SHORT),
		1648	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1649	const_iv (GL_ALPHA),
		1650	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1651	const_iv (GL_LUMINANCE),
		1652	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1653	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1654	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1655	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1656	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1657	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1659	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1660	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1661	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1662	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1663	const_iv (GL_TEXTURE_WRAP_T),
		1664	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1665	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1666	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1667	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1668	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1669	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1670	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1671	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1672	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1673	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1674	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1675	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1676	const_iv (GL_REPLACE),
		1677	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1678	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1679	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1680	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1681	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1682	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1683	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1684	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1685	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1686	const_iv (GL_LINES),
		1687	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1688	const_iv (GL_QUADS),
1530	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),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1693	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	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),
1533	# undef const_iv	1699	# undef const_iv
1534	};	1700	};
1535		1701
1536	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; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1703	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1704	}
1539		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
1540	int glGetError ()	1727	int glGetError ()
		1728
		1729	void glFinish ()
1541		1730
1542	void glClear (int mask)	1731	void glClear (int mask)
1543		1732
1544	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)
1545	PROTOTYPE: @	1734	PROTOTYPE: @
…		…
1552		1741
1553	void glHint (int target, int mode)	1742	void glHint (int target, int mode)
1554		1743
1555	void glBlendFunc (int sfactor, int dfactor)	1744	void glBlendFunc (int sfactor, int dfactor)
1556		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
1557	void glLogicOp (int opcode)	1752	void glLogicOp (int opcode)
1558		1753
1559	void glColorMask (int red, int green, int blue, int alpha)	1754	void glColorMask (int red, int green, int blue, int alpha)
1560		1755
1561	void glMatrixMode (int mode)	1756	void glMatrixMode (int mode)
…		…
1564		1759
1565	void glPopMatrix ()	1760	void glPopMatrix ()
1566		1761
1567	void glLoadIdentity ()	1762	void glLoadIdentity ()
1568		1763
1569	# 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
1570	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_)
1571		1769
1572	void glViewport (int x, int y, int width, int height)	1770	void glViewport (int x, int y, int width, int height)
1573		1771
1574	void glScissor (int x, int y, int width, int height)	1772	void glScissor (int x, int y, int width, int height)
…		…
1589		1787
1590	void glEnd ()	1788	void glEnd ()
1591		1789
1592	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)
1593	PROTOTYPE: @	1791	PROTOTYPE: @
		1792	ALIAS:
		1793	glColor_premultiply = 1
1594	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...
1595	glColor4ub (MIN ((int)r * 256., 255),	1802	glColor4ub (MIN ((int)(r * 256.f), 255),
1596	MIN ((int)g * 256., 255),	1803	MIN ((int)(g * 256.f), 255),
1597	MIN ((int)b * 256., 255),	1804	MIN ((int)(b * 256.f), 255),
1598	MIN ((int)a * 256., 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);
1599		1817
1600	void glVertex (float x, float y, float z = 0.)	1818	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1819	CODE:
1602	glVertex3f (x, y, z);	1820	glVertex3f (x, y, z);
1603		1821
…		…
1615		1833
1616	void glBindTexture (int target, int name)	1834	void glBindTexture (int target, int name)
1617		1835
1618	void glConvolutionParameter (int target, int pname, float params)	1836	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1837	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1838	if (gl.ConvolutionParameterf)
		1839	gl.ConvolutionParameterf (target, pname, params);
1621		1840
1622	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)
1623	CODE:	1842	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1843	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1844	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1845
1627	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)
1628	CODE:	1847	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1848	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	1849	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		1850
1632	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)
1633		1852
1634	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)
1635		1854
1636	void glRasterPos (int x, int y)	1855	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		1856
1640	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)
1641		1858
1642	int glGenTexture ()	1859	int glGenTexture ()
1643	CODE:	1860	CODE:
…		…
1670		1887
1671	void glEndList ()	1888	void glEndList ()
1672		1889
1673	void glCallList (int list)	1890	void glCallList (int list)
1674		1891
		1892

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.80 by root, Sun May 14 22:58:24 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.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.115 by root, Wed Jun 14 18:59:30 2006 UTC