ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC vs.
Revision 1.213 by root, Sun Jul 29 04:14:45 2007 UTC

1	#ifdef _WIN32	1	#ifdef _WIN32
2	long _ftol (double); /* defined by VC6 C libs */
3	long _ftol2 (double dblSource) { return _ftol (dblSource); }
4	# define WIN32_LEAN_AND_MEAN	2	# define WIN32_LEAN_AND_MEAN
5	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls
6	# include <malloc.h>	4	# include <malloc.h>
7	# include <windows.h>	5	# include <windows.h>
8	# include <wininet.h>	6	# include <wininet.h>
9	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
		8	# pragma warning(disable:4761)
		9	#endif
		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
10	#endif	14	#endif
11		15
12	#include "EXTERN.h"	16	#include "EXTERN.h"
13	#include "perl.h"	17	#include "perl.h"
14	#include "XSUB.h"	18	#include "XSUB.h"
15		19
16	#ifdef _WIN32	20	#ifdef _WIN32
17	# undef pipe	21	# undef pipe
18	#endif	22	#endif
19		23
		24	#include <assert.h>
20	#include <math.h>	25	#include <math.h>
21	#include <string.h>	26	#include <string.h>
22	#include <stdio.h>	27	#include <stdio.h>
23	#include <stdlib.h>	28	#include <stdlib.h>
24		29
		30	#define USE_RWOPS 1 // for SDL_mixer:LoadMUS_RW
		31
25	#include <SDL.h>	32	#include <SDL.h>
		33	#include <SDL_thread.h>
26	#include <SDL_endian.h>	34	#include <SDL_endian.h>
27	#include <SDL_image.h>	35	#include <SDL_image.h>
28	#include <SDL_mixer.h>	36	#include <SDL_mixer.h>
29	#include <SDL_opengl.h>	37	#include <SDL_opengl.h>
30		38
…		…
39	# include <sys/types.h>	47	# include <sys/types.h>
40	# include <sys/socket.h>	48	# include <sys/socket.h>
41	# include <netinet/in.h>	49	# include <netinet/in.h>
42	# include <netinet/tcp.h>	50	# include <netinet/tcp.h>
43	# include <inttypes.h>	51	# include <inttypes.h>
44	#else
45	typedef unsigned char uint8_t;
46	typedef unsigned short uint16_t;
47	typedef unsigned int uint32_t;
48	typedef signed char int8_t;
49	typedef signed short int16_t;
50	typedef signed int int32_t;
51	#endif	52	#endif
52		53
53	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */	54	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
54		55
55	#define FOW_DARKNESS 32	56	#define FOW_DARKNESS 32
56		57
57	#define MAP_EXTEND_X 32	58	#define MAP_EXTEND_X 32
58	#define MAP_EXTEND_Y 512	59	#define MAP_EXTEND_Y 512
…		…
63	# define PARACHUTE SDL_INIT_NOPARACHUTE	64	# define PARACHUTE SDL_INIT_NOPARACHUTE
64	#else	65	#else
65	# define PARACHUTE 0	66	# define PARACHUTE 0
66	#endif	67	#endif
67		68
		69	static AV *texture_av;
		70
68	static struct	71	static struct
69	{	72	{
70	#define GL_FUNC(ptr,name) ptr name;	73	#define GL_FUNC(ptr,name) ptr name;
71	#include "glfunc.h"	74	#include "glfunc.h"
72	#undef GL_FUNC	75	#undef GL_FUNC
73	} gl;	76	} gl;
74		77
		78	static void
75	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	79	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
76	{	80	{
77	if (gl.BlendFuncSeparate)	81	if (gl.BlendFuncSeparate)
78	gl.BlendFuncSeparate (sa, da, saa, daa);	82	gl.BlendFuncSeparate (sa, da, saa, daa);
79	else if (gl.BlendFuncSeparateEXT)	83	else if (gl.BlendFuncSeparateEXT)
80	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	84	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
81	else	85	else
82	glBlendFunc (sa, da);	86	glBlendFunc (sa, da);
83	}	87	}
84		88
		89	static GLuint
		90	gen_texture ()
		91	{
		92	GLuint name;
		93
		94	if (AvFILL (texture_av) >= 0)
		95	name = (GLuint)(size_t)av_pop (texture_av);
		96	else
		97	glGenTextures (1, &name);
		98
		99	return name;
		100	}
		101
		102	static void
		103	del_texture (GLuint name)
		104	{
		105	/* make a half-assed attempt at returning the memory used by the texture */
		106	/* textures are frequently being reused by cfplus anyway */
		107	/*glBindTexture (GL_TEXTURE_2D, name);*/
		108	/*glTexImage2D (GL_TEXTURE_2D, 0, GL_ALPHA, 0, 0, 0, GL_ALPHA, GL_UNSIGNED_BYTE, 0);*/
		109	av_push (texture_av, (SV *)(size_t)name);
		110	glDeleteTextures (1, &name);
		111	}
		112
85	#include "texcache.c"	113	#include "texcache.c"
86		114
87	#include "pango-font.c"	115	#include "pango-font.c"
88	#include "pango-fontmap.c"	116	#include "pango-fontmap.c"
89	#include "pango-render.c"	117	#include "pango-render.c"
90		118
		119	typedef IV CFPlus__Channel;
		120	typedef SDL_RWops *CFPlus__RW;
91	typedef Mix_Chunk *CFPlus__MixChunk;	121	typedef Mix_Chunk *CFPlus__MixChunk;
92	typedef Mix_Music *CFPlus__MixMusic;	122	typedef Mix_Music *CFPlus__MixMusic;
93		123
94	typedef PangoFontDescription *CFPlus__Font;	124	typedef PangoFontDescription *CFPlus__Font;
95		125
…		…
162		192
163	*w = rect.width;	193	*w = rect.width;
164	*h = rect.height;	194	*h = rect.height;
165	}	195	}
166		196
		197	typedef uint16_t tileid;
167	typedef uint16_t mapface;	198	typedef uint16_t faceid;
168		199
169	typedef struct {	200	typedef struct {
170	GLint name;	201	int name;
171	int w, h;	202	int w, h;
172	float s, t;	203	float s, t;
173	uint8_t r, g, b, a;	204	uint8_t r, g, b, a;
		205	tileid smoothtile;
		206	uint8_t smoothlevel;
174	} maptex;	207	} maptex;
175		208
176	typedef struct {	209	typedef struct {
177	uint32_t player;	210	uint32_t player;
178	mapface face[3];	211	tileid tile[3];
179	uint16_t darkness;	212	uint16_t darkness;
180	uint8_t stat_width, stat_hp, flags;	213	uint8_t stat_width, stat_hp, flags, smoothmax;
181	} mapcell;	214	} mapcell;
182		215
183	typedef struct {	216	typedef struct {
184	int32_t c0, c1;	217	int32_t c0, c1;
185	mapcell *col;	218	mapcell *col;
186	} maprow;	219	} maprow;
187		220
188	typedef struct map {	221	typedef struct map {
189	int x, y, w, h;	222	int x, y, w, h;
190	int ox, oy; /* offset to virtual global coordinate system */	223	int ox, oy; /* offset to virtual global coordinate system */
191	int faces;	224	int faces; tileid *face2tile; // [faceid]
192	mapface *face;	225	int texs; maptex *tex; // [tileid]
193
194	int texs;
195	maptex *tex;
196		226
197	int32_t rows;	227	int32_t rows;
198	maprow *row;	228	maprow *row;
199	} *CFPlus__Map;	229	} *CFPlus__Map;
200		230
…		…
220	return ptr;	250	return ptr;
221	}	251	}
222		252
223	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	253	#define Append(type,ptr,sze,inc) (ptr) = (type *)append ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
224	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))	254	#define Prepend(type,ptr,sze,inc) (ptr) = (type *)prepend ((char *)ptr, (sze) * sizeof (type), (inc) * sizeof (type))
		255
		256	static void
		257	need_facenum (struct map *self, faceid face)
		258	{
		259	while (self->faces <= face)
		260	{
		261	Append (tileid, self->face2tile, self->faces, self->faces);
		262	self->faces *= 2;
		263	}
		264	}
		265
		266	static void
		267	need_texid (struct map *self, int texid)
		268	{
		269	while (self->texs <= texid)
		270	{
		271	Append (maptex, self->tex, self->texs, self->texs);
		272	self->texs *= 2;
		273	}
		274	}
225		275
226	static maprow *	276	static maprow *
227	map_get_row (CFPlus__Map self, int y)	277	map_get_row (CFPlus__Map self, int y)
228	{	278	{
229	if (0 > y)	279	if (0 > y)
…		…
324	cell->player = 0;	374	cell->player = 0;
325	}	375	}
326	}	376	}
327	}	377	}
328		378
		379	typedef struct {
		380	tileid tile;
		381	uint8_t x, y, level;
		382	} smooth_key;
		383
		384	static void
		385	smooth_or_bits (HV *hv, smooth_key *key, IV bits)
		386	{
		387	SV **sv = hv_fetch (hv, (char *)key, sizeof (*key), 1);
		388
		389	if (SvIOK (*sv))
		390	SvIV_set (*sv, SvIVX (*sv) | bits);
		391	else
		392	sv_setiv (*sv, bits);
		393	}
		394
329	static void	395	static void
330	music_finished (void)	396	music_finished (void)
331	{	397	{
332	SDL_UserEvent ev;	398	SDL_UserEvent ev;
333		399
…		…
365	n |= n >> 4;	431	n |= n >> 4;
366	n |= n >> 8;	432	n |= n >> 8;
367	n |= n >> 16;	433	n |= n >> 16;
368		434
369	return n + 1;	435	return n + 1;
		436	}
		437
		438	/* SDL should provide this, really. */
		439	#define SDLK_MODIFIER_MIN 300
		440	#define SDLK_MODIFIER_MAX 314
		441
		442	/******************************************************************************/
		443
		444	static GV *draw_x_gv, *draw_y_gv, *draw_w_gv, *draw_h_gv;
		445	static GV *hover_gv;
		446
		447	static int
		448	within_widget (SV *widget, NV x, NV y)
		449	{
		450	HV *self;
		451	SV **svp;
		452	NV wx, ww, wy, wh;
		453
		454	if (!SvROK (widget))
		455	return 0;
		456
		457	self = (HV *)SvRV (widget);
		458
		459	if (SvTYPE (self) != SVt_PVHV)
		460	return 0;
		461
		462	svp = hv_fetch (self, "y", 1, 0); wy = svp ? SvNV (*svp) : 0.;
		463	if (y < wy)
		464	return 0;
		465
		466	svp = hv_fetch (self, "h", 1, 0); wh = svp ? SvNV (*svp) : 0.;
		467	if (y >= wy + wh)
		468	return 0;
		469
		470	svp = hv_fetch (self, "x", 1, 0); wx = svp ? SvNV (*svp) : 0.;
		471	if (x < wx)
		472	return 0;
		473
		474	svp = hv_fetch (self, "w", 1, 0); ww = svp ? SvNV (*svp) : 0.;
		475	if (x >= wx + ww)
		476	return 0;
		477
		478	svp = hv_fetch (self, "can_events", sizeof ("can_events") - 1, 0);
		479	if (!svp || !SvTRUE (*svp))
		480	return 0;
		481
		482	return 1;
370	}	483	}
371		484
372	MODULE = CFPlus PACKAGE = CFPlus	485	MODULE = CFPlus PACKAGE = CFPlus
373		486
374	PROTOTYPES: ENABLE	487	PROTOTYPES: ENABLE
…		…
379	static const struct {	492	static const struct {
380	const char *name;	493	const char *name;
381	IV iv;	494	IV iv;
382	} *civ, const_iv[] = {	495	} *civ, const_iv[] = {
383	# define const_iv(name) { # name, (IV)name }	496	# define const_iv(name) { # name, (IV)name }
		497	const_iv (SDLK_MODIFIER_MIN),
		498	const_iv (SDLK_MODIFIER_MAX),
		499
384	const_iv (SDL_ACTIVEEVENT),	500	const_iv (SDL_ACTIVEEVENT),
385	const_iv (SDL_KEYDOWN),	501	const_iv (SDL_KEYDOWN),
386	const_iv (SDL_KEYUP),	502	const_iv (SDL_KEYUP),
387	const_iv (SDL_MOUSEMOTION),	503	const_iv (SDL_MOUSEMOTION),
388	const_iv (SDL_MOUSEBUTTONDOWN),	504	const_iv (SDL_MOUSEBUTTONDOWN),
…		…
397	const_iv (SDL_EVENT_RESERVEDA),	513	const_iv (SDL_EVENT_RESERVEDA),
398	const_iv (SDL_EVENT_RESERVEDB),	514	const_iv (SDL_EVENT_RESERVEDB),
399	const_iv (SDL_VIDEORESIZE),	515	const_iv (SDL_VIDEORESIZE),
400	const_iv (SDL_VIDEOEXPOSE),	516	const_iv (SDL_VIDEOEXPOSE),
401	const_iv (SDL_USEREVENT),	517	const_iv (SDL_USEREVENT),
		518
		519	const_iv (SDL_APPINPUTFOCUS),
		520	const_iv (SDL_APPMOUSEFOCUS),
		521	const_iv (SDL_APPACTIVE),
		522
402	const_iv (SDLK_KP0),	523	const_iv (SDLK_KP0),
403	const_iv (SDLK_KP1),	524	const_iv (SDLK_KP1),
404	const_iv (SDLK_KP2),	525	const_iv (SDLK_KP2),
405	const_iv (SDLK_KP3),	526	const_iv (SDLK_KP3),
406	const_iv (SDLK_KP4),	527	const_iv (SDLK_KP4),
…		…
461	const_iv (SDLK_BREAK),	582	const_iv (SDLK_BREAK),
462	const_iv (SDLK_MENU),	583	const_iv (SDLK_MENU),
463	const_iv (SDLK_POWER),	584	const_iv (SDLK_POWER),
464	const_iv (SDLK_EURO),	585	const_iv (SDLK_EURO),
465	const_iv (SDLK_UNDO),	586	const_iv (SDLK_UNDO),
		587
466	const_iv (KMOD_NONE),	588	const_iv (KMOD_NONE),
		589	const_iv (KMOD_SHIFT),
467	const_iv (KMOD_LSHIFT),	590	const_iv (KMOD_LSHIFT),
468	const_iv (KMOD_RSHIFT),	591	const_iv (KMOD_RSHIFT),
		592	const_iv (KMOD_CTRL),
469	const_iv (KMOD_LCTRL),	593	const_iv (KMOD_LCTRL),
470	const_iv (KMOD_RCTRL),	594	const_iv (KMOD_RCTRL),
		595	const_iv (KMOD_ALT),
471	const_iv (KMOD_LALT),	596	const_iv (KMOD_LALT),
472	const_iv (KMOD_RALT),	597	const_iv (KMOD_RALT),
		598	const_iv (KMOD_META),
473	const_iv (KMOD_LMETA),	599	const_iv (KMOD_LMETA),
474	const_iv (KMOD_RMETA),	600	const_iv (KMOD_RMETA),
475	const_iv (KMOD_NUM),	601	const_iv (KMOD_NUM),
476	const_iv (KMOD_CAPS),	602	const_iv (KMOD_CAPS),
477	const_iv (KMOD_MODE),	603	const_iv (KMOD_MODE),
478	const_iv (KMOD_CTRL),
479	const_iv (KMOD_SHIFT),
480	const_iv (KMOD_ALT),
481	const_iv (KMOD_META)
482	# undef const_iv	604	# undef const_iv
483	};	605	};
484		606
485	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	607	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
486	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	608	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		609
		610	assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
		611	assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
487	}	612	}
		613
		614	void
		615	weaken (SV *rv)
		616	PROTOTYPE: $
		617	CODE:
		618	sv_rvweaken (rv);
488		619
489	int	620	int
490	in_destruct ()	621	in_destruct ()
491	CODE:	622	CODE:
492	RETVAL = PL_main_cv == Nullcv;	623	RETVAL = PL_main_cv == Nullcv;
…		…
504	opengl_fontmap = pango_opengl_font_map_new ();	635	opengl_fontmap = pango_opengl_font_map_new ();
505	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);	636	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
506	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
507	}	638	}
508		639
		640	char *
		641	SDL_GetError ()
		642
509	int	643	int
510	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)	644	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
511		645
512	void	646	void
513	SDL_Quit ()	647	SDL_Quit ()
514		648
515	void	649	void
516	SDL_ListModes ()	650	SDL_ListModes (int rgb, int alpha)
517	PPCODE:	651	PPCODE:
518	{	652	{
519	SDL_Rect **m;	653	SDL_Rect **m;
520		654
521	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	655	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
522	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	656	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
523	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	657	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
524	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	658	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
525		659
526	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	660	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
527	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	661	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
528		662
529	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	663	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
530	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	664	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
531	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	665	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
532	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	666	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
533		667
534	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	668	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
535	#if SDL_VERSION_ATLEAST(1,2,10)	669	#if SDL_VERSION_ATLEAST(1,2,10)
536	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	670	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
537	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	671	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
538	#endif	672	#endif
539		673
540	SDL_EnableUNICODE (1);
541	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
542
543	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	674	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
544		675
545	if (m && m != (SDL_Rect **)-1)	676	if (m && m != (SDL_Rect **)-1)
546	while (*m)	677	while (*m)
547	{	678	{
		679	if ((*m)->w >= 640 && (*m)->h >= 480)
		680	{
548	AV *av = newAV ();	681	AV *av = newAV ();
549	av_push (av, newSViv ((*m)->w));	682	av_push (av, newSViv ((*m)->w));
550	av_push (av, newSViv ((*m)->h));	683	av_push (av, newSViv ((*m)->h));
		684	av_push (av, newSViv (rgb));
		685	av_push (av, newSViv (alpha));
551	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	686	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		687	}
552		688
553	++m;	689	++m;
554	}	690	}
555	}	691	}
556		692
557	char *
558	SDL_GetError ()
559
560	int	693	int
561	SDL_SetVideoMode (int w, int h, int fullscreen)	694	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
562	CODE:	695	CODE:
		696	{
		697	SDL_EnableUNICODE (1);
		698	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
		699
		700	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
		701	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
		702	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
		703	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
		704
563	RETVAL = !!SDL_SetVideoMode (	705	RETVAL = !!SDL_SetVideoMode (
564	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	706	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
565	);	707	);
		708
566	if (RETVAL)	709	if (RETVAL)
567	{	710	{
		711	av_clear (texture_av);
		712
568	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
569	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);	714	#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
570	# include "glfunc.h"	715	#include "glfunc.h"
571	# undef GL_FUNC	716	#undef GL_FUNC
572	}	717	}
		718	}
573	OUTPUT:	719	OUTPUT:
574	RETVAL	720	RETVAL
575		721
576	void	722	void
577	SDL_GL_SwapBuffers ()	723	SDL_GL_SwapBuffers ()
578		724
579	char *	725	char *
580	SDL_GetKeyName (int sym)	726	SDL_GetKeyName (int sym)
581		727
		728	int
		729	SDL_GetAppState ()
		730
582	void	731	void
583	SDL_PollEvent ()	732	poll_events ()
584	PPCODE:	733	PPCODE:
585	{	734	{
586	SDL_Event ev;	735	SDL_Event ev;
587		736
588	while (SDL_PollEvent (&ev))	737	SDL_PumpEvents ();
		738	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
589	{	739	{
590	HV *hv = newHV ();	740	HV *hv = newHV ();
591	hv_store (hv, "type", 4, newSViv (ev.type), 0);	741	hv_store (hv, "type", 4, newSViv (ev.type), 0);
592		742
593	switch (ev.type)	743	switch (ev.type)
…		…
595	case SDL_KEYDOWN:	745	case SDL_KEYDOWN:
596	case SDL_KEYUP:	746	case SDL_KEYUP:
597	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	747	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
598	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	748	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
599	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	749	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
		750	hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
600	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	751	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
601	break;	752	break;
602		753
603	case SDL_ACTIVEEVENT:	754	case SDL_ACTIVEEVENT:
604	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
605	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	756	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
606	break;	757	break;
607		758
608	case SDL_MOUSEMOTION:	759	case SDL_MOUSEMOTION:
		760	{
		761	int state = ev.motion.state;
		762	int x = ev.motion.x;
		763	int y = ev.motion.y;
		764	int xrel = ev.motion.xrel;
		765	int yrel = ev.motion.yrel;
		766
		767	/* do simplistic event compression */
		768	while (SDL_PeepEvents (&ev, 1, SDL_PEEKEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)) > 0
		769	&& state == ev.motion.state)
		770	{
		771	xrel += ev.motion.xrel;
		772	yrel += ev.motion.yrel;
		773	x = ev.motion.x;
		774	y = ev.motion.y;
		775	SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
		776	}
		777
609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
610
611	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	779	hv_store (hv, "state", 5, newSViv (state), 0);
612	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	780	hv_store (hv, "x", 1, newSViv (x), 0);
613	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	781	hv_store (hv, "y", 1, newSViv (y), 0);
614	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
615	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		784	}
616	break;	785	break;
617		786
618	case SDL_MOUSEBUTTONDOWN:	787	case SDL_MOUSEBUTTONDOWN:
619	case SDL_MOUSEBUTTONUP:	788	case SDL_MOUSEBUTTONUP:
620	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
635	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))));
636	}	805	}
637	}	806	}
638		807
639	int	808	int
640	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 = 4096)
641	POSTCALL:	810	POSTCALL:
642	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
643	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
644		813
645	void	814	void
…		…
649	Mix_AllocateChannels (int numchans = -1)	818	Mix_AllocateChannels (int numchans = -1)
650		819
651	void	820	void
652	lowdelay (int fd, int val = 1)	821	lowdelay (int fd, int val = 1)
653	CODE:	822	CODE:
654	#ifndef _WIN32
655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	823	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
656	#endif
657		824
658	void	825	void
659	win32_proxy_info ()	826	win32_proxy_info ()
660	PPCODE:	827	PPCODE:
661	{	828	{
…		…
698	STRLEN image_len;	865	STRLEN image_len;
699	char *image = (char *)SvPVbyte (image_, image_len);	866	char *image = (char *)SvPVbyte (image_, image_len);
700	SDL_Surface *surface, *surface2;	867	SDL_Surface *surface, *surface2;
701	SDL_PixelFormat fmt;	868	SDL_PixelFormat fmt;
702	SDL_RWops *rw = ix	869	SDL_RWops *rw = ix
703	? SDL_RWFromFile (image, "r")	870	? SDL_RWFromFile (image, "rb")
704	: SDL_RWFromConstMem (image, image_len);	871	: SDL_RWFromConstMem (image, image_len);
705		872
706	if (!rw)	873	if (!rw)
707	croak ("load_image: %s", SDL_GetError ());	874	croak ("load_image: %s", SDL_GetError ());
708		875
…		…
796	_exit (1);	963	_exit (1);
797		964
798	void	965	void
799	_exit (int retval = 0)	966	_exit (int retval = 0)
800	CODE:	967	CODE:
		968	#ifdef WIN32
		969	ExitThread (retval); // unclean, please beam me up
		970	#else
801	_exit (retval);	971	_exit (retval);
		972	#endif
		973
		974	void
		975	debug ()
		976	CODE:
		977	{
		978	#if DEBUG
		979	VALGRIND_DO_LEAK_CHECK;
		980	#endif
		981	}
802		982
803	MODULE = CFPlus PACKAGE = CFPlus::Font	983	MODULE = CFPlus PACKAGE = CFPlus::Font
		984
		985	PROTOTYPES: DISABLE
804		986
805	CFPlus::Font	987	CFPlus::Font
806	new_from_file (SV *class, char *path, int id = 0)	988	new_from_file (SV *class, char *path, int id = 0)
807	CODE:	989	CODE:
808	{	990	{
…		…
819	CODE:	1001	CODE:
820	pango_font_description_free (self);	1002	pango_font_description_free (self);
821		1003
822	void	1004	void
823	make_default (CFPlus::Font self)	1005	make_default (CFPlus::Font self)
		1006	PROTOTYPE: $
824	CODE:	1007	CODE:
825	default_font = self;	1008	default_font = self;
826		1009
827	MODULE = CFPlus PACKAGE = CFPlus::Layout	1010	MODULE = CFPlus PACKAGE = CFPlus::Layout
828		1011
		1012	PROTOTYPES: DISABLE
		1013
829	void	1014	void
830	reset_glyph_cache ()	1015	reset_glyph_cache ()
		1016	PROTOTYPE:
831	CODE:	1017	CODE:
832	tc_clear ();	1018	tc_clear ();
833		1019
834	CFPlus::Layout	1020	CFPlus::Layout
835	new (SV *class)	1021	new (SV *class)
…		…
1053	xy_to_index (CFPlus::Layout self, int x, int y)	1239	xy_to_index (CFPlus::Layout self, int x, int y)
1054	CODE:	1240	CODE:
1055	{	1241	{
1056	int index, trailing;	1242	int index, trailing;
1057	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1243	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1058	RETVAL = index;	1244	RETVAL = index + trailing;
1059	}	1245	}
1060	OUTPUT:	1246	OUTPUT:
1061	RETVAL	1247	RETVAL
1062		1248
1063	void	1249	void
…		…
1069		1255
1070	EXTEND (SP, 3);	1256	EXTEND (SP, 3);
1071	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1257	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1258	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1259	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
		1260	}
		1261
		1262	void
		1263	index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
		1264	PPCODE:
		1265	{
		1266	int line, x;
		1267
		1268	pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
		1269	/* pango bug: line is between 1..numlines, not 0..numlines-1 */
		1270
		1271	EXTEND (SP, 2);
		1272	PUSHs (sv_2mortal (newSViv (line - 1)));
		1273	PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
		1274	}
		1275
		1276	void
		1277	line_x_to_index (CFPlus::Layout self, int line, int x)
		1278	PPCODE:
		1279	{
		1280	PangoLayoutLine *lp;
		1281	int index, trailing;
		1282
		1283	if (line < 0)
		1284	XSRETURN_EMPTY;
		1285
		1286	if (!(lp = pango_layout_get_line (self->pl, line)))
		1287	XSRETURN_EMPTY; /* do better */
		1288
		1289	pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
		1290
		1291	EXTEND (SP, 2);
		1292	if (GIMME_V == G_SCALAR)
		1293	PUSHs (sv_2mortal (newSViv (index + trailing)));
		1294	else
		1295	{
		1296	PUSHs (sv_2mortal (newSViv (index)));
		1297	PUSHs (sv_2mortal (newSViv (trailing)));
		1298	}
1074	}	1299	}
1075		1300
1076	void	1301	void
1077	render (CFPlus::Layout self, float x, float y, int flags = 0)	1302	render (CFPlus::Layout self, float x, float y, int flags = 0)
1078	PPCODE:	1303	PPCODE:
…		…
1083	flags	1308	flags
1084	);	1309	);
1085		1310
1086	MODULE = CFPlus PACKAGE = CFPlus::Texture	1311	MODULE = CFPlus PACKAGE = CFPlus::Texture
1087		1312
1088	void	1313	PROTOTYPES: ENABLE
1089	pad2pot (SV *data_, SV *w_, SV *h_)
1090	CODE:
1091	{
1092	int ow = SvIV (w_);
1093	int oh = SvIV (h_);
1094		1314
1095	if (ow && oh)	1315	int minpot (int n)
		1316
		1317	void
		1318	pad (SV *data_, int ow, int oh, int nw, int nh)
		1319	CODE:
		1320	{
		1321	if ((nw != ow || nh != oh) && SvOK (data_))
1096	{	1322	{
1097	int nw = minpot (ow);
1098	int nh = minpot (oh);
1099
1100	if (nw != ow || nh != oh)
1101	{
1102	if (SvOK (data_))
1103	{
1104	STRLEN datalen;	1323	STRLEN datalen;
1105	char *data = SvPVbyte (data_, datalen);	1324	char *data = SvPVbyte (data_, datalen);
1106	int bpp = datalen / (ow * oh);	1325	int bpp = datalen / (ow * oh);
1107	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));	1326	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1108		1327
1109	SvPOK_only (result_);	1328	SvPOK_only (result_);
1110	SvCUR_set (result_, nw * nh * bpp);	1329	SvCUR_set (result_, nw * nh * bpp);
1111		1330
1112	memset (SvPVX (result_), 0, nw * nh * bpp);	1331	memset (SvPVX (result_), 0, nw * nh * bpp);
1113	while (oh--)	1332	while (oh--)
1114	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1333	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1115		1334
1116	sv_setsv (data_, result_);	1335	sv_setsv (data_, result_);
1117	}
1118
1119	sv_setiv (w_, nw);
1120	sv_setiv (h_, nh);
1121	}
1122	}	1336	}
1123	}	1337	}
1124		1338
1125	void	1339	void
1126	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1340	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1169	glDisable (GL_ALPHA_TEST);	1383	glDisable (GL_ALPHA_TEST);
1170	glDisable (GL_BLEND);	1384	glDisable (GL_BLEND);
1171	}	1385	}
1172	}	1386	}
1173		1387
		1388	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1389	CODE:
		1390	{
		1391	GLint width;
		1392	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1393	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1394	RETVAL = width > 0;
		1395	}
		1396	OUTPUT:
		1397	RETVAL
		1398
1174	MODULE = CFPlus PACKAGE = CFPlus::Map	1399	MODULE = CFPlus PACKAGE = CFPlus::Map
1175		1400
		1401	PROTOTYPES: DISABLE
		1402
1176	CFPlus::Map	1403	CFPlus::Map
1177	new (SV *class, int map_width, int map_height)	1404	new (SV *class)
1178	CODE:	1405	CODE:
1179	New (0, RETVAL, 1, struct map);	1406	New (0, RETVAL, 1, struct map);
1180	RETVAL->x = 0;	1407	RETVAL->x = 0;
1181	RETVAL->y = 0;	1408	RETVAL->y = 0;
1182	RETVAL->w = map_width;	1409	RETVAL->w = 0;
1183	RETVAL->h = map_height;	1410	RETVAL->h = 0;
1184	RETVAL->ox = 0;	1411	RETVAL->ox = 0;
1185	RETVAL->oy = 0;	1412	RETVAL->oy = 0;
1186	RETVAL->faces = 8192;	1413	RETVAL->faces = 8192; Newz (0, RETVAL->face2tile, RETVAL->faces, tileid);
1187	Newz (0, RETVAL->face, RETVAL->faces, mapface);	1414	RETVAL->texs = 8192; Newz (0, RETVAL->tex , RETVAL->texs , maptex);
1188	RETVAL->texs = 8192;
1189	Newz (0, RETVAL->tex, RETVAL->texs, maptex);
1190	RETVAL->rows = 0;	1415	RETVAL->rows = 0;
1191	RETVAL->row = 0;	1416	RETVAL->row = 0;
1192	OUTPUT:	1417	OUTPUT:
1193	RETVAL	1418	RETVAL
1194		1419
1195	void	1420	void
1196	DESTROY (CFPlus::Map self)	1421	DESTROY (CFPlus::Map self)
1197	CODE:	1422	CODE:
1198	{	1423	{
1199	map_clear (self);	1424	map_clear (self);
1200	Safefree (self->face);	1425	Safefree (self->face2tile);
1201	Safefree (self->tex);	1426	Safefree (self->tex);
1202	Safefree (self);	1427	Safefree (self);
1203	}	1428	}
1204		1429
1205	void	1430	void
		1431	resize (CFPlus::Map self, int map_width, int map_height)
		1432	CODE:
		1433	self->w = map_width;
		1434	self->h = map_height;
		1435
		1436	void
1206	clear (CFPlus::Map self)	1437	clear (CFPlus::Map self)
1207	CODE:	1438	CODE:
1208	map_clear (self);	1439	map_clear (self);
1209		1440
1210	void	1441	void
1211	set_face (CFPlus::Map self, int face, int texid)	1442	set_tileid (CFPlus::Map self, int face, int tile)
1212	CODE:	1443	CODE:
1213	{	1444	{
1214	while (self->faces <= face)	1445	need_facenum (self, face); self->face2tile [face] = tile;
1215	{	1446	need_texid (self, tile);
1216	Append (mapface, self->face, self->faces, self->faces);	1447	}
1217	self->faces *= 2;
1218	}
1219		1448
1220	self->face [face] = texid;	1449	void
		1450	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1451	CODE:
		1452	{
		1453	tileid texid;
		1454	maptex *tex;
		1455
		1456	if (face < 0 || face >= self->faces)
		1457	return;
		1458
		1459	if (smooth < 0 || smooth >= self->faces)
		1460	return;
		1461
		1462	texid = self->face2tile [face];
		1463
		1464	if (!texid)
		1465	return;
		1466
		1467	tex = self->tex + texid;
		1468	tex->smoothtile = self->face2tile [smooth];
		1469	tex->smoothlevel = level;
1221	}	1470	}
1222		1471
1223	void	1472	void
1224	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1473	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1225	CODE:	1474	CODE:
1226	{	1475	{
1227	while (self->texs <= texid)	1476	need_texid (self, texid);
1228	{
1229	Append (maptex, self->tex, self->texs, self->texs);
1230	self->texs *= 2;
1231	}
1232		1477
1233	{	1478	{
1234	maptex *tex = self->tex + texid;	1479	maptex *tex = self->tex + texid;
1235		1480
1236	tex->name = name;	1481	tex->name = name;
…		…
1280	CODE:	1525	CODE:
1281	{	1526	{
1282	if (dx > 0)	1527	if (dx > 0)
1283	map_blank (self, self->x, self->y, dx, self->h);	1528	map_blank (self, self->x, self->y, dx, self->h);
1284	else if (dx < 0)	1529	else if (dx < 0)
1285	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1530	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1286		1531
1287	if (dy > 0)	1532	if (dy > 0)
1288	map_blank (self, self->x, self->y, self->w, dy);	1533	map_blank (self, self->x, self->y, self->w, dy);
1289	else if (dy < 0)	1534	else if (dy < 0)
1290	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1535	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1291		1536
1292	self->ox += dx; self->x += dx;	1537	self->ox += dx; self->x += dx;
1293	self->oy += dy; self->y += dy;	1538	self->oy += dy; self->y += dy;
1294		1539
1295	while (self->y < 0)	1540	while (self->y < 0)
…		…
1347	cell->stat_width = 1;	1592	cell->stat_width = 1;
1348	cell->stat_hp = *data++;	1593	cell->stat_hp = *data++;
1349	}	1594	}
1350	else if (cmd == 6) // monster width	1595	else if (cmd == 6) // monster width
1351	cell->stat_width = *data++ + 1;	1596	cell->stat_width = *data++ + 1;
1352	else if (cmd == 0x47) // monster width	1597	else if (cmd == 0x47)
1353	{	1598	{
1354	if (*data == 4)	1599	if (*data == 4)
1355	; // decode player tag	1600	; // decode player count
1356		1601
1357	data += *data + 1;	1602	data += *data + 1;
1358	}	1603	}
1359	else if (cmd == 8) // cell flags	1604	else if (cmd == 8) // cell flags
1360	cell->flags = *data++;	1605	cell->flags = *data++;
…		…
1369	cell->darkness = *data++ + 1;	1614	cell->darkness = *data++ + 1;
1370	}	1615	}
1371		1616
1372	if (flags & 4)	1617	if (flags & 4)
1373	{	1618	{
1374	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1619	faceid face = (data [0] << 8) + data [1]; data += 2;
		1620	need_facenum (self, face);
		1621	cell->tile [0] = self->face2tile [face];
1375	}	1622	}
1376		1623
1377	if (flags & 2)	1624	if (flags & 2)
1378	{	1625	{
1379	cell->face [1] = self->face [(data [0] << 8) + data [1]]; data += 2;	1626	faceid face = (data [0] << 8) + data [1]; data += 2;
		1627	need_facenum (self, face);
		1628	cell->tile [1] = self->face2tile [face];
1380	}	1629	}
1381		1630
1382	if (flags & 1)	1631	if (flags & 1)
1383	{	1632	{
1384	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1633	faceid face = (data [0] << 8) + data [1]; data += 2;
		1634	need_facenum (self, face);
		1635	cell->tile [2] = self->face2tile [face];
1385	}	1636	}
1386	}	1637	}
1387	else	1638	else
1388	cell->darkness = 0;	1639	cell->darkness = 0;
1389	}	1640	}
…		…
1419	{	1670	{
1420	mapcell *cell = row->col + (x - row->c0);	1671	mapcell *cell = row->col + (x - row->c0);
1421		1672
1422	for (z = 0; z <= 0; z++)	1673	for (z = 0; z <= 0; z++)
1423	{	1674	{
1424	mapface face = cell->face [z];
1425
1426	if (face)
1427	{
1428	maptex tex = self->tex [face];	1675	maptex tex = self->tex [cell->tile [z]];
1429	int a0 = 255 - tex.a;	1676	int a0 = 255 - tex.a;
1430	int a1 = tex.a;	1677	int a1 = tex.a;
1431		1678
1432	r = (r * a0 + tex.r * a1) / 255;	1679	r = (r * a0 + tex.r * a1) / 255;
1433	g = (g * a0 + tex.g * a1) / 255;	1680	g = (g * a0 + tex.g * a1) / 255;
1434	b = (b * a0 + tex.b * a1) / 255;	1681	b = (b * a0 + tex.b * a1) / 255;
1435	a = (a * a0 + tex.a * a1) / 255;	1682	a = (a * a0 + tex.a * a1) / 255;
1436	}
1437	}	1683	}
1438	}	1684	}
1439		1685
1440	*map++ = (r )	1686	*map++ = (r )
1441	| (g << 8)	1687	| (g << 8)
…		…
1448	}	1694	}
1449	OUTPUT:	1695	OUTPUT:
1450	RETVAL	1696	RETVAL
1451		1697
1452	void	1698	void
1453	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1699	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1454	CODE:	1700	CODE:
1455	{	1701	{
1456	int vx, vy;	1702	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1703	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1704	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1705	smooth_key skey;
1457	int x, y, z;	1706	int x, y, z;
1458	int last_name;	1707	int last_name;
1459	mapface face;
1460		1708
1461	vx = self->x + self->w / 2 - sw / 2 - shift_x;	1709	// thats current max. sorry.
1462	vy = self->y + self->h / 2 - sh / 2 - shift_y;	1710	if (sw > 255) sw = 255;
		1711	if (sh > 255) sh = 255;
1463		1712
1464	/*	1713	// clear key, in case of extra padding
1465	int vx = self->vx = self->w >= sw	1714	memset (&skey, 0, sizeof (skey));
1466	? self->x + (self->w - sw) / 2
1467	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1468
1469	int vy = self->vy = self->h >= sh
1470	? self->y + (self->h - sh) / 2
1471	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1472	*/
1473		1715
1474	glColor4ub (255, 255, 255, 255);	1716	glColor4ub (255, 255, 255, 255);
1475		1717
1476	glEnable (GL_BLEND);	1718	glEnable (GL_BLEND);
1477	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1719	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1480		1722
1481	glBegin (GL_QUADS);	1723	glBegin (GL_QUADS);
1482		1724
1483	last_name = 0;	1725	last_name = 0;
1484		1726
		1727	mx += self->x;
		1728	my += self->y;
		1729
		1730	// first pass: determine smooth_max
		1731	// rather ugly, if you ask me
		1732	// could also be stored inside mapcell and updated on change
		1733	memset (smooth_max, 0, sizeof (smooth_max));
		1734
		1735	for (y = 0; y < sh; y++)
		1736	if (0 <= y + my && y + my < self->rows)
		1737	{
		1738	maprow *row = self->row + (y + my);
		1739
		1740	for (x = 0; x < sw; x++)
		1741	if (row->c0 <= x + mx && x + mx < row->c1)
		1742	{
		1743	mapcell *cell = row->col + (x + mx - row->c0);
		1744
		1745	smooth_max[x + 1][y + 1] =
		1746	MAX (self->tex [cell->tile [0]].smoothlevel,
		1747	MAX (self->tex [cell->tile [1]].smoothlevel,
		1748	self->tex [cell->tile [2]].smoothlevel));
		1749	}
		1750	}
		1751
1485	for (z = 0; z < 3; z++)	1752	for (z = 0; z <= 2; z++)
		1753	{
		1754	memset (smooth_level, 0, sizeof (smooth_level));
		1755
1486	for (y = 0; y < sh; y++)	1756	for (y = 0; y < sh; y++)
1487	if (0 <= y + vy && y + vy < self->rows)	1757	if (0 <= y + my && y + my < self->rows)
1488	{	1758	{
1489	maprow *row = self->row + (y + vy);	1759	maprow *row = self->row + (y + my);
1490		1760
1491	for (x = 0; x < sw; x++)	1761	for (x = 0; x < sw; x++)
1492	if (row->c0 <= x + vx && x + vx < row->c1)	1762	if (row->c0 <= x + mx && x + mx < row->c1)
1493	{	1763	{
1494	mapcell *cell = row->col + (x + vx - row->c0);	1764	mapcell *cell = row->col + (x + mx - row->c0);
1495
1496	face = cell->face [z];	1765	tileid tile = cell->tile [z];
		1766
		1767	if (tile)
		1768	{
		1769	maptex tex = self->tex [tile];
		1770	int px = (x + 1) * T - tex.w;
		1771	int py = (y + 1) * T - tex.h;
1497		1772
1498	if (face && face < self->texs)	1773	// suppressing texture state switches here
		1774	// is only moderately effective, but worth the extra effort
		1775	if (last_name != tex.name)
		1776	{
		1777	if (!tex.name)
		1778	tex = self->tex [2]; /* missing, replace by noface */
		1779
		1780	glEnd ();
		1781	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1782	glBegin (GL_QUADS);
		1783	}
		1784
		1785	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1786	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1787	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1788	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1789
		1790	if (cell->flags && z == 2)
		1791	{
		1792	if (cell->flags & 1)
		1793	{
		1794	maptex tex = self->tex [1];
		1795	int px = x * T + T * 2 / 32;
		1796	int py = y * T - T * 6 / 32;
		1797
		1798	glEnd ();
		1799	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1800	glBegin (GL_QUADS);
		1801
		1802	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1803	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1804	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1805	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1806	}
		1807	}
		1808
		1809	// update smooth hash
		1810	if (tex.smoothtile)
		1811	{
		1812	skey.tile = tex.smoothtile;
		1813	skey.level = tex.smoothlevel;
		1814
		1815	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1816
		1817	// add bits to current tile and all neighbours. skey.x|y is
		1818	// shifted +1|+1 so we always stay positive.
		1819
		1820	// bits is ___n cccc CCCC bbbb
		1821	// n do not draw borders&corners
		1822	// c draw these corners, but...
		1823	// C ... not these
		1824	// b draw these borders
		1825
		1826	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1827	// ┃· ·· ·┃ ━━
		1828
		1829	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1830	// ·· ·· ·┏ ┓·
		1831
		1832	// full tile
		1833	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1834
		1835	// borders
		1836	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1837	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1838	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1839	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1840
		1841	// corners
		1842	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1843	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1844	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1845	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1846	}
		1847	}
		1848	}
		1849	}
		1850
		1851	// go through all smoothlevels, lowest to highest, then draw.
		1852	// this is basically counting sort
		1853	{
		1854	int w, b;
		1855
		1856	for (w = 0; w < 256 / 32; ++w)
		1857	{
		1858	uint32_t smask = smooth_level [w];
		1859	if (smask)
		1860	for (b = 0; b < 32; ++b)
		1861	if (smask & (((uint32_t)1) << b))
1499	{	1862	{
1500	maptex tex = self->tex [face];	1863	int level = (w << 5) | b;
1501	int px = (x + 1) * 32 - tex.w;	1864	HE *he;
1502	int py = (y + 1) * 32 - tex.h;
1503		1865
1504	if (last_name != tex.name)	1866	hv_iterinit (smooth);
		1867	while ((he = hv_iternext (smooth)))
1505	{	1868	{
		1869	smooth_key *skey = (smooth_key *)HeKEY (he);
		1870	IV bits = SvIVX (HeVAL (he));
		1871
		1872	if (!(bits & 0x1000)
		1873	&& skey->level == level
		1874	&& level > smooth_max [skey->x][skey->y])
		1875	{
		1876	maptex tex = self->tex [skey->tile];
		1877	int px = (((int)skey->x) - 1) * T;
		1878	int py = (((int)skey->y) - 1) * T;
		1879	int border = bits & 15;
		1880	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1881	float dx = tex.s * .0625f; // 16 images/row
		1882	float dy = tex.t * .5f ; // 2 images/column
		1883
		1884	// this time naively avoiding texture state changes
		1885	// save gobs of state changes.
		1886	if (last_name != tex.name)
		1887	{
		1888	if (!tex.name)
		1889	continue; // smoothing not yet available
		1890
1506	glEnd ();	1891	glEnd ();
1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1892	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1508	glBegin (GL_QUADS);	1893	glBegin (GL_QUADS);
		1894	}
		1895
		1896	if (border)
		1897	{
		1898	float ox = border * dx;
		1899
		1900	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1901	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1902	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1903	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1904	}
		1905
		1906	if (corner)
		1907	{
		1908	float ox = corner * dx;
		1909
		1910	glTexCoord2f (ox , dy ); glVertex2f (px , py );
		1911	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
		1912	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
		1913	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1914	}
1509	}	1915	}
1510
1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1513	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1515	}
1516
1517	if (cell->flags && z == 2)
1518	{
1519	if (cell->flags & 1)
1520	{
1521	maptex tex = self->tex [1];
1522	int px = (x + 1) * 32 - tex.w + 2;
1523	int py = (y + 1) * 32 - tex.h - 6;
1524
1525	glEnd ();
1526	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1527	glBegin (GL_QUADS);
1528
1529	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1530	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1531	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1532	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1533	}	1916	}
1534	}	1917	}
1535	}
1536	}	1918	}
		1919	}
		1920
		1921	hv_clear (smooth);
		1922	}
1537		1923
1538	glEnd ();	1924	glEnd ();
1539		1925
1540	glDisable (GL_TEXTURE_2D);	1926	glDisable (GL_TEXTURE_2D);
1541	glDisable (GL_BLEND);	1927	glDisable (GL_BLEND);
1542		1928
1543	// top layer: overlays such as the health bar	1929	// top layer: overlays such as the health bar
1544	for (y = 0; y < sh; y++)	1930	for (y = 0; y < sh; y++)
1545	if (0 <= y + vy && y + vy < self->rows)	1931	if (0 <= y + my && y + my < self->rows)
1546	{	1932	{
1547	maprow *row = self->row + (y + vy);	1933	maprow *row = self->row + (y + my);
1548		1934
1549	for (x = 0; x < sw; x++)	1935	for (x = 0; x < sw; x++)
1550	if (row->c0 <= x + vx && x + vx < row->c1)	1936	if (row->c0 <= x + mx && x + mx < row->c1)
1551	{	1937	{
1552	mapcell *cell = row->col + (x + vx - row->c0);	1938	mapcell *cell = row->col + (x + mx - row->c0);
1553		1939
1554	int px = x * 32;	1940	int px = x * T;
1555	int py = y * 32;	1941	int py = y * T;
1556		1942
1557	if (cell->stat_hp)	1943	if (cell->stat_hp)
1558	{	1944	{
1559	int width = cell->stat_width * 32;	1945	int width = cell->stat_width * T;
1560	int thick = sh / 28 + 1 + cell->stat_width;	1946	int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
1561		1947
1562	glColor3ub (0, 0, 0);	1948	glColor3ub (0, 0, 0);
1563	glRectf (px + 1, py - thick - 2,	1949	glRectf (px + 1, py - thick - 2,
1564	px + width - 1, py);	1950	px + width - 1, py);
1565		1951
…		…
1631	glDisable (GL_BLEND);	2017	glDisable (GL_BLEND);
1632	glDisable (GL_TEXTURE_2D);	2018	glDisable (GL_TEXTURE_2D);
1633	}	2019	}
1634		2020
1635	void	2021	void
1636	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	2022	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1637	PPCODE:	2023	PPCODE:
1638	{	2024	{
1639	int vx, vy;
1640	int x, y;	2025	int x, y;
		2026	int sw1 = sw + 2;
		2027	int sh1 = sh + 2;
		2028	int sh3 = sh * 3;
1641	int sw4 = (sw + 3) & ~3;	2029	int sw34 = (sw * 3 + 3) & ~3;
		2030	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1642	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	2031	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1643	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	2032	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1644		2033
1645	memset (darkness, 255, sw4 * sh);
1646	SvPOK_only (darkness_sv);	2034	SvPOK_only (darkness3_sv);
1647	SvCUR_set (darkness_sv, sw4 * sh);	2035	SvCUR_set (darkness3_sv, sw34 * sh3);
1648		2036
1649	vx = self->x + (self->w - sw + 1) / 2 - shift_x;	2037	mx += self->x - 1;
1650	vy = self->y + (self->h - sh + 1) / 2 - shift_y;	2038	my += self->y - 1;
1651		2039
		2040	memset (darkness1, 255, sw1 * sh1);
		2041
1652	for (y = 0; y < sh; y++)	2042	for (y = 0; y < sh1; y++)
1653	if (0 <= y + vy && y + vy < self->rows)	2043	if (0 <= y + my && y + my < self->rows)
1654	{	2044	{
1655	maprow *row = self->row + (y + vy);	2045	maprow *row = self->row + (y + my);
1656		2046
1657	for (x = 0; x < sw; x++)	2047	for (x = 0; x < sw1; x++)
1658	if (row->c0 <= x + vx && x + vx < row->c1)	2048	if (row->c0 <= x + mx && x + mx < row->c1)
1659	{	2049	{
1660	mapcell *cell = row->col + (x + vx - row->c0);	2050	mapcell *cell = row->col + (x + mx - row->c0);
1661		2051
1662	darkness[y * sw4 + x] = cell->darkness	2052	darkness1 [y * sw1 + x] = cell->darkness
1663	? 255 - (cell->darkness - 1)	2053	? 255 - (cell->darkness - 1)
1664	: 255 - FOW_DARKNESS;	2054	: 255 - FOW_DARKNESS;
1665	}	2055	}
1666	}	2056	}
1667		2057
		2058	for (y = 0; y < sh; ++y)
		2059	for (x = 0; x < sw; ++x)
		2060	{
		2061	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2062	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2063	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2064	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2065	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2066	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2067	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2068	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2069	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2070
		2071	uint8_t r11 = (d11 + d21 + d12) / 3;
		2072	uint8_t r21 = d21;
		2073	uint8_t r31 = (d21 + d31 + d32) / 3;
		2074
		2075	uint8_t r12 = d12;
		2076	uint8_t r22 = d22;
		2077	uint8_t r32 = d32;
		2078
		2079	uint8_t r13 = (d13 + d23 + d12) / 3;
		2080	uint8_t r23 = d23;
		2081	uint8_t r33 = (d23 + d33 + d32) / 3;
		2082
		2083	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2084	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2085	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2086	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2087	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2088	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2089	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2090	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2091	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2092	}
		2093
		2094	free (darkness1);
		2095
1668	EXTEND (SP, 3);	2096	EXTEND (SP, 3);
1669	PUSHs (sv_2mortal (newSViv (sw4)));	2097	PUSHs (sv_2mortal (newSViv (sw34)));
1670	PUSHs (sv_2mortal (newSViv (sh)));	2098	PUSHs (sv_2mortal (newSViv (sh3)));
1671	PUSHs (darkness_sv);	2099	PUSHs (darkness3_sv);
1672	}	2100	}
1673		2101
1674	SV *	2102	SV *
1675	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2103	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1676	CODE:	2104	CODE:
…		…
1705	if (row && row->c0 <= x && x < row->c1)	2133	if (row && row->c0 <= x && x < row->c1)
1706	{	2134	{
1707	mapcell *cell = row->col + (x - row->c0);	2135	mapcell *cell = row->col + (x - row->c0);
1708	uint8_t flags = 0;	2136	uint8_t flags = 0;
1709		2137
1710	if (cell->face [0]) flags |= 1;	2138	if (cell->tile [0]) flags |= 1;
1711	if (cell->face [1]) flags |= 2;	2139	if (cell->tile [1]) flags |= 2;
1712	if (cell->face [2]) flags |= 4;	2140	if (cell->tile [2]) flags |= 4;
1713		2141
1714	*data++ = flags;	2142	*data++ = flags;
1715		2143
1716	if (flags & 1)	2144	if (flags & 1)
1717	{	2145	{
		2146	tileid tile = cell->tile [0];
1718	*data++ = cell->face [0] >> 8;	2147	*data++ = tile >> 8;
1719	*data++ = cell->face [0];	2148	*data++ = tile;
1720	}	2149	}
1721		2150
1722	if (flags & 2)	2151	if (flags & 2)
1723	{	2152	{
		2153	tileid tile = cell->tile [1];
1724	*data++ = cell->face [1] >> 8;	2154	*data++ = tile >> 8;
1725	*data++ = cell->face [1];	2155	*data++ = tile;
1726	}	2156	}
1727		2157
1728	if (flags & 4)	2158	if (flags & 4)
1729	{	2159	{
		2160	tileid tile = cell->tile [2];
1730	*data++ = cell->face [2] >> 8;	2161	*data++ = tile >> 8;
1731	*data++ = cell->face [2];	2162	*data++ = tile;
1732	}	2163	}
1733	}	2164	}
1734	else	2165	else
1735	*data++ = 0;	2166	*data++ = 0;
1736	}	2167	}
…		…
1776	{	2207	{
1777	uint8_t flags = *data++;	2208	uint8_t flags = *data++;
1778		2209
1779	if (flags)	2210	if (flags)
1780	{	2211	{
1781	mapface face[3] = { 0, 0, 0 };
1782
1783	mapcell *cell = row_get_cell (row, x);	2212	mapcell *cell = row_get_cell (row, x);
		2213	tileid tile[3] = { 0, 0, 0 };
1784		2214
1785	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	2215	if (flags & 1) { tile[0] = *data++ << 8; tile[0] |= *data++; }
1786	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	2216	if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
1787	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	2217	if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
1788		2218
1789	if (cell->darkness == 0)	2219	if (cell->darkness == 0)
1790	{	2220	{
1791	cell->darkness = 0;	2221	cell->darkness = 0;
1792		2222
1793	for (z = 0; z <= 2; z++)	2223	for (z = 0; z <= 2; z++)
1794	{	2224	{
1795	cell->face[z] = face[z];	2225	tileid t = tile [z];
1796		2226
1797	if (face[z] && (face[z] >= self->texs || !self->tex[face [z]].name))	2227	if (t >= self->texs || (t && !self->tex [t].name))
		2228	{
1798	XPUSHs (sv_2mortal (newSViv (face[z])));	2229	XPUSHs (sv_2mortal (newSViv (t)));
		2230	need_texid (self, t);
		2231	}
		2232
		2233	cell->tile [z] = t;
1799	}	2234	}
1800	}	2235	}
1801	}	2236	}
1802	}	2237	}
1803	}	2238	}
1804	}	2239	}
1805		2240
		2241	MODULE = CFPlus PACKAGE = CFPlus::RW
		2242
		2243	CFPlus::RW
		2244	new (SV *class, SV *data_sv)
		2245	CODE:
		2246	{
		2247	STRLEN datalen;
		2248	char *data = SvPVbyte (data_sv, datalen);
		2249
		2250	RETVAL = SDL_RWFromConstMem (data, datalen);
		2251	}
		2252	OUTPUT:
		2253	RETVAL
		2254
		2255	CFPlus::RW
		2256	new_from_file (SV *class, const char *path, const char *mode = "rb")
		2257	CODE:
		2258	RETVAL = SDL_RWFromFile (path, mode);
		2259	OUTPUT:
		2260	RETVAL
		2261
		2262	void
		2263	close (CFPlus::RW self)
		2264	CODE:
		2265	SDL_RWclose (self);
		2266
		2267	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2268
		2269	PROTOTYPES: DISABLE
		2270
		2271	void
		2272	halt (CFPlus::Channel self)
		2273	CODE:
		2274	Mix_HaltChannel (self);
		2275
		2276	void
		2277	expire (CFPlus::Channel self, int ticks = -1)
		2278	CODE:
		2279	Mix_ExpireChannel (self, ticks);
		2280
		2281	void
		2282	fade_out (CFPlus::Channel self, int ticks = -1)
		2283	CODE:
		2284	Mix_FadeOutChannel (self, ticks);
		2285
		2286	int
		2287	volume (CFPlus::Channel self, int volume)
		2288	CODE:
		2289	RETVAL = Mix_Volume (self, volume);
		2290	OUTPUT:
		2291	RETVAL
		2292
		2293	void
		2294	unregister_all_effects (CFPlus::Channel self)
		2295	CODE:
		2296	Mix_UnregisterAllEffects (self);
		2297
		2298	void
		2299	set_panning (CFPlus::Channel self, int left, int right)
		2300	CODE:
		2301	Mix_SetPanning (self, left, right);
		2302
		2303	void
		2304	set_distance (CFPlus::Channel self, int distance)
		2305	CODE:
		2306	Mix_SetDistance (self, distance);
		2307
		2308	void
		2309	set_position (CFPlus::Channel self, int angle, int distance)
		2310	CODE:
		2311	Mix_SetPosition (self, angle, distance);
		2312
		2313	void
		2314	set_reverse_stereo (CFPlus::Channel self, int flip)
		2315	CODE:
		2316	Mix_SetReverseStereo (self, flip);
		2317
1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2318	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1807		2319
		2320	PROTOTYPES: DISABLE
		2321
1808	CFPlus::MixChunk	2322	CFPlus::MixChunk
1809	new_from_file (SV *class, char *path)	2323	new (SV *class, CFPlus::RW rwops)
1810	CODE:	2324	CODE:
1811	RETVAL = Mix_LoadWAV (path);	2325	RETVAL = Mix_LoadWAV_RW (rwops, 1);
1812	OUTPUT:	2326	OUTPUT:
1813	RETVAL	2327	RETVAL
1814		2328
1815	void	2329	void
1816	DESTROY (CFPlus::MixChunk self)	2330	DESTROY (CFPlus::MixChunk self)
…		…
1822	CODE:	2336	CODE:
1823	RETVAL = Mix_VolumeChunk (self, volume);	2337	RETVAL = Mix_VolumeChunk (self, volume);
1824	OUTPUT:	2338	OUTPUT:
1825	RETVAL	2339	RETVAL
1826		2340
1827	int	2341	CFPlus::Channel
1828	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2342	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1829	CODE:	2343	CODE:
1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2344	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2345	Mix_UnregisterAllEffects (RETVAL);
1831	OUTPUT:	2346	OUTPUT:
1832	RETVAL	2347	RETVAL
1833		2348
1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2349	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1835		2350
1836	int	2351	int
1837	volume (int volume = -1)	2352	volume (int volume = -1)
		2353	PROTOTYPE: ;$
1838	CODE:	2354	CODE:
1839	RETVAL = Mix_VolumeMusic (volume);	2355	RETVAL = Mix_VolumeMusic (volume);
1840	OUTPUT:	2356	OUTPUT:
1841	RETVAL	2357	RETVAL
1842		2358
		2359	void
		2360	fade_out (int ms)
		2361	CODE:
		2362	Mix_FadeOutMusic (ms);
		2363
		2364	void
		2365	halt ()
		2366	CODE:
		2367	Mix_HaltMusic ();
		2368
1843	CFPlus::MixMusic	2369	CFPlus::MixMusic
1844	new_from_file (SV *class, char *path)	2370	new (SV *class, CFPlus::RW rwops)
1845	CODE:	2371	CODE:
1846	RETVAL = Mix_LoadMUS (path);	2372	RETVAL = Mix_LoadMUS_RW (rwops);
1847	OUTPUT:	2373	OUTPUT:
1848	RETVAL	2374	RETVAL
1849		2375
1850	void	2376	void
1851	DESTROY (CFPlus::MixMusic self)	2377	DESTROY (CFPlus::MixMusic self)
…		…
1857	CODE:	2383	CODE:
1858	RETVAL = Mix_PlayMusic (self, loops);	2384	RETVAL = Mix_PlayMusic (self, loops);
1859	OUTPUT:	2385	OUTPUT:
1860	RETVAL	2386	RETVAL
1861		2387
		2388	void
		2389	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2390	CODE:
		2391	Mix_FadeInMusicPos (self, loops, ms, position);
		2392
1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2393	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2394
		2395	PROTOTYPES: ENABLE
1863		2396
1864	BOOT:	2397	BOOT:
1865	{	2398	{
1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2399	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1867	static const struct {	2400	static const struct {
1868	const char *name;	2401	const char *name;
1869	IV iv;	2402	IV iv;
1870	} *civ, const_iv[] = {	2403	} *civ, const_iv[] = {
1871	# define const_iv(name) { # name, (IV)name }	2404	# define const_iv(name) { # name, (IV)name }
		2405	const_iv (GL_VENDOR),
		2406	const_iv (GL_VERSION),
		2407	const_iv (GL_EXTENSIONS),
1872	const_iv (GL_COLOR_MATERIAL),	2408	const_iv (GL_COLOR_MATERIAL),
1873	const_iv (GL_SMOOTH),	2409	const_iv (GL_SMOOTH),
1874	const_iv (GL_FLAT),	2410	const_iv (GL_FLAT),
1875	const_iv (GL_DITHER),	2411	const_iv (GL_DITHER),
1876	const_iv (GL_BLEND),	2412	const_iv (GL_BLEND),
…		…
1880	const_iv (GL_ALPHA_TEST),	2416	const_iv (GL_ALPHA_TEST),
1881	const_iv (GL_NORMALIZE),	2417	const_iv (GL_NORMALIZE),
1882	const_iv (GL_RESCALE_NORMAL),	2418	const_iv (GL_RESCALE_NORMAL),
1883	const_iv (GL_FRONT),	2419	const_iv (GL_FRONT),
1884	const_iv (GL_BACK),	2420	const_iv (GL_BACK),
		2421	const_iv (GL_AUX0),
1885	const_iv (GL_AND),	2422	const_iv (GL_AND),
1886	const_iv (GL_ONE),	2423	const_iv (GL_ONE),
1887	const_iv (GL_ZERO),	2424	const_iv (GL_ZERO),
1888	const_iv (GL_SRC_ALPHA),	2425	const_iv (GL_SRC_ALPHA),
1889	const_iv (GL_DST_ALPHA),	2426	const_iv (GL_DST_ALPHA),
…		…
1903	const_iv (GL_LUMINANCE),	2440	const_iv (GL_LUMINANCE),
1904	const_iv (GL_LUMINANCE_ALPHA),	2441	const_iv (GL_LUMINANCE_ALPHA),
1905	const_iv (GL_FLOAT),	2442	const_iv (GL_FLOAT),
1906	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2443	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1907	const_iv (GL_COMPILE),	2444	const_iv (GL_COMPILE),
		2445	const_iv (GL_PROXY_TEXTURE_1D),
		2446	const_iv (GL_PROXY_TEXTURE_2D),
1908	const_iv (GL_TEXTURE_1D),	2447	const_iv (GL_TEXTURE_1D),
1909	const_iv (GL_TEXTURE_2D),	2448	const_iv (GL_TEXTURE_2D),
1910	const_iv (GL_TEXTURE_ENV),	2449	const_iv (GL_TEXTURE_ENV),
1911	const_iv (GL_TEXTURE_MAG_FILTER),	2450	const_iv (GL_TEXTURE_MAG_FILTER),
1912	const_iv (GL_TEXTURE_MIN_FILTER),	2451	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
1933	const_iv (GL_COLOR_LOGIC_OP),	2472	const_iv (GL_COLOR_LOGIC_OP),
1934	const_iv (GL_SEPARABLE_2D),	2473	const_iv (GL_SEPARABLE_2D),
1935	const_iv (GL_CONVOLUTION_2D),	2474	const_iv (GL_CONVOLUTION_2D),
1936	const_iv (GL_CONVOLUTION_BORDER_MODE),	2475	const_iv (GL_CONVOLUTION_BORDER_MODE),
1937	const_iv (GL_CONSTANT_BORDER),	2476	const_iv (GL_CONSTANT_BORDER),
		2477	const_iv (GL_POINTS),
1938	const_iv (GL_LINES),	2478	const_iv (GL_LINES),
1939	const_iv (GL_LINE_STRIP),	2479	const_iv (GL_LINE_STRIP),
1940	const_iv (GL_LINE_LOOP),	2480	const_iv (GL_LINE_LOOP),
1941	const_iv (GL_QUADS),	2481	const_iv (GL_QUADS),
1942	const_iv (GL_QUAD_STRIP),	2482	const_iv (GL_QUAD_STRIP),
1943	const_iv (GL_TRIANGLES),	2483	const_iv (GL_TRIANGLES),
1944	const_iv (GL_TRIANGLE_STRIP),	2484	const_iv (GL_TRIANGLE_STRIP),
1945	const_iv (GL_TRIANGLE_FAN),	2485	const_iv (GL_TRIANGLE_FAN),
		2486	const_iv (GL_POLYGON),
1946	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2487	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2488	const_iv (GL_POINT_SMOOTH_HINT),
		2489	const_iv (GL_LINE_SMOOTH_HINT),
		2490	const_iv (GL_POLYGON_SMOOTH_HINT),
		2491	const_iv (GL_GENERATE_MIPMAP_HINT),
1947	const_iv (GL_FASTEST),	2492	const_iv (GL_FASTEST),
		2493	const_iv (GL_DONT_CARE),
		2494	const_iv (GL_NICEST),
1948	const_iv (GL_V2F),	2495	const_iv (GL_V2F),
1949	const_iv (GL_V3F),	2496	const_iv (GL_V3F),
1950	const_iv (GL_T2F_V3F),	2497	const_iv (GL_T2F_V3F),
1951	const_iv (GL_T2F_N3F_V3F),	2498	const_iv (GL_T2F_N3F_V3F),
1952	# undef const_iv	2499	# undef const_iv
1953	};	2500	};
1954		2501
1955	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2502	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1956	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2503	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2504
		2505	texture_av = newAV ();
		2506	AvREAL_off (texture_av);
1957	}	2507	}
1958		2508
1959	char *	2509	char *
1960	gl_vendor ()	2510	gl_vendor ()
1961	CODE:	2511	CODE:
…		…
1975	CODE:	2525	CODE:
1976	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2526	RETVAL = (char *)glGetString (GL_EXTENSIONS);
1977	OUTPUT:	2527	OUTPUT:
1978	RETVAL	2528	RETVAL
1979		2529
		2530	const char *glGetString (GLenum pname)
		2531
		2532	GLint glGetInteger (GLenum pname)
		2533	CODE:
		2534	glGetIntegerv (pname, &RETVAL);
		2535	OUTPUT:
		2536	RETVAL
		2537
		2538	GLdouble glGetDouble (GLenum pname)
		2539	CODE:
		2540	glGetDoublev (pname, &RETVAL);
		2541	OUTPUT:
		2542	RETVAL
		2543
1980	int glGetError ()	2544	int glGetError ()
1981		2545
1982	void glFinish ()	2546	void glFinish ()
1983		2547
1984	void glClear (int mask)	2548	void glClear (int mask)
…		…
2021	# near_ and far_ are due to microsofts buggy "c" compiler	2585	# near_ and far_ are due to microsofts buggy "c" compiler
2022	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2586	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2023		2587
2024	# near_ and far_ are due to microsofts buggy "c" compiler	2588	# near_ and far_ are due to microsofts buggy "c" compiler
2025	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2589	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
		2590
		2591	PROTOTYPES: DISABLE
2026		2592
2027	void glViewport (int x, int y, int width, int height)	2593	void glViewport (int x, int y, int width, int height)
2028		2594
2029	void glScissor (int x, int y, int width, int height)	2595	void glScissor (int x, int y, int width, int height)
2030		2596
…		…
2038		2604
2039	void glRotate (float angle, float x, float y, float z)	2605	void glRotate (float angle, float x, float y, float z)
2040	CODE:	2606	CODE:
2041	glRotatef (angle, x, y, z);	2607	glRotatef (angle, x, y, z);
2042		2608
2043	void glBegin (int mode)
2044
2045	void glEnd ()
2046
2047	void glColor (float r, float g, float b, float a = 1.0)	2609	void glColor (float r, float g, float b, float a = 1.0)
2048	PROTOTYPE: @
2049	ALIAS:	2610	ALIAS:
2050	glColor_premultiply = 1	2611	glColor_premultiply = 1
2051	CODE:	2612	CODE:
2052	if (ix)	2613	if (ix)
2053	{	2614	{
…		…
2056	b *= a;	2617	b *= a;
2057	}	2618	}
2058	// microsoft visual "c" rounds instead of truncating...	2619	// microsoft visual "c" rounds instead of truncating...
2059	glColor4f (r, g, b, a);	2620	glColor4f (r, g, b, a);
2060		2621
2061	void glInterleavedArrays (int format, int stride, char *data)
2062
2063	void glDrawElements (int mode, int count, int type, char *indices)
2064
2065	# 1.2 void glDrawRangeElements (int mode, int start, int end
2066
2067	void glRasterPos (float x, float y, float z = 0.)	2622	void glRasterPos (float x, float y, float z = 0.)
2068	CODE:	2623	CODE:
2069	glRasterPos3f (0, 0, z);	2624	glRasterPos3f (0, 0, z);
2070	glBitmap (0, 0, 0, 0, x, y, 0);	2625	glBitmap (0, 0, 0, 0, x, y, 0);
2071		2626
…		…
2075		2630
2076	void glTexCoord (float s, float t)	2631	void glTexCoord (float s, float t)
2077	CODE:	2632	CODE:
2078	glTexCoord2f (s, t);	2633	glTexCoord2f (s, t);
2079		2634
		2635	void glRect (float x1, float y1, float x2, float y2)
		2636	CODE:
		2637	glRectf (x1, y1, x2, y2);
		2638
		2639	PROTOTYPES: ENABLE
		2640
		2641	void glBegin (int mode)
		2642
		2643	void glEnd ()
		2644
		2645	void glPointSize (GLfloat size)
		2646
		2647	void glLineWidth (GLfloat width)
		2648
		2649	void glInterleavedArrays (int format, int stride, char *data)
		2650
		2651	void glDrawElements (int mode, int count, int type, char *indices)
		2652
		2653	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2654
2080	void glTexEnv (int target, int pname, float param)	2655	void glTexEnv (int target, int pname, float param)
2081	CODE:	2656	CODE:
2082	glTexEnvf (target, pname, param);	2657	glTexEnvf (target, pname, param);
2083		2658
2084	void glTexParameter (int target, int pname, float param)	2659	void glTexParameter (int target, int pname, float param)
…		…
2106		2681
2107	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2682	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2108		2683
2109	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2684	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2110		2685
		2686	void glPixelZoom (float x, float y)
		2687
2111	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2688	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2112		2689
2113	int glGenTexture ()	2690	int glGenTexture ()
2114	CODE:	2691	CODE:
2115	{	2692	RETVAL = gen_texture ();
2116	GLuint name;
2117	glGenTextures (1, &name);
2118	RETVAL = name;
2119	}
2120	OUTPUT:	2693	OUTPUT:
2121	RETVAL	2694	RETVAL
2122		2695
2123	void glDeleteTexture (int name)	2696	void glDeleteTexture (int name)
2124	CODE:	2697	CODE:
2125	{
2126	GLuint name_ = name;
2127	glDeleteTextures (1, &name_);	2698	del_texture (name);
2128	}	2699
2129
2130	int glGenList ()	2700	int glGenList ()
2131	CODE:	2701	CODE:
2132	RETVAL = glGenLists (1);	2702	RETVAL = glGenLists (1);
2133	OUTPUT:	2703	OUTPUT:
2134	RETVAL	2704	RETVAL
…		…
2141		2711
2142	void glEndList ()	2712	void glEndList ()
2143		2713
2144	void glCallList (int list)	2714	void glCallList (int list)
2145		2715
		2716	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2717
		2718	PROTOTYPES: DISABLE
		2719
		2720	void
		2721	find_widget (SV *self, NV x, NV y)
		2722	PPCODE:
		2723	{
		2724	if (within_widget (self, x, y))
		2725	XPUSHs (self);
		2726	}
		2727
		2728	BOOT:
		2729	{
		2730	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2731
		2732	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2733	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2734	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2735	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2736	}
		2737
		2738	void
		2739	draw (SV *self)
		2740	CODE:
		2741	{
		2742	HV *hv;
		2743	SV **svp;
		2744	NV x, y, w, h;
		2745	SV *draw_x_sv = GvSV (draw_x_gv);
		2746	SV *draw_y_sv = GvSV (draw_y_gv);
		2747	SV *draw_w_sv = GvSV (draw_w_gv);
		2748	SV *draw_h_sv = GvSV (draw_h_gv);
		2749	SV *hover;
		2750	double draw_x, draw_y, draw_w, draw_h;
		2751
		2752	if (!SvROK (self))
		2753	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2754
		2755	hv = (HV *)SvRV (self);
		2756
		2757	if (SvTYPE (hv) != SVt_PVHV)
		2758	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2759
		2760	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2761	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2762
		2763	if (!h || !w)
		2764	XSRETURN_EMPTY;
		2765
		2766	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2767	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2768
		2769	draw_x = SvNV (draw_x_sv) + x;
		2770	draw_y = SvNV (draw_y_sv) + y;
		2771
		2772	if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
		2773	|| draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
		2774	XSRETURN_EMPTY;
		2775
		2776	sv_setnv (draw_x_sv, draw_x);
		2777	sv_setnv (draw_y_sv, draw_y);
		2778
		2779	glPushMatrix ();
		2780	glTranslated (x, y, 0);
		2781
		2782	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2783	{
		2784	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2785
		2786	if (svp && SvTRUE (*svp))
		2787	{
		2788	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
		2789	glEnable (GL_BLEND);
		2790	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2791	glBegin (GL_QUADS);
		2792	glVertex2f (0, 0);
		2793	glVertex2f (w, 0);
		2794	glVertex2f (w, h);
		2795	glVertex2f (0, h);
		2796	glEnd ();
		2797	glDisable (GL_BLEND);
		2798	}
		2799	}
		2800	#if 0
		2801	if ($ENV{CFPLUS_DEBUG} & 1) {
		2802	glPushMatrix;
		2803	glColor 1, 1, 0, 1;
		2804	glTranslate 0.375, 0.375;
		2805	glBegin GL_LINE_LOOP;
		2806	glVertex 0 , 0;
		2807	glVertex $self->{w} - 1, 0;
		2808	glVertex $self->{w} - 1, $self->{h} - 1;
		2809	glVertex 0 , $self->{h} - 1;
		2810	glEnd;
		2811	glPopMatrix;
		2812	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2813	}
		2814	#endif
		2815	PUSHMARK (SP);
		2816	XPUSHs (self);
		2817	PUTBACK;
		2818	call_method ("_draw", G_VOID | G_DISCARD);
		2819	SPAGAIN;
		2820
		2821	glPopMatrix ();
		2822
		2823	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2824	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2825	}
		2826

Diff Legend

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