[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.157 by root, Sun Oct 1 14:48:50 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	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
566		664
567	char *	665	EXTEND (SP, 3);
568	gl_extensions ()	666
569	CODE:	667	buflen = sizeof (buffer);
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);	668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
571	OUTPUT:	669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
572	RETVAL	670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
573		685
574	void	686	void
575	add_font (char *file)	687	add_font (char *file)
576	CODE:	688	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		690
583	void	691	void
584	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
585	ALIAS:	693	ALIAS:
586	load_image_file = 1	694	load_image_file = 1
…		…
628		736
629	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630		738
631	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
632		740
		741	SDL_LockSurface (surface2);
633	EXTEND (SP, 5);	742	EXTEND (SP, 6);
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	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)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
642		750
643	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
645	}	753	}
646		754
…		…
670	}	778	}
671		779
672	void	780	void
673	error (char *message)	781	error (char *message)
674	CODE:	782	CODE:
		783	fprintf (stderr, "ERROR: %s\n", message);
675	#ifdef _WIN32	784	#ifdef _WIN32
676	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	785	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
677	#else
678	fprintf (stderr, "ERROR: %s\n", message);
679	#endif	786	#endif
680		787
681	void	788	void
682	fatal (char *message)	789	fatal (char *message)
683	CODE:	790	CODE:
		791	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	792	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#else
687	fprintf (stderr, "FATAL: %s\n", message);
688	#endif	794	#endif
689	exit (1);	795	_exit (1);
690		796
		797	void
		798	_exit (int retval)
		799	CODE:
		800	_exit (retval);
		801
691	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
692		803
693	CFClient::Font	804	CFPlus::Font
694	new_from_file (SV class, char path, int id = 0)	805	new_from_file (SV class, char path, int id = 0)
695	CODE:	806	CODE:
696	{	807	{
697	int count;	808	int count;
698	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
701	}	812	}
702	OUTPUT:	813	OUTPUT:
703	RETVAL	814	RETVAL
704		815
705	void	816	void
706	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
707	CODE:	818	CODE:
708	pango_font_description_free (self);	819	pango_font_description_free (self);
709		820
710	void	821	void
711	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
712	CODE:	823	CODE:
713	default_font = self;	824	default_font = self;
714		825
715	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
716		827
717	CFClient::Layout	828	void
718	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
719	CODE:	835	CODE:
720	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
721		837
722	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
723	RETVAL->rgba = rgba;
724	RETVAL->r = 1.;	839	RETVAL->r = 1.;
725	RETVAL->g = 1.;	840	RETVAL->g = 1.;
726	RETVAL->b = 1.;	841	RETVAL->b = 1.;
727	RETVAL->a = 1.;	842	RETVAL->a = 1.;
728	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
732	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
733	OUTPUT:	848	OUTPUT:
734	RETVAL	849	RETVAL
735		850
736	void	851	void
737	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
738	CODE:	853	CODE:
739	g_object_unref (self->pl);	854	g_object_unref (self->pl);
740	Safefree (self);	855	Safefree (self);
741		856
742	int
743	is_rgba (CFClient::Layout self)
744	CODE:
745	RETVAL = self->rgba;
746	OUTPUT:
747	RETVAL
748
749	void	857	void
750	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
751	CODE:	859	CODE:
752	{	860	{
753	STRLEN textlen;	861	STRLEN textlen;
754	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
755		863
756	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
757	}	865	}
758		866
759	void	867	void
760	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
761	CODE:	869	CODE:
762	{	870	{
763	STRLEN textlen;	871	STRLEN textlen;
764	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
765		873
766	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
767	}	875	}
768		876
		877	void
		878	set_shapes (CFPlus::Layout self, ...)
		879	CODE:
		880	{
		881	PangoAttrList *attrs = 0;
		882	const char *text = pango_layout_get_text (self->pl);
		883	const char *pos = text;
		884	int arg = 4;
		885
		886	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		887	{
		888	PangoRectangle inkrect, rect;
		889	PangoAttribute *attr;
		890
		891	int x = SvIV (ST (arg - 3));
		892	int y = SvIV (ST (arg - 2));
		893	int w = SvIV (ST (arg - 1));
		894	int h = SvIV (ST (arg ));
		895
		896	inkrect.x = 0;
		897	inkrect.y = 0;
		898	inkrect.width = 0;
		899	inkrect.height = 0;
		900
		901	rect.x = x * PANGO_SCALE;
		902	rect.y = y * PANGO_SCALE;
		903	rect.width = w * PANGO_SCALE;
		904	rect.height = h * PANGO_SCALE;
		905
		906	if (!attrs)
		907	attrs = pango_layout_get_attributes (self->pl);
		908
		909	attr = pango_attr_shape_new (&inkrect, &rect);
		910	attr->start_index = pos - text;
		911	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		912	pango_attr_list_insert (attrs, attr);
		913
		914	arg += 4;
		915	pos += sizeof (OBJ_STR) - 1;
		916	}
		917
		918	if (attrs)
		919	pango_layout_set_attributes (self->pl, attrs);
		920	}
		921
		922	void
		923	get_shapes (CFPlus::Layout self)
		924	PPCODE:
		925	{
		926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		927
		928	do
		929	{
		930	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		931
		932	if (run && shape_attr_p (run))
		933	{
		934	PangoRectangle extents;
		935	pango_layout_iter_get_run_extents (iter, 0, &extents);
		936
		937	EXTEND (SP, 2);
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		940	}
		941	}
		942	while (pango_layout_iter_next_run (iter));
		943
		944	pango_layout_iter_free (iter);
		945	}
		946
		947	int
		948	has_wrapped (CFPlus::Layout self)
		949	CODE:
		950	{
		951	int lines = 1;
		952	const char *text = pango_layout_get_text (self->pl);
		953
		954	while (*text)
		955	lines += *text++ == '\n';
		956
		957	RETVAL = lines < pango_layout_get_line_count (self->pl);
		958	}
		959	OUTPUT:
		960	RETVAL
		961
769	SV *	962	SV *
770	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
771	CODE:	964	CODE:
772	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
773	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
774	OUTPUT:	967	OUTPUT:
775	RETVAL	968	RETVAL
776		969
777	void	970	void
778	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
779	CODE:	972	CODE:
780	self->r = r;	973	self->r = r;
781	self->g = g;	974	self->g = g;
782	self->b = b;	975	self->b = b;
783	self->a = a;	976	self->a = a;
784		977
785	void	978	void
786	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
787	CODE:	980	CODE:
788	if (self->font != font)	981	if (self->font != font)
789	{	982	{
790	self->font = font;	983	self->font = font;
791	layout_update_font (self);	984	layout_update_font (self);
792	}	985	}
793		986
794	void	987	void
795	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
796	CODE:	989	CODE:
797	if (self->base_height != base_height)	990	if (self->base_height != base_height)
798	{	991	{
799	self->base_height = base_height;	992	self->base_height = base_height;
800	layout_update_font (self);	993	layout_update_font (self);
801	}	994	}
802		995
803	void	996	void
804	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
805	CODE:	998	CODE:
806	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
807		1000
808	void	1001	void
809	set_indent (CFClient::Layout self, int indent)	1002	set_indent (CFPlus::Layout self, int indent)
810	CODE:	1003	CODE:
811	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
812		1005
813	void	1006	void
814	set_spacing (CFClient::Layout self, int spacing)	1007	set_spacing (CFPlus::Layout self, int spacing)
815	CODE:	1008	CODE:
816	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
817		1010
818	void	1011	void
819	set_ellipsise (CFClient::Layout self, int ellipsise)	1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
820	CODE:	1013	CODE:
821	pango_layout_set_ellipsize (self->pl,	1014	pango_layout_set_ellipsize (self->pl,
822	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
823	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
824	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
825	: PANGO_ELLIPSIZE_NONE	1018	: PANGO_ELLIPSIZE_NONE
826	);	1019	);
827		1020
828	void	1021	void
829	set_single_paragraph_mode (CFClient::Layout self, int spm)	1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
830	CODE:	1023	CODE:
831	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
832		1025
833	void	1026	void
834	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
835	PPCODE:	1028	PPCODE:
836	{	1029	{
837	int w, h;	1030	int w, h;
838		1031
839	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
842	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
843	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
844	}	1037	}
845		1038
846	int	1039	int
		1040	descent (CFPlus::Layout self)
		1041	CODE:
		1042	{
		1043	PangoRectangle rect;
		1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1046	RETVAL = PANGO_DESCENT (rect);
		1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	int
847	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
848	CODE:	1053	CODE:
849	{	1054	{
850	int index, trailing;	1055	int index, trailing;
851	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
852	RETVAL = index;	1057	RETVAL = index;
853	}	1058	}
854	OUTPUT:	1059	OUTPUT:
855	RETVAL	1060	RETVAL
856		1061
857	void	1062	void
858	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
859	PPCODE:	1064	PPCODE:
860	{	1065	{
861	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
862	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
863		1068
…		…
866	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
867	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
868	}	1073	}
869		1074
870	void	1075	void
871	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
872	PPCODE:	1077	PPCODE:
873	{	1078	pango_opengl_render_layout_subpixel (
874	SV *retval;	1079	self->pl,
875	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
		1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
876		1084
877	layout_get_pixel_size (self, &w, &h);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
878		1086
879	if (self->rgba)	1087	void
		1088	pad2pot (SV data_, SV w_, SV *h_)
		1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
		1093
		1094	if (ow && oh)
880	{	1095	{
881	cairo_surface_t *surface;	1096	int nw = minpot (ow);
882	cairo_t *cairo;	1097	int nh = minpot (oh);
883		1098
884	retval = newSV (w * h * 4);	1099	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	{	1100	{
902	uint32_t p = (uint32_t )SvPVX (retval);	1101	if (SvOK (data_))
903	uint32_t e = p + w h;
904
905	while (p < e)
906	{	1102	{
907	uint32_t rgba = *p;	1103	STRLEN datalen;
908	rgba = (rgba >> 24) \| (rgba << 8);	1104	char *data = SvPVbyte (data_, datalen);
909	rgba = SDL_SwapBE32 (rgba);	1105	int bpp = datalen / (ow * oh);
910	*p++ = rgba;	1106	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1107
		1108	SvPOK_only (result_);
		1109	SvCUR_set (result_, nw * nh * bpp);
		1110
		1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1114
		1115	sv_setsv (data_, result_);
911	}	1116	}
		1117
		1118	sv_setiv (w_, nw);
		1119	sv_setiv (h_, nh);
912	}	1120	}
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	}	1121	}
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	}	1122	}
948		1123
949	MODULE = CFClient PACKAGE = CFClient::Texture
950
951	void	1124	void
952	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1125	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
953	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
954	ALIAS:	1127	ALIAS:
955	draw_quad_alpha = 1	1128	draw_quad_alpha = 1
956	draw_quad_alpha_premultiplied = 2	1129	draw_quad_alpha_premultiplied = 2
957	CODE:	1130	CODE:
958	{	1131	{
959	HV hv = (HV )SvRV (self);	1132	HV hv = (HV )SvRV (self);
960	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1133	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
961	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1134	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
962	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1135	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
963	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
964		1136
965	if (items < 5)	1137	if (items < 5)
966	{	1138	{
967	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1139	w = SvNV (*hv_fetch (hv, "w", 1, 1));
968	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1140	h = SvNV (*hv_fetch (hv, "h", 1, 1));
969	}	1141	}
970		1142
971	if (ix)	1143	if (ix)
972	{	1144	{
973	glEnable (GL_BLEND);	1145	glEnable (GL_BLEND);
		1146
		1147	if (ix == 2)
974	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1148	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1149	else
		1150	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1151	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1152
		1153	glEnable (GL_ALPHA_TEST);
		1154	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1155	}
976		1156
977	glBindTexture (GL_TEXTURE_2D, name);	1157	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		1158
985	glBegin (GL_QUADS);	1159	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1160	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1161	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1162	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
989	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1163	glTexCoord2f (s, 0); glVertex2f (x + w, y );
990	glEnd ();	1164	glEnd ();
991		1165
992	if (ix)	1166	if (ix)
		1167	{
		1168	glDisable (GL_ALPHA_TEST);
993	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
		1170	}
994	}	1171	}
995		1172
996	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
997		1174
998	CFClient::Map	1175	CFPlus::Map
999	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
1000	CODE:	1177	CODE:
1001	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
1002	RETVAL->x = 0;	1179	RETVAL->x = 0;
1003	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
1013	RETVAL->row = 0;	1190	RETVAL->row = 0;
1014	OUTPUT:	1191	OUTPUT:
1015	RETVAL	1192	RETVAL
1016		1193
1017	void	1194	void
1018	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
1019	CODE:	1196	CODE:
1020	{	1197	{
1021	map_clear (self);	1198	map_clear (self);
1022	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
1023	Safefree (self);	1201	Safefree (self);
1024	}	1202	}
1025		1203
1026	void	1204	void
1027	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
1028	CODE:	1206	CODE:
1029	map_clear (self);	1207	map_clear (self);
1030		1208
1031	void	1209	void
1032	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1033	CODE:	1211	CODE:
1034	{	1212	{
1035	while (self->faces <= face)	1213	while (self->faces <= face)
1036	{	1214	{
1037	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1040		1218
1041	self->face [face] = texid;	1219	self->face [face] = texid;
1042	}	1220	}
1043		1221
1044	void	1222	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)	1223	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:	1224	CODE:
1047	{	1225	{
1048	while (self->texs <= texid)	1226	while (self->texs <= texid)
1049	{	1227	{
1050	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1062	tex->r = r;	1240	tex->r = r;
1063	tex->g = g;	1241	tex->g = g;
1064	tex->b = b;	1242	tex->b = b;
1065	tex->a = a;	1243	tex->a = a;
1066	}	1244	}
		1245
		1246	// somewhat hackish, but for textures that require it, it really
		1247	// improves the look, and most others don't suffer.
		1248	glBindTexture (GL_TEXTURE_2D, name);
		1249	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1250	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1251	// use uglier nearest interpolation because linear suffers
		1252	// from transparent color bleeding and ugly wrapping effects.
		1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1067	}	1254	}
1068		1255
1069	int	1256	int
1070	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1071	ALIAS:	1258	ALIAS:
1072	oy = 1	1259	oy = 1
		1260	x = 2
		1261	y = 3
		1262	w = 4
		1263	h = 5
1073	CODE:	1264	CODE:
1074	switch (ix)	1265	switch (ix)
1075	{	1266	{
1076	case 0: RETVAL = self->ox; break;	1267	case 0: RETVAL = self->ox; break;
1077	case 1: RETVAL = self->oy; break;	1268	case 1: RETVAL = self->oy; break;
		1269	case 2: RETVAL = self->x; break;
		1270	case 3: RETVAL = self->y; break;
		1271	case 4: RETVAL = self->w; break;
		1272	case 5: RETVAL = self->h; break;
1078	}	1273	}
1079	OUTPUT:	1274	OUTPUT:
1080	RETVAL	1275	RETVAL
1081		1276
1082	void	1277	void
1083	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1084	CODE:	1279	CODE:
1085	{	1280	{
1086	if (dx > 0)	1281	if (dx > 0)
1087	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1088	else if (dx < 0)	1283	else if (dx < 0)
1089	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1090		1285
1091	if (dy > 0)	1286	if (dy > 0)
1092	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1093	else if (dy < 0)	1288	else if (dy < 0)
1094	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1095		1290
1096	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1097	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1098		1293
1099	while (self->y < 0)	1294	while (self->y < 0)
…		…
1104	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1105	}	1300	}
1106	}	1301	}
1107		1302
1108	void	1303	void
1109	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1110	CODE:	1305	CODE:
1111	{	1306	{
1112	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1113	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
1114	mapcell *cell;	1309	mapcell *cell;
1115	int x, y, flags;	1310	int x, y, flags;
1116		1311
1117	while (data < data_end)	1312	while (data < data_end - 1)
1118	{	1313	{
1119	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1120		1315
1121	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
1122	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
1123		1318
1124	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1125		1320
1126	if (flags & 15)	1321	if (flags & 15)
1127	{	1322	{
1128	if (cell->darkness < 0)	1323	if (!cell->darkness)
1129	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1130	cell->darkness = 0;	1326	cell->darkness = 256;
1131	cell->face [0] = 0;
1132	cell->face [1] = 0;
1133	cell->face [2] = 0;
1134	}	1327	}
1135		1328
1136	cell->darkness = flags & 8 ? *data++ : 255;
1137
1138	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
1139		1370
1140	if (flags & 4)	1371	if (flags & 4)
1141	{	1372	{
1142	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1143	}	1374	}
…		…
1151	{	1382	{
1152	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1153	}	1384	}
1154	}	1385	}
1155	else	1386	else
1156	cell->darkness = -1;	1387	cell->darkness = 0;
1157	}	1388	}
1158	}	1389	}
1159		1390
1160	SV *	1391	SV *
1161	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1162	CODE:	1393	CODE:
1163	{	1394	{
1164	int x1, x;	1395	int x1, x;
1165	int y1, y;	1396	int y1, y;
1166	int z;	1397	int z;
…		…
1216	}	1447	}
1217	OUTPUT:	1448	OUTPUT:
1218	RETVAL	1449	RETVAL
1219		1450
1220	void	1451	void
1221	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1222	PPCODE:	1453	CODE:
1223	{	1454	{
1224	int vx, vy;	1455	int vx, vy;
1225	int x, y, z;	1456	int x, y, z;
1226	int last_name;	1457	int last_name;
1227	mapface face;	1458	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		1459
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;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1237	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1238		1462
1239	/*	1463	/*
1240	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1241	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1242	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1466	: 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));	1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1247	*/	1471	*/
1248		1472
1249	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1250		1474
		1475	glEnable (GL_BLEND);
1251	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1252	glEnable (GL_BLEND);
1253	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1254	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1255		1479
1256	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1257		1481
…		…
1266	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1267	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1268	{	1492	{
1269	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1270		1494
1271	darkness[y * sw4 + x] = cell->darkness < 0
1272	? 255 - FOW_DARKNESS
1273	: 255 - cell->darkness;
1274
1275	face = cell->face [z];	1495	face = cell->face [z];
1276		1496
1277	if (face)	1497	if (face && face < self->texs)
1278	{	1498	{
1279	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1280
1281	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1282	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1283		1502
1284	if (last_name != tex.name)	1503	if (last_name != tex.name)
1285	{	1504	{
1286	glEnd ();	1505	glEnd ();
1287	last_name = tex.name;
1288	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1289	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1290	}	1508	}
1291		1509
1292	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1293	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1294	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1295	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1296	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1297	}	1534	}
1298	}	1535	}
1299		1536
1300	glEnd ();	1537	glEnd ();
1301		1538
1302	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1303	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
		1574	void
		1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1576	CODE:
		1577	{
		1578	static float color[16][3] = {
		1579	{ 0.00F, 0.00F, 0.00F },
		1580	{ 1.00F, 1.00F, 1.00F },
		1581	{ 0.00F, 0.00F, 0.55F },
		1582	{ 1.00F, 0.00F, 0.00F },
		1583
		1584	{ 1.00F, 0.54F, 0.00F },
		1585	{ 0.11F, 0.56F, 1.00F },
		1586	{ 0.93F, 0.46F, 0.00F },
		1587	{ 0.18F, 0.54F, 0.34F },
		1588
		1589	{ 0.56F, 0.73F, 0.56F },
		1590	{ 0.80F, 0.80F, 0.80F },
		1591	{ 0.55F, 0.41F, 0.13F },
		1592	{ 0.99F, 0.77F, 0.26F },
		1593
		1594	{ 0.74F, 0.65F, 0.41F },
		1595
		1596	{ 0.00F, 1.00F, 1.00F },
		1597	{ 1.00F, 0.00F, 1.00F },
		1598	{ 1.00F, 1.00F, 0.00F },
		1599	};
		1600
		1601	int x, y;
		1602
		1603	glEnable (GL_TEXTURE_2D);
		1604	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1605	glEnable (GL_BLEND);
		1606	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1607	glBegin (GL_QUADS);
		1608
		1609	for (y = 0; y < h; y++)
		1610	for (x = 0; x < w; x++)
		1611	{
		1612	unsigned char m = data [x + y * w];
		1613
		1614	if (m)
		1615	{
		1616	float *c = color [m & 15];
		1617
		1618	float tx1 = m & 0x40 ? 0.5 : 0.;
		1619	float tx2 = tx1 + 0.5;
		1620
		1621	glColor4f (c[0], c[1], c[2], 0.75);
		1622	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1623	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1624	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1625	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1626	}
		1627	}
		1628
		1629	glEnd ();
		1630	glDisable (GL_BLEND);
		1631	glDisable (GL_TEXTURE_2D);
		1632	}
		1633
		1634	void
		1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1636	PPCODE:
		1637	{
		1638	int vx, vy;
		1639	int x, y;
		1640	int sw4 = (sw + 3) & ~3;
		1641	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1642	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1643
		1644	memset (darkness, 255, sw4 * sh);
		1645	SvPOK_only (darkness_sv);
		1646	SvCUR_set (darkness_sv, sw4 * sh);
		1647
		1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1650
		1651	for (y = 0; y < sh; y++)
		1652	if (0 <= y + vy && y + vy < self->rows)
		1653	{
		1654	maprow *row = self->row + (y + vy);
		1655
		1656	for (x = 0; x < sw; x++)
		1657	if (row->c0 <= x + vx && x + vx < row->c1)
		1658	{
		1659	mapcell *cell = row->col + (x + vx - row->c0);
		1660
		1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
		1663	: 255 - FOW_DARKNESS;
		1664	}
		1665	}
1304		1666
1305	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1306	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1307	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1308	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1309	}	1671	}
1310		1672
1311	SV *	1673	SV *
1312	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1313	CODE:	1675	CODE:
1314	{	1676	{
1315	int x, y, x1, y1;	1677	int x, y, x1, y1;
1316	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1317	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1379	}	1741	}
1380	OUTPUT:	1742	OUTPUT:
1381	RETVAL	1743	RETVAL
1382		1744
1383	void	1745	void
1384	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1385	PPCODE:	1747	PPCODE:
1386	{	1748	{
1387	int x, y, z;	1749	int x, y, z;
1388	int w, h;	1750	int w, h;
1389	int x1, y1;	1751	int x1, y1;
…		…
1421		1783
1422	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1423	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1424	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1425		1787
1426	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1427	{	1789	{
1428	cell->darkness = -1;	1790	cell->darkness = 0;
1429		1791
1430	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1431	{	1793	{
1432	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1433		1795
…		…
1438	}	1800	}
1439	}	1801	}
1440	}	1802	}
1441	}	1803	}
1442		1804
1443	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1444		1806
1445	CFClient::MixChunk	1807	CFPlus::MixChunk
1446	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1447	CODE:	1809	CODE:
1448	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1449	OUTPUT:	1811	OUTPUT:
1450	RETVAL	1812	RETVAL
1451		1813
1452	void	1814	void
1453	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1454	CODE:	1816	CODE:
1455	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1456		1818
1457	int	1819	int
1458	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1459	CODE:	1821	CODE:
1460	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1461	OUTPUT:	1823	OUTPUT:
1462	RETVAL	1824	RETVAL
1463		1825
1464	int	1826	int
1465	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1466	CODE:	1828	CODE:
1467	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1468	OUTPUT:	1830	OUTPUT:
1469	RETVAL	1831	RETVAL
1470		1832
1471	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1472		1834
1473	int	1835	int
1474	volume (int volume = -1)	1836	volume (int volume = -1)
1475	CODE:	1837	CODE:
1476	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1477	OUTPUT:	1839	OUTPUT:
1478	RETVAL	1840	RETVAL
1479		1841
1480	CFClient::MixMusic	1842	CFPlus::MixMusic
1481	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1482	CODE:	1844	CODE:
1483	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1484	OUTPUT:	1846	OUTPUT:
1485	RETVAL	1847	RETVAL
1486		1848
1487	void	1849	void
1488	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1489	CODE:	1851	CODE:
1490	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1491		1853
1492	int	1854	int
1493	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1494	CODE:	1856	CODE:
1495	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1496	OUTPUT:	1858	OUTPUT:
1497	RETVAL	1859	RETVAL
1498		1860
1499	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1500		1862
1501	BOOT:	1863	BOOT:
1502	{	1864	{
1503	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1504	static const struct {	1866	static const struct {
1505	const char *name;	1867	const char *name;
1506	IV iv;	1868	IV iv;
1507	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1508	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
1509	const_iv (GL_COLOR_MATERIAL),	1871	const_iv (GL_COLOR_MATERIAL),
1510	const_iv (GL_SMOOTH),	1872	const_iv (GL_SMOOTH),
1511	const_iv (GL_FLAT),	1873	const_iv (GL_FLAT),
1512	const_iv (GL_DITHER),	1874	const_iv (GL_DITHER),
1513	const_iv (GL_BLEND),	1875	const_iv (GL_BLEND),
		1876	const_iv (GL_CULL_FACE),
1514	const_iv (GL_SCISSOR_TEST),	1877	const_iv (GL_SCISSOR_TEST),
		1878	const_iv (GL_DEPTH_TEST),
		1879	const_iv (GL_ALPHA_TEST),
		1880	const_iv (GL_NORMALIZE),
		1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1515	const_iv (GL_AND),	1884	const_iv (GL_AND),
1516	const_iv (GL_ONE),	1885	const_iv (GL_ONE),
1517	const_iv (GL_ZERO),	1886	const_iv (GL_ZERO),
1518	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
1519	const_iv (GL_SRC_ALPHA_SATURATE),	1888	const_iv (GL_DST_ALPHA),
1520	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1521	const_iv (GL_ONE_MINUS_DST_ALPHA),	1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1891	const_iv (GL_SRC_ALPHA_SATURATE),
1522	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1523	const_iv (GL_RGBA),	1893	const_iv (GL_RGBA),
		1894	const_iv (GL_RGBA4),
		1895	const_iv (GL_RGBA8),
		1896	const_iv (GL_RGB5_A1),
1524	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
		1898	const_iv (GL_UNSIGNED_SHORT),
		1899	const_iv (GL_UNSIGNED_INT),
1525	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
		1901	const_iv (GL_INTENSITY),
1526	const_iv (GL_LUMINANCE),	1902	const_iv (GL_LUMINANCE),
		1903	const_iv (GL_LUMINANCE_ALPHA),
1527	const_iv (GL_FLOAT),	1904	const_iv (GL_FLOAT),
1528	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1905	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1529	const_iv (GL_COMPILE),	1906	const_iv (GL_COMPILE),
1530	const_iv (GL_TEXTURE_1D),	1907	const_iv (GL_TEXTURE_1D),
1531	const_iv (GL_TEXTURE_2D),	1908	const_iv (GL_TEXTURE_2D),
…		…
1533	const_iv (GL_TEXTURE_MAG_FILTER),	1910	const_iv (GL_TEXTURE_MAG_FILTER),
1534	const_iv (GL_TEXTURE_MIN_FILTER),	1911	const_iv (GL_TEXTURE_MIN_FILTER),
1535	const_iv (GL_TEXTURE_ENV_MODE),	1912	const_iv (GL_TEXTURE_ENV_MODE),
1536	const_iv (GL_TEXTURE_WRAP_S),	1913	const_iv (GL_TEXTURE_WRAP_S),
1537	const_iv (GL_TEXTURE_WRAP_T),	1914	const_iv (GL_TEXTURE_WRAP_T),
		1915	const_iv (GL_REPEAT),
1538	const_iv (GL_CLAMP),	1916	const_iv (GL_CLAMP),
1539	const_iv (GL_REPEAT),	1917	const_iv (GL_CLAMP_TO_EDGE),
1540	const_iv (GL_NEAREST),	1918	const_iv (GL_NEAREST),
1541	const_iv (GL_LINEAR),	1919	const_iv (GL_LINEAR),
1542	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1920	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1543	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1921	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1544	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1922	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1545	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1923	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1546	const_iv (GL_GENERATE_MIPMAP),	1924	const_iv (GL_GENERATE_MIPMAP),
1547	const_iv (GL_MODULATE),	1925	const_iv (GL_MODULATE),
1548	const_iv (GL_DECAL),	1926	const_iv (GL_DECAL),
1549	const_iv (GL_REPLACE),	1927	const_iv (GL_REPLACE),
		1928	const_iv (GL_DEPTH_BUFFER_BIT),
1550	const_iv (GL_COLOR_BUFFER_BIT),	1929	const_iv (GL_COLOR_BUFFER_BIT),
1551	const_iv (GL_PROJECTION),	1930	const_iv (GL_PROJECTION),
1552	const_iv (GL_MODELVIEW),	1931	const_iv (GL_MODELVIEW),
1553	const_iv (GL_COLOR_LOGIC_OP),	1932	const_iv (GL_COLOR_LOGIC_OP),
1554	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1555	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1556	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1557	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1558	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
		1939	const_iv (GL_LINE_LOOP),
1559	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1560	const_iv (GL_LINE_LOOP),	1941	const_iv (GL_QUAD_STRIP),
		1942	const_iv (GL_TRIANGLES),
		1943	const_iv (GL_TRIANGLE_STRIP),
		1944	const_iv (GL_TRIANGLE_FAN),
1561	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1945	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1562	const_iv (GL_FASTEST),	1946	const_iv (GL_FASTEST),
		1947	const_iv (GL_V2F),
		1948	const_iv (GL_V3F),
		1949	const_iv (GL_T2F_V3F),
		1950	const_iv (GL_T2F_N3F_V3F),
1563	# undef const_iv	1951	# undef const_iv
1564	};	1952	};
1565		1953
1566	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1954	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1567	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1955	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1568	}	1956	}
1569		1957
		1958	char *
		1959	gl_vendor ()
		1960	CODE:
		1961	RETVAL = (char *)glGetString (GL_VENDOR);
		1962	OUTPUT:
		1963	RETVAL
		1964
		1965	char *
		1966	gl_version ()
		1967	CODE:
		1968	RETVAL = (char *)glGetString (GL_VERSION);
		1969	OUTPUT:
		1970	RETVAL
		1971
		1972	char *
		1973	gl_extensions ()
		1974	CODE:
		1975	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1976	OUTPUT:
		1977	RETVAL
		1978
1570	int glGetError ()	1979	int glGetError ()
		1980
		1981	void glFinish ()
1571		1982
1572	void glClear (int mask)	1983	void glClear (int mask)
1573		1984
1574	void glClearColor (float r, float g, float b, float a = 1.0)	1985	void glClearColor (float r, float g, float b, float a = 1.0)
1575	PROTOTYPE: @	1986	PROTOTYPE: @
…		…
1582		1993
1583	void glHint (int target, int mode)	1994	void glHint (int target, int mode)
1584		1995
1585	void glBlendFunc (int sfactor, int dfactor)	1996	void glBlendFunc (int sfactor, int dfactor)
1586		1997
		1998	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1999	CODE:
		2000	gl_BlendFuncSeparate (sa, da, saa, daa);
		2001
		2002	void glDepthMask (int flag)
		2003
1587	void glLogicOp (int opcode)	2004	void glLogicOp (int opcode)
1588		2005
1589	void glColorMask (int red, int green, int blue, int alpha)	2006	void glColorMask (int red, int green, int blue, int alpha)
1590		2007
1591	void glMatrixMode (int mode)	2008	void glMatrixMode (int mode)
…		…
1594		2011
1595	void glPopMatrix ()	2012	void glPopMatrix ()
1596		2013
1597	void glLoadIdentity ()	2014	void glLoadIdentity ()
1598		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
		2019
1599	# near and far are due to microsofts buggy c compiler	2020	# near_ and far_ are due to microsofts buggy "c" compiler
		2021	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2022
		2023	# 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_)	2024	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1601		2025
1602	void glViewport (int x, int y, int width, int height)	2026	void glViewport (int x, int y, int width, int height)
1603		2027
1604	void glScissor (int x, int y, int width, int height)	2028	void glScissor (int x, int y, int width, int height)
…		…
1619		2043
1620	void glEnd ()	2044	void glEnd ()
1621		2045
1622	void glColor (float r, float g, float b, float a = 1.0)	2046	void glColor (float r, float g, float b, float a = 1.0)
1623	PROTOTYPE: @	2047	PROTOTYPE: @
		2048	ALIAS:
		2049	glColor_premultiply = 1
1624	CODE:	2050	CODE:
1625	glColor4ub (MIN ((int)(r * 255.f), 255),	2051	if (ix)
1626	MIN ((int)(g * 255.f), 255),	2052	{
1627	MIN ((int)(b * 255.f), 255),	2053	r *= a;
1628	MIN ((int)(a * 255.f), 255));	2054	g *= a;
		2055	b *= a;
		2056	}
		2057	// microsoft visual "c" rounds instead of truncating...
		2058	glColor4f (r, g, b, a);
		2059
		2060	void glInterleavedArrays (int format, int stride, char *data)
		2061
		2062	void glDrawElements (int mode, int count, int type, char *indices)
		2063
		2064	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2065
		2066	void glRasterPos (float x, float y, float z = 0.)
		2067	CODE:
		2068	glRasterPos3f (0, 0, z);
		2069	glBitmap (0, 0, 0, 0, x, y, 0);
1629		2070
1630	void glVertex (float x, float y, float z = 0.)	2071	void glVertex (float x, float y, float z = 0.)
1631	CODE:	2072	CODE:
1632	glVertex3f (x, y, z);	2073	glVertex3f (x, y, z);
1633		2074
…		…
1645		2086
1646	void glBindTexture (int target, int name)	2087	void glBindTexture (int target, int name)
1647		2088
1648	void glConvolutionParameter (int target, int pname, float params)	2089	void glConvolutionParameter (int target, int pname, float params)
1649	CODE:	2090	CODE:
1650	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2091	if (gl.ConvolutionParameterf)
		2092	gl.ConvolutionParameterf (target, pname, params);
1651		2093
1652	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2094	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1653	CODE:	2095	CODE:
1654	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2096	if (gl.ConvolutionFilter2D)
1655	(target, internalformat, width, height, format, type, data));	2097	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1656		2098
1657	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2099	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1658	CODE:	2100	CODE:
1659	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2101	if (gl.SeparableFilter2D)
1660	(target, internalformat, width, height, format, type, row, column));	2102	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1661		2103
1662	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2104	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1663		2105
1664	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2106	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1665		2107
1666	void glRasterPos (int x, int y)	2108	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1667	CODE:
1668	glRasterPos2i (x, y);
1669		2109
1670	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2110	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1671		2111
1672	int glGenTexture ()	2112	int glGenTexture ()
1673	CODE:	2113	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.157 by root, Sun Oct 1 14:48:50 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.157 by root, Sun Oct 1 14:48:50 2006 UTC