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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.162 by root, Fri Oct 13 19:23:08 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.162 by root, Fri Oct 13 19:23:08 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.162 by root, Fri Oct 13 19:23:08 2006 UTC