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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

…		…
19		19
20	#ifdef _WIN32	20	#ifdef _WIN32
21	# undef pipe	21	# undef pipe
22	// microsoft vs. C	22	// microsoft vs. C
23	# define sqrtf(x) sqrt(x)	23	# define sqrtf(x) sqrt(x)
24	# define roundf(x) (int)(x)
25	# define atan2f(x,y) atan2(x,y)	24	# define atan2f(x,y) atan2(x,y)
26	# define M_PI 3.14159265f	25	# define M_PI 3.14159265f
27	#endif	26	#endif
28		27
29	#include <assert.h>	28	#include <assert.h>
…		…
39	#include <SDL_endian.h>	38	#include <SDL_endian.h>
40	#include <SDL_image.h>	39	#include <SDL_image.h>
41	#include <SDL_mixer.h>	40	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	41	#include <SDL_opengl.h>
43		42
		43	/* work around os x broken headers */
		44	#ifdef __MACOSX__
		45	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		46	typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
		47	typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
		48	#endif
		49
44	#define PANGO_ENABLE_BACKEND	50	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	51	#define G_DISABLE_CAST_CHECKS
46		52
47	#include <glib/gmacros.h>	53	#include <glib/gmacros.h>
48		54
49	#include <pango/pango.h>	55	#include <pango/pango.h>
50		56
51	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2))	57	#ifndef PANGO_VERSION_CHECK
		58	# define PANGO_VERSION_CHECK(a,b,c) 0
		59	#endif
		60
		61	#if !PANGO_VERSION_CHECK (1, 15, 2)
52	# define pango_layout_get_line_readonly pango_layout_get_line_readonly	62	# define pango_layout_get_line_readonly pango_layout_get_line
53	# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly	63	# define pango_layout_get_lines_readonly pango_layout_get_lines
54	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly	64	# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly	65	# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56	#endif	66	#endif
57		67
58	#ifndef _WIN32	68	#ifndef _WIN32
59	# include <sys/types.h>	69	# include <sys/types.h>
60	# include <sys/socket.h>	70	# include <sys/socket.h>
61	# include <netinet/in.h>	71	# include <netinet/in.h>
62	# include <netinet/tcp.h>	72	# include <netinet/tcp.h>
63	# include <inttypes.h>	73	# include <inttypes.h>
64	#endif	74	#endif
65		75
		76	#if __GNUC__ >= 4
		77	# define expect(expr,value) __builtin_expect ((expr),(value))
		78	#else
		79	# define expect(expr,value) (expr)
		80	#endif
		81
		82	#define expect_false(expr) expect ((expr) != 0, 0)
		83	#define expect_true(expr) expect ((expr) != 0, 1)
		84
66	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67		86
		87	/* this is used as fow flag as well, so has to have a different value */
		88	/* then anything that is computed by incoming darkness */
68	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
69		91
70	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
71	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
72		94
73	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
74		96
75	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
76	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
77		99
78	#if 0	100	#define KMOD_LRAM 0x10000 // our extension
79	# define PARACHUTE SDL_INIT_NOPARACHUTE	101
80	#else	102	#define TEXID_SPEECH 1
81	# define PARACHUTE 0	103	#define TEXID_NOFACE 2
82	#endif
83		104
84	static AV *texture_av;	105	static AV *texture_av;
85		106
86	static struct	107	static struct
87	{	108	{
…		…
181		202
182	static void	203	static void
183	layout_update_font (DC__Layout self)	204	layout_update_font (DC__Layout self)
184	{	205	{
185	/* use a random scale factor to account for unknown descenders, 0.8 works	206	/* use a random scale factor to account for unknown descenders, 0.8 works
186	* reasonably well with bitstream vera	207	* reasonably well with dejavu/bistream fonts
187	*/	208	*/
188	PangoFontDescription *font = self->font ? self->font : default_font;	209	PangoFontDescription *font = self->font ? self->font : default_font;
189		210
190	pango_font_description_set_absolute_size (font,	211	pango_font_description_set_absolute_size (font,
191	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));	212	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
…		…
219	int w, h;	240	int w, h;
220	float s, t;	241	float s, t;
221	uint8_t r, g, b, a;	242	uint8_t r, g, b, a;
222	tileid smoothtile;	243	tileid smoothtile;
223	uint8_t smoothlevel;	244	uint8_t smoothlevel;
		245	uint8_t unused; /* set to zero on use */
224	} maptex;	246	} maptex;
225		247
226	typedef struct {	248	typedef struct {
227	uint32_t player;	249	uint32_t player;
228	tileid tile[3];	250	tileid tile[3];
…		…
360	self->oy = 0;	382	self->oy = 0;
361	self->row = 0;	383	self->row = 0;
362	self->rows = 0;	384	self->rows = 0;
363	}	385	}
364		386
		387	#define CELL_CLEAR(cell) \
		388	do { \
		389	if ((cell)->player) \
		390	(cell)->tile [2] = 0; \
		391	(cell)->darkness = 0; \
		392	(cell)->stat_hp = 0; \
		393	(cell)->flags = 0; \
		394	(cell)->player = 0; \
		395	} while (0)
		396
365	static void	397	static void
366	map_blank (DC__Map self, int x0, int y0, int w, int h)	398	map_blank (DC__Map self, int x0, int y0, int w, int h)
367	{	399	{
368	int x, y;	400	int x, y;
369	maprow *row;	401	maprow *row;
…		…
383	if (x >= row->c1)	415	if (x >= row->c1)
384	break;	416	break;
385		417
386	cell = row->col + x - row->c0;	418	cell = row->col + x - row->c0;
387		419
388	cell->darkness = 0;	420	CELL_CLEAR (cell);
389	cell->stat_hp = 0;
390	cell->flags = 0;
391	cell->player = 0;
392	}	421	}
393	}	422	}
394	}	423	}
395		424
396	typedef struct {	425	typedef struct {
…		…
507	if (!svp \|\| !SvTRUE (*svp))	536	if (!svp \|\| !SvTRUE (*svp))
508	return 0;	537	return 0;
509		538
510	return 1;	539	return 1;
511	}	540	}
		541
		542	/******************************************************************************/
		543
		544	/* process keyboard modifiers */
		545	static int
		546	mod_munge (int mod)
		547	{
		548	mod &= MOD_MASK;
		549
		550	if (mod & (KMOD_META \| KMOD_ALT))
		551	mod \|= KMOD_LRAM;
		552
		553	return mod;
		554	}
		555
		556	static void
		557	deliantra_main ()
		558	{
		559	char *argv[] = { 0 };
		560	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		561	}
		562
		563	#ifdef __MACOSX__
		564	/* to due surprising braindamage on the side of SDL design, we
		565	* do some mind-boggling hack here: SDL requires a custom main()
		566	* on OS X, so... we provide one and call the original main(), which,
		567	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		568	* and which calls our main (== SDL_main) back.
		569	*/
		570	extern C_LINKAGE int
		571	main (int argc, char *argv[])
		572	{
		573	deliantra_main ();
		574	}
		575
		576	#undef main
		577
		578	extern C_LINKAGE int main (int argc, char *argv[]);
		579
		580	static void
		581	SDL_braino (void)
		582	{
		583	char *argv[] = { "deliantra client", 0 };
		584	(main) (1, argv);
		585	}
		586	#else
		587	static void
		588	SDL_braino (void)
		589	{
		590	deliantra_main ();
		591	}
		592	#endif
512		593
513	MODULE = Deliantra::Client PACKAGE = DC	594	MODULE = Deliantra::Client PACKAGE = DC
514		595
515	PROTOTYPES: ENABLE	596	PROTOTYPES: ENABLE
516		597
…		…
545	const_iv (SDL_USEREVENT),	626	const_iv (SDL_USEREVENT),
546		627
547	const_iv (SDL_APPINPUTFOCUS),	628	const_iv (SDL_APPINPUTFOCUS),
548	const_iv (SDL_APPMOUSEFOCUS),	629	const_iv (SDL_APPMOUSEFOCUS),
549	const_iv (SDL_APPACTIVE),	630	const_iv (SDL_APPACTIVE),
		631
		632
		633	const_iv (SDLK_UNKNOWN),
		634	const_iv (SDLK_FIRST),
		635	const_iv (SDLK_BACKSPACE),
		636	const_iv (SDLK_TAB),
		637	const_iv (SDLK_CLEAR),
		638	const_iv (SDLK_RETURN),
		639	const_iv (SDLK_PAUSE),
		640	const_iv (SDLK_ESCAPE),
		641	const_iv (SDLK_SPACE),
		642	const_iv (SDLK_EXCLAIM),
		643	const_iv (SDLK_QUOTEDBL),
		644	const_iv (SDLK_HASH),
		645	const_iv (SDLK_DOLLAR),
		646	const_iv (SDLK_AMPERSAND),
		647	const_iv (SDLK_QUOTE),
		648	const_iv (SDLK_LEFTPAREN),
		649	const_iv (SDLK_RIGHTPAREN),
		650	const_iv (SDLK_ASTERISK),
		651	const_iv (SDLK_PLUS),
		652	const_iv (SDLK_COMMA),
		653	const_iv (SDLK_MINUS),
		654	const_iv (SDLK_PERIOD),
		655	const_iv (SDLK_SLASH),
		656	const_iv (SDLK_0),
		657	const_iv (SDLK_1),
		658	const_iv (SDLK_2),
		659	const_iv (SDLK_3),
		660	const_iv (SDLK_4),
		661	const_iv (SDLK_5),
		662	const_iv (SDLK_6),
		663	const_iv (SDLK_7),
		664	const_iv (SDLK_8),
		665	const_iv (SDLK_9),
		666	const_iv (SDLK_COLON),
		667	const_iv (SDLK_SEMICOLON),
		668	const_iv (SDLK_LESS),
		669	const_iv (SDLK_EQUALS),
		670	const_iv (SDLK_GREATER),
		671	const_iv (SDLK_QUESTION),
		672	const_iv (SDLK_AT),
		673
		674	const_iv (SDLK_LEFTBRACKET),
		675	const_iv (SDLK_BACKSLASH),
		676	const_iv (SDLK_RIGHTBRACKET),
		677	const_iv (SDLK_CARET),
		678	const_iv (SDLK_UNDERSCORE),
		679	const_iv (SDLK_BACKQUOTE),
		680	const_iv (SDLK_DELETE),
550		681
551	const_iv (SDLK_FIRST),	682	const_iv (SDLK_FIRST),
552	const_iv (SDLK_LAST),	683	const_iv (SDLK_LAST),
553	const_iv (SDLK_KP0),	684	const_iv (SDLK_KP0),
554	const_iv (SDLK_KP1),	685	const_iv (SDLK_KP1),
…		…
630	const_iv (KMOD_RMETA),	761	const_iv (KMOD_RMETA),
631	const_iv (KMOD_NUM),	762	const_iv (KMOD_NUM),
632	const_iv (KMOD_CAPS),	763	const_iv (KMOD_CAPS),
633	const_iv (KMOD_MODE),	764	const_iv (KMOD_MODE),
634		765
		766	const_iv (KMOD_LRAM),
		767
635	const_iv (MIX_DEFAULT_FORMAT),	768	const_iv (MIX_DEFAULT_FORMAT),
		769
		770	const_iv (SDL_INIT_TIMER),
		771	const_iv (SDL_INIT_AUDIO),
		772	const_iv (SDL_INIT_VIDEO),
		773	const_iv (SDL_INIT_CDROM),
		774	const_iv (SDL_INIT_JOYSTICK),
		775	const_iv (SDL_INIT_EVERYTHING),
		776	const_iv (SDL_INIT_NOPARACHUTE),
		777	const_iv (SDL_INIT_EVENTTHREAD),
		778
		779	const_iv (SDL_GL_RED_SIZE),
		780	const_iv (SDL_GL_GREEN_SIZE),
		781	const_iv (SDL_GL_BLUE_SIZE),
		782	const_iv (SDL_GL_ALPHA_SIZE),
		783	const_iv (SDL_GL_DOUBLEBUFFER),
		784	const_iv (SDL_GL_BUFFER_SIZE),
		785	const_iv (SDL_GL_DEPTH_SIZE),
		786	const_iv (SDL_GL_STENCIL_SIZE),
		787	const_iv (SDL_GL_ACCUM_RED_SIZE),
		788	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		789	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		790	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		791	const_iv (SDL_GL_STEREO),
		792	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		793	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		794	const_iv (SDL_GL_ACCELERATED_VISUAL),
		795	const_iv (SDL_GL_SWAP_CONTROL),
		796
		797	const_iv (FOW_DARKNESS)
636	# undef const_iv	798	# undef const_iv
637	};	799	};
638		800
639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	801	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	802	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
662		824
663	IV minpot (UV n)	825	IV minpot (UV n)
664		826
665	IV popcount (UV n)	827	IV popcount (UV n)
666		828
		829	NV distance (NV dx, NV dy)
		830	CODE:
		831	RETVAL = pow (dx * dx + dy * dy, 0.5);
		832	OUTPUT:
		833	RETVAL
		834
667	void	835	void
668	pango_init ()	836	pango_init ()
669	CODE:	837	CODE:
670	{	838	{
671	opengl_fontmap = pango_opengl_font_map_new ();	839	opengl_fontmap = pango_opengl_font_map_new ();
672	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	840	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
673	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	841	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674	#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)	842	/pango_context_set_font_description (opengl_context, default_font);/
		843	#if PANGO_VERSION_CHECK (1, 15, 2)
675	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	844	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	845	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
677	#endif	846	#endif
678	}	847	}
679		848
680	char *
681	SDL_GetError ()	849	char *SDL_GetError ()
682		850
683	int	851	void SDL_braino ()
684	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
685		852
686	void	853	int SDL_Init (U32 flags)
		854
		855	int SDL_InitSubSystem (U32 flags)
		856
		857	void SDL_QuitSubSystem (U32 flags)
		858
687	SDL_Quit ()	859	void SDL_Quit ()
		860
		861	int SDL_GL_SetAttribute (int attr, int value)
		862
		863	int SDL_GL_GetAttribute (int attr)
		864	CODE:
		865	if (SDL_GL_GetAttribute (attr, &RETVAL))
		866	XSRETURN_UNDEF;
		867	OUTPUT:
		868	RETVAL
688		869
689	void	870	void
690	SDL_ListModes (int rgb, int alpha)	871	SDL_ListModes (int rgb, int alpha)
691	PPCODE:	872	PPCODE:
692	{	873	{
…		…
704	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	885	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	886	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	887	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707		888
708	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	889	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709	#if SDL_VERSION_ATLEAST(1,2,10)
710	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	890	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712	#endif
713		891
714	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	892	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
715		893
716	if (m && m != (SDL_Rect **)-1)	894	if (m && m != (SDL_Rect **)-1)
717	while (*m)	895	while (*m)
718	{	896	{
719	if ((m)->w >= 800 && (m)->h >= 480)	897	if ((m)->w >= 400 && (m)->h >= 300)
720	{	898	{
721	AV *av = newAV ();	899	AV *av = newAV ();
722	av_push (av, newSViv ((*m)->w));	900	av_push (av, newSViv ((*m)->w));
723	av_push (av, newSViv ((*m)->h));	901	av_push (av, newSViv ((*m)->h));
724	av_push (av, newSViv (rgb));	902	av_push (av, newSViv (rgb));
…		…
752		930
753	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");	931	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
754	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	932	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
755	#include "glfunc.h"	933	#include "glfunc.h"
756	#undef GL_FUNC	934	#undef GL_FUNC
		935
		936	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		937	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
757	}	938	}
758	}	939	}
759	OUTPUT:	940	OUTPUT:
760	RETVAL	941	RETVAL
761		942
…		…
765	char *	946	char *
766	SDL_GetKeyName (int sym)	947	SDL_GetKeyName (int sym)
767		948
768	int	949	int
769	SDL_GetAppState ()	950	SDL_GetAppState ()
		951
		952	int
		953	SDL_GetModState ()
770		954
771	void	955	void
772	poll_events ()	956	poll_events ()
773	PPCODE:	957	PPCODE:
774	{	958	{
…		…
784	{	968	{
785	case SDL_KEYDOWN:	969	case SDL_KEYDOWN:
786	case SDL_KEYUP:	970	case SDL_KEYUP:
787	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	971	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
788	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	972	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
789	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	973	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
790	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	974	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
791	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	975	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
792	break;	976	break;
793		977
794	case SDL_ACTIVEEVENT:	978	case SDL_ACTIVEEVENT:
795	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	979	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
813	x = ev.motion.x;	997	x = ev.motion.x;
814	y = ev.motion.y;	998	y = ev.motion.y;
815	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	999	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
816	}	1000	}
817		1001
818	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1002	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
819	hv_store (hv, "state", 5, newSViv (state), 0);	1003	hv_store (hv, "state", 5, newSViv (state), 0);
820	hv_store (hv, "x", 1, newSViv (x), 0);	1004	hv_store (hv, "x", 1, newSViv (x), 0);
821	hv_store (hv, "y", 1, newSViv (y), 0);	1005	hv_store (hv, "y", 1, newSViv (y), 0);
822	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1006	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
823	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1007	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
843		1027
844	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1028	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
845	}	1029	}
846	}	1030	}
847		1031
		1032	char *
		1033	SDL_AudioDriverName ()
		1034	CODE:
		1035	{
		1036	char buf [256];
		1037	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1038	XSRETURN_UNDEF;
		1039
		1040	RETVAL = buf;
		1041	}
		1042	OUTPUT:
		1043	RETVAL
		1044
848	int	1045	int
849	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1046	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
850	POSTCALL:	1047	POSTCALL:
851	Mix_HookMusicFinished (music_finished);	1048	Mix_HookMusicFinished (music_finished);
852	Mix_ChannelFinished (channel_finished);	1049	Mix_ChannelFinished (channel_finished);
…		…
908	}	1105	}
909	}	1106	}
910	#endif	1107	#endif
911	}	1108	}
912		1109
913	void	1110	int
914	add_font (char *file)	1111	add_font (char *file)
915	CODE:	1112	CODE:
916	FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1113	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
		1114	OUTPUT:
		1115	RETVAL
917		1116
918	void	1117	void
919	load_image_inline (SV *image_)	1118	load_image_inline (SV *image_)
920	ALIAS:	1119	ALIAS:
921	load_image_file = 1	1120	load_image_file = 1
…		…
1037	#if DEBUG	1236	#if DEBUG
1038	VALGRIND_DO_LEAK_CHECK;	1237	VALGRIND_DO_LEAK_CHECK;
1039	#endif	1238	#endif
1040	}	1239	}
1041		1240
		1241	int
		1242	SvREFCNT (SV *sv)
		1243	CODE:
		1244	RETVAL = SvREFCNT (sv);
		1245	OUTPUT:
		1246	RETVAL
		1247
1042	MODULE = Deliantra::Client PACKAGE = DC::Font	1248	MODULE = Deliantra::Client PACKAGE = DC::Font
1043		1249
1044	PROTOTYPES: DISABLE	1250	PROTOTYPES: DISABLE
1045		1251
1046	DC::Font	1252	DC::Font
…		…
1331	PPCODE:	1537	PPCODE:
1332	{	1538	{
1333	int line, x;	1539	int line, x;
1334		1540
1335	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);	1541	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1336	#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3))	1542	#if !PANGO_VERSION_CHECK (1, 17, 3)
1337	/* pango bug: line is between 1..numlines, not 0..numlines-1 */	1543	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338	--line;	1544	--line;
1339	#endif	1545	#endif
1340	EXTEND (SP, 2);	1546	EXTEND (SP, 2);
1341	PUSHs (sv_2mortal (newSViv (line)));	1547	PUSHs (sv_2mortal (newSViv (line)));
…		…
1475	if (ix)	1681	if (ix)
1476	{	1682	{
1477	glDisable (GL_ALPHA_TEST);	1683	glDisable (GL_ALPHA_TEST);
1478	glDisable (GL_BLEND);	1684	glDisable (GL_BLEND);
1479	}	1685	}
		1686	}
		1687
		1688	void
		1689	draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t data2 = data1)
		1690	PROTOTYPE: @
		1691	CODE:
		1692	{
		1693	glEnable (GL_BLEND);
		1694	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1695	glEnable (GL_TEXTURE_2D);
		1696	glBindTexture (GL_TEXTURE_2D, name1);
		1697
		1698	glColor3f (intensity, intensity, intensity);
		1699	glPushMatrix ();
		1700	glScalef (1./3, 1./3, 1.);
		1701
		1702	if (blend > 0.f)
		1703	{
		1704	float dx3 = dx * -3.f / w;
		1705	float dy3 = dy * -3.f / h;
		1706	GLfloat env_color[4] = { 0., 0., 0., blend };
		1707
		1708	/* interpolate the two shadow textures */
		1709	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1710	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1711
		1712	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1713	gl.ActiveTexture (GL_TEXTURE1);
		1714	glEnable (GL_TEXTURE_2D);
		1715	glBindTexture (GL_TEXTURE_2D, name2);
		1716	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1717
		1718	/* rgb == rgb(glcolor) */
		1719	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1720	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1721	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1722
		1723	/* alpha = interpolate t0, t1 by env_alpha */
		1724	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1725
		1726	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1727	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1728	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1729
		1730	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1731	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1732
		1733	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1734	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1735
		1736	glBegin (GL_QUADS);
		1737	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1738	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1739	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1740	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1741	glEnd ();
		1742
		1743	glDisable (GL_TEXTURE_2D);
		1744	gl.ActiveTexture (GL_TEXTURE0);
		1745	}
		1746	else
		1747	{
		1748	/* simple blending of one texture, also opengl <1.3 path */
		1749	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1750
		1751	glBegin (GL_QUADS);
		1752	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1753	glTexCoord2f (0, t); glVertex2f (0, h);
		1754	glTexCoord2f (s, t); glVertex2f (w, h);
		1755	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1756	glEnd ();
		1757	}
		1758
		1759	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1760	{
		1761	int x, y;
		1762	int dx3 = dx * 3;
		1763	int dy3 = dy * 3;
		1764
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1766	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1767	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1768	glTranslatef (-1., -1., 0);
		1769	glBegin (GL_QUADS);
		1770
		1771	for (y = 1; y < h; y += 3)
		1772	{
		1773	int y1 = y - dy3;
		1774	int y1valid = y1 >= 0 && y1 < h;
		1775
		1776	for (x = 1; x < w; x += 3)
		1777	{
		1778	int x1 = x - dx3;
		1779	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1780	uint8_t h2;
		1781
		1782	if (y1valid && x1 >= 0 && x1 < w)
		1783	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1784	else
		1785	h2 = 1; /* out of range == invisible */
		1786
		1787	if (h1 \|\| h2)
		1788	{
		1789	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1790	glColor4f (1., 1., 1., alpha);
		1791
		1792	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1793	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1794	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1795	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1796	}
		1797	}
		1798	}
		1799	}
		1800
		1801	glEnd ();
		1802
		1803	glPopMatrix ();
		1804
		1805	glDisable (GL_TEXTURE_2D);
		1806	glDisable (GL_BLEND);
1480	}	1807	}
1481		1808
1482	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1809	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1483	CODE:	1810	CODE:
1484	{	1811	{
…		…
1590	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1917	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1591	// use uglier nearest interpolation because linear suffers	1918	// use uglier nearest interpolation because linear suffers
1592	// from transparent color bleeding and ugly wrapping effects.	1919	// from transparent color bleeding and ugly wrapping effects.
1593	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1920	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1594	}	1921	}
		1922
		1923	void
		1924	expire_textures (DC::Map self, int texid, int count)
		1925	PPCODE:
		1926	for (; texid < self->texs && count; ++texid, --count)
		1927	{
		1928	maptex *tex = self->tex + texid;
		1929
		1930	if (tex->name)
		1931	{
		1932	if (tex->unused)
		1933	{
		1934	tex->name = 0;
		1935	tex->unused = 0;
		1936	XPUSHs (sv_2mortal (newSViv (texid)));
		1937	}
		1938	else
		1939	tex->unused = 1;
		1940	}
		1941	}
1595		1942
1596	int	1943	int
1597	ox (DC::Map self)	1944	ox (DC::Map self)
1598	ALIAS:	1945	ALIAS:
1599	oy = 1	1946	oy = 1
…		…
1677	uint8_t ext, cmd;	2024	uint8_t ext, cmd;
1678		2025
1679	do	2026	do
1680	{	2027	{
1681	ext = *data++;	2028	ext = *data++;
1682	cmd = ext & 0x3f;	2029	cmd = ext & 0x7f;
1683		2030
1684	if (cmd < 4)	2031	if (cmd < 4)
1685	cell->darkness = 255 - ext * 64 + 1;	2032	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1686	else if (cmd == 5) // health	2033	else if (cmd == 5) // health
1687	{	2034	{
1688	cell->stat_width = 1;	2035	cell->stat_width = 1;
1689	cell->stat_hp = *data++;	2036	cell->stat_hp = *data++;
1690	}	2037	}
1691	else if (cmd == 6) // monster width	2038	else if (cmd == 6) // monster width
1692	cell->stat_width = *data++ + 1;	2039	cell->stat_width = *data++ + 1;
1693	else if (cmd == 0x47)	2040	else if (cmd == 0x47)
1694	{	2041	{
1695	if (*data == 4)	2042	if (*data == 1) cell->player = data [1];
1696	; // decode player count	2043	else if (*data == 2) cell->player = data [2] + (data [1] << 8);
		2044	else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
		2045	else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1697		2046
1698	data += *data + 1;	2047	data += *data + 1;
1699	}	2048	}
1700	else if (cmd == 8) // cell flags	2049	else if (cmd == 8) // cell flags
1701	cell->flags = *data++;	2050	cell->flags = *data++;
…		…
1718	cell->tile [z] = self->face2tile [face];	2067	cell->tile [z] = self->face2tile [face];
1719		2068
1720	if (cell->tile [z])	2069	if (cell->tile [z])
1721	{	2070	{
1722	maptex *tex = self->tex + cell->tile [z];	2071	maptex *tex = self->tex + cell->tile [z];
		2072	tex->unused = 0;
1723	if (!tex->name)	2073	if (!tex->name)
1724	av_push (missing, newSViv (cell->tile [z]));	2074	av_push (missing, newSViv (cell->tile [z]));
1725		2075
1726	if (tex->smoothtile)	2076	if (tex->smoothtile)
1727	{	2077	{
1728	maptex *smooth = self->tex + tex->smoothtile;	2078	maptex *smooth = self->tex + tex->smoothtile;
		2079	smooth->unused = 0;
1729	if (!smooth->name)	2080	if (!smooth->name)
1730	av_push (missing, newSViv (tex->smoothtile));	2081	av_push (missing, newSViv (tex->smoothtile));
1731	}	2082	}
1732	}	2083	}
1733	}	2084	}
1734	}	2085	}
1735	else	2086	else
1736	cell->darkness = 0;	2087	CELL_CLEAR (cell);
1737	}	2088	}
1738	}	2089	}
1739	OUTPUT:	2090	OUTPUT:
1740	RETVAL	2091	RETVAL
1741		2092
…		…
1793	}	2144	}
1794	OUTPUT:	2145	OUTPUT:
1795	RETVAL	2146	RETVAL
1796		2147
1797	void	2148	void
1798	draw (DC::Map self, int mx, int my, int sw, int sh, int T)	2149	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1799	CODE:	2150	CODE:
1800	{	2151	{
1801	int x, y, z;	2152	int x, y, z;
1802		2153
1803	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2154	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1804	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2155	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1805	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2156	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1806	smooth_key skey;	2157	smooth_key skey;
1807		2158	int pl_x, pl_y;
		2159	maptex pl_tex;
1808	rc_t *rc = rc_alloc ();	2160	rc_t *rc = rc_alloc ();
		2161	rc_t *rc_ov = rc_alloc ();
1809	rc_key_t key;	2162	rc_key_t key;
1810	rc_array_t *arr;	2163	rc_array_t *arr;
1811		2164
		2165	pl_tex.name = 0;
		2166
1812	// thats current max. sorry.	2167	// that's current max. sorry.
1813	if (sw > 255) sw = 255;	2168	if (sw > 255) sw = 255;
1814	if (sh > 255) sh = 255;	2169	if (sh > 255) sh = 255;
1815		2170
1816	// clear key, in case of extra padding	2171	// clear key, in case of extra padding
1817	memset (&skey, 0, sizeof (skey));	2172	memset (&skey, 0, sizeof (skey));
…		…
1821	key.g = 255;	2176	key.g = 255;
1822	key.b = 255;	2177	key.b = 255;
1823	key.a = 255;	2178	key.a = 255;
1824	key.mode = GL_QUADS;	2179	key.mode = GL_QUADS;
1825	key.format = GL_T2F_V3F;	2180	key.format = GL_T2F_V3F;
1826	key.texname = -1;
1827		2181
1828	mx += self->x;	2182	mx += self->x;
1829	my += self->y;	2183	my += self->y;
1830		2184
1831	// first pass: determine smooth_max	2185	// first pass: determine smooth_max
…		…
1855	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2209	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1856		2210
1857	for (z = 0; z <= 2; z++)	2211	for (z = 0; z <= 2; z++)
1858	{	2212	{
1859	memset (smooth_level, 0, sizeof (smooth_level));	2213	memset (smooth_level, 0, sizeof (smooth_level));
		2214	key.texname = -1;
1860		2215
1861	for (y = 0; y < sh; y++)	2216	for (y = 0; y < sh; y++)
1862	if (0 <= y + my && y + my < self->rows)	2217	if (0 <= y + my && y + my < self->rows)
1863	{	2218	{
1864	maprow *row = self->row + (y + my);	2219	maprow *row = self->row + (y + my);
…		…
1874	maptex tex = self->tex [tile];	2229	maptex tex = self->tex [tile];
1875	int px, py;	2230	int px, py;
1876		2231
1877	if (key.texname != tex.name)	2232	if (key.texname != tex.name)
1878	{	2233	{
		2234	self->tex [tile].unused = 0;
		2235
1879	if (!tex.name)	2236	if (!tex.name)
1880	tex = self->tex [2]; /* missing, replace by noface */	2237	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1881		2238
1882	key.texname = tex.name;	2239	key.texname = tex.name;
1883	arr = rc_array (rc, &key);	2240	arr = rc_array (rc, &key);
1884	}	2241	}
1885		2242
1886	px = (x + 1) * T - tex.w;	2243	px = (x + 1) * T - tex.w;
1887	py = (y + 1) * T - tex.h;	2244	py = (y + 1) * T - tex.h;
		2245
		2246	if (expect_false (cell->player == player) && expect_false (z == 2))
		2247	{
		2248	pl_x = px;
		2249	pl_y = py;
		2250	pl_tex = tex;
		2251	continue;
		2252	}
1888		2253
1889	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2254	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2255	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1891	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2256	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1892	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2257	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1893
1894	if (cell->flags && z == 2)
1895	{
1896	// overlays such as the speech bubble, probably more to come
1897	if (cell->flags & 1)
1898	{
1899	maptex tex = self->tex [1];
1900	int px = x * T + T * 2 / 32;
1901	int py = y * T - T * 6 / 32;
1902
1903	if (tex.name)
1904	{
1905	if (key.texname != tex.name)
1906	{
1907	key.texname = tex.name;
1908	arr = rc_array (rc, &key);
1909	}
1910
1911	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1912	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1913	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1914	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1915	}
1916	}
1917	}
1918		2258
1919	// update smooth hash	2259	// update smooth hash
1920	if (tex.smoothtile)	2260	if (tex.smoothtile)
1921	{	2261	{
1922	skey.tile = tex.smoothtile;	2262	skey.tile = tex.smoothtile;
…		…
1951	// corners	2291	// corners
1952	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2292	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1953	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2293	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1954	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2294	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1955	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2295	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2296	}
		2297	}
		2298
		2299	if (expect_false (z == 2) && expect_false (cell->flags))
		2300	{
		2301	// overlays such as the speech bubble, probably more to come
		2302	if (cell->flags & 1)
		2303	{
		2304	rc_key_t key_ov = key;
		2305	maptex tex = self->tex [TEXID_SPEECH];
		2306	rc_array_t *arr;
		2307	int px = x * T + T * 2 / 32;
		2308	int py = y * T - T * 6 / 32;
		2309
		2310	key_ov.texname = tex.name;
		2311	arr = rc_array (rc_ov, &key_ov);
		2312
		2313	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2314	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2315	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2316	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1956	}	2317	}
1957	}	2318	}
1958	}	2319	}
1959	}	2320	}
1960		2321
…		…
2000	{	2361	{
2001	// this time avoiding texture state changes	2362	// this time avoiding texture state changes
2002	// save gobs of state changes.	2363	// save gobs of state changes.
2003	if (key.texname != tex.name)	2364	if (key.texname != tex.name)
2004	{	2365	{
		2366	self->tex [skey->tile].unused = 0;
		2367
2005	glEnd ();	2368	glEnd ();
2006	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2369	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2007	glBegin (GL_QUADS);	2370	glBegin (GL_QUADS);
2008	}	2371	}
2009		2372
…		…
2038	}	2401	}
2039		2402
2040	hv_clear (smooth);	2403	hv_clear (smooth);
2041	}	2404	}
2042		2405
		2406	if (pl_tex.name)
		2407	{
		2408	maptex tex = pl_tex;
		2409	int px = pl_x + sdx;
		2410	int py = pl_y + sdy;
		2411
		2412	key.texname = tex.name;
		2413	arr = rc_array (rc, &key);
		2414
		2415	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2416	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
		2417	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2418	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
		2419
		2420	rc_draw (rc);
		2421	}
		2422
		2423	rc_draw (rc_ov);
		2424	rc_clear (rc_ov);
		2425
2043	glDisable (GL_BLEND);	2426	glDisable (GL_BLEND);
2044	rc_free (rc);	2427	rc_free (rc);
		2428	rc_free (rc_ov);
2045		2429
2046	// top layer: overlays such as the health bar	2430	// top layer: overlays such as the health bar
2047	for (y = 0; y < sh; y++)	2431	for (y = 0; y < sh; y++)
2048	if (0 <= y + my && y + my < self->rows)	2432	if (0 <= y + my && y + my < self->rows)
2049	{	2433	{
…		…
2054	{	2438	{
2055	mapcell *cell = row->col + (x + mx - row->c0);	2439	mapcell *cell = row->col + (x + mx - row->c0);
2056		2440
2057	int px = x * T;	2441	int px = x * T;
2058	int py = y * T;	2442	int py = y * T;
		2443
		2444	if (expect_false (cell->player == player))
		2445	{
		2446	px += sdx;
		2447	py += sdy;
		2448	}
2059		2449
2060	if (cell->stat_hp)	2450	if (cell->stat_hp)
2061	{	2451	{
2062	int width = cell->stat_width * T;	2452	int width = cell->stat_width * T;
2063	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2453	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2074	}	2464	}
2075	}	2465	}
2076	}	2466	}
2077		2467
2078	void	2468	void
2079	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2469	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2080	CODE:	2470	CODE:
2081	{	2471	{
2082	static float color[16][3] = {	2472	static float color[16][3] = {
2083	{ 0.00F, 0.00F, 0.00F },	2473	{ 0.00f, 0.00f, 0.00f },
2084	{ 1.00F, 1.00F, 1.00F },	2474	{ 1.00f, 1.00f, 1.00f },
2085	{ 0.00F, 0.00F, 0.55F },	2475	{ 0.00f, 0.00f, 0.55f },
2086	{ 1.00F, 0.00F, 0.00F },	2476	{ 1.00f, 0.00f, 0.00f },
2087		2477
2088	{ 1.00F, 0.54F, 0.00F },	2478	{ 1.00f, 0.54f, 0.00f },
2089	{ 0.11F, 0.56F, 1.00F },	2479	{ 0.11f, 0.56f, 1.00f },
2090	{ 0.93F, 0.46F, 0.00F },	2480	{ 0.93f, 0.46f, 0.00f },
2091	{ 0.18F, 0.54F, 0.34F },	2481	{ 0.18f, 0.54f, 0.34f },
2092		2482
2093	{ 0.56F, 0.73F, 0.56F },	2483	{ 0.56f, 0.73f, 0.56f },
2094	{ 0.80F, 0.80F, 0.80F },	2484	{ 0.80f, 0.80f, 0.80f },
2095	{ 0.55F, 0.41F, 0.13F },	2485	{ 0.55f, 0.41f, 0.13f },
2096	{ 0.99F, 0.77F, 0.26F },	2486	{ 0.99f, 0.77f, 0.26f },
2097		2487
2098	{ 0.74F, 0.65F, 0.41F },	2488	{ 0.74f, 0.65f, 0.41f },
2099		2489
2100	{ 0.00F, 1.00F, 1.00F },	2490	{ 0.00f, 1.00f, 1.00f },
2101	{ 1.00F, 0.00F, 1.00F },	2491	{ 1.00f, 0.00f, 1.00f },
2102	{ 1.00F, 1.00F, 0.00F },	2492	{ 1.00f, 1.00f, 0.00f },
2103	};	2493	};
2104		2494
2105	int x, y;	2495	int x, y;
2106		2496
2107	glEnable (GL_TEXTURE_2D);	2497	glEnable (GL_TEXTURE_2D);
		2498	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2499	* but the nvidia driver (185.18.14) mishandles alpha textures
		2500	* and takes the colour from god knows where instead of using
		2501	* Cp. MODULATE results in the same colour, but slightly different
		2502	* alpha, but atcually gives us the correct colour with nvidia.
		2503	*/
2108	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2504	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2109	glEnable (GL_BLEND);	2505	glEnable (GL_BLEND);
2110	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2506	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2111	glBegin (GL_QUADS);	2507	glBegin (GL_QUADS);
2112		2508
2113	for (y = 0; y < h; y++)	2509	for (y = 0; y < h; y++)
…		…
2117		2513
2118	if (m)	2514	if (m)
2119	{	2515	{
2120	float *c = color [m & 15];	2516	float *c = color [m & 15];
2121		2517
2122	float tx1 = m & 0x40 ? 0.5 : 0.;	2518	float tx1 = m & 0x40 ? 0.5f : 0.f;
2123	float tx2 = tx1 + 0.5;	2519	float tx2 = tx1 + 0.5f;
2124		2520
2125	glColor4f (c[0], c[1], c[2], 0.75);	2521	glColor4f (c[0], c[1], c[2], 1);
2126	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2522	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2127	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2523	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2128	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2524	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2129	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2525	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2130	}	2526	}
…		…
2138	void	2534	void
2139	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2535	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2140	PPCODE:	2536	PPCODE:
2141	{	2537	{
2142	int x, y;	2538	int x, y;
2143	int sw1 = sw + 2;	2539	int sw1 = sw + 2;
2144	int sh1 = sh + 2;	2540	int sh1 = sh + 2;
2145	int sh3 = sh * 3;	2541	int sh3 = sh * 3;
2146	int sw34 = (sw * 3 + 3) & ~3;	2542	int sw3 = sw * 3;
2147	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2543	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2148	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2544	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
2149	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);	2545	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2150		2546
2151	SvPOK_only (darkness3_sv);	2547	SvPOK_only (darkness3_sv);
2152	SvCUR_set (darkness3_sv, sw34 * sh3);	2548	SvCUR_set (darkness3_sv, sw3 * sh3);
2153		2549
2154	mx += self->x - 1;	2550	mx += self->x - 1;
2155	my += self->y - 1;	2551	my += self->y - 1;
2156
2157	memset (darkness1, 255, sw1 * sh1);
2158		2552
2159	for (y = 0; y < sh1; y++)	2553	for (y = 0; y < sh1; y++)
2160	if (0 <= y + my && y + my < self->rows)	2554	if (0 <= y + my && y + my < self->rows)
2161	{	2555	{
2162	maprow *row = self->row + (y + my);	2556	maprow *row = self->row + (y + my);
…		…
2165	if (row->c0 <= x + mx && x + mx < row->c1)	2559	if (row->c0 <= x + mx && x + mx < row->c1)
2166	{	2560	{
2167	mapcell *cell = row->col + (x + mx - row->c0);	2561	mapcell *cell = row->col + (x + mx - row->c0);
2168		2562
2169	darkness1 [y * sw1 + x] = cell->darkness	2563	darkness1 [y * sw1 + x] = cell->darkness
2170	? 255 - (cell->darkness - 1)	2564	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2171	: 255 - FOW_DARKNESS;	2565	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2172	}	2566	}
2173	}	2567	}
2174		2568
2175	for (y = 0; y < sh; ++y)	2569	for (y = 0; y < sh; ++y)
2176	for (x = 0; x < sw; ++x)	2570	for (x = 0; x < sw; ++x)
…		…
2195		2589
2196	uint8_t r13 = (d13 + d23 + d12) / 3;	2590	uint8_t r13 = (d13 + d23 + d12) / 3;
2197	uint8_t r23 = d23;	2591	uint8_t r23 = d23;
2198	uint8_t r33 = (d23 + d33 + d32) / 3;	2592	uint8_t r33 = (d23 + d33 + d32) / 3;
2199		2593
2200	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2594	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2201	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2595	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2202	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2596	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2203	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2597	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2204	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2598	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2205	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2599	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2206	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2600	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2207	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2601	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2208	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2602	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2209	}	2603	}
2210		2604
2211	free (darkness1);	2605	free (darkness1);
2212		2606
2213	EXTEND (SP, 3);	2607	EXTEND (SP, 3);
2214	PUSHs (sv_2mortal (newSViv (sw34)));	2608	PUSHs (sv_2mortal (newSViv (sw3)));
2215	PUSHs (sv_2mortal (newSViv (sh3)));	2609	PUSHs (sv_2mortal (newSViv (sh3)));
2216	PUSHs (darkness3_sv);	2610	PUSHs (darkness3_sv);
2217	}	2611	}
2218		2612
2219	SV *	2613	SV *
…		…
2282	else	2676	else
2283	*data++ = 0;	2677	*data++ = 0;
2284	}	2678	}
2285	}	2679	}
2286		2680
		2681	/* if size is wh + 5 then no data has been found /
		2682	if (data - (uint8_t )SvPVX (data_sv) != w h + 5)
		2683	{
2287	SvPOK_only (data_sv);	2684	SvPOK_only (data_sv);
2288	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));	2685	SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
		2686	}
		2687
2289	RETVAL = data_sv;	2688	RETVAL = data_sv;
2290	}	2689	}
2291	OUTPUT:	2690	OUTPUT:
2292	RETVAL	2691	RETVAL
2293		2692
2294	void	2693	void
2295	set_rect (DC::Map self, int x0, int y0, uint8_t *data)	2694	set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296	PPCODE:	2695	PPCODE:
2297	{	2696	{
2298	int x, y, z;	2697	int x, y, z;
2299	int w, h;	2698	int w, h;
2300	int x1, y1;	2699	int x1, y1;
		2700	STRLEN len;
		2701	uint8_t data, end;
		2702
		2703	len = SvLEN (data_sv);
		2704	SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
		2705	data = SvPVbyte_nolen (data_sv);
		2706	end = data + len + 8;
		2707
		2708	if (len < 5)
		2709	XSRETURN_EMPTY;
2301		2710
2302	if (*data++ != 0)	2711	if (*data++ != 0)
2303	XSRETURN_EMPTY; /* version mismatch */	2712	XSRETURN_EMPTY; /* version mismatch */
2304		2713
2305	w = data++ << 8; w \|= data++;	2714	w = data++ << 8; w \|= data++;
…		…
2320	{	2729	{
2321	maprow *row = map_get_row (self, y);	2730	maprow *row = map_get_row (self, y);
2322		2731
2323	for (x = x0; x < x1; x++)	2732	for (x = x0; x < x1; x++)
2324	{	2733	{
		2734	uint8_t flags;
		2735
		2736	if (data + 7 >= end)
		2737	XSRETURN_EMPTY;
		2738
2325	uint8_t flags = *data++;	2739	flags = *data++;
2326		2740
2327	if (flags)	2741	if (flags)
2328	{	2742	{
2329	mapcell *cell = row_get_cell (row, x);	2743	mapcell *cell = row_get_cell (row, x);
2330	tileid tile[3] = { 0, 0, 0 };	2744	tileid tile[3] = { 0, 0, 0 };
…		…
2333	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }	2747	if (flags & 2) { tile[1] = data++ << 8; tile[1] \|= data++; }
2334	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }	2748	if (flags & 4) { tile[2] = data++ << 8; tile[2] \|= data++; }
2335		2749
2336	if (cell->darkness == 0)	2750	if (cell->darkness == 0)
2337	{	2751	{
2338	cell->darkness = 0;	2752	/cell->darkness = 0;/
		2753	EXTEND (SP, 3);
2339		2754
2340	for (z = 0; z <= 2; z++)	2755	for (z = 0; z <= 2; z++)
2341	{	2756	{
2342	tileid t = tile [z];	2757	tileid t = tile [z];
2343		2758
2344	if (t >= self->texs \|\| (t && !self->tex [t].name))	2759	if (t >= self->texs \|\| (t && !self->tex [t].name))
2345	{	2760	{
2346	XPUSHs (sv_2mortal (newSViv (t)));	2761	PUSHs (sv_2mortal (newSViv (t)));
2347	need_texid (self, t);	2762	need_texid (self, t);
2348	}	2763	}
2349		2764
2350	cell->tile [z] = t;	2765	cell->tile [z] = t;
2351	}	2766	}
…		…
2396	if (RETVAL < 0)	2811	if (RETVAL < 0)
2397	{	2812	{
2398	RETVAL = Mix_GroupOldest (-1);	2813	RETVAL = Mix_GroupOldest (-1);
2399		2814
2400	if (RETVAL < 0)	2815	if (RETVAL < 0)
		2816	{
		2817	// happens sometimes, maybe it just stopped playing(?)
		2818	RETVAL = Mix_GroupAvailable (-1);
		2819
		2820	if (RETVAL < 0)
2401	XSRETURN_UNDEF;	2821	XSRETURN_UNDEF;
2402		2822	}
		2823	else
2403	Mix_HaltChannel (RETVAL);	2824	Mix_HaltChannel (RETVAL);
2404	}	2825	}
2405		2826
2406	Mix_UnregisterAllEffects (RETVAL);	2827	Mix_UnregisterAllEffects (RETVAL);
2407	Mix_Volume (RETVAL, 128);	2828	Mix_Volume (RETVAL, 128);
2408	}	2829	}
…		…
2455	void	2876	void
2456	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2877	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2457	CODE:	2878	CODE:
2458	{	2879	{
2459	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2880	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2460	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2881	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2461	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2882	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2462	}	2883	}
2463		2884
2464	void	2885	void
2465	set_reverse_stereo (DC::Channel self, int flip)	2886	set_reverse_stereo (DC::Channel self, int flip)
…		…
2467	Mix_SetReverseStereo (self, flip);	2888	Mix_SetReverseStereo (self, flip);
2468		2889
2469	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2890	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2470		2891
2471	PROTOTYPES: DISABLE	2892	PROTOTYPES: DISABLE
		2893
		2894	void
		2895	decoders ()
		2896	PPCODE:
		2897	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2898	int i, num = Mix_GetNumChunkDecoders ();
		2899	EXTEND (SP, num);
		2900	for (i = 0; i < num; ++i)
		2901	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2902	#else
		2903	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2904	#endif
2472		2905
2473	DC::MixChunk	2906	DC::MixChunk
2474	new (SV *class, DC::RW rwops)	2907	new (SV *class, DC::RW rwops)
2475	CODE:	2908	CODE:
2476	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2909	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2509	OUTPUT:	2942	OUTPUT:
2510	RETVAL	2943	RETVAL
2511		2944
2512	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2945	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2513		2946
		2947	void
		2948	decoders ()
		2949	PPCODE:
		2950	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2951	int i, num = Mix_GetNumMusicDecoders ();
		2952	EXTEND (SP, num);
		2953	for (i = 0; i < num; ++i)
		2954	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		2955	#else
		2956	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2957	#endif
		2958
2514	int	2959	int
2515	volume (int volume = -1)	2960	volume (int volume = -1)
2516	PROTOTYPE: ;$	2961	PROTOTYPE: ;$
2517	CODE:	2962	CODE:
2518	if (items > 0)	2963	if (items > 0)
…		…
2528		2973
2529	void	2974	void
2530	halt ()	2975	halt ()
2531	CODE:	2976	CODE:
2532	Mix_HaltMusic ();	2977	Mix_HaltMusic ();
		2978
		2979	int
		2980	playing ()
		2981	CODE:
		2982	RETVAL = Mix_PlayingMusic ();
		2983	OUTPUT:
		2984	RETVAL
2533		2985
2534	DC::MixMusic	2986	DC::MixMusic
2535	new (SV *class, DC::RW rwops)	2987	new (SV *class, DC::RW rwops)
2536	CODE:	2988	CODE:
2537	RETVAL = Mix_LoadMUS_RW (rwops);	2989	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2568	} *civ, const_iv[] = {	3020	} *civ, const_iv[] = {
2569	# define const_iv(name) { # name, (IV)name }	3021	# define const_iv(name) { # name, (IV)name }
2570	const_iv (GL_VENDOR),	3022	const_iv (GL_VENDOR),
2571	const_iv (GL_VERSION),	3023	const_iv (GL_VERSION),
2572	const_iv (GL_EXTENSIONS),	3024	const_iv (GL_EXTENSIONS),
		3025	const_iv (GL_MAX_TEXTURE_UNITS),
2573	const_iv (GL_COLOR_MATERIAL),	3026	const_iv (GL_COLOR_MATERIAL),
2574	const_iv (GL_SMOOTH),	3027	const_iv (GL_SMOOTH),
2575	const_iv (GL_FLAT),	3028	const_iv (GL_FLAT),
2576	const_iv (GL_DITHER),	3029	const_iv (GL_DITHER),
2577	const_iv (GL_BLEND),	3030	const_iv (GL_BLEND),
…		…
2589	const_iv (GL_ZERO),	3042	const_iv (GL_ZERO),
2590	const_iv (GL_SRC_ALPHA),	3043	const_iv (GL_SRC_ALPHA),
2591	const_iv (GL_DST_ALPHA),	3044	const_iv (GL_DST_ALPHA),
2592	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3045	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2593	const_iv (GL_ONE_MINUS_DST_ALPHA),	3046	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3047	const_iv (GL_SRC_COLOR),
		3048	const_iv (GL_DST_COLOR),
		3049	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3050	const_iv (GL_ONE_MINUS_DST_COLOR),
2594	const_iv (GL_SRC_ALPHA_SATURATE),	3051	const_iv (GL_SRC_ALPHA_SATURATE),
2595	const_iv (GL_RGB),	3052	const_iv (GL_RGB),
2596	const_iv (GL_RGBA),	3053	const_iv (GL_RGBA),
2597	const_iv (GL_RGBA4),	3054	const_iv (GL_RGBA4),
2598	const_iv (GL_RGBA8),	3055	const_iv (GL_RGBA8),
…		…
2666	const_iv (GL_NICEST),	3123	const_iv (GL_NICEST),
2667	const_iv (GL_V2F),	3124	const_iv (GL_V2F),
2668	const_iv (GL_V3F),	3125	const_iv (GL_V3F),
2669	const_iv (GL_T2F_V3F),	3126	const_iv (GL_T2F_V3F),
2670	const_iv (GL_T2F_N3F_V3F),	3127	const_iv (GL_T2F_N3F_V3F),
		3128	const_iv (GL_FUNC_ADD),
		3129	const_iv (GL_FUNC_SUBTRACT),
		3130	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2671	# undef const_iv	3131	# undef const_iv
2672	};	3132	};
2673		3133
2674	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3134	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2675	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3135	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2682	disable_GL_EXT_blend_func_separate ()	3142	disable_GL_EXT_blend_func_separate ()
2683	CODE:	3143	CODE:
2684	gl.BlendFuncSeparate = 0;	3144	gl.BlendFuncSeparate = 0;
2685	gl.BlendFuncSeparateEXT = 0;	3145	gl.BlendFuncSeparateEXT = 0;
2686		3146
		3147	void
		3148	apple_nvidia_bug (int enable)
		3149
2687	char *	3150	char *
2688	gl_vendor ()	3151	gl_vendor ()
2689	CODE:	3152	CODE:
2690	RETVAL = (char *)glGetString (GL_VENDOR);	3153	RETVAL = (char *)glGetString (GL_VENDOR);
2691	OUTPUT:	3154	OUTPUT:
…		…
2721		3184
2722	int glGetError ()	3185	int glGetError ()
2723		3186
2724	void glFinish ()	3187	void glFinish ()
2725		3188
		3189	void glFlush ()
		3190
2726	void glClear (int mask)	3191	void glClear (int mask)
2727		3192
2728	void glClearColor (float r, float g, float b, float a = 1.0)	3193	void glClearColor (float r, float g, float b, float a = 1.0)
2729	PROTOTYPE: @	3194	PROTOTYPE: @
2730		3195
…		…
2739	void glBlendFunc (int sfactor, int dfactor)	3204	void glBlendFunc (int sfactor, int dfactor)
2740		3205
2741	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3206	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2742	CODE:	3207	CODE:
2743	gl_BlendFuncSeparate (sa, da, saa, daa);	3208	gl_BlendFuncSeparate (sa, da, saa, daa);
		3209
		3210	# void glBlendEquation (int se)
2744		3211
2745	void glDepthMask (int flag)	3212	void glDepthMask (int flag)
2746		3213
2747	void glLogicOp (int opcode)	3214	void glLogicOp (int opcode)
2748		3215
…		…
2783	void glRotate (float angle, float x, float y, float z)	3250	void glRotate (float angle, float x, float y, float z)
2784	CODE:	3251	CODE:
2785	glRotatef (angle, x, y, z);	3252	glRotatef (angle, x, y, z);
2786		3253
2787	void glColor (float r, float g, float b, float a = 1.0)	3254	void glColor (float r, float g, float b, float a = 1.0)
		3255	PROTOTYPE: @
2788	ALIAS:	3256	ALIAS:
2789	glColor_premultiply = 1	3257	glColor_premultiply = 1
2790	CODE:	3258	CODE:
2791	if (ix)	3259	if (ix)
2792	{	3260	{
…		…
2897	void glNewList (int list, int mode = GL_COMPILE)	3365	void glNewList (int list, int mode = GL_COMPILE)
2898		3366
2899	void glEndList ()	3367	void glEndList ()
2900		3368
2901	void glCallList (int list)	3369	void glCallList (int list)
		3370
		3371	void c_init ()
		3372	CODE:
		3373	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3374	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2902		3375
2903	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3376	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2904		3377
2905	PROTOTYPES: DISABLE	3378	PROTOTYPES: DISABLE
2906		3379

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs. Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.253 by root, Fri Dec 28 20:59:14 2007 UTC vs.
Revision 1.304 by root, Fri Apr 23 16:30:38 2010 UTC