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.54 by root, Wed Apr 19 23:37:48 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
		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
417		573
418	void	574	void
419	SDL_GL_SwapBuffers ()	575	SDL_GL_SwapBuffers ()
		576
		577	char *
		578	SDL_GetKeyName (int sym)
420		579
421	void	580	void
422	SDL_PollEvent ()	581	SDL_PollEvent ()
423	PPCODE:	582	PPCODE:
424	{	583	{
…		…
426		585
427	while (SDL_PollEvent (&ev))	586	while (SDL_PollEvent (&ev))
428	{	587	{
429	HV *hv = newHV ();	588	HV *hv = newHV ();
430	hv_store (hv, "type", 4, newSViv (ev.type), 0);	589	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		590
431	switch (ev.type)	591	switch (ev.type)
432	{	592	{
433	case SDL_KEYDOWN:	593	case SDL_KEYDOWN:
434	case SDL_KEYUP:	594	case SDL_KEYUP:
435	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
442	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
443	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
444	break;	604	break;
445		605
446	case SDL_MOUSEMOTION:	606	case SDL_MOUSEMOTION:
		607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		608
447	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
448	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
449	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
450	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
451	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
452	break;	614	break;
453		615
454	case SDL_MOUSEBUTTONDOWN:	616	case SDL_MOUSEBUTTONDOWN:
455	case SDL_MOUSEBUTTONUP:	617	case SDL_MOUSEBUTTONUP:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
456	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	620	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
457	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	621	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
458	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	622	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
459	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;
460	}	631	}
461		632
462	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
463	}	634	}
464	}	635	}
465		636
466	int	637	int
467	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);
468		642
469	void	643	void
470	Mix_CloseAudio ()	644	Mix_CloseAudio ()
471		645
472	int	646	int
…		…
477	CODE:	651	CODE:
478	#ifndef _WIN32	652	#ifndef _WIN32
479	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
480	#endif	654	#endif
481		655
482	char *	656	void
483	gl_version ()	657	win32_proxy_info ()
484	CODE:	658	PPCODE:
485	RETVAL = (char *)glGetString (GL_VERSION);	659	{
486	OUTPUT:	660	#ifdef _WIN32
487	RETVAL	661	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
488		664
489	char *	665	EXTEND (SP, 3);
490	gl_extensions ()	666
491	CODE:	667	buflen = sizeof (buffer);
492	RETVAL = (char *)glGetString (GL_EXTENSIONS);	668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
493	OUTPUT:	669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
494	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	}
495		685
496	void	686	void
497	add_font (char *file)	687	add_font (char *file)
498	CODE:	688	CODE:
499	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
500
501	void
502	set_font (char *file)
503	CODE:
504	{
505	int count;
506	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)file, 0, 0, &count);
507	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
508	FcPatternDestroy (pattern);
509	pango_context_set_font_description (context, font);
510	}
511		690
512	void	691	void
513	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
514	ALIAS:	693	ALIAS:
515	load_image_file = 1	694	load_image_file = 1
…		…
557		736
558	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
559		738
560	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
561		740
		741	SDL_LockSurface (surface2);
562	EXTEND (SP, 5);	742	EXTEND (SP, 6);
563	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
564	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
565	SDL_LockSurface (surface2);
566	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
567	SDL_UnlockSurface (surface2);
568	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)));
569	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
570	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
571		750
572	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
573	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
574	}	753	}
575		754
…		…
597	PUSHs (sv_2mortal (newSViv (b / y)));	776	PUSHs (sv_2mortal (newSViv (b / y)));
598	PUSHs (sv_2mortal (newSViv (a / y)));	777	PUSHs (sv_2mortal (newSViv (a / y)));
599	}	778	}
600		779
601	void	780	void
		781	error (char *message)
		782	CODE:
		783	fprintf (stderr, "ERROR: %s\n", message);
		784	#ifdef _WIN32
		785	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
		786	#endif
		787
		788	void
602	fatal (char *message)	789	fatal (char *message)
603	CODE:	790	CODE:
		791	fprintf (stderr, "FATAL: %s\n", message);
604	#ifdef _WIN32	792	#ifdef _WIN32
605	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
606	#else
607	fprintf (stderr, "FATAL: %s\n", message);
608	#endif	794	#endif
609	exit (1);	795	_exit (1);
610		796
		797	void
		798	_exit (int retval)
		799	CODE:
		800	_exit (retval);
		801
		802	MODULE = CFPlus PACKAGE = CFPlus::Font
		803
		804	CFPlus::Font
		805	new_from_file (SV *class, char *path, int id = 0)
		806	CODE:
		807	{
		808	int count;
		809	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
		810	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		811	FcPatternDestroy (pattern);
		812	}
		813	OUTPUT:
		814	RETVAL
		815
		816	void
		817	DESTROY (CFPlus::Font self)
		818	CODE:
		819	pango_font_description_free (self);
		820
		821	void
		822	make_default (CFPlus::Font self)
		823	CODE:
		824	default_font = self;
		825
611	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
612		827
613	CFClient::Layout	828	void
614	new (SV *class, int base_height = 10)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
615	CODE:	835	CODE:
616	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
617	RETVAL->base_height = base_height;	837
618	RETVAL->pl = pango_layout_new (context);	838	RETVAL->pl = pango_layout_new (opengl_context);
		839	RETVAL->r = 1.;
		840	RETVAL->g = 1.;
		841	RETVAL->b = 1.;
		842	RETVAL->a = 1.;
		843	RETVAL->base_height = MIN_FONT_HEIGHT;
		844	RETVAL->font = 0;
		845
619	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	846	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
		847	layout_update_font (RETVAL);
620	OUTPUT:	848	OUTPUT:
621	RETVAL	849	RETVAL
622		850
623	void	851	void
624	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
625	CODE:	853	CODE:
626	g_object_unref (self->pl);	854	g_object_unref (self->pl);
627	Safefree (self);	855	Safefree (self);
628		856
629	void	857	void
630	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
631	CODE:	859	CODE:
632	{	860	{
633	STRLEN textlen;	861	STRLEN textlen;
634	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
635		863
636	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
637	}	865	}
638		866
639	void	867	void
640	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
641	CODE:	869	CODE:
642	{	870	{
643	STRLEN textlen;	871	STRLEN textlen;
644	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
645		873
646	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
647	}	875	}
648		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
649	SV *	962	SV *
650	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
651	CODE:	964	CODE:
652	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
653	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
654	OUTPUT:	967	OUTPUT:
655	RETVAL	968	RETVAL
656		969
657	void	970	void
		971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		972	CODE:
		973	self->r = r;
		974	self->g = g;
		975	self->b = b;
		976	self->a = a;
		977
		978	void
		979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		980	CODE:
		981	if (self->font != font)
		982	{
		983	self->font = font;
		984	layout_update_font (self);
		985	}
		986
		987	void
658	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
659	CODE:	989	CODE:
		990	if (self->base_height != base_height)
		991	{
660	self->base_height = base_height;	992	self->base_height = base_height;
		993	layout_update_font (self);
		994	}
661		995
662	void	996	void
663	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
664	CODE:	998	CODE:
665	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);
666		1000
667	void	1001	void
		1002	set_indent (CFPlus::Layout self, int indent)
		1003	CODE:
		1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1005
		1006	void
		1007	set_spacing (CFPlus::Layout self, int spacing)
		1008	CODE:
		1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1010
		1011	void
		1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1013	CODE:
		1014	pango_layout_set_ellipsize (self->pl,
		1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1018	: PANGO_ELLIPSIZE_NONE
		1019	);
		1020
		1021	void
		1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1023	CODE:
		1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1025
		1026	void
668	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
669	PPCODE:	1028	PPCODE:
670	{	1029	{
671	int w, h;	1030	int w, h;
672		1031
673	layout_update (self);
674	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
675		1033
676	EXTEND (SP, 2);	1034	EXTEND (SP, 2);
677	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
678	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
679	}	1037	}
680		1038
681	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
682	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
683	CODE:	1053	CODE:
684	{	1054	{
685	int index, trailing;	1055	int index, trailing;
686
687	layout_update (self);
688	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);
689
690	RETVAL = index;	1057	RETVAL = index;
691	}	1058	}
692	OUTPUT:	1059	OUTPUT:
693	RETVAL	1060	RETVAL
694		1061
695	void	1062	void
696	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
697	PPCODE:	1064	PPCODE:
698	{	1065	{
699	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
700	layout_update (self);
701	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
702		1068
703	EXTEND (SP, 3);	1069	EXTEND (SP, 3);
704	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1070	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
705	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
706	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
707	}	1073	}
708		1074
709	void	1075	void
710	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
711	PPCODE:	1077	PPCODE:
712	{	1078	pango_opengl_render_layout_subpixel (
713	SV *retval;	1079	self->pl,
714	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
715	FT_Bitmap bitmap;	1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
716		1084
717	layout_update (self);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
718	layout_get_pixel_size (self, &w, &h);
719		1086
720	retval = newSV (w * h);	1087	void
721	SvPOK_only (retval);	1088	pad2pot (SV *data_, SV *w_, SV *h_)
722	SvCUR_set (retval, w * h);	1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
723		1093
724	bitmap.rows = h;	1094	if (ow && oh)
725	bitmap.width = w;	1095	{
726	bitmap.pitch = w;	1096	int nw = minpot (ow);
727	bitmap.buffer = (unsigned char*)SvPVX (retval);	1097	int nh = minpot (oh);
728	bitmap.num_grays = 256;
729	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
730		1098
731	memset (bitmap.buffer, 0, w * h);	1099	if (nw != ow || nh != oh)
732		1100	{
733	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1101	if (SvOK (data_))
		1102	{
		1103	STRLEN datalen;
		1104	char *data = SvPVbyte (data_, datalen);
		1105	int bpp = datalen / (ow * oh);
		1106	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
734		1107
735	EXTEND (SP, 3);	1108	SvPOK_only (result_);
736	PUSHs (sv_2mortal (newSViv (w)));	1109	SvCUR_set (result_, nw * nh * bpp);
737	PUSHs (sv_2mortal (newSViv (h)));
738	PUSHs (sv_2mortal (retval));
739	}
740		1110
741	MODULE = CFClient PACKAGE = CFClient::Texture	1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
742		1114
		1115	sv_setsv (data_, result_);
		1116	}
		1117
		1118	sv_setiv (w_, nw);
		1119	sv_setiv (h_, nh);
		1120	}
		1121	}
		1122	}
		1123
743	void	1124	void
744	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.)
745	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
		1127	ALIAS:
		1128	draw_quad_alpha = 1
		1129	draw_quad_alpha_premultiplied = 2
746	CODE:	1130	CODE:
747	{	1131	{
748	HV *hv = (HV *)SvRV (self);	1132	HV *hv = (HV *)SvRV (self);
749	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1133	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
750	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1134	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
751	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1135	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
752	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
753		1136
754	if (items < 5)	1137	if (items < 5)
755	{	1138	{
756	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1139	w = SvNV (*hv_fetch (hv, "w", 1, 1));
757	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1140	h = SvNV (*hv_fetch (hv, "h", 1, 1));
758	}	1141	}
759		1142
		1143	if (ix)
		1144	{
		1145	glEnable (GL_BLEND);
		1146
		1147	if (ix == 2)
		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);
		1155	}
		1156
760	glBindTexture (GL_TEXTURE_2D, name);	1157	glBindTexture (GL_TEXTURE_2D, name);
761	if (wrap_mode) {	1158
762	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
763	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
764	}
765	glBegin (GL_QUADS);	1159	glBegin (GL_QUADS);
766	glTexCoord2f (0, 0); glVertex2f (x , y );	1160	glTexCoord2f (0, 0); glVertex2f (x , y );
767	glTexCoord2f (0, t); glVertex2f (x , y + h);	1161	glTexCoord2f (0, t); glVertex2f (x , y + h);
768	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1162	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
769	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1163	glTexCoord2f (s, 0); glVertex2f (x + w, y );
770	glEnd ();	1164	glEnd ();
771	}
772		1165
		1166	if (ix)
		1167	{
		1168	glDisable (GL_ALPHA_TEST);
		1169	glDisable (GL_BLEND);
		1170	}
		1171	}
		1172
773	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
774		1174
775	CFClient::Map	1175	CFPlus::Map
776	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
777	CODE:	1177	CODE:
778	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
779	RETVAL->x = 0;	1179	RETVAL->x = 0;
780	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
790	RETVAL->row = 0;	1190	RETVAL->row = 0;
791	OUTPUT:	1191	OUTPUT:
792	RETVAL	1192	RETVAL
793		1193
794	void	1194	void
795	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
796	CODE:	1196	CODE:
797	{	1197	{
798	map_clear (self);	1198	map_clear (self);
799	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
800	Safefree (self);	1201	Safefree (self);
801	}	1202	}
802		1203
803	void	1204	void
804	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
805	CODE:	1206	CODE:
806	map_clear (self);	1207	map_clear (self);
807		1208
808	void	1209	void
809	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
810	CODE:	1211	CODE:
811	{	1212	{
812	while (self->faces <= face)	1213	while (self->faces <= face)
813	{	1214	{
814	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
817		1218
818	self->face [face] = texid;	1219	self->face [face] = texid;
819	}	1220	}
820		1221
821	void	1222	void
822	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)
823	CODE:	1224	CODE:
824	{	1225	{
825	while (self->texs <= texid)	1226	while (self->texs <= texid)
826	{	1227	{
827	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
839	tex->r = r;	1240	tex->r = r;
840	tex->g = g;	1241	tex->g = g;
841	tex->b = b;	1242	tex->b = b;
842	tex->a = a;	1243	tex->a = a;
843	}	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);
844	}	1254	}
845		1255
846	int	1256	int
847	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
848	ALIAS:	1258	ALIAS:
849	oy = 1	1259	oy = 1
		1260	x = 2
		1261	y = 3
		1262	w = 4
		1263	h = 5
850	CODE:	1264	CODE:
851	switch (ix)	1265	switch (ix)
852	{	1266	{
853	case 0: RETVAL = self->ox; break;	1267	case 0: RETVAL = self->ox; break;
854	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;
855	}	1273	}
856	OUTPUT:	1274	OUTPUT:
857	RETVAL	1275	RETVAL
858		1276
859	void	1277	void
860	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
861	CODE:	1279	CODE:
862	{	1280	{
863	if (dx > 0)	1281	if (dx > 0)
864	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
865	else if (dx < 0)	1283	else if (dx < 0)
866	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);
867		1285
868	if (dy > 0)	1286	if (dy > 0)
869	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
870	else if (dy < 0)	1288	else if (dy < 0)
871	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);
872		1290
873	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
874	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
875		1293
876	while (self->y < 0)	1294	while (self->y < 0)
…		…
881	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
882	}	1300	}
883	}	1301	}
884		1302
885	void	1303	void
886	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
887	CODE:	1305	CODE:
888	{	1306	{
889	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1307	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
890	uint8_t *data_end = (uint8_t *)SvEND (data_);	1308	uint8_t *data_end = (uint8_t *)SvEND (data_);
891	mapcell *cell;	1309	mapcell *cell;
892	int x, y, flags;	1310	int x, y, flags;
893		1311
894	while (data < data_end)	1312	while (data < data_end - 1)
895	{	1313	{
896	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
897		1315
898	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
899	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
900		1318
901	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
902		1320
903	if (flags & 15)	1321	if (flags & 15)
904	{	1322	{
905	if (cell->darkness < 0)	1323	if (!cell->darkness)
906	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
907	cell->darkness = 0;	1326	cell->darkness = 256;
908	cell->face [0] = 0;
909	cell->face [1] = 0;
910	cell->face [2] = 0;
911	}	1327	}
912		1328
913	cell->darkness = flags & 8 ? *data++ : 255;
914
915	//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	}
916		1370
917	if (flags & 4)	1371	if (flags & 4)
918	{	1372	{
919	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;
920	}	1374	}
…		…
928	{	1382	{
929	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;
930	}	1384	}
931	}	1385	}
932	else	1386	else
933	cell->darkness = -1;	1387	cell->darkness = 0;
934	}	1388	}
935	}	1389	}
936		1390
937	SV *	1391	SV *
938	mapmap (CFClient::Map self, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
939	CODE:	1393	CODE:
940	{	1394	{
941	int x0, x1, x;	1395	int x1, x;
942	int y0, y1, y;	1396	int y1, y;
943	int z;	1397	int z;
944	SV *map_sv = newSV (w * h * sizeof (uint32_t));	1398	SV *map_sv = newSV (w * h * sizeof (uint32_t));
945	uint32_t *map = (uint32_t *)SvPVX (map_sv);	1399	uint32_t *map = (uint32_t *)SvPVX (map_sv);
946		1400
947	SvPOK_only (map_sv);	1401	SvPOK_only (map_sv);
948	SvCUR_set (map_sv, w * h * sizeof (uint32_t));	1402	SvCUR_set (map_sv, w * h * sizeof (uint32_t));
949		1403
950	x0 = self->x - w / 2; x1 = x0 + w;	1404	x0 += self->x; x1 = x0 + w;
951	y0 = self->y - h / 2; y1 = y0 + h;	1405	y0 += self->y; y1 = y0 + h;
952		1406
953	for (y = y0; y < y1; y++)	1407	for (y = y0; y < y1; y++)
954	{	1408	{
955	maprow *row = 0 <= y && y < self->rows	1409	maprow *row = 0 <= y && y < self->rows
956	? self->row + y	1410	? self->row + y
…		…
993	}	1447	}
994	OUTPUT:	1448	OUTPUT:
995	RETVAL	1449	RETVAL
996		1450
997	void	1451	void
998	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)
999	PPCODE:	1453	CODE:
1000	{	1454	{
1001	int vx, vy;	1455	int vx, vy;
1002	int x, y, z;	1456	int x, y, z;
1003	int last_name;	1457	int last_name;
1004	mapface face;	1458	mapface face;
1005	int sw4 = (sw + 3) & ~3;
1006	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1007	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1008		1459
1009	memset (darkness, 255, sw4 * sh);
1010	SvPOK_only (darkness_sv);
1011	SvCUR_set (darkness_sv, sw4 * sh);
1012
1013	vx = self->x + (self->w - sw) / 2 - shift_x;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1014	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1015		1462
1016	/*	1463	/*
1017	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1018	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1019	: 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));
…		…
1023	: 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));
1024	*/	1471	*/
1025		1472
1026	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1027		1474
		1475	glEnable (GL_BLEND);
1028	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1029	glEnable (GL_BLEND);
1030	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1031	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1032		1479
1033	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1034		1481
…		…
1043	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1044	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1045	{	1492	{
1046	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1047		1494
1048	darkness[y * sw4 + x] = cell->darkness < 0
1049	? 255 - FOW_DARKNESS
1050	: 255 - cell->darkness;
1051
1052	face = cell->face [z];	1495	face = cell->face [z];
1053		1496
1054	if (face)	1497	if (face && face < self->texs)
1055	{	1498	{
1056	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1057
1058	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1059	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1060		1502
1061	if (last_name != tex.name)	1503	if (last_name != tex.name)
1062	{	1504	{
1063	glEnd ();	1505	glEnd ();
1064	last_name = tex.name;
1065	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1066	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1067	}	1508	}
1068		1509
1069	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1070	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1071	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);
1072	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1073	}	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	}
1074	}	1534	}
1075	}	1535	}
1076		1536
1077	glEnd ();	1537	glEnd ();
1078		1538
1079	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1080	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	}
1081		1666
1082	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1083	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1084	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1085	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1086	}	1671	}
1087		1672
1088	SV *	1673	SV *
1089	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)
1090	CODE:	1675	CODE:
1091	{	1676	{
1092	int x, y, x1, y1;	1677	int x, y, x1, y1;
1093	SV *data_sv = newSV (w * h * 7 + 5);	1678	SV *data_sv = newSV (w * h * 7 + 5);
1094	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1679	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1096	*data++ = 0; /* version 0 format */	1681	*data++ = 0; /* version 0 format */
1097	*data++ = w >> 8; *data++ = w;	1682	*data++ = w >> 8; *data++ = w;
1098	*data++ = h >> 8; *data++ = h;	1683	*data++ = h >> 8; *data++ = h;
1099		1684
1100	// we need to do this 'cause we don't keep an absolute coord system for rows	1685	// we need to do this 'cause we don't keep an absolute coord system for rows
1101	// TODO: treat rows as we treat	1686	// TODO: treat rows as we treat columns
1102	map_get_row (self, y0 + self->y - self->oy);//D	1687	map_get_row (self, y0 + self->y - self->oy);//D
1103	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1688	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1104		1689
1105	x0 += self->x - self->ox;	1690	x0 += self->x - self->ox;
1106	y0 += self->y - self->oy;	1691	y0 += self->y - self->oy;
…		…
1156	}	1741	}
1157	OUTPUT:	1742	OUTPUT:
1158	RETVAL	1743	RETVAL
1159		1744
1160	void	1745	void
1161	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)
1162	PPCODE:	1747	PPCODE:
1163	{	1748	{
1164	int x, y, z;	1749	int x, y, z;
1165	int w, h;	1750	int w, h;
1166	int x1, y1;	1751	int x1, y1;
…		…
1170		1755
1171	w = *data++ << 8; w |= *data++;	1756	w = *data++ << 8; w |= *data++;
1172	h = *data++ << 8; h |= *data++;	1757	h = *data++ << 8; h |= *data++;
1173		1758
1174	// we need to do this 'cause we don't keep an absolute coord system for rows	1759	// we need to do this 'cause we don't keep an absolute coord system for rows
1175	// TODO: treat rows as we treat	1760	// TODO: treat rows as we treat columns
1176	map_get_row (self, y0 + self->y - self->oy);//D	1761	map_get_row (self, y0 + self->y - self->oy);//D
1177	map_get_row (self, y0 + self->y - self->oy + h - 1);//D	1762	map_get_row (self, y0 + self->y - self->oy + h - 1);//D
1178		1763
1179	x0 += self->x - self->ox;	1764	x0 += self->x - self->ox;
1180	y0 += self->y - self->oy;	1765	y0 += self->y - self->oy;
…		…
1198		1783
1199	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }	1784	if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1200	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }	1785	if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1201	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }	1786	if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1202		1787
1203	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1204	{	1789	{
1205	cell->darkness = -1;	1790	cell->darkness = 0;
1206		1791
1207	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1208	{	1793	{
1209	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1210		1795
…		…
1215	}	1800	}
1216	}	1801	}
1217	}	1802	}
1218	}	1803	}
1219		1804
1220	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1221		1806
1222	CFClient::MixChunk	1807	CFPlus::MixChunk
1223	new_from_file (SV *class, char *path)	1808	new_from_file (SV *class, char *path)
1224	CODE:	1809	CODE:
1225	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1226	OUTPUT:	1811	OUTPUT:
1227	RETVAL	1812	RETVAL
1228		1813
1229	void	1814	void
1230	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1231	CODE:	1816	CODE:
1232	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1233		1818
1234	int	1819	int
1235	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1236	CODE:	1821	CODE:
1237	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1238	OUTPUT:	1823	OUTPUT:
1239	RETVAL	1824	RETVAL
1240		1825
1241	int	1826	int
1242	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)
1243	CODE:	1828	CODE:
1244	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1245	OUTPUT:	1830	OUTPUT:
1246	RETVAL	1831	RETVAL
1247		1832
1248	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1249		1834
1250	int	1835	int
1251	volume (int volume = -1)	1836	volume (int volume = -1)
1252	CODE:	1837	CODE:
1253	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1254	OUTPUT:	1839	OUTPUT:
1255	RETVAL	1840	RETVAL
1256		1841
1257	CFClient::MixMusic	1842	CFPlus::MixMusic
1258	new_from_file (SV *class, char *path)	1843	new_from_file (SV *class, char *path)
1259	CODE:	1844	CODE:
1260	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1261	OUTPUT:	1846	OUTPUT:
1262	RETVAL	1847	RETVAL
1263		1848
1264	void	1849	void
1265	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1266	CODE:	1851	CODE:
1267	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1268		1853
1269	int	1854	int
1270	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1271	CODE:	1856	CODE:
1272	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1273	OUTPUT:	1858	OUTPUT:
1274	RETVAL	1859	RETVAL
1275		1860
1276	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1277		1862
1278	BOOT:	1863	BOOT:
1279	{	1864	{
1280	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1281	static const struct {	1866	static const struct {
1282	const char *name;	1867	const char *name;
1283	IV iv;	1868	IV iv;
1284	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1285	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
1286	const_iv (GL_COLOR_MATERIAL),	1871	const_iv (GL_COLOR_MATERIAL),
1287	const_iv (GL_SMOOTH),	1872	const_iv (GL_SMOOTH),
1288	const_iv (GL_FLAT),	1873	const_iv (GL_FLAT),
		1874	const_iv (GL_DITHER),
1289	const_iv (GL_BLEND),	1875	const_iv (GL_BLEND),
		1876	const_iv (GL_CULL_FACE),
		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),
1290	const_iv (GL_AND),	1884	const_iv (GL_AND),
		1885	const_iv (GL_ONE),
		1886	const_iv (GL_ZERO),
1291	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
		1888	const_iv (GL_DST_ALPHA),
1292	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1891	const_iv (GL_SRC_ALPHA_SATURATE),
1293	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1294	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),
1295	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
1296	const_iv (GL_ALPHA4),	1898	const_iv (GL_UNSIGNED_SHORT),
		1899	const_iv (GL_UNSIGNED_INT),
1297	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
		1901	const_iv (GL_INTENSITY),
		1902	const_iv (GL_LUMINANCE),
		1903	const_iv (GL_LUMINANCE_ALPHA),
1298	const_iv (GL_FLOAT),	1904	const_iv (GL_FLOAT),
1299	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1905	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1300	const_iv (GL_COMPILE),	1906	const_iv (GL_COMPILE),
1301	const_iv (GL_TEXTURE_1D),	1907	const_iv (GL_TEXTURE_1D),
1302	const_iv (GL_TEXTURE_2D),	1908	const_iv (GL_TEXTURE_2D),
…		…
1304	const_iv (GL_TEXTURE_MAG_FILTER),	1910	const_iv (GL_TEXTURE_MAG_FILTER),
1305	const_iv (GL_TEXTURE_MIN_FILTER),	1911	const_iv (GL_TEXTURE_MIN_FILTER),
1306	const_iv (GL_TEXTURE_ENV_MODE),	1912	const_iv (GL_TEXTURE_ENV_MODE),
1307	const_iv (GL_TEXTURE_WRAP_S),	1913	const_iv (GL_TEXTURE_WRAP_S),
1308	const_iv (GL_TEXTURE_WRAP_T),	1914	const_iv (GL_TEXTURE_WRAP_T),
		1915	const_iv (GL_REPEAT),
1309	const_iv (GL_CLAMP),	1916	const_iv (GL_CLAMP),
1310	const_iv (GL_REPEAT),	1917	const_iv (GL_CLAMP_TO_EDGE),
1311	const_iv (GL_NEAREST),	1918	const_iv (GL_NEAREST),
1312	const_iv (GL_LINEAR),	1919	const_iv (GL_LINEAR),
		1920	const_iv (GL_NEAREST_MIPMAP_NEAREST),
		1921	const_iv (GL_LINEAR_MIPMAP_NEAREST),
		1922	const_iv (GL_NEAREST_MIPMAP_LINEAR),
		1923	const_iv (GL_LINEAR_MIPMAP_LINEAR),
		1924	const_iv (GL_GENERATE_MIPMAP),
1313	const_iv (GL_MODULATE),	1925	const_iv (GL_MODULATE),
		1926	const_iv (GL_DECAL),
1314	const_iv (GL_REPLACE),	1927	const_iv (GL_REPLACE),
		1928	const_iv (GL_DEPTH_BUFFER_BIT),
1315	const_iv (GL_COLOR_BUFFER_BIT),	1929	const_iv (GL_COLOR_BUFFER_BIT),
1316	const_iv (GL_PROJECTION),	1930	const_iv (GL_PROJECTION),
1317	const_iv (GL_MODELVIEW),	1931	const_iv (GL_MODELVIEW),
1318	const_iv (GL_COLOR_LOGIC_OP),	1932	const_iv (GL_COLOR_LOGIC_OP),
		1933	const_iv (GL_SEPARABLE_2D),
1319	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1320	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1321	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1322	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
		1939	const_iv (GL_LINE_LOOP),
1323	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
		1941	const_iv (GL_QUAD_STRIP),
		1942	const_iv (GL_TRIANGLES),
		1943	const_iv (GL_TRIANGLE_STRIP),
		1944	const_iv (GL_TRIANGLE_FAN),
1324	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1945	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1325	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),
1326	# undef const_iv	1951	# undef const_iv
1327	};	1952	};
1328		1953
1329	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; )
1330	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1955	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1331	}	1956	}
1332		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
1333	int glGetError ()	1979	int glGetError ()
		1980
		1981	void glFinish ()
1334		1982
1335	void glClear (int mask)	1983	void glClear (int mask)
1336		1984
1337	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)
1338	PROTOTYPE: @	1986	PROTOTYPE: @
…		…
1345		1993
1346	void glHint (int target, int mode)	1994	void glHint (int target, int mode)
1347		1995
1348	void glBlendFunc (int sfactor, int dfactor)	1996	void glBlendFunc (int sfactor, int dfactor)
1349		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
1350	void glLogicOp (int opcode)	2004	void glLogicOp (int opcode)
1351		2005
		2006	void glColorMask (int red, int green, int blue, int alpha)
		2007
1352	void glMatrixMode (int mode)	2008	void glMatrixMode (int mode)
1353		2009
1354	void glPushMatrix ()	2010	void glPushMatrix ()
1355		2011
1356	void glPopMatrix ()	2012	void glPopMatrix ()
1357		2013
1358	void glLoadIdentity ()	2014	void glLoadIdentity ()
1359		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
		2019
		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
1360	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_)
1361		2025
1362	void glViewport (int x, int y, int width, int height)	2026	void glViewport (int x, int y, int width, int height)
		2027
		2028	void glScissor (int x, int y, int width, int height)
1363		2029
1364	void glTranslate (float x, float y, float z = 0.)	2030	void glTranslate (float x, float y, float z = 0.)
1365	CODE:	2031	CODE:
1366	glTranslatef (x, y, z);	2032	glTranslatef (x, y, z);
1367		2033
1368	void glScale (float x, float y, float z)	2034	void glScale (float x, float y, float z = 1.)
1369	CODE:	2035	CODE:
1370	glScalef (x, y, z);	2036	glScalef (x, y, z);
1371		2037
1372	void glRotate (float angle, float x, float y, float z)	2038	void glRotate (float angle, float x, float y, float z)
1373	CODE:	2039	CODE:
…		…
1377		2043
1378	void glEnd ()	2044	void glEnd ()
1379		2045
1380	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)
1381	PROTOTYPE: @	2047	PROTOTYPE: @
		2048	ALIAS:
		2049	glColor_premultiply = 1
1382	CODE:	2050	CODE:
		2051	if (ix)
		2052	{
		2053	r *= a;
		2054	g *= a;
		2055	b *= a;
		2056	}
		2057	// microsoft visual "c" rounds instead of truncating...
1383	glColor4f (r, g, b, a);	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);
1384		2070
1385	void glVertex (float x, float y, float z = 0.)	2071	void glVertex (float x, float y, float z = 0.)
1386	CODE:	2072	CODE:
1387	glVertex3f (x, y, z);	2073	glVertex3f (x, y, z);
1388		2074
…		…
1400		2086
1401	void glBindTexture (int target, int name)	2087	void glBindTexture (int target, int name)
1402		2088
1403	void glConvolutionParameter (int target, int pname, float params)	2089	void glConvolutionParameter (int target, int pname, float params)
1404	CODE:	2090	CODE:
		2091	if (gl.ConvolutionParameterf)
1405	glConvolutionParameterf (target, pname, params);	2092	gl.ConvolutionParameterf (target, pname, params);
1406		2093
1407	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)
		2095	CODE:
		2096	if (gl.ConvolutionFilter2D)
		2097	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2098
		2099	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
		2100	CODE:
		2101	if (gl.SeparableFilter2D)
		2102	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1408		2103
1409	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)
1410		2105
1411	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)
		2107
		2108	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2109
		2110	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1412		2111
1413	int glGenTexture ()	2112	int glGenTexture ()
1414	CODE:	2113	CODE:
1415	{	2114	{
1416	GLuint name;	2115	GLuint name;

Diff Legend

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