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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

…		…
39	#include <SDL_endian.h>	39	#include <SDL_endian.h>
40	#include <SDL_image.h>	40	#include <SDL_image.h>
41	#include <SDL_mixer.h>	41	#include <SDL_mixer.h>
42	#include <SDL_opengl.h>	42	#include <SDL_opengl.h>
43		43
		44	/* work around os x broken headers */
		45	#ifdef __MACOSX__
		46	typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
		47	#endif
		48
44	#define PANGO_ENABLE_BACKEND	49	#define PANGO_ENABLE_BACKEND
45	#define G_DISABLE_CAST_CHECKS	50	#define G_DISABLE_CAST_CHECKS
46		51
47	#include <glib/gmacros.h>	52	#include <glib/gmacros.h>
48		53
…		…
76	#define expect_false(expr) expect ((expr) != 0, 0)	81	#define expect_false(expr) expect ((expr) != 0, 0)
77	#define expect_true(expr) expect ((expr) != 0, 1)	82	#define expect_true(expr) expect ((expr) != 0, 1)
78		83
79	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */	84	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80		85
81	#define FOW_DARKNESS 32	86	#define FOW_DARKNESS 64
82		87
83	#define MAP_EXTEND_X 32	88	#define MAP_EXTEND_X 32
84	#define MAP_EXTEND_Y 512	89	#define MAP_EXTEND_Y 512
85		90
86	#define MIN_FONT_HEIGHT 10	91	#define MIN_FONT_HEIGHT 10
87		92
88	/* mask out modifiers we are not interested in */	93	/* mask out modifiers we are not interested in */
89	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)	94	#define MOD_MASK (KMOD_CTRL \| KMOD_SHIFT \| KMOD_ALT \| KMOD_META)
90		95
91	#if 1	96	#define KMOD_LRAM 0x10000 // our extension
92	# define PARACHUTE SDL_INIT_NOPARACHUTE	97
93	#else	98	#define TEXID_SPEECH 1
94	# define PARACHUTE 0	99	#define TEXID_NOFACE 2
95	#endif	100	#define TEXID_HIDDEN 3
96		101
97	static AV *texture_av;	102	static AV *texture_av;
98		103
99	static struct	104	static struct
100	{	105	{
…		…
232	int w, h;	237	int w, h;
233	float s, t;	238	float s, t;
234	uint8_t r, g, b, a;	239	uint8_t r, g, b, a;
235	tileid smoothtile;	240	tileid smoothtile;
236	uint8_t smoothlevel;	241	uint8_t smoothlevel;
		242	uint8_t unused; /* set to zero on use */
237	} maptex;	243	} maptex;
238		244
239	typedef struct {	245	typedef struct {
240	uint32_t player;	246	uint32_t player;
241	tileid tile[3];	247	tileid tile[3];
…		…
373	self->oy = 0;	379	self->oy = 0;
374	self->row = 0;	380	self->row = 0;
375	self->rows = 0;	381	self->rows = 0;
376	}	382	}
377		383
		384	#define CELL_CLEAR(cell) \
		385	do { \
		386	if ((cell)->player) \
		387	(cell)->tile [2] = 0; \
		388	(cell)->darkness = 0; \
		389	(cell)->stat_hp = 0; \
		390	(cell)->flags = 0; \
		391	(cell)->player = 0; \
		392	} while (0)
		393
378	static void	394	static void
379	map_blank (DC__Map self, int x0, int y0, int w, int h)	395	map_blank (DC__Map self, int x0, int y0, int w, int h)
380	{	396	{
381	int x, y;	397	int x, y;
382	maprow *row;	398	maprow *row;
…		…
396	if (x >= row->c1)	412	if (x >= row->c1)
397	break;	413	break;
398		414
399	cell = row->col + x - row->c0;	415	cell = row->col + x - row->c0;
400		416
401	cell->darkness = 0;	417	CELL_CLEAR (cell);
402	cell->stat_hp = 0;
403	cell->flags = 0;
404	cell->player = 0;
405	}	418	}
406	}	419	}
407	}	420	}
408		421
409	typedef struct {	422	typedef struct {
…		…
520	if (!svp \|\| !SvTRUE (*svp))	533	if (!svp \|\| !SvTRUE (*svp))
521	return 0;	534	return 0;
522		535
523	return 1;	536	return 1;
524	}	537	}
		538
		539	/******************************************************************************/
		540
		541	/* process keyboard modifiers */
		542	static int
		543	mod_munge (int mod)
		544	{
		545	mod &= MOD_MASK;
		546
		547	if (mod & (KMOD_META \| KMOD_ALT))
		548	mod \|= KMOD_LRAM;
		549
		550	return mod;
		551	}
		552
		553	static void
		554	deliantra_main ()
		555	{
		556	char *argv[] = { 0 };
		557	call_argv ("::main", G_DISCARD \| G_VOID, argv);
		558	}
		559
		560	#ifdef __MACOSX__
		561	/* to due surprising braindamage on the side of SDL design, we
		562	* do some mind-boggling hack here: SDL requires a custom main()
		563	* on OS X, so... we provide one and call the original main(), which,
		564	* due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
		565	* and which calls our main (== SDL_main) back.
		566	*/
		567	extern C_LINKAGE int
		568	main (int argc, char *argv[])
		569	{
		570	deliantra_main ();
		571	}
		572
		573	#undef main
		574
		575	extern C_LINKAGE int main (int argc, char *argv[]);
		576
		577	static void
		578	SDL_braino (void)
		579	{
		580	char *argv[] = { "deliantra client", 0 };
		581	(main) (1, argv);
		582	}
		583	#else
		584	static void
		585	SDL_braino (void)
		586	{
		587	deliantra_main ();
		588	}
		589	#endif
525		590
526	MODULE = Deliantra::Client PACKAGE = DC	591	MODULE = Deliantra::Client PACKAGE = DC
527		592
528	PROTOTYPES: ENABLE	593	PROTOTYPES: ENABLE
529		594
…		…
558	const_iv (SDL_USEREVENT),	623	const_iv (SDL_USEREVENT),
559		624
560	const_iv (SDL_APPINPUTFOCUS),	625	const_iv (SDL_APPINPUTFOCUS),
561	const_iv (SDL_APPMOUSEFOCUS),	626	const_iv (SDL_APPMOUSEFOCUS),
562	const_iv (SDL_APPACTIVE),	627	const_iv (SDL_APPACTIVE),
		628
		629
		630	const_iv (SDLK_UNKNOWN),
		631	const_iv (SDLK_FIRST),
		632	const_iv (SDLK_BACKSPACE),
		633	const_iv (SDLK_TAB),
		634	const_iv (SDLK_CLEAR),
		635	const_iv (SDLK_RETURN),
		636	const_iv (SDLK_PAUSE),
		637	const_iv (SDLK_ESCAPE),
		638	const_iv (SDLK_SPACE),
		639	const_iv (SDLK_EXCLAIM),
		640	const_iv (SDLK_QUOTEDBL),
		641	const_iv (SDLK_HASH),
		642	const_iv (SDLK_DOLLAR),
		643	const_iv (SDLK_AMPERSAND),
		644	const_iv (SDLK_QUOTE),
		645	const_iv (SDLK_LEFTPAREN),
		646	const_iv (SDLK_RIGHTPAREN),
		647	const_iv (SDLK_ASTERISK),
		648	const_iv (SDLK_PLUS),
		649	const_iv (SDLK_COMMA),
		650	const_iv (SDLK_MINUS),
		651	const_iv (SDLK_PERIOD),
		652	const_iv (SDLK_SLASH),
		653	const_iv (SDLK_0),
		654	const_iv (SDLK_1),
		655	const_iv (SDLK_2),
		656	const_iv (SDLK_3),
		657	const_iv (SDLK_4),
		658	const_iv (SDLK_5),
		659	const_iv (SDLK_6),
		660	const_iv (SDLK_7),
		661	const_iv (SDLK_8),
		662	const_iv (SDLK_9),
		663	const_iv (SDLK_COLON),
		664	const_iv (SDLK_SEMICOLON),
		665	const_iv (SDLK_LESS),
		666	const_iv (SDLK_EQUALS),
		667	const_iv (SDLK_GREATER),
		668	const_iv (SDLK_QUESTION),
		669	const_iv (SDLK_AT),
		670
		671	const_iv (SDLK_LEFTBRACKET),
		672	const_iv (SDLK_BACKSLASH),
		673	const_iv (SDLK_RIGHTBRACKET),
		674	const_iv (SDLK_CARET),
		675	const_iv (SDLK_UNDERSCORE),
		676	const_iv (SDLK_BACKQUOTE),
		677	const_iv (SDLK_DELETE),
563		678
564	const_iv (SDLK_FIRST),	679	const_iv (SDLK_FIRST),
565	const_iv (SDLK_LAST),	680	const_iv (SDLK_LAST),
566	const_iv (SDLK_KP0),	681	const_iv (SDLK_KP0),
567	const_iv (SDLK_KP1),	682	const_iv (SDLK_KP1),
…		…
643	const_iv (KMOD_RMETA),	758	const_iv (KMOD_RMETA),
644	const_iv (KMOD_NUM),	759	const_iv (KMOD_NUM),
645	const_iv (KMOD_CAPS),	760	const_iv (KMOD_CAPS),
646	const_iv (KMOD_MODE),	761	const_iv (KMOD_MODE),
647		762
		763	const_iv (KMOD_LRAM),
		764
648	const_iv (MIX_DEFAULT_FORMAT),	765	const_iv (MIX_DEFAULT_FORMAT),
		766
		767	const_iv (SDL_INIT_TIMER),
		768	const_iv (SDL_INIT_AUDIO),
		769	const_iv (SDL_INIT_VIDEO),
		770	const_iv (SDL_INIT_CDROM),
		771	const_iv (SDL_INIT_JOYSTICK),
		772	const_iv (SDL_INIT_EVERYTHING),
		773	const_iv (SDL_INIT_NOPARACHUTE),
		774	const_iv (SDL_INIT_EVENTTHREAD),
		775
		776	const_iv (SDL_GL_RED_SIZE),
		777	const_iv (SDL_GL_GREEN_SIZE),
		778	const_iv (SDL_GL_BLUE_SIZE),
		779	const_iv (SDL_GL_ALPHA_SIZE),
		780	const_iv (SDL_GL_DOUBLEBUFFER),
		781	const_iv (SDL_GL_BUFFER_SIZE),
		782	const_iv (SDL_GL_DEPTH_SIZE),
		783	const_iv (SDL_GL_STENCIL_SIZE),
		784	const_iv (SDL_GL_ACCUM_RED_SIZE),
		785	const_iv (SDL_GL_ACCUM_GREEN_SIZE),
		786	const_iv (SDL_GL_ACCUM_BLUE_SIZE),
		787	const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
		788	const_iv (SDL_GL_STEREO),
		789	const_iv (SDL_GL_MULTISAMPLEBUFFERS),
		790	const_iv (SDL_GL_MULTISAMPLESAMPLES),
		791	const_iv (SDL_GL_ACCELERATED_VISUAL),
		792	const_iv (SDL_GL_SWAP_CONTROL),
		793
		794	const_iv (FOW_DARKNESS)
649	# undef const_iv	795	# undef const_iv
650	};	796	};
651		797
652	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	798	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
653	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	799	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
689	pango_context_set_language (opengl_context, pango_language_from_string ("en"));	835	pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/	836	/pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);/
691	#endif	837	#endif
692	}	838	}
693		839
694	char *
695	SDL_GetError ()	840	char *SDL_GetError ()
696		841
697	int	842	void SDL_braino ()
698	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
699		843
700	void	844	int SDL_Init (U32 flags)
		845
		846	int SDL_InitSubSystem (U32 flags)
		847
		848	void SDL_QuitSubSystem (U32 flags)
		849
701	SDL_Quit ()	850	void SDL_Quit ()
		851
		852	int SDL_GL_SetAttribute (int attr, int value)
		853
		854	int SDL_GL_GetAttribute (int attr)
		855	CODE:
		856	if (SDL_GL_GetAttribute (attr, &RETVAL))
		857	XSRETURN_UNDEF;
		858	OUTPUT:
		859	RETVAL
702		860
703	void	861	void
704	SDL_ListModes (int rgb, int alpha)	862	SDL_ListModes (int rgb, int alpha)
705	PPCODE:	863	PPCODE:
706	{	864	{
…		…
718	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	876	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);	877	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	878	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721		879
722	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	880	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723	#if SDL_VERSION_ATLEAST(1,2,10)
724	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	881	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726	#endif
727		882
728	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	883	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
729		884
730	if (m && m != (SDL_Rect **)-1)	885	if (m && m != (SDL_Rect **)-1)
731	while (*m)	886	while (*m)
732	{	887	{
733	if ((m)->w >= 800 && (m)->h >= 480)	888	if ((m)->w >= 400 && (m)->h >= 300)
734	{	889	{
735	AV *av = newAV ();	890	AV *av = newAV ();
736	av_push (av, newSViv ((*m)->w));	891	av_push (av, newSViv ((*m)->w));
737	av_push (av, newSViv ((*m)->h));	892	av_push (av, newSViv ((*m)->h));
738	av_push (av, newSViv (rgb));	893	av_push (av, newSViv (rgb));
…		…
801	{	956	{
802	case SDL_KEYDOWN:	957	case SDL_KEYDOWN:
803	case SDL_KEYUP:	958	case SDL_KEYUP:
804	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	959	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	960	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);	961	hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
807	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */	962	hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
808	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	963	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809	break;	964	break;
810		965
811	case SDL_ACTIVEEVENT:	966	case SDL_ACTIVEEVENT:
812	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	967	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
…		…
830	x = ev.motion.x;	985	x = ev.motion.x;
831	y = ev.motion.y;	986	y = ev.motion.y;
832	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));	987	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833	}	988	}
834		989
835	hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);	990	hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836	hv_store (hv, "state", 5, newSViv (state), 0);	991	hv_store (hv, "state", 5, newSViv (state), 0);
837	hv_store (hv, "x", 1, newSViv (x), 0);	992	hv_store (hv, "x", 1, newSViv (x), 0);
838	hv_store (hv, "y", 1, newSViv (y), 0);	993	hv_store (hv, "y", 1, newSViv (y), 0);
839	hv_store (hv, "xrel", 4, newSViv (xrel), 0);	994	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840	hv_store (hv, "yrel", 4, newSViv (yrel), 0);	995	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
…		…
1056	#if DEBUG	1211	#if DEBUG
1057	VALGRIND_DO_LEAK_CHECK;	1212	VALGRIND_DO_LEAK_CHECK;
1058	#endif	1213	#endif
1059	}	1214	}
1060		1215
		1216	int
		1217	SvREFCNT (SV *sv)
		1218	CODE:
		1219	RETVAL = SvREFCNT (sv);
		1220	OUTPUT:
		1221	RETVAL
		1222
1061	MODULE = Deliantra::Client PACKAGE = DC::Font	1223	MODULE = Deliantra::Client PACKAGE = DC::Font
1062		1224
1063	PROTOTYPES: DISABLE	1225	PROTOTYPES: DISABLE
1064		1226
1065	DC::Font	1227	DC::Font
…		…
1494	if (ix)	1656	if (ix)
1495	{	1657	{
1496	glDisable (GL_ALPHA_TEST);	1658	glDisable (GL_ALPHA_TEST);
1497	glDisable (GL_BLEND);	1659	glDisable (GL_BLEND);
1498	}	1660	}
		1661	}
		1662
		1663	void
		1664	draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1)
		1665	PROTOTYPE: @
		1666	CODE:
		1667	{
		1668	glEnable (GL_TEXTURE_2D);
		1669	glEnable (GL_BLEND);
		1670	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
		1671	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1672
		1673	glColor4f (intensity, intensity, intensity, 0.9);
		1674	glPushMatrix ();
		1675	glScalef (1./3, 1./3, 1.);
		1676
		1677	glBindTexture (GL_TEXTURE_2D, name1);
		1678
		1679	glBegin (GL_QUADS);
		1680	glTexCoord2f ( 0, 0); glVertex2f ( 0, 0);
		1681	glTexCoord2f ( 0, t1); glVertex2f ( 0, h1);
		1682	glTexCoord2f (s1, t1); glVertex2f (w1, h1);
		1683	glTexCoord2f (s1, 0); glVertex2f (w1, 0);
		1684	glEnd ();
		1685
		1686	glPopMatrix ();
		1687
		1688	glDisable (GL_TEXTURE_2D);
		1689	glDisable (GL_BLEND);
1499	}	1690	}
1500		1691
1501	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)	1692	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
1502	CODE:	1693	CODE:
1503	{	1694	{
…		…
1609	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);	1800	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1610	// use uglier nearest interpolation because linear suffers	1801	// use uglier nearest interpolation because linear suffers
1611	// from transparent color bleeding and ugly wrapping effects.	1802	// from transparent color bleeding and ugly wrapping effects.
1612	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);	1803	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613	}	1804	}
		1805
		1806	void
		1807	expire_textures (DC::Map self, int texid, int count)
		1808	PPCODE:
		1809	for (; texid < self->texs && count; ++texid, --count)
		1810	{
		1811	maptex *tex = self->tex + texid;
		1812
		1813	if (tex->name)
		1814	{
		1815	if (tex->unused)
		1816	{
		1817	tex->name = 0;
		1818	tex->unused = 0;
		1819	XPUSHs (sv_2mortal (newSViv (texid)));
		1820	}
		1821	else
		1822	tex->unused = 1;
		1823	}
		1824	}
1614		1825
1615	int	1826	int
1616	ox (DC::Map self)	1827	ox (DC::Map self)
1617	ALIAS:	1828	ALIAS:
1618	oy = 1	1829	oy = 1
…		…
1739	cell->tile [z] = self->face2tile [face];	1950	cell->tile [z] = self->face2tile [face];
1740		1951
1741	if (cell->tile [z])	1952	if (cell->tile [z])
1742	{	1953	{
1743	maptex *tex = self->tex + cell->tile [z];	1954	maptex *tex = self->tex + cell->tile [z];
		1955	tex->unused = 0;
1744	if (!tex->name)	1956	if (!tex->name)
1745	av_push (missing, newSViv (cell->tile [z]));	1957	av_push (missing, newSViv (cell->tile [z]));
1746		1958
1747	if (tex->smoothtile)	1959	if (tex->smoothtile)
1748	{	1960	{
1749	maptex *smooth = self->tex + tex->smoothtile;	1961	maptex *smooth = self->tex + tex->smoothtile;
		1962	smooth->unused = 0;
1750	if (!smooth->name)	1963	if (!smooth->name)
1751	av_push (missing, newSViv (tex->smoothtile));	1964	av_push (missing, newSViv (tex->smoothtile));
1752	}	1965	}
1753	}	1966	}
1754	}	1967	}
1755	}	1968	}
1756	else	1969	else
1757	cell->darkness = 0;	1970	CELL_CLEAR (cell);
1758	}	1971	}
1759	}	1972	}
1760	OUTPUT:	1973	OUTPUT:
1761	RETVAL	1974	RETVAL
1762		1975
…		…
1814	}	2027	}
1815	OUTPUT:	2028	OUTPUT:
1816	RETVAL	2029	RETVAL
1817		2030
1818	void	2031	void
1819	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)	2032	draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1820	CODE:	2033	CODE:
1821	{	2034	{
1822	int x, y, z;	2035	int x, y, z;
1823		2036
1824	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	2037	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1825	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	2038	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1826	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)	2039	static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1827	smooth_key skey;	2040	smooth_key skey;
1828	int pl_x, pl_y;	2041	int pl_x, pl_y;
1829	maptex pl_tex;	2042	maptex pl_tex;
		2043	rc_t *rc = rc_alloc ();
		2044	rc_t *rc_ov = rc_alloc ();
		2045	rc_key_t key;
		2046	rc_array_t arr, arr_hidden;
1830		2047
1831	pl_tex.name = 0;	2048	pl_tex.name = 0;
1832		2049
1833	rc_t *rc = rc_alloc ();
1834	rc_key_t key;
1835	rc_array_t *arr;
1836
1837	// thats current max. sorry.	2050	// that's current max. sorry.
1838	if (sw > 255) sw = 255;	2051	if (sw > 255) sw = 255;
1839	if (sh > 255) sh = 255;	2052	if (sh > 255) sh = 255;
1840		2053
1841	// clear key, in case of extra padding	2054	// clear key, in case of extra padding
1842	memset (&skey, 0, sizeof (skey));	2055	memset (&skey, 0, sizeof (skey));
…		…
1846	key.g = 255;	2059	key.g = 255;
1847	key.b = 255;	2060	key.b = 255;
1848	key.a = 255;	2061	key.a = 255;
1849	key.mode = GL_QUADS;	2062	key.mode = GL_QUADS;
1850	key.format = GL_T2F_V3F;	2063	key.format = GL_T2F_V3F;
1851	key.texname = -1;
1852		2064
1853	mx += self->x;	2065	mx += self->x;
1854	my += self->y;	2066	my += self->y;
1855		2067
1856	// first pass: determine smooth_max	2068	// first pass: determine smooth_max
…		…
1877		2089
1878	glEnable (GL_BLEND);	2090	glEnable (GL_BLEND);
1879	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2091	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1880	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2092	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1881		2093
		2094	key.texname = self->tex [TEXID_HIDDEN].name;
		2095	arr_hidden = rc_array (rc_ov, &key);
		2096
1882	for (z = 0; z <= 2; z++)	2097	for (z = 0; z <= 2; z++)
1883	{	2098	{
1884	memset (smooth_level, 0, sizeof (smooth_level));	2099	memset (smooth_level, 0, sizeof (smooth_level));
		2100	key.texname = -1;
1885		2101
1886	for (y = 0; y < sh; y++)	2102	for (y = 0; y < sh; y++)
1887	if (0 <= y + my && y + my < self->rows)	2103	if (0 <= y + my && y + my < self->rows)
1888	{	2104	{
1889	maprow *row = self->row + (y + my);	2105	maprow *row = self->row + (y + my);
…		…
1895	tileid tile = cell->tile [z];	2111	tileid tile = cell->tile [z];
1896		2112
1897	if (tile)	2113	if (tile)
1898	{	2114	{
1899	maptex tex = self->tex [tile];	2115	maptex tex = self->tex [tile];
1900	int px = (x + 1) * T - tex.w;	2116	int px, py;
1901	int py = (y + 1) * T - tex.h;
1902		2117
1903	if (key.texname != tex.name)	2118	if (key.texname != tex.name)
1904	{	2119	{
		2120	self->tex [tile].unused = 0;
		2121
1905	if (!tex.name)	2122	if (!tex.name)
1906	tex = self->tex [2]; /* missing, replace by noface */	2123	tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1907		2124
1908	key.texname = tex.name;	2125	key.texname = tex.name;
1909	arr = rc_array (rc, &key);	2126	arr = rc_array (rc, &key);
1910	}	2127	}
		2128
		2129	px = (x + 1) * T - tex.w;
		2130	py = (y + 1) * T - tex.h;
1911		2131
1912	if (expect_false (cell->player == player) && expect_false (z == 2))	2132	if (expect_false (cell->player == player) && expect_false (z == 2))
1913	{	2133	{
1914	pl_x = px;	2134	pl_x = px;
1915	pl_y = py;	2135	pl_y = py;
…		…
1920	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2140	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1921	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);	2141	rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1922	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);	2142	rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1923	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2143	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1924		2144
1925	if (expect_false (cell->flags) && expect_false (z == 2))
1926	{
1927	// overlays such as the speech bubble, probably more to come
1928	if (cell->flags & 1)
1929	{
1930	maptex tex = self->tex [1];
1931	int px = x * T + T * 2 / 32;
1932	int py = y * T - T * 6 / 32;
1933
1934	if (tex.name)
1935	{
1936	if (key.texname != tex.name)
1937	{
1938	key.texname = tex.name;
1939	arr = rc_array (rc, &key);
1940	}
1941
1942	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1943	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1944	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1945	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1946	}
1947	}
1948	}
1949
1950	// update smooth hash	2145	// update smooth hash
1951	if (tex.smoothtile)	2146	if (tex.smoothtile)
1952	{	2147	{
1953	skey.tile = tex.smoothtile;	2148	skey.tile = tex.smoothtile;
1954	skey.level = tex.smoothlevel;	2149	skey.level = tex.smoothlevel;
…		…
1982	// corners	2177	// corners
1983	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);	2178	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1984	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);	2179	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1985	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);	2180	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1986	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);	2181	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		2182	}
		2183	}
		2184
		2185	if (expect_false (z == 2))
		2186	{
		2187	/* draw question marks on top of hidden spaces */
		2188	if (!cell->darkness)
		2189	{
		2190	maptex tex = self->tex [TEXID_HIDDEN];
		2191	int px = (x + 1) * T - tex.w;
		2192	int py = (y + 1) * T - tex.h;
		2193
		2194	rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
		2195	rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
		2196	rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
		2197	rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
		2198	}
		2199
		2200	if (expect_false (cell->flags))
		2201	{
		2202	// overlays such as the speech bubble, probably more to come
		2203	if (cell->flags & 1)
		2204	{
		2205	rc_key_t key_ov = key;
		2206	maptex tex = self->tex [TEXID_SPEECH];
		2207	rc_array_t *arr;
		2208	int px = x * T + T * 2 / 32;
		2209	int py = y * T - T * 6 / 32;
		2210
		2211	key_ov.texname = tex.name;
		2212	arr = rc_array (rc_ov, &key_ov);
		2213
		2214	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
		2215	rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
		2216	rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
		2217	rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
		2218	}
1987	}	2219	}
1988	}	2220	}
1989	}	2221	}
1990	}	2222	}
1991		2223
…		…
2031	{	2263	{
2032	// this time avoiding texture state changes	2264	// this time avoiding texture state changes
2033	// save gobs of state changes.	2265	// save gobs of state changes.
2034	if (key.texname != tex.name)	2266	if (key.texname != tex.name)
2035	{	2267	{
		2268	self->tex [skey->tile].unused = 0;
		2269
2036	glEnd ();	2270	glEnd ();
2037	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);	2271	glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2038	glBegin (GL_QUADS);	2272	glBegin (GL_QUADS);
2039	}	2273	}
2040		2274
…		…
2072	}	2306	}
2073		2307
2074	if (pl_tex.name)	2308	if (pl_tex.name)
2075	{	2309	{
2076	maptex tex = pl_tex;	2310	maptex tex = pl_tex;
2077	int px = pl_x + pdx;	2311	int px = pl_x + sdx;
2078	int py = pl_y + pdy;	2312	int py = pl_y + sdy;
2079		2313
2080	key.texname = tex.name;	2314	key.texname = tex.name;
2081	arr = rc_array (rc, &key);	2315	arr = rc_array (rc, &key);
2082		2316
2083	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);	2317	rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
…		…
2086	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);	2320	rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087		2321
2088	rc_draw (rc);	2322	rc_draw (rc);
2089	}	2323	}
2090		2324
		2325	rc_draw (rc_ov);
		2326	rc_clear (rc_ov);
		2327
2091	glDisable (GL_BLEND);	2328	glDisable (GL_BLEND);
2092	rc_free (rc);	2329	rc_free (rc);
		2330	rc_free (rc_ov);
2093		2331
2094	// top layer: overlays such as the health bar	2332	// top layer: overlays such as the health bar
2095	for (y = 0; y < sh; y++)	2333	for (y = 0; y < sh; y++)
2096	if (0 <= y + my && y + my < self->rows)	2334	if (0 <= y + my && y + my < self->rows)
2097	{	2335	{
…		…
2102	{	2340	{
2103	mapcell *cell = row->col + (x + mx - row->c0);	2341	mapcell *cell = row->col + (x + mx - row->c0);
2104		2342
2105	int px = x * T;	2343	int px = x * T;
2106	int py = y * T;	2344	int py = y * T;
		2345
		2346	if (expect_false (cell->player == player))
		2347	{
		2348	px += sdx;
		2349	py += sdy;
		2350	}
2107		2351
2108	if (cell->stat_hp)	2352	if (cell->stat_hp)
2109	{	2353	{
2110	int width = cell->stat_width * T;	2354	int width = cell->stat_width * T;
2111	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;	2355	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
…		…
2151	};	2395	};
2152		2396
2153	int x, y;	2397	int x, y;
2154		2398
2155	glEnable (GL_TEXTURE_2D);	2399	glEnable (GL_TEXTURE_2D);
		2400	/* GL_REPLACE would be correct, as we don't need to modulate alpha,
		2401	* but the nvidia driver (185.18.14) mishandles alpha textures
		2402	* ansd takes the colour from god knows where instead of using
		2403	* Cp. MODULATE results in the same colour, but slightly different
		2404	* alpha, but atcually gives us the correct colour with nvidia.
		2405	*/
2156	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	2406	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2157	glEnable (GL_BLEND);	2407	glEnable (GL_BLEND);
2158	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	2408	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2159	glBegin (GL_QUADS);	2409	glBegin (GL_QUADS);
2160		2410
2161	for (y = 0; y < h; y++)	2411	for (y = 0; y < h; y++)
…		…
2168	float *c = color [m & 15];	2418	float *c = color [m & 15];
2169		2419
2170	float tx1 = m & 0x40 ? 0.5 : 0.;	2420	float tx1 = m & 0x40 ? 0.5 : 0.;
2171	float tx2 = tx1 + 0.5;	2421	float tx2 = tx1 + 0.5;
2172		2422
2173	glColor4f (c[0], c[1], c[2], 0.75);	2423	glColor4f (c[0], c[1], c[2], 1);
2174	glTexCoord2f (tx1, 0.); glVertex2i (x , y );	2424	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2175	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);	2425	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2176	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);	2426	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2177	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );	2427	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2178	}	2428	}
…		…
2200	SvCUR_set (darkness3_sv, sw34 * sh3);	2450	SvCUR_set (darkness3_sv, sw34 * sh3);
2201		2451
2202	mx += self->x - 1;	2452	mx += self->x - 1;
2203	my += self->y - 1;	2453	my += self->y - 1;
2204		2454
2205	memset (darkness1, 255, sw1 * sh1);	2455	memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2206		2456
2207	for (y = 0; y < sh1; y++)	2457	for (y = 0; y < sh1; y++)
2208	if (0 <= y + my && y + my < self->rows)	2458	if (0 <= y + my && y + my < self->rows)
2209	{	2459	{
2210	maprow *row = self->row + (y + my);	2460	maprow *row = self->row + (y + my);
…		…
2637	} *civ, const_iv[] = {	2887	} *civ, const_iv[] = {
2638	# define const_iv(name) { # name, (IV)name }	2888	# define const_iv(name) { # name, (IV)name }
2639	const_iv (GL_VENDOR),	2889	const_iv (GL_VENDOR),
2640	const_iv (GL_VERSION),	2890	const_iv (GL_VERSION),
2641	const_iv (GL_EXTENSIONS),	2891	const_iv (GL_EXTENSIONS),
		2892	const_iv (GL_MAX_TEXTURE_UNITS),
2642	const_iv (GL_COLOR_MATERIAL),	2893	const_iv (GL_COLOR_MATERIAL),
2643	const_iv (GL_SMOOTH),	2894	const_iv (GL_SMOOTH),
2644	const_iv (GL_FLAT),	2895	const_iv (GL_FLAT),
2645	const_iv (GL_DITHER),	2896	const_iv (GL_DITHER),
2646	const_iv (GL_BLEND),	2897	const_iv (GL_BLEND),
…		…
2658	const_iv (GL_ZERO),	2909	const_iv (GL_ZERO),
2659	const_iv (GL_SRC_ALPHA),	2910	const_iv (GL_SRC_ALPHA),
2660	const_iv (GL_DST_ALPHA),	2911	const_iv (GL_DST_ALPHA),
2661	const_iv (GL_ONE_MINUS_SRC_ALPHA),	2912	const_iv (GL_ONE_MINUS_SRC_ALPHA),
2662	const_iv (GL_ONE_MINUS_DST_ALPHA),	2913	const_iv (GL_ONE_MINUS_DST_ALPHA),
		2914	const_iv (GL_SRC_COLOR),
		2915	const_iv (GL_DST_COLOR),
		2916	const_iv (GL_ONE_MINUS_SRC_COLOR),
		2917	const_iv (GL_ONE_MINUS_DST_COLOR),
2663	const_iv (GL_SRC_ALPHA_SATURATE),	2918	const_iv (GL_SRC_ALPHA_SATURATE),
2664	const_iv (GL_RGB),	2919	const_iv (GL_RGB),
2665	const_iv (GL_RGBA),	2920	const_iv (GL_RGBA),
2666	const_iv (GL_RGBA4),	2921	const_iv (GL_RGBA4),
2667	const_iv (GL_RGBA8),	2922	const_iv (GL_RGBA8),
…		…
2735	const_iv (GL_NICEST),	2990	const_iv (GL_NICEST),
2736	const_iv (GL_V2F),	2991	const_iv (GL_V2F),
2737	const_iv (GL_V3F),	2992	const_iv (GL_V3F),
2738	const_iv (GL_T2F_V3F),	2993	const_iv (GL_T2F_V3F),
2739	const_iv (GL_T2F_N3F_V3F),	2994	const_iv (GL_T2F_N3F_V3F),
		2995	const_iv (GL_FUNC_ADD),
		2996	const_iv (GL_FUNC_SUBTRACT),
		2997	const_iv (GL_FUNC_REVERSE_SUBTRACT),
2740	# undef const_iv	2998	# undef const_iv
2741	};	2999	};
2742		3000
2743	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	3001	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2744	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	3002	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
…		…
2751	disable_GL_EXT_blend_func_separate ()	3009	disable_GL_EXT_blend_func_separate ()
2752	CODE:	3010	CODE:
2753	gl.BlendFuncSeparate = 0;	3011	gl.BlendFuncSeparate = 0;
2754	gl.BlendFuncSeparateEXT = 0;	3012	gl.BlendFuncSeparateEXT = 0;
2755		3013
		3014	void
		3015	apple_nvidia_bug (int enable)
		3016
2756	char *	3017	char *
2757	gl_vendor ()	3018	gl_vendor ()
2758	CODE:	3019	CODE:
2759	RETVAL = (char *)glGetString (GL_VENDOR);	3020	RETVAL = (char *)glGetString (GL_VENDOR);
2760	OUTPUT:	3021	OUTPUT:
…		…
2809		3070
2810	void glBlendFuncSeparate (int sa, int da, int saa, int daa)	3071	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2811	CODE:	3072	CODE:
2812	gl_BlendFuncSeparate (sa, da, saa, daa);	3073	gl_BlendFuncSeparate (sa, da, saa, daa);
2813		3074
		3075	# void glBlendEquation (int se)
		3076
2814	void glDepthMask (int flag)	3077	void glDepthMask (int flag)
2815		3078
2816	void glLogicOp (int opcode)	3079	void glLogicOp (int opcode)
2817		3080
2818	void glColorMask (int red, int green, int blue, int alpha)	3081	void glColorMask (int red, int green, int blue, int alpha)
…		…
2852	void glRotate (float angle, float x, float y, float z)	3115	void glRotate (float angle, float x, float y, float z)
2853	CODE:	3116	CODE:
2854	glRotatef (angle, x, y, z);	3117	glRotatef (angle, x, y, z);
2855		3118
2856	void glColor (float r, float g, float b, float a = 1.0)	3119	void glColor (float r, float g, float b, float a = 1.0)
		3120	PROTOTYPE: @
2857	ALIAS:	3121	ALIAS:
2858	glColor_premultiply = 1	3122	glColor_premultiply = 1
2859	CODE:	3123	CODE:
2860	if (ix)	3124	if (ix)
2861	{	3125	{

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC vs. Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.261 by root, Sun Jul 13 12:17:00 2008 UTC vs.
Revision 1.293 by root, Thu Dec 17 02:49:38 2009 UTC