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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 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	# pragma warning(disable:4244)
3	#endif	7	#endif
4		8
5	#include "EXTERN.h"	9	#include "EXTERN.h"
6	#include "perl.h"	10	#include "perl.h"
7	#include "XSUB.h"	11	#include "XSUB.h"
8		12
		13	#ifdef _WIN32
		14	# undef pipe
		15	#endif
		16
		17	#include <math.h>
9	#include <string.h>	18	#include <string.h>
10	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
11		21
12	#include <SDL.h>	22	#include <SDL.h>
		23	#include <SDL_endian.h>
13	#include <SDL_image.h>	24	#include <SDL_image.h>
14	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
15	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
16		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
17	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
18		32
19	#include <pango/pango.h>	33	#include <pango/pango.h>
20	#include <pango/pangofc-fontmap.h>
21	#include <pango/pangoft2.h>
22		34
23	#ifndef _WIN32	35	#ifndef _WIN32
24	# include <sys/types.h>	36	# include <sys/types.h>
25	# include <sys/socket.h>	37	# include <sys/socket.h>
26	# include <netinet/in.h>	38	# include <netinet/in.h>
33	typedef signed char int8_t;	45	typedef signed char int8_t;
34	typedef signed short int16_t;	46	typedef signed short int16_t;
35	typedef signed int int32_t;	47	typedef signed int int32_t;
36	#endif	48	#endif
37		49
38	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
39		51
40	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
41		53
42	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
43	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
44		56
45	#define MIN_FONT_HEIGHT 8 * PANGO_SCALE	57	#define MIN_FONT_HEIGHT 10
46		58
		59	#if 0
		60	# define PARACHUTE SDL_INIT_NOPARACHUTE
		61	#else
		62	# define PARACHUTE 0
		63	#endif
		64
		65	static struct
		66	{
		67	#define GL_FUNC(ptr,name) ptr name;
		68	#include "glfunc.h"
		69	#undef GL_FUNC
		70	} gl;
		71
		72	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		73	{
		74	if (gl.BlendFuncSeparate)
		75	gl.BlendFuncSeparate (sa, da, saa, daa);
		76	else if (gl.BlendFuncSeparateEXT)
		77	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		78	else
		79	glBlendFunc (sa, da);
		80	}
		81
		82	#include "texcache.c"
		83
		84	#include "pango-font.c"
		85	#include "pango-fontmap.c"
		86	#include "pango-render.c"
		87
47	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
48	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
49		90
50	static PangoContext *context;	91	typedef PangoFontDescription *CFPlus__Font;
51	static PangoFontMap *fontmap;	92
		93	static int
		94	shape_attr_p (PangoLayoutRun *run)
		95	{
		96	GSList *attrs = run->item->analysis.extra_attrs;
		97
		98	while (attrs)
		99	{
		100	PangoAttribute *attr = attrs->data;
		101
		102	if (attr->klass->type == PANGO_ATTR_SHAPE)
		103	return 1;
		104
		105	attrs = attrs->next;
		106	}
		107
		108	return 0;
		109	}
52		110
53	typedef struct cf_layout {	111	typedef struct cf_layout {
54	PangoLayout *pl;	112	PangoLayout *pl;
		113	float r, g, b, a; // default color for rgba mode
55	int base_height;	114	int base_height;
		115	CFPlus__Font font;
56	} *CFClient__Layout;	116	} *CFPlus__Layout;
		117
		118	static CFPlus__Font default_font;
		119	static PangoContext *opengl_context;
		120	static PangoFontMap *opengl_fontmap;
57		121
58	static void	122	static void
59	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
60	{	124	{
61	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
62	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
63	}	130	}
64		131
65	static void	132	static void
66	layout_update (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
67	{	134	{
68	/* use a random scale factor to account for unknown descenders, 0.8 works	135	/* use a random scale factor to account for unknown descenders, 0.8 works
69	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
70	*/	137	*/
71	PangoFontDescription font = (PangoFontDescription )	138	PangoFontDescription *font = self->font ? self->font : default_font;
72	pango_layout_get_font_description (self->pl);
73		139
74	int height = self->base_height * (PANGO_SCALE * 8 / 10);
75
76	if (height < MIN_FONT_HEIGHT)
77	height = MIN_FONT_HEIGHT;
78
79	if (pango_font_description_get_size (font) != height)
80	{
81	font = pango_font_description_copy (font);
82	pango_font_description_set_absolute_size (font, height);	140	pango_font_description_set_absolute_size (font,
		141	MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
		142
83	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
84	}
85	}	144	}
86		145
87	static void	146	static void
88	layout_get_pixel_size (CFClient__Layout self, int w, int h)	147	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
89	{	148	{
90	layout_update (self);	149	PangoRectangle rect;
91		150
		151	// get_pixel_* wrongly rounds down
92	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
93		153
94	w = (w + 3) & ~3;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
95	if (!w) w = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
96	if (!h) h = 1;	156
		157	if (!rect.width) rect.width = 1;
		158	if (!rect.height) rect.height = 1;
		159
		160	*w = rect.width;
		161	*h = rect.height;
97	}	162	}
98		163
99	typedef uint16_t mapface;	164	typedef uint16_t mapface;
100		165
101	typedef struct {	166	typedef struct {
…		…
104	float s, t;	169	float s, t;
105	uint8_t r, g, b, a;	170	uint8_t r, g, b, a;
106	} maptex;	171	} maptex;
107		172
108	typedef struct {	173	typedef struct {
109	int16_t darkness;	174	uint32_t player;
110	mapface face[3];	175	mapface face[3];
		176	uint16_t darkness;
		177	uint8_t stat_width, stat_hp, flags;
111	} mapcell;	178	} mapcell;
112		179
113	typedef struct {	180	typedef struct {
114	int32_t c0, c1;	181	int32_t c0, c1;
115	mapcell *col;	182	mapcell *col;
…		…
124	int texs;	191	int texs;
125	maptex *tex;	192	maptex *tex;
126		193
127	int32_t rows;	194	int32_t rows;
128	maprow *row;	195	maprow *row;
129	} *CFClient__Map;	196	} *CFPlus__Map;
130		197
131	static char *	198	static char *
132	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
133	{	200	{
134	char *p;	201	char *p;
…		…
152		219
153	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	220	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
154	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	221	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
155		222
156	static maprow *	223	static maprow *
157	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
158	{	225	{
159	if (0 > y)	226	if (0 > y)
160	{	227	{
161	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
162	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
200		267
201	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
202	}	269	}
203		270
204	static mapcell *	271	static mapcell *
205	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
206	{	273	{
207	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
208	}	275	}
209		276
210	static void	277	static void
211	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
212	{	279	{
213	int r;	280	int r;
214		281
215	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
216	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
224	self->row = 0;	291	self->row = 0;
225	self->rows = 0;	292	self->rows = 0;
226	}	293	}
227		294
228	static void	295	static void
229	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	296	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
230	{	297	{
231	int x, y;	298	int x, y;
232	maprow *row;	299	maprow *row;
		300	mapcell *cell;
233		301
234	for (y = y0; y < y0 + h; y++)	302	for (y = y0; y < y0 + h; y++)
235	if (y >= 0)	303	if (y >= 0)
236	{	304	{
237	if (y >= self->rows)	305	if (y >= self->rows)
…		…
243	if (x >= row->c0)	311	if (x >= row->c0)
244	{	312	{
245	if (x >= row->c1)	313	if (x >= row->c1)
246	break;	314	break;
247		315
248	row->col[x - row->c0].darkness = -1;	316	cell = row->col + x - row->c0;
		317
		318	cell->darkness = 0;
		319	cell->stat_hp = 0;
		320	cell->flags = 0;
		321	cell->player = 0;
249	}	322	}
250	}	323	}
251	}	324	}
252		325
253	static void	326	static void
254	music_finished ()	327	music_finished (void)
255	{	328	{
256	SDL_UserEvent ev;	329	SDL_UserEvent ev;
257		330
258	ev.type = SDL_USEREVENT;	331	ev.type = SDL_USEREVENT;
259	ev.code = 0;	332	ev.code = 0;
…		…
261	ev.data2 = 0;	334	ev.data2 = 0;
262		335
263	SDL_PushEvent ((SDL_Event *)&ev);	336	SDL_PushEvent ((SDL_Event *)&ev);
264	}	337	}
265		338
		339	static void
		340	channel_finished (int channel)
		341	{
		342	SDL_UserEvent ev;
		343
		344	ev.type = SDL_USEREVENT;
		345	ev.code = 1;
		346	ev.data1 = (void *)(long)channel;
		347	ev.data2 = 0;
		348
		349	SDL_PushEvent ((SDL_Event *)&ev);
		350	}
		351
		352	static unsigned int
		353	minpot (unsigned int n)
		354	{
		355	if (!n)
		356	return 0;
		357
		358	--n;
		359
		360	n \|= n >> 1;
		361	n \|= n >> 2;
		362	n \|= n >> 4;
		363	n \|= n >> 8;
		364	n \|= n >> 16;
		365
		366	return n + 1;
		367	}
		368
266	MODULE = CFClient PACKAGE = CFClient	369	MODULE = CFPlus PACKAGE = CFPlus
267		370
268	PROTOTYPES: ENABLE	371	PROTOTYPES: ENABLE
269		372
270	BOOT:	373	BOOT:
271	{	374	{
272	HV *stash = gv_stashpv ("CFClient", 1);	375	HV *stash = gv_stashpv ("CFPlus", 1);
273	static const struct {	376	static const struct {
274	const char *name;	377	const char *name;
275	IV iv;	378	IV iv;
276	} *civ, const_iv[] = {	379	} *civ, const_iv[] = {
277	# define const_iv(name) { # name, (IV)name }	380	# define const_iv(name) { # name, (IV)name }
…		…
376	# undef const_iv	479	# undef const_iv
377	};	480	};
378		481
379	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	482	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
380	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	483	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
381
382	fontmap = pango_ft2_font_map_new ();
383	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)fontmap, substitute_func, 0, 0);
384	context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)fontmap);
385	}	484	}
386		485
387	int	486	int
		487	in_destruct ()
		488	CODE:
		489	RETVAL = PL_main_cv == Nullcv;
		490	OUTPUT:
		491	RETVAL
		492
		493	NV floor (NV x)
		494
		495	NV ceil (NV x)
		496
		497	void
		498	pango_init ()
		499	CODE:
		500	{
		501	opengl_fontmap = pango_opengl_font_map_new ();
		502	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
		503	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
		504	}
		505
		506	int
388	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	507	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
389		508
390	void	509	void
391	SDL_Quit ()	510	SDL_Quit ()
392		511
393	void	512	void
…		…
399	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	518	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
400	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	519	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
401	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	520	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
402	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	521	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
403		522
		523	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		524	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		525
404	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
405	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	527	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
406	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
407	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
408		530
409	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	531	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		532	#if SDL_VERSION_ATLEAST(1,2,10)
410	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	533	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
411	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	534	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		535	#endif
412		536
413	SDL_EnableUNICODE (1);	537	SDL_EnableUNICODE (1);
414	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	538	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
415		539
416	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	540	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
425		549
426	++m;	550	++m;
427	}	551	}
428	}	552	}
429		553
		554	char *
		555	SDL_GetError ()
		556
430	int	557	int
431	SDL_SetVideoMode (int w, int h, int fullscreen)	558	SDL_SetVideoMode (int w, int h, int fullscreen)
432	CODE:	559	CODE:
433	RETVAL = !!SDL_SetVideoMode (	560	RETVAL = !!SDL_SetVideoMode (
434	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	561	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
435	);	562	);
		563	if (RETVAL)
		564	{
436	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	565	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		566	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		567	# include "glfunc.h"
		568	# undef GL_FUNC
		569	}
437	OUTPUT:	570	OUTPUT:
438	RETVAL	571	RETVAL
439		572
440	void	573	void
441	SDL_GL_SwapBuffers ()	574	SDL_GL_SwapBuffers ()
		575
		576	char *
		577	SDL_GetKeyName (int sym)
442		578
443	void	579	void
444	SDL_PollEvent ()	580	SDL_PollEvent ()
445	PPCODE:	581	PPCODE:
446	{	582	{
…		…
448		584
449	while (SDL_PollEvent (&ev))	585	while (SDL_PollEvent (&ev))
450	{	586	{
451	HV *hv = newHV ();	587	HV *hv = newHV ();
452	hv_store (hv, "type", 4, newSViv (ev.type), 0);	588	hv_store (hv, "type", 4, newSViv (ev.type), 0);
		589
453	switch (ev.type)	590	switch (ev.type)
454	{	591	{
455	case SDL_KEYDOWN:	592	case SDL_KEYDOWN:
456	case SDL_KEYUP:	593	case SDL_KEYUP:
457	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	594	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
…		…
464	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	601	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
465	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
466	break;	603	break;
467		604
468	case SDL_MOUSEMOTION:	605	case SDL_MOUSEMOTION:
		606	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		607
469	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	608	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
470	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	609	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
471	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	610	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
472	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	611	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
473	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	612	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
474	break;	613	break;
475		614
476	case SDL_MOUSEBUTTONDOWN:	615	case SDL_MOUSEBUTTONDOWN:
477	case SDL_MOUSEBUTTONUP:	616	case SDL_MOUSEBUTTONUP:
		617	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		618
478	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	619	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
479	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	620	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
480	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	621	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
481	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	622	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
		623	break;
		624
		625	case SDL_USEREVENT:
		626	hv_store (hv, "code", 4, newSViv (ev.user.code), 0);
		627	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
		628	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
		629	break;
482	}	630	}
483		631
484	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	632	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
485	}	633	}
486	}	634	}
487		635
488	int	636	int
489	Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)	637	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
490	POSTCALL:	638	POSTCALL:
491	Mix_HookMusicFinished (music_finished);	639	Mix_HookMusicFinished (music_finished);
		640	Mix_ChannelFinished (channel_finished);
492		641
493	void	642	void
494	Mix_CloseAudio ()	643	Mix_CloseAudio ()
495		644
496	int	645	int
…		…
501	CODE:	650	CODE:
502	#ifndef _WIN32	651	#ifndef _WIN32
503	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	652	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
504	#endif	653	#endif
505		654
506	char *
507	gl_version ()
508	CODE:
509	RETVAL = (char *)glGetString (GL_VERSION);
510	OUTPUT:
511	RETVAL
512
513	char *
514	gl_extensions ()
515	CODE:
516	RETVAL = (char *)glGetString (GL_EXTENSIONS);
517	OUTPUT:
518	RETVAL
519
520	void	655	void
521	add_font (char *file)	656	add_font (char *file)
522	CODE:	657	CODE:
523	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	658	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
524
525	void
526	set_font (char *file)
527	CODE:
528	{
529	int count;
530	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )file, 0, 0, &count);
531	PangoFontDescription *font = pango_fc_font_description_from_pattern (pattern, 0);
532	FcPatternDestroy (pattern);
533	pango_font_description_set_absolute_size (font, MIN_FONT_HEIGHT);
534	pango_context_set_font_description (context, font);
535	}
536		659
537	void	660	void
538	load_image_inline (SV *image_)	661	load_image_inline (SV *image_)
539	ALIAS:	662	ALIAS:
540	load_image_file = 1	663	load_image_file = 1
…		…
582		705
583	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	706	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
584		707
585	assert (surface2->pitch == surface2->w * 4);	708	assert (surface2->pitch == surface2->w * 4);
586		709
		710	SDL_LockSurface (surface2);
587	EXTEND (SP, 5);	711	EXTEND (SP, 6);
588	PUSHs (sv_2mortal (newSViv (surface2->w)));	712	PUSHs (sv_2mortal (newSViv (surface2->w)));
589	PUSHs (sv_2mortal (newSViv (surface2->h)));	713	PUSHs (sv_2mortal (newSViv (surface2->h)));
590	SDL_LockSurface (surface2);
591	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	714	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
592	SDL_UnlockSurface (surface2);
593	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	715	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
594	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	716	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
595	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	717	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		718	SDL_UnlockSurface (surface2);
596		719
597	SDL_FreeSurface (surface);	720	SDL_FreeSurface (surface);
598	SDL_FreeSurface (surface2);	721	SDL_FreeSurface (surface2);
599	}	722	}
600		723
…		…
622	PUSHs (sv_2mortal (newSViv (b / y)));	745	PUSHs (sv_2mortal (newSViv (b / y)));
623	PUSHs (sv_2mortal (newSViv (a / y)));	746	PUSHs (sv_2mortal (newSViv (a / y)));
624	}	747	}
625		748
626	void	749	void
		750	error (char *message)
		751	CODE:
		752	fprintf (stderr, "ERROR: %s\n", message);
		753	#ifdef _WIN32
		754	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
		755	#endif
		756
		757	void
627	fatal (char *message)	758	fatal (char *message)
628	CODE:	759	CODE:
		760	fprintf (stderr, "FATAL: %s\n", message);
629	#ifdef _WIN32	761	#ifdef _WIN32
630	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	762	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
631	#else
632	fprintf (stderr, "FATAL: %s\n", message);
633	#endif	763	#endif
634	exit (1);	764	_exit (1);
635		765
		766	void
		767	_exit (int retval)
		768	CODE:
		769	_exit (retval);
		770
		771	MODULE = CFPlus PACKAGE = CFPlus::Font
		772
		773	CFPlus::Font
		774	new_from_file (SV class, char path, int id = 0)
		775	CODE:
		776	{
		777	int count;
		778	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
		779	RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
		780	FcPatternDestroy (pattern);
		781	}
		782	OUTPUT:
		783	RETVAL
		784
		785	void
		786	DESTROY (CFPlus::Font self)
		787	CODE:
		788	pango_font_description_free (self);
		789
		790	void
		791	make_default (CFPlus::Font self)
		792	CODE:
		793	default_font = self;
		794
636	MODULE = CFClient PACKAGE = CFClient::Layout	795	MODULE = CFPlus PACKAGE = CFPlus::Layout
637		796
638	CFClient::Layout	797	void
639	new (SV *class, int base_height = 10)	798	reset_glyph_cache ()
		799	CODE:
		800	tc_clear ();
		801
		802	CFPlus::Layout
		803	new (SV *class)
640	CODE:	804	CODE:
641	New (0, RETVAL, 1, struct cf_layout);	805	New (0, RETVAL, 1, struct cf_layout);
642	RETVAL->base_height = base_height;	806
643	RETVAL->pl = pango_layout_new (context);	807	RETVAL->pl = pango_layout_new (opengl_context);
		808	RETVAL->r = 1.;
		809	RETVAL->g = 1.;
		810	RETVAL->b = 1.;
		811	RETVAL->a = 1.;
		812	RETVAL->base_height = MIN_FONT_HEIGHT;
		813	RETVAL->font = 0;
		814
644	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);	815	pango_layout_set_wrap (RETVAL->pl, PANGO_WRAP_WORD_CHAR);
645	pango_layout_set_font_description (RETVAL->pl,	816	layout_update_font (RETVAL);
646	pango_font_description_copy (
647	pango_context_get_font_description (context)));
648	OUTPUT:	817	OUTPUT:
649	RETVAL	818	RETVAL
650		819
651	void	820	void
652	DESTROY (CFClient::Layout self)	821	DESTROY (CFPlus::Layout self)
653	CODE:	822	CODE:
654	g_object_unref (self->pl);	823	g_object_unref (self->pl);
655	Safefree (self);	824	Safefree (self);
656		825
657	void	826	void
658	set_text (CFClient::Layout self, SV *text_)	827	set_text (CFPlus::Layout self, SV *text_)
659	CODE:	828	CODE:
660	{	829	{
661	STRLEN textlen;	830	STRLEN textlen;
662	char *text = SvPVutf8 (text_, textlen);	831	char *text = SvPVutf8 (text_, textlen);
663		832
664	pango_layout_set_text (self->pl, text, textlen);	833	pango_layout_set_text (self->pl, text, textlen);
665	}	834	}
666		835
667	void	836	void
668	set_markup (CFClient::Layout self, SV *text_)	837	set_markup (CFPlus::Layout self, SV *text_)
669	CODE:	838	CODE:
670	{	839	{
671	STRLEN textlen;	840	STRLEN textlen;
672	char *text = SvPVutf8 (text_, textlen);	841	char *text = SvPVutf8 (text_, textlen);
673		842
674	pango_layout_set_markup (self->pl, text, textlen);	843	pango_layout_set_markup (self->pl, text, textlen);
675	}	844	}
676		845
		846	void
		847	set_shapes (CFPlus::Layout self, ...)
		848	CODE:
		849	{
		850	PangoAttrList *attrs = 0;
		851	const char *text = pango_layout_get_text (self->pl);
		852	const char *pos = text;
		853	int arg = 4;
		854
		855	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		856	{
		857	PangoRectangle inkrect, rect;
		858	PangoAttribute *attr;
		859
		860	int x = SvIV (ST (arg - 3));
		861	int y = SvIV (ST (arg - 2));
		862	int w = SvIV (ST (arg - 1));
		863	int h = SvIV (ST (arg ));
		864
		865	inkrect.x = 0;
		866	inkrect.y = 0;
		867	inkrect.width = 0;
		868	inkrect.height = 0;
		869
		870	rect.x = x * PANGO_SCALE;
		871	rect.y = y * PANGO_SCALE;
		872	rect.width = w * PANGO_SCALE;
		873	rect.height = h * PANGO_SCALE;
		874
		875	if (!attrs)
		876	attrs = pango_layout_get_attributes (self->pl);
		877
		878	attr = pango_attr_shape_new (&inkrect, &rect);
		879	attr->start_index = pos - text;
		880	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		881	pango_attr_list_insert (attrs, attr);
		882
		883	arg += 4;
		884	pos += sizeof (OBJ_STR) - 1;
		885	}
		886
		887	if (attrs)
		888	pango_layout_set_attributes (self->pl, attrs);
		889	}
		890
		891	void
		892	get_shapes (CFPlus::Layout self)
		893	PPCODE:
		894	{
		895	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		896
		897	do
		898	{
		899	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		900
		901	if (run && shape_attr_p (run))
		902	{
		903	PangoRectangle extents;
		904	pango_layout_iter_get_run_extents (iter, 0, &extents);
		905
		906	EXTEND (SP, 2);
		907	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		908	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		909	}
		910	}
		911	while (pango_layout_iter_next_run (iter));
		912
		913	pango_layout_iter_free (iter);
		914	}
		915
		916	int
		917	has_wrapped (CFPlus::Layout self)
		918	CODE:
		919	{
		920	int lines = 1;
		921	const char *text = pango_layout_get_text (self->pl);
		922
		923	while (*text)
		924	lines += *text++ == '\n';
		925
		926	RETVAL = lines < pango_layout_get_line_count (self->pl);
		927	}
		928	OUTPUT:
		929	RETVAL
		930
677	SV *	931	SV *
678	get_text (CFClient::Layout self)	932	get_text (CFPlus::Layout self)
679	CODE:	933	CODE:
680	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	934	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
681	SvUTF8_on (RETVAL);	935	sv_utf8_decode (RETVAL);
682	OUTPUT:	936	OUTPUT:
683	RETVAL	937	RETVAL
684		938
685	void	939	void
		940	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
		941	CODE:
		942	self->r = r;
		943	self->g = g;
		944	self->b = b;
		945	self->a = a;
		946
		947	void
		948	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
		949	CODE:
		950	if (self->font != font)
		951	{
		952	self->font = font;
		953	layout_update_font (self);
		954	}
		955
		956	void
686	set_height (CFClient::Layout self, int base_height)	957	set_height (CFPlus::Layout self, int base_height)
687	CODE:	958	CODE:
		959	if (self->base_height != base_height)
		960	{
688	self->base_height = base_height;	961	self->base_height = base_height;
		962	layout_update_font (self);
		963	}
689		964
690	void	965	void
691	set_width (CFClient::Layout self, int max_width = -1)	966	set_width (CFPlus::Layout self, int max_width = -1)
692	CODE:	967	CODE:
693	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	968	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
694		969
695	void	970	void
		971	set_indent (CFPlus::Layout self, int indent)
		972	CODE:
		973	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		974
		975	void
		976	set_spacing (CFPlus::Layout self, int spacing)
		977	CODE:
		978	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		979
		980	void
		981	set_ellipsise (CFPlus::Layout self, int ellipsise)
		982	CODE:
		983	pango_layout_set_ellipsize (self->pl,
		984	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		985	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		986	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		987	: PANGO_ELLIPSIZE_NONE
		988	);
		989
		990	void
		991	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		992	CODE:
		993	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		994
		995	void
696	size (CFClient::Layout self)	996	size (CFPlus::Layout self)
697	PPCODE:	997	PPCODE:
698	{	998	{
699	int w, h;	999	int w, h;
700		1000
701	layout_update (self);
702	layout_get_pixel_size (self, &w, &h);	1001	layout_get_pixel_size (self, &w, &h);
703		1002
704	EXTEND (SP, 2);	1003	EXTEND (SP, 2);
705	PUSHs (sv_2mortal (newSViv (w)));	1004	PUSHs (sv_2mortal (newSViv (w)));
706	PUSHs (sv_2mortal (newSViv (h)));	1005	PUSHs (sv_2mortal (newSViv (h)));
707	}	1006	}
708		1007
709	int	1008	int
		1009	descent (CFPlus::Layout self)
		1010	CODE:
		1011	{
		1012	PangoRectangle rect;
		1013	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1014	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1015	RETVAL = PANGO_DESCENT (rect);
		1016	}
		1017	OUTPUT:
		1018	RETVAL
		1019
		1020	int
710	xy_to_index (CFClient::Layout self, int x, int y)	1021	xy_to_index (CFPlus::Layout self, int x, int y)
711	CODE:	1022	CODE:
712	{	1023	{
713	int index, trailing;	1024	int index, trailing;
714
715	layout_update (self);
716	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1025	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
717
718	RETVAL = index;	1026	RETVAL = index;
719	}	1027	}
720	OUTPUT:	1028	OUTPUT:
721	RETVAL	1029	RETVAL
722		1030
723	void	1031	void
724	cursor_pos (CFClient::Layout self, int index)	1032	cursor_pos (CFPlus::Layout self, int index)
725	PPCODE:	1033	PPCODE:
726	{	1034	{
727	PangoRectangle strong_pos;	1035	PangoRectangle strong_pos;
728	layout_update (self);
729	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1036	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
730		1037
731	EXTEND (SP, 3);	1038	EXTEND (SP, 3);
732	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));	1039	PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
733	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1040	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
734	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1041	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
735	}	1042	}
736		1043
737	void	1044	void
738	render (CFClient::Layout self)	1045	render (CFPlus::Layout self, float x, float y, int flags = 0)
739	PPCODE:	1046	PPCODE:
740	{	1047	pango_opengl_render_layout_subpixel (
741	SV *retval;	1048	self->pl,
742	int w, h;	1049	x * PANGO_SCALE, y * PANGO_SCALE,
743	FT_Bitmap bitmap;	1050	self->r, self->g, self->b, self->a,
		1051	flags
		1052	);
744		1053
745	layout_update (self);	1054	MODULE = CFPlus PACKAGE = CFPlus::Texture
746	layout_get_pixel_size (self, &w, &h);
747		1055
748	retval = newSV (w * h);	1056	void
749	SvPOK_only (retval);	1057	pad2pot (SV data_, SV w_, SV *h_)
750	SvCUR_set (retval, w * h);	1058	CODE:
		1059	{
		1060	int ow = SvIV (w_);
		1061	int oh = SvIV (h_);
751		1062
752	bitmap.rows = h;	1063	if (ow && oh)
753	bitmap.width = w;	1064	{
754	bitmap.pitch = w;	1065	int nw = minpot (ow);
755	bitmap.buffer = (unsigned char*)SvPVX (retval);	1066	int nh = minpot (oh);
756	bitmap.num_grays = 256;
757	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
758		1067
759	memset (bitmap.buffer, 0, w * h);	1068	if (nw != ow \|\| nh != oh)
760		1069	{
761	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);	1070	if (SvOK (data_))
		1071	{
		1072	STRLEN datalen;
		1073	char *data = SvPVbyte (data_, datalen);
		1074	int bpp = datalen / (ow * oh);
		1075	SV result_ = sv_2mortal (newSV (nw nh * bpp));
762		1076
763	EXTEND (SP, 3);	1077	SvPOK_only (result_);
764	PUSHs (sv_2mortal (newSViv (w)));	1078	SvCUR_set (result_, nw * nh * bpp);
765	PUSHs (sv_2mortal (newSViv (h)));
766	PUSHs (sv_2mortal (retval));
767	}
768		1079
769	MODULE = CFClient PACKAGE = CFClient::Texture	1080	memset (SvPVX (result_), 0, nw * nh * bpp);
		1081	while (oh--)
		1082	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
770		1083
		1084	sv_setsv (data_, result_);
		1085	}
		1086
		1087	sv_setiv (w_, nw);
		1088	sv_setiv (h_, nh);
		1089	}
		1090	}
		1091	}
		1092
771	void	1093	void
772	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1094	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
773	PROTOTYPE: $$$;$$	1095	PROTOTYPE: $$$;$$
		1096	ALIAS:
		1097	draw_quad_alpha = 1
		1098	draw_quad_alpha_premultiplied = 2
774	CODE:	1099	CODE:
775	{	1100	{
776	HV hv = (HV )SvRV (self);	1101	HV hv = (HV )SvRV (self);
777	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1102	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
778	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1103	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
779	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1104	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
780	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
781		1105
782	if (items < 5)	1106	if (items < 5)
783	{	1107	{
784	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1108	w = SvNV (*hv_fetch (hv, "w", 1, 1));
785	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1109	h = SvNV (*hv_fetch (hv, "h", 1, 1));
786	}	1110	}
787		1111
		1112	if (ix)
		1113	{
		1114	glEnable (GL_BLEND);
		1115
		1116	if (ix == 2)
		1117	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1118	else
		1119	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1120	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1121
		1122	glEnable (GL_ALPHA_TEST);
		1123	glAlphaFunc (GL_GREATER, 0.01f);
		1124	}
		1125
788	glBindTexture (GL_TEXTURE_2D, name);	1126	glBindTexture (GL_TEXTURE_2D, name);
789	if (wrap_mode) {	1127
790	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
791	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
792	}
793	glBegin (GL_QUADS);	1128	glBegin (GL_QUADS);
794	glTexCoord2f (0, 0); glVertex2f (x , y );	1129	glTexCoord2f (0, 0); glVertex2f (x , y );
795	glTexCoord2f (0, t); glVertex2f (x , y + h);	1130	glTexCoord2f (0, t); glVertex2f (x , y + h);
796	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1131	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
797	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1132	glTexCoord2f (s, 0); glVertex2f (x + w, y );
798	glEnd ();	1133	glEnd ();
799	}
800		1134
		1135	if (ix)
		1136	{
		1137	glDisable (GL_ALPHA_TEST);
		1138	glDisable (GL_BLEND);
		1139	}
		1140	}
		1141
801	MODULE = CFClient PACKAGE = CFClient::Map	1142	MODULE = CFPlus PACKAGE = CFPlus::Map
802		1143
803	CFClient::Map	1144	CFPlus::Map
804	new (SV *class, int map_width, int map_height)	1145	new (SV *class, int map_width, int map_height)
805	CODE:	1146	CODE:
806	New (0, RETVAL, 1, struct map);	1147	New (0, RETVAL, 1, struct map);
807	RETVAL->x = 0;	1148	RETVAL->x = 0;
808	RETVAL->y = 0;	1149	RETVAL->y = 0;
…		…
818	RETVAL->row = 0;	1159	RETVAL->row = 0;
819	OUTPUT:	1160	OUTPUT:
820	RETVAL	1161	RETVAL
821		1162
822	void	1163	void
823	DESTROY (CFClient::Map self)	1164	DESTROY (CFPlus::Map self)
824	CODE:	1165	CODE:
825	{	1166	{
826	map_clear (self);	1167	map_clear (self);
827	Safefree (self->face);	1168	Safefree (self->face);
		1169	Safefree (self->tex);
828	Safefree (self);	1170	Safefree (self);
829	}	1171	}
830		1172
831	void	1173	void
832	clear (CFClient::Map self)	1174	clear (CFPlus::Map self)
833	CODE:	1175	CODE:
834	map_clear (self);	1176	map_clear (self);
835		1177
836	void	1178	void
837	set_face (CFClient::Map self, int face, int texid)	1179	set_face (CFPlus::Map self, int face, int texid)
838	CODE:	1180	CODE:
839	{	1181	{
840	while (self->faces <= face)	1182	while (self->faces <= face)
841	{	1183	{
842	Append (mapface, self->face, self->faces, self->faces);	1184	Append (mapface, self->face, self->faces, self->faces);
…		…
845		1187
846	self->face [face] = texid;	1188	self->face [face] = texid;
847	}	1189	}
848		1190
849	void	1191	void
850	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)	1192	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)
851	CODE:	1193	CODE:
852	{	1194	{
853	while (self->texs <= texid)	1195	while (self->texs <= texid)
854	{	1196	{
855	Append (maptex, self->tex, self->texs, self->texs);	1197	Append (maptex, self->tex, self->texs, self->texs);
…		…
867	tex->r = r;	1209	tex->r = r;
868	tex->g = g;	1210	tex->g = g;
869	tex->b = b;	1211	tex->b = b;
870	tex->a = a;	1212	tex->a = a;
871	}	1213	}
		1214
		1215	// somewhat hackish, but for textures that require it, it really
		1216	// improves the look, and most others don't suffer.
		1217	glBindTexture (GL_TEXTURE_2D, name);
		1218	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1219	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1220	// use uglier nearest interpolation because linear suffers
		1221	// from transparent color bleeding and ugly wrapping effects.
		1222	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
872	}	1223	}
873		1224
874	int	1225	int
875	ox (CFClient::Map self)	1226	ox (CFPlus::Map self)
876	ALIAS:	1227	ALIAS:
877	oy = 1	1228	oy = 1
		1229	x = 2
		1230	y = 3
		1231	w = 4
		1232	h = 5
878	CODE:	1233	CODE:
879	switch (ix)	1234	switch (ix)
880	{	1235	{
881	case 0: RETVAL = self->ox; break;	1236	case 0: RETVAL = self->ox; break;
882	case 1: RETVAL = self->oy; break;	1237	case 1: RETVAL = self->oy; break;
		1238	case 2: RETVAL = self->x; break;
		1239	case 3: RETVAL = self->y; break;
		1240	case 4: RETVAL = self->w; break;
		1241	case 5: RETVAL = self->h; break;
883	}	1242	}
884	OUTPUT:	1243	OUTPUT:
885	RETVAL	1244	RETVAL
886		1245
887	void	1246	void
888	scroll (CFClient::Map self, int dx, int dy)	1247	scroll (CFPlus::Map self, int dx, int dy)
889	CODE:	1248	CODE:
890	{	1249	{
891	if (dx > 0)	1250	if (dx > 0)
892	map_blank (self, self->x, self->y, dx - 1, self->h);	1251	map_blank (self, self->x, self->y, dx, self->h);
893	else if (dx < 0)	1252	else if (dx < 0)
894	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1253	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
895		1254
896	if (dy > 0)	1255	if (dy > 0)
897	map_blank (self, self->x, self->y, self->w, dy - 1);	1256	map_blank (self, self->x, self->y, self->w, dy);
898	else if (dy < 0)	1257	else if (dy < 0)
899	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1258	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
900		1259
901	self->ox += dx; self->x += dx;	1260	self->ox += dx; self->x += dx;
902	self->oy += dy; self->y += dy;	1261	self->oy += dy; self->y += dy;
903		1262
904	while (self->y < 0)	1263	while (self->y < 0)
…		…
909	self->y += MAP_EXTEND_Y;	1268	self->y += MAP_EXTEND_Y;
910	}	1269	}
911	}	1270	}
912		1271
913	void	1272	void
914	map1a_update (CFClient::Map self, SV *data_)	1273	map1a_update (CFPlus::Map self, SV *data_, int extmap)
915	CODE:	1274	CODE:
916	{	1275	{
917	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1276	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
918	uint8_t data_end = (uint8_t )SvEND (data_);	1277	uint8_t data_end = (uint8_t )SvEND (data_);
919	mapcell *cell;	1278	mapcell *cell;
920	int x, y, flags;	1279	int x, y, flags;
921		1280
922	while (data < data_end)	1281	while (data < data_end - 1)
923	{	1282	{
924	flags = (data [0] << 8) + data [1]; data += 2;	1283	flags = (data [0] << 8) + data [1]; data += 2;
925		1284
926	x = ((flags >> 10) & 63) + self->x;	1285	x = self->x + ((flags >> 10) & 63);
927	y = ((flags >> 4) & 63) + self->y;	1286	y = self->y + ((flags >> 4) & 63);
928		1287
929	cell = map_get_cell (self, x, y);	1288	cell = map_get_cell (self, x, y);
930		1289
931	if (flags & 15)	1290	if (flags & 15)
932	{	1291	{
933	if (cell->darkness < 0)	1292	if (!cell->darkness)
934	{	1293	{
		1294	memset (cell, 0, sizeof (*cell));
935	cell->darkness = 0;	1295	cell->darkness = 256;
936	cell->face [0] = 0;
937	cell->face [1] = 0;
938	cell->face [2] = 0;
939	}	1296	}
940		1297
941	cell->darkness = flags & 8 ? *data++ : 255;
942
943	//TODO: don't trust server data to be in-range(!)	1298	//TODO: don't trust server data to be in-range(!)
		1299
		1300	if (flags & 8)
		1301	{
		1302	if (extmap)
		1303	{
		1304	uint8_t ext, cmd;
		1305
		1306	do
		1307	{
		1308	ext = *data++;
		1309	cmd = ext & 0x3f;
		1310
		1311	if (cmd < 4)
		1312	cell->darkness = 255 - ext * 64 + 1;
		1313	else if (cmd == 5) // health
		1314	{
		1315	cell->stat_width = 1;
		1316	cell->stat_hp = *data++;
		1317	}
		1318	else if (cmd == 6) // monster width
		1319	cell->stat_width = *data++ + 1;
		1320	else if (cmd == 0x47) // monster width
		1321	{
		1322	if (*data == 4)
		1323	; // decode player tag
		1324
		1325	data += *data + 1;
		1326	}
		1327	else if (cmd == 8) // cell flags
		1328	cell->flags = *data++;
		1329	else if (ext & 0x40) // unknown, multibyte => skip
		1330	data += *data + 1;
		1331	else
		1332	data++;
		1333	}
		1334	while (ext & 0x80);
		1335	}
		1336	else
		1337	cell->darkness = *data++ + 1;
		1338	}
944		1339
945	if (flags & 4)	1340	if (flags & 4)
946	{	1341	{
947	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1342	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
948	}	1343	}
…		…
956	{	1351	{
957	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1352	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
958	}	1353	}
959	}	1354	}
960	else	1355	else
961	cell->darkness = -1;	1356	cell->darkness = 0;
962	}	1357	}
963	}	1358	}
964		1359
965	SV *	1360	SV *
966	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1361	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
967	CODE:	1362	CODE:
968	{	1363	{
969	int x1, x;	1364	int x1, x;
970	int y1, y;	1365	int y1, y;
971	int z;	1366	int z;
…		…
1021	}	1416	}
1022	OUTPUT:	1417	OUTPUT:
1023	RETVAL	1418	RETVAL
1024		1419
1025	void	1420	void
1026	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1421	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1027	PPCODE:	1422	CODE:
1028	{	1423	{
1029	int vx, vy;	1424	int vx, vy;
1030	int x, y, z;	1425	int x, y, z;
1031	int last_name;	1426	int last_name;
1032	mapface face;	1427	mapface face;
1033	int sw4 = (sw + 3) & ~3;
1034	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1035	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1036		1428
1037	memset (darkness, 255, sw4 * sh);
1038	SvPOK_only (darkness_sv);
1039	SvCUR_set (darkness_sv, sw4 * sh);
1040
1041	vx = self->x + (self->w - sw) / 2 - shift_x;	1429	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1042	vy = self->y + (self->h - sh) / 2 - shift_y;	1430	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1043		1431
1044	/*	1432	/*
1045	int vx = self->vx = self->w >= sw	1433	int vx = self->vx = self->w >= sw
1046	? self->x + (self->w - sw) / 2	1434	? self->x + (self->w - sw) / 2
1047	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1435	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1051	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1439	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1052	*/	1440	*/
1053		1441
1054	glColor4ub (255, 255, 255, 255);	1442	glColor4ub (255, 255, 255, 255);
1055		1443
		1444	glEnable (GL_BLEND);
1056	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1445	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1057	glEnable (GL_BLEND);
1058	glEnable (GL_TEXTURE_2D);	1446	glEnable (GL_TEXTURE_2D);
1059	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1447	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1060		1448
1061	glBegin (GL_QUADS);	1449	glBegin (GL_QUADS);
1062		1450
…		…
1071	for (x = 0; x < sw; x++)	1459	for (x = 0; x < sw; x++)
1072	if (row->c0 <= x + vx && x + vx < row->c1)	1460	if (row->c0 <= x + vx && x + vx < row->c1)
1073	{	1461	{
1074	mapcell *cell = row->col + (x + vx - row->c0);	1462	mapcell *cell = row->col + (x + vx - row->c0);
1075		1463
1076	darkness[y * sw4 + x] = cell->darkness < 0
1077	? 255 - FOW_DARKNESS
1078	: 255 - cell->darkness;
1079
1080	face = cell->face [z];	1464	face = cell->face [z];
1081		1465
1082	if (face)	1466	if (face && face < self->texs)
1083	{	1467	{
1084	maptex tex = self->tex [face];	1468	maptex tex = self->tex [face];
1085
1086	int px = (x + 1) * 32 - tex.w;	1469	int px = (x + 1) * 32 - tex.w;
1087	int py = (y + 1) * 32 - tex.h;	1470	int py = (y + 1) * 32 - tex.h;
1088		1471
1089	if (last_name != tex.name)	1472	if (last_name != tex.name)
1090	{	1473	{
1091	glEnd ();	1474	glEnd ();
1092	last_name = tex.name;
1093	glBindTexture (GL_TEXTURE_2D, last_name);	1475	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1094	glBegin (GL_QUADS);	1476	glBegin (GL_QUADS);
1095	}	1477	}
1096		1478
1097	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1479	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1098	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1480	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1099	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1481	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1100	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1482	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1101	}	1483	}
		1484
		1485	if (cell->flags && z == 2)
		1486	{
		1487	if (cell->flags & 1)
		1488	{
		1489	maptex tex = self->tex [1];
		1490	int px = (x + 1) * 32 - tex.w + 2;
		1491	int py = (y + 1) * 32 - tex.h - 6;
		1492
		1493	glEnd ();
		1494	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1495	glBegin (GL_QUADS);
		1496
		1497	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1498	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1499	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1500	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1501	}
		1502	}
1102	}	1503	}
1103	}	1504	}
1104		1505
1105	glEnd ();	1506	glEnd ();
1106		1507
1107	glDisable (GL_TEXTURE_2D);	1508	glDisable (GL_TEXTURE_2D);
1108	glDisable (GL_BLEND);	1509	glDisable (GL_BLEND);
		1510
		1511	// top layer: overlays such as the health bar
		1512	for (y = 0; y < sh; y++)
		1513	if (0 <= y + vy && y + vy < self->rows)
		1514	{
		1515	maprow *row = self->row + (y + vy);
		1516
		1517	for (x = 0; x < sw; x++)
		1518	if (row->c0 <= x + vx && x + vx < row->c1)
		1519	{
		1520	mapcell *cell = row->col + (x + vx - row->c0);
		1521
		1522	int px = x * 32;
		1523	int py = y * 32;
		1524
		1525	if (cell->stat_hp)
		1526	{
		1527	int width = cell->stat_width * 32;
		1528	int thick = sh / 28 + 1 + cell->stat_width;
		1529
		1530	glColor3ub (0, 0, 0);
		1531	glRectf (px + 1, py - thick - 2,
		1532	px + width - 1, py);
		1533
		1534	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1535	glRectf (px + 2,
		1536	py - thick - 1,
		1537	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1538	}
		1539	}
		1540	}
		1541	}
		1542
		1543	void
		1544	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1545	CODE:
		1546	{
		1547	static float color[16][3] = {
		1548	{ 0.00F, 0.00F, 0.00F },
		1549	{ 1.00F, 1.00F, 1.00F },
		1550	{ 0.00F, 0.00F, 0.55F },
		1551	{ 1.00F, 0.00F, 0.00F },
		1552
		1553	{ 1.00F, 0.54F, 0.00F },
		1554	{ 0.11F, 0.56F, 1.00F },
		1555	{ 0.93F, 0.46F, 0.00F },
		1556	{ 0.18F, 0.54F, 0.34F },
		1557
		1558	{ 0.56F, 0.73F, 0.56F },
		1559	{ 0.80F, 0.80F, 0.80F },
		1560	{ 0.55F, 0.41F, 0.13F },
		1561	{ 0.99F, 0.77F, 0.26F },
		1562
		1563	{ 0.74F, 0.65F, 0.41F },
		1564
		1565	{ 0.00F, 1.00F, 1.00F },
		1566	{ 1.00F, 0.00F, 1.00F },
		1567	{ 1.00F, 1.00F, 0.00F },
		1568	};
		1569
		1570	int x, y;
		1571
		1572	glEnable (GL_TEXTURE_2D);
		1573	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1574	glEnable (GL_BLEND);
		1575	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1576	glBegin (GL_QUADS);
		1577
		1578	for (y = 0; y < h; y++)
		1579	for (x = 0; x < w; x++)
		1580	{
		1581	unsigned char m = data [x + y * w];
		1582
		1583	if (m)
		1584	{
		1585	float *c = color [m & 15];
		1586
		1587	float tx1 = m & 0x40 ? 0.5 : 0.;
		1588	float tx2 = tx1 + 0.5;
		1589
		1590	glColor4f (c[0], c[1], c[2], 0.75);
		1591	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1592	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1593	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1594	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1595	}
		1596	}
		1597
		1598	glEnd ();
		1599	glDisable (GL_BLEND);
		1600	glDisable (GL_TEXTURE_2D);
		1601	}
		1602
		1603	void
		1604	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1605	PPCODE:
		1606	{
		1607	int vx, vy;
		1608	int x, y;
		1609	int sw4 = (sw + 3) & ~3;
		1610	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1611	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1612
		1613	memset (darkness, 255, sw4 * sh);
		1614	SvPOK_only (darkness_sv);
		1615	SvCUR_set (darkness_sv, sw4 * sh);
		1616
		1617	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1618	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1619
		1620	for (y = 0; y < sh; y++)
		1621	if (0 <= y + vy && y + vy < self->rows)
		1622	{
		1623	maprow *row = self->row + (y + vy);
		1624
		1625	for (x = 0; x < sw; x++)
		1626	if (row->c0 <= x + vx && x + vx < row->c1)
		1627	{
		1628	mapcell *cell = row->col + (x + vx - row->c0);
		1629
		1630	darkness[y * sw4 + x] = cell->darkness
		1631	? 255 - (cell->darkness - 1)
		1632	: 255 - FOW_DARKNESS;
		1633	}
		1634	}
1109		1635
1110	EXTEND (SP, 3);	1636	EXTEND (SP, 3);
1111	PUSHs (sv_2mortal (newSViv (sw4)));	1637	PUSHs (sv_2mortal (newSViv (sw4)));
1112	PUSHs (sv_2mortal (newSViv (sh)));	1638	PUSHs (sv_2mortal (newSViv (sh)));
1113	PUSHs (darkness_sv);	1639	PUSHs (darkness_sv);
1114	}	1640	}
1115		1641
1116	SV *	1642	SV *
1117	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1643	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1118	CODE:	1644	CODE:
1119	{	1645	{
1120	int x, y, x1, y1;	1646	int x, y, x1, y1;
1121	SV data_sv = newSV (w h * 7 + 5);	1647	SV data_sv = newSV (w h * 7 + 5);
1122	uint8_t data = (uint8_t )SvPVX (data_sv);	1648	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1184	}	1710	}
1185	OUTPUT:	1711	OUTPUT:
1186	RETVAL	1712	RETVAL
1187		1713
1188	void	1714	void
1189	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1715	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1190	PPCODE:	1716	PPCODE:
1191	{	1717	{
1192	int x, y, z;	1718	int x, y, z;
1193	int w, h;	1719	int w, h;
1194	int x1, y1;	1720	int x1, y1;
…		…
1226		1752
1227	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1753	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1228	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1754	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1229	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1755	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1230		1756
1231	if (cell->darkness <= 0)	1757	if (cell->darkness == 0)
1232	{	1758	{
1233	cell->darkness = -1;	1759	cell->darkness = 0;
1234		1760
1235	for (z = 0; z <= 2; z++)	1761	for (z = 0; z <= 2; z++)
1236	{	1762	{
1237	cell->face[z] = face[z];	1763	cell->face[z] = face[z];
1238		1764
…		…
1243	}	1769	}
1244	}	1770	}
1245	}	1771	}
1246	}	1772	}
1247		1773
1248	MODULE = CFClient PACKAGE = CFClient::MixChunk	1774	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1249		1775
1250	CFClient::MixChunk	1776	CFPlus::MixChunk
1251	new_from_file (SV class, char path)	1777	new_from_file (SV class, char path)
1252	CODE:	1778	CODE:
1253	RETVAL = Mix_LoadWAV (path);	1779	RETVAL = Mix_LoadWAV (path);
1254	OUTPUT:	1780	OUTPUT:
1255	RETVAL	1781	RETVAL
1256		1782
1257	void	1783	void
1258	DESTROY (CFClient::MixChunk self)	1784	DESTROY (CFPlus::MixChunk self)
1259	CODE:	1785	CODE:
1260	Mix_FreeChunk (self);	1786	Mix_FreeChunk (self);
1261		1787
1262	int	1788	int
1263	volume (CFClient::MixChunk self, int volume = -1)	1789	volume (CFPlus::MixChunk self, int volume = -1)
1264	CODE:	1790	CODE:
1265	RETVAL = Mix_VolumeChunk (self, volume);	1791	RETVAL = Mix_VolumeChunk (self, volume);
1266	OUTPUT:	1792	OUTPUT:
1267	RETVAL	1793	RETVAL
1268		1794
1269	int	1795	int
1270	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1796	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1271	CODE:	1797	CODE:
1272	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1798	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1273	OUTPUT:	1799	OUTPUT:
1274	RETVAL	1800	RETVAL
1275		1801
1276	MODULE = CFClient PACKAGE = CFClient::MixMusic	1802	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1277		1803
1278	int	1804	int
1279	volume (int volume = -1)	1805	volume (int volume = -1)
1280	CODE:	1806	CODE:
1281	RETVAL = Mix_VolumeMusic (volume);	1807	RETVAL = Mix_VolumeMusic (volume);
1282	OUTPUT:	1808	OUTPUT:
1283	RETVAL	1809	RETVAL
1284		1810
1285	CFClient::MixMusic	1811	CFPlus::MixMusic
1286	new_from_file (SV class, char path)	1812	new_from_file (SV class, char path)
1287	CODE:	1813	CODE:
1288	RETVAL = Mix_LoadMUS (path);	1814	RETVAL = Mix_LoadMUS (path);
1289	OUTPUT:	1815	OUTPUT:
1290	RETVAL	1816	RETVAL
1291		1817
1292	void	1818	void
1293	DESTROY (CFClient::MixMusic self)	1819	DESTROY (CFPlus::MixMusic self)
1294	CODE:	1820	CODE:
1295	Mix_FreeMusic (self);	1821	Mix_FreeMusic (self);
1296		1822
1297	int	1823	int
1298	play (CFClient::MixMusic self, int loops = -1)	1824	play (CFPlus::MixMusic self, int loops = -1)
1299	CODE:	1825	CODE:
1300	RETVAL = Mix_PlayMusic (self, loops);	1826	RETVAL = Mix_PlayMusic (self, loops);
1301	OUTPUT:	1827	OUTPUT:
1302	RETVAL	1828	RETVAL
1303		1829
1304	MODULE = CFClient PACKAGE = CFClient::OpenGL	1830	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1305		1831
1306	BOOT:	1832	BOOT:
1307	{	1833	{
1308	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1834	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1309	static const struct {	1835	static const struct {
1310	const char *name;	1836	const char *name;
1311	IV iv;	1837	IV iv;
1312	} *civ, const_iv[] = {	1838	} *civ, const_iv[] = {
1313	# define const_iv(name) { # name, (IV)name }	1839	# define const_iv(name) { # name, (IV)name }
1314	const_iv (GL_COLOR_MATERIAL),	1840	const_iv (GL_COLOR_MATERIAL),
1315	const_iv (GL_SMOOTH),	1841	const_iv (GL_SMOOTH),
1316	const_iv (GL_FLAT),	1842	const_iv (GL_FLAT),
		1843	const_iv (GL_DITHER),
1317	const_iv (GL_BLEND),	1844	const_iv (GL_BLEND),
		1845	const_iv (GL_CULL_FACE),
		1846	const_iv (GL_SCISSOR_TEST),
		1847	const_iv (GL_DEPTH_TEST),
		1848	const_iv (GL_ALPHA_TEST),
		1849	const_iv (GL_NORMALIZE),
		1850	const_iv (GL_RESCALE_NORMAL),
		1851	const_iv (GL_FRONT),
		1852	const_iv (GL_BACK),
1318	const_iv (GL_AND),	1853	const_iv (GL_AND),
		1854	const_iv (GL_ONE),
		1855	const_iv (GL_ZERO),
1319	const_iv (GL_SRC_ALPHA),	1856	const_iv (GL_SRC_ALPHA),
		1857	const_iv (GL_DST_ALPHA),
1320	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1858	const_iv (GL_ONE_MINUS_SRC_ALPHA),
		1859	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1860	const_iv (GL_SRC_ALPHA_SATURATE),
1321	const_iv (GL_RGB),	1861	const_iv (GL_RGB),
1322	const_iv (GL_RGBA),	1862	const_iv (GL_RGBA),
		1863	const_iv (GL_RGBA4),
		1864	const_iv (GL_RGBA8),
		1865	const_iv (GL_RGB5_A1),
1323	const_iv (GL_UNSIGNED_BYTE),	1866	const_iv (GL_UNSIGNED_BYTE),
1324	const_iv (GL_ALPHA4),	1867	const_iv (GL_UNSIGNED_SHORT),
		1868	const_iv (GL_UNSIGNED_INT),
1325	const_iv (GL_ALPHA),	1869	const_iv (GL_ALPHA),
		1870	const_iv (GL_INTENSITY),
		1871	const_iv (GL_LUMINANCE),
		1872	const_iv (GL_LUMINANCE_ALPHA),
1326	const_iv (GL_FLOAT),	1873	const_iv (GL_FLOAT),
1327	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1874	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1328	const_iv (GL_COMPILE),	1875	const_iv (GL_COMPILE),
1329	const_iv (GL_TEXTURE_1D),	1876	const_iv (GL_TEXTURE_1D),
1330	const_iv (GL_TEXTURE_2D),	1877	const_iv (GL_TEXTURE_2D),
…		…
1332	const_iv (GL_TEXTURE_MAG_FILTER),	1879	const_iv (GL_TEXTURE_MAG_FILTER),
1333	const_iv (GL_TEXTURE_MIN_FILTER),	1880	const_iv (GL_TEXTURE_MIN_FILTER),
1334	const_iv (GL_TEXTURE_ENV_MODE),	1881	const_iv (GL_TEXTURE_ENV_MODE),
1335	const_iv (GL_TEXTURE_WRAP_S),	1882	const_iv (GL_TEXTURE_WRAP_S),
1336	const_iv (GL_TEXTURE_WRAP_T),	1883	const_iv (GL_TEXTURE_WRAP_T),
		1884	const_iv (GL_REPEAT),
1337	const_iv (GL_CLAMP),	1885	const_iv (GL_CLAMP),
1338	const_iv (GL_REPEAT),	1886	const_iv (GL_CLAMP_TO_EDGE),
1339	const_iv (GL_NEAREST),	1887	const_iv (GL_NEAREST),
1340	const_iv (GL_LINEAR),	1888	const_iv (GL_LINEAR),
1341	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1889	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1342	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1890	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1343	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1891	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1344	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1892	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1345	const_iv (GL_GENERATE_MIPMAP),	1893	const_iv (GL_GENERATE_MIPMAP),
1346	const_iv (GL_LINEAR),
1347	const_iv (GL_MODULATE),	1894	const_iv (GL_MODULATE),
		1895	const_iv (GL_DECAL),
1348	const_iv (GL_REPLACE),	1896	const_iv (GL_REPLACE),
		1897	const_iv (GL_DEPTH_BUFFER_BIT),
1349	const_iv (GL_COLOR_BUFFER_BIT),	1898	const_iv (GL_COLOR_BUFFER_BIT),
1350	const_iv (GL_PROJECTION),	1899	const_iv (GL_PROJECTION),
1351	const_iv (GL_MODELVIEW),	1900	const_iv (GL_MODELVIEW),
1352	const_iv (GL_COLOR_LOGIC_OP),	1901	const_iv (GL_COLOR_LOGIC_OP),
		1902	const_iv (GL_SEPARABLE_2D),
1353	const_iv (GL_CONVOLUTION_2D),	1903	const_iv (GL_CONVOLUTION_2D),
1354	const_iv (GL_CONVOLUTION_BORDER_MODE),	1904	const_iv (GL_CONVOLUTION_BORDER_MODE),
1355	const_iv (GL_CONSTANT_BORDER),	1905	const_iv (GL_CONSTANT_BORDER),
1356	const_iv (GL_LINES),	1906	const_iv (GL_LINES),
		1907	const_iv (GL_LINE_STRIP),
		1908	const_iv (GL_LINE_LOOP),
1357	const_iv (GL_QUADS),	1909	const_iv (GL_QUADS),
1358	const_iv (GL_LINE_LOOP),	1910	const_iv (GL_QUAD_STRIP),
		1911	const_iv (GL_TRIANGLES),
		1912	const_iv (GL_TRIANGLE_STRIP),
		1913	const_iv (GL_TRIANGLE_FAN),
1359	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1914	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1360	const_iv (GL_FASTEST),	1915	const_iv (GL_FASTEST),
		1916	const_iv (GL_V2F),
		1917	const_iv (GL_V3F),
		1918	const_iv (GL_T2F_V3F),
		1919	const_iv (GL_T2F_N3F_V3F),
1361	# undef const_iv	1920	# undef const_iv
1362	};	1921	};
1363		1922
1364	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1923	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1365	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1924	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1366	}	1925	}
1367		1926
		1927	char *
		1928	gl_vendor ()
		1929	CODE:
		1930	RETVAL = (char *)glGetString (GL_VENDOR);
		1931	OUTPUT:
		1932	RETVAL
		1933
		1934	char *
		1935	gl_version ()
		1936	CODE:
		1937	RETVAL = (char *)glGetString (GL_VERSION);
		1938	OUTPUT:
		1939	RETVAL
		1940
		1941	char *
		1942	gl_extensions ()
		1943	CODE:
		1944	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1945	OUTPUT:
		1946	RETVAL
		1947
1368	int glGetError ()	1948	int glGetError ()
		1949
		1950	void glFinish ()
1369		1951
1370	void glClear (int mask)	1952	void glClear (int mask)
1371		1953
1372	void glClearColor (float r, float g, float b, float a = 1.0)	1954	void glClearColor (float r, float g, float b, float a = 1.0)
1373	PROTOTYPE: @	1955	PROTOTYPE: @
…		…
1380		1962
1381	void glHint (int target, int mode)	1963	void glHint (int target, int mode)
1382		1964
1383	void glBlendFunc (int sfactor, int dfactor)	1965	void glBlendFunc (int sfactor, int dfactor)
1384		1966
		1967	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1968	CODE:
		1969	gl_BlendFuncSeparate (sa, da, saa, daa);
		1970
		1971	void glDepthMask (int flag)
		1972
1385	void glLogicOp (int opcode)	1973	void glLogicOp (int opcode)
1386		1974
		1975	void glColorMask (int red, int green, int blue, int alpha)
		1976
1387	void glMatrixMode (int mode)	1977	void glMatrixMode (int mode)
1388		1978
1389	void glPushMatrix ()	1979	void glPushMatrix ()
1390		1980
1391	void glPopMatrix ()	1981	void glPopMatrix ()
1392		1982
1393	void glLoadIdentity ()	1983	void glLoadIdentity ()
1394		1984
		1985	void glDrawBuffer (int buffer)
		1986
		1987	void glReadBuffer (int buffer)
		1988
		1989	# near_ and far_ are due to microsofts buggy "c" compiler
		1990	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1991
		1992	# near_ and far_ are due to microsofts buggy "c" compiler
1395	void glOrtho (double left, double right, double bottom, double top, double near, double far)	1993	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1396		1994
1397	void glViewport (int x, int y, int width, int height)	1995	void glViewport (int x, int y, int width, int height)
		1996
		1997	void glScissor (int x, int y, int width, int height)
1398		1998
1399	void glTranslate (float x, float y, float z = 0.)	1999	void glTranslate (float x, float y, float z = 0.)
1400	CODE:	2000	CODE:
1401	glTranslatef (x, y, z);	2001	glTranslatef (x, y, z);
1402		2002
1403	void glScale (float x, float y, float z)	2003	void glScale (float x, float y, float z = 1.)
1404	CODE:	2004	CODE:
1405	glScalef (x, y, z);	2005	glScalef (x, y, z);
1406		2006
1407	void glRotate (float angle, float x, float y, float z)	2007	void glRotate (float angle, float x, float y, float z)
1408	CODE:	2008	CODE:
…		…
1412		2012
1413	void glEnd ()	2013	void glEnd ()
1414		2014
1415	void glColor (float r, float g, float b, float a = 1.0)	2015	void glColor (float r, float g, float b, float a = 1.0)
1416	PROTOTYPE: @	2016	PROTOTYPE: @
		2017	ALIAS:
		2018	glColor_premultiply = 1
1417	CODE:	2019	CODE:
		2020	if (ix)
		2021	{
		2022	r *= a;
		2023	g *= a;
		2024	b *= a;
		2025	}
		2026	// microsoft visual "c" rounds instead of truncating...
1418	glColor4f (r, g, b, a);	2027	glColor4f (r, g, b, a);
		2028
		2029	void glInterleavedArrays (int format, int stride, char *data)
		2030
		2031	void glDrawElements (int mode, int count, int type, char *indices)
		2032
		2033	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2034
		2035	void glRasterPos (float x, float y, float z = 0.)
		2036	CODE:
		2037	glRasterPos3f (0, 0, z);
		2038	glBitmap (0, 0, 0, 0, x, y, 0);
1419		2039
1420	void glVertex (float x, float y, float z = 0.)	2040	void glVertex (float x, float y, float z = 0.)
1421	CODE:	2041	CODE:
1422	glVertex3f (x, y, z);	2042	glVertex3f (x, y, z);
1423		2043
…		…
1435		2055
1436	void glBindTexture (int target, int name)	2056	void glBindTexture (int target, int name)
1437		2057
1438	void glConvolutionParameter (int target, int pname, float params)	2058	void glConvolutionParameter (int target, int pname, float params)
1439	CODE:	2059	CODE:
		2060	if (gl.ConvolutionParameterf)
1440	glConvolutionParameterf (target, pname, params);	2061	gl.ConvolutionParameterf (target, pname, params);
1441		2062
1442	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2063	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
		2064	CODE:
		2065	if (gl.ConvolutionFilter2D)
		2066	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
		2067
		2068	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
		2069	CODE:
		2070	if (gl.SeparableFilter2D)
		2071	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1443		2072
1444	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2073	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1445		2074
1446	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2075	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
		2076
		2077	void glDrawPixels (int width, int height, int format, int type, char *pixels)
		2078
		2079	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1447		2080
1448	int glGenTexture ()	2081	int glGenTexture ()
1449	CODE:	2082	CODE:
1450	{	2083	{
1451	GLuint name;	2084	GLuint name;

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs. Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.60 by root, Sun Apr 23 04:47:02 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC