[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.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
…		…
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	}
…		…
1537	self->rows += MAP_EXTEND_Y;	1550	self->rows += MAP_EXTEND_Y;
1538	self->y += MAP_EXTEND_Y;	1551	self->y += MAP_EXTEND_Y;
1539	}	1552	}
1540	}	1553	}
1541		1554
1542	void	1555	SV *
1543	map1a_update (CFPlus::Map self, SV *data_, int extmap)	1556	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1544	CODE:	1557	CODE:
1545	{	1558	{
1546	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1559	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1547	uint8_t data_end = (uint8_t )SvEND (data_);	1560	uint8_t data_end = (uint8_t )SvEND (data_);
1548	mapcell *cell;	1561	mapcell *cell;
1549	int x, y, flags;	1562	int x, y, z, flags;
		1563	AV *missing = newAV ();
		1564	RETVAL = newRV_noinc ((SV *)missing);
1550		1565
1551	while (data < data_end - 1)	1566	while (data < data_end - 1)
1552	{	1567	{
1553	flags = (data [0] << 8) + data [1]; data += 2;	1568	flags = (data [0] << 8) + data [1]; data += 2;
1554		1569
…		…
1605	}	1620	}
1606	else	1621	else
1607	cell->darkness = *data++ + 1;	1622	cell->darkness = *data++ + 1;
1608	}	1623	}
1609		1624
		1625	for (z = 0; z <= 2; ++z)
1610	if (flags & 4)	1626	if (flags & (4 >> z))
1611	{	1627	{
1612	faceid face = (data [0] << 8) + data [1]; data += 2;	1628	faceid face = (data [0] << 8) + data [1]; data += 2;
1613	need_facenum (self, face);	1629	need_facenum (self, face);
1614	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	}
1615	}	1645	}
1616
1617	if (flags & 2)
1618	{
1619	faceid face = (data [0] << 8) + data [1]; data += 2;
1620	need_facenum (self, face);
1621	cell->tile [1] = self->face2tile [face];
1622	}
1623
1624	if (flags & 1)
1625	{
1626	faceid face = (data [0] << 8) + data [1]; data += 2;
1627	need_facenum (self, face);
1628	cell->tile [2] = self->face2tile [face];
1629	}
1630	}	1646	}
1631	else	1647	else
1632	cell->darkness = 0;	1648	cell->darkness = 0;
1633	}	1649	}
1634	}	1650	}
		1651	OUTPUT:
		1652	RETVAL
1635		1653
1636	SV *	1654	SV *
1637	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)
1638	CODE:	1656	CODE:
1639	{	1657	{
…		…
1713	glEnable (GL_TEXTURE_2D);	1731	glEnable (GL_TEXTURE_2D);
1714	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1732	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1715		1733
1716	glBegin (GL_QUADS);	1734	glBegin (GL_QUADS);
1717		1735
1718	last_name = 0;	1736	last_name = -1;
1719		1737
1720	mx += self->x;	1738	mx += self->x;
1721	my += self->y;	1739	my += self->y;
1722		1740
1723	// first pass: determine smooth_max	1741	// first pass: determine smooth_max
…		…
1758	tileid tile = cell->tile [z];	1776	tileid tile = cell->tile [z];
1759		1777
1760	if (tile)	1778	if (tile)
1761	{	1779	{
1762	maptex tex = self->tex [tile];	1780	maptex tex = self->tex [tile];
1763	int px = (x + 1) * T - tex.w;	1781	int px, py;
1764	int py = (y + 1) * T - tex.h;
1765		1782
1766	// suppressing texture state switches here	1783	// suppressing texture state switches here
1767	// is only moderately effective, but worth the extra effort	1784	// is only moderately effective, but worth the extra effort
1768	if (last_name != tex.name)	1785	if (last_name != tex.name)
1769	{	1786	{
…		…
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 );
…		…
2229	}	2249	}
2230	}	2250	}
2231	}	2251	}
2232	}	2252	}
2233		2253
		2254	MODULE = CFPlus PACKAGE = CFPlus::RW
		2255
		2256	CFPlus::RW
		2257	new (SV class, SV data_sv)
		2258	CODE:
		2259	{
		2260	STRLEN datalen;
		2261	char *data = SvPVbyte (data_sv, datalen);
		2262
		2263	RETVAL = SDL_RWFromConstMem (data, datalen);
		2264	}
		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
		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
2234	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2365	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
2235		2366
2236	PROTOTYPES: DISABLE	2367	PROTOTYPES: DISABLE
2237		2368
2238	CFPlus::MixChunk	2369	CFPlus::MixChunk
2239	new_from_file (SV class, char path)	2370	new (SV *class, CFPlus::RW rwops)
2240	CODE:	2371	CODE:
2241	RETVAL = Mix_LoadWAV (path);	2372	RETVAL = Mix_LoadWAV_RW (rwops, 1);
2242	OUTPUT:	2373	OUTPUT:
2243	RETVAL	2374	RETVAL
2244		2375
2245	void	2376	void
2246	DESTROY (CFPlus::MixChunk self)	2377	DESTROY (CFPlus::MixChunk self)
…		…
2248	Mix_FreeChunk (self);	2379	Mix_FreeChunk (self);
2249		2380
2250	int	2381	int
2251	volume (CFPlus::MixChunk self, int volume = -1)	2382	volume (CFPlus::MixChunk self, int volume = -1)
2252	CODE:	2383	CODE:
		2384	if (items > 1)
		2385	volume = CLAMP (volume, 0, 128);
2253	RETVAL = Mix_VolumeChunk (self, volume);	2386	RETVAL = Mix_VolumeChunk (self, volume);
2254	OUTPUT:	2387	OUTPUT:
2255	RETVAL	2388	RETVAL
2256		2389
2257	int	2390	CFPlus::Channel
2258	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)
2259	CODE:	2392	CODE:
		2393	{
2260	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	}
2261	OUTPUT:	2405	OUTPUT:
2262	RETVAL	2406	RETVAL
2263		2407
2264	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2408	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
2265		2409
2266	int	2410	int
2267	volume (int volume = -1)	2411	volume (int volume = -1)
2268	PROTOTYPE: ;$	2412	PROTOTYPE: ;$
2269	CODE:	2413	CODE:
		2414	if (items > 0)
		2415	volume = CLAMP (volume, 0, 128);
2270	RETVAL = Mix_VolumeMusic (volume);	2416	RETVAL = Mix_VolumeMusic (volume);
2271	OUTPUT:	2417	OUTPUT:
2272	RETVAL	2418	RETVAL
2273		2419
2274	int	2420	void
2275	fade_out (int ms)	2421	fade_out (int ms)
2276	CODE:	2422	CODE:
2277	RETVAL = Mix_FadeOutMusic (ms);	2423	Mix_FadeOutMusic (ms);
2278	OUTPUT:	2424
2279	RETVAL	2425	void
		2426	halt ()
		2427	CODE:
		2428	Mix_HaltMusic ();
2280		2429
2281	CFPlus::MixMusic	2430	CFPlus::MixMusic
2282	new_from_file (SV class, char path)	2431	new (SV *class, CFPlus::RW rwops)
2283	CODE:	2432	CODE:
2284	RETVAL = Mix_LoadMUS (path);	2433	RETVAL = Mix_LoadMUS_RW (rwops);
2285	OUTPUT:	2434	OUTPUT:
2286	RETVAL	2435	RETVAL
2287		2436
2288	void	2437	void
2289	DESTROY (CFPlus::MixMusic self)	2438	DESTROY (CFPlus::MixMusic self)
…		…
2295	CODE:	2444	CODE:
2296	RETVAL = Mix_PlayMusic (self, loops);	2445	RETVAL = Mix_PlayMusic (self, loops);
2297	OUTPUT:	2446	OUTPUT:
2298	RETVAL	2447	RETVAL
2299		2448
2300	int	2449	void
2301	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)
2302	CODE:	2451	CODE:
2303	RETVAL = Mix_FadeInMusicPos (self, loops, ms, position);	2452	Mix_FadeInMusicPos (self, loops, ms, position);
2304	OUTPUT:
2305	RETVAL
2306		2453
2307	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2454	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
2308		2455
2309	PROTOTYPES: ENABLE	2456	PROTOTYPES: ENABLE
2310		2457
…		…
2386	const_iv (GL_COLOR_LOGIC_OP),	2533	const_iv (GL_COLOR_LOGIC_OP),
2387	const_iv (GL_SEPARABLE_2D),	2534	const_iv (GL_SEPARABLE_2D),
2388	const_iv (GL_CONVOLUTION_2D),	2535	const_iv (GL_CONVOLUTION_2D),
2389	const_iv (GL_CONVOLUTION_BORDER_MODE),	2536	const_iv (GL_CONVOLUTION_BORDER_MODE),
2390	const_iv (GL_CONSTANT_BORDER),	2537	const_iv (GL_CONSTANT_BORDER),
		2538	const_iv (GL_POINTS),
2391	const_iv (GL_LINES),	2539	const_iv (GL_LINES),
2392	const_iv (GL_LINE_STRIP),	2540	const_iv (GL_LINE_STRIP),
2393	const_iv (GL_LINE_LOOP),	2541	const_iv (GL_LINE_LOOP),
2394	const_iv (GL_QUADS),	2542	const_iv (GL_QUADS),
2395	const_iv (GL_QUAD_STRIP),	2543	const_iv (GL_QUAD_STRIP),
2396	const_iv (GL_TRIANGLES),	2544	const_iv (GL_TRIANGLES),
2397	const_iv (GL_TRIANGLE_STRIP),	2545	const_iv (GL_TRIANGLE_STRIP),
2398	const_iv (GL_TRIANGLE_FAN),	2546	const_iv (GL_TRIANGLE_FAN),
		2547	const_iv (GL_POLYGON),
2399	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2548	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
2400	const_iv (GL_POINT_SMOOTH_HINT),	2549	const_iv (GL_POINT_SMOOTH_HINT),
2401	const_iv (GL_LINE_SMOOTH_HINT),	2550	const_iv (GL_LINE_SMOOTH_HINT),
2402	const_iv (GL_POLYGON_SMOOTH_HINT),	2551	const_iv (GL_POLYGON_SMOOTH_HINT),
2403	const_iv (GL_GENERATE_MIPMAP_HINT),	2552	const_iv (GL_GENERATE_MIPMAP_HINT),
…		…
2498	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2647	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2499		2648
2500	# near_ and far_ are due to microsofts buggy "c" compiler	2649	# 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_)	2650	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
2502		2651
		2652	PROTOTYPES: DISABLE
		2653
2503	void glViewport (int x, int y, int width, int height)	2654	void glViewport (int x, int y, int width, int height)
2504		2655
2505	void glScissor (int x, int y, int width, int height)	2656	void glScissor (int x, int y, int width, int height)
2506		2657
2507	void glTranslate (float x, float y, float z = 0.)	2658	void glTranslate (float x, float y, float z = 0.)
…		…
2514		2665
2515	void glRotate (float angle, float x, float y, float z)	2666	void glRotate (float angle, float x, float y, float z)
2516	CODE:	2667	CODE:
2517	glRotatef (angle, x, y, z);	2668	glRotatef (angle, x, y, z);
2518		2669
2519	void glBegin (int mode)
2520
2521	void glEnd ()
2522
2523	void glColor (float r, float g, float b, float a = 1.0)	2670	void glColor (float r, float g, float b, float a = 1.0)
2524	PROTOTYPE: @
2525	ALIAS:	2671	ALIAS:
2526	glColor_premultiply = 1	2672	glColor_premultiply = 1
2527	CODE:	2673	CODE:
2528	if (ix)	2674	if (ix)
2529	{	2675	{
…		…
2532	b *= a;	2678	b *= a;
2533	}	2679	}
2534	// microsoft visual "c" rounds instead of truncating...	2680	// microsoft visual "c" rounds instead of truncating...
2535	glColor4f (r, g, b, a);	2681	glColor4f (r, g, b, a);
2536		2682
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.)	2683	void glRasterPos (float x, float y, float z = 0.)
2544	CODE:	2684	CODE:
2545	glRasterPos3f (0, 0, z);	2685	glRasterPos3f (0, 0, z);
2546	glBitmap (0, 0, 0, 0, x, y, 0);	2686	glBitmap (0, 0, 0, 0, x, y, 0);
2547		2687
…		…
2551		2691
2552	void glTexCoord (float s, float t)	2692	void glTexCoord (float s, float t)
2553	CODE:	2693	CODE:
2554	glTexCoord2f (s, t);	2694	glTexCoord2f (s, t);
2555		2695
		2696	void glRect (float x1, float y1, float x2, float y2)
		2697	CODE:
		2698	glRectf (x1, y1, x2, y2);
		2699
		2700	PROTOTYPES: ENABLE
		2701
		2702	void glBegin (int mode)
		2703
		2704	void glEnd ()
		2705
		2706	void glPointSize (GLfloat size)
		2707
		2708	void glLineWidth (GLfloat width)
		2709
		2710	void glInterleavedArrays (int format, int stride, char *data)
		2711
		2712	void glDrawElements (int mode, int count, int type, char *indices)
		2713
		2714	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2715
2556	void glTexEnv (int target, int pname, float param)	2716	void glTexEnv (int target, int pname, float param)
2557	CODE:	2717	CODE:
2558	glTexEnvf (target, pname, param);	2718	glTexEnvf (target, pname, param);
2559		2719
2560	void glTexParameter (int target, int pname, float param)	2720	void glTexParameter (int target, int pname, float param)
…		…
2617	MODULE = CFPlus PACKAGE = CFPlus::UI::Base	2777	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
2618		2778
2619	PROTOTYPES: DISABLE	2779	PROTOTYPES: DISABLE
2620		2780
2621	void	2781	void
2622	find_widget (SV *widget, NV x, NV y)	2782	find_widget (SV *self, NV x, NV y)
2623	PPCODE:	2783	PPCODE:
2624	{	2784	{
2625	if (within_widget (widget, x, y))	2785	if (within_widget (self, x, y))
2626	XPUSHs (widget);	2786	XPUSHs (self);
2627	}	2787	}
2628		2788
		2789	BOOT:
		2790	{
		2791	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2792
		2793	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2794	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2795	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2796	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2797	}
		2798
		2799	void
		2800	draw (SV *self)
		2801	CODE:
		2802	{
		2803	HV *hv;
		2804	SV **svp;
		2805	NV x, y, w, h;
		2806	SV *draw_x_sv = GvSV (draw_x_gv);
		2807	SV *draw_y_sv = GvSV (draw_y_gv);
		2808	SV *draw_w_sv = GvSV (draw_w_gv);
		2809	SV *draw_h_sv = GvSV (draw_h_gv);
		2810	SV *hover;
		2811	double draw_x, draw_y, draw_w, draw_h;
		2812
		2813	if (!SvROK (self))
		2814	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2815
		2816	hv = (HV *)SvRV (self);
		2817
		2818	if (SvTYPE (hv) != SVt_PVHV)
		2819	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2820
		2821	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2822	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2823
		2824	if (!h \|\| !w)
		2825	XSRETURN_EMPTY;
		2826
		2827	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2828	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2829
		2830	draw_x = SvNV (draw_x_sv) + x;
		2831	draw_y = SvNV (draw_y_sv) + y;
		2832
		2833	if (draw_x + w < 0 \|\| draw_x >= SvNV (draw_w_sv)
		2834	\|\| draw_y + h < 0 \|\| draw_y >= SvNV (draw_h_sv))
		2835	XSRETURN_EMPTY;
		2836
		2837	sv_setnv (draw_x_sv, draw_x);
		2838	sv_setnv (draw_y_sv, draw_y);
		2839
		2840	glPushMatrix ();
		2841	glTranslated (x, y, 0);
		2842
		2843	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2844	{
		2845	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2846
		2847	if (svp && SvTRUE (*svp))
		2848	{
		2849	glColor4f (10.2f, 0.80.2f, 0.5*0.2f, 0.2f);
		2850	glEnable (GL_BLEND);
		2851	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2852	glBegin (GL_QUADS);
		2853	glVertex2f (0, 0);
		2854	glVertex2f (w, 0);
		2855	glVertex2f (w, h);
		2856	glVertex2f (0, h);
		2857	glEnd ();
		2858	glDisable (GL_BLEND);
		2859	}
		2860	}
		2861	#if 0
		2862	if ($ENV{CFPLUS_DEBUG} & 1) {
		2863	glPushMatrix;
		2864	glColor 1, 1, 0, 1;
		2865	glTranslate 0.375, 0.375;
		2866	glBegin GL_LINE_LOOP;
		2867	glVertex 0 , 0;
		2868	glVertex $self->{w} - 1, 0;
		2869	glVertex $self->{w} - 1, $self->{h} - 1;
		2870	glVertex 0 , $self->{h} - 1;
		2871	glEnd;
		2872	glPopMatrix;
		2873	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2874	}
		2875	#endif
		2876	PUSHMARK (SP);
		2877	XPUSHs (self);
		2878	PUTBACK;
		2879	call_method ("_draw", G_VOID \| G_DISCARD);
		2880	SPAGAIN;
		2881
		2882	glPopMatrix ();
		2883
		2884	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2885	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2886	}
		2887

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.221 by root, Fri Aug 10 04:02:13 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.221 by root, Fri Aug 10 04:02:13 2007 UTC