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.78 by root, Fri May 12 01:47:03 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
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
3	# pragma warning(disable:4244)	6	# pragma warning(disable:4244)
4	#endif	7	#endif
5		8
6	#include "EXTERN.h"	9	#include "EXTERN.h"
7	#include "perl.h"	10	#include "perl.h"
8	#include "XSUB.h"	11	#include "XSUB.h"
9		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
10	#include <string.h>	18	#include <string.h>
11	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
12		21
13	#include <SDL.h>	22	#include <SDL.h>
14	#include <SDL_endian.h>	23	#include <SDL_endian.h>
15	#include <SDL_image.h>	24	#include <SDL_image.h>
16	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
17	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
18		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
19	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
20		32
21	#include <pango/pango.h>	33	#include <pango/pango.h>
22	#include <pango/pangofc-fontmap.h>
23	#include <pango/pangoft2.h>
24	#include <pango/pangocairo.h>
25		34
26	#ifndef _WIN32	35	#ifndef _WIN32
27	# include <sys/types.h>	36	# include <sys/types.h>
28	# include <sys/socket.h>	37	# include <sys/socket.h>
29	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
36	typedef signed char int8_t;	45	typedef signed char int8_t;
37	typedef signed short int16_t;	46	typedef signed short int16_t;
38	typedef signed int int32_t;	47	typedef signed int int32_t;
39	#endif	48	#endif
40		49
41	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
42		51
43	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
44		53
45	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
46	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
47		56
48	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
49		58
50	#define GL_CALL(type,func,args) \	59	#if 0
51	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
52	static int init_; \	61	#else
53	static type fptr_; \	62	# define PARACHUTE 0
54	\	63	#endif
55	if (!init_) \
56	{ \
57	init_ = 1; \
58	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
59	} \
60	\
61	if (fptr_) \
62	fptr_ args; \
63	}
64		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
65	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
66	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
67		90
68	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	}
69		110
70	typedef struct cf_layout {	111	typedef struct cf_layout {
71	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
72	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
73	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
74	int base_height;	114	int base_height;
75	CFClient__Font font;	115	CFPlus__Font font;
76	} *CFClient__Layout;	116	} *CFPlus__Layout;
77		117
78	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
79	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
80	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
81		121
82	static void	122	static void
83	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
84	{	124	{
85	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
86	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
87	}	130	}
88		131
89	static void	132	static void
90	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
91	{	134	{
92	/* 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
93	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
94	*/	137	*/
95	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
99		142
100	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
101	}	144	}
102		145
103	static void	146	static void
104	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
105	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
106	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
107		153
108	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
109	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
110		156
111	*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;
112	}	162	}
113		163
114	typedef uint16_t mapface;	164	typedef uint16_t mapface;
115		165
116	typedef struct {	166	typedef struct {
…		…
119	float s, t;	169	float s, t;
120	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
121	} maptex;	171	} maptex;
122		172
123	typedef struct {	173	typedef struct {
124	int16_t darkness;	174	uint32_t player;
125	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
126	} mapcell;	178	} mapcell;
127		179
128	typedef struct {	180	typedef struct {
129	int32_t c0, c1;	181	int32_t c0, c1;
130	mapcell *col;	182	mapcell *col;
…		…
139	int texs;	191	int texs;
140	maptex *tex;	192	maptex *tex;
141		193
142	int32_t rows;	194	int32_t rows;
143	maprow *row;	195	maprow *row;
144	} *CFClient__Map;	196	} *CFPlus__Map;
145		197
146	static char *	198	static char *
147	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
148	{	200	{
149	char *p;	201	char *p;
…		…
167		219
168	#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))
169	#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))
170		222
171	static maprow *	223	static maprow *
172	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
173	{	225	{
174	if (0 > y)	226	if (0 > y)
175	{	227	{
176	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
177	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
215		267
216	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
217	}	269	}
218		270
219	static mapcell *	271	static mapcell *
220	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
221	{	273	{
222	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
223	}	275	}
224		276
225	static void	277	static void
226	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
227	{	279	{
228	int r;	280	int r;
229		281
230	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
231	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
239	self->row = 0;	291	self->row = 0;
240	self->rows = 0;	292	self->rows = 0;
241	}	293	}
242		294
243	static void	295	static void
244	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)
245	{	297	{
246	int x, y;	298	int x, y;
247	maprow *row;	299	maprow *row;
		300	mapcell *cell;
248		301
249	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
250	if (y >= 0)	303	if (y >= 0)
251	{	304	{
252	if (y >= self->rows)	305	if (y >= self->rows)
…		…
258	if (x >= row->c0)	311	if (x >= row->c0)
259	{	312	{
260	if (x >= row->c1)	313	if (x >= row->c1)
261	break;	314	break;
262		315
263	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;
264	}	322	}
265	}	323	}
266	}	324	}
267		325
268	static void	326	static void
…		…
289	ev.data2 = 0;	347	ev.data2 = 0;
290		348
291	SDL_PushEvent ((SDL_Event *)&ev);	349	SDL_PushEvent ((SDL_Event *)&ev);
292	}	350	}
293		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
294	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
295		370
296	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
297		372
298	BOOT:	373	BOOT:
299	{	374	{
300	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
301	static const struct {	376	static const struct {
302	const char *name;	377	const char *name;
303	IV iv;	378	IV iv;
304	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
305	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
404	# undef const_iv	479	# undef const_iv
405	};	480	};
406		481
407	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; )
408	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
409
410	ft2_fontmap = pango_ft2_font_map_new ();
411	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
412	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
413
414	cairo_fontmap = pango_cairo_font_map_get_default ();
415	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
416	}	484	}
417		485
418	int	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
		497	void
		498	pango_init ()
		499	CODE:
		500	{
		501	opengl_fontmap = pango_opengl_font_map_new ();
		502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		504	}
		505
		506	int
419	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
420		508
421	void	509	void
422	SDL_Quit ()	510	SDL_Quit ()
423		511
424	void	512	void
…		…
430	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
431	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
432	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
433	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
434		522
		523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		525
435	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
436	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
437	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
438	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
439		530
440	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
441	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
442	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
443		536
444	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
445	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
446		539
447	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
456		549
457	++m;	550	++m;
458	}	551	}
459	}	552	}
460		553
		554	char *
		555	SDL_GetError ()
		556
461	int	557	int
462	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
463	CODE:	559	CODE:
464	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
465	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
466	);	562	);
		563	if (RETVAL)
		564	{
467	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	}
468	OUTPUT:	570	OUTPUT:
469	RETVAL	571	RETVAL
470		572
471	void	573	void
472	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
		575
		576	char *
		577	SDL_GetKeyName (int sym)
473		578
474	void	579	void
475	SDL_PollEvent ()	580	SDL_PollEvent ()
476	PPCODE:	581	PPCODE:
477	{	582	{
…		…
496	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
497	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
498	break;	603	break;
499		604
500	case SDL_MOUSEMOTION:	605	case SDL_MOUSEMOTION:
		606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		607
501	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
502	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
503	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
504	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
505	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
506	break;	613	break;
507		614
508	case SDL_MOUSEBUTTONDOWN:	615	case SDL_MOUSEBUTTONDOWN:
509	case SDL_MOUSEBUTTONUP:	616	case SDL_MOUSEBUTTONUP:
		617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		618
510	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	619	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
511	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
512	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
513	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
514	break;	623	break;
…		…
518	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
519	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
520	break;	629	break;
521	}	630	}
522		631
523	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
524	}	633	}
525	}	634	}
526		635
527	int	636	int
528	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)
…		…
541	CODE:	650	CODE:
542	#ifndef _WIN32	651	#ifndef _WIN32
543	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
544	#endif	653	#endif
545		654
546	char *
547	gl_version ()
548	CODE:
549	RETVAL = (char *)glGetString (GL_VERSION);
550	OUTPUT:
551	RETVAL
552
553	char *
554	gl_extensions ()
555	CODE:
556	RETVAL = (char *)glGetString (GL_EXTENSIONS);
557	OUTPUT:
558	RETVAL
559
560	void	655	void
561	add_font (char *file)	656	add_font (char *file)
562	CODE:	657	CODE:
563	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
564		659
565	void	660	void
566	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
567	ALIAS:	662	ALIAS:
568	load_image_file = 1	663	load_image_file = 1
…		…
610		705
611	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
612		707
613	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
614		709
		710	SDL_LockSurface (surface2);
615	EXTEND (SP, 5);	711	EXTEND (SP, 6);
616	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
617	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
618	SDL_LockSurface (surface2);
619	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
620	SDL_UnlockSurface (surface2);
621	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)));
622	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
623	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
624		719
625	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
626	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
627	}	722	}
628		723
…		…
652	}	747	}
653		748
654	void	749	void
655	error (char *message)	750	error (char *message)
656	CODE:	751	CODE:
		752	fprintf (stderr, "ERROR: %s\n", message);
657	#ifdef _WIN32	753	#ifdef _WIN32
658	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
659	#else
660	fprintf (stderr, "ERROR: %s\n", message);
661	#endif	755	#endif
662		756
663	void	757	void
664	fatal (char *message)	758	fatal (char *message)
665	CODE:	759	CODE:
		760	fprintf (stderr, "FATAL: %s\n", message);
666	#ifdef _WIN32	761	#ifdef _WIN32
667	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
668	#else
669	fprintf (stderr, "FATAL: %s\n", message);
670	#endif	763	#endif
671	exit (1);	764	_exit (1);
672		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
673	MODULE = CFClient PACKAGE = CFClient::Font	771	MODULE = CFPlus PACKAGE = CFPlus::Font
674		772
675	CFClient::Font	773	CFPlus::Font
676	new_from_file (SV *class, char *path, int id = 0)	774	new_from_file (SV *class, char *path, int id = 0)
677	CODE:	775	CODE:
678	{	776	{
679	int count;	777	int count;
680	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	778	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
683	}	781	}
684	OUTPUT:	782	OUTPUT:
685	RETVAL	783	RETVAL
686		784
687	void	785	void
688	DESTROY (CFClient::Font self)	786	DESTROY (CFPlus::Font self)
689	CODE:	787	CODE:
690	pango_font_description_free (self);	788	pango_font_description_free (self);
691		789
692	void	790	void
693	make_default (CFClient::Font self)	791	make_default (CFPlus::Font self)
694	CODE:	792	CODE:
695	default_font = self;	793	default_font = self;
696		794
697	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
698		796
699	CFClient::Layout	797	void
700	new (SV *class, int rgba = 0)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
701	CODE:	804	CODE:
702	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
703		806
704	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	807	RETVAL->pl = pango_layout_new (opengl_context);
705	RETVAL->rgba = rgba;
706	RETVAL->r = 1.;	808	RETVAL->r = 1.;
707	RETVAL->g = 1.;	809	RETVAL->g = 1.;
708	RETVAL->b = 1.;	810	RETVAL->b = 1.;
709	RETVAL->a = 1.;	811	RETVAL->a = 1.;
710	RETVAL->base_height = MIN_FONT_HEIGHT;	812	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
714	layout_update_font (RETVAL);	816	layout_update_font (RETVAL);
715	OUTPUT:	817	OUTPUT:
716	RETVAL	818	RETVAL
717		819
718	void	820	void
719	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
720	CODE:	822	CODE:
721	g_object_unref (self->pl);	823	g_object_unref (self->pl);
722	Safefree (self);	824	Safefree (self);
723		825
724	int
725	is_rgba (CFClient::Layout self)
726	CODE:
727	RETVAL = self->rgba;
728	OUTPUT:
729	RETVAL
730
731	void	826	void
732	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
733	CODE:	828	CODE:
734	{	829	{
735	STRLEN textlen;	830	STRLEN textlen;
736	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
737		832
738	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
739	}	834	}
740		835
741	void	836	void
742	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
743	CODE:	838	CODE:
744	{	839	{
745	STRLEN textlen;	840	STRLEN textlen;
746	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
747		842
748	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
749	}	844	}
750		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
751	SV *	931	SV *
752	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
753	CODE:	933	CODE:
754	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
755	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
756	OUTPUT:	936	OUTPUT:
757	RETVAL	937	RETVAL
758		938
759	void	939	void
760	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.)
761	CODE:	941	CODE:
762	self->r = r;	942	self->r = r;
763	self->g = g;	943	self->g = g;
764	self->b = b;	944	self->b = b;
765	self->a = a;	945	self->a = a;
766		946
767	void	947	void
768	set_font (CFClient::Layout self, CFClient::Font font = 0)	948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
769	CODE:	949	CODE:
770	if (self->font != font)	950	if (self->font != font)
771	{	951	{
772	self->font = font;	952	self->font = font;
773	layout_update_font (self);	953	layout_update_font (self);
774	}	954	}
775		955
776	void	956	void
777	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
778	CODE:	958	CODE:
779	if (self->base_height != base_height)	959	if (self->base_height != base_height)
780	{	960	{
781	self->base_height = base_height;	961	self->base_height = base_height;
782	layout_update_font (self);	962	layout_update_font (self);
783	}	963	}
784		964
785	void	965	void
786	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
787	CODE:	967	CODE:
788	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);
789		969
790	void	970	void
		971	set_indent (CFPlus::Layout self, int indent)
		972	CODE:
		973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		974
		975	void
		976	set_spacing (CFPlus::Layout self, int spacing)
		977	CODE:
		978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		979
		980	void
		981	set_ellipsise (CFPlus::Layout self, int ellipsise)
		982	CODE:
		983	pango_layout_set_ellipsize (self->pl,
		984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		987	: PANGO_ELLIPSIZE_NONE
		988	);
		989
		990	void
		991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		992	CODE:
		993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		994
		995	void
791	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
792	PPCODE:	997	PPCODE:
793	{	998	{
794	int w, h;	999	int w, h;
795		1000
796	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
…		…
799	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
800	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
801	}	1006	}
802		1007
803	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
804	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
805	CODE:	1022	CODE:
806	{	1023	{
807	int index, trailing;	1024	int index, trailing;
808	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);
809	RETVAL = index;	1026	RETVAL = index;
810	}	1027	}
811	OUTPUT:	1028	OUTPUT:
812	RETVAL	1029	RETVAL
813		1030
814	void	1031	void
815	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
816	PPCODE:	1033	PPCODE:
817	{	1034	{
818	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
819	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
820		1037
…		…
823	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
824	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
825	}	1042	}
826		1043
827	void	1044	void
828	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
829	PPCODE:	1046	PPCODE:
830	{	1047	pango_opengl_render_layout_subpixel (
831	SV *retval;	1048	self->pl,
832	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
		1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
833		1053
834	layout_get_pixel_size (self, &w, &h);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
835		1055
836	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)
837	{	1064	{
838	cairo_surface_t *surface;	1065	int nw = minpot (ow);
839	cairo_t *cairo;	1066	int nh = minpot (oh);
840		1067
841	retval = newSV (w * h * 4);	1068	if (nw != ow || nh != oh)
842	SvPOK_only (retval);
843	SvCUR_set (retval, w * h * 4);
844
845	memset (SvPVX (retval), 0, w * h * 4);
846
847	surface = cairo_image_surface_create_for_data (
848	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
849	cairo = cairo_create (surface);
850	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
851
852	pango_cairo_show_layout (cairo, self->pl);
853
854	cairo_destroy (cairo);
855	cairo_surface_destroy (surface);
856
857	// what a mess, and its premultiplied, too :(
858	{	1069	{
859	uint32_t *p = (uint32_t *)SvPVX (retval);	1070	if (SvOK (data_))
860	uint32_t *e = p + w * h;
861
862	while (p < e)
863	{	1071	{
864	uint32_t rgba = *p;	1072	STRLEN datalen;
865	rgba = (rgba >> 24) | (rgba << 8);	1073	char *data = SvPVbyte (data_, datalen);
866	rgba = SDL_SwapBE32 (rgba);	1074	int bpp = datalen / (ow * oh);
867	*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_);
868	}	1085	}
		1086
		1087	sv_setiv (w_, nw);
		1088	sv_setiv (h_, nh);
869	}	1089	}
870
871	EXTEND (SP, 5);
872	PUSHs (sv_2mortal (newSViv (w)));
873	PUSHs (sv_2mortal (newSViv (h)));
874	PUSHs (sv_2mortal (retval));
875	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
876	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
877	}	1090	}
878	else
879	{
880	FT_Bitmap bitmap;
881
882	retval = newSV (w * h);
883	SvPOK_only (retval);
884	SvCUR_set (retval, w * h);
885
886	bitmap.rows = h;
887	bitmap.width = w;
888	bitmap.pitch = w;
889	bitmap.buffer = (unsigned char*)SvPVX (retval);
890	bitmap.num_grays = 256;
891	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
892
893	memset (bitmap.buffer, 0, w * h);
894
895	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
896
897	EXTEND (SP, 5);
898	PUSHs (sv_2mortal (newSViv (w)));
899	PUSHs (sv_2mortal (newSViv (h)));
900	PUSHs (sv_2mortal (retval));
901	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
902	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
903	}
904	}	1091	}
905		1092
906	MODULE = CFClient PACKAGE = CFClient::Texture
907
908	void	1093	void
909	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.)
910	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
911	ALIAS:	1096	ALIAS:
912	draw_quad_alpha = 1	1097	draw_quad_alpha = 1
913	draw_quad_alpha_premultiplied = 2	1098	draw_quad_alpha_premultiplied = 2
914	CODE:	1099	CODE:
915	{	1100	{
916	HV *hv = (HV *)SvRV (self);	1101	HV *hv = (HV *)SvRV (self);
917	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1102	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
918	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1103	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
919	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1104	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
920	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
921		1105
922	if (items < 5)	1106	if (items < 5)
923	{	1107	{
924	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1108	w = SvNV (*hv_fetch (hv, "w", 1, 1));
925	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1109	h = SvNV (*hv_fetch (hv, "h", 1, 1));
926	}	1110	}
927		1111
928	if (ix)	1112	if (ix)
929	{	1113	{
930	glEnable (GL_BLEND);	1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
931	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);
932	}	1124	}
933		1125
934	glBindTexture (GL_TEXTURE_2D, name);	1126	glBindTexture (GL_TEXTURE_2D, name);
935
936	if (wrap_mode)
937	{
938	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
939	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
940	}
941		1127
942	glBegin (GL_QUADS);	1128	glBegin (GL_QUADS);
943	glTexCoord2f (0, 0); glVertex2f (x , y );	1129	glTexCoord2f (0, 0); glVertex2f (x , y );
944	glTexCoord2f (0, t); glVertex2f (x , y + h);	1130	glTexCoord2f (0, t); glVertex2f (x , y + h);
945	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1131	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
946	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1132	glTexCoord2f (s, 0); glVertex2f (x + w, y );
947	glEnd ();	1133	glEnd ();
948		1134
949	if (ix)	1135	if (ix)
		1136	{
		1137	glDisable (GL_ALPHA_TEST);
950	glDisable (GL_BLEND);	1138	glDisable (GL_BLEND);
		1139	}
951	}	1140	}
952		1141
953	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
954		1143
955	CFClient::Map	1144	CFPlus::Map
956	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
957	CODE:	1146	CODE:
958	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
959	RETVAL->x = 0;	1148	RETVAL->x = 0;
960	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
970	RETVAL->row = 0;	1159	RETVAL->row = 0;
971	OUTPUT:	1160	OUTPUT:
972	RETVAL	1161	RETVAL
973		1162
974	void	1163	void
975	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
976	CODE:	1165	CODE:
977	{	1166	{
978	map_clear (self);	1167	map_clear (self);
979	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
980	Safefree (self);	1170	Safefree (self);
981	}	1171	}
982		1172
983	void	1173	void
984	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
985	CODE:	1175	CODE:
986	map_clear (self);	1176	map_clear (self);
987		1177
988	void	1178	void
989	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
990	CODE:	1180	CODE:
991	{	1181	{
992	while (self->faces <= face)	1182	while (self->faces <= face)
993	{	1183	{
994	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
997		1187
998	self->face [face] = texid;	1188	self->face [face] = texid;
999	}	1189	}
1000		1190
1001	void	1191	void
1002	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)
1003	CODE:	1193	CODE:
1004	{	1194	{
1005	while (self->texs <= texid)	1195	while (self->texs <= texid)
1006	{	1196	{
1007	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
1019	tex->r = r;	1209	tex->r = r;
1020	tex->g = g;	1210	tex->g = g;
1021	tex->b = b;	1211	tex->b = b;
1022	tex->a = a;	1212	tex->a = a;
1023	}	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);
1024	}	1223	}
1025		1224
1026	int	1225	int
1027	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
1028	ALIAS:	1227	ALIAS:
1029	oy = 1	1228	oy = 1
		1229	x = 2
		1230	y = 3
		1231	w = 4
		1232	h = 5
1030	CODE:	1233	CODE:
1031	switch (ix)	1234	switch (ix)
1032	{	1235	{
1033	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
1034	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;
1035	}	1242	}
1036	OUTPUT:	1243	OUTPUT:
1037	RETVAL	1244	RETVAL
1038		1245
1039	void	1246	void
1040	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
1041	CODE:	1248	CODE:
1042	{	1249	{
1043	if (dx > 0)	1250	if (dx > 0)
1044	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
1045	else if (dx < 0)	1252	else if (dx < 0)
1046	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);
1047		1254
1048	if (dy > 0)	1255	if (dy > 0)
1049	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
1050	else if (dy < 0)	1257	else if (dy < 0)
1051	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);
1052		1259
1053	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
1054	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
1055		1262
1056	while (self->y < 0)	1263	while (self->y < 0)
…		…
1061	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
1062	}	1269	}
1063	}	1270	}
1064		1271
1065	void	1272	void
1066	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1067	CODE:	1274	CODE:
1068	{	1275	{
1069	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1276	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1070	uint8_t *data_end = (uint8_t *)SvEND (data_);	1277	uint8_t *data_end = (uint8_t *)SvEND (data_);
1071	mapcell *cell;	1278	mapcell *cell;
1072	int x, y, flags;	1279	int x, y, flags;
1073		1280
1074	while (data < data_end)	1281	while (data < data_end - 1)
1075	{	1282	{
1076	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
1077		1284
1078	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
1079	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
1080		1287
1081	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
1082		1289
1083	if (flags & 15)	1290	if (flags & 15)
1084	{	1291	{
1085	if (cell->darkness < 0)	1292	if (!cell->darkness)
1086	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
1087	cell->darkness = 0;	1295	cell->darkness = 256;
1088	cell->face [0] = 0;
1089	cell->face [1] = 0;
1090	cell->face [2] = 0;
1091	}	1296	}
1092		1297
1093	cell->darkness = flags & 8 ? *data++ : 255;
1094
1095	//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	}
1096		1340
1097	if (flags & 4)	1341	if (flags & 4)
1098	{	1342	{
1099	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;
1100	}	1344	}
…		…
1108	{	1352	{
1109	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;
1110	}	1354	}
1111	}	1355	}
1112	else	1356	else
1113	cell->darkness = -1;	1357	cell->darkness = 0;
1114	}	1358	}
1115	}	1359	}
1116		1360
1117	SV *	1361	SV *
1118	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)
1119	CODE:	1363	CODE:
1120	{	1364	{
1121	int x1, x;	1365	int x1, x;
1122	int y1, y;	1366	int y1, y;
1123	int z;	1367	int z;
…		…
1173	}	1417	}
1174	OUTPUT:	1418	OUTPUT:
1175	RETVAL	1419	RETVAL
1176		1420
1177	void	1421	void
1178	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)
1179	PPCODE:	1423	CODE:
1180	{	1424	{
1181	int vx, vy;	1425	int vx, vy;
1182	int x, y, z;	1426	int x, y, z;
1183	int last_name;	1427	int last_name;
1184	mapface face;	1428	mapface face;
1185	int sw4 = (sw + 3) & ~3;
1186	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1187	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1188		1429
1189	memset (darkness, 255, sw4 * sh);
1190	SvPOK_only (darkness_sv);
1191	SvCUR_set (darkness_sv, sw4 * sh);
1192
1193	vx = self->x + (self->w - sw) / 2 - shift_x;	1430	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1194	vy = self->y + (self->h - sh) / 2 - shift_y;	1431	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1195		1432
1196	/*	1433	/*
1197	int vx = self->vx = self->w >= sw	1434	int vx = self->vx = self->w >= sw
1198	? self->x + (self->w - sw) / 2	1435	? self->x + (self->w - sw) / 2
1199	: 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));
…		…
1203	: 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));
1204	*/	1441	*/
1205		1442
1206	glColor4ub (255, 255, 255, 255);	1443	glColor4ub (255, 255, 255, 255);
1207		1444
		1445	glEnable (GL_BLEND);
1208	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1446	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1209	glEnable (GL_BLEND);
1210	glEnable (GL_TEXTURE_2D);	1447	glEnable (GL_TEXTURE_2D);
1211	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1448	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1212		1449
1213	glBegin (GL_QUADS);	1450	glBegin (GL_QUADS);
1214		1451
…		…
1223	for (x = 0; x < sw; x++)	1460	for (x = 0; x < sw; x++)
1224	if (row->c0 <= x + vx && x + vx < row->c1)	1461	if (row->c0 <= x + vx && x + vx < row->c1)
1225	{	1462	{
1226	mapcell *cell = row->col + (x + vx - row->c0);	1463	mapcell *cell = row->col + (x + vx - row->c0);
1227		1464
1228	darkness[y * sw4 + x] = cell->darkness < 0
1229	? 255 - FOW_DARKNESS
1230	: 255 - cell->darkness;
1231
1232	face = cell->face [z];	1465	face = cell->face [z];
1233		1466
1234	if (face)	1467	if (face && face < self->texs)
1235	{	1468	{
1236	maptex tex = self->tex [face];	1469	maptex tex = self->tex [face];
1237
1238	int px = (x + 1) * 32 - tex.w;	1470	int px = (x + 1) * 32 - tex.w;
1239	int py = (y + 1) * 32 - tex.h;	1471	int py = (y + 1) * 32 - tex.h;
1240		1472
1241	if (last_name != tex.name)	1473	if (last_name != tex.name)
1242	{	1474	{
1243	glEnd ();	1475	glEnd ();
1244	last_name = tex.name;
1245	glBindTexture (GL_TEXTURE_2D, last_name);	1476	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1246	glBegin (GL_QUADS);	1477	glBegin (GL_QUADS);
1247	}	1478	}
1248		1479
1249	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1480	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1250	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1481	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1251	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);
1252	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1483	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1253	}	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	}
1254	}	1504	}
1255	}	1505	}
1256		1506
1257	glEnd ();	1507	glEnd ();
1258		1508
1259	glDisable (GL_TEXTURE_2D);	1509	glDisable (GL_TEXTURE_2D);
1260	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	}
1261		1636
1262	EXTEND (SP, 3);	1637	EXTEND (SP, 3);
1263	PUSHs (sv_2mortal (newSViv (sw4)));	1638	PUSHs (sv_2mortal (newSViv (sw4)));
1264	PUSHs (sv_2mortal (newSViv (sh)));	1639	PUSHs (sv_2mortal (newSViv (sh)));
1265	PUSHs (darkness_sv);	1640	PUSHs (darkness_sv);
1266	}	1641	}
1267		1642
1268	SV *	1643	SV *
1269	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)
1270	CODE:	1645	CODE:
1271	{	1646	{
1272	int x, y, x1, y1;	1647	int x, y, x1, y1;
1273	SV *data_sv = newSV (w * h * 7 + 5);	1648	SV *data_sv = newSV (w * h * 7 + 5);
1274	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1649	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1336	}	1711	}
1337	OUTPUT:	1712	OUTPUT:
1338	RETVAL	1713	RETVAL
1339		1714
1340	void	1715	void
1341	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)
1342	PPCODE:	1717	PPCODE:
1343	{	1718	{
1344	int x, y, z;	1719	int x, y, z;
1345	int w, h;	1720	int w, h;
1346	int x1, y1;	1721	int x1, y1;
…		…
1378		1753
1379	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1754	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1380	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1755	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1381	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1756	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1382		1757
1383	if (cell->darkness <= 0)	1758	if (cell->darkness == 0)
1384	{	1759	{
1385	cell->darkness = -1;	1760	cell->darkness = 0;
1386		1761
1387	for (z = 0; z <= 2; z++)	1762	for (z = 0; z <= 2; z++)
1388	{	1763	{
1389	cell->face[z] = face[z];	1764	cell->face[z] = face[z];
1390		1765
…		…
1395	}	1770	}
1396	}	1771	}
1397	}	1772	}
1398	}	1773	}
1399		1774
1400	MODULE = CFClient PACKAGE = CFClient::MixChunk	1775	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1401		1776
1402	CFClient::MixChunk	1777	CFPlus::MixChunk
1403	new_from_file (SV *class, char *path)	1778	new_from_file (SV *class, char *path)
1404	CODE:	1779	CODE:
1405	RETVAL = Mix_LoadWAV (path);	1780	RETVAL = Mix_LoadWAV (path);
1406	OUTPUT:	1781	OUTPUT:
1407	RETVAL	1782	RETVAL
1408		1783
1409	void	1784	void
1410	DESTROY (CFClient::MixChunk self)	1785	DESTROY (CFPlus::MixChunk self)
1411	CODE:	1786	CODE:
1412	Mix_FreeChunk (self);	1787	Mix_FreeChunk (self);
1413		1788
1414	int	1789	int
1415	volume (CFClient::MixChunk self, int volume = -1)	1790	volume (CFPlus::MixChunk self, int volume = -1)
1416	CODE:	1791	CODE:
1417	RETVAL = Mix_VolumeChunk (self, volume);	1792	RETVAL = Mix_VolumeChunk (self, volume);
1418	OUTPUT:	1793	OUTPUT:
1419	RETVAL	1794	RETVAL
1420		1795
1421	int	1796	int
1422	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)
1423	CODE:	1798	CODE:
1424	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1799	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1425	OUTPUT:	1800	OUTPUT:
1426	RETVAL	1801	RETVAL
1427		1802
1428	MODULE = CFClient PACKAGE = CFClient::MixMusic	1803	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1429		1804
1430	int	1805	int
1431	volume (int volume = -1)	1806	volume (int volume = -1)
1432	CODE:	1807	CODE:
1433	RETVAL = Mix_VolumeMusic (volume);	1808	RETVAL = Mix_VolumeMusic (volume);
1434	OUTPUT:	1809	OUTPUT:
1435	RETVAL	1810	RETVAL
1436		1811
1437	CFClient::MixMusic	1812	CFPlus::MixMusic
1438	new_from_file (SV *class, char *path)	1813	new_from_file (SV *class, char *path)
1439	CODE:	1814	CODE:
1440	RETVAL = Mix_LoadMUS (path);	1815	RETVAL = Mix_LoadMUS (path);
1441	OUTPUT:	1816	OUTPUT:
1442	RETVAL	1817	RETVAL
1443		1818
1444	void	1819	void
1445	DESTROY (CFClient::MixMusic self)	1820	DESTROY (CFPlus::MixMusic self)
1446	CODE:	1821	CODE:
1447	Mix_FreeMusic (self);	1822	Mix_FreeMusic (self);
1448		1823
1449	int	1824	int
1450	play (CFClient::MixMusic self, int loops = -1)	1825	play (CFPlus::MixMusic self, int loops = -1)
1451	CODE:	1826	CODE:
1452	RETVAL = Mix_PlayMusic (self, loops);	1827	RETVAL = Mix_PlayMusic (self, loops);
1453	OUTPUT:	1828	OUTPUT:
1454	RETVAL	1829	RETVAL
1455		1830
1456	MODULE = CFClient PACKAGE = CFClient::OpenGL	1831	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1457		1832
1458	BOOT:	1833	BOOT:
1459	{	1834	{
1460	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1835	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1461	static const struct {	1836	static const struct {
1462	const char *name;	1837	const char *name;
1463	IV iv;	1838	IV iv;
1464	} *civ, const_iv[] = {	1839	} *civ, const_iv[] = {
1465	# define const_iv(name) { # name, (IV)name }	1840	# define const_iv(name) { # name, (IV)name }
1466	const_iv (GL_COLOR_MATERIAL),	1841	const_iv (GL_COLOR_MATERIAL),
1467	const_iv (GL_SMOOTH),	1842	const_iv (GL_SMOOTH),
1468	const_iv (GL_FLAT),	1843	const_iv (GL_FLAT),
1469	const_iv (GL_DITHER),	1844	const_iv (GL_DITHER),
1470	const_iv (GL_BLEND),	1845	const_iv (GL_BLEND),
		1846	const_iv (GL_CULL_FACE),
1471	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),
1472	const_iv (GL_AND),	1854	const_iv (GL_AND),
1473	const_iv (GL_ONE),	1855	const_iv (GL_ONE),
1474	const_iv (GL_ZERO),	1856	const_iv (GL_ZERO),
1475	const_iv (GL_SRC_ALPHA),	1857	const_iv (GL_SRC_ALPHA),
1476	const_iv (GL_SRC_ALPHA_SATURATE),	1858	const_iv (GL_DST_ALPHA),
1477	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1859	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1478	const_iv (GL_ONE_MINUS_DST_ALPHA),	1860	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1861	const_iv (GL_SRC_ALPHA_SATURATE),
1479	const_iv (GL_RGB),	1862	const_iv (GL_RGB),
1480	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),
1481	const_iv (GL_UNSIGNED_BYTE),	1867	const_iv (GL_UNSIGNED_BYTE),
		1868	const_iv (GL_UNSIGNED_SHORT),
		1869	const_iv (GL_UNSIGNED_INT),
1482	const_iv (GL_ALPHA),	1870	const_iv (GL_ALPHA),
		1871	const_iv (GL_INTENSITY),
1483	const_iv (GL_LUMINANCE),	1872	const_iv (GL_LUMINANCE),
		1873	const_iv (GL_LUMINANCE_ALPHA),
1484	const_iv (GL_FLOAT),	1874	const_iv (GL_FLOAT),
1485	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1875	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1486	const_iv (GL_COMPILE),	1876	const_iv (GL_COMPILE),
1487	const_iv (GL_TEXTURE_1D),	1877	const_iv (GL_TEXTURE_1D),
1488	const_iv (GL_TEXTURE_2D),	1878	const_iv (GL_TEXTURE_2D),
…		…
1490	const_iv (GL_TEXTURE_MAG_FILTER),	1880	const_iv (GL_TEXTURE_MAG_FILTER),
1491	const_iv (GL_TEXTURE_MIN_FILTER),	1881	const_iv (GL_TEXTURE_MIN_FILTER),
1492	const_iv (GL_TEXTURE_ENV_MODE),	1882	const_iv (GL_TEXTURE_ENV_MODE),
1493	const_iv (GL_TEXTURE_WRAP_S),	1883	const_iv (GL_TEXTURE_WRAP_S),
1494	const_iv (GL_TEXTURE_WRAP_T),	1884	const_iv (GL_TEXTURE_WRAP_T),
		1885	const_iv (GL_REPEAT),
1495	const_iv (GL_CLAMP),	1886	const_iv (GL_CLAMP),
1496	const_iv (GL_REPEAT),	1887	const_iv (GL_CLAMP_TO_EDGE),
1497	const_iv (GL_NEAREST),	1888	const_iv (GL_NEAREST),
1498	const_iv (GL_LINEAR),	1889	const_iv (GL_LINEAR),
1499	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1890	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1500	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1891	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1501	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1892	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1502	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1893	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1503	const_iv (GL_GENERATE_MIPMAP),	1894	const_iv (GL_GENERATE_MIPMAP),
1504	const_iv (GL_MODULATE),	1895	const_iv (GL_MODULATE),
1505	const_iv (GL_DECAL),	1896	const_iv (GL_DECAL),
1506	const_iv (GL_REPLACE),	1897	const_iv (GL_REPLACE),
		1898	const_iv (GL_DEPTH_BUFFER_BIT),
1507	const_iv (GL_COLOR_BUFFER_BIT),	1899	const_iv (GL_COLOR_BUFFER_BIT),
1508	const_iv (GL_PROJECTION),	1900	const_iv (GL_PROJECTION),
1509	const_iv (GL_MODELVIEW),	1901	const_iv (GL_MODELVIEW),
1510	const_iv (GL_COLOR_LOGIC_OP),	1902	const_iv (GL_COLOR_LOGIC_OP),
1511	const_iv (GL_SEPARABLE_2D),	1903	const_iv (GL_SEPARABLE_2D),
1512	const_iv (GL_CONVOLUTION_2D),	1904	const_iv (GL_CONVOLUTION_2D),
1513	const_iv (GL_CONVOLUTION_BORDER_MODE),	1905	const_iv (GL_CONVOLUTION_BORDER_MODE),
1514	const_iv (GL_CONSTANT_BORDER),	1906	const_iv (GL_CONSTANT_BORDER),
1515	const_iv (GL_LINES),	1907	const_iv (GL_LINES),
		1908	const_iv (GL_LINE_STRIP),
		1909	const_iv (GL_LINE_LOOP),
1516	const_iv (GL_QUADS),	1910	const_iv (GL_QUADS),
1517	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),
1518	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1915	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1519	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),
1520	# undef const_iv	1921	# undef const_iv
1521	};	1922	};
1522		1923
1523	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; )
1524	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1925	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1525	}	1926	}
1526		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
1527	int glGetError ()	1949	int glGetError ()
		1950
		1951	void glFinish ()
1528		1952
1529	void glClear (int mask)	1953	void glClear (int mask)
1530		1954
1531	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)
1532	PROTOTYPE: @	1956	PROTOTYPE: @
…		…
1539		1963
1540	void glHint (int target, int mode)	1964	void glHint (int target, int mode)
1541		1965
1542	void glBlendFunc (int sfactor, int dfactor)	1966	void glBlendFunc (int sfactor, int dfactor)
1543		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
1544	void glLogicOp (int opcode)	1974	void glLogicOp (int opcode)
1545		1975
1546	void glColorMask (int red, int green, int blue, int alpha)	1976	void glColorMask (int red, int green, int blue, int alpha)
1547		1977
1548	void glMatrixMode (int mode)	1978	void glMatrixMode (int mode)
…		…
1551		1981
1552	void glPopMatrix ()	1982	void glPopMatrix ()
1553		1983
1554	void glLoadIdentity ()	1984	void glLoadIdentity ()
1555		1985
		1986	void glDrawBuffer (int buffer)
		1987
		1988	void glReadBuffer (int buffer)
		1989
1556	# 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
1557	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_)
1558		1995
1559	void glViewport (int x, int y, int width, int height)	1996	void glViewport (int x, int y, int width, int height)
1560		1997
1561	void glScissor (int x, int y, int width, int height)	1998	void glScissor (int x, int y, int width, int height)
…		…
1576		2013
1577	void glEnd ()	2014	void glEnd ()
1578		2015
1579	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)
1580	PROTOTYPE: @	2017	PROTOTYPE: @
		2018	ALIAS:
		2019	glColor_premultiply = 1
1581	CODE:	2020	CODE:
1582	// 255.999 is close enough to correctness (256 and clamp)	2021	if (ix)
1583	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	2022	{
		2023	r *= a;
		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);
1584		2040
1585	void glVertex (float x, float y, float z = 0.)	2041	void glVertex (float x, float y, float z = 0.)
1586	CODE:	2042	CODE:
1587	glVertex3f (x, y, z);	2043	glVertex3f (x, y, z);
1588		2044
…		…
1600		2056
1601	void glBindTexture (int target, int name)	2057	void glBindTexture (int target, int name)
1602		2058
1603	void glConvolutionParameter (int target, int pname, float params)	2059	void glConvolutionParameter (int target, int pname, float params)
1604	CODE:	2060	CODE:
1605	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2061	if (gl.ConvolutionParameterf)
		2062	gl.ConvolutionParameterf (target, pname, params);
1606		2063
1607	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)
1608	CODE:	2065	CODE:
1609	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2066	if (gl.ConvolutionFilter2D)
1610	(target, internalformat, width, height, format, type, data));	2067	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1611		2068
1612	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)
1613	CODE:	2070	CODE:
1614	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2071	if (gl.SeparableFilter2D)
1615	(target, internalformat, width, height, format, type, row, column));	2072	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1616		2073
1617	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)
1618		2075
1619	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)
1620		2077
1621	void glRasterPos (int x, int y)	2078	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1622	CODE:
1623	glRasterPos2i (x, y);
1624		2079
1625	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)
1626		2081
1627	int glGenTexture ()	2082	int glGenTexture ()
1628	CODE:	2083	CODE:

Diff Legend

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