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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.56 by root, Thu Apr 20 09:13:31 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.56 by root, Thu Apr 20 09:13:31 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC