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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs. Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC