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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	62	#else
58	# define PARACHUTE 0	63	# define PARACHUTE 0
59	#endif	64	#endif
60		65
		66	static AV *texture_av;
		67
61	static struct	68	static struct
62	{	69	{
63	#define GL_FUNC(ptr,name) ptr name;	70	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	71	#include "glfunc.h"
65	#undef GL_FUNC	72	#undef GL_FUNC
66	} gl;	73	} gl;
67		74
		75	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	76	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	77	{
70	if (gl.BlendFuncSeparate)	78	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	79	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	80	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	81	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	82	else
75	glBlendFunc (sa, da);	83	glBlendFunc (sa, da);
		84	}
		85
		86	static GLuint
		87	gen_texture ()
		88	{
		89	GLuint name;
		90
		91	if (AvFILL (texture_av) >= 0)
		92	name = (GLuint)(size_t)av_pop (texture_av);
		93	else
		94	glGenTextures (1, &name);
		95
		96	return name;
		97	}
		98
		99	static void
		100	del_texture (GLuint name)
		101	{
		102	/* make a half-assed attempt at returning the memory used by the texture */
		103	/* textures are frequently being reused by cfplus anyway */
		104	/glBindTexture (GL_TEXTURE_2D, name);/
		105	/glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);/
		106	av_push (texture_av, (SV *)(size_t)name);
		107	glDeleteTextures (1, &name);
76	}	108	}
77		109
78	#include "texcache.c"	110	#include "texcache.c"
79		111
80	#include "pango-font.c"	112	#include "pango-font.c"
…		…
400		432
401	/* SDL should provide this, really. */	433	/* SDL should provide this, really. */
402	#define SDLK_MODIFIER_MIN 300	434	#define SDLK_MODIFIER_MIN 300
403	#define SDLK_MODIFIER_MAX 314	435	#define SDLK_MODIFIER_MAX 314
404		436
405	static AV *texture_av;
406
407	MODULE = CFPlus PACKAGE = CFPlus	437	MODULE = CFPlus PACKAGE = CFPlus
408		438
409	PROTOTYPES: ENABLE	439	PROTOTYPES: ENABLE
410		440
411	BOOT:	441	BOOT:
412	{	442	{
413	texture_av = newAV ();
414	AvREAL_off (texture_av);
415
416	HV *stash = gv_stashpv ("CFPlus", 1);	443	HV *stash = gv_stashpv ("CFPlus", 1);
417	static const struct {	444	static const struct {
418	const char *name;	445	const char *name;
419	IV iv;	446	IV iv;
420	} *civ, const_iv[] = {	447	} *civ, const_iv[] = {
…		…
619	RETVAL = !!SDL_SetVideoMode (	646	RETVAL = !!SDL_SetVideoMode (
620	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	647	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
621	);	648	);
622	if (RETVAL)	649	if (RETVAL)
623	{	650	{
		651	av_clear (texture_av);
		652
624	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	653	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
625	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	654	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
626	# include "glfunc.h"	655	# include "glfunc.h"
627	# undef GL_FUNC	656	# undef GL_FUNC
		657
628	}	658	}
629	OUTPUT:	659	OUTPUT:
630	RETVAL	660	RETVAL
631		661
632	void	662	void
633	SDL_GL_SwapBuffers ()	663	SDL_GL_SwapBuffers ()
634		664
635	char *	665	char *
636	SDL_GetKeyName (int sym)	666	SDL_GetKeyName (int sym)
637		667
		668	int
		669	SDL_GetAppState ()
		670
638	void	671	void
639	SDL_PollEvent ()	672	poll_events ()
640	PPCODE:	673	PPCODE:
641	{	674	{
642	SDL_Event ev;	675	SDL_Event ev;
643		676
644	while (SDL_PollEvent (&ev))	677	SDL_PumpEvents ();
		678	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
645	{	679	{
646	HV *hv = newHV ();	680	HV *hv = newHV ();
647	hv_store (hv, "type", 4, newSViv (ev.type), 0);	681	hv_store (hv, "type", 4, newSViv (ev.type), 0);
648		682
649	switch (ev.type)	683	switch (ev.type)
…		…
661	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	695	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
662	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	696	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
663	break;	697	break;
664		698
665	case SDL_MOUSEMOTION:	699	case SDL_MOUSEMOTION:
		700	{
		701	int state = ev.motion.state;
		702	int x = ev.motion.x;
		703	int y = ev.motion.y;
		704	int xrel = ev.motion.xrel;
		705	int yrel = ev.motion.yrel;
		706
		707	/* do simplistic event compression */
		708	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		709	&& state == ev.motion.state)
		710	{
		711	xrel += ev.motion.xrel;
		712	yrel += ev.motion.yrel;
		713	x = ev.motion.x;
		714	y = ev.motion.y;
		715	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		716	}
		717
666	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	718	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
667
668	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	719	hv_store (hv, "state", 5, newSViv (state), 0);
669	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	720	hv_store (hv, "x", 1, newSViv (x), 0);
670	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	721	hv_store (hv, "y", 1, newSViv (y), 0);
671	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	722	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
672	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	723	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		724	}
673	break;	725	break;
674		726
675	case SDL_MOUSEBUTTONDOWN:	727	case SDL_MOUSEBUTTONDOWN:
676	case SDL_MOUSEBUTTONUP:	728	case SDL_MOUSEBUTTONUP:
677	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	729	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
857	ExitThread (retval); // unclean, please beam me up	909	ExitThread (retval); // unclean, please beam me up
858	#else	910	#else
859	_exit (retval);	911	_exit (retval);
860	#endif	912	#endif
861		913
		914	void
		915	debug ()
		916	CODE:
		917	{
		918	#if DEBUG
		919	VALGRIND_DO_LEAK_CHECK;
		920	#endif
		921	}
		922
862	MODULE = CFPlus PACKAGE = CFPlus::Font	923	MODULE = CFPlus PACKAGE = CFPlus::Font
863		924
864	CFPlus::Font	925	CFPlus::Font
865	new_from_file (SV class, char path, int id = 0)	926	new_from_file (SV class, char path, int id = 0)
866	CODE:	927	CODE:
…		…
1181	flags	1242	flags
1182	);	1243	);
1183		1244
1184	MODULE = CFPlus PACKAGE = CFPlus::Texture	1245	MODULE = CFPlus PACKAGE = CFPlus::Texture
1185		1246
		1247	int minpot (int n)
		1248
1186	void	1249	void
1187	pad2pot (SV data_, SV w_, SV *h_)	1250	pad2pot (SV data_, SV w_, SV *h_)
1188	CODE:	1251	CODE:
1189	{	1252	{
1190	int ow = SvIV (w_);	1253	int ow = SvIV (w_);
…		…
1266	{	1329	{
1267	glDisable (GL_ALPHA_TEST);	1330	glDisable (GL_ALPHA_TEST);
1268	glDisable (GL_BLEND);	1331	glDisable (GL_BLEND);
1269	}	1332	}
1270	}	1333	}
		1334
		1335	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1336	CODE:
		1337	{
		1338	GLint width;
		1339	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1340	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1341	RETVAL = width > 0;
		1342	}
		1343	OUTPUT:
		1344	RETVAL
1271		1345
1272	MODULE = CFPlus PACKAGE = CFPlus::Map	1346	MODULE = CFPlus PACKAGE = CFPlus::Map
1273		1347
1274	CFPlus::Map	1348	CFPlus::Map
1275	new (SV *class)	1349	new (SV *class)
…		…
1396	CODE:	1470	CODE:
1397	{	1471	{
1398	if (dx > 0)	1472	if (dx > 0)
1399	map_blank (self, self->x, self->y, dx, self->h);	1473	map_blank (self, self->x, self->y, dx, self->h);
1400	else if (dx < 0)	1474	else if (dx < 0)
1401	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1475	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1402		1476
1403	if (dy > 0)	1477	if (dy > 0)
1404	map_blank (self, self->x, self->y, self->w, dy);	1478	map_blank (self, self->x, self->y, self->w, dy);
1405	else if (dy < 0)	1479	else if (dy < 0)
1406	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1480	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1407		1481
1408	self->ox += dx; self->x += dx;	1482	self->ox += dx; self->x += dx;
1409	self->oy += dy; self->y += dy;	1483	self->oy += dy; self->y += dy;
1410		1484
1411	while (self->y < 0)	1485	while (self->y < 0)
…		…
1740	smooth_key skey = (smooth_key )HeKEY (he);	1814	smooth_key skey = (smooth_key )HeKEY (he);
1741	IV bits = SvIVX (HeVAL (he));	1815	IV bits = SvIVX (HeVAL (he));
1742		1816
1743	if (!(bits & 0x1000)	1817	if (!(bits & 0x1000)
1744	&& skey->level == level	1818	&& skey->level == level
1745	&& level >= smooth_max [skey->x][skey->y])	1819	&& level > smooth_max [skey->x][skey->y])
1746	{	1820	{
1747	maptex tex = self->tex [skey->tile];	1821	maptex tex = self->tex [skey->tile];
1748	int px = (((int)skey->x) - 1) * T;	1822	int px = (((int)skey->x) - 1) * T;
1749	int py = (((int)skey->y) - 1) * T;	1823	int py = (((int)skey->y) - 1) * T;
1750	int border = bits & 15;	1824	int border = bits & 15;
…		…
2101	CODE:	2175	CODE:
2102	RETVAL = Mix_VolumeMusic (volume);	2176	RETVAL = Mix_VolumeMusic (volume);
2103	OUTPUT:	2177	OUTPUT:
2104	RETVAL	2178	RETVAL
2105		2179
		2180	int
		2181	fade_out (int ms)
		2182	CODE:
		2183	RETVAL = Mix_FadeOutMusic (ms);
		2184	OUTPUT:
		2185	RETVAL
		2186
2106	CFPlus::MixMusic	2187	CFPlus::MixMusic
2107	new_from_file (SV class, char path)	2188	new_from_file (SV class, char path)
2108	CODE:	2189	CODE:
2109	RETVAL = Mix_LoadMUS (path);	2190	RETVAL = Mix_LoadMUS (path);
2110	OUTPUT:	2191	OUTPUT:
…		…
2117		2198
2118	int	2199	int
2119	play (CFPlus::MixMusic self, int loops = -1)	2200	play (CFPlus::MixMusic self, int loops = -1)
2120	CODE:	2201	CODE:
2121	RETVAL = Mix_PlayMusic (self, loops);	2202	RETVAL = Mix_PlayMusic (self, loops);
		2203	OUTPUT:
		2204	RETVAL
		2205
		2206	int
		2207	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2208	CODE:
		2209	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);
2122	OUTPUT:	2210	OUTPUT:
2123	RETVAL	2211	RETVAL
2124		2212
2125	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2213	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2126		2214
…		…
2130	static const struct {	2218	static const struct {
2131	const char *name;	2219	const char *name;
2132	IV iv;	2220	IV iv;
2133	} *civ, const_iv[] = {	2221	} *civ, const_iv[] = {
2134	# define const_iv(name) { # name, (IV)name }	2222	# define const_iv(name) { # name, (IV)name }
		2223	const_iv (GL_VENDOR),
		2224	const_iv (GL_VERSION),
		2225	const_iv (GL_EXTENSIONS),
2135	const_iv (GL_COLOR_MATERIAL),	2226	const_iv (GL_COLOR_MATERIAL),
2136	const_iv (GL_SMOOTH),	2227	const_iv (GL_SMOOTH),
2137	const_iv (GL_FLAT),	2228	const_iv (GL_FLAT),
2138	const_iv (GL_DITHER),	2229	const_iv (GL_DITHER),
2139	const_iv (GL_BLEND),	2230	const_iv (GL_BLEND),
…		…
2166	const_iv (GL_LUMINANCE),	2257	const_iv (GL_LUMINANCE),
2167	const_iv (GL_LUMINANCE_ALPHA),	2258	const_iv (GL_LUMINANCE_ALPHA),
2168	const_iv (GL_FLOAT),	2259	const_iv (GL_FLOAT),
2169	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2260	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
2170	const_iv (GL_COMPILE),	2261	const_iv (GL_COMPILE),
		2262	const_iv (GL_PROXY_TEXTURE_1D),
		2263	const_iv (GL_PROXY_TEXTURE_2D),
2171	const_iv (GL_TEXTURE_1D),	2264	const_iv (GL_TEXTURE_1D),
2172	const_iv (GL_TEXTURE_2D),	2265	const_iv (GL_TEXTURE_2D),
2173	const_iv (GL_TEXTURE_ENV),	2266	const_iv (GL_TEXTURE_ENV),
2174	const_iv (GL_TEXTURE_MAG_FILTER),	2267	const_iv (GL_TEXTURE_MAG_FILTER),
2175	const_iv (GL_TEXTURE_MIN_FILTER),	2268	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2215	# undef const_iv	2308	# undef const_iv
2216	};	2309	};
2217		2310
2218	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2311	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2219	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2312	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2313
		2314	texture_av = newAV ();
		2315	AvREAL_off (texture_av);
2220	}	2316	}
2221		2317
2222	char *	2318	char *
2223	gl_vendor ()	2319	gl_vendor ()
2224	CODE:	2320	CODE:
…		…
2235		2331
2236	char *	2332	char *
2237	gl_extensions ()	2333	gl_extensions ()
2238	CODE:	2334	CODE:
2239	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2335	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		2336	OUTPUT:
		2337	RETVAL
		2338
		2339	char *glGetString (GLenum pname)
		2340
		2341	GLint glGetInteger (GLenum pname)
		2342	CODE:
		2343	glGetIntegerv (pname, &RETVAL);
		2344	OUTPUT:
		2345	RETVAL
		2346
		2347	GLdouble glGetDouble (GLenum pname)
		2348	CODE:
		2349	glGetDoublev (pname, &RETVAL);
2240	OUTPUT:	2350	OUTPUT:
2241	RETVAL	2351	RETVAL
2242		2352
2243	int glGetError ()	2353	int glGetError ()
2244		2354
…		…
2369		2479
2370	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2480	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2371		2481
2372	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2482	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2373		2483
		2484	void glPixelZoom (float x, float y)
		2485
2374	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2486	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2375		2487
2376	int glGenTexture ()	2488	int glGenTexture ()
2377	CODE:	2489	CODE:
2378	{	2490	RETVAL = gen_texture ();
2379	GLuint name;
2380	if (AvFILL (texture_av) >= 0)
2381	name = (GLuint)av_pop (texture_av);
2382	else
2383	glGenTextures (1, &name);
2384	RETVAL = name;
2385	}
2386	OUTPUT:	2491	OUTPUT:
2387	RETVAL	2492	RETVAL
2388		2493
2389	void glDeleteTexture (int name)	2494	void glDeleteTexture (int name)
2390	CODE:	2495	CODE:
2391	{	2496	del_texture (name);
2392	glBindTexture (GL_TEXTURE_2D, name);	2497
2393	glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);
2394	av_push (texture_av, (SV *)name);
2395	/glDeleteTextures (1, &name_);/
2396	}
2397
2398	int glGenList ()	2498	int glGenList ()
2399	CODE:	2499	CODE:
2400	RETVAL = glGenLists (1);	2500	RETVAL = glGenLists (1);
2401	OUTPUT:	2501	OUTPUT:
2402	RETVAL	2502	RETVAL

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs. Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.183 by root, Fri Apr 20 16:56:08 2007 UTC vs.
Revision 1.199 by root, Tue Jul 17 13:53:02 2007 UTC