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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	long _ftol (double); /* defined by VC6 C libs */
		3	long _ftol2 (double dblSource) { return _ftol (dblSource); }
		4	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	5	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	6	# include <malloc.h>
4	# include <windows.h>	7	# include <windows.h>
		8	# include <wininet.h>
5	# pragma warning(disable:4244)	9	# pragma warning(disable:4244)
6	#endif	10	#endif
7		11
8	#include "EXTERN.h"	12	#include "EXTERN.h"
9	#include "perl.h"	13	#include "perl.h"
10	#include "XSUB.h"	14	#include "XSUB.h"
11		15
		16	#ifdef _WIN32
		17	# undef pipe
		18	#endif
		19
12	#include <math.h>	20	#include <math.h>
13	#include <string.h>	21	#include <string.h>
14	#include <stdio.h>	22	#include <stdio.h>
		23	#include <stdlib.h>
15		24
16	#include <SDL.h>	25	#include <SDL.h>
17	#include <SDL_endian.h>	26	#include <SDL_endian.h>
18	#include <SDL_image.h>	27	#include <SDL_image.h>
19	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
21		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
22	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
23		35
24	#include <pango/pango.h>	36	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		37
29	#ifndef _WIN32	38	#ifndef _WIN32
30	# include <sys/types.h>	39	# include <sys/types.h>
31	# include <sys/socket.h>	40	# include <sys/socket.h>
32	# include <netinet/in.h>	41	# include <netinet/in.h>
39	typedef signed char int8_t;	48	typedef signed char int8_t;
40	typedef signed short int16_t;	49	typedef signed short int16_t;
41	typedef signed int int32_t;	50	typedef signed int int32_t;
42	#endif	51	#endif
43		52
44	#include "glext.h"	53	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		54
46	#define FOW_DARKNESS 32	55	#define FOW_DARKNESS 32
47		56
48	#define MAP_EXTEND_X 32	57	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	58	#define MAP_EXTEND_Y 512
50		59
51	#define MIN_FONT_HEIGHT 10	60	#define MIN_FONT_HEIGHT 10
52		61
53	#define GL_CALL(type,func,args) \	62	#if 0
54	{ \	63	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	64	#else
56	static type fptr_; \	65	# define PARACHUTE 0
57	\	66	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		67
		68	static struct
		69	{
		70	#define GL_FUNC(ptr,name) ptr name;
		71	#include "glfunc.h"
		72	#undef GL_FUNC
		73	} gl;
		74
		75	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		76	{
		77	if (gl.BlendFuncSeparate)
		78	gl.BlendFuncSeparate (sa, da, saa, daa);
		79	else if (gl.BlendFuncSeparateEXT)
		80	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		81	else
		82	glBlendFunc (sa, da);
		83	}
		84
		85	#include "texcache.c"
		86
		87	#include "pango-font.c"
		88	#include "pango-fontmap.c"
		89	#include "pango-render.c"
		90
68	typedef Mix_Chunk *CFClient__MixChunk;	91	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	92	typedef Mix_Music *CFPlus__MixMusic;
70		93
71	typedef PangoFontDescription *CFClient__Font;	94	typedef PangoFontDescription *CFPlus__Font;
		95
		96	static int
		97	shape_attr_p (PangoLayoutRun *run)
		98	{
		99	GSList *attrs = run->item->analysis.extra_attrs;
		100
		101	while (attrs)
		102	{
		103	PangoAttribute *attr = attrs->data;
		104
		105	if (attr->klass->type == PANGO_ATTR_SHAPE)
		106	return 1;
		107
		108	attrs = attrs->next;
		109	}
		110
		111	return 0;
		112	}
72		113
73	typedef struct cf_layout {	114	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	115	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	116	float r, g, b, a; // default color for rgba mode
77	int base_height;	117	int base_height;
78	CFClient__Font font;	118	CFPlus__Font font;
79	} *CFClient__Layout;	119	} *CFPlus__Layout;
80		120
81	static CFClient__Font default_font;	121	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	122	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	123	static PangoFontMap *opengl_fontmap;
84		124
85	static void	125	static void
86	substitute_func (FcPattern *pattern, gpointer data)	126	substitute_func (FcPattern *pattern, gpointer data)
87	{	127	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	128	FcPatternAddBool (pattern, FC_HINTING, 1);
89	#ifdef _WIN32	129	#ifdef FC_HINT_STYLE
90	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	130	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
91	#else	131	#endif
92	FcPatternAddBool (pattern, FC_AUTOHINT, 0);	132	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
93	#endif
94	}	133	}
95		134
96	static void	135	static void
97	layout_update_font (CFClient__Layout self)	136	layout_update_font (CFPlus__Layout self)
98	{	137	{
99	/* use a random scale factor to account for unknown descenders, 0.8 works	138	/* use a random scale factor to account for unknown descenders, 0.8 works
100	* reasonably well with bitstream vera	139	* reasonably well with bitstream vera
101	*/	140	*/
102	PangoFontDescription *font = self->font ? self->font : default_font;	141	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
106		145
107	pango_layout_set_font_description (self->pl, font);	146	pango_layout_set_font_description (self->pl, font);
108	}	147	}
109		148
110	static void	149	static void
111	layout_get_pixel_size (CFClient__Layout self, int w, int h)	150	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
112	{	151	{
		152	PangoRectangle rect;
		153
		154	// get_pixel_* wrongly rounds down
113	pango_layout_get_pixel_size (self->pl, w, h);	155	pango_layout_get_extents (self->pl, 0, &rect);
114		156
115	if (!w) w = 1;	157	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
116	if (!h) h = 1;	158	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
117		159
118	w = (w + 3) & ~3;	160	if (!rect.width) rect.width = 1;
		161	if (!rect.height) rect.height = 1;
		162
		163	*w = rect.width;
		164	*h = rect.height;
119	}	165	}
120		166
121	typedef uint16_t mapface;	167	typedef uint16_t mapface;
122		168
123	typedef struct {	169	typedef struct {
…		…
126	float s, t;	172	float s, t;
127	uint8_t r, g, b, a;	173	uint8_t r, g, b, a;
128	} maptex;	174	} maptex;
129		175
130	typedef struct {	176	typedef struct {
131	int16_t darkness;	177	uint32_t player;
132	mapface face[3];	178	mapface face[3];
		179	uint16_t darkness;
		180	uint8_t stat_width, stat_hp, flags;
133	} mapcell;	181	} mapcell;
134		182
135	typedef struct {	183	typedef struct {
136	int32_t c0, c1;	184	int32_t c0, c1;
137	mapcell *col;	185	mapcell *col;
…		…
146	int texs;	194	int texs;
147	maptex *tex;	195	maptex *tex;
148		196
149	int32_t rows;	197	int32_t rows;
150	maprow *row;	198	maprow *row;
151	} *CFClient__Map;	199	} *CFPlus__Map;
152		200
153	static char *	201	static char *
154	prepend (char *ptr, int sze, int inc)	202	prepend (char *ptr, int sze, int inc)
155	{	203	{
156	char *p;	204	char *p;
…		…
174		222
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	223	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
176	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	224	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		225
178	static maprow *	226	static maprow *
179	map_get_row (CFClient__Map self, int y)	227	map_get_row (CFPlus__Map self, int y)
180	{	228	{
181	if (0 > y)	229	if (0 > y)
182	{	230	{
183	int extend = - y + MAP_EXTEND_Y;	231	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	232	Prepend (maprow, self->row, self->rows, extend);
…		…
222		270
223	return row->col + (x - row->c0);	271	return row->col + (x - row->c0);
224	}	272	}
225		273
226	static mapcell *	274	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	275	map_get_cell (CFPlus__Map self, int x, int y)
228	{	276	{
229	return row_get_cell (map_get_row (self, y), x);	277	return row_get_cell (map_get_row (self, y), x);
230	}	278	}
231		279
232	static void	280	static void
233	map_clear (CFClient__Map self)	281	map_clear (CFPlus__Map self)
234	{	282	{
235	int r;	283	int r;
236		284
237	for (r = 0; r < self->rows; r++)	285	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	286	Safefree (self->row[r].col);
…		…
246	self->row = 0;	294	self->row = 0;
247	self->rows = 0;	295	self->rows = 0;
248	}	296	}
249		297
250	static void	298	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	299	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	300	{
253	int x, y;	301	int x, y;
254	maprow *row;	302	maprow *row;
		303	mapcell *cell;
255		304
256	for (y = y0; y < y0 + h; y++)	305	for (y = y0; y < y0 + h; y++)
257	if (y >= 0)	306	if (y >= 0)
258	{	307	{
259	if (y >= self->rows)	308	if (y >= self->rows)
…		…
265	if (x >= row->c0)	314	if (x >= row->c0)
266	{	315	{
267	if (x >= row->c1)	316	if (x >= row->c1)
268	break;	317	break;
269		318
270	row->col[x - row->c0].darkness = -1;	319	cell = row->col + x - row->c0;
		320
		321	cell->darkness = 0;
		322	cell->stat_hp = 0;
		323	cell->flags = 0;
		324	cell->player = 0;
271	}	325	}
272	}	326	}
273	}	327	}
274		328
275	static void	329	static void
…		…
296	ev.data2 = 0;	350	ev.data2 = 0;
297		351
298	SDL_PushEvent ((SDL_Event *)&ev);	352	SDL_PushEvent ((SDL_Event *)&ev);
299	}	353	}
300		354
		355	static unsigned int
		356	minpot (unsigned int n)
		357	{
		358	if (!n)
		359	return 0;
		360
		361	--n;
		362
		363	n \|= n >> 1;
		364	n \|= n >> 2;
		365	n \|= n >> 4;
		366	n \|= n >> 8;
		367	n \|= n >> 16;
		368
		369	return n + 1;
		370	}
		371
301	MODULE = CFClient PACKAGE = CFClient	372	MODULE = CFPlus PACKAGE = CFPlus
302		373
303	PROTOTYPES: ENABLE	374	PROTOTYPES: ENABLE
304		375
305	BOOT:	376	BOOT:
306	{	377	{
307	HV *stash = gv_stashpv ("CFClient", 1);	378	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	379	static const struct {
309	const char *name;	380	const char *name;
310	IV iv;	381	IV iv;
311	} *civ, const_iv[] = {	382	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	383	# define const_iv(name) { # name, (IV)name }
…		…
413		484
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	485	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	486	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	487	}
417		488
		489	int
		490	in_destruct ()
		491	CODE:
		492	RETVAL = PL_main_cv == Nullcv;
		493	OUTPUT:
		494	RETVAL
		495
		496	NV floor (NV x)
		497
		498	NV ceil (NV x)
		499
418	void	500	void
419	pango_init ()	501	pango_init ()
420	CODE:	502	CODE:
421	{	503	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	504	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	505	pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
425	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	506	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
426
427	cairo_fontmap = pango_cairo_font_map_get_default ();
428	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
429	}	507	}
430		508
431	int	509	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	510	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		511
434	void	512	void
435	SDL_Quit ()	513	SDL_Quit ()
436		514
437	void	515	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	522	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	523	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	524	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		525
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	526	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	527	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		528
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	532	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		533
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	534	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		535	#if SDL_VERSION_ATLEAST(1,2,10)
		536	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		537	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		538	#endif
457		539
458	SDL_EnableUNICODE (1);	540	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	541	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		542
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	543	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	561	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	562	CODE:
481	RETVAL = !!SDL_SetVideoMode (	563	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	564	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	565	);
		566	if (RETVAL)
		567	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	568	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		569	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		570	# include "glfunc.h"
		571	# undef GL_FUNC
		572	}
485	OUTPUT:	573	OUTPUT:
486	RETVAL	574	RETVAL
487		575
488	void	576	void
489	SDL_GL_SwapBuffers ()	577	SDL_GL_SwapBuffers ()
…		…
542	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	630	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
543	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	631	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
544	break;	632	break;
545	}	633	}
546		634
547	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
548	}	636	}
549	}	637	}
550		638
551	int	639	int
552	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	640	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
565	CODE:	653	CODE:
566	#ifndef _WIN32	654	#ifndef _WIN32
567	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
568	#endif	656	#endif
569		657
570	char *	658	void
571	gl_vendor ()	659	win32_proxy_info ()
572	CODE:	660	PPCODE:
573	RETVAL = (char *)glGetString (GL_VENDOR);	661	{
574	OUTPUT:	662	#ifdef _WIN32
575	RETVAL	663	char buffer[2048];
		664	DWORD buflen;
576		665
577	char *	666	EXTEND (SP, 3);
578	gl_version ()	667
579	CODE:	668	buflen = sizeof (buffer);
580	RETVAL = (char *)glGetString (GL_VERSION);	669	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
581	OUTPUT:	670	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
582	RETVAL	671	{
		672	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
583		673
584	char *	674	buflen = sizeof (buffer);
585	gl_extensions ()	675	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
586	CODE:	676	{
587	RETVAL = (char *)glGetString (GL_EXTENSIONS);	677	PUSHs (newSVpv (buffer, 0));
588	OUTPUT:	678
589	RETVAL	679	buflen = sizeof (buffer);
		680	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		681	PUSHs (newSVpv (buffer, 0));
		682	}
		683	}
		684	#endif
		685	}
590		686
591	void	687	void
592	add_font (char *file)	688	add_font (char *file)
593	CODE:	689	CODE:
594	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	690	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
595	#ifdef _WIN32
596	// cairo... sigh... requires win2000
597	AddFontResourceEx (file, FR_PRIVATE, 0);
598	#endif
599		691
600	void	692	void
601	load_image_inline (SV *image_)	693	load_image_inline (SV *image_)
602	ALIAS:	694	ALIAS:
603	load_image_file = 1	695	load_image_file = 1
…		…
645		737
646	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	738	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
647		739
648	assert (surface2->pitch == surface2->w * 4);	740	assert (surface2->pitch == surface2->w * 4);
649		741
		742	SDL_LockSurface (surface2);
650	EXTEND (SP, 5);	743	EXTEND (SP, 6);
651	PUSHs (sv_2mortal (newSViv (surface2->w)));	744	PUSHs (sv_2mortal (newSViv (surface2->w)));
652	PUSHs (sv_2mortal (newSViv (surface2->h)));	745	PUSHs (sv_2mortal (newSViv (surface2->h)));
653	SDL_LockSurface (surface2);
654	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	746	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
655	SDL_UnlockSurface (surface2);
656	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	747	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
657	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	748	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
658	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	749	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		750	SDL_UnlockSurface (surface2);
659		751
660	SDL_FreeSurface (surface);	752	SDL_FreeSurface (surface);
661	SDL_FreeSurface (surface2);	753	SDL_FreeSurface (surface2);
662	}	754	}
663		755
…		…
699	CODE:	791	CODE:
700	fprintf (stderr, "FATAL: %s\n", message);	792	fprintf (stderr, "FATAL: %s\n", message);
701	#ifdef _WIN32	793	#ifdef _WIN32
702	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	794	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
703	#endif	795	#endif
704	exit (1);	796	_exit (1);
705		797
		798	void
		799	_exit (int retval = 0)
		800	CODE:
		801	_exit (retval);
		802
706	MODULE = CFClient PACKAGE = CFClient::Font	803	MODULE = CFPlus PACKAGE = CFPlus::Font
707		804
708	CFClient::Font	805	CFPlus::Font
709	new_from_file (SV class, char path, int id = 0)	806	new_from_file (SV class, char path, int id = 0)
710	CODE:	807	CODE:
711	{	808	{
712	int count;	809	int count;
713	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	810	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
716	}	813	}
717	OUTPUT:	814	OUTPUT:
718	RETVAL	815	RETVAL
719		816
720	void	817	void
721	DESTROY (CFClient::Font self)	818	DESTROY (CFPlus::Font self)
722	CODE:	819	CODE:
723	pango_font_description_free (self);	820	pango_font_description_free (self);
724		821
725	void	822	void
726	make_default (CFClient::Font self)	823	make_default (CFPlus::Font self)
727	CODE:	824	CODE:
728	default_font = self;	825	default_font = self;
729		826
730	MODULE = CFClient PACKAGE = CFClient::Layout	827	MODULE = CFPlus PACKAGE = CFPlus::Layout
731		828
732	CFClient::Layout	829	void
733	new (SV *class, int rgba = 0)	830	reset_glyph_cache ()
734	CODE:	831	CODE:
735	#if _WIN32	832	tc_clear ();
736	//rgba = 0;//D make stext nicer, breaks TextView	833
737	#endif	834	CFPlus::Layout
		835	new (SV *class)
		836	CODE:
738	New (0, RETVAL, 1, struct cf_layout);	837	New (0, RETVAL, 1, struct cf_layout);
739		838
740	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	839	RETVAL->pl = pango_layout_new (opengl_context);
741	RETVAL->rgba = rgba;
742	RETVAL->r = 1.;	840	RETVAL->r = 1.;
743	RETVAL->g = 1.;	841	RETVAL->g = 1.;
744	RETVAL->b = 1.;	842	RETVAL->b = 1.;
745	RETVAL->a = 1.;	843	RETVAL->a = 1.;
746	RETVAL->base_height = MIN_FONT_HEIGHT;	844	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
750	layout_update_font (RETVAL);	848	layout_update_font (RETVAL);
751	OUTPUT:	849	OUTPUT:
752	RETVAL	850	RETVAL
753		851
754	void	852	void
755	DESTROY (CFClient::Layout self)	853	DESTROY (CFPlus::Layout self)
756	CODE:	854	CODE:
757	g_object_unref (self->pl);	855	g_object_unref (self->pl);
758	Safefree (self);	856	Safefree (self);
759		857
760	int
761	is_rgba (CFClient::Layout self)
762	CODE:
763	RETVAL = self->rgba;
764	OUTPUT:
765	RETVAL
766
767	void	858	void
768	set_text (CFClient::Layout self, SV *text_)	859	set_text (CFPlus::Layout self, SV *text_)
769	CODE:	860	CODE:
770	{	861	{
771	STRLEN textlen;	862	STRLEN textlen;
772	char *text = SvPVutf8 (text_, textlen);	863	char *text = SvPVutf8 (text_, textlen);
773		864
774	pango_layout_set_text (self->pl, text, textlen);	865	pango_layout_set_text (self->pl, text, textlen);
775	}	866	}
776		867
777	void	868	void
778	set_markup (CFClient::Layout self, SV *text_)	869	set_markup (CFPlus::Layout self, SV *text_)
779	CODE:	870	CODE:
780	{	871	{
781	STRLEN textlen;	872	STRLEN textlen;
782	char *text = SvPVutf8 (text_, textlen);	873	char *text = SvPVutf8 (text_, textlen);
783		874
784	pango_layout_set_markup (self->pl, text, textlen);	875	pango_layout_set_markup (self->pl, text, textlen);
785	}	876	}
786		877
		878	void
		879	set_shapes (CFPlus::Layout self, ...)
		880	CODE:
		881	{
		882	PangoAttrList *attrs = 0;
		883	const char *text = pango_layout_get_text (self->pl);
		884	const char *pos = text;
		885	int arg = 4;
		886
		887	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		888	{
		889	PangoRectangle inkrect, rect;
		890	PangoAttribute *attr;
		891
		892	int x = SvIV (ST (arg - 3));
		893	int y = SvIV (ST (arg - 2));
		894	int w = SvIV (ST (arg - 1));
		895	int h = SvIV (ST (arg ));
		896
		897	inkrect.x = 0;
		898	inkrect.y = 0;
		899	inkrect.width = 0;
		900	inkrect.height = 0;
		901
		902	rect.x = x * PANGO_SCALE;
		903	rect.y = y * PANGO_SCALE;
		904	rect.width = w * PANGO_SCALE;
		905	rect.height = h * PANGO_SCALE;
		906
		907	if (!attrs)
		908	attrs = pango_layout_get_attributes (self->pl);
		909
		910	attr = pango_attr_shape_new (&inkrect, &rect);
		911	attr->start_index = pos - text;
		912	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		913	pango_attr_list_insert (attrs, attr);
		914
		915	arg += 4;
		916	pos += sizeof (OBJ_STR) - 1;
		917	}
		918
		919	if (attrs)
		920	pango_layout_set_attributes (self->pl, attrs);
		921	}
		922
		923	void
		924	get_shapes (CFPlus::Layout self)
		925	PPCODE:
		926	{
		927	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		928
		929	do
		930	{
		931	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		932
		933	if (run && shape_attr_p (run))
		934	{
		935	PangoRectangle extents;
		936	pango_layout_iter_get_run_extents (iter, 0, &extents);
		937
		938	EXTEND (SP, 2);
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		940	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		941	}
		942	}
		943	while (pango_layout_iter_next_run (iter));
		944
		945	pango_layout_iter_free (iter);
		946	}
		947
		948	int
		949	has_wrapped (CFPlus::Layout self)
		950	CODE:
		951	{
		952	int lines = 1;
		953	const char *text = pango_layout_get_text (self->pl);
		954
		955	while (*text)
		956	lines += *text++ == '\n';
		957
		958	RETVAL = lines < pango_layout_get_line_count (self->pl);
		959	}
		960	OUTPUT:
		961	RETVAL
		962
787	SV *	963	SV *
788	get_text (CFClient::Layout self)	964	get_text (CFPlus::Layout self)
789	CODE:	965	CODE:
790	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	966	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
791	SvUTF8_on (RETVAL);	967	sv_utf8_decode (RETVAL);
792	OUTPUT:	968	OUTPUT:
793	RETVAL	969	RETVAL
794		970
795	void	971	void
796	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	972	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
797	CODE:	973	CODE:
798	self->r = r;	974	self->r = r;
799	self->g = g;	975	self->g = g;
800	self->b = b;	976	self->b = b;
801	self->a = a;	977	self->a = a;
802		978
803	void	979	void
804	set_font (CFClient::Layout self, CFClient::Font font = 0)	980	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
805	CODE:	981	CODE:
806	if (self->font != font)	982	if (self->font != font)
807	{	983	{
808	self->font = font;	984	self->font = font;
809	layout_update_font (self);	985	layout_update_font (self);
810	}	986	}
811		987
812	void	988	void
813	set_height (CFClient::Layout self, int base_height)	989	set_height (CFPlus::Layout self, int base_height)
814	CODE:	990	CODE:
815	if (self->base_height != base_height)	991	if (self->base_height != base_height)
816	{	992	{
817	self->base_height = base_height;	993	self->base_height = base_height;
818	layout_update_font (self);	994	layout_update_font (self);
819	}	995	}
820		996
821	void	997	void
822	set_width (CFClient::Layout self, int max_width = -1)	998	set_width (CFPlus::Layout self, int max_width = -1)
823	CODE:	999	CODE:
824	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	1000	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
825		1001
826	void	1002	void
827	set_indent (CFClient::Layout self, int indent)	1003	set_indent (CFPlus::Layout self, int indent)
828	CODE:	1004	CODE:
829	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1005	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
830		1006
831	void	1007	void
832	set_spacing (CFClient::Layout self, int spacing)	1008	set_spacing (CFPlus::Layout self, int spacing)
833	CODE:	1009	CODE:
834	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1010	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
835		1011
836	void	1012	void
837	set_ellipsise (CFClient::Layout self, int ellipsise)	1013	set_ellipsise (CFPlus::Layout self, int ellipsise)
838	CODE:	1014	CODE:
839	pango_layout_set_ellipsize (self->pl,	1015	pango_layout_set_ellipsize (self->pl,
840	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1016	ellipsise == 1 ? PANGO_ELLIPSIZE_START
841	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1017	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
842	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1018	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
843	: PANGO_ELLIPSIZE_NONE	1019	: PANGO_ELLIPSIZE_NONE
844	);	1020	);
845		1021
846	void	1022	void
847	set_single_paragraph_mode (CFClient::Layout self, int spm)	1023	set_single_paragraph_mode (CFPlus::Layout self, int spm)
848	CODE:	1024	CODE:
849	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1025	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
850		1026
851	void	1027	void
852	size (CFClient::Layout self)	1028	size (CFPlus::Layout self)
853	PPCODE:	1029	PPCODE:
854	{	1030	{
855	int w, h;	1031	int w, h;
856		1032
857	layout_get_pixel_size (self, &w, &h);	1033	layout_get_pixel_size (self, &w, &h);
…		…
860	PUSHs (sv_2mortal (newSViv (w)));	1036	PUSHs (sv_2mortal (newSViv (w)));
861	PUSHs (sv_2mortal (newSViv (h)));	1037	PUSHs (sv_2mortal (newSViv (h)));
862	}	1038	}
863		1039
864	int	1040	int
		1041	descent (CFPlus::Layout self)
		1042	CODE:
		1043	{
		1044	PangoRectangle rect;
		1045	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1046	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1047	RETVAL = PANGO_DESCENT (rect);
		1048	}
		1049	OUTPUT:
		1050	RETVAL
		1051
		1052	int
865	xy_to_index (CFClient::Layout self, int x, int y)	1053	xy_to_index (CFPlus::Layout self, int x, int y)
866	CODE:	1054	CODE:
867	{	1055	{
868	int index, trailing;	1056	int index, trailing;
869	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1057	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
870	RETVAL = index;	1058	RETVAL = index;
871	}	1059	}
872	OUTPUT:	1060	OUTPUT:
873	RETVAL	1061	RETVAL
874		1062
875	void	1063	void
876	cursor_pos (CFClient::Layout self, int index)	1064	cursor_pos (CFPlus::Layout self, int index)
877	PPCODE:	1065	PPCODE:
878	{	1066	{
879	PangoRectangle strong_pos;	1067	PangoRectangle strong_pos;
880	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1068	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
881		1069
…		…
884	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
885	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
886	}	1074	}
887		1075
888	void	1076	void
889	render (CFClient::Layout self)	1077	render (CFPlus::Layout self, float x, float y, int flags = 0)
890	PPCODE:	1078	PPCODE:
891	{	1079	pango_opengl_render_layout_subpixel (
892	SV *retval;	1080	self->pl,
893	int w, h;	1081	x * PANGO_SCALE, y * PANGO_SCALE,
		1082	self->r, self->g, self->b, self->a,
		1083	flags
		1084	);
894		1085
895	layout_get_pixel_size (self, &w, &h);	1086	MODULE = CFPlus PACKAGE = CFPlus::Texture
896		1087
897	if (self->rgba)	1088	void
		1089	pad2pot (SV data_, SV w_, SV *h_)
		1090	CODE:
		1091	{
		1092	int ow = SvIV (w_);
		1093	int oh = SvIV (h_);
		1094
		1095	if (ow && oh)
898	{	1096	{
899	cairo_surface_t *surface;	1097	int nw = minpot (ow);
900	cairo_t *cairo;	1098	int nh = minpot (oh);
901		1099
902	retval = newSV (w * h * 4);	1100	if (nw != ow \|\| nh != oh)
903	SvPOK_only (retval);
904	SvCUR_set (retval, w * h * 4);
905
906	memset (SvPVX (retval), 0, w * h * 4);
907
908	surface = cairo_image_surface_create_for_data (
909	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
910	cairo = cairo_create (surface);
911	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
912
913	pango_cairo_show_layout (cairo, self->pl);
914
915	cairo_destroy (cairo);
916	cairo_surface_destroy (surface);
917
918	// what a mess, and its premultiplied, too :(
919	{	1101	{
920	uint32_t p = (uint32_t )SvPVX (retval);	1102	if (SvOK (data_))
921	uint32_t e = p + w h;
922
923	while (p < e)
924	{	1103	{
925	uint32_t rgba = *p;	1104	STRLEN datalen;
926	rgba = (rgba >> 24) \| (rgba << 8);	1105	char *data = SvPVbyte (data_, datalen);
927	#if 0	1106	int bpp = datalen / (ow * oh);
928	#ifdef _WIN32	1107	SV result_ = sv_2mortal (newSV (nw nh * bpp));
929	{//D
930	uint8_t r = rgba >> 24;
931	uint8_t g = rgba >> 16;
932	uint8_t b = rgba >> 8;
933	uint8_t a = rgba >> 0;
934		1108
935	rgba = (rgba & 0xffffff00) \| a;	1109	SvPOK_only (result_);
		1110	SvCUR_set (result_, nw * nh * bpp);
		1111
		1112	memset (SvPVX (result_), 0, nw * nh * bpp);
		1113	while (oh--)
		1114	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1115
		1116	sv_setsv (data_, result_);
936	}	1117	}
937	#endif	1118
938	#endif	1119	sv_setiv (w_, nw);
939	rgba = SDL_SwapBE32 (rgba);	1120	sv_setiv (h_, nh);
940	*p++ = rgba;
941	}	1121	}
942	}
943
944	EXTEND (SP, 5);
945	PUSHs (sv_2mortal (newSViv (w)));
946	PUSHs (sv_2mortal (newSViv (h)));
947	PUSHs (sv_2mortal (retval));
948	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
949	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
950	}	1122	}
951	else
952	{
953	FT_Bitmap bitmap;
954
955	retval = newSV (w * h);
956	SvPOK_only (retval);
957	SvCUR_set (retval, w * h);
958
959	bitmap.rows = h;
960	bitmap.width = w;
961	bitmap.pitch = w;
962	bitmap.buffer = (unsigned char*)SvPVX (retval);
963	bitmap.num_grays = 256;
964	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
965
966	memset (bitmap.buffer, 0, w * h);
967
968	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
969
970	EXTEND (SP, 5);
971	PUSHs (sv_2mortal (newSViv (w)));
972	PUSHs (sv_2mortal (newSViv (h)));
973	PUSHs (sv_2mortal (retval));
974	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
975	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
976	}
977	}	1123	}
978		1124
979	MODULE = CFClient PACKAGE = CFClient::Texture
980
981	void	1125	void
982	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1126	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
983	PROTOTYPE: $$$;$$	1127	PROTOTYPE: $$$;$$
984	ALIAS:	1128	ALIAS:
985	draw_quad_alpha = 1	1129	draw_quad_alpha = 1
986	draw_quad_alpha_premultiplied = 2	1130	draw_quad_alpha_premultiplied = 2
987	CODE:	1131	CODE:
988	{	1132	{
989	HV hv = (HV )SvRV (self);	1133	HV hv = (HV )SvRV (self);
990	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1134	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
991	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1135	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
992	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1136	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
993	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
994		1137
995	if (items < 5)	1138	if (items < 5)
996	{	1139	{
997	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1140	w = SvNV (*hv_fetch (hv, "w", 1, 1));
998	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1141	h = SvNV (*hv_fetch (hv, "h", 1, 1));
999	}	1142	}
1000		1143
1001	if (ix)	1144	if (ix)
1002	{	1145	{
1003	glEnable (GL_BLEND);	1146	glEnable (GL_BLEND);
		1147
		1148	if (ix == 2)
1004	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1149	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1150	else
		1151	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1152	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1153
1005	glEnable (GL_ALPHA_TEST);	1154	glEnable (GL_ALPHA_TEST);
1006	glAlphaFunc (GL_GREATER, 0.01f);	1155	glAlphaFunc (GL_GREATER, 0.01f);
1007	}	1156	}
1008		1157
1009	glBindTexture (GL_TEXTURE_2D, name);	1158	glBindTexture (GL_TEXTURE_2D, name);
1010
1011	if (wrap_mode)
1012	{
1013	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1014	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1015	}
1016		1159
1017	glBegin (GL_QUADS);	1160	glBegin (GL_QUADS);
1018	glTexCoord2f (0, 0); glVertex2f (x , y );	1161	glTexCoord2f (0, 0); glVertex2f (x , y );
1019	glTexCoord2f (0, t); glVertex2f (x , y + h);	1162	glTexCoord2f (0, t); glVertex2f (x , y + h);
1020	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1163	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1026	glDisable (GL_ALPHA_TEST);	1169	glDisable (GL_ALPHA_TEST);
1027	glDisable (GL_BLEND);	1170	glDisable (GL_BLEND);
1028	}	1171	}
1029	}	1172	}
1030		1173
1031	MODULE = CFClient PACKAGE = CFClient::Map	1174	MODULE = CFPlus PACKAGE = CFPlus::Map
1032		1175
1033	CFClient::Map	1176	CFPlus::Map
1034	new (SV *class, int map_width, int map_height)	1177	new (SV *class, int map_width, int map_height)
1035	CODE:	1178	CODE:
1036	New (0, RETVAL, 1, struct map);	1179	New (0, RETVAL, 1, struct map);
1037	RETVAL->x = 0;	1180	RETVAL->x = 0;
1038	RETVAL->y = 0;	1181	RETVAL->y = 0;
…		…
1048	RETVAL->row = 0;	1191	RETVAL->row = 0;
1049	OUTPUT:	1192	OUTPUT:
1050	RETVAL	1193	RETVAL
1051		1194
1052	void	1195	void
1053	DESTROY (CFClient::Map self)	1196	DESTROY (CFPlus::Map self)
1054	CODE:	1197	CODE:
1055	{	1198	{
1056	map_clear (self);	1199	map_clear (self);
1057	Safefree (self->face);	1200	Safefree (self->face);
		1201	Safefree (self->tex);
1058	Safefree (self);	1202	Safefree (self);
1059	}	1203	}
1060		1204
1061	void	1205	void
1062	clear (CFClient::Map self)	1206	clear (CFPlus::Map self)
1063	CODE:	1207	CODE:
1064	map_clear (self);	1208	map_clear (self);
1065		1209
1066	void	1210	void
1067	set_face (CFClient::Map self, int face, int texid)	1211	set_face (CFPlus::Map self, int face, int texid)
1068	CODE:	1212	CODE:
1069	{	1213	{
1070	while (self->faces <= face)	1214	while (self->faces <= face)
1071	{	1215	{
1072	Append (mapface, self->face, self->faces, self->faces);	1216	Append (mapface, self->face, self->faces, self->faces);
…		…
1075		1219
1076	self->face [face] = texid;	1220	self->face [face] = texid;
1077	}	1221	}
1078		1222
1079	void	1223	void
1080	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)	1224	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)
1081	CODE:	1225	CODE:
1082	{	1226	{
1083	while (self->texs <= texid)	1227	while (self->texs <= texid)
1084	{	1228	{
1085	Append (maptex, self->tex, self->texs, self->texs);	1229	Append (maptex, self->tex, self->texs, self->texs);
…		…
1101	}	1245	}
1102		1246
1103	// somewhat hackish, but for textures that require it, it really	1247	// somewhat hackish, but for textures that require it, it really
1104	// improves the look, and most others don't suffer.	1248	// improves the look, and most others don't suffer.
1105	glBindTexture (GL_TEXTURE_2D, name);	1249	glBindTexture (GL_TEXTURE_2D, name);
1106	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);	1250	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
1107	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);	1251	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1252	// use uglier nearest interpolation because linear suffers
		1253	// from transparent color bleeding and ugly wrapping effects.
		1254	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1108	}	1255	}
1109		1256
1110	int	1257	int
1111	ox (CFClient::Map self)	1258	ox (CFPlus::Map self)
1112	ALIAS:	1259	ALIAS:
1113	oy = 1	1260	oy = 1
		1261	x = 2
		1262	y = 3
		1263	w = 4
		1264	h = 5
1114	CODE:	1265	CODE:
1115	switch (ix)	1266	switch (ix)
1116	{	1267	{
1117	case 0: RETVAL = self->ox; break;	1268	case 0: RETVAL = self->ox; break;
1118	case 1: RETVAL = self->oy; break;	1269	case 1: RETVAL = self->oy; break;
		1270	case 2: RETVAL = self->x; break;
		1271	case 3: RETVAL = self->y; break;
		1272	case 4: RETVAL = self->w; break;
		1273	case 5: RETVAL = self->h; break;
1119	}	1274	}
1120	OUTPUT:	1275	OUTPUT:
1121	RETVAL	1276	RETVAL
1122		1277
1123	void	1278	void
1124	scroll (CFClient::Map self, int dx, int dy)	1279	scroll (CFPlus::Map self, int dx, int dy)
1125	CODE:	1280	CODE:
1126	{	1281	{
1127	if (dx > 0)	1282	if (dx > 0)
1128	map_blank (self, self->x, self->y, dx - 1, self->h);	1283	map_blank (self, self->x, self->y, dx, self->h);
1129	else if (dx < 0)	1284	else if (dx < 0)
1130	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1285	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1131		1286
1132	if (dy > 0)	1287	if (dy > 0)
1133	map_blank (self, self->x, self->y, self->w, dy - 1);	1288	map_blank (self, self->x, self->y, self->w, dy);
1134	else if (dy < 0)	1289	else if (dy < 0)
1135	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1290	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1136		1291
1137	self->ox += dx; self->x += dx;	1292	self->ox += dx; self->x += dx;
1138	self->oy += dy; self->y += dy;	1293	self->oy += dy; self->y += dy;
1139		1294
1140	while (self->y < 0)	1295	while (self->y < 0)
…		…
1145	self->y += MAP_EXTEND_Y;	1300	self->y += MAP_EXTEND_Y;
1146	}	1301	}
1147	}	1302	}
1148		1303
1149	void	1304	void
1150	map1a_update (CFClient::Map self, SV *data_)	1305	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1151	CODE:	1306	CODE:
1152	{	1307	{
1153	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1308	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1154	uint8_t data_end = (uint8_t )SvEND (data_);	1309	uint8_t data_end = (uint8_t )SvEND (data_);
1155	mapcell *cell;	1310	mapcell *cell;
1156	int x, y, flags;	1311	int x, y, flags;
1157		1312
1158	while (data < data_end)	1313	while (data < data_end - 1)
1159	{	1314	{
1160	flags = (data [0] << 8) + data [1]; data += 2;	1315	flags = (data [0] << 8) + data [1]; data += 2;
1161		1316
1162	x = ((flags >> 10) & 63) + self->x;	1317	x = self->x + ((flags >> 10) & 63);
1163	y = ((flags >> 4) & 63) + self->y;	1318	y = self->y + ((flags >> 4) & 63);
1164		1319
1165	cell = map_get_cell (self, x, y);	1320	cell = map_get_cell (self, x, y);
1166		1321
1167	if (flags & 15)	1322	if (flags & 15)
1168	{	1323	{
1169	if (cell->darkness < 0)	1324	if (!cell->darkness)
1170	{	1325	{
		1326	memset (cell, 0, sizeof (*cell));
1171	cell->darkness = 0;	1327	cell->darkness = 256;
1172	cell->face [0] = 0;
1173	cell->face [1] = 0;
1174	cell->face [2] = 0;
1175	}	1328	}
1176		1329
1177	cell->darkness = flags & 8 ? *data++ : 255;
1178
1179	//TODO: don't trust server data to be in-range(!)	1330	//TODO: don't trust server data to be in-range(!)
		1331
		1332	if (flags & 8)
		1333	{
		1334	if (extmap)
		1335	{
		1336	uint8_t ext, cmd;
		1337
		1338	do
		1339	{
		1340	ext = *data++;
		1341	cmd = ext & 0x3f;
		1342
		1343	if (cmd < 4)
		1344	cell->darkness = 255 - ext * 64 + 1;
		1345	else if (cmd == 5) // health
		1346	{
		1347	cell->stat_width = 1;
		1348	cell->stat_hp = *data++;
		1349	}
		1350	else if (cmd == 6) // monster width
		1351	cell->stat_width = *data++ + 1;
		1352	else if (cmd == 0x47) // monster width
		1353	{
		1354	if (*data == 4)
		1355	; // decode player tag
		1356
		1357	data += *data + 1;
		1358	}
		1359	else if (cmd == 8) // cell flags
		1360	cell->flags = *data++;
		1361	else if (ext & 0x40) // unknown, multibyte => skip
		1362	data += *data + 1;
		1363	else
		1364	data++;
		1365	}
		1366	while (ext & 0x80);
		1367	}
		1368	else
		1369	cell->darkness = *data++ + 1;
		1370	}
1180		1371
1181	if (flags & 4)	1372	if (flags & 4)
1182	{	1373	{
1183	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1374	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1184	}	1375	}
…		…
1192	{	1383	{
1193	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1384	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1194	}	1385	}
1195	}	1386	}
1196	else	1387	else
1197	cell->darkness = -1;	1388	cell->darkness = 0;
1198	}	1389	}
1199	}	1390	}
1200		1391
1201	SV *	1392	SV *
1202	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1393	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1203	CODE:	1394	CODE:
1204	{	1395	{
1205	int x1, x;	1396	int x1, x;
1206	int y1, y;	1397	int y1, y;
1207	int z;	1398	int z;
…		…
1257	}	1448	}
1258	OUTPUT:	1449	OUTPUT:
1259	RETVAL	1450	RETVAL
1260		1451
1261	void	1452	void
1262	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1453	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1263	PPCODE:	1454	CODE:
1264	{	1455	{
1265	int vx, vy;	1456	int vx, vy;
1266	int x, y, z;	1457	int x, y, z;
1267	int last_name;	1458	int last_name;
1268	mapface face;	1459	mapface face;
1269	int sw4 = (sw + 3) & ~3;
1270	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1271	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1272		1460
1273	memset (darkness, 255, sw4 * sh);
1274	SvPOK_only (darkness_sv);
1275	SvCUR_set (darkness_sv, sw4 * sh);
1276
1277	vx = self->x + (self->w - sw) / 2 - shift_x;	1461	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1278	vy = self->y + (self->h - sh) / 2 - shift_y;	1462	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1279		1463
1280	/*	1464	/*
1281	int vx = self->vx = self->w >= sw	1465	int vx = self->vx = self->w >= sw
1282	? self->x + (self->w - sw) / 2	1466	? self->x + (self->w - sw) / 2
1283	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1467	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1287	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1471	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1288	*/	1472	*/
1289		1473
1290	glColor4ub (255, 255, 255, 255);	1474	glColor4ub (255, 255, 255, 255);
1291		1475
		1476	glEnable (GL_BLEND);
1292	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1477	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1293	glEnable (GL_BLEND);
1294	glEnable (GL_TEXTURE_2D);	1478	glEnable (GL_TEXTURE_2D);
1295	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1479	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1296		1480
1297	glBegin (GL_QUADS);	1481	glBegin (GL_QUADS);
1298		1482
…		…
1307	for (x = 0; x < sw; x++)	1491	for (x = 0; x < sw; x++)
1308	if (row->c0 <= x + vx && x + vx < row->c1)	1492	if (row->c0 <= x + vx && x + vx < row->c1)
1309	{	1493	{
1310	mapcell *cell = row->col + (x + vx - row->c0);	1494	mapcell *cell = row->col + (x + vx - row->c0);
1311		1495
1312	darkness[y * sw4 + x] = cell->darkness < 0
1313	? 255 - FOW_DARKNESS
1314	: 255 - cell->darkness;
1315
1316	face = cell->face [z];	1496	face = cell->face [z];
1317		1497
1318	if (face)	1498	if (face && face < self->texs)
1319	{	1499	{
1320	maptex tex = self->tex [face];	1500	maptex tex = self->tex [face];
1321
1322	int px = (x + 1) * 32 - tex.w;	1501	int px = (x + 1) * 32 - tex.w;
1323	int py = (y + 1) * 32 - tex.h;	1502	int py = (y + 1) * 32 - tex.h;
1324		1503
1325	if (last_name != tex.name)	1504	if (last_name != tex.name)
1326	{	1505	{
1327	glEnd ();	1506	glEnd ();
1328	last_name = tex.name;
1329	glBindTexture (GL_TEXTURE_2D, last_name);	1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1330	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1331	}	1509	}
1332		1510
1333	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1334	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1335	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1513	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1336	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1337	}	1515	}
		1516
		1517	if (cell->flags && z == 2)
		1518	{
		1519	if (cell->flags & 1)
		1520	{
		1521	maptex tex = self->tex [1];
		1522	int px = (x + 1) * 32 - tex.w + 2;
		1523	int py = (y + 1) * 32 - tex.h - 6;
		1524
		1525	glEnd ();
		1526	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1527	glBegin (GL_QUADS);
		1528
		1529	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1530	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1531	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1532	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1533	}
		1534	}
1338	}	1535	}
1339	}	1536	}
1340		1537
1341	glEnd ();	1538	glEnd ();
1342		1539
1343	glDisable (GL_TEXTURE_2D);	1540	glDisable (GL_TEXTURE_2D);
1344	glDisable (GL_BLEND);	1541	glDisable (GL_BLEND);
		1542
		1543	// top layer: overlays such as the health bar
		1544	for (y = 0; y < sh; y++)
		1545	if (0 <= y + vy && y + vy < self->rows)
		1546	{
		1547	maprow *row = self->row + (y + vy);
		1548
		1549	for (x = 0; x < sw; x++)
		1550	if (row->c0 <= x + vx && x + vx < row->c1)
		1551	{
		1552	mapcell *cell = row->col + (x + vx - row->c0);
		1553
		1554	int px = x * 32;
		1555	int py = y * 32;
		1556
		1557	if (cell->stat_hp)
		1558	{
		1559	int width = cell->stat_width * 32;
		1560	int thick = sh / 28 + 1 + cell->stat_width;
		1561
		1562	glColor3ub (0, 0, 0);
		1563	glRectf (px + 1, py - thick - 2,
		1564	px + width - 1, py);
		1565
		1566	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1567	glRectf (px + 2,
		1568	py - thick - 1,
		1569	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1570	}
		1571	}
		1572	}
		1573	}
		1574
		1575	void
		1576	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1577	CODE:
		1578	{
		1579	static float color[16][3] = {
		1580	{ 0.00F, 0.00F, 0.00F },
		1581	{ 1.00F, 1.00F, 1.00F },
		1582	{ 0.00F, 0.00F, 0.55F },
		1583	{ 1.00F, 0.00F, 0.00F },
		1584
		1585	{ 1.00F, 0.54F, 0.00F },
		1586	{ 0.11F, 0.56F, 1.00F },
		1587	{ 0.93F, 0.46F, 0.00F },
		1588	{ 0.18F, 0.54F, 0.34F },
		1589
		1590	{ 0.56F, 0.73F, 0.56F },
		1591	{ 0.80F, 0.80F, 0.80F },
		1592	{ 0.55F, 0.41F, 0.13F },
		1593	{ 0.99F, 0.77F, 0.26F },
		1594
		1595	{ 0.74F, 0.65F, 0.41F },
		1596
		1597	{ 0.00F, 1.00F, 1.00F },
		1598	{ 1.00F, 0.00F, 1.00F },
		1599	{ 1.00F, 1.00F, 0.00F },
		1600	};
		1601
		1602	int x, y;
		1603
		1604	glEnable (GL_TEXTURE_2D);
		1605	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1606	glEnable (GL_BLEND);
		1607	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1608	glBegin (GL_QUADS);
		1609
		1610	for (y = 0; y < h; y++)
		1611	for (x = 0; x < w; x++)
		1612	{
		1613	unsigned char m = data [x + y * w];
		1614
		1615	if (m)
		1616	{
		1617	float *c = color [m & 15];
		1618
		1619	float tx1 = m & 0x40 ? 0.5 : 0.;
		1620	float tx2 = tx1 + 0.5;
		1621
		1622	glColor4f (c[0], c[1], c[2], 0.75);
		1623	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1624	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1625	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1626	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1627	}
		1628	}
		1629
		1630	glEnd ();
		1631	glDisable (GL_BLEND);
		1632	glDisable (GL_TEXTURE_2D);
		1633	}
		1634
		1635	void
		1636	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1637	PPCODE:
		1638	{
		1639	int vx, vy;
		1640	int x, y;
		1641	int sw4 = (sw + 3) & ~3;
		1642	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1643	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1644
		1645	memset (darkness, 255, sw4 * sh);
		1646	SvPOK_only (darkness_sv);
		1647	SvCUR_set (darkness_sv, sw4 * sh);
		1648
		1649	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1650	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1651
		1652	for (y = 0; y < sh; y++)
		1653	if (0 <= y + vy && y + vy < self->rows)
		1654	{
		1655	maprow *row = self->row + (y + vy);
		1656
		1657	for (x = 0; x < sw; x++)
		1658	if (row->c0 <= x + vx && x + vx < row->c1)
		1659	{
		1660	mapcell *cell = row->col + (x + vx - row->c0);
		1661
		1662	darkness[y * sw4 + x] = cell->darkness
		1663	? 255 - (cell->darkness - 1)
		1664	: 255 - FOW_DARKNESS;
		1665	}
		1666	}
1345		1667
1346	EXTEND (SP, 3);	1668	EXTEND (SP, 3);
1347	PUSHs (sv_2mortal (newSViv (sw4)));	1669	PUSHs (sv_2mortal (newSViv (sw4)));
1348	PUSHs (sv_2mortal (newSViv (sh)));	1670	PUSHs (sv_2mortal (newSViv (sh)));
1349	PUSHs (darkness_sv);	1671	PUSHs (darkness_sv);
1350	}	1672	}
1351		1673
1352	SV *	1674	SV *
1353	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1675	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1354	CODE:	1676	CODE:
1355	{	1677	{
1356	int x, y, x1, y1;	1678	int x, y, x1, y1;
1357	SV data_sv = newSV (w h * 7 + 5);	1679	SV data_sv = newSV (w h * 7 + 5);
1358	uint8_t data = (uint8_t )SvPVX (data_sv);	1680	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1420	}	1742	}
1421	OUTPUT:	1743	OUTPUT:
1422	RETVAL	1744	RETVAL
1423		1745
1424	void	1746	void
1425	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1747	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1426	PPCODE:	1748	PPCODE:
1427	{	1749	{
1428	int x, y, z;	1750	int x, y, z;
1429	int w, h;	1751	int w, h;
1430	int x1, y1;	1752	int x1, y1;
…		…
1462		1784
1463	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1785	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1464	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1786	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1465	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1787	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1466		1788
1467	if (cell->darkness <= 0)	1789	if (cell->darkness == 0)
1468	{	1790	{
1469	cell->darkness = -1;	1791	cell->darkness = 0;
1470		1792
1471	for (z = 0; z <= 2; z++)	1793	for (z = 0; z <= 2; z++)
1472	{	1794	{
1473	cell->face[z] = face[z];	1795	cell->face[z] = face[z];
1474		1796
…		…
1479	}	1801	}
1480	}	1802	}
1481	}	1803	}
1482	}	1804	}
1483		1805
1484	MODULE = CFClient PACKAGE = CFClient::MixChunk	1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1485		1807
1486	CFClient::MixChunk	1808	CFPlus::MixChunk
1487	new_from_file (SV class, char path)	1809	new_from_file (SV class, char path)
1488	CODE:	1810	CODE:
1489	RETVAL = Mix_LoadWAV (path);	1811	RETVAL = Mix_LoadWAV (path);
1490	OUTPUT:	1812	OUTPUT:
1491	RETVAL	1813	RETVAL
1492		1814
1493	void	1815	void
1494	DESTROY (CFClient::MixChunk self)	1816	DESTROY (CFPlus::MixChunk self)
1495	CODE:	1817	CODE:
1496	Mix_FreeChunk (self);	1818	Mix_FreeChunk (self);
1497		1819
1498	int	1820	int
1499	volume (CFClient::MixChunk self, int volume = -1)	1821	volume (CFPlus::MixChunk self, int volume = -1)
1500	CODE:	1822	CODE:
1501	RETVAL = Mix_VolumeChunk (self, volume);	1823	RETVAL = Mix_VolumeChunk (self, volume);
1502	OUTPUT:	1824	OUTPUT:
1503	RETVAL	1825	RETVAL
1504		1826
1505	int	1827	int
1506	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1828	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1507	CODE:	1829	CODE:
1508	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1509	OUTPUT:	1831	OUTPUT:
1510	RETVAL	1832	RETVAL
1511		1833
1512	MODULE = CFClient PACKAGE = CFClient::MixMusic	1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1513		1835
1514	int	1836	int
1515	volume (int volume = -1)	1837	volume (int volume = -1)
1516	CODE:	1838	CODE:
1517	RETVAL = Mix_VolumeMusic (volume);	1839	RETVAL = Mix_VolumeMusic (volume);
1518	OUTPUT:	1840	OUTPUT:
1519	RETVAL	1841	RETVAL
1520		1842
1521	CFClient::MixMusic	1843	CFPlus::MixMusic
1522	new_from_file (SV class, char path)	1844	new_from_file (SV class, char path)
1523	CODE:	1845	CODE:
1524	RETVAL = Mix_LoadMUS (path);	1846	RETVAL = Mix_LoadMUS (path);
1525	OUTPUT:	1847	OUTPUT:
1526	RETVAL	1848	RETVAL
1527		1849
1528	void	1850	void
1529	DESTROY (CFClient::MixMusic self)	1851	DESTROY (CFPlus::MixMusic self)
1530	CODE:	1852	CODE:
1531	Mix_FreeMusic (self);	1853	Mix_FreeMusic (self);
1532		1854
1533	int	1855	int
1534	play (CFClient::MixMusic self, int loops = -1)	1856	play (CFPlus::MixMusic self, int loops = -1)
1535	CODE:	1857	CODE:
1536	RETVAL = Mix_PlayMusic (self, loops);	1858	RETVAL = Mix_PlayMusic (self, loops);
1537	OUTPUT:	1859	OUTPUT:
1538	RETVAL	1860	RETVAL
1539		1861
1540	MODULE = CFClient PACKAGE = CFClient::OpenGL	1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1541		1863
1542	BOOT:	1864	BOOT:
1543	{	1865	{
1544	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1545	static const struct {	1867	static const struct {
1546	const char *name;	1868	const char *name;
1547	IV iv;	1869	IV iv;
1548	} *civ, const_iv[] = {	1870	} *civ, const_iv[] = {
1549	# define const_iv(name) { # name, (IV)name }	1871	# define const_iv(name) { # name, (IV)name }
…		…
1556	const_iv (GL_SCISSOR_TEST),	1878	const_iv (GL_SCISSOR_TEST),
1557	const_iv (GL_DEPTH_TEST),	1879	const_iv (GL_DEPTH_TEST),
1558	const_iv (GL_ALPHA_TEST),	1880	const_iv (GL_ALPHA_TEST),
1559	const_iv (GL_NORMALIZE),	1881	const_iv (GL_NORMALIZE),
1560	const_iv (GL_RESCALE_NORMAL),	1882	const_iv (GL_RESCALE_NORMAL),
		1883	const_iv (GL_FRONT),
		1884	const_iv (GL_BACK),
1561	const_iv (GL_AND),	1885	const_iv (GL_AND),
1562	const_iv (GL_ONE),	1886	const_iv (GL_ONE),
1563	const_iv (GL_ZERO),	1887	const_iv (GL_ZERO),
1564	const_iv (GL_SRC_ALPHA),	1888	const_iv (GL_SRC_ALPHA),
1565	const_iv (GL_SRC_ALPHA_SATURATE),	1889	const_iv (GL_DST_ALPHA),
1566	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1890	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1567	const_iv (GL_ONE_MINUS_DST_ALPHA),	1891	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1892	const_iv (GL_SRC_ALPHA_SATURATE),
1568	const_iv (GL_RGB),	1893	const_iv (GL_RGB),
1569	const_iv (GL_RGBA),	1894	const_iv (GL_RGBA),
		1895	const_iv (GL_RGBA4),
		1896	const_iv (GL_RGBA8),
		1897	const_iv (GL_RGB5_A1),
1570	const_iv (GL_UNSIGNED_BYTE),	1898	const_iv (GL_UNSIGNED_BYTE),
1571	const_iv (GL_UNSIGNED_SHORT),	1899	const_iv (GL_UNSIGNED_SHORT),
1572	const_iv (GL_UNSIGNED_INT),	1900	const_iv (GL_UNSIGNED_INT),
1573	const_iv (GL_ALPHA),	1901	const_iv (GL_ALPHA),
1574	const_iv (GL_INTENSITY),	1902	const_iv (GL_INTENSITY),
…		…
1583	const_iv (GL_TEXTURE_MAG_FILTER),	1911	const_iv (GL_TEXTURE_MAG_FILTER),
1584	const_iv (GL_TEXTURE_MIN_FILTER),	1912	const_iv (GL_TEXTURE_MIN_FILTER),
1585	const_iv (GL_TEXTURE_ENV_MODE),	1913	const_iv (GL_TEXTURE_ENV_MODE),
1586	const_iv (GL_TEXTURE_WRAP_S),	1914	const_iv (GL_TEXTURE_WRAP_S),
1587	const_iv (GL_TEXTURE_WRAP_T),	1915	const_iv (GL_TEXTURE_WRAP_T),
		1916	const_iv (GL_REPEAT),
1588	const_iv (GL_CLAMP),	1917	const_iv (GL_CLAMP),
1589	const_iv (GL_REPEAT),	1918	const_iv (GL_CLAMP_TO_EDGE),
1590	const_iv (GL_NEAREST),	1919	const_iv (GL_NEAREST),
1591	const_iv (GL_LINEAR),	1920	const_iv (GL_LINEAR),
1592	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1921	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1593	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1922	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1594	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1923	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1605	const_iv (GL_SEPARABLE_2D),	1934	const_iv (GL_SEPARABLE_2D),
1606	const_iv (GL_CONVOLUTION_2D),	1935	const_iv (GL_CONVOLUTION_2D),
1607	const_iv (GL_CONVOLUTION_BORDER_MODE),	1936	const_iv (GL_CONVOLUTION_BORDER_MODE),
1608	const_iv (GL_CONSTANT_BORDER),	1937	const_iv (GL_CONSTANT_BORDER),
1609	const_iv (GL_LINES),	1938	const_iv (GL_LINES),
		1939	const_iv (GL_LINE_STRIP),
1610	const_iv (GL_LINE_LOOP),	1940	const_iv (GL_LINE_LOOP),
1611	const_iv (GL_QUADS),	1941	const_iv (GL_QUADS),
1612	const_iv (GL_QUAD_STRIP),	1942	const_iv (GL_QUAD_STRIP),
1613	const_iv (GL_TRIANGLES),	1943	const_iv (GL_TRIANGLES),
1614	const_iv (GL_TRIANGLE_STRIP),	1944	const_iv (GL_TRIANGLE_STRIP),
…		…
1624		1954
1625	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1955	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1626	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1956	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1627	}	1957	}
1628		1958
		1959	char *
		1960	gl_vendor ()
		1961	CODE:
		1962	RETVAL = (char *)glGetString (GL_VENDOR);
		1963	OUTPUT:
		1964	RETVAL
		1965
		1966	char *
		1967	gl_version ()
		1968	CODE:
		1969	RETVAL = (char *)glGetString (GL_VERSION);
		1970	OUTPUT:
		1971	RETVAL
		1972
		1973	char *
		1974	gl_extensions ()
		1975	CODE:
		1976	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1977	OUTPUT:
		1978	RETVAL
		1979
1629	int glGetError ()	1980	int glGetError ()
		1981
		1982	void glFinish ()
1630		1983
1631	void glClear (int mask)	1984	void glClear (int mask)
1632		1985
1633	void glClearColor (float r, float g, float b, float a = 1.0)	1986	void glClearColor (float r, float g, float b, float a = 1.0)
1634	PROTOTYPE: @	1987	PROTOTYPE: @
…		…
1641		1994
1642	void glHint (int target, int mode)	1995	void glHint (int target, int mode)
1643		1996
1644	void glBlendFunc (int sfactor, int dfactor)	1997	void glBlendFunc (int sfactor, int dfactor)
1645		1998
		1999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2000	CODE:
		2001	gl_BlendFuncSeparate (sa, da, saa, daa);
		2002
1646	void glDepthMask (int flag)	2003	void glDepthMask (int flag)
1647		2004
1648	void glLogicOp (int opcode)	2005	void glLogicOp (int opcode)
1649		2006
1650	void glColorMask (int red, int green, int blue, int alpha)	2007	void glColorMask (int red, int green, int blue, int alpha)
…		…
1654	void glPushMatrix ()	2011	void glPushMatrix ()
1655		2012
1656	void glPopMatrix ()	2013	void glPopMatrix ()
1657		2014
1658	void glLoadIdentity ()	2015	void glLoadIdentity ()
		2016
		2017	void glDrawBuffer (int buffer)
		2018
		2019	void glReadBuffer (int buffer)
1659		2020
1660	# near_ and far_ are due to microsofts buggy "c" compiler	2021	# near_ and far_ are due to microsofts buggy "c" compiler
1661	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	2022	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1662		2023
1663	# near_ and far_ are due to microsofts buggy "c" compiler	2024	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1683		2044
1684	void glEnd ()	2045	void glEnd ()
1685		2046
1686	void glColor (float r, float g, float b, float a = 1.0)	2047	void glColor (float r, float g, float b, float a = 1.0)
1687	PROTOTYPE: @	2048	PROTOTYPE: @
		2049	ALIAS:
		2050	glColor_premultiply = 1
1688	CODE:	2051	CODE:
		2052	if (ix)
		2053	{
		2054	r *= a;
		2055	g *= a;
		2056	b *= a;
		2057	}
1689	// microsoft visual "c" rounds instead of truncating...	2058	// microsoft visual "c" rounds instead of truncating...
1690	glColor4ub (MIN ((int)(r * 255.f), 255),	2059	glColor4f (r, g, b, a);
1691	MIN ((int)(g * 255.f), 255),
1692	MIN ((int)(b * 255.f), 255),
1693	MIN ((int)(a * 255.f), 255));
1694		2060
1695	void glInterleavedArrays (int format, int stride, char *data)	2061	void glInterleavedArrays (int format, int stride, char *data)
1696		2062
1697	void glDrawElements (int mode, int count, int type, char *indices)	2063	void glDrawElements (int mode, int count, int type, char *indices)
1698		2064
…		…
1721		2087
1722	void glBindTexture (int target, int name)	2088	void glBindTexture (int target, int name)
1723		2089
1724	void glConvolutionParameter (int target, int pname, float params)	2090	void glConvolutionParameter (int target, int pname, float params)
1725	CODE:	2091	CODE:
1726	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2092	if (gl.ConvolutionParameterf)
		2093	gl.ConvolutionParameterf (target, pname, params);
1727		2094
1728	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2095	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1729	CODE:	2096	CODE:
1730	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2097	if (gl.ConvolutionFilter2D)
1731	(target, internalformat, width, height, format, type, data));	2098	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1732		2099
1733	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2100	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1734	CODE:	2101	CODE:
1735	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2102	if (gl.SeparableFilter2D)
1736	(target, internalformat, width, height, format, type, row, column));	2103	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1737		2104
1738	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2105	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1739		2106
1740	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2107	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1741		2108
…		…
1774		2141
1775	void glEndList ()	2142	void glEndList ()
1776		2143
1777	void glCallList (int list)	2144	void glCallList (int list)
1778		2145
1779

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs. Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.96 by root, Wed May 24 22:28:43 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC