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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.221 by root, Fri Aug 10 04:02:13 2007 UTC

…		…
25	#include <math.h>	25	#include <math.h>
26	#include <string.h>	26	#include <string.h>
27	#include <stdio.h>	27	#include <stdio.h>
28	#include <stdlib.h>	28	#include <stdlib.h>
29		29
		30	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
		31
30	#include <SDL.h>	32	#include <SDL.h>
31	#include <SDL_thread.h>	33	#include <SDL_thread.h>
32	#include <SDL_endian.h>	34	#include <SDL_endian.h>
33	#include <SDL_image.h>	35	#include <SDL_image.h>
34	#include <SDL_mixer.h>	36	#include <SDL_mixer.h>
…		…
112		114
113	#include "pango-font.c"	115	#include "pango-font.c"
114	#include "pango-fontmap.c"	116	#include "pango-fontmap.c"
115	#include "pango-render.c"	117	#include "pango-render.c"
116		118
		119	typedef IV CFPlus__Channel;
		120	typedef SDL_RWops *CFPlus__RW;
117	typedef Mix_Chunk *CFPlus__MixChunk;	121	typedef Mix_Chunk *CFPlus__MixChunk;
118	typedef Mix_Music *CFPlus__MixMusic;	122	typedef Mix_Music *CFPlus__MixMusic;
119		123
120	typedef PangoFontDescription *CFPlus__Font;	124	typedef PangoFontDescription *CFPlus__Font;
121		125
…		…
800	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));	804	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
801	}	805	}
802	}	806	}
803		807
804	int	808	int
805	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)	809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
806	POSTCALL:	810	POSTCALL:
807	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
808	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
809		813
810	void	814	void
811	Mix_CloseAudio ()	815	Mix_CloseAudio ()
812		816
813	int	817	int
814	Mix_AllocateChannels (int numchans = -1)	818	Mix_AllocateChannels (int numchans = -1)
		819
		820	const char *
		821	Mix_GetError ()
815		822
816	void	823	void
817	lowdelay (int fd, int val = 1)	824	lowdelay (int fd, int val = 1)
818	CODE:	825	CODE:
819	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	826	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
861	STRLEN image_len;	868	STRLEN image_len;
862	char image = (char )SvPVbyte (image_, image_len);	869	char image = (char )SvPVbyte (image_, image_len);
863	SDL_Surface surface, surface2;	870	SDL_Surface surface, surface2;
864	SDL_PixelFormat fmt;	871	SDL_PixelFormat fmt;
865	SDL_RWops *rw = ix	872	SDL_RWops *rw = ix
866	? SDL_RWFromFile (image, "r")	873	? SDL_RWFromFile (image, "rb")
867	: SDL_RWFromConstMem (image, image_len);	874	: SDL_RWFromConstMem (image, image_len);
868		875
869	if (!rw)	876	if (!rw)
870	croak ("load_image: %s", SDL_GetError ());	877	croak ("load_image: %s", SDL_GetError ());
871		878
…		…
1343	HV hv = (HV )SvRV (self);	1350	HV hv = (HV )SvRV (self);
1344	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1345	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1346	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1347		1354
		1355	if (name <= 0)
		1356	XSRETURN_EMPTY;
		1357
1348	if (items < 5)	1358	if (items < 5)
1349	{	1359	{
1350	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1360	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1351	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1361	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1352	}	1362	}
…		…
1540	self->rows += MAP_EXTEND_Y;	1550	self->rows += MAP_EXTEND_Y;
1541	self->y += MAP_EXTEND_Y;	1551	self->y += MAP_EXTEND_Y;
1542	}	1552	}
1543	}	1553	}
1544		1554
1545	void	1555	SV *
1546	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1556	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1547	CODE:	1557	CODE:
1548	{	1558	{
1549	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1559	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1550	uint8_t data_end = (uint8_t )SvEND (data_);	1560	uint8_t data_end = (uint8_t )SvEND (data_);
1551	mapcell *cell;	1561	mapcell *cell;
1552	int x, y, flags;	1562	int x, y, z, flags;
		1563	AV *missing = newAV ();
		1564	RETVAL = newRV_noinc ((SV *)missing);
1553		1565
1554	while (data < data_end - 1)	1566	while (data < data_end - 1)
1555	{	1567	{
1556	flags = (data [0] << 8) + data [1]; data += 2;	1568	flags = (data [0] << 8) + data [1]; data += 2;
1557		1569
…		…
1608	}	1620	}
1609	else	1621	else
1610	cell->darkness = *data++ + 1;	1622	cell->darkness = *data++ + 1;
1611	}	1623	}
1612		1624
		1625	for (z = 0; z <= 2; ++z)
1613	if (flags & 4)	1626	if (flags & (4 >> z))
1614	{	1627	{
1615	faceid face = (data [0] << 8) + data [1]; data += 2;	1628	faceid face = (data [0] << 8) + data [1]; data += 2;
1616	need_facenum (self, face);	1629	need_facenum (self, face);
1617	cell->tile [0] = self->face2tile [face];	1630	cell->tile [z] = self->face2tile [face];
		1631
		1632	if (cell->tile [z])
		1633	{
		1634	maptex *tex = self->tex + cell->tile [z];
		1635	if (!tex->name)
		1636	av_push (missing, newSViv (cell->tile [z]));
		1637
		1638	if (tex->smoothtile)
		1639	{
		1640	maptex *smooth = self->tex + tex->smoothtile;
		1641	if (!smooth->name)
		1642	av_push (missing, newSViv (tex->smoothtile));
		1643	}
		1644	}
1618	}	1645	}
1619
1620	if (flags & 2)
1621	{
1622	faceid face = (data [0] << 8) + data [1]; data += 2;
1623	need_facenum (self, face);
1624	cell->tile [1] = self->face2tile [face];
1625	}
1626
1627	if (flags & 1)
1628	{
1629	faceid face = (data [0] << 8) + data [1]; data += 2;
1630	need_facenum (self, face);
1631	cell->tile [2] = self->face2tile [face];
1632	}
1633	}	1646	}
1634	else	1647	else
1635	cell->darkness = 0;	1648	cell->darkness = 0;
1636	}	1649	}
1637	}	1650	}
		1651	OUTPUT:
		1652	RETVAL
1638		1653
1639	SV *	1654	SV *
1640	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)	1655	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1641	CODE:	1656	CODE:
1642	{	1657	{
…		…
1716	glEnable (GL_TEXTURE_2D);	1731	glEnable (GL_TEXTURE_2D);
1717	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1732	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1718		1733
1719	glBegin (GL_QUADS);	1734	glBegin (GL_QUADS);
1720		1735
1721	last_name = 0;	1736	last_name = -1;
1722		1737
1723	mx += self->x;	1738	mx += self->x;
1724	my += self->y;	1739	my += self->y;
1725		1740
1726	// first pass: determine smooth_max	1741	// first pass: determine smooth_max
…		…
1761	tileid tile = cell->tile [z];	1776	tileid tile = cell->tile [z];
1762		1777
1763	if (tile)	1778	if (tile)
1764	{	1779	{
1765	maptex tex = self->tex [tile];	1780	maptex tex = self->tex [tile];
1766	int px = (x + 1) * T - tex.w;	1781	int px, py;
1767	int py = (y + 1) * T - tex.h;
1768		1782
1769	// suppressing texture state switches here	1783	// suppressing texture state switches here
1770	// is only moderately effective, but worth the extra effort	1784	// is only moderately effective, but worth the extra effort
1771	if (last_name != tex.name)	1785	if (last_name != tex.name)
1772	{	1786	{
…		…
1775		1789
1776	glEnd ();	1790	glEnd ();
1777	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1791	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1778	glBegin (GL_QUADS);	1792	glBegin (GL_QUADS);
1779	}	1793	}
		1794
		1795	px = (x + 1) * T - tex.w;
		1796	py = (y + 1) * T - tex.h;
1780		1797
1781	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1798	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1782	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1799	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1783	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1800	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1784	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1801	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
…		…
2232	}	2249	}
2233	}	2250	}
2234	}	2251	}
2235	}	2252	}
2236		2253
2237	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2254	MODULE = CFPlus PACKAGE = CFPlus::RW
2238		2255
2239	PROTOTYPES: DISABLE	2256	CFPlus::RW
2240
2241	CFPlus::MixChunk
2242	new (SV class, SV data_sv)	2257	new (SV class, SV data_sv)
2243	CODE:	2258	CODE:
2244	{	2259	{
2245	STRLEN datalen;	2260	STRLEN datalen;
2246	char *data = SvPVbyte (data_sv, datalen);	2261	char *data = SvPVbyte (data_sv, datalen);
2247		2262
2248	RETVAL = Mix_LoadWAV_RW (SDL_RWFromConstMem (data, datalen), 1);	2263	RETVAL = SDL_RWFromConstMem (data, datalen);
2249	}	2264	}
2250	OUTPUT:	2265	OUTPUT:
		2266	RETVAL
		2267
		2268	CFPlus::RW
		2269	new_from_file (SV class, const char path, const char *mode = "rb")
		2270	CODE:
		2271	RETVAL = SDL_RWFromFile (path, mode);
		2272	OUTPUT:
		2273	RETVAL
		2274
		2275	# fails on win32:
		2276	# CFPlus.xs(2268) : error C2059: syntax error : '('
		2277	#void
		2278	#close (CFPlus::RW self)
		2279	# CODE:
		2280	# (self->(close)) (self);
		2281
		2282	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2283
		2284	PROTOTYPES: DISABLE
		2285
		2286	CFPlus::Channel
		2287	find ()
		2288	CODE:
		2289	{
		2290	RETVAL = Mix_GroupAvailable (-1);
		2291
2251	RETVAL	2292	if (RETVAL < 0)
		2293	{
		2294	RETVAL = Mix_GroupOldest (-1);
		2295
		2296	if (RETVAL < 0)
		2297	XSRETURN_UNDEF;
		2298
		2299	Mix_HaltChannel (RETVAL);
		2300	}
		2301
		2302	Mix_UnregisterAllEffects (RETVAL);
		2303	Mix_Volume (RETVAL, 128);
		2304	}
		2305	OUTPUT:
		2306	RETVAL
		2307
		2308	void
		2309	halt (CFPlus::Channel self)
		2310	CODE:
		2311	Mix_HaltChannel (self);
		2312
		2313	void
		2314	expire (CFPlus::Channel self, int ticks = -1)
		2315	CODE:
		2316	Mix_ExpireChannel (self, ticks);
		2317
		2318	void
		2319	fade_out (CFPlus::Channel self, int ticks = -1)
		2320	CODE:
		2321	Mix_FadeOutChannel (self, ticks);
		2322
		2323	int
		2324	volume (CFPlus::Channel self, int volume)
		2325	CODE:
		2326	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2327	OUTPUT:
		2328	RETVAL
		2329
		2330	void
		2331	unregister_all_effects (CFPlus::Channel self)
		2332	CODE:
		2333	Mix_UnregisterAllEffects (self);
		2334
		2335	void
		2336	set_panning (CFPlus::Channel self, int left, int right)
		2337	CODE:
		2338	left = CLAMP (left , 0, 255);
		2339	right = CLAMP (right, 0, 255);
		2340	Mix_SetPanning (self, left, right);
		2341
		2342	void
		2343	set_distance (CFPlus::Channel self, int distance)
		2344	CODE:
		2345	Mix_SetDistance (self, CLAMP (distance, 0, 255));
		2346
		2347	void
		2348	set_position (CFPlus::Channel self, int angle, int distance)
		2349	CODE:
		2350
		2351	void
		2352	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
		2353	CODE:
		2354	{
		2355	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2356	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
		2357	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2358	}
		2359
		2360	void
		2361	set_reverse_stereo (CFPlus::Channel self, int flip)
		2362	CODE:
		2363	Mix_SetReverseStereo (self, flip);
		2364
		2365	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
		2366
		2367	PROTOTYPES: DISABLE
2252		2368
2253	CFPlus::MixChunk	2369	CFPlus::MixChunk
2254	new_from_file (SV class, char path)	2370	new (SV *class, CFPlus::RW rwops)
2255	CODE:	2371	CODE:
2256	RETVAL = Mix_LoadWAV (path);	2372	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2257	OUTPUT:	2373	OUTPUT:
2258	RETVAL	2374	RETVAL
2259		2375
2260	void	2376	void
2261	DESTROY (CFPlus::MixChunk self)	2377	DESTROY (CFPlus::MixChunk self)
…		…
2263	Mix_FreeChunk (self);	2379	Mix_FreeChunk (self);
2264		2380
2265	int	2381	int
2266	volume (CFPlus::MixChunk self, int volume = -1)	2382	volume (CFPlus::MixChunk self, int volume = -1)
2267	CODE:	2383	CODE:
		2384	if (items > 1)
		2385	volume = CLAMP (volume, 0, 128);
2268	RETVAL = Mix_VolumeChunk (self, volume);	2386	RETVAL = Mix_VolumeChunk (self, volume);
2269	OUTPUT:	2387	OUTPUT:
2270	RETVAL	2388	RETVAL
2271		2389
2272	int	2390	CFPlus::Channel
2273	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2391	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2274	CODE:	2392	CODE:
		2393	{
2275	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2394	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2395
		2396	if (RETVAL < 0)
		2397	XSRETURN_UNDEF;
		2398
		2399	if (channel < 0)
		2400	{
		2401	Mix_UnregisterAllEffects (RETVAL);
		2402	Mix_Volume (RETVAL, 128);
		2403	}
		2404	}
2276	OUTPUT:	2405	OUTPUT:
2277	RETVAL	2406	RETVAL
2278		2407
2279	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2408	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2280		2409
2281	int	2410	int
2282	volume (int volume = -1)	2411	volume (int volume = -1)
2283	PROTOTYPE: ;$	2412	PROTOTYPE: ;$
2284	CODE:	2413	CODE:
		2414	if (items > 0)
		2415	volume = CLAMP (volume, 0, 128);
2285	RETVAL = Mix_VolumeMusic (volume);	2416	RETVAL = Mix_VolumeMusic (volume);
2286	OUTPUT:	2417	OUTPUT:
2287	RETVAL	2418	RETVAL
2288		2419
2289	int	2420	void
2290	fade_out (int ms)	2421	fade_out (int ms)
2291	CODE:	2422	CODE:
2292	RETVAL = Mix_FadeOutMusic (ms);	2423	Mix_FadeOutMusic (ms);
2293	OUTPUT:	2424
2294	RETVAL	2425	void
		2426	halt ()
		2427	CODE:
		2428	Mix_HaltMusic ();
2295		2429
2296	CFPlus::MixMusic	2430	CFPlus::MixMusic
2297	new_from_file (SV class, char path)	2431	new (SV *class, CFPlus::RW rwops)
2298	CODE:	2432	CODE:
2299	RETVAL = Mix_LoadMUS (path);	2433	RETVAL = Mix_LoadMUS_RW (rwops);
2300	OUTPUT:	2434	OUTPUT:
2301	RETVAL	2435	RETVAL
2302		2436
2303	void	2437	void
2304	DESTROY (CFPlus::MixMusic self)	2438	DESTROY (CFPlus::MixMusic self)
…		…
2310	CODE:	2444	CODE:
2311	RETVAL = Mix_PlayMusic (self, loops);	2445	RETVAL = Mix_PlayMusic (self, loops);
2312	OUTPUT:	2446	OUTPUT:
2313	RETVAL	2447	RETVAL
2314		2448
2315	int	2449	void
2316	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2450	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2317	CODE:	2451	CODE:
2318	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2452	Mix_FadeInMusicPos (self, loops, ms, position);
2319	OUTPUT:
2320	RETVAL
2321		2453
2322	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2454	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2323		2455
2324	PROTOTYPES: ENABLE	2456	PROTOTYPES: ENABLE
2325		2457

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC vs. Revision 1.221 by root, Fri Aug 10 04:02:13 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.211 by root, Sat Jul 28 00:45:28 2007 UTC vs.
Revision 1.221 by root, Fri Aug 10 04:02:13 2007 UTC