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

Diff Legend

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