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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.220 by root, Thu Aug 9 11:02:08 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
…		…
434	/* SDL should provide this, really. */	438	/* SDL should provide this, really. */
435	#define SDLK_MODIFIER_MIN 300	439	#define SDLK_MODIFIER_MIN 300
436	#define SDLK_MODIFIER_MAX 314	440	#define SDLK_MODIFIER_MAX 314
437		441
438	/******************************************************************************/	442	/******************************************************************************/
		443
		444	static GV draw_x_gv, draw_y_gv, draw_w_gv, draw_h_gv;
		445	static GV *hover_gv;
439		446
440	static int	447	static int
441	within_widget (SV *widget, NV x, NV y)	448	within_widget (SV *widget, NV x, NV y)
442	{	449	{
443	HV *self;	450	HV *self;
…		…
797	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))));
798	}	805	}
799	}	806	}
800		807
801	int	808	int
802	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	809	Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 1024)
803	POSTCALL:	810	POSTCALL:
804	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
805	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
806		813
807	void	814	void
808	Mix_CloseAudio ()	815	Mix_CloseAudio ()
809		816
810	int	817	int
811	Mix_AllocateChannels (int numchans = -1)	818	Mix_AllocateChannels (int numchans = -1)
		819
		820	const char *
		821	Mix_GetError ()
812		822
813	void	823	void
814	lowdelay (int fd, int val = 1)	824	lowdelay (int fd, int val = 1)
815	CODE:	825	CODE:
816	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));	826	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
…		…
858	STRLEN image_len;	868	STRLEN image_len;
859	char image = (char )SvPVbyte (image_, image_len);	869	char image = (char )SvPVbyte (image_, image_len);
860	SDL_Surface surface, surface2;	870	SDL_Surface surface, surface2;
861	SDL_PixelFormat fmt;	871	SDL_PixelFormat fmt;
862	SDL_RWops *rw = ix	872	SDL_RWops *rw = ix
863	? SDL_RWFromFile (image, "r")	873	? SDL_RWFromFile (image, "rb")
864	: SDL_RWFromConstMem (image, image_len);	874	: SDL_RWFromConstMem (image, image_len);
865		875
866	if (!rw)	876	if (!rw)
867	croak ("load_image: %s", SDL_GetError ());	877	croak ("load_image: %s", SDL_GetError ());
868		878
…		…
1340	HV hv = (HV )SvRV (self);	1350	HV hv = (HV )SvRV (self);
1341	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1351	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1342	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1352	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1343	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1353	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1344		1354
		1355	if (name <= 0)
		1356	XSRETURN_EMPTY;
		1357
1345	if (items < 5)	1358	if (items < 5)
1346	{	1359	{
1347	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1360	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1348	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1361	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1349	}	1362	}
…		…
1686	RETVAL = map_sv;	1699	RETVAL = map_sv;
1687	}	1700	}
1688	OUTPUT:	1701	OUTPUT:
1689	RETVAL	1702	RETVAL
1690		1703
1691	void	1704	SV *
1692	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1705	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1693	CODE:	1706	CODE:
1694	{	1707	{
1695	HV smooth = (HV )sv_2mortal ((SV *)newHV ());	1708	HV smooth = (HV )sv_2mortal ((SV *)newHV ());
1696	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level	1709	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1697	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)	1710	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
1698	smooth_key skey;	1711	smooth_key skey;
1699	int x, y, z;	1712	int x, y, z;
1700	int last_name;	1713	int last_name;
		1714	AV *missing = newAV ();
		1715	RETVAL = newRV_noinc ((SV *)missing);
1701		1716
1702	// thats current max. sorry.	1717	// thats current max. sorry.
1703	if (sw > 255) sw = 255;	1718	if (sw > 255) sw = 255;
1704	if (sh > 255) sh = 255;	1719	if (sh > 255) sh = 255;
1705		1720
…		…
1713	glEnable (GL_TEXTURE_2D);	1728	glEnable (GL_TEXTURE_2D);
1714	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1729	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1715		1730
1716	glBegin (GL_QUADS);	1731	glBegin (GL_QUADS);
1717		1732
1718	last_name = 0;	1733	last_name = -1;
1719		1734
1720	mx += self->x;	1735	mx += self->x;
1721	my += self->y;	1736	my += self->y;
1722		1737
1723	// first pass: determine smooth_max	1738	// first pass: determine smooth_max
…		…
1758	tileid tile = cell->tile [z];	1773	tileid tile = cell->tile [z];
1759		1774
1760	if (tile)	1775	if (tile)
1761	{	1776	{
1762	maptex tex = self->tex [tile];	1777	maptex tex = self->tex [tile];
1763	int px = (x + 1) * T - tex.w;	1778	int px, py;
1764	int py = (y + 1) * T - tex.h;
1765		1779
1766	// suppressing texture state switches here	1780	// suppressing texture state switches here
1767	// is only moderately effective, but worth the extra effort	1781	// is only moderately effective, but worth the extra effort
1768	if (last_name != tex.name)	1782	if (last_name != tex.name)
1769	{	1783	{
1770	if (!tex.name)	1784	if (!tex.name)
		1785	{
		1786	av_push (missing, newSViv (tile));
1771	tex = self->tex [2]; /* missing, replace by noface */	1787	tex = self->tex [2]; /* missing, replace by noface */
		1788	}
1772		1789
1773	glEnd ();	1790	glEnd ();
1774	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1791	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1775	glBegin (GL_QUADS);	1792	glBegin (GL_QUADS);
1776	}	1793	}
		1794
		1795	px = (x + 1) * T - tex.w;
		1796	py = (y + 1) * T - tex.h;
1777		1797
1778	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1798	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1779	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1799	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1780	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);
1781	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1801	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
…		…
1877	// this time naively avoiding texture state changes	1897	// this time naively avoiding texture state changes
1878	// save gobs of state changes.	1898	// save gobs of state changes.
1879	if (last_name != tex.name)	1899	if (last_name != tex.name)
1880	{	1900	{
1881	if (!tex.name)	1901	if (!tex.name)
		1902	{
		1903	av_push (missing, newSViv (skey->tile));
1882	continue; // smoothing not yet available	1904	continue; // smoothing not yet available
		1905	}
1883		1906
1884	glEnd ();	1907	glEnd ();
1885	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1908	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1886	glBegin (GL_QUADS);	1909	glBegin (GL_QUADS);
1887	}	1910	}
…		…
1948	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);	1971	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1949	}	1972	}
1950	}	1973	}
1951	}	1974	}
1952	}	1975	}
		1976	OUTPUT:
		1977	RETVAL
1953		1978
1954	void	1979	void
1955	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)	1980	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1956	CODE:	1981	CODE:
1957	{	1982	{
…		…
2229	}	2254	}
2230	}	2255	}
2231	}	2256	}
2232	}	2257	}
2233		2258
		2259	MODULE = CFPlus PACKAGE = CFPlus::RW
		2260
		2261	CFPlus::RW
		2262	new (SV class, SV data_sv)
		2263	CODE:
		2264	{
		2265	STRLEN datalen;
		2266	char *data = SvPVbyte (data_sv, datalen);
		2267
		2268	RETVAL = SDL_RWFromConstMem (data, datalen);
		2269	}
		2270	OUTPUT:
		2271	RETVAL
		2272
		2273	CFPlus::RW
		2274	new_from_file (SV class, const char path, const char *mode = "rb")
		2275	CODE:
		2276	RETVAL = SDL_RWFromFile (path, mode);
		2277	OUTPUT:
		2278	RETVAL
		2279
		2280	# fails on win32:
		2281	# CFPlus.xs(2268) : error C2059: syntax error : '('
		2282	#void
		2283	#close (CFPlus::RW self)
		2284	# CODE:
		2285	# (self->(close)) (self);
		2286
		2287	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2288
		2289	PROTOTYPES: DISABLE
		2290
		2291	CFPlus::Channel
		2292	find ()
		2293	CODE:
		2294	{
		2295	RETVAL = Mix_GroupAvailable (-1);
		2296
		2297	if (RETVAL < 0)
		2298	{
		2299	RETVAL = Mix_GroupOldest (-1);
		2300
		2301	if (RETVAL < 0)
		2302	XSRETURN_UNDEF;
		2303
		2304	Mix_HaltChannel (RETVAL);
		2305	}
		2306
		2307	Mix_UnregisterAllEffects (RETVAL);
		2308	Mix_Volume (RETVAL, 128);
		2309	}
		2310	OUTPUT:
		2311	RETVAL
		2312
		2313	void
		2314	halt (CFPlus::Channel self)
		2315	CODE:
		2316	Mix_HaltChannel (self);
		2317
		2318	void
		2319	expire (CFPlus::Channel self, int ticks = -1)
		2320	CODE:
		2321	Mix_ExpireChannel (self, ticks);
		2322
		2323	void
		2324	fade_out (CFPlus::Channel self, int ticks = -1)
		2325	CODE:
		2326	Mix_FadeOutChannel (self, ticks);
		2327
		2328	int
		2329	volume (CFPlus::Channel self, int volume)
		2330	CODE:
		2331	RETVAL = Mix_Volume (self, CLAMP (volume, 0, 128));
		2332	OUTPUT:
		2333	RETVAL
		2334
		2335	void
		2336	unregister_all_effects (CFPlus::Channel self)
		2337	CODE:
		2338	Mix_UnregisterAllEffects (self);
		2339
		2340	void
		2341	set_panning (CFPlus::Channel self, int left, int right)
		2342	CODE:
		2343	left = CLAMP (left , 0, 255);
		2344	right = CLAMP (right, 0, 255);
		2345	Mix_SetPanning (self, left, right);
		2346
		2347	void
		2348	set_distance (CFPlus::Channel self, int distance)
		2349	CODE:
		2350	Mix_SetDistance (self, CLAMP (distance, 0, 255));
		2351
		2352	void
		2353	set_position (CFPlus::Channel self, int angle, int distance)
		2354	CODE:
		2355
		2356	void
		2357	set_position_r (CFPlus::Channel self, int dx, int dy, int maxdistance)
		2358	CODE:
		2359	{
		2360	int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
		2361	int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI);
		2362	Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
		2363	}
		2364
		2365	void
		2366	set_reverse_stereo (CFPlus::Channel self, int flip)
		2367	CODE:
		2368	Mix_SetReverseStereo (self, flip);
		2369
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2370	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2371
2236	PROTOTYPES: DISABLE	2372	PROTOTYPES: DISABLE
2237		2373
2238	CFPlus::MixChunk	2374	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2375	new (SV *class, CFPlus::RW rwops)
2240	CODE:	2376	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2377	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2242	OUTPUT:	2378	OUTPUT:
2243	RETVAL	2379	RETVAL
2244		2380
2245	void	2381	void
2246	DESTROY (CFPlus::MixChunk self)	2382	DESTROY (CFPlus::MixChunk self)
…		…
2248	Mix_FreeChunk (self);	2384	Mix_FreeChunk (self);
2249		2385
2250	int	2386	int
2251	volume (CFPlus::MixChunk self, int volume = -1)	2387	volume (CFPlus::MixChunk self, int volume = -1)
2252	CODE:	2388	CODE:
		2389	if (items > 1)
		2390	volume = CLAMP (volume, 0, 128);
2253	RETVAL = Mix_VolumeChunk (self, volume);	2391	RETVAL = Mix_VolumeChunk (self, volume);
2254	OUTPUT:	2392	OUTPUT:
2255	RETVAL	2393	RETVAL
2256		2394
2257	int	2395	CFPlus::Channel
2258	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2396	play (CFPlus::MixChunk self, CFPlus::Channel channel = -1, int loops = 0, int ticks = -1)
2259	CODE:	2397	CODE:
		2398	{
2260	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2399	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2400
		2401	if (RETVAL < 0)
		2402	XSRETURN_UNDEF;
		2403
		2404	if (channel < 0)
		2405	{
		2406	Mix_UnregisterAllEffects (RETVAL);
		2407	Mix_Volume (RETVAL, 128);
		2408	}
		2409	}
2261	OUTPUT:	2410	OUTPUT:
2262	RETVAL	2411	RETVAL
2263		2412
2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2413	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2265		2414
2266	int	2415	int
2267	volume (int volume = -1)	2416	volume (int volume = -1)
2268	PROTOTYPE: ;$	2417	PROTOTYPE: ;$
2269	CODE:	2418	CODE:
		2419	if (items > 0)
		2420	volume = CLAMP (volume, 0, 128);
2270	RETVAL = Mix_VolumeMusic (volume);	2421	RETVAL = Mix_VolumeMusic (volume);
2271	OUTPUT:	2422	OUTPUT:
2272	RETVAL	2423	RETVAL
2273		2424
2274	int	2425	void
2275	fade_out (int ms)	2426	fade_out (int ms)
2276	CODE:	2427	CODE:
2277	RETVAL = Mix_FadeOutMusic (ms);	2428	Mix_FadeOutMusic (ms);
2278	OUTPUT:	2429
2279	RETVAL	2430	void
		2431	halt ()
		2432	CODE:
		2433	Mix_HaltMusic ();
2280		2434
2281	CFPlus::MixMusic	2435	CFPlus::MixMusic
2282	new_from_file (SV class, char path)	2436	new (SV *class, CFPlus::RW rwops)
2283	CODE:	2437	CODE:
2284	RETVAL = Mix_LoadMUS (path);	2438	RETVAL = Mix_LoadMUS_RW (rwops);
2285	OUTPUT:	2439	OUTPUT:
2286	RETVAL	2440	RETVAL
2287		2441
2288	void	2442	void
2289	DESTROY (CFPlus::MixMusic self)	2443	DESTROY (CFPlus::MixMusic self)
…		…
2295	CODE:	2449	CODE:
2296	RETVAL = Mix_PlayMusic (self, loops);	2450	RETVAL = Mix_PlayMusic (self, loops);
2297	OUTPUT:	2451	OUTPUT:
2298	RETVAL	2452	RETVAL
2299		2453
2300	int	2454	void
2301	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)	2455	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
2302	CODE:	2456	CODE:
2303	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2457	Mix_FadeInMusicPos (self, loops, ms, position);
2304	OUTPUT:
2305	RETVAL
2306		2458
2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2459	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308		2460
2309	PROTOTYPES: ENABLE	2461	PROTOTYPES: ENABLE
2310		2462
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2538	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2539	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2540	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2541	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2542	const_iv (GL_CONSTANT_BORDER),
		2543	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2544	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2545	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2546	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2547	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2548	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2549	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2550	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2551	const_iv (GL_TRIANGLE_FAN),
		2552	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2553	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2554	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2555	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2556	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2557	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2652	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2653
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2654	# near_ and far_ are due to microsofts buggy "c" compiler
2501	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2655	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2656
		2657	PROTOTYPES: DISABLE
		2658
2503	void glViewport (int x, int y, int width, int height)	2659	void glViewport (int x, int y, int width, int height)
2504		2660
2505	void glScissor (int x, int y, int width, int height)	2661	void glScissor (int x, int y, int width, int height)
2506		2662
2507	void glTranslate (float x, float y, float z = 0.)	2663	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2670
2515	void glRotate (float angle, float x, float y, float z)	2671	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2672	CODE:
2517	glRotatef (angle, x, y, z);	2673	glRotatef (angle, x, y, z);
2518		2674
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2675	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2676	ALIAS:
2526	glColor_premultiply = 1	2677	glColor_premultiply = 1
2527	CODE:	2678	CODE:
2528	if (ix)	2679	if (ix)
2529	{	2680	{
…		…
2532	b *= a;	2683	b *= a;
2533	}	2684	}
2534	// microsoft visual "c" rounds instead of truncating...	2685	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2686	glColor4f (r, g, b, a);
2536		2687
2537	void glInterleavedArrays (int format, int stride, char *data)
2538
2539	void glDrawElements (int mode, int count, int type, char *indices)
2540
2541	# 1.2 void glDrawRangeElements (int mode, int start, int end
2542
2543	void glRasterPos (float x, float y, float z = 0.)	2688	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2689	CODE:
2545	glRasterPos3f (0, 0, z);	2690	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2691	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2692
…		…
2551		2696
2552	void glTexCoord (float s, float t)	2697	void glTexCoord (float s, float t)
2553	CODE:	2698	CODE:
2554	glTexCoord2f (s, t);	2699	glTexCoord2f (s, t);
2555		2700
		2701	void glRect (float x1, float y1, float x2, float y2)
		2702	CODE:
		2703	glRectf (x1, y1, x2, y2);
		2704
		2705	PROTOTYPES: ENABLE
		2706
		2707	void glBegin (int mode)
		2708
		2709	void glEnd ()
		2710
		2711	void glPointSize (GLfloat size)
		2712
		2713	void glLineWidth (GLfloat width)
		2714
		2715	void glInterleavedArrays (int format, int stride, char *data)
		2716
		2717	void glDrawElements (int mode, int count, int type, char *indices)
		2718
		2719	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2720
2556	void glTexEnv (int target, int pname, float param)	2721	void glTexEnv (int target, int pname, float param)
2557	CODE:	2722	CODE:
2558	glTexEnvf (target, pname, param);	2723	glTexEnvf (target, pname, param);
2559		2724
2560	void glTexParameter (int target, int pname, float param)	2725	void glTexParameter (int target, int pname, float param)
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2782	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2783
2619	PROTOTYPES: DISABLE	2784	PROTOTYPES: DISABLE
2620		2785
2621	void	2786	void
2622	find_widget (SV *widget, NV x, NV y)	2787	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2788	PPCODE:
2624	{	2789	{
2625	if (within_widget (widget, x, y))	2790	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2791	XPUSHs (self);
2627	}	2792	}
2628		2793
		2794	BOOT:
		2795	{
		2796	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2797
		2798	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2799	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2800	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2801	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2802	}
		2803
		2804	void
		2805	draw (SV *self)
		2806	CODE:
		2807	{
		2808	HV *hv;
		2809	SV **svp;
		2810	NV x, y, w, h;
		2811	SV *draw_x_sv = GvSV (draw_x_gv);
		2812	SV *draw_y_sv = GvSV (draw_y_gv);
		2813	SV *draw_w_sv = GvSV (draw_w_gv);
		2814	SV *draw_h_sv = GvSV (draw_h_gv);
		2815	SV *hover;
		2816	double draw_x, draw_y, draw_w, draw_h;
		2817
		2818	if (!SvROK (self))
		2819	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2820
		2821	hv = (HV *)SvRV (self);
		2822
		2823	if (SvTYPE (hv) != SVt_PVHV)
		2824	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2825
		2826	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2827	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2828
		2829	if (!h \|\| !w)
		2830	XSRETURN_EMPTY;
		2831
		2832	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2833	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2834
		2835	draw_x = SvNV (draw_x_sv) + x;
		2836	draw_y = SvNV (draw_y_sv) + y;
		2837
		2838	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2839	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2840	XSRETURN_EMPTY;
		2841
		2842	sv_setnv (draw_x_sv, draw_x);
		2843	sv_setnv (draw_y_sv, draw_y);
		2844
		2845	glPushMatrix ();
		2846	glTranslated (x, y, 0);
		2847
		2848	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2849	{
		2850	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2851
		2852	if (svp && SvTRUE (*svp))
		2853	{
		2854	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2855	glEnable (GL_BLEND);
		2856	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2857	glBegin (GL_QUADS);
		2858	glVertex2f (0, 0);
		2859	glVertex2f (w, 0);
		2860	glVertex2f (w, h);
		2861	glVertex2f (0, h);
		2862	glEnd ();
		2863	glDisable (GL_BLEND);
		2864	}
		2865	}
		2866	#if 0
		2867	if ($ENV{CFPLUS_DEBUG} & 1) {
		2868	glPushMatrix;
		2869	glColor 1, 1, 0, 1;
		2870	glTranslate 0.375, 0.375;
		2871	glBegin GL_LINE_LOOP;
		2872	glVertex 0 , 0;
		2873	glVertex $self->{w} - 1, 0;
		2874	glVertex $self->{w} - 1, $self->{h} - 1;
		2875	glVertex 0 , $self->{h} - 1;
		2876	glEnd;
		2877	glPopMatrix;
		2878	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2879	}
		2880	#endif
		2881	PUSHMARK (SP);
		2882	XPUSHs (self);
		2883	PUTBACK;
		2884	call_method ("_draw", G_VOID \| G_DISCARD);
		2885	SPAGAIN;
		2886
		2887	glPopMatrix ();
		2888
		2889	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2890	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2891	}
		2892

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs. Revision 1.220 by root, Thu Aug 9 11:02:08 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.207 by root, Fri Jul 20 18:19:45 2007 UTC vs.
Revision 1.220 by root, Thu Aug 9 11:02:08 2007 UTC