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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC