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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 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>
…		…
38	#include <SDL_thread.h>	37	#include <SDL_thread.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>
		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
43		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>
…		…
76	#define expect_false(expr) expect ((expr) != 0, 0)	82	#define expect_false(expr) expect ((expr) != 0, 0)
77	#define expect_true(expr) expect ((expr) != 0, 1)	83	#define expect_true(expr) expect ((expr) != 0, 1)
78		84
79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	85	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80		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 */
81	#define FOW_DARKNESS 32	89	#define FOW_DARKNESS 50
		90	#define DARKNESS_ADJUST(n) (n)
82		91
83	#define MAP_EXTEND_X 32	92	#define MAP_EXTEND_X 32
84	#define MAP_EXTEND_Y 512	93	#define MAP_EXTEND_Y 512
85		94
86	#define MIN_FONT_HEIGHT 10	95	#define MIN_FONT_HEIGHT 10
87		96
88	/* mask out modifiers we are not interested in */	97	/* mask out modifiers we are not interested in */
89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	98	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
		99
		100	#define KMOD_LRAM 0x10000 // our extension
		101
		102	#define TEXID_SPEECH 1
		103	#define TEXID_NOFACE 2
		104
		105	static char *
		106	fast_sv_grow (SV *sv, STRLEN need)
		107	{
		108	STRLEN len = SvLEN (sv);
		109	STRLEN want = SvCUR (sv) + need;
		110
		111	if (expect_false (len < want))
		112	{
		113	do
		114	len *= 2;
		115	while (len < want);
		116
		117	sv_grow (sv, len);
		118	}
		119
		120	SvCUR_set (sv, want);
		121	return SvEND (sv) - need;
		122	}
90		123
91	static AV *texture_av;	124	static AV *texture_av;
92		125
93	static struct	126	static struct
94	{	127	{
…		…
226	int w, h;	259	int w, h;
227	float s, t;	260	float s, t;
228	uint8_t r, g, b, a;	261	uint8_t r, g, b, a;
229	tileid smoothtile;	262	tileid smoothtile;
230	uint8_t smoothlevel;	263	uint8_t smoothlevel;
		264	uint8_t unused; /* set to zero on use */
231	} maptex;	265	} maptex;
232		266
233	typedef struct {	267	typedef struct {
234	uint32_t player;	268	uint32_t player;
235	tileid tile[3];	269	tileid tile[3];
…		…
367	self->oy = 0;	401	self->oy = 0;
368	self->row = 0;	402	self->row = 0;
369	self->rows = 0;	403	self->rows = 0;
370	}	404	}
371		405
		406	#define CELL_CLEAR(cell) \
		407	do { \
		408	if ((cell)->player) \
		409	(cell)->tile [2] = 0; \
		410	(cell)->darkness = 0; \
		411	(cell)->stat_hp = 0; \
		412	(cell)->flags = 0; \
		413	(cell)->player = 0; \
		414	} while (0)
		415
372	static void	416	static void
373	map_blank (DC__Map self, int x0, int y0, int w, int h)	417	map_blank (DC__Map self, int x0, int y0, int w, int h)
374	{	418	{
375	int x, y;	419	int x, y;
376	maprow *row;	420	maprow *row;
…		…
390	if (x >= row->c1)	434	if (x >= row->c1)
391	break;	435	break;
392		436
393	cell = row->col + x - row->c0;	437	cell = row->col + x - row->c0;
394		438
395	cell->darkness = 0;	439	CELL_CLEAR (cell);
396	cell->stat_hp = 0;
397	cell->flags = 0;
398	cell->player = 0;
399	}	440	}
400	}	441	}
401	}	442	}
402		443
403	typedef struct {	444	typedef struct {
…		…
438	ev.code = 1;	479	ev.code = 1;
439	ev.data1 = (void *)(long)channel;	480	ev.data1 = (void *)(long)channel;
440	ev.data2 = 0;	481	ev.data2 = 0;
441		482
442	SDL_PushEvent ((SDL_Event *)&ev);	483	SDL_PushEvent ((SDL_Event *)&ev);
		484	}
		485
		486	static unsigned int
		487	div255 (unsigned int n)
		488	{
		489	return (n + (n >> 8)) >> 8;
443	}	490	}
444		491
445	static unsigned int	492	static unsigned int
446	minpot (unsigned int n)	493	minpot (unsigned int n)
447	{	494	{
…		…
514	if (!svp \|\| !SvTRUE (*svp))	561	if (!svp \|\| !SvTRUE (*svp))
515	return 0;	562	return 0;
516		563
517	return 1;	564	return 1;
518	}	565	}
		566
		567	/******************************************************************************/
		568
		569	/* process keyboard modifiers */
		570	static int
		571	mod_munge (int mod)
		572	{
		573	mod &= MOD_MASK;
		574
		575	if (mod & (KMOD_META \| KMOD_ALT))
		576	mod \|= KMOD_LRAM;
		577
		578	return mod;
		579	}
		580
		581	static void
		582	deliantra_main (SV *real_main)
		583	{
		584	dSP;
		585
		586	PUSHMARK (SP);
		587	call_sv (real_main, G_DISCARD \| G_VOID);
		588	}
		589
		590	#ifdef __MACOSX__
		591	static SV *real_main;
		592
		593	/* to due surprising braindamage on the side of SDL design, we
		594	* do some mind-boggling hack here: SDL requires a custom main()
		595	* on OS X, so... we provide one and call the original main(), which,
		596	* due to shared library magic, calls -lSDLmain's main, not perl's main,
		597	* and which calls our main (== SDL_main) back.
		598	*/
		599	extern C_LINKAGE int
		600	main (int argc, char *argv[])
		601	{
		602	deliantra_main (real_main);
		603	}
		604
		605	#undef main
		606
		607	extern C_LINKAGE int main (int argc, char *argv[]);
		608
		609	static void
		610	SDL_main_hack (SV *real_main_)
		611	{
		612	real_main = real_main_;
		613
		614	char *argv[] = { "deliantra client", 0 };
		615	(main) (1, argv);
		616	}
		617	#else
		618	static void
		619	SDL_main_hack (SV *real_main)
		620	{
		621	deliantra_main (real_main);
		622	}
		623	#endif
519		624
520	MODULE = Deliantra::Client PACKAGE = DC	625	MODULE = Deliantra::Client PACKAGE = DC
521		626
522	PROTOTYPES: ENABLE	627	PROTOTYPES: ENABLE
523		628
…		…
552	const_iv (SDL_USEREVENT),	657	const_iv (SDL_USEREVENT),
553		658
554	const_iv (SDL_APPINPUTFOCUS),	659	const_iv (SDL_APPINPUTFOCUS),
555	const_iv (SDL_APPMOUSEFOCUS),	660	const_iv (SDL_APPMOUSEFOCUS),
556	const_iv (SDL_APPACTIVE),	661	const_iv (SDL_APPACTIVE),
		662
		663
		664	const_iv (SDLK_UNKNOWN),
		665	const_iv (SDLK_FIRST),
		666	const_iv (SDLK_BACKSPACE),
		667	const_iv (SDLK_TAB),
		668	const_iv (SDLK_CLEAR),
		669	const_iv (SDLK_RETURN),
		670	const_iv (SDLK_PAUSE),
		671	const_iv (SDLK_ESCAPE),
		672	const_iv (SDLK_SPACE),
		673	const_iv (SDLK_EXCLAIM),
		674	const_iv (SDLK_QUOTEDBL),
		675	const_iv (SDLK_HASH),
		676	const_iv (SDLK_DOLLAR),
		677	const_iv (SDLK_AMPERSAND),
		678	const_iv (SDLK_QUOTE),
		679	const_iv (SDLK_LEFTPAREN),
		680	const_iv (SDLK_RIGHTPAREN),
		681	const_iv (SDLK_ASTERISK),
		682	const_iv (SDLK_PLUS),
		683	const_iv (SDLK_COMMA),
		684	const_iv (SDLK_MINUS),
		685	const_iv (SDLK_PERIOD),
		686	const_iv (SDLK_SLASH),
		687	const_iv (SDLK_0),
		688	const_iv (SDLK_1),
		689	const_iv (SDLK_2),
		690	const_iv (SDLK_3),
		691	const_iv (SDLK_4),
		692	const_iv (SDLK_5),
		693	const_iv (SDLK_6),
		694	const_iv (SDLK_7),
		695	const_iv (SDLK_8),
		696	const_iv (SDLK_9),
		697	const_iv (SDLK_COLON),
		698	const_iv (SDLK_SEMICOLON),
		699	const_iv (SDLK_LESS),
		700	const_iv (SDLK_EQUALS),
		701	const_iv (SDLK_GREATER),
		702	const_iv (SDLK_QUESTION),
		703	const_iv (SDLK_AT),
		704
		705	const_iv (SDLK_LEFTBRACKET),
		706	const_iv (SDLK_BACKSLASH),
		707	const_iv (SDLK_RIGHTBRACKET),
		708	const_iv (SDLK_CARET),
		709	const_iv (SDLK_UNDERSCORE),
		710	const_iv (SDLK_BACKQUOTE),
		711	const_iv (SDLK_DELETE),
557		712
558	const_iv (SDLK_FIRST),	713	const_iv (SDLK_FIRST),
559	const_iv (SDLK_LAST),	714	const_iv (SDLK_LAST),
560	const_iv (SDLK_KP0),	715	const_iv (SDLK_KP0),
561	const_iv (SDLK_KP1),	716	const_iv (SDLK_KP1),
…		…
637	const_iv (KMOD_RMETA),	792	const_iv (KMOD_RMETA),
638	const_iv (KMOD_NUM),	793	const_iv (KMOD_NUM),
639	const_iv (KMOD_CAPS),	794	const_iv (KMOD_CAPS),
640	const_iv (KMOD_MODE),	795	const_iv (KMOD_MODE),
641		796
		797	const_iv (KMOD_LRAM),
		798
642	const_iv (MIX_DEFAULT_FORMAT),	799	const_iv (MIX_DEFAULT_FORMAT),
643		800
644	const_iv (SDL_INIT_TIMER),	801	const_iv (SDL_INIT_TIMER),
645	const_iv (SDL_INIT_AUDIO),	802	const_iv (SDL_INIT_AUDIO),
646	const_iv (SDL_INIT_VIDEO),	803	const_iv (SDL_INIT_VIDEO),
…		…
664	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),	821	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665	const_iv (SDL_GL_STEREO),	822	const_iv (SDL_GL_STEREO),
666	const_iv (SDL_GL_MULTISAMPLEBUFFERS),	823	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667	const_iv (SDL_GL_MULTISAMPLESAMPLES),	824	const_iv (SDL_GL_MULTISAMPLESAMPLES),
668	const_iv (SDL_GL_ACCELERATED_VISUAL),	825	const_iv (SDL_GL_ACCELERATED_VISUAL),
669	const_iv (SDL_GL_SWAP_CONTROL)	826	const_iv (SDL_GL_SWAP_CONTROL),
		827
		828	const_iv (FOW_DARKNESS)
670	# undef const_iv	829	# undef const_iv
671	};	830	};
672		831
673	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	832	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
674	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	833	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
675		834
676	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);	835	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
677	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);	836	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
678	}	837	}
679		838
…		…
695	NV ceil (NV x)	854	NV ceil (NV x)
696		855
697	IV minpot (UV n)	856	IV minpot (UV n)
698		857
699	IV popcount (UV n)	858	IV popcount (UV n)
		859
		860	NV distance (NV dx, NV dy)
		861	CODE:
		862	RETVAL = pow (dx * dx + dy * dy, 0.5);
		863	OUTPUT:
		864	RETVAL
700		865
701	void	866	void
702	pango_init ()	867	pango_init ()
703	CODE:	868	CODE:
704	{	869	{
…		…
712	#endif	877	#endif
713	}	878	}
714		879
715	char *SDL_GetError ()	880	char *SDL_GetError ()
716		881
		882	void SDL_main_hack (SV *real_main)
		883	PROTOTYPE: &
		884
717	int SDL_Init (U32 flags)	885	int SDL_Init (U32 flags)
718		886
719	int SDL_InitSubSystem (U32 flags)	887	int SDL_InitSubSystem (U32 flags)
720		888
721	void SDL_QuitSubSystem (U32 flags)	889	void SDL_QuitSubSystem (U32 flags)
…		…
756	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	924	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
757		925
758	if (m && m != (SDL_Rect **)-1)	926	if (m && m != (SDL_Rect **)-1)
759	while (*m)	927	while (*m)
760	{	928	{
		929	if ((m)->w >= 400 && (m)->h >= 300)
		930	{
761	AV *av = newAV ();	931	AV *av = newAV ();
762	av_push (av, newSViv ((*m)->w));	932	av_push (av, newSViv ((*m)->w));
763	av_push (av, newSViv ((*m)->h));	933	av_push (av, newSViv ((*m)->h));
764	av_push (av, newSViv (rgb));	934	av_push (av, newSViv (rgb));
765	av_push (av, newSViv (alpha));	935	av_push (av, newSViv (alpha));
766	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	936	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		937	}
767		938
768	++m;	939	++m;
769	}	940	}
770	}	941	}
771		942
…		…
786	);	957	);
787		958
788	if (RETVAL)	959	if (RETVAL)
789	{	960	{
790	av_clear (texture_av);	961	av_clear (texture_av);
791
792	SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
793	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	962	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
794	#include "glfunc.h"	963	#include "glfunc.h"
795	#undef GL_FUNC	964	#undef GL_FUNC
		965	if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
		966	if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
796	}	967	}
797	}	968	}
798	OUTPUT:	969	OUTPUT:
799	RETVAL	970	RETVAL
800		971
801	void	972	void
		973	SDL_WM_SetCaption (const char title, const char icon)
		974
		975	void
802	SDL_GL_SwapBuffers ()	976	SDL_GL_SwapBuffers ()
803		977
804	char *	978	char *
805	SDL_GetKeyName (int sym)	979	SDL_GetKeyName (int sym)
806		980
…		…
808	SDL_GetAppState ()	982	SDL_GetAppState ()
809		983
810	int	984	int
811	SDL_GetModState ()	985	SDL_GetModState ()
812		986
		987	int
		988	SDL_WaitEvent ()
		989	C_ARGS: 0
		990
813	void	991	void
		992	SDL_PumpEvents ()
		993
		994	void
814	poll_events ()	995	peep_events ()
815	PPCODE:	996	PPCODE:
816	{	997	{
817	SDL_Event ev;	998	SDL_Event ev;
818		999
819	SDL_PumpEvents ();	1000	SDL_PumpEvents ();
…		…
826	{	1007	{
827	case SDL_KEYDOWN:	1008	case SDL_KEYDOWN:
828	case SDL_KEYUP:	1009	case SDL_KEYUP:
829	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	1010	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
830	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	1011	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
831	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	1012	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
832	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	1013	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
833	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	1014	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
834	break;	1015	break;
835		1016
836	case SDL_ACTIVEEVENT:	1017	case SDL_ACTIVEEVENT:
837	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	1018	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
855	x = ev.motion.x;	1036	x = ev.motion.x;
856	y = ev.motion.y;	1037	y = ev.motion.y;
857	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	1038	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
858	}	1039	}
859		1040
860	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	1041	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
861	hv_store (hv, "state", 5, newSViv (state), 0);	1042	hv_store (hv, "state", 5, newSViv (state), 0);
862	hv_store (hv, "x", 1, newSViv (x), 0);	1043	hv_store (hv, "x", 1, newSViv (x), 0);
863	hv_store (hv, "y", 1, newSViv (y), 0);	1044	hv_store (hv, "y", 1, newSViv (y), 0);
864	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	1045	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
865	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	1046	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
885		1066
886	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));	1067	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
887	}	1068	}
888	}	1069	}
889		1070
		1071	char *
		1072	SDL_AudioDriverName ()
		1073	CODE:
		1074	{
		1075	char buf [256];
		1076	if (!SDL_AudioDriverName (buf, sizeof (buf)))
		1077	XSRETURN_UNDEF;
		1078
		1079	RETVAL = buf;
		1080	}
		1081	OUTPUT:
		1082	RETVAL
		1083
890	int	1084	int
891	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	1085	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
892	POSTCALL:	1086	POSTCALL:
893	Mix_HookMusicFinished (music_finished);	1087	Mix_HookMusicFinished (music_finished);
894	Mix_ChannelFinished (channel_finished);	1088	Mix_ChannelFinished (channel_finished);
…		…
956	add_font (char *file)	1150	add_font (char *file)
957	CODE:	1151	CODE:
958	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);	1152	RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959	OUTPUT:	1153	OUTPUT:
960	RETVAL	1154	RETVAL
		1155
		1156	void
		1157	IMG_Init (int flags = IMG_INIT_JPG \| IMG_INIT_PNG)
		1158
		1159	# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
		1160	void
		1161	Mix_Init (int flags = MIX_INIT_MOD \| MIX_INIT_OGG)
961		1162
962	void	1163	void
963	load_image_inline (SV *image_)	1164	load_image_inline (SV *image_)
964	ALIAS:	1165	ALIAS:
965	load_image_file = 1	1166	load_image_file = 1
…		…
1081	#if DEBUG	1282	#if DEBUG
1082	VALGRIND_DO_LEAK_CHECK;	1283	VALGRIND_DO_LEAK_CHECK;
1083	#endif	1284	#endif
1084	}	1285	}
1085		1286
		1287	int
		1288	SvREFCNT (SV *sv)
		1289	CODE:
		1290	RETVAL = SvREFCNT (sv);
		1291	OUTPUT:
		1292	RETVAL
		1293
1086	MODULE = Deliantra::Client PACKAGE = DC::Font	1294	MODULE = Deliantra::Client PACKAGE = DC::Font
1087		1295
1088	PROTOTYPES: DISABLE	1296	PROTOTYPES: DISABLE
1089		1297
1090	DC::Font	1298	DC::Font
…		…
1519	if (ix)	1727	if (ix)
1520	{	1728	{
1521	glDisable (GL_ALPHA_TEST);	1729	glDisable (GL_ALPHA_TEST);
1522	glDisable (GL_BLEND);	1730	glDisable (GL_BLEND);
1523	}	1731	}
		1732	}
		1733
		1734	void
		1735	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)
		1736	PROTOTYPE: @
		1737	CODE:
		1738	{
		1739	glEnable (GL_BLEND);
		1740	glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1741	glEnable (GL_TEXTURE_2D);
		1742	glBindTexture (GL_TEXTURE_2D, name1);
		1743
		1744	glColor3f (intensity, intensity, intensity);
		1745	glPushMatrix ();
		1746	glScalef (1./3, 1./3, 1.);
		1747
		1748	if (blend > 0.f)
		1749	{
		1750	float dx3 = dx * -3.f / w;
		1751	float dy3 = dy * -3.f / h;
		1752	GLfloat env_color[4] = { 0., 0., 0., blend };
		1753
		1754	/* interpolate the two shadow textures */
		1755	/* stage 0 == rgb(glcolor) + alpha(t0) */
		1756	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1757
		1758	/* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
		1759	gl.ActiveTexture (GL_TEXTURE1);
		1760	glEnable (GL_TEXTURE_2D);
		1761	glBindTexture (GL_TEXTURE_2D, name2);
		1762	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
		1763
		1764	/* rgb == rgb(glcolor) */
		1765	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
		1766	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
		1767	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
		1768
		1769	/* alpha = interpolate t0, t1 by env_alpha */
		1770	glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
		1771
		1772	glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
		1773	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
		1774	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
		1775
		1776	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
		1777	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
		1778
		1779	glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
		1780	glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
		1781
		1782	glBegin (GL_QUADS);
		1783	gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
		1784	gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
		1785	gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
		1786	gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
		1787	glEnd ();
		1788
		1789	glDisable (GL_TEXTURE_2D);
		1790	gl.ActiveTexture (GL_TEXTURE0);
		1791	}
		1792	else
		1793	{
		1794	/* simple blending of one texture, also opengl <1.3 path */
		1795	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1796
		1797	glBegin (GL_QUADS);
		1798	glTexCoord2f (0, 0); glVertex2f (0, 0);
		1799	glTexCoord2f (0, t); glVertex2f (0, h);
		1800	glTexCoord2f (s, t); glVertex2f (w, h);
		1801	glTexCoord2f (s, 0); glVertex2f (w, 0);
		1802	glEnd ();
		1803	}
		1804
		1805	/* draw ?-marks or equivalent, this is very clumsy code :/ */
		1806	{
		1807	int x, y;
		1808	int dx3 = dx * 3;
		1809	int dy3 = dy * 3;
		1810
		1811	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1812	glBindTexture (GL_TEXTURE_2D, hidden_tex);
		1813	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1814	glTranslatef (-1., -1., 0);
		1815	glBegin (GL_QUADS);
		1816
		1817	for (y = 1; y < h; y += 3)
		1818	{
		1819	int y1 = y - dy3;
		1820	int y1valid = y1 >= 0 && y1 < h;
		1821
		1822	for (x = 1; x < w; x += 3)
		1823	{
		1824	int x1 = x - dx3;
		1825	uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1826	uint8_t h2;
		1827
		1828	if (y1valid && x1 >= 0 && x1 < w)
		1829	h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
		1830	else
		1831	h2 = 1; /* out of range == invisible */
		1832
		1833	if (h1 \|\| h2)
		1834	{
		1835	float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
		1836	glColor4f (1., 1., 1., alpha);
		1837
		1838	glTexCoord2f (0, 0.); glVertex2i (x , y );
		1839	glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
		1840	glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
		1841	glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
		1842	}
		1843	}
		1844	}
		1845	}
		1846
		1847	glEnd ();
		1848
		1849	glPopMatrix ();
		1850
		1851	glDisable (GL_TEXTURE_2D);
		1852	glDisable (GL_BLEND);
1524	}	1853	}
1525		1854
1526	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1855	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1527	CODE:	1856	CODE:
1528	{	1857	{
…		…
1634	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1963	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1635	// use uglier nearest interpolation because linear suffers	1964	// use uglier nearest interpolation because linear suffers
1636	// from transparent color bleeding and ugly wrapping effects.	1965	// from transparent color bleeding and ugly wrapping effects.
1637	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1966	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1638	}	1967	}
		1968
		1969	void
		1970	expire_textures (DC::Map self, int texid, int count)
		1971	PPCODE:
		1972	for (; texid < self->texs && count; ++texid, --count)
		1973	{
		1974	maptex *tex = self->tex + texid;
		1975
		1976	if (tex->name)
		1977	{
		1978	if (tex->unused)
		1979	{
		1980	tex->name = 0;
		1981	tex->unused = 0;
		1982	XPUSHs (sv_2mortal (newSViv (texid)));
		1983	}
		1984	else
		1985	tex->unused = 1;
		1986	}
		1987	}
1639		1988
1640	int	1989	int
1641	ox (DC::Map self)	1990	ox (DC::Map self)
1642	ALIAS:	1991	ALIAS:
1643	oy = 1	1992	oy = 1
…		…
1724	{	2073	{
1725	ext = *data++;	2074	ext = *data++;
1726	cmd = ext & 0x7f;	2075	cmd = ext & 0x7f;
1727		2076
1728	if (cmd < 4)	2077	if (cmd < 4)
1729	cell->darkness = 255 - ext * 64 + 1;	2078	cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1730	else if (cmd == 5) // health	2079	else if (cmd == 5) // health
1731	{	2080	{
1732	cell->stat_width = 1;	2081	cell->stat_width = 1;
1733	cell->stat_hp = *data++;	2082	cell->stat_hp = *data++;
1734	}	2083	}
…		…
1764	cell->tile [z] = self->face2tile [face];	2113	cell->tile [z] = self->face2tile [face];
1765		2114
1766	if (cell->tile [z])	2115	if (cell->tile [z])
1767	{	2116	{
1768	maptex *tex = self->tex + cell->tile [z];	2117	maptex *tex = self->tex + cell->tile [z];
		2118	tex->unused = 0;
1769	if (!tex->name)	2119	if (!tex->name)
1770	av_push (missing, newSViv (cell->tile [z]));	2120	av_push (missing, newSViv (cell->tile [z]));
1771		2121
1772	if (tex->smoothtile)	2122	if (tex->smoothtile)
1773	{	2123	{
1774	maptex *smooth = self->tex + tex->smoothtile;	2124	maptex *smooth = self->tex + tex->smoothtile;
		2125	smooth->unused = 0;
1775	if (!smooth->name)	2126	if (!smooth->name)
1776	av_push (missing, newSViv (tex->smoothtile));	2127	av_push (missing, newSViv (tex->smoothtile));
1777	}	2128	}
1778	}	2129	}
1779	}	2130	}
1780	}	2131	}
1781	else	2132	else
1782	cell->darkness = 0;	2133	CELL_CLEAR (cell);
1783	}	2134	}
1784	}	2135	}
1785	OUTPUT:	2136	OUTPUT:
1786	RETVAL	2137	RETVAL
1787		2138
…		…
1807	? self->row + y	2158	? self->row + y
1808	: 0;	2159	: 0;
1809		2160
1810	for (x = x0; x < x1; x++)	2161	for (x = x0; x < x1; x++)
1811	{	2162	{
1812	int r = 32, g = 32, b = 32, a = 192;	2163	unsigned int r = 32, g = 32, b = 32, a = 192;
1813		2164
1814	if (row && row->c0 <= x && x < row->c1)	2165	if (row && row->c0 <= x && x < row->c1)
1815	{	2166	{
1816	mapcell *cell = row->col + (x - row->c0);	2167	mapcell *cell = row->col + (x - row->c0);
1817		2168
…		…
1819	{	2170	{
1820	maptex tex = self->tex [cell->tile [z]];	2171	maptex tex = self->tex [cell->tile [z]];
1821	int a0 = 255 - tex.a;	2172	int a0 = 255 - tex.a;
1822	int a1 = tex.a;	2173	int a1 = tex.a;
1823		2174
1824	r = (r * a0 + tex.r * a1) / 255;	2175	r = div255 (r * a0 + tex.r * a1);
1825	g = (g * a0 + tex.g * a1) / 255;	2176	g = div255 (g * a0 + tex.g * a1);
1826	b = (b * a0 + tex.b * a1) / 255;	2177	b = div255 (b * a0 + tex.b * a1);
1827	a = (a * a0 + tex.a * a1) / 255;	2178	a = div255 (a * a0 + tex.a * a1);
1828	}	2179	}
1829	}	2180	}
1830		2181
1831	*map++ = (r )	2182	*map++ = (r )
1832	\| (g << 8)	2183	\| (g << 8)
…		…
1839	}	2190	}
1840	OUTPUT:	2191	OUTPUT:
1841	RETVAL	2192	RETVAL
1842		2193
1843	void	2194	void
1844	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)	2195	draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1845	CODE:	2196	CODE:
1846	{	2197	{
1847	int x, y, z;	2198	int x, y, z;
1848		2199
1849	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2200	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1850	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2201	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1851	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2202	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1852	smooth_key skey;	2203	smooth_key skey;
1853	int pl_x, pl_y;	2204	int pl_x, pl_y;
1854	maptex pl_tex;	2205	maptex pl_tex;
1855	rc_t *rc = rc_alloc ();	2206	rc_t *rc = rc_alloc ();
		2207	rc_t *rc_ov = rc_alloc ();
1856	rc_key_t key;	2208	rc_key_t key;
1857	rc_array_t *arr;	2209	rc_array_t *arr;
1858		2210
1859	pl_tex.name = 0;	2211	pl_tex.name = 0;
1860		2212
1861	// thats current max. sorry.	2213	// that's current max. sorry.
1862	if (sw > 255) sw = 255;	2214	if (sw > 255) sw = 255;
1863	if (sh > 255) sh = 255;	2215	if (sh > 255) sh = 255;
1864		2216
1865	// clear key, in case of extra padding	2217	// clear key, in case of extra padding
1866	memset (&skey, 0, sizeof (skey));	2218	memset (&skey, 0, sizeof (skey));
…		…
1870	key.g = 255;	2222	key.g = 255;
1871	key.b = 255;	2223	key.b = 255;
1872	key.a = 255;	2224	key.a = 255;
1873	key.mode = GL_QUADS;	2225	key.mode = GL_QUADS;
1874	key.format = GL_T2F_V3F;	2226	key.format = GL_T2F_V3F;
1875	key.texname = -1;
1876		2227
1877	mx += self->x;	2228	mx += self->x;
1878	my += self->y;	2229	my += self->y;
1879		2230
1880	// first pass: determine smooth_max	2231	// first pass: determine smooth_max
…		…
1904	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2255	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1905		2256
1906	for (z = 0; z <= 2; z++)	2257	for (z = 0; z <= 2; z++)
1907	{	2258	{
1908	memset (smooth_level, 0, sizeof (smooth_level));	2259	memset (smooth_level, 0, sizeof (smooth_level));
		2260	key.texname = -1;
1909		2261
1910	for (y = 0; y < sh; y++)	2262	for (y = 0; y < sh; y++)
1911	if (0 <= y + my && y + my < self->rows)	2263	if (0 <= y + my && y + my < self->rows)
1912	{	2264	{
1913	maprow *row = self->row + (y + my);	2265	maprow *row = self->row + (y + my);
…		…
1919	tileid tile = cell->tile [z];	2271	tileid tile = cell->tile [z];
1920		2272
1921	if (tile)	2273	if (tile)
1922	{	2274	{
1923	maptex tex = self->tex [tile];	2275	maptex tex = self->tex [tile];
1924	int px = (x + 1) * T - tex.w;	2276	int px, py;
1925	int py = (y + 1) * T - tex.h;
1926		2277
1927	if (key.texname != tex.name)	2278	if (key.texname != tex.name)
1928	{	2279	{
		2280	self->tex [tile].unused = 0;
		2281
1929	if (!tex.name)	2282	if (!tex.name)
1930	tex = self->tex [2]; /* missing, replace by noface */	2283	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1931		2284
1932	key.texname = tex.name;	2285	key.texname = tex.name;
1933	arr = rc_array (rc, &key);	2286	arr = rc_array (rc, &key);
1934	}	2287	}
		2288
		2289	px = (x + 1) * Th - tex.w;
		2290	py = (y + 1) * Tw - tex.h;
1935		2291
1936	if (expect_false (cell->player == player) && expect_false (z == 2))	2292	if (expect_false (cell->player == player) && expect_false (z == 2))
1937	{	2293	{
1938	pl_x = px;	2294	pl_x = px;
1939	pl_y = py;	2295	pl_y = py;
…		…
1944	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2300	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1945	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2301	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1946	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2302	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1947	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2303	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1948		2304
1949	if (expect_false (cell->flags) && expect_false (z == 2))
1950	{
1951	// overlays such as the speech bubble, probably more to come
1952	if (cell->flags & 1)
1953	{
1954	maptex tex = self->tex [1];
1955	int px = x * T + T * 2 / 32;
1956	int py = y * T - T * 6 / 32;
1957
1958	if (tex.name)
1959	{
1960	if (key.texname != tex.name)
1961	{
1962	key.texname = tex.name;
1963	arr = rc_array (rc, &key);
1964	}
1965
1966	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1967	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1968	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1969	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1970	}
1971	}
1972	}
1973
1974	// update smooth hash	2305	// update smooth hash
1975	if (tex.smoothtile)	2306	if (tex.smoothtile)
1976	{	2307	{
1977	skey.tile = tex.smoothtile;	2308	skey.tile = tex.smoothtile;
1978	skey.level = tex.smoothlevel;	2309	skey.level = tex.smoothlevel;
…		…
2006	// corners	2337	// corners
2007	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2338	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
2008	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2339	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
2009	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2340	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2010	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2341	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2342	}
		2343	}
		2344
		2345	if (expect_false (z == 2) && expect_false (cell->flags))
		2346	{
		2347	// overlays such as the speech bubble, probably more to come
		2348	if (cell->flags & 1)
		2349	{
		2350	rc_key_t key_ov = key;
		2351	maptex tex = self->tex [TEXID_SPEECH];
		2352	rc_array_t *arr;
		2353	int px = x * Tw + Tw * 2 / 32;
		2354	int py = y * Th - Th * 6 / 32;
		2355
		2356	key_ov.texname = tex.name;
		2357	arr = rc_array (rc_ov, &key_ov);
		2358
		2359	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2360	rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
		2361	rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
		2362	rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2011	}	2363	}
2012	}	2364	}
2013	}	2365	}
2014	}	2366	}
2015		2367
…		…
2042	if (!(bits & 0x1000)	2394	if (!(bits & 0x1000)
2043	&& skey->level == level	2395	&& skey->level == level
2044	&& level > smooth_max [skey->x][skey->y])	2396	&& level > smooth_max [skey->x][skey->y])
2045	{	2397	{
2046	maptex tex = self->tex [skey->tile];	2398	maptex tex = self->tex [skey->tile];
2047	int px = (((int)skey->x) - 1) * T;	2399	int px = (((int)skey->x) - 1) * Tw;
2048	int py = (((int)skey->y) - 1) * T;	2400	int py = (((int)skey->y) - 1) * Th;
2049	int border = bits & 15;	2401	int border = bits & 15;
2050	int corner = (bits >> 8) & ~(bits >> 4) & 15;	2402	int corner = (bits >> 8) & ~(bits >> 4) & 15;
2051	float dx = tex.s * .0625f; // 16 images/row	2403	float dx = tex.s * .0625f; // 16 images/row
2052	float dy = tex.t * .5f ; // 2 images/column	2404	float dy = tex.t * .5f ; // 2 images/column
2053		2405
…		…
2055	{	2407	{
2056	// this time avoiding texture state changes	2408	// this time avoiding texture state changes
2057	// save gobs of state changes.	2409	// save gobs of state changes.
2058	if (key.texname != tex.name)	2410	if (key.texname != tex.name)
2059	{	2411	{
		2412	self->tex [skey->tile].unused = 0;
		2413
2060	glEnd ();	2414	glEnd ();
2061	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2415	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2062	glBegin (GL_QUADS);	2416	glBegin (GL_QUADS);
2063	}	2417	}
2064		2418
2065	if (border)	2419	if (border)
2066	{	2420	{
2067	float ox = border * dx;	2421	float ox = border * dx;
2068		2422
2069	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );	2423	glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2070	glTexCoord2f (ox , dy ); glVertex2i (px , py + T);	2424	glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2071	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T);	2425	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2072	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py );	2426	glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2073	}	2427	}
2074		2428
2075	if (corner)	2429	if (corner)
2076	{	2430	{
2077	float ox = corner * dx;	2431	float ox = corner * dx;
2078		2432
2079	glTexCoord2f (ox , dy ); glVertex2i (px , py );	2433	glTexCoord2f (ox , dy ); glVertex2i (px , py );
2080	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T);	2434	glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2081	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T);	2435	glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2082	glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py );	2436	glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2083	}	2437	}
2084	}	2438	}
2085	}	2439	}
2086	}	2440	}
2087	}	2441	}
…		…
2096	}	2450	}
2097		2451
2098	if (pl_tex.name)	2452	if (pl_tex.name)
2099	{	2453	{
2100	maptex tex = pl_tex;	2454	maptex tex = pl_tex;
2101	int px = pl_x + pdx;	2455	int px = pl_x + sdx;
2102	int py = pl_y + pdy;	2456	int py = pl_y + sdy;
2103		2457
2104	key.texname = tex.name;	2458	key.texname = tex.name;
2105	arr = rc_array (rc, &key);	2459	arr = rc_array (rc, &key);
2106		2460
2107	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2461	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
…		…
2110	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2464	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111		2465
2112	rc_draw (rc);	2466	rc_draw (rc);
2113	}	2467	}
2114		2468
		2469	rc_draw (rc_ov);
		2470	rc_clear (rc_ov);
		2471
2115	glDisable (GL_BLEND);	2472	glDisable (GL_BLEND);
2116	rc_free (rc);	2473	rc_free (rc);
		2474	rc_free (rc_ov);
2117		2475
2118	// top layer: overlays such as the health bar	2476	// top layer: overlays such as the health bar
2119	for (y = 0; y < sh; y++)	2477	for (y = 0; y < sh; y++)
2120	if (0 <= y + my && y + my < self->rows)	2478	if (0 <= y + my && y + my < self->rows)
2121	{	2479	{
…		…
2124	for (x = 0; x < sw; x++)	2482	for (x = 0; x < sw; x++)
2125	if (row->c0 <= x + mx && x + mx < row->c1)	2483	if (row->c0 <= x + mx && x + mx < row->c1)
2126	{	2484	{
2127	mapcell *cell = row->col + (x + mx - row->c0);	2485	mapcell *cell = row->col + (x + mx - row->c0);
2128		2486
2129	int px = x * T;	2487	int px = x * Tw;
2130	int py = y * T;	2488	int py = y * Th;
		2489
		2490	if (expect_false (cell->player == player))
		2491	{
		2492	px += sdx;
		2493	py += sdy;
		2494	}
2131		2495
2132	if (cell->stat_hp)	2496	if (cell->stat_hp)
2133	{	2497	{
2134	int width = cell->stat_width * T;	2498	int width = cell->stat_width * Tw;
2135	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2499	int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2136		2500
2137	glColor3ub (0, 0, 0);	2501	glColor3ub (0, 0, 0);
2138	glRectf (px + 1, py - thick - 2,	2502	glRectf (px + 1, py - thick - 2,
2139	px + width - 1, py);	2503	px + width - 1, py);
2140		2504
…		…
2146	}	2510	}
2147	}	2511	}
2148	}	2512	}
2149		2513
2150	void	2514	void
2151	draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data)	2515	draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2152	CODE:	2516	CODE:
2153	{	2517	{
2154	static float color[16][3] = {	2518	static float color[16][3] = {
2155	{ 0.00F, 0.00F, 0.00F },	2519	{ 0.00f, 0.00f, 0.00f },
2156	{ 1.00F, 1.00F, 1.00F },	2520	{ 1.00f, 1.00f, 1.00f },
2157	{ 0.00F, 0.00F, 0.55F },	2521	{ 0.00f, 0.00f, 0.55f },
2158	{ 1.00F, 0.00F, 0.00F },	2522	{ 1.00f, 0.00f, 0.00f },
2159		2523
2160	{ 1.00F, 0.54F, 0.00F },	2524	{ 1.00f, 0.54f, 0.00f },
2161	{ 0.11F, 0.56F, 1.00F },	2525	{ 0.11f, 0.56f, 1.00f },
2162	{ 0.93F, 0.46F, 0.00F },	2526	{ 0.93f, 0.46f, 0.00f },
2163	{ 0.18F, 0.54F, 0.34F },	2527	{ 0.18f, 0.54f, 0.34f },
2164		2528
2165	{ 0.56F, 0.73F, 0.56F },	2529	{ 0.56f, 0.73f, 0.56f },
2166	{ 0.80F, 0.80F, 0.80F },	2530	{ 0.80f, 0.80f, 0.80f },
2167	{ 0.55F, 0.41F, 0.13F },	2531	{ 0.55f, 0.41f, 0.13f },
2168	{ 0.99F, 0.77F, 0.26F },	2532	{ 0.99f, 0.77f, 0.26f },
2169		2533
2170	{ 0.74F, 0.65F, 0.41F },	2534	{ 0.74f, 0.65f, 0.41f },
2171		2535
2172	{ 0.00F, 1.00F, 1.00F },	2536	{ 0.00f, 1.00f, 1.00f },
2173	{ 1.00F, 0.00F, 1.00F },	2537	{ 1.00f, 0.00f, 1.00f },
2174	{ 1.00F, 1.00F, 0.00F },	2538	{ 1.00f, 1.00f, 0.00f },
2175	};	2539	};
2176		2540
2177	int x, y;	2541	int x, y;
2178		2542
2179	glEnable (GL_TEXTURE_2D);	2543	glEnable (GL_TEXTURE_2D);
		2544	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2545	* but the nvidia driver (185.18.14) mishandles alpha textures
		2546	* and takes the colour from god knows where instead of using
		2547	* Cp. MODULATE results in the same colour, but slightly different
		2548	* alpha, but atcually gives us the correct colour with nvidia.
		2549	*/
2180	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2550	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2181	glEnable (GL_BLEND);	2551	glEnable (GL_BLEND);
2182	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2552	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2183	glBegin (GL_QUADS);	2553	glBegin (GL_QUADS);
2184		2554
2185	for (y = 0; y < h; y++)	2555	for (y = 0; y < h; y++)
…		…
2189		2559
2190	if (m)	2560	if (m)
2191	{	2561	{
2192	float *c = color [m & 15];	2562	float *c = color [m & 15];
2193		2563
2194	float tx1 = m & 0x40 ? 0.5 : 0.;	2564	float tx1 = m & 0x40 ? 0.5f : 0.f;
2195	float tx2 = tx1 + 0.5;	2565	float tx2 = tx1 + 0.5f;
2196		2566
2197	glColor4f (c[0], c[1], c[2], 0.75);	2567	glColor4f (c[0], c[1], c[2], 1);
2198	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2568	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2199	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2569	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2200	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2570	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2201	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2571	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2202	}	2572	}
…		…
2210	void	2580	void
2211	fow_texture (DC::Map self, int mx, int my, int sw, int sh)	2581	fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2212	PPCODE:	2582	PPCODE:
2213	{	2583	{
2214	int x, y;	2584	int x, y;
2215	int sw1 = sw + 2;	2585	int sw1 = sw + 2;
2216	int sh1 = sh + 2;	2586	int sh1 = sh + 2;
2217	int sh3 = sh * 3;	2587	int sh3 = sh * 3;
2218	int sw34 = (sw * 3 + 3) & ~3;	2588	int sw3 = sw * 3;
		2589	SV darkness3_sv = sv_2mortal (newSV (sw3 sh3));
		2590	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2219	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);	2591	uint8_t darkness1 = (uint8_t )malloc (sw1 * sh1);
2220	SV darkness3_sv = sv_2mortal (newSV (sw34 sh3));	2592	memset (darkness1, 0, sw1*sh1);
2221	uint8_t darkness3 = (uint8_t )SvPVX (darkness3_sv);
2222		2593
2223	SvPOK_only (darkness3_sv);	2594	SvPOK_only (darkness3_sv);
2224	SvCUR_set (darkness3_sv, sw34 * sh3);	2595	SvCUR_set (darkness3_sv, sw3 * sh3);
2225		2596
2226	mx += self->x - 1;	2597	mx += self->x - 1;
2227	my += self->y - 1;	2598	my += self->y - 1;
2228
2229	memset (darkness1, 255, sw1 * sh1);
2230		2599
2231	for (y = 0; y < sh1; y++)	2600	for (y = 0; y < sh1; y++)
2232	if (0 <= y + my && y + my < self->rows)	2601	if (0 <= y + my && y + my < self->rows)
2233	{	2602	{
2234	maprow *row = self->row + (y + my);	2603	maprow *row = self->row + (y + my);
…		…
2237	if (row->c0 <= x + mx && x + mx < row->c1)	2606	if (row->c0 <= x + mx && x + mx < row->c1)
2238	{	2607	{
2239	mapcell *cell = row->col + (x + mx - row->c0);	2608	mapcell *cell = row->col + (x + mx - row->c0);
2240		2609
2241	darkness1 [y * sw1 + x] = cell->darkness	2610	darkness1 [y * sw1 + x] = cell->darkness
2242	? 255 - (cell->darkness - 1)	2611	? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2243	: 255 - FOW_DARKNESS;	2612	: DARKNESS_ADJUST (255 - FOW_DARKNESS);
2244	}	2613	}
2245	}	2614	}
2246		2615
2247	for (y = 0; y < sh; ++y)	2616	for (y = 0; y < sh; ++y)
2248	for (x = 0; x < sw; ++x)	2617	for (x = 0; x < sw; ++x)
…		…
2267		2636
2268	uint8_t r13 = (d13 + d23 + d12) / 3;	2637	uint8_t r13 = (d13 + d23 + d12) / 3;
2269	uint8_t r23 = d23;	2638	uint8_t r23 = d23;
2270	uint8_t r33 = (d23 + d33 + d32) / 3;	2639	uint8_t r33 = (d23 + d33 + d32) / 3;
2271		2640
2272	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);	2641	darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2273	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);	2642	darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2274	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);	2643	darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2275	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);	2644	darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2276	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);	2645	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2277	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);	2646	darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2278	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);	2647	darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2279	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);	2648	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2280	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);	2649	darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2281	}	2650	}
2282		2651
2283	free (darkness1);	2652	free (darkness1);
2284		2653
2285	EXTEND (SP, 3);	2654	EXTEND (SP, 3);
2286	PUSHs (sv_2mortal (newSViv (sw34)));	2655	PUSHs (sv_2mortal (newSViv (sw3)));
2287	PUSHs (sv_2mortal (newSViv (sh3)));	2656	PUSHs (sv_2mortal (newSViv (sh3)));
2288	PUSHs (darkness3_sv);	2657	PUSHs (darkness3_sv);
2289	}	2658	}
2290		2659
2291	SV *	2660	SV *
…		…
2489	if (RETVAL < 0)	2858	if (RETVAL < 0)
2490	{	2859	{
2491	RETVAL = Mix_GroupOldest (-1);	2860	RETVAL = Mix_GroupOldest (-1);
2492		2861
2493	if (RETVAL < 0)	2862	if (RETVAL < 0)
		2863	{
		2864	// happens sometimes, maybe it just stopped playing(?)
		2865	RETVAL = Mix_GroupAvailable (-1);
		2866
		2867	if (RETVAL < 0)
2494	XSRETURN_UNDEF;	2868	XSRETURN_UNDEF;
2495		2869	}
		2870	else
2496	Mix_HaltChannel (RETVAL);	2871	Mix_HaltChannel (RETVAL);
2497	}	2872	}
2498		2873
2499	Mix_UnregisterAllEffects (RETVAL);	2874	Mix_UnregisterAllEffects (RETVAL);
2500	Mix_Volume (RETVAL, 128);	2875	Mix_Volume (RETVAL, 128);
2501	}	2876	}
…		…
2548	void	2923	void
2549	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)	2924	set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2550	CODE:	2925	CODE:
2551	{	2926	{
2552	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));	2927	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2553	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);	2928	int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2554	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));	2929	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2555	}	2930	}
2556		2931
2557	void	2932	void
2558	set_reverse_stereo (DC::Channel self, int flip)	2933	set_reverse_stereo (DC::Channel self, int flip)
…		…
2560	Mix_SetReverseStereo (self, flip);	2935	Mix_SetReverseStereo (self, flip);
2561		2936
2562	MODULE = Deliantra::Client PACKAGE = DC::MixChunk	2937	MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2563		2938
2564	PROTOTYPES: DISABLE	2939	PROTOTYPES: DISABLE
		2940
		2941	void
		2942	decoders ()
		2943	PPCODE:
		2944	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2945	int i, num = Mix_GetNumChunkDecoders ();
		2946	EXTEND (SP, num);
		2947	for (i = 0; i < num; ++i)
		2948	PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
		2949	#else
		2950	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		2951	#endif
2565		2952
2566	DC::MixChunk	2953	DC::MixChunk
2567	new (SV *class, DC::RW rwops)	2954	new (SV *class, DC::RW rwops)
2568	CODE:	2955	CODE:
2569	RETVAL = Mix_LoadWAV_RW (rwops, 1);	2956	RETVAL = Mix_LoadWAV_RW (rwops, 1);
…		…
2602	OUTPUT:	2989	OUTPUT:
2603	RETVAL	2990	RETVAL
2604		2991
2605	MODULE = Deliantra::Client PACKAGE = DC::MixMusic	2992	MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2606		2993
		2994	void
		2995	decoders ()
		2996	PPCODE:
		2997	#if SDL_MIXER_MAJOR_VERSION > 1 \|\| SDL_MIXER_MINOR_VERSION > 2 \|\| SDL_MIXER_PATCHLEVEL >= 10
		2998	int i, num = Mix_GetNumMusicDecoders ();
		2999	EXTEND (SP, num);
		3000	for (i = 0; i < num; ++i)
		3001	PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
		3002	#else
		3003	XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
		3004	#endif
		3005
2607	int	3006	int
2608	volume (int volume = -1)	3007	volume (int volume = -1)
2609	PROTOTYPE: ;$	3008	PROTOTYPE: ;$
2610	CODE:	3009	CODE:
2611	if (items > 0)	3010	if (items > 0)
…		…
2621		3020
2622	void	3021	void
2623	halt ()	3022	halt ()
2624	CODE:	3023	CODE:
2625	Mix_HaltMusic ();	3024	Mix_HaltMusic ();
		3025
		3026	int
		3027	playing ()
		3028	CODE:
		3029	RETVAL = Mix_PlayingMusic ();
		3030	OUTPUT:
		3031	RETVAL
2626		3032
2627	DC::MixMusic	3033	DC::MixMusic
2628	new (SV *class, DC::RW rwops)	3034	new (SV *class, DC::RW rwops)
2629	CODE:	3035	CODE:
2630	RETVAL = Mix_LoadMUS_RW (rwops);	3036	RETVAL = Mix_LoadMUS_RW (rwops);
…		…
2661	} *civ, const_iv[] = {	3067	} *civ, const_iv[] = {
2662	# define const_iv(name) { # name, (IV)name }	3068	# define const_iv(name) { # name, (IV)name }
2663	const_iv (GL_VENDOR),	3069	const_iv (GL_VENDOR),
2664	const_iv (GL_VERSION),	3070	const_iv (GL_VERSION),
2665	const_iv (GL_EXTENSIONS),	3071	const_iv (GL_EXTENSIONS),
		3072	const_iv (GL_MAX_TEXTURE_UNITS),
2666	const_iv (GL_COLOR_MATERIAL),	3073	const_iv (GL_COLOR_MATERIAL),
2667	const_iv (GL_SMOOTH),	3074	const_iv (GL_SMOOTH),
2668	const_iv (GL_FLAT),	3075	const_iv (GL_FLAT),
2669	const_iv (GL_DITHER),	3076	const_iv (GL_DITHER),
2670	const_iv (GL_BLEND),	3077	const_iv (GL_BLEND),
…		…
2682	const_iv (GL_ZERO),	3089	const_iv (GL_ZERO),
2683	const_iv (GL_SRC_ALPHA),	3090	const_iv (GL_SRC_ALPHA),
2684	const_iv (GL_DST_ALPHA),	3091	const_iv (GL_DST_ALPHA),
2685	const_iv (GL_ONE_MINUS_SRC_ALPHA),	3092	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2686	const_iv (GL_ONE_MINUS_DST_ALPHA),	3093	const_iv (GL_ONE_MINUS_DST_ALPHA),
		3094	const_iv (GL_SRC_COLOR),
		3095	const_iv (GL_DST_COLOR),
		3096	const_iv (GL_ONE_MINUS_SRC_COLOR),
		3097	const_iv (GL_ONE_MINUS_DST_COLOR),
2687	const_iv (GL_SRC_ALPHA_SATURATE),	3098	const_iv (GL_SRC_ALPHA_SATURATE),
2688	const_iv (GL_RGB),	3099	const_iv (GL_RGB),
2689	const_iv (GL_RGBA),	3100	const_iv (GL_RGBA),
2690	const_iv (GL_RGBA4),	3101	const_iv (GL_RGBA4),
2691	const_iv (GL_RGBA8),	3102	const_iv (GL_RGBA8),
…		…
2759	const_iv (GL_NICEST),	3170	const_iv (GL_NICEST),
2760	const_iv (GL_V2F),	3171	const_iv (GL_V2F),
2761	const_iv (GL_V3F),	3172	const_iv (GL_V3F),
2762	const_iv (GL_T2F_V3F),	3173	const_iv (GL_T2F_V3F),
2763	const_iv (GL_T2F_N3F_V3F),	3174	const_iv (GL_T2F_N3F_V3F),
		3175	const_iv (GL_FUNC_ADD),
		3176	const_iv (GL_FUNC_SUBTRACT),
		3177	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2764	# undef const_iv	3178	# undef const_iv
2765	};	3179	};
2766		3180
2767	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3181	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
2768	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3182	newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
2769		3183
2770	texture_av = newAV ();	3184	texture_av = newAV ();
2771	AvREAL_off (texture_av);	3185	AvREAL_off (texture_av);
2772	}	3186	}
2773		3187
2774	void	3188	void
2775	disable_GL_EXT_blend_func_separate ()	3189	disable_GL_EXT_blend_func_separate ()
2776	CODE:	3190	CODE:
2777	gl.BlendFuncSeparate = 0;	3191	gl.BlendFuncSeparate = 0;
2778	gl.BlendFuncSeparateEXT = 0;	3192	gl.BlendFuncSeparateEXT = 0;
		3193
		3194	void
		3195	apple_nvidia_bug (int enable)
2779		3196
2780	char *	3197	char *
2781	gl_vendor ()	3198	gl_vendor ()
2782	CODE:	3199	CODE:
2783	RETVAL = (char *)glGetString (GL_VENDOR);	3200	RETVAL = (char *)glGetString (GL_VENDOR);
…		…
2814		3231
2815	int glGetError ()	3232	int glGetError ()
2816		3233
2817	void glFinish ()	3234	void glFinish ()
2818		3235
		3236	void glFlush ()
		3237
2819	void glClear (int mask)	3238	void glClear (int mask)
2820		3239
2821	void glClearColor (float r, float g, float b, float a = 1.0)	3240	void glClearColor (float r, float g, float b, float a = 1.0)
2822	PROTOTYPE: @	3241	PROTOTYPE: @
2823		3242
…		…
2832	void glBlendFunc (int sfactor, int dfactor)	3251	void glBlendFunc (int sfactor, int dfactor)
2833		3252
2834	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3253	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2835	CODE:	3254	CODE:
2836	gl_BlendFuncSeparate (sa, da, saa, daa);	3255	gl_BlendFuncSeparate (sa, da, saa, daa);
		3256
		3257	# void glBlendEquation (int se)
2837		3258
2838	void glDepthMask (int flag)	3259	void glDepthMask (int flag)
2839		3260
2840	void glLogicOp (int opcode)	3261	void glLogicOp (int opcode)
2841		3262
…		…
2876	void glRotate (float angle, float x, float y, float z)	3297	void glRotate (float angle, float x, float y, float z)
2877	CODE:	3298	CODE:
2878	glRotatef (angle, x, y, z);	3299	glRotatef (angle, x, y, z);
2879		3300
2880	void glColor (float r, float g, float b, float a = 1.0)	3301	void glColor (float r, float g, float b, float a = 1.0)
		3302	PROTOTYPE: @
2881	ALIAS:	3303	ALIAS:
2882	glColor_premultiply = 1	3304	glColor_premultiply = 1
2883	CODE:	3305	CODE:
2884	if (ix)	3306	if (ix)
2885	{	3307	{
…		…
2990	void glNewList (int list, int mode = GL_COMPILE)	3412	void glNewList (int list, int mode = GL_COMPILE)
2991		3413
2992	void glEndList ()	3414	void glEndList ()
2993		3415
2994	void glCallList (int list)	3416	void glCallList (int list)
		3417
		3418	void c_init ()
		3419	CODE:
		3420	glPixelStorei (GL_PACK_ALIGNMENT , 1);
		3421	glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
2995		3422
2996	MODULE = Deliantra::Client PACKAGE = DC::UI::Base	3423	MODULE = Deliantra::Client PACKAGE = DC::UI::Base
2997		3424
2998	PROTOTYPES: DISABLE	3425	PROTOTYPES: DISABLE
2999		3426

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC vs. Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.264 by root, Fri Jul 18 22:32:54 2008 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC