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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
		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
38	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		52
40	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
41		54
42	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
44		57
45	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
46		59
47	#define GL_CALL(type,func,args) \	60	#if 0
48	{ \	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
49	static int init_; \	62	#else
50	static type fptr_; \	63	# define PARACHUTE 0
51	\	64	#endif
52	if (!init_) \
53	{ \
54	init_ = 1; \
55	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
56	} \
57	\
58	if (fptr_) \
59	fptr_ args; \
60	}
61		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
62	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
63	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
64		91
65	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
66		111
67	typedef struct cf_layout {	112	typedef struct cf_layout {
68	PangoLayout *pl;	113	PangoLayout *pl;
		114	float r, g, b, a; // default color for rgba mode
69	int base_height;	115	int base_height;
70	CFClient__Font font;	116	CFPlus__Font font;
71	} *CFClient__Layout;	117	} *CFPlus__Layout;
72		118
73	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
74	static PangoContext *context;	120	static PangoContext *opengl_context;
75	static PangoFontMap *fontmap;	121	static PangoFontMap *opengl_fontmap;
76		122
77	static void	123	static void
78	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
79	{	125	{
80	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
81	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	130	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
82	}	131	}
83		132
84	static void	133	static void
85	layout_update_font (CFClient__Layout self)	134	layout_update_font (CFPlus__Layout self)
86	{	135	{
87	/* 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
88	* reasonably well with bitstream vera	137	* reasonably well with bitstream vera
89	*/	138	*/
90	PangoFontDescription *font = self->font ? self->font : default_font;	139	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
94		143
95	pango_layout_set_font_description (self->pl, font);	144	pango_layout_set_font_description (self->pl, font);
96	}	145	}
97		146
98	static void	147	static void
99	layout_get_pixel_size (CFClient__Layout self, int w, int h)	148	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
100	{	149	{
		150	PangoRectangle rect;
		151
		152	// get_pixel_* wrongly rounds down
101	pango_layout_get_pixel_size (self->pl, w, h);	153	pango_layout_get_extents (self->pl, 0, &rect);
102		154
103	w = (w + 3) & ~3;	155	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
104	if (!w) w = 1;	156	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
105	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;
106	}	163	}
107		164
108	typedef uint16_t mapface;	165	typedef uint16_t mapface;
109		166
110	typedef struct {	167	typedef struct {
…		…
113	float s, t;	170	float s, t;
114	uint8_t r, g, b, a;	171	uint8_t r, g, b, a;
115	} maptex;	172	} maptex;
116		173
117	typedef struct {	174	typedef struct {
118	int16_t darkness;	175	uint32_t player;
119	mapface face[3];	176	mapface face[3];
		177	uint16_t darkness;
		178	uint8_t stat_width, stat_hp, flags;
120	} mapcell;	179	} mapcell;
121		180
122	typedef struct {	181	typedef struct {
123	int32_t c0, c1;	182	int32_t c0, c1;
124	mapcell *col;	183	mapcell *col;
…		…
133	int texs;	192	int texs;
134	maptex *tex;	193	maptex *tex;
135		194
136	int32_t rows;	195	int32_t rows;
137	maprow *row;	196	maprow *row;
138	} *CFClient__Map;	197	} *CFPlus__Map;
139		198
140	static char *	199	static char *
141	prepend (char *ptr, int sze, int inc)	200	prepend (char *ptr, int sze, int inc)
142	{	201	{
143	char *p;	202	char *p;
…		…
161		220
162	#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))
163	#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))
164		223
165	static maprow *	224	static maprow *
166	map_get_row (CFClient__Map self, int y)	225	map_get_row (CFPlus__Map self, int y)
167	{	226	{
168	if (0 > y)	227	if (0 > y)
169	{	228	{
170	int extend = - y + MAP_EXTEND_Y;	229	int extend = - y + MAP_EXTEND_Y;
171	Prepend (maprow, self->row, self->rows, extend);	230	Prepend (maprow, self->row, self->rows, extend);
…		…
209		268
210	return row->col + (x - row->c0);	269	return row->col + (x - row->c0);
211	}	270	}
212		271
213	static mapcell *	272	static mapcell *
214	map_get_cell (CFClient__Map self, int x, int y)	273	map_get_cell (CFPlus__Map self, int x, int y)
215	{	274	{
216	return row_get_cell (map_get_row (self, y), x);	275	return row_get_cell (map_get_row (self, y), x);
217	}	276	}
218		277
219	static void	278	static void
220	map_clear (CFClient__Map self)	279	map_clear (CFPlus__Map self)
221	{	280	{
222	int r;	281	int r;
223		282
224	for (r = 0; r < self->rows; r++)	283	for (r = 0; r < self->rows; r++)
225	Safefree (self->row[r].col);	284	Safefree (self->row[r].col);
…		…
233	self->row = 0;	292	self->row = 0;
234	self->rows = 0;	293	self->rows = 0;
235	}	294	}
236		295
237	static void	296	static void
238	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)
239	{	298	{
240	int x, y;	299	int x, y;
241	maprow *row;	300	maprow *row;
		301	mapcell *cell;
242		302
243	for (y = y0; y < y0 + h; y++)	303	for (y = y0; y < y0 + h; y++)
244	if (y >= 0)	304	if (y >= 0)
245	{	305	{
246	if (y >= self->rows)	306	if (y >= self->rows)
…		…
252	if (x >= row->c0)	312	if (x >= row->c0)
253	{	313	{
254	if (x >= row->c1)	314	if (x >= row->c1)
255	break;	315	break;
256		316
257	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;
258	}	323	}
259	}	324	}
260	}	325	}
261		326
262	static void	327	static void
263	music_finished ()	328	music_finished (void)
264	{	329	{
265	SDL_UserEvent ev;	330	SDL_UserEvent ev;
266		331
267	ev.type = SDL_USEREVENT;	332	ev.type = SDL_USEREVENT;
268	ev.code = 0;	333	ev.code = 0;
…		…
270	ev.data2 = 0;	335	ev.data2 = 0;
271		336
272	SDL_PushEvent ((SDL_Event *)&ev);	337	SDL_PushEvent ((SDL_Event *)&ev);
273	}	338	}
274		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
275	MODULE = CFClient PACKAGE = CFClient	370	MODULE = CFPlus PACKAGE = CFPlus
276		371
277	PROTOTYPES: ENABLE	372	PROTOTYPES: ENABLE
278		373
279	BOOT:	374	BOOT:
280	{	375	{
281	HV *stash = gv_stashpv ("CFClient", 1);	376	HV *stash = gv_stashpv ("CFPlus", 1);
282	static const struct {	377	static const struct {
283	const char *name;	378	const char *name;
284	IV iv;	379	IV iv;
285	} *civ, const_iv[] = {	380	} *civ, const_iv[] = {
286	# define const_iv(name) { # name, (IV)name }	381	# define const_iv(name) { # name, (IV)name }
…		…
385	# undef const_iv	480	# undef const_iv
386	};	481	};
387		482
388	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; )
389	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	484	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
390
391	fontmap = pango_ft2_font_map_new ();
392	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
393	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
394	}	485	}
395		486
396	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
397	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	508	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
398		509
399	void	510	void
400	SDL_Quit ()	511	SDL_Quit ()
401		512
402	void	513	void
…		…
408	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
409	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
410	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
411	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	522	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
412		523
		524	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		525	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		526
413	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
414	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
415	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
416	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
417		531
418	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	532	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		533	#if SDL_VERSION_ATLEAST(1,2,10)
419	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	534	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
420	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	535	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		536	#endif
421		537
422	SDL_EnableUNICODE (1);	538	SDL_EnableUNICODE (1);
423	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	539	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
424		540
425	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	541	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
434		550
435	++m;	551	++m;
436	}	552	}
437	}	553	}
438		554
		555	char *
		556	SDL_GetError ()
		557
439	int	558	int
440	SDL_SetVideoMode (int w, int h, int fullscreen)	559	SDL_SetVideoMode (int w, int h, int fullscreen)
441	CODE:	560	CODE:
442	RETVAL = !!SDL_SetVideoMode (	561	RETVAL = !!SDL_SetVideoMode (
443	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	562	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
444	);	563	);
		564	if (RETVAL)
		565	{
445	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	}
446	OUTPUT:	571	OUTPUT:
447	RETVAL	572	RETVAL
448		573
449	void	574	void
450	SDL_GL_SwapBuffers ()	575	SDL_GL_SwapBuffers ()
		576
		577	char *
		578	SDL_GetKeyName (int sym)
451		579
452	void	580	void
453	SDL_PollEvent ()	581	SDL_PollEvent ()
454	PPCODE:	582	PPCODE:
455	{	583	{
…		…
474	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	602	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
475	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	603	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
476	break;	604	break;
477		605
478	case SDL_MOUSEMOTION:	606	case SDL_MOUSEMOTION:
		607	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		608
479	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	609	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	610	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	611	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
482	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	612	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
483	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	613	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
484	break;	614	break;
485		615
486	case SDL_MOUSEBUTTONDOWN:	616	case SDL_MOUSEBUTTONDOWN:
487	case SDL_MOUSEBUTTONUP:	617	case SDL_MOUSEBUTTONUP:
		618	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		619
488	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	620	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
489	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	621	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
490	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	622	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
491	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	623	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
492	break;	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;
493	}	631	}
494		632
495	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	633	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
496	}	634	}
497	}	635	}
498		636
499	int	637	int
500	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)
501	POSTCALL:	639	POSTCALL:
502	Mix_HookMusicFinished (music_finished);	640	Mix_HookMusicFinished (music_finished);
		641	Mix_ChannelFinished (channel_finished);
503		642
504	void	643	void
505	Mix_CloseAudio ()	644	Mix_CloseAudio ()
506		645
507	int	646	int
…		…
512	CODE:	651	CODE:
513	#ifndef _WIN32	652	#ifndef _WIN32
514	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	653	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
515	#endif	654	#endif
516		655
517	char *	656	void
518	gl_version ()	657	win32_proxy_info ()
519	CODE:	658	PPCODE:
520	RETVAL = (char *)glGetString (GL_VERSION);	659	{
521	OUTPUT:	660	#ifdef _WIN32
522	RETVAL	661	char buffer[2048];
		662	DWORD buflen;
523		663
524	char *	664	EXTEND (SP, 3);
525	gl_extensions ()	665
526	CODE:	666	buflen = sizeof (buffer);
527	RETVAL = (char *)glGetString (GL_EXTENSIONS);	667	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
528	OUTPUT:	668	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
529	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	}
530		684
531	void	685	void
532	add_font (char *file)	686	add_font (char *file)
533	CODE:	687	CODE:
534	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	688	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
535		689
536	void	690	void
537	load_image_inline (SV *image_)	691	load_image_inline (SV *image_)
538	ALIAS:	692	ALIAS:
539	load_image_file = 1	693	load_image_file = 1
…		…
581		735
582	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	736	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
583		737
584	assert (surface2->pitch == surface2->w * 4);	738	assert (surface2->pitch == surface2->w * 4);
585		739
		740	SDL_LockSurface (surface2);
586	EXTEND (SP, 5);	741	EXTEND (SP, 6);
587	PUSHs (sv_2mortal (newSViv (surface2->w)));	742	PUSHs (sv_2mortal (newSViv (surface2->w)));
588	PUSHs (sv_2mortal (newSViv (surface2->h)));	743	PUSHs (sv_2mortal (newSViv (surface2->h)));
589	SDL_LockSurface (surface2);
590	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	744	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
591	SDL_UnlockSurface (surface2);
592	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)));
593	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	746	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
594	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	747	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		748	SDL_UnlockSurface (surface2);
595		749
596	SDL_FreeSurface (surface);	750	SDL_FreeSurface (surface);
597	SDL_FreeSurface (surface2);	751	SDL_FreeSurface (surface2);
598	}	752	}
599		753
…		…
623	}	777	}
624		778
625	void	779	void
626	error (char *message)	780	error (char *message)
627	CODE:	781	CODE:
		782	fprintf (stderr, "ERROR: %s\n", message);
628	#ifdef _WIN32	783	#ifdef _WIN32
629	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	784	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		785	#endif
		786
		787	void
		788	fatal (char *message)
		789	CODE:
		790	fprintf (stderr, "FATAL: %s\n", message);
		791	#ifdef _WIN32
		792	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
		793	#endif
		794	_exit (1);
		795
		796	void
		797	_exit (int retval = 0)
		798	CODE:
		799	#ifdef WIN32
		800	ExitThread (retval); // unclean, please beam me up
630	#else	801	#else
631	fprintf (stderr, "ERROR: %s\n", message);	802	_exit (retval);
632	#endif	803	#endif
633		804
634	void
635	fatal (char *message)
636	CODE:
637	#ifdef _WIN32
638	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);
639	#else
640	fprintf (stderr, "FATAL: %s\n", message);
641	#endif
642	exit (1);
643
644	MODULE = CFClient PACKAGE = CFClient::Font	805	MODULE = CFPlus PACKAGE = CFPlus::Font
645		806
646	CFClient::Font	807	CFPlus::Font
647	new_from_file (SV class, char path, int id = 0)	808	new_from_file (SV class, char path, int id = 0)
648	CODE:	809	CODE:
649	{	810	{
650	int count;	811	int count;
651	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	812	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
654	}	815	}
655	OUTPUT:	816	OUTPUT:
656	RETVAL	817	RETVAL
657		818
658	void	819	void
659	DESTROY (CFClient::Font self)	820	DESTROY (CFPlus::Font self)
660	CODE:	821	CODE:
661	pango_font_description_free (self);	822	pango_font_description_free (self);
662		823
663	void	824	void
664	make_default (CFClient::Font self)	825	make_default (CFPlus::Font self)
665	CODE:	826	CODE:
666	default_font = self;	827	default_font = self;
667		828
668	MODULE = CFClient PACKAGE = CFClient::Layout	829	MODULE = CFPlus PACKAGE = CFPlus::Layout
669		830
670	CFClient::Layout	831	void
671	new (SV *class, int base_height = MIN_FONT_HEIGHT)	832	reset_glyph_cache ()
		833	CODE:
		834	tc_clear ();
		835
		836	CFPlus::Layout
		837	new (SV *class)
672	CODE:	838	CODE:
673	New (0, RETVAL, 1, struct cf_layout);	839	New (0, RETVAL, 1, struct cf_layout);
		840
674	RETVAL->pl = pango_layout_new (context);	841	RETVAL->pl = pango_layout_new (opengl_context);
675	RETVAL->base_height = base_height;	842	RETVAL->r = 1.;
		843	RETVAL->g = 1.;
		844	RETVAL->b = 1.;
		845	RETVAL->a = 1.;
		846	RETVAL->base_height = MIN_FONT_HEIGHT;
676	RETVAL->font = 0;	847	RETVAL->font = 0;
		848
677	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	849	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
678	pango_layout_set_font_description (RETVAL->pl, default_font);	850	layout_update_font (RETVAL);
679	OUTPUT:	851	OUTPUT:
680	RETVAL	852	RETVAL
681		853
682	void	854	void
683	DESTROY (CFClient::Layout self)	855	DESTROY (CFPlus::Layout self)
684	CODE:	856	CODE:
685	g_object_unref (self->pl);	857	g_object_unref (self->pl);
686	Safefree (self);	858	Safefree (self);
687		859
688	void	860	void
689	set_text (CFClient::Layout self, SV *text_)	861	set_text (CFPlus::Layout self, SV *text_)
690	CODE:	862	CODE:
691	{	863	{
692	STRLEN textlen;	864	STRLEN textlen;
693	char *text = SvPVutf8 (text_, textlen);	865	char *text = SvPVutf8 (text_, textlen);
694		866
695	pango_layout_set_text (self->pl, text, textlen);	867	pango_layout_set_text (self->pl, text, textlen);
696	}	868	}
697		869
698	void	870	void
699	set_markup (CFClient::Layout self, SV *text_)	871	set_markup (CFPlus::Layout self, SV *text_)
700	CODE:	872	CODE:
701	{	873	{
702	STRLEN textlen;	874	STRLEN textlen;
703	char *text = SvPVutf8 (text_, textlen);	875	char *text = SvPVutf8 (text_, textlen);
704		876
705	pango_layout_set_markup (self->pl, text, textlen);	877	pango_layout_set_markup (self->pl, text, textlen);
706	}	878	}
707		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
708	SV *	965	SV *
709	get_text (CFClient::Layout self)	966	get_text (CFPlus::Layout self)
710	CODE:	967	CODE:
711	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	968	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
712	SvUTF8_on (RETVAL);	969	sv_utf8_decode (RETVAL);
713	OUTPUT:	970	OUTPUT:
714	RETVAL	971	RETVAL
715		972
716	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
717	set_font (CFClient::Layout self, CFClient::Font font = 0)	982	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
718	CODE:	983	CODE:
719	if (self->font != font)	984	if (self->font != font)
720	{	985	{
721	self->font = font;	986	self->font = font;
722	layout_update_font (self);	987	layout_update_font (self);
723	}	988	}
724		989
725	void	990	void
726	set_height (CFClient::Layout self, int base_height)	991	set_height (CFPlus::Layout self, int base_height)
727	CODE:	992	CODE:
728	if (self->base_height != base_height)	993	if (self->base_height != base_height)
729	{	994	{
730	self->base_height = base_height;	995	self->base_height = base_height;
731	layout_update_font (self);	996	layout_update_font (self);
732	}	997	}
733		998
734	void	999	void
735	set_width (CFClient::Layout self, int max_width = -1)	1000	set_width (CFPlus::Layout self, int max_width = -1)
736	CODE:	1001	CODE:
737	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);
738		1003
739	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
740	size (CFClient::Layout self)	1030	size (CFPlus::Layout self)
741	PPCODE:	1031	PPCODE:
742	{	1032	{
743	int w, h;	1033	int w, h;
744		1034
745	layout_get_pixel_size (self, &w, &h);	1035	layout_get_pixel_size (self, &w, &h);
…		…
748	PUSHs (sv_2mortal (newSViv (w)));	1038	PUSHs (sv_2mortal (newSViv (w)));
749	PUSHs (sv_2mortal (newSViv (h)));	1039	PUSHs (sv_2mortal (newSViv (h)));
750	}	1040	}
751		1041
752	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
753	xy_to_index (CFClient::Layout self, int x, int y)	1055	xy_to_index (CFPlus::Layout self, int x, int y)
754	CODE:	1056	CODE:
755	{	1057	{
756	int index, trailing;	1058	int index, trailing;
757	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);
758	RETVAL = index;	1060	RETVAL = index;
759	}	1061	}
760	OUTPUT:	1062	OUTPUT:
761	RETVAL	1063	RETVAL
762		1064
763	void	1065	void
764	cursor_pos (CFClient::Layout self, int index)	1066	cursor_pos (CFPlus::Layout self, int index)
765	PPCODE:	1067	PPCODE:
766	{	1068	{
767	PangoRectangle strong_pos;	1069	PangoRectangle strong_pos;
768	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1070	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
769		1071
…		…
772	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1074	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
773	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1075	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
774	}	1076	}
775		1077
776	void	1078	void
777	render (CFClient::Layout self)	1079	render (CFPlus::Layout self, float x, float y, int flags = 0)
778	PPCODE:	1080	PPCODE:
779	{	1081	pango_opengl_render_layout_subpixel (
780	SV *retval;	1082	self->pl,
781	int w, h;	1083	x * PANGO_SCALE, y * PANGO_SCALE,
782	FT_Bitmap bitmap;	1084	self->r, self->g, self->b, self->a,
		1085	flags
		1086	);
783		1087
784	layout_get_pixel_size (self, &w, &h);	1088	MODULE = CFPlus PACKAGE = CFPlus::Texture
785		1089
786	retval = newSV (w * h);	1090	void
787	SvPOK_only (retval);	1091	pad2pot (SV data_, SV w_, SV *h_)
788	SvCUR_set (retval, w * h);	1092	CODE:
		1093	{
		1094	int ow = SvIV (w_);
		1095	int oh = SvIV (h_);
789		1096
790	bitmap.rows = h;	1097	if (ow && oh)
791	bitmap.width = w;	1098	{
792	bitmap.pitch = w;	1099	int nw = minpot (ow);
793	bitmap.buffer = (unsigned char*)SvPVX (retval);	1100	int nh = minpot (oh);
794	bitmap.num_grays = 256;
795	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
796		1101
797	memset (bitmap.buffer, 0, w * h);	1102	if (nw != ow \|\| nh != oh)
798		1103	{
799	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));
800		1110
801	EXTEND (SP, 3);	1111	SvPOK_only (result_);
802	PUSHs (sv_2mortal (newSViv (w)));	1112	SvCUR_set (result_, nw * nh * bpp);
803	PUSHs (sv_2mortal (newSViv (h)));
804	PUSHs (sv_2mortal (retval));
805	}
806		1113
807	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);
808		1117
		1118	sv_setsv (data_, result_);
		1119	}
		1120
		1121	sv_setiv (w_, nw);
		1122	sv_setiv (h_, nh);
		1123	}
		1124	}
		1125	}
		1126
809	void	1127	void
810	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.)
811	PROTOTYPE: $$$;$$	1129	PROTOTYPE: $$$;$$
		1130	ALIAS:
		1131	draw_quad_alpha = 1
		1132	draw_quad_alpha_premultiplied = 2
812	CODE:	1133	CODE:
813	{	1134	{
814	HV hv = (HV )SvRV (self);	1135	HV hv = (HV )SvRV (self);
815	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1136	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
816	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1137	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
817	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1138	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
818	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
819		1139
820	if (items < 5)	1140	if (items < 5)
821	{	1141	{
822	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1142	w = SvNV (*hv_fetch (hv, "w", 1, 1));
823	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1143	h = SvNV (*hv_fetch (hv, "h", 1, 1));
824	}	1144	}
825		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
826	glBindTexture (GL_TEXTURE_2D, name);	1160	glBindTexture (GL_TEXTURE_2D, name);
827	if (wrap_mode) {	1161
828	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
829	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
830	}
831	glBegin (GL_QUADS);	1162	glBegin (GL_QUADS);
832	glTexCoord2f (0, 0); glVertex2f (x , y );	1163	glTexCoord2f (0, 0); glVertex2f (x , y );
833	glTexCoord2f (0, t); glVertex2f (x , y + h);	1164	glTexCoord2f (0, t); glVertex2f (x , y + h);
834	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1165	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
835	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1166	glTexCoord2f (s, 0); glVertex2f (x + w, y );
836	glEnd ();	1167	glEnd ();
837	}
838		1168
		1169	if (ix)
		1170	{
		1171	glDisable (GL_ALPHA_TEST);
		1172	glDisable (GL_BLEND);
		1173	}
		1174	}
		1175
839	MODULE = CFClient PACKAGE = CFClient::Map	1176	MODULE = CFPlus PACKAGE = CFPlus::Map
840		1177
841	CFClient::Map	1178	CFPlus::Map
842	new (SV *class, int map_width, int map_height)	1179	new (SV *class, int map_width, int map_height)
843	CODE:	1180	CODE:
844	New (0, RETVAL, 1, struct map);	1181	New (0, RETVAL, 1, struct map);
845	RETVAL->x = 0;	1182	RETVAL->x = 0;
846	RETVAL->y = 0;	1183	RETVAL->y = 0;
…		…
856	RETVAL->row = 0;	1193	RETVAL->row = 0;
857	OUTPUT:	1194	OUTPUT:
858	RETVAL	1195	RETVAL
859		1196
860	void	1197	void
861	DESTROY (CFClient::Map self)	1198	DESTROY (CFPlus::Map self)
862	CODE:	1199	CODE:
863	{	1200	{
864	map_clear (self);	1201	map_clear (self);
865	Safefree (self->face);	1202	Safefree (self->face);
		1203	Safefree (self->tex);
866	Safefree (self);	1204	Safefree (self);
867	}	1205	}
868		1206
869	void	1207	void
870	clear (CFClient::Map self)	1208	clear (CFPlus::Map self)
871	CODE:	1209	CODE:
872	map_clear (self);	1210	map_clear (self);
873		1211
874	void	1212	void
875	set_face (CFClient::Map self, int face, int texid)	1213	set_face (CFPlus::Map self, int face, int texid)
876	CODE:	1214	CODE:
877	{	1215	{
878	while (self->faces <= face)	1216	while (self->faces <= face)
879	{	1217	{
880	Append (mapface, self->face, self->faces, self->faces);	1218	Append (mapface, self->face, self->faces, self->faces);
…		…
883		1221
884	self->face [face] = texid;	1222	self->face [face] = texid;
885	}	1223	}
886		1224
887	void	1225	void
888	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)
889	CODE:	1227	CODE:
890	{	1228	{
891	while (self->texs <= texid)	1229	while (self->texs <= texid)
892	{	1230	{
893	Append (maptex, self->tex, self->texs, self->texs);	1231	Append (maptex, self->tex, self->texs, self->texs);
…		…
905	tex->r = r;	1243	tex->r = r;
906	tex->g = g;	1244	tex->g = g;
907	tex->b = b;	1245	tex->b = b;
908	tex->a = a;	1246	tex->a = a;
909	}	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);
910	}	1257	}
911		1258
912	int	1259	int
913	ox (CFClient::Map self)	1260	ox (CFPlus::Map self)
914	ALIAS:	1261	ALIAS:
915	oy = 1	1262	oy = 1
		1263	x = 2
		1264	y = 3
		1265	w = 4
		1266	h = 5
916	CODE:	1267	CODE:
917	switch (ix)	1268	switch (ix)
918	{	1269	{
919	case 0: RETVAL = self->ox; break;	1270	case 0: RETVAL = self->ox; break;
920	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;
921	}	1276	}
922	OUTPUT:	1277	OUTPUT:
923	RETVAL	1278	RETVAL
924		1279
925	void	1280	void
926	scroll (CFClient::Map self, int dx, int dy)	1281	scroll (CFPlus::Map self, int dx, int dy)
927	CODE:	1282	CODE:
928	{	1283	{
929	if (dx > 0)	1284	if (dx > 0)
930	map_blank (self, self->x, self->y, dx - 1, self->h);	1285	map_blank (self, self->x, self->y, dx, self->h);
931	else if (dx < 0)	1286	else if (dx < 0)
932	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);
933		1288
934	if (dy > 0)	1289	if (dy > 0)
935	map_blank (self, self->x, self->y, self->w, dy - 1);	1290	map_blank (self, self->x, self->y, self->w, dy);
936	else if (dy < 0)	1291	else if (dy < 0)
937	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);
938		1293
939	self->ox += dx; self->x += dx;	1294	self->ox += dx; self->x += dx;
940	self->oy += dy; self->y += dy;	1295	self->oy += dy; self->y += dy;
941		1296
942	while (self->y < 0)	1297	while (self->y < 0)
…		…
947	self->y += MAP_EXTEND_Y;	1302	self->y += MAP_EXTEND_Y;
948	}	1303	}
949	}	1304	}
950		1305
951	void	1306	void
952	map1a_update (CFClient::Map self, SV *data_)	1307	map1a_update (CFPlus::Map self, SV *data_, int extmap)
953	CODE:	1308	CODE:
954	{	1309	{
955	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1310	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
956	uint8_t data_end = (uint8_t )SvEND (data_);	1311	uint8_t data_end = (uint8_t )SvEND (data_);
957	mapcell *cell;	1312	mapcell *cell;
958	int x, y, flags;	1313	int x, y, flags;
959		1314
960	while (data < data_end)	1315	while (data < data_end - 1)
961	{	1316	{
962	flags = (data [0] << 8) + data [1]; data += 2;	1317	flags = (data [0] << 8) + data [1]; data += 2;
963		1318
964	x = ((flags >> 10) & 63) + self->x;	1319	x = self->x + ((flags >> 10) & 63);
965	y = ((flags >> 4) & 63) + self->y;	1320	y = self->y + ((flags >> 4) & 63);
966		1321
967	cell = map_get_cell (self, x, y);	1322	cell = map_get_cell (self, x, y);
968		1323
969	if (flags & 15)	1324	if (flags & 15)
970	{	1325	{
971	if (cell->darkness < 0)	1326	if (!cell->darkness)
972	{	1327	{
		1328	memset (cell, 0, sizeof (*cell));
973	cell->darkness = 0;	1329	cell->darkness = 256;
974	cell->face [0] = 0;
975	cell->face [1] = 0;
976	cell->face [2] = 0;
977	}	1330	}
978		1331
979	cell->darkness = flags & 8 ? *data++ : 255;
980
981	//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	}
982		1373
983	if (flags & 4)	1374	if (flags & 4)
984	{	1375	{
985	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;
986	}	1377	}
…		…
994	{	1385	{
995	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;
996	}	1387	}
997	}	1388	}
998	else	1389	else
999	cell->darkness = -1;	1390	cell->darkness = 0;
1000	}	1391	}
1001	}	1392	}
1002		1393
1003	SV *	1394	SV *
1004	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1395	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1005	CODE:	1396	CODE:
1006	{	1397	{
1007	int x1, x;	1398	int x1, x;
1008	int y1, y;	1399	int y1, y;
1009	int z;	1400	int z;
…		…
1059	}	1450	}
1060	OUTPUT:	1451	OUTPUT:
1061	RETVAL	1452	RETVAL
1062		1453
1063	void	1454	void
1064	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)
1065	PPCODE:	1456	CODE:
1066	{	1457	{
1067	int vx, vy;	1458	int vx, vy;
1068	int x, y, z;	1459	int x, y, z;
1069	int last_name;	1460	int last_name;
1070	mapface face;	1461	mapface face;
1071	int sw4 = (sw + 3) & ~3;
1072	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1073	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1074		1462
1075	memset (darkness, 255, sw4 * sh);
1076	SvPOK_only (darkness_sv);
1077	SvCUR_set (darkness_sv, sw4 * sh);
1078
1079	vx = self->x + (self->w - sw) / 2 - shift_x;	1463	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1080	vy = self->y + (self->h - sh) / 2 - shift_y;	1464	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1081		1465
1082	/*	1466	/*
1083	int vx = self->vx = self->w >= sw	1467	int vx = self->vx = self->w >= sw
1084	? self->x + (self->w - sw) / 2	1468	? self->x + (self->w - sw) / 2
1085	: 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));
…		…
1089	: 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));
1090	*/	1474	*/
1091		1475
1092	glColor4ub (255, 255, 255, 255);	1476	glColor4ub (255, 255, 255, 255);
1093		1477
		1478	glEnable (GL_BLEND);
1094	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1479	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1095	glEnable (GL_BLEND);
1096	glEnable (GL_TEXTURE_2D);	1480	glEnable (GL_TEXTURE_2D);
1097	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1481	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1098		1482
1099	glBegin (GL_QUADS);	1483	glBegin (GL_QUADS);
1100		1484
…		…
1109	for (x = 0; x < sw; x++)	1493	for (x = 0; x < sw; x++)
1110	if (row->c0 <= x + vx && x + vx < row->c1)	1494	if (row->c0 <= x + vx && x + vx < row->c1)
1111	{	1495	{
1112	mapcell *cell = row->col + (x + vx - row->c0);	1496	mapcell *cell = row->col + (x + vx - row->c0);
1113		1497
1114	darkness[y * sw4 + x] = cell->darkness < 0
1115	? 255 - FOW_DARKNESS
1116	: 255 - cell->darkness;
1117
1118	face = cell->face [z];	1498	face = cell->face [z];
1119		1499
1120	if (face)	1500	if (face && face < self->texs)
1121	{	1501	{
1122	maptex tex = self->tex [face];	1502	maptex tex = self->tex [face];
1123
1124	int px = (x + 1) * 32 - tex.w;	1503	int px = (x + 1) * 32 - tex.w;
1125	int py = (y + 1) * 32 - tex.h;	1504	int py = (y + 1) * 32 - tex.h;
1126		1505
1127	if (last_name != tex.name)	1506	if (last_name != tex.name)
1128	{	1507	{
1129	glEnd ();	1508	glEnd ();
1130	last_name = tex.name;
1131	glBindTexture (GL_TEXTURE_2D, last_name);	1509	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1132	glBegin (GL_QUADS);	1510	glBegin (GL_QUADS);
1133	}	1511	}
1134		1512
1135	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1513	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1136	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1514	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1137	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);
1138	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1516	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1139	}	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	}
1140	}	1537	}
1141	}	1538	}
1142		1539
1143	glEnd ();	1540	glEnd ();
1144		1541
1145	glDisable (GL_TEXTURE_2D);	1542	glDisable (GL_TEXTURE_2D);
1146	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	}
1147		1669
1148	EXTEND (SP, 3);	1670	EXTEND (SP, 3);
1149	PUSHs (sv_2mortal (newSViv (sw4)));	1671	PUSHs (sv_2mortal (newSViv (sw4)));
1150	PUSHs (sv_2mortal (newSViv (sh)));	1672	PUSHs (sv_2mortal (newSViv (sh)));
1151	PUSHs (darkness_sv);	1673	PUSHs (darkness_sv);
1152	}	1674	}
1153		1675
1154	SV *	1676	SV *
1155	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)
1156	CODE:	1678	CODE:
1157	{	1679	{
1158	int x, y, x1, y1;	1680	int x, y, x1, y1;
1159	SV data_sv = newSV (w h * 7 + 5);	1681	SV data_sv = newSV (w h * 7 + 5);
1160	uint8_t data = (uint8_t )SvPVX (data_sv);	1682	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1222	}	1744	}
1223	OUTPUT:	1745	OUTPUT:
1224	RETVAL	1746	RETVAL
1225		1747
1226	void	1748	void
1227	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)
1228	PPCODE:	1750	PPCODE:
1229	{	1751	{
1230	int x, y, z;	1752	int x, y, z;
1231	int w, h;	1753	int w, h;
1232	int x1, y1;	1754	int x1, y1;
…		…
1264		1786
1265	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1787	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1266	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1788	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1267	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1789	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1268		1790
1269	if (cell->darkness <= 0)	1791	if (cell->darkness == 0)
1270	{	1792	{
1271	cell->darkness = -1;	1793	cell->darkness = 0;
1272		1794
1273	for (z = 0; z <= 2; z++)	1795	for (z = 0; z <= 2; z++)
1274	{	1796	{
1275	cell->face[z] = face[z];	1797	cell->face[z] = face[z];
1276		1798
…		…
1281	}	1803	}
1282	}	1804	}
1283	}	1805	}
1284	}	1806	}
1285		1807
1286	MODULE = CFClient PACKAGE = CFClient::MixChunk	1808	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1287		1809
1288	CFClient::MixChunk	1810	CFPlus::MixChunk
1289	new_from_file (SV class, char path)	1811	new_from_file (SV class, char path)
1290	CODE:	1812	CODE:
1291	RETVAL = Mix_LoadWAV (path);	1813	RETVAL = Mix_LoadWAV (path);
1292	OUTPUT:	1814	OUTPUT:
1293	RETVAL	1815	RETVAL
1294		1816
1295	void	1817	void
1296	DESTROY (CFClient::MixChunk self)	1818	DESTROY (CFPlus::MixChunk self)
1297	CODE:	1819	CODE:
1298	Mix_FreeChunk (self);	1820	Mix_FreeChunk (self);
1299		1821
1300	int	1822	int
1301	volume (CFClient::MixChunk self, int volume = -1)	1823	volume (CFPlus::MixChunk self, int volume = -1)
1302	CODE:	1824	CODE:
1303	RETVAL = Mix_VolumeChunk (self, volume);	1825	RETVAL = Mix_VolumeChunk (self, volume);
1304	OUTPUT:	1826	OUTPUT:
1305	RETVAL	1827	RETVAL
1306		1828
1307	int	1829	int
1308	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)
1309	CODE:	1831	CODE:
1310	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1832	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1311	OUTPUT:	1833	OUTPUT:
1312	RETVAL	1834	RETVAL
1313		1835
1314	MODULE = CFClient PACKAGE = CFClient::MixMusic	1836	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1315		1837
1316	int	1838	int
1317	volume (int volume = -1)	1839	volume (int volume = -1)
1318	CODE:	1840	CODE:
1319	RETVAL = Mix_VolumeMusic (volume);	1841	RETVAL = Mix_VolumeMusic (volume);
1320	OUTPUT:	1842	OUTPUT:
1321	RETVAL	1843	RETVAL
1322		1844
1323	CFClient::MixMusic	1845	CFPlus::MixMusic
1324	new_from_file (SV class, char path)	1846	new_from_file (SV class, char path)
1325	CODE:	1847	CODE:
1326	RETVAL = Mix_LoadMUS (path);	1848	RETVAL = Mix_LoadMUS (path);
1327	OUTPUT:	1849	OUTPUT:
1328	RETVAL	1850	RETVAL
1329		1851
1330	void	1852	void
1331	DESTROY (CFClient::MixMusic self)	1853	DESTROY (CFPlus::MixMusic self)
1332	CODE:	1854	CODE:
1333	Mix_FreeMusic (self);	1855	Mix_FreeMusic (self);
1334		1856
1335	int	1857	int
1336	play (CFClient::MixMusic self, int loops = -1)	1858	play (CFPlus::MixMusic self, int loops = -1)
1337	CODE:	1859	CODE:
1338	RETVAL = Mix_PlayMusic (self, loops);	1860	RETVAL = Mix_PlayMusic (self, loops);
1339	OUTPUT:	1861	OUTPUT:
1340	RETVAL	1862	RETVAL
1341		1863
1342	MODULE = CFClient PACKAGE = CFClient::OpenGL	1864	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1343		1865
1344	BOOT:	1866	BOOT:
1345	{	1867	{
1346	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1868	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1347	static const struct {	1869	static const struct {
1348	const char *name;	1870	const char *name;
1349	IV iv;	1871	IV iv;
1350	} *civ, const_iv[] = {	1872	} *civ, const_iv[] = {
1351	# define const_iv(name) { # name, (IV)name }	1873	# define const_iv(name) { # name, (IV)name }
1352	const_iv (GL_COLOR_MATERIAL),	1874	const_iv (GL_COLOR_MATERIAL),
1353	const_iv (GL_SMOOTH),	1875	const_iv (GL_SMOOTH),
1354	const_iv (GL_FLAT),	1876	const_iv (GL_FLAT),
1355	const_iv (GL_DITHER),	1877	const_iv (GL_DITHER),
1356	const_iv (GL_BLEND),	1878	const_iv (GL_BLEND),
		1879	const_iv (GL_CULL_FACE),
1357	const_iv (GL_SCISSOR_TEST),	1880	const_iv (GL_SCISSOR_TEST),
		1881	const_iv (GL_DEPTH_TEST),
		1882	const_iv (GL_ALPHA_TEST),
		1883	const_iv (GL_NORMALIZE),
		1884	const_iv (GL_RESCALE_NORMAL),
		1885	const_iv (GL_FRONT),
		1886	const_iv (GL_BACK),
1358	const_iv (GL_AND),	1887	const_iv (GL_AND),
1359	const_iv (GL_ONE),	1888	const_iv (GL_ONE),
1360	const_iv (GL_ZERO),	1889	const_iv (GL_ZERO),
1361	const_iv (GL_SRC_ALPHA),	1890	const_iv (GL_SRC_ALPHA),
1362	const_iv (GL_SRC_ALPHA_SATURATE),	1891	const_iv (GL_DST_ALPHA),
1363	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1892	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1364	const_iv (GL_ONE_MINUS_DST_ALPHA),	1893	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1894	const_iv (GL_SRC_ALPHA_SATURATE),
1365	const_iv (GL_RGB),	1895	const_iv (GL_RGB),
1366	const_iv (GL_RGBA),	1896	const_iv (GL_RGBA),
		1897	const_iv (GL_RGBA4),
		1898	const_iv (GL_RGBA8),
		1899	const_iv (GL_RGB5_A1),
1367	const_iv (GL_UNSIGNED_BYTE),	1900	const_iv (GL_UNSIGNED_BYTE),
		1901	const_iv (GL_UNSIGNED_SHORT),
		1902	const_iv (GL_UNSIGNED_INT),
1368	const_iv (GL_ALPHA),	1903	const_iv (GL_ALPHA),
		1904	const_iv (GL_INTENSITY),
		1905	const_iv (GL_LUMINANCE),
		1906	const_iv (GL_LUMINANCE_ALPHA),
1369	const_iv (GL_FLOAT),	1907	const_iv (GL_FLOAT),
1370	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1908	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1371	const_iv (GL_COMPILE),	1909	const_iv (GL_COMPILE),
1372	const_iv (GL_TEXTURE_1D),	1910	const_iv (GL_TEXTURE_1D),
1373	const_iv (GL_TEXTURE_2D),	1911	const_iv (GL_TEXTURE_2D),
…		…
1375	const_iv (GL_TEXTURE_MAG_FILTER),	1913	const_iv (GL_TEXTURE_MAG_FILTER),
1376	const_iv (GL_TEXTURE_MIN_FILTER),	1914	const_iv (GL_TEXTURE_MIN_FILTER),
1377	const_iv (GL_TEXTURE_ENV_MODE),	1915	const_iv (GL_TEXTURE_ENV_MODE),
1378	const_iv (GL_TEXTURE_WRAP_S),	1916	const_iv (GL_TEXTURE_WRAP_S),
1379	const_iv (GL_TEXTURE_WRAP_T),	1917	const_iv (GL_TEXTURE_WRAP_T),
		1918	const_iv (GL_REPEAT),
1380	const_iv (GL_CLAMP),	1919	const_iv (GL_CLAMP),
1381	const_iv (GL_REPEAT),	1920	const_iv (GL_CLAMP_TO_EDGE),
1382	const_iv (GL_NEAREST),	1921	const_iv (GL_NEAREST),
1383	const_iv (GL_LINEAR),	1922	const_iv (GL_LINEAR),
1384	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1923	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1385	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1924	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1386	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1925	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1387	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1926	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1388	const_iv (GL_GENERATE_MIPMAP),	1927	const_iv (GL_GENERATE_MIPMAP),
1389	const_iv (GL_MODULATE),	1928	const_iv (GL_MODULATE),
1390	const_iv (GL_DECAL),	1929	const_iv (GL_DECAL),
1391	const_iv (GL_REPLACE),	1930	const_iv (GL_REPLACE),
		1931	const_iv (GL_DEPTH_BUFFER_BIT),
1392	const_iv (GL_COLOR_BUFFER_BIT),	1932	const_iv (GL_COLOR_BUFFER_BIT),
1393	const_iv (GL_PROJECTION),	1933	const_iv (GL_PROJECTION),
1394	const_iv (GL_MODELVIEW),	1934	const_iv (GL_MODELVIEW),
1395	const_iv (GL_COLOR_LOGIC_OP),	1935	const_iv (GL_COLOR_LOGIC_OP),
1396	const_iv (GL_SEPARABLE_2D),	1936	const_iv (GL_SEPARABLE_2D),
1397	const_iv (GL_CONVOLUTION_2D),	1937	const_iv (GL_CONVOLUTION_2D),
1398	const_iv (GL_CONVOLUTION_BORDER_MODE),	1938	const_iv (GL_CONVOLUTION_BORDER_MODE),
1399	const_iv (GL_CONSTANT_BORDER),	1939	const_iv (GL_CONSTANT_BORDER),
1400	const_iv (GL_LINES),	1940	const_iv (GL_LINES),
		1941	const_iv (GL_LINE_STRIP),
		1942	const_iv (GL_LINE_LOOP),
1401	const_iv (GL_QUADS),	1943	const_iv (GL_QUADS),
1402	const_iv (GL_LINE_LOOP),	1944	const_iv (GL_QUAD_STRIP),
		1945	const_iv (GL_TRIANGLES),
		1946	const_iv (GL_TRIANGLE_STRIP),
		1947	const_iv (GL_TRIANGLE_FAN),
1403	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1948	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1404	const_iv (GL_FASTEST),	1949	const_iv (GL_FASTEST),
		1950	const_iv (GL_V2F),
		1951	const_iv (GL_V3F),
		1952	const_iv (GL_T2F_V3F),
		1953	const_iv (GL_T2F_N3F_V3F),
1405	# undef const_iv	1954	# undef const_iv
1406	};	1955	};
1407		1956
1408	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1957	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1409	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1958	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1410	}	1959	}
1411		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
1412	int glGetError ()	1982	int glGetError ()
		1983
		1984	void glFinish ()
1413		1985
1414	void glClear (int mask)	1986	void glClear (int mask)
1415		1987
1416	void glClearColor (float r, float g, float b, float a = 1.0)	1988	void glClearColor (float r, float g, float b, float a = 1.0)
1417	PROTOTYPE: @	1989	PROTOTYPE: @
…		…
1424		1996
1425	void glHint (int target, int mode)	1997	void glHint (int target, int mode)
1426		1998
1427	void glBlendFunc (int sfactor, int dfactor)	1999	void glBlendFunc (int sfactor, int dfactor)
1428		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
1429	void glLogicOp (int opcode)	2007	void glLogicOp (int opcode)
1430		2008
1431	void glColorMask (int red, int green, int blue, int alpha)	2009	void glColorMask (int red, int green, int blue, int alpha)
1432		2010
1433	void glMatrixMode (int mode)	2011	void glMatrixMode (int mode)
…		…
1436		2014
1437	void glPopMatrix ()	2015	void glPopMatrix ()
1438		2016
1439	void glLoadIdentity ()	2017	void glLoadIdentity ()
1440		2018
		2019	void glDrawBuffer (int buffer)
		2020
		2021	void glReadBuffer (int buffer)
		2022
1441	# near and far are due to microsofts buggy c compiler	2023	# near_ and far_ are due to microsofts buggy "c" compiler
		2024	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2025
		2026	# near_ and far_ are due to microsofts buggy "c" compiler
1442	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2027	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1443		2028
1444	void glViewport (int x, int y, int width, int height)	2029	void glViewport (int x, int y, int width, int height)
1445		2030
1446	void glScissor (int x, int y, int width, int height)	2031	void glScissor (int x, int y, int width, int height)
…		…
1461		2046
1462	void glEnd ()	2047	void glEnd ()
1463		2048
1464	void glColor (float r, float g, float b, float a = 1.0)	2049	void glColor (float r, float g, float b, float a = 1.0)
1465	PROTOTYPE: @	2050	PROTOTYPE: @
		2051	ALIAS:
		2052	glColor_premultiply = 1
1466	CODE:	2053	CODE:
1467	glColor4ub (r * 255., g * 255., b * 255., a * 255.);	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);
1468		2073
1469	void glVertex (float x, float y, float z = 0.)	2074	void glVertex (float x, float y, float z = 0.)
1470	CODE:	2075	CODE:
1471	glVertex3f (x, y, z);	2076	glVertex3f (x, y, z);
1472		2077
…		…
1484		2089
1485	void glBindTexture (int target, int name)	2090	void glBindTexture (int target, int name)
1486		2091
1487	void glConvolutionParameter (int target, int pname, float params)	2092	void glConvolutionParameter (int target, int pname, float params)
1488	CODE:	2093	CODE:
1489	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2094	if (gl.ConvolutionParameterf)
		2095	gl.ConvolutionParameterf (target, pname, params);
1490		2096
1491	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2097	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1492	CODE:	2098	CODE:
1493	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2099	if (gl.ConvolutionFilter2D)
1494	(target, internalformat, width, height, format, type, data));	2100	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1495		2101
1496	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2102	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1497	CODE:	2103	CODE:
1498	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2104	if (gl.SeparableFilter2D)
1499	(target, internalformat, width, height, format, type, row, column));	2105	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1500		2106
1501	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2107	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1502		2108
1503	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2109	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1504		2110
1505	void glRasterPos (int x, int y)	2111	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1506	CODE:
1507	glRasterPos2i (x, y);
1508		2112
1509	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2113	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1510		2114
1511	int glGenTexture ()	2115	int glGenTexture ()
1512	CODE:	2116	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.70 by root, Sun Apr 30 09:21:47 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC