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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
52		59
53	#define GL_CALL(type,func,args) \	60	#if 0
54	{ \	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	62	#else
56	static type fptr_; \	63	# define PARACHUTE 0
57	\	64	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		65
		66	static struct
		67	{
		68	#define GL_FUNC(ptr,name) ptr name;
		69	#include "glfunc.h"
		70	#undef GL_FUNC
		71	} gl;
		72
		73	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		74	{
		75	if (gl.BlendFuncSeparate)
		76	gl.BlendFuncSeparate (sa, da, saa, daa);
		77	else if (gl.BlendFuncSeparateEXT)
		78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		79	else
		80	glBlendFunc (sa, da);
		81	}
		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
68	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
70		91
71	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
72		111
73	typedef struct cf_layout {	112	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
77	int base_height;	115	int base_height;
78	CFClient__Font font;	116	CFPlus__Font font;
79	} *CFClient__Layout;	117	} *CFPlus__Layout;
80		118
81	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
84		122
85	static void	123	static void
86	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
87	{	125	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	127	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	129	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	131	}
95		132
96	static void	133	static void
97	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
98	{	135	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	136	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
101	*/	138	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		143
107	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
108	}	145	}
109		146
110	static void	147	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
114		154
115	if (!w) w = 1;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		157
118	w = (w + 3) & ~3;	158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
119	}	163	}
120		164
121	typedef uint16_t mapface;	165	typedef uint16_t mapface;
122		166
123	typedef struct {	167	typedef struct {
…		…
126	float s, t;	170	float s, t;
127	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
128	} maptex;	172	} maptex;
129		173
130	typedef struct {	174	typedef struct {
131	int16_t darkness;	175	uint32_t player;
132	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	179	} mapcell;
134		180
135	typedef struct {	181	typedef struct {
136	int32_t c0, c1;	182	int32_t c0, c1;
137	mapcell *col;	183	mapcell *col;
…		…
146	int texs;	192	int texs;
147	maptex *tex;	193	maptex *tex;
148		194
149	int32_t rows;	195	int32_t rows;
150	maprow *row;	196	maprow *row;
151	} *CFClient__Map;	197	} *CFPlus__Map;
152		198
153	static char *	199	static char *
154	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
155	{	201	{
156	char *p;	202	char *p;
…		…
174		220
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	222	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		223
178	static maprow *	224	static maprow *
179	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
180	{	226	{
181	if (0 > y)	227	if (0 > y)
182	{	228	{
183	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
222		268
223	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
224	}	270	}
225		271
226	static mapcell *	272	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
228	{	274	{
229	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
230	}	276	}
231		277
232	static void	278	static void
233	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
234	{	280	{
235	int r;	281	int r;
236		282
237	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
246	self->row = 0;	292	self->row = 0;
247	self->rows = 0;	293	self->rows = 0;
248	}	294	}
249		295
250	static void	296	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	297	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	298	{
253	int x, y;	299	int x, y;
254	maprow *row;	300	maprow *row;
		301	mapcell *cell;
255		302
256	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	304	if (y >= 0)
258	{	305	{
259	if (y >= self->rows)	306	if (y >= self->rows)
…		…
265	if (x >= row->c0)	312	if (x >= row->c0)
266	{	313	{
267	if (x >= row->c1)	314	if (x >= row->c1)
268	break;	315	break;
269		316
270	row->col[x - row->c0].darkness = -1;	317	cell = row->col + x - row->c0;
		318
		319	cell->darkness = 0;
		320	cell->stat_hp = 0;
		321	cell->flags = 0;
		322	cell->player = 0;
271	}	323	}
272	}	324	}
273	}	325	}
274		326
275	static void	327	static void
…		…
296	ev.data2 = 0;	348	ev.data2 = 0;
297		349
298	SDL_PushEvent ((SDL_Event *)&ev);	350	SDL_PushEvent ((SDL_Event *)&ev);
299	}	351	}
300		352
		353	static unsigned int
		354	minpot (unsigned int n)
		355	{
		356	if (!n)
		357	return 0;
		358
		359	--n;
		360
		361	n \|= n >> 1;
		362	n \|= n >> 2;
		363	n \|= n >> 4;
		364	n \|= n >> 8;
		365	n \|= n >> 16;
		366
		367	return n + 1;
		368	}
		369
301	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
302		371
303	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
304		373
305	BOOT:	374	BOOT:
306	{	375	{
307	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	377	static const struct {
309	const char *name;	378	const char *name;
310	IV iv;	379	IV iv;
311	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
413		482
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	483	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	485	}
417		486
		487	int
		488	in_destruct ()
		489	CODE:
		490	RETVAL = PL_main_cv == Nullcv;
		491	OUTPUT:
		492	RETVAL
		493
		494	NV floor (NV x)
		495
		496	NV ceil (NV x)
		497
418	void	498	void
419	pango_init ()	499	pango_init ()
420	CODE:	500	CODE:
421	{	501	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	502	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	505	}
430		506
431	int	507	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		509
434	void	510	void
435	SDL_Quit ()	511	SDL_Quit ()
436		512
437	void	513	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		523
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		526
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		531
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
		534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
457		537
458	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		540
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	559	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	560	CODE:
481	RETVAL = !!SDL_SetVideoMode (	561	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	562	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	563	);
		564	if (RETVAL)
		565	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	566	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		567	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		568	# include "glfunc.h"
		569	# undef GL_FUNC
		570	}
485	OUTPUT:	571	OUTPUT:
486	RETVAL	572	RETVAL
487		573
488	void	574	void
489	SDL_GL_SwapBuffers ()	575	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	630	break;
545	}	631	}
546		632
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	634	}
549	}	635	}
550		636
551	int	637	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
565	CODE:	651	CODE:
566	#ifndef _WIN32	652	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	654	#endif
569		655
570	char *	656	void
571	gl_vendor ()	657	win32_proxy_info ()
572	CODE:	658	PPCODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);	659	{
574	OUTPUT:	660	#ifdef _WIN32
575	RETVAL	661	char buffer[2048];
		662	DWORD buflen;
576		663
577	char *	664	EXTEND (SP, 3);
578	gl_version ()	665
579	CODE:	666	buflen = sizeof (buffer);
580	RETVAL = (char *)glGetString (GL_VERSION);	667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
581	OUTPUT:	668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
582	RETVAL	669	{
		670	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
583		671
584	char *	672	buflen = sizeof (buffer);
585	gl_extensions ()	673	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
586	CODE:	674	{
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);	675	PUSHs (newSVpv (buffer, 0));
588	OUTPUT:	676
589	RETVAL	677	buflen = sizeof (buffer);
		678	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		679	PUSHs (newSVpv (buffer, 0));
		680	}
		681	}
		682	#endif
		683	}
590		684
591	void	685	void
592	add_font (char *file)	686	add_font (char *file)
593	CODE:	687	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		689
600	void	690	void
601	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
602	ALIAS:	692	ALIAS:
603	load_image_file = 1	693	load_image_file = 1
…		…
645		735
646	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647		737
648	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
649		739
		740	SDL_LockSurface (surface2);
650	EXTEND (SP, 5);	741	EXTEND (SP, 6);
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	745	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
659		749
660	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
662	}	752	}
663		753
…		…
699	CODE:	789	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	790	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	791	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	793	#endif
704	exit (1);	794	_exit (1);
705		795
		796	void
		797	_exit (int retval = 0)
		798	CODE:
		799	#ifdef WIN32
		800	ExitThread (retval); // unclean, please beam me up
		801	#else
		802	_exit (retval);
		803	#endif
		804
706	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
707		806
708	CFClient::Font	807	CFPlus::Font
709	new_from_file (SV class, char path, int id = 0)	808	new_from_file (SV class, char path, int id = 0)
710	CODE:	809	CODE:
711	{	810	{
712	int count;	811	int count;
713	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	812	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
716	}	815	}
717	OUTPUT:	816	OUTPUT:
718	RETVAL	817	RETVAL
719		818
720	void	819	void
721	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
722	CODE:	821	CODE:
723	pango_font_description_free (self);	822	pango_font_description_free (self);
724		823
725	void	824	void
726	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
727	CODE:	826	CODE:
728	default_font = self;	827	default_font = self;
729		828
730	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
731		830
732	CFClient::Layout	831	void
733	new (SV *class, int rgba = 0)	832	reset_glyph_cache ()
734	CODE:	833	CODE:
735	#if _WIN32	834	tc_clear ();
736	rgba = 0;//D	835
737	#endif	836	CFPlus::Layout
		837	new (SV *class)
		838	CODE:
738	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
739		840
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	841	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	842	RETVAL->r = 1.;
743	RETVAL->g = 1.;	843	RETVAL->g = 1.;
744	RETVAL->b = 1.;	844	RETVAL->b = 1.;
745	RETVAL->a = 1.;	845	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	846	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
750	layout_update_font (RETVAL);	850	layout_update_font (RETVAL);
751	OUTPUT:	851	OUTPUT:
752	RETVAL	852	RETVAL
753		853
754	void	854	void
755	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
756	CODE:	856	CODE:
757	g_object_unref (self->pl);	857	g_object_unref (self->pl);
758	Safefree (self);	858	Safefree (self);
759		859
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	860	void
768	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
769	CODE:	862	CODE:
770	{	863	{
771	STRLEN textlen;	864	STRLEN textlen;
772	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
773		866
774	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
775	}	868	}
776		869
777	void	870	void
778	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
779	CODE:	872	CODE:
780	{	873	{
781	STRLEN textlen;	874	STRLEN textlen;
782	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
783		876
784	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
785	}	878	}
786		879
		880	void
		881	set_shapes (CFPlus::Layout self, ...)
		882	CODE:
		883	{
		884	PangoAttrList *attrs = 0;
		885	const char *text = pango_layout_get_text (self->pl);
		886	const char *pos = text;
		887	int arg = 4;
		888
		889	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		890	{
		891	PangoRectangle inkrect, rect;
		892	PangoAttribute *attr;
		893
		894	int x = SvIV (ST (arg - 3));
		895	int y = SvIV (ST (arg - 2));
		896	int w = SvIV (ST (arg - 1));
		897	int h = SvIV (ST (arg ));
		898
		899	inkrect.x = 0;
		900	inkrect.y = 0;
		901	inkrect.width = 0;
		902	inkrect.height = 0;
		903
		904	rect.x = x * PANGO_SCALE;
		905	rect.y = y * PANGO_SCALE;
		906	rect.width = w * PANGO_SCALE;
		907	rect.height = h * PANGO_SCALE;
		908
		909	if (!attrs)
		910	attrs = pango_layout_get_attributes (self->pl);
		911
		912	attr = pango_attr_shape_new (&inkrect, &rect);
		913	attr->start_index = pos - text;
		914	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		915	pango_attr_list_insert (attrs, attr);
		916
		917	arg += 4;
		918	pos += sizeof (OBJ_STR) - 1;
		919	}
		920
		921	if (attrs)
		922	pango_layout_set_attributes (self->pl, attrs);
		923	}
		924
		925	void
		926	get_shapes (CFPlus::Layout self)
		927	PPCODE:
		928	{
		929	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		930
		931	do
		932	{
		933	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		934
		935	if (run && shape_attr_p (run))
		936	{
		937	PangoRectangle extents;
		938	pango_layout_iter_get_run_extents (iter, 0, &extents);
		939
		940	EXTEND (SP, 2);
		941	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		942	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		943	}
		944	}
		945	while (pango_layout_iter_next_run (iter));
		946
		947	pango_layout_iter_free (iter);
		948	}
		949
		950	int
		951	has_wrapped (CFPlus::Layout self)
		952	CODE:
		953	{
		954	int lines = 1;
		955	const char *text = pango_layout_get_text (self->pl);
		956
		957	while (*text)
		958	lines += *text++ == '\n';
		959
		960	RETVAL = lines < pango_layout_get_line_count (self->pl);
		961	}
		962	OUTPUT:
		963	RETVAL
		964
787	SV *	965	SV *
788	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
789	CODE:	967	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	969	sv_utf8_decode (RETVAL);
792	OUTPUT:	970	OUTPUT:
793	RETVAL	971	RETVAL
794		972
795	void	973	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	974	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797	CODE:	975	CODE:
798	self->r = r;	976	self->r = r;
799	self->g = g;	977	self->g = g;
800	self->b = b;	978	self->b = b;
801	self->a = a;	979	self->a = a;
802		980
803	void	981	void
804	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805	CODE:	983	CODE:
806	if (self->font != font)	984	if (self->font != font)
807	{	985	{
808	self->font = font;	986	self->font = font;
809	layout_update_font (self);	987	layout_update_font (self);
810	}	988	}
811		989
812	void	990	void
813	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
814	CODE:	992	CODE:
815	if (self->base_height != base_height)	993	if (self->base_height != base_height)
816	{	994	{
817	self->base_height = base_height;	995	self->base_height = base_height;
818	layout_update_font (self);	996	layout_update_font (self);
819	}	997	}
820		998
821	void	999	void
822	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
823	CODE:	1001	CODE:
824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1002	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825		1003
826	void	1004	void
827	set_indent (CFClient::Layout self, int indent)	1005	set_indent (CFPlus::Layout self, int indent)
828	CODE:	1006	CODE:
829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830		1008
831	void	1009	void
832	set_spacing (CFClient::Layout self, int spacing)	1010	set_spacing (CFPlus::Layout self, int spacing)
833	CODE:	1011	CODE:
834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835		1013
836	void	1014	void
837	set_ellipsise (CFClient::Layout self, int ellipsise)	1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
838	CODE:	1016	CODE:
839	pango_layout_set_ellipsize (self->pl,	1017	pango_layout_set_ellipsize (self->pl,
840	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
843	: PANGO_ELLIPSIZE_NONE	1021	: PANGO_ELLIPSIZE_NONE
844	);	1022	);
845		1023
846	void	1024	void
847	set_single_paragraph_mode (CFClient::Layout self, int spm)	1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
848	CODE:	1026	CODE:
849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850		1028
851	void	1029	void
852	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
853	PPCODE:	1031	PPCODE:
854	{	1032	{
855	int w, h;	1033	int w, h;
856		1034
857	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
862	}	1040	}
863		1041
864	int	1042	int
		1043	descent (CFPlus::Layout self)
		1044	CODE:
		1045	{
		1046	PangoRectangle rect;
		1047	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1048	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1049	RETVAL = PANGO_DESCENT (rect);
		1050	}
		1051	OUTPUT:
		1052	RETVAL
		1053
		1054	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
866	CODE:	1056	CODE:
867	{	1057	{
868	int index, trailing;	1058	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1059	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870	RETVAL = index;	1060	RETVAL = index;
871	}	1061	}
872	OUTPUT:	1062	OUTPUT:
873	RETVAL	1063	RETVAL
874		1064
875	void	1065	void
876	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
877	PPCODE:	1067	PPCODE:
878	{	1068	{
879	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
880	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881		1071
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1076	}
887		1077
888	void	1078	void
889	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
890	PPCODE:	1080	PPCODE:
891	{	1081	pango_opengl_render_layout_subpixel (
892	SV *retval;	1082	self->pl,
893	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
		1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
894		1087
895	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
896		1089
897	if (self->rgba)	1090	void
		1091	pad2pot (SV data_, SV w_, SV *h_)
		1092	CODE:
		1093	{
		1094	int ow = SvIV (w_);
		1095	int oh = SvIV (h_);
		1096
		1097	if (ow && oh)
898	{	1098	{
899	cairo_surface_t *surface;	1099	int nw = minpot (ow);
900	cairo_t *cairo;	1100	int nh = minpot (oh);
901		1101
902	retval = newSV (w * h * 4);	1102	if (nw != ow \|\| nh != oh)
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{	1103	{
920	uint32_t p = (uint32_t )SvPVX (retval);	1104	if (SvOK (data_))
921	uint32_t e = p + w h;
922
923	while (p < e)
924	{	1105	{
925	uint32_t rgba = *p;	1106	STRLEN datalen;
926	rgba = (rgba >> 24) \| (rgba << 8);	1107	char *data = SvPVbyte (data_, datalen);
927	#if 0	1108	int bpp = datalen / (ow * oh);
928	#ifdef _WIN32	1109	SV result_ = sv_2mortal (newSV (nw nh * bpp));
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934		1110
935	rgba = (rgba & 0xffffff00) \| a;	1111	SvPOK_only (result_);
		1112	SvCUR_set (result_, nw * nh * bpp);
		1113
		1114	memset (SvPVX (result_), 0, nw * nh * bpp);
		1115	while (oh--)
		1116	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1117
		1118	sv_setsv (data_, result_);
936	}	1119	}
937	#endif	1120
938	#endif	1121	sv_setiv (w_, nw);
939	rgba = SDL_SwapBE32 (rgba);	1122	sv_setiv (h_, nh);
940	*p++ = rgba;
941	}	1123	}
942	}
943
944	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	1124	}
951	else
952	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));
972	PUSHs (sv_2mortal (newSViv (h)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}
977	}	1125	}
978		1126
979	MODULE = CFClient PACKAGE = CFClient::Texture
980
981	void	1127	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1128	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
984	ALIAS:	1130	ALIAS:
985	draw_quad_alpha = 1	1131	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1132	draw_quad_alpha_premultiplied = 2
987	CODE:	1133	CODE:
988	{	1134	{
989	HV hv = (HV )SvRV (self);	1135	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1136	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1137	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1138	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1139
995	if (items < 5)	1140	if (items < 5)
996	{	1141	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1142	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1143	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1144	}
1000		1145
1001	if (ix)	1146	if (ix)
1002	{	1147	{
1003	glEnable (GL_BLEND);	1148	glEnable (GL_BLEND);
		1149
		1150	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1151	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1152	else
		1153	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1154	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1155
1005	glEnable (GL_ALPHA_TEST);	1156	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1157	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1158	}
1008		1159
1009	glBindTexture (GL_TEXTURE_2D, name);	1160	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1161
1017	glBegin (GL_QUADS);	1162	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1163	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1164	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1165	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1026	glDisable (GL_ALPHA_TEST);	1171	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1172	glDisable (GL_BLEND);
1028	}	1173	}
1029	}	1174	}
1030		1175
1031	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1177
1033	CFClient::Map	1178	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
1035	CODE:	1180	CODE:
1036	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1182	RETVAL->x = 0;
1038	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1193	RETVAL->row = 0;
1049	OUTPUT:	1194	OUTPUT:
1050	RETVAL	1195	RETVAL
1051		1196
1052	void	1197	void
1053	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
1054	CODE:	1199	CODE:
1055	{	1200	{
1056	map_clear (self);	1201	map_clear (self);
1057	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
1058	Safefree (self);	1204	Safefree (self);
1059	}	1205	}
1060		1206
1061	void	1207	void
1062	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
1063	CODE:	1209	CODE:
1064	map_clear (self);	1210	map_clear (self);
1065		1211
1066	void	1212	void
1067	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1214	CODE:
1069	{	1215	{
1070	while (self->faces <= face)	1216	while (self->faces <= face)
1071	{	1217	{
1072	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1221
1076	self->face [face] = texid;	1222	self->face [face] = texid;
1077	}	1223	}
1078		1224
1079	void	1225	void
1080	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	1226	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)
1081	CODE:	1227	CODE:
1082	{	1228	{
1083	while (self->texs <= texid)	1229	while (self->texs <= texid)
1084	{	1230	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
1097	tex->r = r;	1243	tex->r = r;
1098	tex->g = g;	1244	tex->g = g;
1099	tex->b = b;	1245	tex->b = b;
1100	tex->a = a;	1246	tex->a = a;
1101	}	1247	}
		1248
		1249	// somewhat hackish, but for textures that require it, it really
		1250	// improves the look, and most others don't suffer.
		1251	glBindTexture (GL_TEXTURE_2D, name);
		1252	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1253	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1254	// use uglier nearest interpolation because linear suffers
		1255	// from transparent color bleeding and ugly wrapping effects.
		1256	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1102	}	1257	}
1103		1258
1104	int	1259	int
1105	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
1106	ALIAS:	1261	ALIAS:
1107	oy = 1	1262	oy = 1
		1263	x = 2
		1264	y = 3
		1265	w = 4
		1266	h = 5
1108	CODE:	1267	CODE:
1109	switch (ix)	1268	switch (ix)
1110	{	1269	{
1111	case 0: RETVAL = self->ox; break;	1270	case 0: RETVAL = self->ox; break;
1112	case 1: RETVAL = self->oy; break;	1271	case 1: RETVAL = self->oy; break;
		1272	case 2: RETVAL = self->x; break;
		1273	case 3: RETVAL = self->y; break;
		1274	case 4: RETVAL = self->w; break;
		1275	case 5: RETVAL = self->h; break;
1113	}	1276	}
1114	OUTPUT:	1277	OUTPUT:
1115	RETVAL	1278	RETVAL
1116		1279
1117	void	1280	void
1118	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
1119	CODE:	1282	CODE:
1120	{	1283	{
1121	if (dx > 0)	1284	if (dx > 0)
1122	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
1123	else if (dx < 0)	1286	else if (dx < 0)
1124	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1287	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1125		1288
1126	if (dy > 0)	1289	if (dy > 0)
1127	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
1128	else if (dy < 0)	1291	else if (dy < 0)
1129	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1292	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1130		1293
1131	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
1132	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
1133		1296
1134	while (self->y < 0)	1297	while (self->y < 0)
…		…
1139	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
1140	}	1303	}
1141	}	1304	}
1142		1305
1143	void	1306	void
1144	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1145	CODE:	1308	CODE:
1146	{	1309	{
1147	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1148	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
1149	mapcell *cell;	1312	mapcell *cell;
1150	int x, y, flags;	1313	int x, y, flags;
1151		1314
1152	while (data < data_end)	1315	while (data < data_end - 1)
1153	{	1316	{
1154	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
1155		1318
1156	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
1157	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
1158		1321
1159	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
1160		1323
1161	if (flags & 15)	1324	if (flags & 15)
1162	{	1325	{
1163	if (cell->darkness < 0)	1326	if (!cell->darkness)
1164	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
1165	cell->darkness = 0;	1329	cell->darkness = 256;
1166	cell->face [0] = 0;
1167	cell->face [1] = 0;
1168	cell->face [2] = 0;
1169	}	1330	}
1170		1331
1171	cell->darkness = flags & 8 ? *data++ : 255;
1172
1173	//TODO: don't trust server data to be in-range(!)	1332	//TODO: don't trust server data to be in-range(!)
		1333
		1334	if (flags & 8)
		1335	{
		1336	if (extmap)
		1337	{
		1338	uint8_t ext, cmd;
		1339
		1340	do
		1341	{
		1342	ext = *data++;
		1343	cmd = ext & 0x3f;
		1344
		1345	if (cmd < 4)
		1346	cell->darkness = 255 - ext * 64 + 1;
		1347	else if (cmd == 5) // health
		1348	{
		1349	cell->stat_width = 1;
		1350	cell->stat_hp = *data++;
		1351	}
		1352	else if (cmd == 6) // monster width
		1353	cell->stat_width = *data++ + 1;
		1354	else if (cmd == 0x47) // monster width
		1355	{
		1356	if (*data == 4)
		1357	; // decode player tag
		1358
		1359	data += *data + 1;
		1360	}
		1361	else if (cmd == 8) // cell flags
		1362	cell->flags = *data++;
		1363	else if (ext & 0x40) // unknown, multibyte => skip
		1364	data += *data + 1;
		1365	else
		1366	data++;
		1367	}
		1368	while (ext & 0x80);
		1369	}
		1370	else
		1371	cell->darkness = *data++ + 1;
		1372	}
1174		1373
1175	if (flags & 4)	1374	if (flags & 4)
1176	{	1375	{
1177	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1376	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1178	}	1377	}
…		…
1186	{	1385	{
1187	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1386	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1188	}	1387	}
1189	}	1388	}
1190	else	1389	else
1191	cell->darkness = -1;	1390	cell->darkness = 0;
1192	}	1391	}
1193	}	1392	}
1194		1393
1195	SV *	1394	SV *
1196	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1197	CODE:	1396	CODE:
1198	{	1397	{
1199	int x1, x;	1398	int x1, x;
1200	int y1, y;	1399	int y1, y;
1201	int z;	1400	int z;
…		…
1251	}	1450	}
1252	OUTPUT:	1451	OUTPUT:
1253	RETVAL	1452	RETVAL
1254		1453
1255	void	1454	void
1256	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1455	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1257	PPCODE:	1456	CODE:
1258	{	1457	{
1259	int vx, vy;	1458	int vx, vy;
1260	int x, y, z;	1459	int x, y, z;
1261	int last_name;	1460	int last_name;
1262	mapface face;	1461	mapface face;
1263	int sw4 = (sw + 3) & ~3;
1264	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1265	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1266		1462
1267	memset (darkness, 255, sw4 * sh);
1268	SvPOK_only (darkness_sv);
1269	SvCUR_set (darkness_sv, sw4 * sh);
1270
1271	vx = self->x + (self->w - sw) / 2 - shift_x;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1272	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1273		1465
1274	/*	1466	/*
1275	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1276	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1277	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1469	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1281	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1473	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1282	*/	1474	*/
1283		1475
1284	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1285		1477
		1478	glEnable (GL_BLEND);
1286	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1287	glEnable (GL_BLEND);
1288	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1289	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1290		1482
1291	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1292		1484
…		…
1301	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1302	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1303	{	1495	{
1304	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1305		1497
1306	darkness[y * sw4 + x] = cell->darkness < 0
1307	? 255 - FOW_DARKNESS
1308	: 255 - cell->darkness;
1309
1310	face = cell->face [z];	1498	face = cell->face [z];
1311		1499
1312	if (face)	1500	if (face && face < self->texs)
1313	{	1501	{
1314	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1315
1316	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1317	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1318		1505
1319	if (last_name != tex.name)	1506	if (last_name != tex.name)
1320	{	1507	{
1321	glEnd ();	1508	glEnd ();
1322	last_name = tex.name;
1323	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1324	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1325	}	1511	}
1326		1512
1327	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1328	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1329	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1515	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1330	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1331	}	1517	}
		1518
		1519	if (cell->flags && z == 2)
		1520	{
		1521	if (cell->flags & 1)
		1522	{
		1523	maptex tex = self->tex [1];
		1524	int px = (x + 1) * 32 - tex.w + 2;
		1525	int py = (y + 1) * 32 - tex.h - 6;
		1526
		1527	glEnd ();
		1528	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1529	glBegin (GL_QUADS);
		1530
		1531	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1532	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1533	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1534	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1535	}
		1536	}
1332	}	1537	}
1333	}	1538	}
1334		1539
1335	glEnd ();	1540	glEnd ();
1336		1541
1337	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1338	glDisable (GL_BLEND);	1543	glDisable (GL_BLEND);
		1544
		1545	// top layer: overlays such as the health bar
		1546	for (y = 0; y < sh; y++)
		1547	if (0 <= y + vy && y + vy < self->rows)
		1548	{
		1549	maprow *row = self->row + (y + vy);
		1550
		1551	for (x = 0; x < sw; x++)
		1552	if (row->c0 <= x + vx && x + vx < row->c1)
		1553	{
		1554	mapcell *cell = row->col + (x + vx - row->c0);
		1555
		1556	int px = x * 32;
		1557	int py = y * 32;
		1558
		1559	if (cell->stat_hp)
		1560	{
		1561	int width = cell->stat_width * 32;
		1562	int thick = sh / 28 + 1 + cell->stat_width;
		1563
		1564	glColor3ub (0, 0, 0);
		1565	glRectf (px + 1, py - thick - 2,
		1566	px + width - 1, py);
		1567
		1568	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1569	glRectf (px + 2,
		1570	py - thick - 1,
		1571	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1572	}
		1573	}
		1574	}
		1575	}
		1576
		1577	void
		1578	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1579	CODE:
		1580	{
		1581	static float color[16][3] = {
		1582	{ 0.00F, 0.00F, 0.00F },
		1583	{ 1.00F, 1.00F, 1.00F },
		1584	{ 0.00F, 0.00F, 0.55F },
		1585	{ 1.00F, 0.00F, 0.00F },
		1586
		1587	{ 1.00F, 0.54F, 0.00F },
		1588	{ 0.11F, 0.56F, 1.00F },
		1589	{ 0.93F, 0.46F, 0.00F },
		1590	{ 0.18F, 0.54F, 0.34F },
		1591
		1592	{ 0.56F, 0.73F, 0.56F },
		1593	{ 0.80F, 0.80F, 0.80F },
		1594	{ 0.55F, 0.41F, 0.13F },
		1595	{ 0.99F, 0.77F, 0.26F },
		1596
		1597	{ 0.74F, 0.65F, 0.41F },
		1598
		1599	{ 0.00F, 1.00F, 1.00F },
		1600	{ 1.00F, 0.00F, 1.00F },
		1601	{ 1.00F, 1.00F, 0.00F },
		1602	};
		1603
		1604	int x, y;
		1605
		1606	glEnable (GL_TEXTURE_2D);
		1607	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1608	glEnable (GL_BLEND);
		1609	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1610	glBegin (GL_QUADS);
		1611
		1612	for (y = 0; y < h; y++)
		1613	for (x = 0; x < w; x++)
		1614	{
		1615	unsigned char m = data [x + y * w];
		1616
		1617	if (m)
		1618	{
		1619	float *c = color [m & 15];
		1620
		1621	float tx1 = m & 0x40 ? 0.5 : 0.;
		1622	float tx2 = tx1 + 0.5;
		1623
		1624	glColor4f (c[0], c[1], c[2], 0.75);
		1625	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1626	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1627	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1628	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1629	}
		1630	}
		1631
		1632	glEnd ();
		1633	glDisable (GL_BLEND);
		1634	glDisable (GL_TEXTURE_2D);
		1635	}
		1636
		1637	void
		1638	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1639	PPCODE:
		1640	{
		1641	int vx, vy;
		1642	int x, y;
		1643	int sw4 = (sw + 3) & ~3;
		1644	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1645	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1646
		1647	memset (darkness, 255, sw4 * sh);
		1648	SvPOK_only (darkness_sv);
		1649	SvCUR_set (darkness_sv, sw4 * sh);
		1650
		1651	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1652	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1653
		1654	for (y = 0; y < sh; y++)
		1655	if (0 <= y + vy && y + vy < self->rows)
		1656	{
		1657	maprow *row = self->row + (y + vy);
		1658
		1659	for (x = 0; x < sw; x++)
		1660	if (row->c0 <= x + vx && x + vx < row->c1)
		1661	{
		1662	mapcell *cell = row->col + (x + vx - row->c0);
		1663
		1664	darkness[y * sw4 + x] = cell->darkness
		1665	? 255 - (cell->darkness - 1)
		1666	: 255 - FOW_DARKNESS;
		1667	}
		1668	}
1339		1669
1340	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1341	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1342	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1343	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1344	}	1674	}
1345		1675
1346	SV *	1676	SV *
1347	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1677	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1348	CODE:	1678	CODE:
1349	{	1679	{
1350	int x, y, x1, y1;	1680	int x, y, x1, y1;
1351	SV data_sv = newSV (w h * 7 + 5);	1681	SV data_sv = newSV (w h * 7 + 5);
1352	uint8_t data = (uint8_t )SvPVX (data_sv);	1682	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1414	}	1744	}
1415	OUTPUT:	1745	OUTPUT:
1416	RETVAL	1746	RETVAL
1417		1747
1418	void	1748	void
1419	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1749	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1420	PPCODE:	1750	PPCODE:
1421	{	1751	{
1422	int x, y, z;	1752	int x, y, z;
1423	int w, h;	1753	int w, h;
1424	int x1, y1;	1754	int x1, y1;
…		…
1456		1786
1457	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1458	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1459	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1460		1790
1461	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1462	{	1792	{
1463	cell->darkness = -1;	1793	cell->darkness = 0;
1464		1794
1465	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1466	{	1796	{
1467	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1468		1798
…		…
1473	}	1803	}
1474	}	1804	}
1475	}	1805	}
1476	}	1806	}
1477		1807
1478	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1479		1809
1480	CFClient::MixChunk	1810	CFPlus::MixChunk
1481	new_from_file (SV class, char path)	1811	new_from_file (SV class, char path)
1482	CODE:	1812	CODE:
1483	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1484	OUTPUT:	1814	OUTPUT:
1485	RETVAL	1815	RETVAL
1486		1816
1487	void	1817	void
1488	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1489	CODE:	1819	CODE:
1490	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1491		1821
1492	int	1822	int
1493	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1494	CODE:	1824	CODE:
1495	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1496	OUTPUT:	1826	OUTPUT:
1497	RETVAL	1827	RETVAL
1498		1828
1499	int	1829	int
1500	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1830	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1501	CODE:	1831	CODE:
1502	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1503	OUTPUT:	1833	OUTPUT:
1504	RETVAL	1834	RETVAL
1505		1835
1506	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1507		1837
1508	int	1838	int
1509	volume (int volume = -1)	1839	volume (int volume = -1)
1510	CODE:	1840	CODE:
1511	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1512	OUTPUT:	1842	OUTPUT:
1513	RETVAL	1843	RETVAL
1514		1844
1515	CFClient::MixMusic	1845	CFPlus::MixMusic
1516	new_from_file (SV class, char path)	1846	new_from_file (SV class, char path)
1517	CODE:	1847	CODE:
1518	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1519	OUTPUT:	1849	OUTPUT:
1520	RETVAL	1850	RETVAL
1521		1851
1522	void	1852	void
1523	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1524	CODE:	1854	CODE:
1525	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1526		1856
1527	int	1857	int
1528	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1529	CODE:	1859	CODE:
1530	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1531	OUTPUT:	1861	OUTPUT:
1532	RETVAL	1862	RETVAL
1533		1863
1534	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1535		1865
1536	BOOT:	1866	BOOT:
1537	{	1867	{
1538	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1539	static const struct {	1869	static const struct {
1540	const char *name;	1870	const char *name;
1541	IV iv;	1871	IV iv;
1542	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1543	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
…		…
1550	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
1551	const_iv (GL_DEPTH_TEST),	1881	const_iv (GL_DEPTH_TEST),
1552	const_iv (GL_ALPHA_TEST),	1882	const_iv (GL_ALPHA_TEST),
1553	const_iv (GL_NORMALIZE),	1883	const_iv (GL_NORMALIZE),
1554	const_iv (GL_RESCALE_NORMAL),	1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1555	const_iv (GL_AND),	1887	const_iv (GL_AND),
1556	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1557	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1558	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1559	const_iv (GL_SRC_ALPHA_SATURATE),	1891	const_iv (GL_DST_ALPHA),
1560	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1561	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1894	const_iv (GL_SRC_ALPHA_SATURATE),
1562	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1563	const_iv (GL_RGBA),	1896	const_iv (GL_RGBA),
		1897	const_iv (GL_RGBA4),
		1898	const_iv (GL_RGBA8),
		1899	const_iv (GL_RGB5_A1),
1564	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
1565	const_iv (GL_UNSIGNED_SHORT),	1901	const_iv (GL_UNSIGNED_SHORT),
1566	const_iv (GL_UNSIGNED_INT),	1902	const_iv (GL_UNSIGNED_INT),
1567	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
1568	const_iv (GL_INTENSITY),	1904	const_iv (GL_INTENSITY),
…		…
1577	const_iv (GL_TEXTURE_MAG_FILTER),	1913	const_iv (GL_TEXTURE_MAG_FILTER),
1578	const_iv (GL_TEXTURE_MIN_FILTER),	1914	const_iv (GL_TEXTURE_MIN_FILTER),
1579	const_iv (GL_TEXTURE_ENV_MODE),	1915	const_iv (GL_TEXTURE_ENV_MODE),
1580	const_iv (GL_TEXTURE_WRAP_S),	1916	const_iv (GL_TEXTURE_WRAP_S),
1581	const_iv (GL_TEXTURE_WRAP_T),	1917	const_iv (GL_TEXTURE_WRAP_T),
		1918	const_iv (GL_REPEAT),
1582	const_iv (GL_CLAMP),	1919	const_iv (GL_CLAMP),
1583	const_iv (GL_REPEAT),	1920	const_iv (GL_CLAMP_TO_EDGE),
1584	const_iv (GL_NEAREST),	1921	const_iv (GL_NEAREST),
1585	const_iv (GL_LINEAR),	1922	const_iv (GL_LINEAR),
1586	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1923	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1587	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1924	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1588	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1925	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1599	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1600	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1601	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1602	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1603	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
1604	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_LINE_LOOP),
1605	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1606	const_iv (GL_QUAD_STRIP),	1944	const_iv (GL_QUAD_STRIP),
1607	const_iv (GL_TRIANGLES),	1945	const_iv (GL_TRIANGLES),
1608	const_iv (GL_TRIANGLE_STRIP),	1946	const_iv (GL_TRIANGLE_STRIP),
…		…
1618		1956
1619	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1957	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1620	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1958	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1621	}	1959	}
1622		1960
		1961	char *
		1962	gl_vendor ()
		1963	CODE:
		1964	RETVAL = (char *)glGetString (GL_VENDOR);
		1965	OUTPUT:
		1966	RETVAL
		1967
		1968	char *
		1969	gl_version ()
		1970	CODE:
		1971	RETVAL = (char *)glGetString (GL_VERSION);
		1972	OUTPUT:
		1973	RETVAL
		1974
		1975	char *
		1976	gl_extensions ()
		1977	CODE:
		1978	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1979	OUTPUT:
		1980	RETVAL
		1981
1623	int glGetError ()	1982	int glGetError ()
		1983
		1984	void glFinish ()
1624		1985
1625	void glClear (int mask)	1986	void glClear (int mask)
1626		1987
1627	void glClearColor (float r, float g, float b, float a = 1.0)	1988	void glClearColor (float r, float g, float b, float a = 1.0)
1628	PROTOTYPE: @	1989	PROTOTYPE: @
…		…
1635		1996
1636	void glHint (int target, int mode)	1997	void glHint (int target, int mode)
1637		1998
1638	void glBlendFunc (int sfactor, int dfactor)	1999	void glBlendFunc (int sfactor, int dfactor)
1639		2000
		2001	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2002	CODE:
		2003	gl_BlendFuncSeparate (sa, da, saa, daa);
		2004
1640	void glDepthMask (int flag)	2005	void glDepthMask (int flag)
1641		2006
1642	void glLogicOp (int opcode)	2007	void glLogicOp (int opcode)
1643		2008
1644	void glColorMask (int red, int green, int blue, int alpha)	2009	void glColorMask (int red, int green, int blue, int alpha)
…		…
1648	void glPushMatrix ()	2013	void glPushMatrix ()
1649		2014
1650	void glPopMatrix ()	2015	void glPopMatrix ()
1651		2016
1652	void glLoadIdentity ()	2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
1653		2022
1654	# near_ and far_ are due to microsofts buggy "c" compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
1655	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2024	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1656		2025
1657	# near_ and far_ are due to microsofts buggy "c" compiler	2026	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1677		2046
1678	void glEnd ()	2047	void glEnd ()
1679		2048
1680	void glColor (float r, float g, float b, float a = 1.0)	2049	void glColor (float r, float g, float b, float a = 1.0)
1681	PROTOTYPE: @	2050	PROTOTYPE: @
		2051	ALIAS:
		2052	glColor_premultiply = 1
1682	CODE:	2053	CODE:
		2054	if (ix)
		2055	{
		2056	r *= a;
		2057	g *= a;
		2058	b *= a;
		2059	}
1683	// microsoft visual "c" rounds instead of truncating...	2060	// microsoft visual "c" rounds instead of truncating...
1684	glColor4ub (MIN ((int)(r * 255.f), 255),	2061	glColor4f (r, g, b, a);
1685	MIN ((int)(g * 255.f), 255),
1686	MIN ((int)(b * 255.f), 255),
1687	MIN ((int)(a * 255.f), 255));
1688		2062
1689	void glInterleavedArrays (int format, int stride, char *data)	2063	void glInterleavedArrays (int format, int stride, char *data)
1690		2064
1691	void glDrawElements (int mode, int count, int type, char *indices)	2065	void glDrawElements (int mode, int count, int type, char *indices)
1692		2066
…		…
1715		2089
1716	void glBindTexture (int target, int name)	2090	void glBindTexture (int target, int name)
1717		2091
1718	void glConvolutionParameter (int target, int pname, float params)	2092	void glConvolutionParameter (int target, int pname, float params)
1719	CODE:	2093	CODE:
1720	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2094	if (gl.ConvolutionParameterf)
		2095	gl.ConvolutionParameterf (target, pname, params);
1721		2096
1722	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2097	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1723	CODE:	2098	CODE:
1724	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2099	if (gl.ConvolutionFilter2D)
1725	(target, internalformat, width, height, format, type, data));	2100	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1726		2101
1727	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2102	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1728	CODE:	2103	CODE:
1729	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2104	if (gl.SeparableFilter2D)
1730	(target, internalformat, width, height, format, type, row, column));	2105	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1731		2106
1732	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2107	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1733		2108
1734	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2109	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1735		2110
…		…
1768		2143
1769	void glEndList ()	2144	void glEndList ()
1770		2145
1771	void glCallList (int list)	2146	void glCallList (int list)
1772		2147
1773

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.94 by root, Tue May 23 18:57:35 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC