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.174 by root, Fri Apr 6 07:45:34 2007 UTC vs.
Revision 1.214 by root, Sun Jul 29 18:56:02 2007 UTC

…		…
6	# include <wininet.h>	6	# include <wininet.h>
7	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
8	# pragma warning(disable:4761)	8	# pragma warning(disable:4761)
9	#endif	9	#endif
10		10
		11	//#define DEBUG 1
		12	#if DEBUG
		13	# include <valgrind/memcheck.h>
		14	#endif
		15
11	#include "EXTERN.h"	16	#include "EXTERN.h"
12	#include "perl.h"	17	#include "perl.h"
13	#include "XSUB.h"	18	#include "XSUB.h"
14		19
15	#ifdef _WIN32	20	#ifdef _WIN32
…		…
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
…		…
56	# define PARACHUTE SDL_INIT_NOPARACHUTE	64	# define PARACHUTE SDL_INIT_NOPARACHUTE
57	#else	65	#else
58	# define PARACHUTE 0	66	# define PARACHUTE 0
59	#endif	67	#endif
60		68
		69	static AV *texture_av;
		70
61	static struct	71	static struct
62	{	72	{
63	#define GL_FUNC(ptr,name) ptr name;	73	#define GL_FUNC(ptr,name) ptr name;
64	#include "glfunc.h"	74	#include "glfunc.h"
65	#undef GL_FUNC	75	#undef GL_FUNC
66	} gl;	76	} gl;
67		77
		78	static void
68	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)	79	gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
69	{	80	{
70	if (gl.BlendFuncSeparate)	81	if (gl.BlendFuncSeparate)
71	gl.BlendFuncSeparate (sa, da, saa, daa);	82	gl.BlendFuncSeparate (sa, da, saa, daa);
72	else if (gl.BlendFuncSeparateEXT)	83	else if (gl.BlendFuncSeparateEXT)
73	gl.BlendFuncSeparateEXT (sa, da, saa, daa);	84	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
74	else	85	else
75	glBlendFunc (sa, da);	86	glBlendFunc (sa, da);
76	}	87	}
77		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
78	#include "texcache.c"	113	#include "texcache.c"
79		114
80	#include "pango-font.c"	115	#include "pango-font.c"
81	#include "pango-fontmap.c"	116	#include "pango-fontmap.c"
82	#include "pango-render.c"	117	#include "pango-render.c"
83		118
		119	typedef IV CFPlus__Channel;
		120	typedef SDL_RWops *CFPlus__RW;
84	typedef Mix_Chunk *CFPlus__MixChunk;	121	typedef Mix_Chunk *CFPlus__MixChunk;
85	typedef Mix_Music *CFPlus__MixMusic;	122	typedef Mix_Music *CFPlus__MixMusic;
86		123
87	typedef PangoFontDescription *CFPlus__Font;	124	typedef PangoFontDescription *CFPlus__Font;
88		125
…		…
163	typedef struct {	200	typedef struct {
164	int name;	201	int name;
165	int w, h;	202	int w, h;
166	float s, t;	203	float s, t;
167	uint8_t r, g, b, a;	204	uint8_t r, g, b, a;
		205	tileid smoothtile;
		206	uint8_t smoothlevel;
168	} maptex;	207	} maptex;
169		208
170	typedef struct {	209	typedef struct {
171	uint32_t player;	210	uint32_t player;
172	tileid tile[3];	211	tileid tile[3];
173	uint16_t darkness;	212	uint16_t darkness;
174	uint8_t stat_width, stat_hp, flags;	213	uint8_t stat_width, stat_hp, flags, smoothmax;
175	} mapcell;	214	} mapcell;
176		215
177	typedef struct {	216	typedef struct {
178	int32_t c0, c1;	217	int32_t c0, c1;
179	mapcell *col;	218	mapcell *col;
…		…
335	cell->player = 0;	374	cell->player = 0;
336	}	375	}
337	}	376	}
338	}	377	}
339		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
340	static void	395	static void
341	music_finished (void)	396	music_finished (void)
342	{	397	{
343	SDL_UserEvent ev;	398	SDL_UserEvent ev;
344		399
…		…
381	}	436	}
382		437
383	/* SDL should provide this, really. */	438	/* SDL should provide this, really. */
384	#define SDLK_MODIFIER_MIN 300	439	#define SDLK_MODIFIER_MIN 300
385	#define SDLK_MODIFIER_MAX 314	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;
		483	}
386		484
387	MODULE = CFPlus PACKAGE = CFPlus	485	MODULE = CFPlus PACKAGE = CFPlus
388		486
389	PROTOTYPES: ENABLE	487	PROTOTYPES: ENABLE
390		488
…		…
537	opengl_fontmap = pango_opengl_font_map_new ();	635	opengl_fontmap = pango_opengl_font_map_new ();
538	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);
539	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);	637	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
540	}	638	}
541		639
		640	char *
		641	SDL_GetError ()
		642
542	int	643	int
543	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)	644	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
544		645
545	void	646	void
546	SDL_Quit ()	647	SDL_Quit ()
547		648
548	void	649	void
549	SDL_ListModes ()	650	SDL_ListModes (int rgb, int alpha)
550	PPCODE:	651	PPCODE:
551	{	652	{
552	SDL_Rect **m;	653	SDL_Rect **m;
553		654
554	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	655	SDL_GL_SetAttribute (SDL_GL_RED_SIZE , rgb);
555	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	656	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb);
556	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	657	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE , rgb);
557	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	658	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, alpha);
558		659
559	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	660	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
560	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	661	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE , 0);
561		662
562	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	663	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE , 0);
563	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	664	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
564	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	665	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
565	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	666	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
566		667
567	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	668	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
568	#if SDL_VERSION_ATLEAST(1,2,10)	669	#if SDL_VERSION_ATLEAST(1,2,10)
569	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);	670	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
570	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);	671	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
571	#endif	672	#endif
572		673
573	SDL_EnableUNICODE (1);
574	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
575
576	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	674	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
577		675
578	if (m && m != (SDL_Rect **)-1)	676	if (m && m != (SDL_Rect **)-1)
579	while (*m)	677	while (*m)
580	{	678	{
		679	if ((*m)->w >= 640 && (*m)->h >= 480)
		680	{
581	AV *av = newAV ();	681	AV *av = newAV ();
582	av_push (av, newSViv ((*m)->w));	682	av_push (av, newSViv ((*m)->w));
583	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));
584	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));	686	XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
		687	}
585		688
586	++m;	689	++m;
587	}	690	}
588	}	691	}
589		692
590	char *
591	SDL_GetError ()
592
593	int	693	int
594	SDL_SetVideoMode (int w, int h, int fullscreen)	694	SDL_SetVideoMode (int w, int h, int rgb, int alpha, int fullscreen)
595	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
596	RETVAL = !!SDL_SetVideoMode (	705	RETVAL = !!SDL_SetVideoMode (
597	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	706	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
598	);	707	);
		708
599	if (RETVAL)	709	if (RETVAL)
600	{	710	{
		711	av_clear (texture_av);
		712
601	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	713	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
602	# 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);
603	# include "glfunc.h"	715	#include "glfunc.h"
604	# undef GL_FUNC	716	#undef GL_FUNC
605	}	717	}
		718	}
606	OUTPUT:	719	OUTPUT:
607	RETVAL	720	RETVAL
608		721
609	void	722	void
610	SDL_GL_SwapBuffers ()	723	SDL_GL_SwapBuffers ()
611		724
612	char *	725	char *
613	SDL_GetKeyName (int sym)	726	SDL_GetKeyName (int sym)
614		727
		728	int
		729	SDL_GetAppState ()
		730
615	void	731	void
616	SDL_PollEvent ()	732	poll_events ()
617	PPCODE:	733	PPCODE:
618	{	734	{
619	SDL_Event ev;	735	SDL_Event ev;
620		736
621	while (SDL_PollEvent (&ev))	737	SDL_PumpEvents ();
		738	while (SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_ALLEVENTS) > 0)
622	{	739	{
623	HV *hv = newHV ();	740	HV *hv = newHV ();
624	hv_store (hv, "type", 4, newSViv (ev.type), 0);	741	hv_store (hv, "type", 4, newSViv (ev.type), 0);
625		742
626	switch (ev.type)	743	switch (ev.type)
…		…
638	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	755	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
639	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	756	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
640	break;	757	break;
641		758
642	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
643	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	778	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
644
645	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	779	hv_store (hv, "state", 5, newSViv (state), 0);
646	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	780	hv_store (hv, "x", 1, newSViv (x), 0);
647	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	781	hv_store (hv, "y", 1, newSViv (y), 0);
648	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	782	hv_store (hv, "xrel", 4, newSViv (xrel), 0);
649	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	783	hv_store (hv, "yrel", 4, newSViv (yrel), 0);
		784	}
650	break;	785	break;
651		786
652	case SDL_MOUSEBUTTONDOWN:	787	case SDL_MOUSEBUTTONDOWN:
653	case SDL_MOUSEBUTTONUP:	788	case SDL_MOUSEBUTTONUP:
654	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);	789	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
…		…
669	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))));
670	}	805	}
671	}	806	}
672		807
673	int	808	int
674	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)
675	POSTCALL:	810	POSTCALL:
676	Mix_HookMusicFinished (music_finished);	811	Mix_HookMusicFinished (music_finished);
677	Mix_ChannelFinished (channel_finished);	812	Mix_ChannelFinished (channel_finished);
678		813
679	void	814	void
680	Mix_CloseAudio ()	815	Mix_CloseAudio ()
681		816
682	int	817	int
683	Mix_AllocateChannels (int numchans = -1)	818	Mix_AllocateChannels (int numchans = -1)
684		819
		820	const char *
		821	Mix_GetError ()
		822
685	void	823	void
686	lowdelay (int fd, int val = 1)	824	lowdelay (int fd, int val = 1)
687	CODE:	825	CODE:
688	#ifndef _WIN32
689	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	826	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, (void *)&val, sizeof (val));
690	#endif
691		827
692	void	828	void
693	win32_proxy_info ()	829	win32_proxy_info ()
694	PPCODE:	830	PPCODE:
695	{	831	{
…		…
732	STRLEN image_len;	868	STRLEN image_len;
733	char *image = (char *)SvPVbyte (image_, image_len);	869	char *image = (char *)SvPVbyte (image_, image_len);
734	SDL_Surface *surface, *surface2;	870	SDL_Surface *surface, *surface2;
735	SDL_PixelFormat fmt;	871	SDL_PixelFormat fmt;
736	SDL_RWops *rw = ix	872	SDL_RWops *rw = ix
737	? SDL_RWFromFile (image, "r")	873	? SDL_RWFromFile (image, "rb")
738	: SDL_RWFromConstMem (image, image_len);	874	: SDL_RWFromConstMem (image, image_len);
739		875
740	if (!rw)	876	if (!rw)
741	croak ("load_image: %s", SDL_GetError ());	877	croak ("load_image: %s", SDL_GetError ());
742		878
…		…
836	ExitThread (retval); // unclean, please beam me up	972	ExitThread (retval); // unclean, please beam me up
837	#else	973	#else
838	_exit (retval);	974	_exit (retval);
839	#endif	975	#endif
840		976
		977	void
		978	debug ()
		979	CODE:
		980	{
		981	#if DEBUG
		982	VALGRIND_DO_LEAK_CHECK;
		983	#endif
		984	}
		985
841	MODULE = CFPlus PACKAGE = CFPlus::Font	986	MODULE = CFPlus PACKAGE = CFPlus::Font
		987
		988	PROTOTYPES: DISABLE
842		989
843	CFPlus::Font	990	CFPlus::Font
844	new_from_file (SV *class, char *path, int id = 0)	991	new_from_file (SV *class, char *path, int id = 0)
845	CODE:	992	CODE:
846	{	993	{
…		…
857	CODE:	1004	CODE:
858	pango_font_description_free (self);	1005	pango_font_description_free (self);
859		1006
860	void	1007	void
861	make_default (CFPlus::Font self)	1008	make_default (CFPlus::Font self)
		1009	PROTOTYPE: $
862	CODE:	1010	CODE:
863	default_font = self;	1011	default_font = self;
864		1012
865	MODULE = CFPlus PACKAGE = CFPlus::Layout	1013	MODULE = CFPlus PACKAGE = CFPlus::Layout
866		1014
		1015	PROTOTYPES: DISABLE
		1016
867	void	1017	void
868	reset_glyph_cache ()	1018	reset_glyph_cache ()
		1019	PROTOTYPE:
869	CODE:	1020	CODE:
870	tc_clear ();	1021	tc_clear ();
871		1022
872	CFPlus::Layout	1023	CFPlus::Layout
873	new (SV *class)	1024	new (SV *class)
…		…
1160	flags	1311	flags
1161	);	1312	);
1162		1313
1163	MODULE = CFPlus PACKAGE = CFPlus::Texture	1314	MODULE = CFPlus PACKAGE = CFPlus::Texture
1164		1315
1165	void	1316	PROTOTYPES: ENABLE
1166	pad2pot (SV *data_, SV *w_, SV *h_)
1167	CODE:
1168	{
1169	int ow = SvIV (w_);
1170	int oh = SvIV (h_);
1171		1317
1172	if (ow && oh)	1318	int minpot (int n)
		1319
		1320	void
		1321	pad (SV *data_, int ow, int oh, int nw, int nh)
		1322	CODE:
		1323	{
		1324	if ((nw != ow || nh != oh) && SvOK (data_))
1173	{	1325	{
1174	int nw = minpot (ow);
1175	int nh = minpot (oh);
1176
1177	if (nw != ow || nh != oh)
1178	{
1179	if (SvOK (data_))
1180	{
1181	STRLEN datalen;	1326	STRLEN datalen;
1182	char *data = SvPVbyte (data_, datalen);	1327	char *data = SvPVbyte (data_, datalen);
1183	int bpp = datalen / (ow * oh);	1328	int bpp = datalen / (ow * oh);
1184	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));	1329	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
1185		1330
1186	SvPOK_only (result_);	1331	SvPOK_only (result_);
1187	SvCUR_set (result_, nw * nh * bpp);	1332	SvCUR_set (result_, nw * nh * bpp);
1188		1333
1189	memset (SvPVX (result_), 0, nw * nh * bpp);	1334	memset (SvPVX (result_), 0, nw * nh * bpp);
1190	while (oh--)	1335	while (oh--)
1191	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);	1336	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
1192		1337
1193	sv_setsv (data_, result_);	1338	sv_setsv (data_, result_);
1194	}
1195
1196	sv_setiv (w_, nw);
1197	sv_setiv (h_, nh);
1198	}
1199	}	1339	}
1200	}	1340	}
1201		1341
1202	void	1342	void
1203	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)	1343	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
…		…
1246	glDisable (GL_ALPHA_TEST);	1386	glDisable (GL_ALPHA_TEST);
1247	glDisable (GL_BLEND);	1387	glDisable (GL_BLEND);
1248	}	1388	}
1249	}	1389	}
1250		1390
		1391	IV texture_valid_2d (GLint internalformat, GLsizei w, GLsizei h, GLenum format, GLenum type)
		1392	CODE:
		1393	{
		1394	GLint width;
		1395	glTexImage2D (GL_PROXY_TEXTURE_2D, 0, internalformat, w, h, 0, format, type, 0);
		1396	glGetTexLevelParameteriv (GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width);
		1397	RETVAL = width > 0;
		1398	}
		1399	OUTPUT:
		1400	RETVAL
		1401
1251	MODULE = CFPlus PACKAGE = CFPlus::Map	1402	MODULE = CFPlus PACKAGE = CFPlus::Map
		1403
		1404	PROTOTYPES: DISABLE
1252		1405
1253	CFPlus::Map	1406	CFPlus::Map
1254	new (SV *class)	1407	new (SV *class)
1255	CODE:	1408	CODE:
1256	New (0, RETVAL, 1, struct map);	1409	New (0, RETVAL, 1, struct map);
…		…
1292	set_tileid (CFPlus::Map self, int face, int tile)	1445	set_tileid (CFPlus::Map self, int face, int tile)
1293	CODE:	1446	CODE:
1294	{	1447	{
1295	need_facenum (self, face); self->face2tile [face] = tile;	1448	need_facenum (self, face); self->face2tile [face] = tile;
1296	need_texid (self, tile);	1449	need_texid (self, tile);
		1450	}
		1451
		1452	void
		1453	set_smooth (CFPlus::Map self, int face, int smooth, int level)
		1454	CODE:
		1455	{
		1456	tileid texid;
		1457	maptex *tex;
		1458
		1459	if (face < 0 || face >= self->faces)
		1460	return;
		1461
		1462	if (smooth < 0 || smooth >= self->faces)
		1463	return;
		1464
		1465	texid = self->face2tile [face];
		1466
		1467	if (!texid)
		1468	return;
		1469
		1470	tex = self->tex + texid;
		1471	tex->smoothtile = self->face2tile [smooth];
		1472	tex->smoothlevel = level;
1297	}	1473	}
1298		1474
1299	void	1475	void
1300	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)	1476	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)
1301	CODE:	1477	CODE:
…		…
1352	CODE:	1528	CODE:
1353	{	1529	{
1354	if (dx > 0)	1530	if (dx > 0)
1355	map_blank (self, self->x, self->y, dx, self->h);	1531	map_blank (self, self->x, self->y, dx, self->h);
1356	else if (dx < 0)	1532	else if (dx < 0)
1357	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);	1533	map_blank (self, self->x + self->w + dx, self->y, -dx, self->h);
1358		1534
1359	if (dy > 0)	1535	if (dy > 0)
1360	map_blank (self, self->x, self->y, self->w, dy);	1536	map_blank (self, self->x, self->y, self->w, dy);
1361	else if (dy < 0)	1537	else if (dy < 0)
1362	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);	1538	map_blank (self, self->x, self->y + self->h + dy, self->w, -dy);
1363		1539
1364	self->ox += dx; self->x += dx;	1540	self->ox += dx; self->x += dx;
1365	self->oy += dy; self->y += dy;	1541	self->oy += dy; self->y += dy;
1366		1542
1367	while (self->y < 0)	1543	while (self->y < 0)
…		…
1421	}	1597	}
1422	else if (cmd == 6) // monster width	1598	else if (cmd == 6) // monster width
1423	cell->stat_width = *data++ + 1;	1599	cell->stat_width = *data++ + 1;
1424	else if (cmd == 0x47)	1600	else if (cmd == 0x47)
1425	{	1601	{
1426	if (*data == 8)	1602	if (*data == 4)
1427	; // decode player uuid	1603	; // decode player count
1428		1604
1429	data += *data + 1;	1605	data += *data + 1;
1430	}	1606	}
1431	else if (cmd == 8) // cell flags	1607	else if (cmd == 8) // cell flags
1432	cell->flags = *data++;	1608	cell->flags = *data++;
…		…
1524		1700
1525	void	1701	void
1526	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)	1702	draw (CFPlus::Map self, int mx, int my, int sw, int sh, int T)
1527	CODE:	1703	CODE:
1528	{	1704	{
		1705	HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
		1706	uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
		1707	static uint8_t smooth_max[256][256]; // egad, fats and wasteful on memory (64k)
		1708	smooth_key skey;
1529	int x, y, z;	1709	int x, y, z;
1530	int last_name;	1710	int last_name;
		1711
		1712	// thats current max. sorry.
		1713	if (sw > 255) sw = 255;
		1714	if (sh > 255) sh = 255;
		1715
		1716	// clear key, in case of extra padding
		1717	memset (&skey, 0, sizeof (skey));
1531		1718
1532	glColor4ub (255, 255, 255, 255);	1719	glColor4ub (255, 255, 255, 255);
1533		1720
1534	glEnable (GL_BLEND);	1721	glEnable (GL_BLEND);
1535	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1722	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
…		…
1541	last_name = 0;	1728	last_name = 0;
1542		1729
1543	mx += self->x;	1730	mx += self->x;
1544	my += self->y;	1731	my += self->y;
1545		1732
		1733	// first pass: determine smooth_max
		1734	// rather ugly, if you ask me
		1735	// could also be stored inside mapcell and updated on change
		1736	memset (smooth_max, 0, sizeof (smooth_max));
		1737
		1738	for (y = 0; y < sh; y++)
		1739	if (0 <= y + my && y + my < self->rows)
		1740	{
		1741	maprow *row = self->row + (y + my);
		1742
		1743	for (x = 0; x < sw; x++)
		1744	if (row->c0 <= x + mx && x + mx < row->c1)
		1745	{
		1746	mapcell *cell = row->col + (x + mx - row->c0);
		1747
		1748	smooth_max[x + 1][y + 1] =
		1749	MAX (self->tex [cell->tile [0]].smoothlevel,
		1750	MAX (self->tex [cell->tile [1]].smoothlevel,
		1751	self->tex [cell->tile [2]].smoothlevel));
		1752	}
		1753	}
		1754
1546	for (z = 0; z < 3; z++)	1755	for (z = 0; z <= 2; z++)
		1756	{
		1757	memset (smooth_level, 0, sizeof (smooth_level));
		1758
1547	for (y = 0; y < sh; y++)	1759	for (y = 0; y < sh; y++)
1548	if (0 <= y + my && y + my < self->rows)	1760	if (0 <= y + my && y + my < self->rows)
1549	{	1761	{
1550	maprow *row = self->row + (y + my);	1762	maprow *row = self->row + (y + my);
1551		1763
1552	for (x = 0; x < sw; x++)	1764	for (x = 0; x < sw; x++)
1553	if (row->c0 <= x + mx && x + mx < row->c1)	1765	if (row->c0 <= x + mx && x + mx < row->c1)
1554	{	1766	{
1555	mapcell *cell = row->col + (x + mx - row->c0);	1767	mapcell *cell = row->col + (x + mx - row->c0);
1556	tileid tile = cell->tile [z];	1768	tileid tile = cell->tile [z];
		1769
		1770	if (tile)
		1771	{
		1772	maptex tex = self->tex [tile];
		1773	int px = (x + 1) * T - tex.w;
		1774	int py = (y + 1) * T - tex.h;
		1775
		1776	// suppressing texture state switches here
		1777	// is only moderately effective, but worth the extra effort
		1778	if (last_name != tex.name)
		1779	{
		1780	if (!tex.name)
		1781	tex = self->tex [2]; /* missing, replace by noface */
		1782
		1783	glEnd ();
		1784	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1785	glBegin (GL_QUADS);
		1786	}
		1787
		1788	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1789	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1790	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1791	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1792
		1793	if (cell->flags && z == 2)
		1794	{
		1795	if (cell->flags & 1)
		1796	{
		1797	maptex tex = self->tex [1];
		1798	int px = x * T + T * 2 / 32;
		1799	int py = y * T - T * 6 / 32;
		1800
		1801	glEnd ();
		1802	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1803	glBegin (GL_QUADS);
		1804
		1805	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1806	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);
		1807	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);
		1808	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );
		1809	}
		1810	}
		1811
		1812	// update smooth hash
		1813	if (tex.smoothtile)
		1814	{
		1815	skey.tile = tex.smoothtile;
		1816	skey.level = tex.smoothlevel;
		1817
		1818	smooth_level [tex.smoothlevel >> 5] |= ((uint32_t)1) << (tex.smoothlevel & 31);
		1819
		1820	// add bits to current tile and all neighbours. skey.x|y is
		1821	// shifted +1|+1 so we always stay positive.
		1822
		1823	// bits is ___n cccc CCCC bbbb
		1824	// n do not draw borders&corners
		1825	// c draw these corners, but...
		1826	// C ... not these
		1827	// b draw these borders
		1828
		1829	// borders: 1 ┃· 2 ━━ 4 ·┃ 8 ··
		1830	// ┃· ·· ·┃ ━━
		1831
		1832	// corners: 1 ┛· 2 ·┗ 4 ·· 8 ··
		1833	// ·· ·· ·┏ ┓·
		1834
		1835	// full tile
		1836	skey.x = x + 1; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x1000);
		1837
		1838	// borders
		1839	skey.x = x + 2; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0091);
		1840	skey.x = x + 1; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0032);
		1841	skey.x = x ; skey.y = y + 1; smooth_or_bits (smooth, &skey, 0x0064);
		1842	skey.x = x + 1; skey.y = y ; smooth_or_bits (smooth, &skey, 0x00c8);
		1843
		1844	// corners
		1845	skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
		1846	skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
		1847	skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
		1848	skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
		1849	}
		1850	}
1557		1851	}
		1852	}
		1853
		1854	// go through all smoothlevels, lowest to highest, then draw.
		1855	// this is basically counting sort
		1856	{
		1857	int w, b;
		1858
		1859	for (w = 0; w < 256 / 32; ++w)
		1860	{
		1861	uint32_t smask = smooth_level [w];
1558	if (tile)	1862	if (smask)
		1863	for (b = 0; b < 32; ++b)
		1864	if (smask & (((uint32_t)1) << b))
1559	{	1865	{
1560	maptex tex = self->tex [tile];	1866	int level = (w << 5) | b;
1561	int px = (x + 1) * T - tex.w;	1867	HE *he;
1562	int py = (y + 1) * T - tex.h;
1563		1868
1564	if (last_name != tex.name)	1869	hv_iterinit (smooth);
		1870	while ((he = hv_iternext (smooth)))
1565	{	1871	{
		1872	smooth_key *skey = (smooth_key *)HeKEY (he);
		1873	IV bits = SvIVX (HeVAL (he));
		1874
1566	if (!tex.name)	1875	if (!(bits & 0x1000)
1567	tex = self->tex [2]; /* missing, replace by noface */	1876	&& skey->level == level
1568		1877	&& level > smooth_max [skey->x][skey->y])
1569	glEnd ();
1570	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1571	glBegin (GL_QUADS);
1572	}
1573
1574	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1575	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1576	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1577	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1578
1579	if (cell->flags && z == 2)
1580	{
1581	if (cell->flags & 1)
1582	{	1878	{
1583	maptex tex = self->tex [1];	1879	maptex tex = self->tex [skey->tile];
1584	int px = x * T + T * 2 / 32;	1880	int px = (((int)skey->x) - 1) * T;
1585	int py = y * T - T * 6 / 32;	1881	int py = (((int)skey->y) - 1) * T;
		1882	int border = bits & 15;
		1883	int corner = (bits >> 8) & ~(bits >> 4) & 15;
		1884	float dx = tex.s * .0625f; // 16 images/row
		1885	float dy = tex.t * .5f ; // 2 images/column
1586		1886
		1887	// this time naively avoiding texture state changes
		1888	// save gobs of state changes.
		1889	if (last_name != tex.name)
		1890	{
		1891	if (!tex.name)
		1892	continue; // smoothing not yet available
		1893
1587	glEnd ();	1894	glEnd ();
1588	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);	1895	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1589	glBegin (GL_QUADS);	1896	glBegin (GL_QUADS);
		1897	}
1590		1898
		1899	if (border)
		1900	{
		1901	float ox = border * dx;
		1902
		1903	glTexCoord2f (ox , 0.f ); glVertex2f (px , py );
		1904	glTexCoord2f (ox , dy ); glVertex2f (px , py + T);
		1905	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py + T);
		1906	glTexCoord2f (ox + dx, 0.f ); glVertex2f (px + T, py );
		1907	}
		1908
		1909	if (corner)
		1910	{
		1911	float ox = corner * dx;
		1912
1591	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1913	glTexCoord2f (ox , dy ); glVertex2f (px , py );
1592	glTexCoord2f (0 , tex.t); glVertex2f (px , py + T);	1914	glTexCoord2f (ox , dy * 2.f); glVertex2f (px , py + T);
1593	glTexCoord2f (tex.s, tex.t); glVertex2f (px + T, py + T);	1915	glTexCoord2f (ox + dx, dy * 2.f); glVertex2f (px + T, py + T);
1594	glTexCoord2f (tex.s, 0 ); glVertex2f (px + T, py );	1916	glTexCoord2f (ox + dx, dy ); glVertex2f (px + T, py );
		1917	}
1595	}	1918	}
1596	}	1919	}
1597	}	1920	}
1598	}
1599	}	1921	}
		1922	}
		1923
		1924	hv_clear (smooth);
		1925	}
1600		1926
1601	glEnd ();	1927	glEnd ();
1602		1928
1603	glDisable (GL_TEXTURE_2D);	1929	glDisable (GL_TEXTURE_2D);
1604	glDisable (GL_BLEND);	1930	glDisable (GL_BLEND);
…		…
1698	void	2024	void
1699	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)	2025	fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1700	PPCODE:	2026	PPCODE:
1701	{	2027	{
1702	int x, y;	2028	int x, y;
		2029	int sw1 = sw + 2;
		2030	int sh1 = sh + 2;
		2031	int sh3 = sh * 3;
1703	int sw4 = (sw + 3) & ~3;	2032	int sw34 = (sw * 3 + 3) & ~3;
		2033	uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
1704	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));	2034	SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3));
1705	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);	2035	uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
1706		2036
1707	memset (darkness, 255, sw4 * sh);
1708	SvPOK_only (darkness_sv);	2037	SvPOK_only (darkness3_sv);
1709	SvCUR_set (darkness_sv, sw4 * sh);	2038	SvCUR_set (darkness3_sv, sw34 * sh3);
1710		2039
1711	mx += self->x;	2040	mx += self->x - 1;
1712	my += self->y;	2041	my += self->y - 1;
1713		2042
		2043	memset (darkness1, 255, sw1 * sh1);
		2044
1714	for (y = 0; y < sh; y++)	2045	for (y = 0; y < sh1; y++)
1715	if (0 <= y + my && y + my < self->rows)	2046	if (0 <= y + my && y + my < self->rows)
1716	{	2047	{
1717	maprow *row = self->row + (y + my);	2048	maprow *row = self->row + (y + my);
1718		2049
1719	for (x = 0; x < sw; x++)	2050	for (x = 0; x < sw1; x++)
1720	if (row->c0 <= x + mx && x + mx < row->c1)	2051	if (row->c0 <= x + mx && x + mx < row->c1)
1721	{	2052	{
1722	mapcell *cell = row->col + (x + mx - row->c0);	2053	mapcell *cell = row->col + (x + mx - row->c0);
1723		2054
1724	darkness[y * sw4 + x] = cell->darkness	2055	darkness1 [y * sw1 + x] = cell->darkness
1725	? 255 - (cell->darkness - 1)	2056	? 255 - (cell->darkness - 1)
1726	: 255 - FOW_DARKNESS;	2057	: 255 - FOW_DARKNESS;
1727	}	2058	}
1728	}	2059	}
1729		2060
		2061	for (y = 0; y < sh; ++y)
		2062	for (x = 0; x < sw; ++x)
		2063	{
		2064	uint8_t d11 = darkness1 [(y ) * sw1 + x ];
		2065	uint8_t d21 = darkness1 [(y ) * sw1 + x + 1];
		2066	uint8_t d31 = darkness1 [(y ) * sw1 + x + 2];
		2067	uint8_t d12 = darkness1 [(y + 1) * sw1 + x ];
		2068	uint8_t d22 = darkness1 [(y + 1) * sw1 + x + 1];
		2069	uint8_t d32 = darkness1 [(y + 1) * sw1 + x + 2];
		2070	uint8_t d13 = darkness1 [(y + 2) * sw1 + x ];
		2071	uint8_t d23 = darkness1 [(y + 2) * sw1 + x + 1];
		2072	uint8_t d33 = darkness1 [(y + 2) * sw1 + x + 2];
		2073
		2074	uint8_t r11 = (d11 + d21 + d12) / 3;
		2075	uint8_t r21 = d21;
		2076	uint8_t r31 = (d21 + d31 + d32) / 3;
		2077
		2078	uint8_t r12 = d12;
		2079	uint8_t r22 = d22;
		2080	uint8_t r32 = d32;
		2081
		2082	uint8_t r13 = (d13 + d23 + d12) / 3;
		2083	uint8_t r23 = d23;
		2084	uint8_t r33 = (d23 + d33 + d32) / 3;
		2085
		2086	darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11);
		2087	darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21);
		2088	darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31);
		2089	darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12);
		2090	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22);
		2091	darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32);
		2092	darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13);
		2093	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23);
		2094	darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33);
		2095	}
		2096
		2097	free (darkness1);
		2098
1730	EXTEND (SP, 3);	2099	EXTEND (SP, 3);
1731	PUSHs (sv_2mortal (newSViv (sw4)));	2100	PUSHs (sv_2mortal (newSViv (sw34)));
1732	PUSHs (sv_2mortal (newSViv (sh)));	2101	PUSHs (sv_2mortal (newSViv (sh3)));
1733	PUSHs (darkness_sv);	2102	PUSHs (darkness3_sv);
1734	}	2103	}
1735		2104
1736	SV *	2105	SV *
1737	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)	2106	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1738	CODE:	2107	CODE:
…		…
1856		2225
1857	for (z = 0; z <= 2; z++)	2226	for (z = 0; z <= 2; z++)
1858	{	2227	{
1859	tileid t = tile [z];	2228	tileid t = tile [z];
1860		2229
1861	if (t >= self->texs || !self->tex [t].name)	2230	if (t >= self->texs || (t && !self->tex [t].name))
1862	{	2231	{
1863	XPUSHs (sv_2mortal (newSViv (t)));	2232	XPUSHs (sv_2mortal (newSViv (t)));
1864	need_texid (self, t);	2233	need_texid (self, t);
1865	}	2234	}
1866		2235
…		…
1870	}	2239	}
1871	}	2240	}
1872	}	2241	}
1873	}	2242	}
1874		2243
		2244	MODULE = CFPlus PACKAGE = CFPlus::RW
		2245
		2246	CFPlus::RW
		2247	new (SV *class, SV *data_sv)
		2248	CODE:
		2249	{
		2250	STRLEN datalen;
		2251	char *data = SvPVbyte (data_sv, datalen);
		2252
		2253	RETVAL = SDL_RWFromConstMem (data, datalen);
		2254	}
		2255	OUTPUT:
		2256	RETVAL
		2257
		2258	CFPlus::RW
		2259	new_from_file (SV *class, const char *path, const char *mode = "rb")
		2260	CODE:
		2261	RETVAL = SDL_RWFromFile (path, mode);
		2262	OUTPUT:
		2263	RETVAL
		2264
		2265	void
		2266	close (CFPlus::RW self)
		2267	CODE:
		2268	SDL_RWclose (self);
		2269
		2270	MODULE = CFPlus PACKAGE = CFPlus::Channel
		2271
		2272	PROTOTYPES: DISABLE
		2273
		2274	void
		2275	halt (CFPlus::Channel self)
		2276	CODE:
		2277	Mix_HaltChannel (self);
		2278
		2279	void
		2280	expire (CFPlus::Channel self, int ticks = -1)
		2281	CODE:
		2282	Mix_ExpireChannel (self, ticks);
		2283
		2284	void
		2285	fade_out (CFPlus::Channel self, int ticks = -1)
		2286	CODE:
		2287	Mix_FadeOutChannel (self, ticks);
		2288
		2289	int
		2290	volume (CFPlus::Channel self, int volume)
		2291	CODE:
		2292	RETVAL = Mix_Volume (self, volume);
		2293	OUTPUT:
		2294	RETVAL
		2295
		2296	void
		2297	unregister_all_effects (CFPlus::Channel self)
		2298	CODE:
		2299	Mix_UnregisterAllEffects (self);
		2300
		2301	void
		2302	set_panning (CFPlus::Channel self, int left, int right)
		2303	CODE:
		2304	Mix_SetPanning (self, left, right);
		2305
		2306	void
		2307	set_distance (CFPlus::Channel self, int distance)
		2308	CODE:
		2309	Mix_SetDistance (self, distance);
		2310
		2311	void
		2312	set_position (CFPlus::Channel self, int angle, int distance)
		2313	CODE:
		2314	Mix_SetPosition (self, angle, distance);
		2315
		2316	void
		2317	set_reverse_stereo (CFPlus::Channel self, int flip)
		2318	CODE:
		2319	Mix_SetReverseStereo (self, flip);
		2320
1875	MODULE = CFPlus PACKAGE = CFPlus::MixChunk	2321	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1876		2322
		2323	PROTOTYPES: DISABLE
		2324
1877	CFPlus::MixChunk	2325	CFPlus::MixChunk
1878	new_from_file (SV *class, char *path)	2326	new (SV *class, CFPlus::RW rwops)
1879	CODE:	2327	CODE:
1880	RETVAL = Mix_LoadWAV (path);	2328	RETVAL = Mix_LoadWAV_RW (rwops, 1);
1881	OUTPUT:	2329	OUTPUT:
1882	RETVAL	2330	RETVAL
1883		2331
1884	void	2332	void
1885	DESTROY (CFPlus::MixChunk self)	2333	DESTROY (CFPlus::MixChunk self)
…		…
1891	CODE:	2339	CODE:
1892	RETVAL = Mix_VolumeChunk (self, volume);	2340	RETVAL = Mix_VolumeChunk (self, volume);
1893	OUTPUT:	2341	OUTPUT:
1894	RETVAL	2342	RETVAL
1895		2343
1896	int	2344	CFPlus::Channel
1897	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	2345	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1898	CODE:	2346	CODE:
1899	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	2347	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
		2348	Mix_UnregisterAllEffects (RETVAL);
1900	OUTPUT:	2349	OUTPUT:
1901	RETVAL	2350	RETVAL
1902		2351
1903	MODULE = CFPlus PACKAGE = CFPlus::MixMusic	2352	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1904		2353
1905	int	2354	int
1906	volume (int volume = -1)	2355	volume (int volume = -1)
		2356	PROTOTYPE: ;$
1907	CODE:	2357	CODE:
1908	RETVAL = Mix_VolumeMusic (volume);	2358	RETVAL = Mix_VolumeMusic (volume);
1909	OUTPUT:	2359	OUTPUT:
1910	RETVAL	2360	RETVAL
1911		2361
		2362	void
		2363	fade_out (int ms)
		2364	CODE:
		2365	Mix_FadeOutMusic (ms);
		2366
		2367	void
		2368	halt ()
		2369	CODE:
		2370	Mix_HaltMusic ();
		2371
1912	CFPlus::MixMusic	2372	CFPlus::MixMusic
1913	new_from_file (SV *class, char *path)	2373	new (SV *class, CFPlus::RW rwops)
1914	CODE:	2374	CODE:
1915	RETVAL = Mix_LoadMUS (path);	2375	RETVAL = Mix_LoadMUS_RW (rwops);
1916	OUTPUT:	2376	OUTPUT:
1917	RETVAL	2377	RETVAL
1918		2378
1919	void	2379	void
1920	DESTROY (CFPlus::MixMusic self)	2380	DESTROY (CFPlus::MixMusic self)
…		…
1926	CODE:	2386	CODE:
1927	RETVAL = Mix_PlayMusic (self, loops);	2387	RETVAL = Mix_PlayMusic (self, loops);
1928	OUTPUT:	2388	OUTPUT:
1929	RETVAL	2389	RETVAL
1930		2390
		2391	void
		2392	fade_in_pos (CFPlus::MixMusic self, int loops, int ms, double position)
		2393	CODE:
		2394	Mix_FadeInMusicPos (self, loops, ms, position);
		2395
1931	MODULE = CFPlus PACKAGE = CFPlus::OpenGL	2396	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		2397
		2398	PROTOTYPES: ENABLE
1932		2399
1933	BOOT:	2400	BOOT:
1934	{	2401	{
1935	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);	2402	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1936	static const struct {	2403	static const struct {
1937	const char *name;	2404	const char *name;
1938	IV iv;	2405	IV iv;
1939	} *civ, const_iv[] = {	2406	} *civ, const_iv[] = {
1940	# define const_iv(name) { # name, (IV)name }	2407	# define const_iv(name) { # name, (IV)name }
		2408	const_iv (GL_VENDOR),
		2409	const_iv (GL_VERSION),
		2410	const_iv (GL_EXTENSIONS),
1941	const_iv (GL_COLOR_MATERIAL),	2411	const_iv (GL_COLOR_MATERIAL),
1942	const_iv (GL_SMOOTH),	2412	const_iv (GL_SMOOTH),
1943	const_iv (GL_FLAT),	2413	const_iv (GL_FLAT),
1944	const_iv (GL_DITHER),	2414	const_iv (GL_DITHER),
1945	const_iv (GL_BLEND),	2415	const_iv (GL_BLEND),
…		…
1949	const_iv (GL_ALPHA_TEST),	2419	const_iv (GL_ALPHA_TEST),
1950	const_iv (GL_NORMALIZE),	2420	const_iv (GL_NORMALIZE),
1951	const_iv (GL_RESCALE_NORMAL),	2421	const_iv (GL_RESCALE_NORMAL),
1952	const_iv (GL_FRONT),	2422	const_iv (GL_FRONT),
1953	const_iv (GL_BACK),	2423	const_iv (GL_BACK),
		2424	const_iv (GL_AUX0),
1954	const_iv (GL_AND),	2425	const_iv (GL_AND),
1955	const_iv (GL_ONE),	2426	const_iv (GL_ONE),
1956	const_iv (GL_ZERO),	2427	const_iv (GL_ZERO),
1957	const_iv (GL_SRC_ALPHA),	2428	const_iv (GL_SRC_ALPHA),
1958	const_iv (GL_DST_ALPHA),	2429	const_iv (GL_DST_ALPHA),
…		…
1972	const_iv (GL_LUMINANCE),	2443	const_iv (GL_LUMINANCE),
1973	const_iv (GL_LUMINANCE_ALPHA),	2444	const_iv (GL_LUMINANCE_ALPHA),
1974	const_iv (GL_FLOAT),	2445	const_iv (GL_FLOAT),
1975	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	2446	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1976	const_iv (GL_COMPILE),	2447	const_iv (GL_COMPILE),
		2448	const_iv (GL_PROXY_TEXTURE_1D),
		2449	const_iv (GL_PROXY_TEXTURE_2D),
1977	const_iv (GL_TEXTURE_1D),	2450	const_iv (GL_TEXTURE_1D),
1978	const_iv (GL_TEXTURE_2D),	2451	const_iv (GL_TEXTURE_2D),
1979	const_iv (GL_TEXTURE_ENV),	2452	const_iv (GL_TEXTURE_ENV),
1980	const_iv (GL_TEXTURE_MAG_FILTER),	2453	const_iv (GL_TEXTURE_MAG_FILTER),
1981	const_iv (GL_TEXTURE_MIN_FILTER),	2454	const_iv (GL_TEXTURE_MIN_FILTER),
…		…
2002	const_iv (GL_COLOR_LOGIC_OP),	2475	const_iv (GL_COLOR_LOGIC_OP),
2003	const_iv (GL_SEPARABLE_2D),	2476	const_iv (GL_SEPARABLE_2D),
2004	const_iv (GL_CONVOLUTION_2D),	2477	const_iv (GL_CONVOLUTION_2D),
2005	const_iv (GL_CONVOLUTION_BORDER_MODE),	2478	const_iv (GL_CONVOLUTION_BORDER_MODE),
2006	const_iv (GL_CONSTANT_BORDER),	2479	const_iv (GL_CONSTANT_BORDER),
		2480	const_iv (GL_POINTS),
2007	const_iv (GL_LINES),	2481	const_iv (GL_LINES),
2008	const_iv (GL_LINE_STRIP),	2482	const_iv (GL_LINE_STRIP),
2009	const_iv (GL_LINE_LOOP),	2483	const_iv (GL_LINE_LOOP),
2010	const_iv (GL_QUADS),	2484	const_iv (GL_QUADS),
2011	const_iv (GL_QUAD_STRIP),	2485	const_iv (GL_QUAD_STRIP),
2012	const_iv (GL_TRIANGLES),	2486	const_iv (GL_TRIANGLES),
2013	const_iv (GL_TRIANGLE_STRIP),	2487	const_iv (GL_TRIANGLE_STRIP),
2014	const_iv (GL_TRIANGLE_FAN),	2488	const_iv (GL_TRIANGLE_FAN),
		2489	const_iv (GL_POLYGON),
2015	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	2490	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		2491	const_iv (GL_POINT_SMOOTH_HINT),
		2492	const_iv (GL_LINE_SMOOTH_HINT),
		2493	const_iv (GL_POLYGON_SMOOTH_HINT),
		2494	const_iv (GL_GENERATE_MIPMAP_HINT),
2016	const_iv (GL_FASTEST),	2495	const_iv (GL_FASTEST),
		2496	const_iv (GL_DONT_CARE),
		2497	const_iv (GL_NICEST),
2017	const_iv (GL_V2F),	2498	const_iv (GL_V2F),
2018	const_iv (GL_V3F),	2499	const_iv (GL_V3F),
2019	const_iv (GL_T2F_V3F),	2500	const_iv (GL_T2F_V3F),
2020	const_iv (GL_T2F_N3F_V3F),	2501	const_iv (GL_T2F_N3F_V3F),
2021	# undef const_iv	2502	# undef const_iv
2022	};	2503	};
2023		2504
2024	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	2505	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2025	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	2506	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		2507
		2508	texture_av = newAV ();
		2509	AvREAL_off (texture_av);
2026	}	2510	}
2027		2511
2028	char *	2512	char *
2029	gl_vendor ()	2513	gl_vendor ()
2030	CODE:	2514	CODE:
…		…
2044	CODE:	2528	CODE:
2045	RETVAL = (char *)glGetString (GL_EXTENSIONS);	2529	RETVAL = (char *)glGetString (GL_EXTENSIONS);
2046	OUTPUT:	2530	OUTPUT:
2047	RETVAL	2531	RETVAL
2048		2532
		2533	const char *glGetString (GLenum pname)
		2534
		2535	GLint glGetInteger (GLenum pname)
		2536	CODE:
		2537	glGetIntegerv (pname, &RETVAL);
		2538	OUTPUT:
		2539	RETVAL
		2540
		2541	GLdouble glGetDouble (GLenum pname)
		2542	CODE:
		2543	glGetDoublev (pname, &RETVAL);
		2544	OUTPUT:
		2545	RETVAL
		2546
2049	int glGetError ()	2547	int glGetError ()
2050		2548
2051	void glFinish ()	2549	void glFinish ()
2052		2550
2053	void glClear (int mask)	2551	void glClear (int mask)
…		…
2090	# near_ and far_ are due to microsofts buggy "c" compiler	2588	# near_ and far_ are due to microsofts buggy "c" compiler
2091	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2589	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
2092		2590
2093	# near_ and far_ are due to microsofts buggy "c" compiler	2591	# near_ and far_ are due to microsofts buggy "c" compiler
2094	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2592	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
		2593
		2594	PROTOTYPES: DISABLE
2095		2595
2096	void glViewport (int x, int y, int width, int height)	2596	void glViewport (int x, int y, int width, int height)
2097		2597
2098	void glScissor (int x, int y, int width, int height)	2598	void glScissor (int x, int y, int width, int height)
2099		2599
…		…
2107		2607
2108	void glRotate (float angle, float x, float y, float z)	2608	void glRotate (float angle, float x, float y, float z)
2109	CODE:	2609	CODE:
2110	glRotatef (angle, x, y, z);	2610	glRotatef (angle, x, y, z);
2111		2611
2112	void glBegin (int mode)
2113
2114	void glEnd ()
2115
2116	void glColor (float r, float g, float b, float a = 1.0)	2612	void glColor (float r, float g, float b, float a = 1.0)
2117	PROTOTYPE: @
2118	ALIAS:	2613	ALIAS:
2119	glColor_premultiply = 1	2614	glColor_premultiply = 1
2120	CODE:	2615	CODE:
2121	if (ix)	2616	if (ix)
2122	{	2617	{
…		…
2125	b *= a;	2620	b *= a;
2126	}	2621	}
2127	// microsoft visual "c" rounds instead of truncating...	2622	// microsoft visual "c" rounds instead of truncating...
2128	glColor4f (r, g, b, a);	2623	glColor4f (r, g, b, a);
2129		2624
2130	void glInterleavedArrays (int format, int stride, char *data)
2131
2132	void glDrawElements (int mode, int count, int type, char *indices)
2133
2134	# 1.2 void glDrawRangeElements (int mode, int start, int end
2135
2136	void glRasterPos (float x, float y, float z = 0.)	2625	void glRasterPos (float x, float y, float z = 0.)
2137	CODE:	2626	CODE:
2138	glRasterPos3f (0, 0, z);	2627	glRasterPos3f (0, 0, z);
2139	glBitmap (0, 0, 0, 0, x, y, 0);	2628	glBitmap (0, 0, 0, 0, x, y, 0);
2140		2629
…		…
2144		2633
2145	void glTexCoord (float s, float t)	2634	void glTexCoord (float s, float t)
2146	CODE:	2635	CODE:
2147	glTexCoord2f (s, t);	2636	glTexCoord2f (s, t);
2148		2637
		2638	void glRect (float x1, float y1, float x2, float y2)
		2639	CODE:
		2640	glRectf (x1, y1, x2, y2);
		2641
		2642	PROTOTYPES: ENABLE
		2643
		2644	void glBegin (int mode)
		2645
		2646	void glEnd ()
		2647
		2648	void glPointSize (GLfloat size)
		2649
		2650	void glLineWidth (GLfloat width)
		2651
		2652	void glInterleavedArrays (int format, int stride, char *data)
		2653
		2654	void glDrawElements (int mode, int count, int type, char *indices)
		2655
		2656	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2657
2149	void glTexEnv (int target, int pname, float param)	2658	void glTexEnv (int target, int pname, float param)
2150	CODE:	2659	CODE:
2151	glTexEnvf (target, pname, param);	2660	glTexEnvf (target, pname, param);
2152		2661
2153	void glTexParameter (int target, int pname, float param)	2662	void glTexParameter (int target, int pname, float param)
…		…
2175		2684
2176	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2685	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2177		2686
2178	void glDrawPixels (int width, int height, int format, int type, char *pixels)	2687	void glDrawPixels (int width, int height, int format, int type, char *pixels)
2179		2688
		2689	void glPixelZoom (float x, float y)
		2690
2180	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2691	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
2181		2692
2182	int glGenTexture ()	2693	int glGenTexture ()
2183	CODE:	2694	CODE:
2184	{	2695	RETVAL = gen_texture ();
2185	GLuint name;
2186	glGenTextures (1, &name);
2187	RETVAL = name;
2188	}
2189	OUTPUT:	2696	OUTPUT:
2190	RETVAL	2697	RETVAL
2191		2698
2192	void glDeleteTexture (int name)	2699	void glDeleteTexture (int name)
2193	CODE:	2700	CODE:
2194	{
2195	GLuint name_ = name;
2196	glDeleteTextures (1, &name_);	2701	del_texture (name);
2197	}	2702
2198
2199	int glGenList ()	2703	int glGenList ()
2200	CODE:	2704	CODE:
2201	RETVAL = glGenLists (1);	2705	RETVAL = glGenLists (1);
2202	OUTPUT:	2706	OUTPUT:
2203	RETVAL	2707	RETVAL
…		…
2210		2714
2211	void glEndList ()	2715	void glEndList ()
2212		2716
2213	void glCallList (int list)	2717	void glCallList (int list)
2214		2718
		2719	MODULE = CFPlus PACKAGE = CFPlus::UI::Base
		2720
		2721	PROTOTYPES: DISABLE
		2722
		2723	void
		2724	find_widget (SV *self, NV x, NV y)
		2725	PPCODE:
		2726	{
		2727	if (within_widget (self, x, y))
		2728	XPUSHs (self);
		2729	}
		2730
		2731	BOOT:
		2732	{
		2733	hover_gv = gv_fetchpv ("CFPlus::UI::HOVER", 1, SVt_NV);
		2734
		2735	draw_x_gv = gv_fetchpv ("CFPlus::UI::Base::draw_x", 1, SVt_NV);
		2736	draw_y_gv = gv_fetchpv ("CFPlus::UI::Base::draw_y", 1, SVt_NV);
		2737	draw_w_gv = gv_fetchpv ("CFPlus::UI::Base::draw_w", 1, SVt_NV);
		2738	draw_h_gv = gv_fetchpv ("CFPlus::UI::Base::draw_h", 1, SVt_NV);
		2739	}
		2740
		2741	void
		2742	draw (SV *self)
		2743	CODE:
		2744	{
		2745	HV *hv;
		2746	SV **svp;
		2747	NV x, y, w, h;
		2748	SV *draw_x_sv = GvSV (draw_x_gv);
		2749	SV *draw_y_sv = GvSV (draw_y_gv);
		2750	SV *draw_w_sv = GvSV (draw_w_gv);
		2751	SV *draw_h_sv = GvSV (draw_h_gv);
		2752	SV *hover;
		2753	double draw_x, draw_y, draw_w, draw_h;
		2754
		2755	if (!SvROK (self))
		2756	croak ("CFPlus::Base::draw: %s not a reference", SvPV_nolen (self));
		2757
		2758	hv = (HV *)SvRV (self);
		2759
		2760	if (SvTYPE (hv) != SVt_PVHV)
		2761	croak ("CFPlus::Base::draw: %s not a hashref", SvPV_nolen (self));
		2762
		2763	svp = hv_fetch (hv, "w", 1, 0); w = svp ? SvNV (*svp) : 0.;
		2764	svp = hv_fetch (hv, "h", 1, 0); h = svp ? SvNV (*svp) : 0.;
		2765
		2766	if (!h || !w)
		2767	XSRETURN_EMPTY;
		2768
		2769	svp = hv_fetch (hv, "x", 1, 0); x = svp ? SvNV (*svp) : 0.;
		2770	svp = hv_fetch (hv, "y", 1, 0); y = svp ? SvNV (*svp) : 0.;
		2771
		2772	draw_x = SvNV (draw_x_sv) + x;
		2773	draw_y = SvNV (draw_y_sv) + y;
		2774
		2775	if (draw_x + w < 0 || draw_x >= SvNV (draw_w_sv)
		2776	|| draw_y + h < 0 || draw_y >= SvNV (draw_h_sv))
		2777	XSRETURN_EMPTY;
		2778
		2779	sv_setnv (draw_x_sv, draw_x);
		2780	sv_setnv (draw_y_sv, draw_y);
		2781
		2782	glPushMatrix ();
		2783	glTranslated (x, y, 0);
		2784
		2785	if (SvROK (GvSV (hover_gv)) && SvRV (GvSV (hover_gv)) == (SV *)hv)
		2786	{
		2787	svp = hv_fetch (hv, "can_hover", sizeof ("can_hover") - 1, 0);
		2788
		2789	if (svp && SvTRUE (*svp))
		2790	{
		2791	glColor4f (1*0.2f, 0.8*0.2f, 0.5*0.2f, 0.2f);
		2792	glEnable (GL_BLEND);
		2793	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		2794	glBegin (GL_QUADS);
		2795	glVertex2f (0, 0);
		2796	glVertex2f (w, 0);
		2797	glVertex2f (w, h);
		2798	glVertex2f (0, h);
		2799	glEnd ();
		2800	glDisable (GL_BLEND);
		2801	}
		2802	}
		2803	#if 0
		2804	if ($ENV{CFPLUS_DEBUG} & 1) {
		2805	glPushMatrix;
		2806	glColor 1, 1, 0, 1;
		2807	glTranslate 0.375, 0.375;
		2808	glBegin GL_LINE_LOOP;
		2809	glVertex 0 , 0;
		2810	glVertex $self->{w} - 1, 0;
		2811	glVertex $self->{w} - 1, $self->{h} - 1;
		2812	glVertex 0 , $self->{h} - 1;
		2813	glEnd;
		2814	glPopMatrix;
		2815	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
		2816	}
		2817	#endif
		2818	PUSHMARK (SP);
		2819	XPUSHs (self);
		2820	PUTBACK;
		2821	call_method ("_draw", G_VOID | G_DISCARD);
		2822	SPAGAIN;
		2823
		2824	glPopMatrix ();
		2825
		2826	draw_x = draw_x - x; sv_setnv (draw_x_sv, draw_x);
		2827	draw_y = draw_y - y; sv_setnv (draw_y_sv, draw_y);
		2828	}
		2829

Diff Legend

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