ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.53 by root, Wed Apr 19 21:38:04 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
		3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
2	# include <malloc.h>	4	# include <malloc.h>
		5	# include <windows.h>
		6	# include <wininet.h>
		7	# pragma warning(disable:4244)
3	#endif	8	#endif
4		9
5	#include "EXTERN.h"	10	#include "EXTERN.h"
6	#include "perl.h"	11	#include "perl.h"
7	#include "XSUB.h"	12	#include "XSUB.h"
8		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
		18	#include <math.h>
9	#include <string.h>	19	#include <string.h>
10	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
11		22
12	#include <SDL.h>	23	#include <SDL.h>
		24	#include <SDL_endian.h>
13	#include <SDL_image.h>	25	#include <SDL_image.h>
14	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
16		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
17	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
18		33
19	#include <pango/pango.h>	34	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		35
23	#ifndef _WIN32	36	#ifndef _WIN32
24	# include <sys/types.h>	37	# include <sys/types.h>
25	# include <sys/socket.h>	38	# include <sys/socket.h>
26	# include <netinet/in.h>	39	# include <netinet/in.h>
…		…
33	typedef signed char int8_t;	46	typedef signed char int8_t;
34	typedef signed short int16_t;	47	typedef signed short int16_t;
35	typedef signed int int32_t;	48	typedef signed int int32_t;
36	#endif	49	#endif
37		50
		51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
		52
38	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
39		54
40	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
41	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
42		57
		58	#define MIN_FONT_HEIGHT 10
		59
		60	#if 0
		61	# define PARACHUTE SDL_INIT_NOPARACHUTE
		62	#else
		63	# define PARACHUTE 0
		64	#endif
		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
43	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
44	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
45		91
46	static PangoContext *context;	92	typedef PangoFontDescription *CFPlus__Font;
47	static PangoFontMap *fontmap;	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	}
48		111
49	typedef struct cf_layout {	112	typedef struct cf_layout {
50	PangoLayout *pl;	113	PangoLayout *pl;
		114	float r, g, b, a; // default color for rgba mode
51	int base_height;	115	int base_height;
		116	CFPlus__Font font;
52	} *CFClient__Layout;	117	} *CFPlus__Layout;
		118
		119	static CFPlus__Font default_font;
		120	static PangoContext *opengl_context;
		121	static PangoFontMap *opengl_fontmap;
53		122
54	static void	123	static void
55	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
56	{	125	{
57	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
		127	#ifdef FC_HINT_STYLE
		128	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		129	#endif
58	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
59	}	131	}
60		132
61	static void	133	static void
62	layout_update (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
63	{	135	{
64	/* 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
65	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
66	*/	138	*/
67	PangoFontDescription *font = pango_context_get_font_description (context);	139	PangoFontDescription *font = self->font ? self->font : default_font;
68		140
69	int height = self->base_height * (PANGO_SCALE * 8 / 10);
70
71	if (pango_font_description_get_size (font) != height)
72	{
73	pango_font_description_set_absolute_size (font, height);	141	pango_font_description_set_absolute_size (font,
74	pango_layout_context_changed (self->pl);	142	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
75	}	143
		144	pango_layout_set_font_description (self->pl, font);
76	}	145	}
77		146
78	static void	147	static void
79	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	148	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
80	{	149	{
81	layout_update (self);	150	PangoRectangle rect;
82		151
		152	// get_pixel_* wrongly rounds down
83	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
84		154
85	*w = (*w + 3) & ~3;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
86	if (!*w) *w = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
87	if (!*h) *h = 1;	157
		158	if (!rect.width) rect.width = 1;
		159	if (!rect.height) rect.height = 1;
		160
		161	*w = rect.width;
		162	*h = rect.height;
88	}	163	}
89		164
90	typedef uint16_t mapface;	165	typedef uint16_t mapface;
91		166
92	typedef struct {	167	typedef struct {
…		…
95	float s, t;	170	float s, t;
96	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
97	} maptex;	172	} maptex;
98		173
99	typedef struct {	174	typedef struct {
100	int16_t darkness;	175	uint32_t player;
101	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
102	} mapcell;	179	} mapcell;
103		180
104	typedef struct {	181	typedef struct {
105	int32_t c0, c1;	182	int32_t c0, c1;
106	mapcell *col;	183	mapcell *col;
…		…
115	int texs;	192	int texs;
116	maptex *tex;	193	maptex *tex;
117		194
118	int32_t rows;	195	int32_t rows;
119	maprow *row;	196	maprow *row;
120	} *CFClient__Map;	197	} *CFPlus__Map;
121		198
122	static char *	199	static char *
123	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
124	{	201	{
125	char *p;	202	char *p;
…		…
143		220
144	#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))
145	#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))
146		223
147	static maprow *	224	static maprow *
148	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
149	{	226	{
150	if (0 > y)	227	if (0 > y)
151	{	228	{
152	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
153	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
191		268
192	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
193	}	270	}
194		271
195	static mapcell *	272	static mapcell *
196	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
197	{	274	{
198	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
199	}	276	}
200		277
201	static void	278	static void
202	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
203	{	280	{
204	int r;	281	int r;
205		282
206	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
207	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
215	self->row = 0;	292	self->row = 0;
216	self->rows = 0;	293	self->rows = 0;
217	}	294	}
218		295
219	static void	296	static void
220	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)
221	{	298	{
222	int x, y;	299	int x, y;
223	maprow *row;	300	maprow *row;
		301	mapcell *cell;
224		302
225	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
226	if (y >= 0)	304	if (y >= 0)
227	{	305	{
228	if (y >= self->rows)	306	if (y >= self->rows)
…		…
234	if (x >= row->c0)	312	if (x >= row->c0)
235	{	313	{
236	if (x >= row->c1)	314	if (x >= row->c1)
237	break;	315	break;
238		316
239	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;
240	}	323	}
241	}	324	}
242	}	325	}
243		326
		327	static void
		328	music_finished (void)
		329	{
		330	SDL_UserEvent ev;
		331
		332	ev.type = SDL_USEREVENT;
		333	ev.code = 0;
		334	ev.data1 = 0;
		335	ev.data2 = 0;
		336
		337	SDL_PushEvent ((SDL_Event *)&ev);
		338	}
		339
		340	static void
		341	channel_finished (int channel)
		342	{
		343	SDL_UserEvent ev;
		344
		345	ev.type = SDL_USEREVENT;
		346	ev.code = 1;
		347	ev.data1 = (void *)(long)channel;
		348	ev.data2 = 0;
		349
		350	SDL_PushEvent ((SDL_Event *)&ev);
		351	}
		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
244	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
245		371
246	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
247		373
248	BOOT:	374	BOOT:
249	{	375	{
250	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
251	static const struct {	377	static const struct {
252	const char *name;	378	const char *name;
253	IV iv;	379	IV iv;
254	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
255	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
354	# undef const_iv	480	# undef const_iv
355	};	481	};
356		482
357	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; )
358	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
359
360	fontmap = pango_ft2_font_map_new ();
361	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
362	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
363	}	485	}
364		486
365	int	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
		498	void
		499	pango_init ()
		500	CODE:
		501	{
		502	opengl_fontmap = pango_opengl_font_map_new ();
		503	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		504	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		505	}
		506
		507	int
366	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
367		509
368	void	510	void
369	SDL_Quit ()	511	SDL_Quit ()
370		512
371	void	513	void
…		…
377	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
378	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
379	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
380	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
381		523
		524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		526
382	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
383	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
384	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
385	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
386		531
387	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
388	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
389	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
390		537
391	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
392	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
393		540
394	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
403		550
404	++m;	551	++m;
405	}	552	}
406	}	553	}
407		554
		555	char *
		556	SDL_GetError ()
		557
408	int	558	int
409	SDL_SetVideoMode (int w, int h, int fullscreen)	559	SDL_SetVideoMode (int w, int h, int fullscreen)
410	CODE:	560	CODE:
411	RETVAL = !!SDL_SetVideoMode (	561	RETVAL = !!SDL_SetVideoMode (
412	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	562	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
413	);	563	);
		564	if (RETVAL)
		565	{
414	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	}
415	OUTPUT:	571	OUTPUT:
416	RETVAL	572	RETVAL
		573
		574	void
		575	SDL_GL_SwapBuffers ()
		576
		577	char *
		578	SDL_GetKeyName (int sym)
417		579
418	void	580	void
419	SDL_PollEvent ()	581	SDL_PollEvent ()
420	PPCODE:	582	PPCODE:
421	{	583	{
…		…
423		585
424	while (SDL_PollEvent (&ev))	586	while (SDL_PollEvent (&ev))
425	{	587	{
426	HV *hv = newHV ();	588	HV *hv = newHV ();
427	hv_store (hv, "type", 4, newSViv (ev.type), 0);	589	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		590
428	switch (ev.type)	591	switch (ev.type)
429	{	592	{
430	case SDL_KEYDOWN:	593	case SDL_KEYDOWN:
431	case SDL_KEYUP:	594	case SDL_KEYUP:
432	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
439	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
440	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
441	break;	604	break;
442		605
443	case SDL_MOUSEMOTION:	606	case SDL_MOUSEMOTION:
		607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		608
444	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
445	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
446	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
447	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
448	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
449	break;	614	break;
450		615
451	case SDL_MOUSEBUTTONDOWN:	616	case SDL_MOUSEBUTTONDOWN:
452	case SDL_MOUSEBUTTONUP:	617	case SDL_MOUSEBUTTONUP:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
453	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	620	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
454	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	621	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
455	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	622	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
456	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	623	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		624	break;
		625
		626	case SDL_USEREVENT:
		627	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		628	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		629	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		630	break;
457	}	631	}
458		632
459	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
460	}	634	}
461	}	635	}
462		636
463	int	637	int
464	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	638	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
		639	POSTCALL:
		640	Mix_HookMusicFinished (music_finished);
		641	Mix_ChannelFinished (channel_finished);
465		642
466	void	643	void
467	Mix_CloseAudio ()	644	Mix_CloseAudio ()
468		645
469	int	646	int
…		…
474	CODE:	651	CODE:
475	#ifndef _WIN32	652	#ifndef _WIN32
476	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
477	#endif	654	#endif
478		655
479	char *	656	void
480	gl_version ()	657	win32_proxy_info ()
481	CODE:	658	PPCODE:
482	RETVAL = (char *)glGetString (GL_VERSION);	659	{
483	OUTPUT:	660	#ifdef _WIN32
484	RETVAL	661	char buffer[2048];
		662	DWORD buflen;
485		663
486	char *	664	EXTEND (SP, 3);
487	gl_extensions ()	665
488	CODE:	666	buflen = sizeof (buffer);
489	RETVAL = (char *)glGetString (GL_EXTENSIONS);	667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
490	OUTPUT:	668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
491	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	}
492		684
493	void	685	void
494	add_font (char *file)	686	add_font (char *file)
495	CODE:	687	CODE:
496	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
497
498	void
499	set_font (char *file)
500	CODE:
501	{
502	int count;
503	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
504	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
505	FcPatternDestroy (pattern);
506	pango_context_set_font_description (context, font);
507	}
508		689
509	void	690	void
510	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
511	ALIAS:	692	ALIAS:
512	load_image_file = 1	693	load_image_file = 1
…		…
554		735
555	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
556		737
557	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
558		739
		740	SDL_LockSurface (surface2);
559	EXTEND (SP, 5);	741	EXTEND (SP, 6);
560	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
561	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
562	SDL_LockSurface (surface2);
563	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
564	SDL_UnlockSurface (surface2);
565	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)));
566	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
567	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
568		749
569	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
570	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
571	}	752	}
572		753
…		…
594	PUSHs (sv_2mortal (newSViv (b / y)));	775	PUSHs (sv_2mortal (newSViv (b / y)));
595	PUSHs (sv_2mortal (newSViv (a / y)));	776	PUSHs (sv_2mortal (newSViv (a / y)));
596	}	777	}
597		778
598	void	779	void
		780	error (char *message)
		781	CODE:
		782	fprintf (stderr, "ERROR: %s\n", message);
		783	#ifdef _WIN32
		784	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
		785	#endif
		786
		787	void
599	fatal (char *message)	788	fatal (char *message)
600	CODE:	789	CODE:
		790	fprintf (stderr, "FATAL: %s\n", message);
601	#ifdef _WIN32	791	#ifdef _WIN32
602	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	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
603	#else	801	#else
604	fprintf (stderr, "FATAL: %s\n", message);	802	_exit (retval);
605	#endif	803	#endif
606	exit (1);
607		804
		805	MODULE = CFPlus PACKAGE = CFPlus::Font
		806
		807	CFPlus::Font
		808	new_from_file (SV *class, char *path, int id = 0)
		809	CODE:
		810	{
		811	int count;
		812	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
		813	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		814	FcPatternDestroy (pattern);
		815	}
		816	OUTPUT:
		817	RETVAL
		818
		819	void
		820	DESTROY (CFPlus::Font self)
		821	CODE:
		822	pango_font_description_free (self);
		823
		824	void
		825	make_default (CFPlus::Font self)
		826	CODE:
		827	default_font = self;
		828
608	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
609		830
610	CFClient::Layout	831	void
611	new (SV *class, int base_height = 10)	832	reset_glyph_cache ()
		833	CODE:
		834	tc_clear ();
		835
		836	CFPlus::Layout
		837	new (SV *class)
612	CODE:	838	CODE:
613	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
614	RETVAL->base_height = base_height;	840
615	RETVAL->pl = pango_layout_new (context);	841	RETVAL->pl = pango_layout_new (opengl_context);
		842	RETVAL->r = 1.;
		843	RETVAL->g = 1.;
		844	RETVAL->b = 1.;
		845	RETVAL->a = 1.;
		846	RETVAL->base_height = MIN_FONT_HEIGHT;
		847	RETVAL->font = 0;
		848
616	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	849	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		850	layout_update_font (RETVAL);
617	OUTPUT:	851	OUTPUT:
618	RETVAL	852	RETVAL
619		853
620	void	854	void
621	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
622	CODE:	856	CODE:
623	g_object_unref (self->pl);	857	g_object_unref (self->pl);
624	Safefree (self);	858	Safefree (self);
625		859
626	void	860	void
627	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
628	CODE:	862	CODE:
629	{	863	{
630	STRLEN textlen;	864	STRLEN textlen;
631	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
632		866
633	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
634	}	868	}
635		869
636	void	870	void
637	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
638	CODE:	872	CODE:
639	{	873	{
640	STRLEN textlen;	874	STRLEN textlen;
641	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
642		876
643	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
644	}	878	}
645		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
646	SV *	965	SV *
647	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
648	CODE:	967	CODE:
649	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
650	SvUTF8_on (RETVAL);	969	sv_utf8_decode (RETVAL);
651	OUTPUT:	970	OUTPUT:
652	RETVAL	971	RETVAL
653		972
654	void	973	void
		974	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		975	CODE:
		976	self->r = r;
		977	self->g = g;
		978	self->b = b;
		979	self->a = a;
		980
		981	void
		982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		983	CODE:
		984	if (self->font != font)
		985	{
		986	self->font = font;
		987	layout_update_font (self);
		988	}
		989
		990	void
655	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
656	CODE:	992	CODE:
		993	if (self->base_height != base_height)
		994	{
657	self->base_height = base_height;	995	self->base_height = base_height;
		996	layout_update_font (self);
		997	}
658		998
659	void	999	void
660	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
661	CODE:	1001	CODE:
662	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);
663		1003
664	void	1004	void
		1005	set_indent (CFPlus::Layout self, int indent)
		1006	CODE:
		1007	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1008
		1009	void
		1010	set_spacing (CFPlus::Layout self, int spacing)
		1011	CODE:
		1012	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1013
		1014	void
		1015	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1016	CODE:
		1017	pango_layout_set_ellipsize (self->pl,
		1018	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1019	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1020	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1021	: PANGO_ELLIPSIZE_NONE
		1022	);
		1023
		1024	void
		1025	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1026	CODE:
		1027	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1028
		1029	void
665	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
666	PPCODE:	1031	PPCODE:
667	{	1032	{
668	int w, h;	1033	int w, h;
669		1034
670	layout_update (self);
671	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
672		1036
673	EXTEND (SP, 2);	1037	EXTEND (SP, 2);
674	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
675	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
676	}	1040	}
677		1041
678	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
679	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
680	CODE:	1056	CODE:
681	{	1057	{
682	int index, trailing;	1058	int index, trailing;
683
684	layout_update (self);
685	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);
686
687	RETVAL = index;	1060	RETVAL = index;
688	}	1061	}
689	OUTPUT:	1062	OUTPUT:
690	RETVAL	1063	RETVAL
691		1064
692	void	1065	void
693	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
694	PPCODE:	1067	PPCODE:
695	{	1068	{
696	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
697	layout_update (self);
698	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
699		1071
700	EXTEND (SP, 3);	1072	EXTEND (SP, 3);
701	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
702	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
703	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
704	}	1076	}
705		1077
706	void	1078	void
707	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
708	PPCODE:	1080	PPCODE:
709	{	1081	pango_opengl_render_layout_subpixel (
710	SV *retval;	1082	self->pl,
711	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
712	FT_Bitmap bitmap;	1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
713		1087
714	layout_update (self);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
715	layout_get_pixel_size (self, &w, &h);
716		1089
717	retval = newSV (w * h);	1090	void
718	SvPOK_only (retval);	1091	pad2pot (SV *data_, SV *w_, SV *h_)
719	SvCUR_set (retval, w * h);	1092	CODE:
		1093	{
		1094	int ow = SvIV (w_);
		1095	int oh = SvIV (h_);
720		1096
721	bitmap.rows = h;	1097	if (ow && oh)
722	bitmap.width = w;	1098	{
723	bitmap.pitch = w;	1099	int nw = minpot (ow);
724	bitmap.buffer = (unsigned char*)SvPVX (retval);	1100	int nh = minpot (oh);
725	bitmap.num_grays = 256;
726	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
727		1101
728	memset (bitmap.buffer, 0, w * h);	1102	if (nw != ow || nh != oh)
729		1103	{
730	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1104	if (SvOK (data_))
		1105	{
		1106	STRLEN datalen;
		1107	char *data = SvPVbyte (data_, datalen);
		1108	int bpp = datalen / (ow * oh);
		1109	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
731		1110
732	EXTEND (SP, 3);	1111	SvPOK_only (result_);
733	PUSHs (sv_2mortal (newSViv (w)));	1112	SvCUR_set (result_, nw * nh * bpp);
734	PUSHs (sv_2mortal (newSViv (h)));
735	PUSHs (sv_2mortal (retval));
736	}
737		1113
738	MODULE = CFClient PACKAGE = CFClient::Texture	1114	memset (SvPVX (result_), 0, nw * nh * bpp);
		1115	while (oh--)
		1116	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
739		1117
		1118	sv_setsv (data_, result_);
		1119	}
		1120
		1121	sv_setiv (w_, nw);
		1122	sv_setiv (h_, nh);
		1123	}
		1124	}
		1125	}
		1126
740	void	1127	void
741	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.)
742	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
		1130	ALIAS:
		1131	draw_quad_alpha = 1
		1132	draw_quad_alpha_premultiplied = 2
743	CODE:	1133	CODE:
744	{	1134	{
745	HV *hv = (HV *)SvRV (self);	1135	HV *hv = (HV *)SvRV (self);
746	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1136	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
747	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1137	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
748	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1138	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
749	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
750		1139
751	if (items < 5)	1140	if (items < 5)
752	{	1141	{
753	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1142	w = SvNV (*hv_fetch (hv, "w", 1, 1));
754	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1143	h = SvNV (*hv_fetch (hv, "h", 1, 1));
755	}	1144	}
756		1145
		1146	if (ix)
		1147	{
		1148	glEnable (GL_BLEND);
		1149
		1150	if (ix == 2)
		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);
		1158	}
		1159
757	glBindTexture (GL_TEXTURE_2D, name);	1160	glBindTexture (GL_TEXTURE_2D, name);
758	if (wrap_mode) {	1161
759	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
760	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
761	}
762	glBegin (GL_QUADS);	1162	glBegin (GL_QUADS);
763	glTexCoord2f (0, 0); glVertex2f (x , y );	1163	glTexCoord2f (0, 0); glVertex2f (x , y );
764	glTexCoord2f (0, t); glVertex2f (x , y + h);	1164	glTexCoord2f (0, t); glVertex2f (x , y + h);
765	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1165	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
766	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1166	glTexCoord2f (s, 0); glVertex2f (x + w, y );
767	glEnd ();	1167	glEnd ();
768	}
769		1168
		1169	if (ix)
		1170	{
		1171	glDisable (GL_ALPHA_TEST);
		1172	glDisable (GL_BLEND);
		1173	}
		1174	}
		1175
770	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
771		1177
772	CFClient::Map	1178	CFPlus::Map
773	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
774	CODE:	1180	CODE:
775	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
776	RETVAL->x = 0;	1182	RETVAL->x = 0;
777	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
787	RETVAL->row = 0;	1193	RETVAL->row = 0;
788	OUTPUT:	1194	OUTPUT:
789	RETVAL	1195	RETVAL
790		1196
791	void	1197	void
792	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
793	CODE:	1199	CODE:
794	{	1200	{
795	map_clear (self);	1201	map_clear (self);
796	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
797	Safefree (self);	1204	Safefree (self);
798	}	1205	}
799		1206
800	void	1207	void
801	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
802	CODE:	1209	CODE:
803	map_clear (self);	1210	map_clear (self);
804		1211
805	void	1212	void
806	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
807	CODE:	1214	CODE:
808	{	1215	{
809	while (self->faces <= face)	1216	while (self->faces <= face)
810	{	1217	{
811	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
814		1221
815	self->face [face] = texid;	1222	self->face [face] = texid;
816	}	1223	}
817		1224
818	void	1225	void
819	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)
820	CODE:	1227	CODE:
821	{	1228	{
822	while (self->texs <= texid)	1229	while (self->texs <= texid)
823	{	1230	{
824	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
836	tex->r = r;	1243	tex->r = r;
837	tex->g = g;	1244	tex->g = g;
838	tex->b = b;	1245	tex->b = b;
839	tex->a = a;	1246	tex->a = a;
840	}	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);
841	}	1257	}
842		1258
843	int	1259	int
844	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
845	ALIAS:	1261	ALIAS:
846	oy = 1	1262	oy = 1
		1263	x = 2
		1264	y = 3
		1265	w = 4
		1266	h = 5
847	CODE:	1267	CODE:
848	switch (ix)	1268	switch (ix)
849	{	1269	{
850	case 0: RETVAL = self->ox; break;	1270	case 0: RETVAL = self->ox; break;
851	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;
852	}	1276	}
853	OUTPUT:	1277	OUTPUT:
854	RETVAL	1278	RETVAL
855		1279
856	void	1280	void
857	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
858	CODE:	1282	CODE:
859	{	1283	{
860	if (dx > 0)	1284	if (dx > 0)
861	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
862	else if (dx < 0)	1286	else if (dx < 0)
863	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);
864		1288
865	if (dy > 0)	1289	if (dy > 0)
866	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
867	else if (dy < 0)	1291	else if (dy < 0)
868	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);
869		1293
870	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
871	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
872		1296
873	while (self->y < 0)	1297	while (self->y < 0)
…		…
878	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
879	}	1303	}
880	}	1304	}
881		1305
882	void	1306	void
883	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
884	CODE:	1308	CODE:
885	{	1309	{
886	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1310	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
887	uint8_t *data_end = (uint8_t *)SvEND (data_);	1311	uint8_t *data_end = (uint8_t *)SvEND (data_);
888	mapcell *cell;	1312	mapcell *cell;
889	int x, y, flags;	1313	int x, y, flags;
890		1314
891	while (data < data_end)	1315	while (data < data_end - 1)
892	{	1316	{
893	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
894		1318
895	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
896	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
897		1321
898	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
899		1323
900	if (flags & 15)	1324	if (flags & 15)
901	{	1325	{
902	if (cell->darkness < 0)	1326	if (!cell->darkness)
903	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
904	cell->darkness = 0;	1329	cell->darkness = 256;
905	cell->face [0] = 0;
906	cell->face [1] = 0;
907	cell->face [2] = 0;
908	}	1330	}
909		1331
910	cell->darkness = flags & 8 ? *data++ : 255;
911
912	//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	}
913		1373
914	if (flags & 4)	1374	if (flags & 4)
915	{	1375	{
916	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;
917	}	1377	}
…		…
925	{	1385	{
926	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;
927	}	1387	}
928	}	1388	}
929	else	1389	else
930	cell->darkness = -1;	1390	cell->darkness = 0;
931	}	1391	}
932	}	1392	}
933		1393
934	SV *	1394	SV *
935	mapmap (CFClient::Map self, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
936	CODE:	1396	CODE:
937	{	1397	{
938	int x0, x1, x;	1398	int x1, x;
939	int y0, y1, y;	1399	int y1, y;
940	int z;	1400	int z;
941	SV *map_sv = newSV (w * h * sizeof (uint32_t));	1401	SV *map_sv = newSV (w * h * sizeof (uint32_t));
942	uint32_t *map = (uint32_t *)SvPVX (map_sv);	1402	uint32_t *map = (uint32_t *)SvPVX (map_sv);
943		1403
944	SvPOK_only (map_sv);	1404	SvPOK_only (map_sv);
945	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1405	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
946		1406
947	x0 = self->x - w / 2; x1 = x0 + w;	1407	x0 += self->x; x1 = x0 + w;
948	y0 = self->y - h / 2; y1 = y0 + h;	1408	y0 += self->y; y1 = y0 + h;
949		1409
950	for (y = y0; y < y1; y++)	1410	for (y = y0; y < y1; y++)
951	{	1411	{
952	maprow *row = 0 <= y && y < self->rows	1412	maprow *row = 0 <= y && y < self->rows
953	? self->row + y	1413	? self->row + y
…		…
990	}	1450	}
991	OUTPUT:	1451	OUTPUT:
992	RETVAL	1452	RETVAL
993		1453
994	void	1454	void
995	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)
996	PPCODE:	1456	CODE:
997	{	1457	{
998	int vx, vy;	1458	int vx, vy;
999	int x, y, z;	1459	int x, y, z;
1000	int last_name;	1460	int last_name;
1001	mapface face;	1461	mapface face;
1002	int sw4 = (sw + 3) & ~3;
1003	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1004	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1005		1462
1006	memset (darkness, 255, sw4 * sh);
1007	SvPOK_only (darkness_sv);
1008	SvCUR_set (darkness_sv, sw4 * sh);
1009
1010	vx = self->x + (self->w - sw) / 2 - shift_x;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1011	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1012		1465
1013	/*	1466	/*
1014	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1015	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1016	: 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));
…		…
1020	: 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));
1021	*/	1474	*/
1022		1475
1023	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1024		1477
		1478	glEnable (GL_BLEND);
1025	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1026	glEnable (GL_BLEND);
1027	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1028	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1029		1482
1030	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1031		1484
…		…
1040	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1041	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1042	{	1495	{
1043	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1044		1497
1045	darkness[y * sw4 + x] = cell->darkness < 0
1046	? 255 - FOW_DARKNESS
1047	: 255 - cell->darkness;
1048
1049	face = cell->face [z];	1498	face = cell->face [z];
1050		1499
1051	if (face)	1500	if (face && face < self->texs)
1052	{	1501	{
1053	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1054
1055	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1056	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1057		1505
1058	if (last_name != tex.name)	1506	if (last_name != tex.name)
1059	{	1507	{
1060	glEnd ();	1508	glEnd ();
1061	last_name = tex.name;
1062	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1063	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1064	}	1511	}
1065		1512
1066	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1067	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1068	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);
1069	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1070	}	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	}
1071	}	1537	}
1072	}	1538	}
1073		1539
1074	glEnd ();	1540	glEnd ();
1075		1541
1076	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1077	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	}
1078		1669
1079	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1080	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1081	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1082	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1083	}	1674	}
1084		1675
1085	SV *	1676	SV *
1086	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)
1087	CODE:	1678	CODE:
1088	{	1679	{
1089	int x, y, x1, y1;	1680	int x, y, x1, y1;
1090	SV *data_sv = newSV (w * h * 7 + 5);	1681	SV *data_sv = newSV (w * h * 7 + 5);
1091	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1682	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1093	*data++ = 0; /* version 0 format */	1684	*data++ = 0; /* version 0 format */
1094	*data++ = w >> 8; *data++ = w;	1685	*data++ = w >> 8; *data++ = w;
1095	*data++ = h >> 8; *data++ = h;	1686	*data++ = h >> 8; *data++ = h;
1096		1687
1097	// we need to do this 'cause we don't keep an absolute coord system for rows	1688	// we need to do this 'cause we don't keep an absolute coord system for rows
1098	// TODO: treat rows as we treat	1689	// TODO: treat rows as we treat columns
1099	map_get_row (self, y0 + self->y - self->oy);//D	1690	map_get_row (self, y0 + self->y - self->oy);//D
1100	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1691	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1101		1692
1102	x0 += self->x - self->ox;	1693	x0 += self->x - self->ox;
1103	y0 += self->y - self->oy;	1694	y0 += self->y - self->oy;
…		…
1153	}	1744	}
1154	OUTPUT:	1745	OUTPUT:
1155	RETVAL	1746	RETVAL
1156		1747
1157	void	1748	void
1158	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)
1159	PPCODE:	1750	PPCODE:
1160	{	1751	{
1161	int x, y, z;	1752	int x, y, z;
1162	int w, h;	1753	int w, h;
1163	int x1, y1;	1754	int x1, y1;
…		…
1167		1758
1168	w = *data++ << 8; w |= *data++;	1759	w = *data++ << 8; w |= *data++;
1169	h = *data++ << 8; h |= *data++;	1760	h = *data++ << 8; h |= *data++;
1170		1761
1171	// we need to do this 'cause we don't keep an absolute coord system for rows	1762	// we need to do this 'cause we don't keep an absolute coord system for rows
1172	// TODO: treat rows as we treat	1763	// TODO: treat rows as we treat columns
1173	map_get_row (self, y0 + self->y - self->oy);//D	1764	map_get_row (self, y0 + self->y - self->oy);//D
1174	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1765	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1175		1766
1176	x0 += self->x - self->ox;	1767	x0 += self->x - self->ox;
1177	y0 += self->y - self->oy;	1768	y0 += self->y - self->oy;
…		…
1195		1786
1196	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1787	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1197	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1788	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1198	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1789	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1199		1790
1200	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1201	{	1792	{
1202	cell->darkness = -1;	1793	cell->darkness = 0;
1203		1794
1204	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1205	{	1796	{
1206	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1207		1798
…		…
1212	}	1803	}
1213	}	1804	}
1214	}	1805	}
1215	}	1806	}
1216		1807
1217	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1218		1809
1219	CFClient::MixChunk	1810	CFPlus::MixChunk
1220	new_from_file (SV *class, char *path)	1811	new_from_file (SV *class, char *path)
1221	CODE:	1812	CODE:
1222	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1223	OUTPUT:	1814	OUTPUT:
1224	RETVAL	1815	RETVAL
1225		1816
1226	void	1817	void
1227	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1228	CODE:	1819	CODE:
1229	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1230		1821
1231	int	1822	int
1232	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1233	CODE:	1824	CODE:
1234	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1235	OUTPUT:	1826	OUTPUT:
1236	RETVAL	1827	RETVAL
1237		1828
1238	int	1829	int
1239	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)
1240	CODE:	1831	CODE:
1241	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1242	OUTPUT:	1833	OUTPUT:
1243	RETVAL	1834	RETVAL
1244		1835
1245	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1246		1837
1247	int	1838	int
1248	volume (int volume = -1)	1839	volume (int volume = -1)
1249	CODE:	1840	CODE:
1250	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1251	OUTPUT:	1842	OUTPUT:
1252	RETVAL	1843	RETVAL
1253		1844
1254	CFClient::MixMusic	1845	CFPlus::MixMusic
1255	new_from_file (SV *class, char *path)	1846	new_from_file (SV *class, char *path)
1256	CODE:	1847	CODE:
1257	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1258	OUTPUT:	1849	OUTPUT:
1259	RETVAL	1850	RETVAL
1260		1851
1261	void	1852	void
1262	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1263	CODE:	1854	CODE:
1264	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1265		1856
1266	int	1857	int
1267	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1268	CODE:	1859	CODE:
1269	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1270	OUTPUT:	1861	OUTPUT:
1271	RETVAL	1862	RETVAL
1272		1863
		1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
		1865
		1866	BOOT:
		1867	{
		1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
		1869	static const struct {
		1870	const char *name;
		1871	IV iv;
		1872	} *civ, const_iv[] = {
		1873	# define const_iv(name) { # name, (IV)name }
		1874	const_iv (GL_COLOR_MATERIAL),
		1875	const_iv (GL_SMOOTH),
		1876	const_iv (GL_FLAT),
		1877	const_iv (GL_DITHER),
		1878	const_iv (GL_BLEND),
		1879	const_iv (GL_CULL_FACE),
		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),
		1887	const_iv (GL_AND),
		1888	const_iv (GL_ONE),
		1889	const_iv (GL_ZERO),
		1890	const_iv (GL_SRC_ALPHA),
		1891	const_iv (GL_DST_ALPHA),
		1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1894	const_iv (GL_SRC_ALPHA_SATURATE),
		1895	const_iv (GL_RGB),
		1896	const_iv (GL_RGBA),
		1897	const_iv (GL_RGBA4),
		1898	const_iv (GL_RGBA8),
		1899	const_iv (GL_RGB5_A1),
		1900	const_iv (GL_UNSIGNED_BYTE),
		1901	const_iv (GL_UNSIGNED_SHORT),
		1902	const_iv (GL_UNSIGNED_INT),
		1903	const_iv (GL_ALPHA),
		1904	const_iv (GL_INTENSITY),
		1905	const_iv (GL_LUMINANCE),
		1906	const_iv (GL_LUMINANCE_ALPHA),
		1907	const_iv (GL_FLOAT),
		1908	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
		1909	const_iv (GL_COMPILE),
		1910	const_iv (GL_TEXTURE_1D),
		1911	const_iv (GL_TEXTURE_2D),
		1912	const_iv (GL_TEXTURE_ENV),
		1913	const_iv (GL_TEXTURE_MAG_FILTER),
		1914	const_iv (GL_TEXTURE_MIN_FILTER),
		1915	const_iv (GL_TEXTURE_ENV_MODE),
		1916	const_iv (GL_TEXTURE_WRAP_S),
		1917	const_iv (GL_TEXTURE_WRAP_T),
		1918	const_iv (GL_REPEAT),
		1919	const_iv (GL_CLAMP),
		1920	const_iv (GL_CLAMP_TO_EDGE),
		1921	const_iv (GL_NEAREST),
		1922	const_iv (GL_LINEAR),
		1923	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1924	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1925	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1926	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1927	const_iv (GL_GENERATE_MIPMAP),
		1928	const_iv (GL_MODULATE),
		1929	const_iv (GL_DECAL),
		1930	const_iv (GL_REPLACE),
		1931	const_iv (GL_DEPTH_BUFFER_BIT),
		1932	const_iv (GL_COLOR_BUFFER_BIT),
		1933	const_iv (GL_PROJECTION),
		1934	const_iv (GL_MODELVIEW),
		1935	const_iv (GL_COLOR_LOGIC_OP),
		1936	const_iv (GL_SEPARABLE_2D),
		1937	const_iv (GL_CONVOLUTION_2D),
		1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
		1939	const_iv (GL_CONSTANT_BORDER),
		1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
		1942	const_iv (GL_LINE_LOOP),
		1943	const_iv (GL_QUADS),
		1944	const_iv (GL_QUAD_STRIP),
		1945	const_iv (GL_TRIANGLES),
		1946	const_iv (GL_TRIANGLE_STRIP),
		1947	const_iv (GL_TRIANGLE_FAN),
		1948	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
		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),
		1954	# undef const_iv
		1955	};
		1956
		1957	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
		1958	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
		1959	}
		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
		1982	int glGetError ()
		1983
		1984	void glFinish ()
		1985
		1986	void glClear (int mask)
		1987
		1988	void glClearColor (float r, float g, float b, float a = 1.0)
		1989	PROTOTYPE: @
		1990
		1991	void glEnable (int cap)
		1992
		1993	void glDisable (int cap)
		1994
		1995	void glShadeModel (int mode)
		1996
		1997	void glHint (int target, int mode)
		1998
		1999	void glBlendFunc (int sfactor, int dfactor)
		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
		2007	void glLogicOp (int opcode)
		2008
		2009	void glColorMask (int red, int green, int blue, int alpha)
		2010
		2011	void glMatrixMode (int mode)
		2012
		2013	void glPushMatrix ()
		2014
		2015	void glPopMatrix ()
		2016
		2017	void glLoadIdentity ()
		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
		2022
		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
		2027	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
		2028
		2029	void glViewport (int x, int y, int width, int height)
		2030
		2031	void glScissor (int x, int y, int width, int height)
		2032
		2033	void glTranslate (float x, float y, float z = 0.)
		2034	CODE:
		2035	glTranslatef (x, y, z);
		2036
		2037	void glScale (float x, float y, float z = 1.)
		2038	CODE:
		2039	glScalef (x, y, z);
		2040
		2041	void glRotate (float angle, float x, float y, float z)
		2042	CODE:
		2043	glRotatef (angle, x, y, z);
		2044
		2045	void glBegin (int mode)
		2046
		2047	void glEnd ()
		2048
		2049	void glColor (float r, float g, float b, float a = 1.0)
		2050	PROTOTYPE: @
		2051	ALIAS:
		2052	glColor_premultiply = 1
		2053	CODE:
		2054	if (ix)
		2055	{
		2056	r *= a;
		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);
		2073
		2074	void glVertex (float x, float y, float z = 0.)
		2075	CODE:
		2076	glVertex3f (x, y, z);
		2077
		2078	void glTexCoord (float s, float t)
		2079	CODE:
		2080	glTexCoord2f (s, t);
		2081
		2082	void glTexEnv (int target, int pname, float param)
		2083	CODE:
		2084	glTexEnvf (target, pname, param);
		2085
		2086	void glTexParameter (int target, int pname, float param)
		2087	CODE:
		2088	glTexParameterf (target, pname, param);
		2089
		2090	void glBindTexture (int target, int name)
		2091
		2092	void glConvolutionParameter (int target, int pname, float params)
		2093	CODE:
		2094	if (gl.ConvolutionParameterf)
		2095	gl.ConvolutionParameterf (target, pname, params);
		2096
		2097	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		2098	CODE:
		2099	if (gl.ConvolutionFilter2D)
		2100	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2101
		2102	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
		2103	CODE:
		2104	if (gl.SeparableFilter2D)
		2105	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
		2106
		2107	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
		2108
		2109	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		2110
		2111	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2112
		2113	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
		2114
		2115	int glGenTexture ()
		2116	CODE:
		2117	{
		2118	GLuint name;
		2119	glGenTextures (1, &name);
		2120	RETVAL = name;
		2121	}
		2122	OUTPUT:
		2123	RETVAL
		2124
		2125	void glDeleteTexture (int name)
		2126	CODE:
		2127	{
		2128	GLuint name_ = name;
		2129	glDeleteTextures (1, &name_);
		2130	}
		2131
		2132	int glGenList ()
		2133	CODE:
		2134	RETVAL = glGenLists (1);
		2135	OUTPUT:
		2136	RETVAL
		2137
		2138	void glDeleteList (int list)
		2139	CODE:
		2140	glDeleteLists (list, 1);
		2141
		2142	void glNewList (int list, int mode = GL_COMPILE)
		2143
		2144	void glEndList ()
		2145
		2146	void glCallList (int list)
		2147

Diff Legend

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