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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.86 by root, Fri May 19 16:43:56 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
…		…
441	SDL_Rect **m;	519	SDL_Rect **m;
442		520
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
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, 16);	524	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		525
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 64);	526	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	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);
…		…
470		552
471	++m;	553	++m;
472	}	554	}
473	}	555	}
474		556
		557	char *
		558	SDL_GetError ()
		559
475	int	560	int
476	SDL_SetVideoMode (int w, int h, int fullscreen)	561	SDL_SetVideoMode (int w, int h, int fullscreen)
477	CODE:	562	CODE:
478	RETVAL = !!SDL_SetVideoMode (	563	RETVAL = !!SDL_SetVideoMode (
479	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	564	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
480	);	565	);
		566	if (RETVAL)
		567	{
481	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	}
482	OUTPUT:	573	OUTPUT:
483	RETVAL	574	RETVAL
484		575
485	void	576	void
486	SDL_GL_SwapBuffers ()	577	SDL_GL_SwapBuffers ()
		578
		579	char *
		580	SDL_GetKeyName (int sym)
487		581
488	void	582	void
489	SDL_PollEvent ()	583	SDL_PollEvent ()
490	PPCODE:	584	PPCODE:
491	{	585	{
…		…
510	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	604	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
511	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
512	break;	606	break;
513		607
514	case SDL_MOUSEMOTION:	608	case SDL_MOUSEMOTION:
		609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		610
515	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	611	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
516	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	612	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
517	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	613	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
518	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	614	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
519	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	615	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
520	break;	616	break;
521		617
522	case SDL_MOUSEBUTTONDOWN:	618	case SDL_MOUSEBUTTONDOWN:
523	case SDL_MOUSEBUTTONUP:	619	case SDL_MOUSEBUTTONUP:
		620	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		621
524	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	622	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
525	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	623	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
526	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	624	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
527	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	625	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
528	break;	626	break;
…		…
532	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	630	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
533	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	631	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
534	break;	632	break;
535	}	633	}
536		634
537	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
538	}	636	}
539	}	637	}
540		638
541	int	639	int
542	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)
…		…
555	CODE:	653	CODE:
556	#ifndef _WIN32	654	#ifndef _WIN32
557	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
558	#endif	656	#endif
559		657
560	char *	658	void
561	gl_version ()	659	win32_proxy_info ()
562	CODE:	660	PPCODE:
563	RETVAL = (char *)glGetString (GL_VERSION);	661	{
564	OUTPUT:	662	#ifdef _WIN32
565	RETVAL	663	char buffer[2048];
		664	DWORD buflen;
566		665
567	char *	666	EXTEND (SP, 3);
568	gl_extensions ()	667
569	CODE:	668	buflen = sizeof (buffer);
570	RETVAL = (char *)glGetString (GL_EXTENSIONS);	669	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
571	OUTPUT:	670	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
572	RETVAL	671	{
		672	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		673
		674	buflen = sizeof (buffer);
		675	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		676	{
		677	PUSHs (newSVpv (buffer, 0));
		678
		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	}
573		686
574	void	687	void
575	add_font (char *file)	688	add_font (char *file)
576	CODE:	689	CODE:
577	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	690	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
578	#ifdef _WIN32
579	// cairo... sigh... requires win2000
580	AddFontResourceEx (file, FR_PRIVATE, 0);
581	#endif
582		691
583	void	692	void
584	load_image_inline (SV *image_)	693	load_image_inline (SV *image_)
585	ALIAS:	694	ALIAS:
586	load_image_file = 1	695	load_image_file = 1
…		…
628		737
629	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	738	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
630		739
631	assert (surface2->pitch == surface2->w * 4);	740	assert (surface2->pitch == surface2->w * 4);
632		741
		742	SDL_LockSurface (surface2);
633	EXTEND (SP, 5);	743	EXTEND (SP, 6);
634	PUSHs (sv_2mortal (newSViv (surface2->w)));	744	PUSHs (sv_2mortal (newSViv (surface2->w)));
635	PUSHs (sv_2mortal (newSViv (surface2->h)));	745	PUSHs (sv_2mortal (newSViv (surface2->h)));
636	SDL_LockSurface (surface2);
637	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	746	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)));	747	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
640	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	748	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
641	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	749	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		750	SDL_UnlockSurface (surface2);
642		751
643	SDL_FreeSurface (surface);	752	SDL_FreeSurface (surface);
644	SDL_FreeSurface (surface2);	753	SDL_FreeSurface (surface2);
645	}	754	}
646		755
…		…
682	CODE:	791	CODE:
683	fprintf (stderr, "FATAL: %s\n", message);	792	fprintf (stderr, "FATAL: %s\n", message);
684	#ifdef _WIN32	793	#ifdef _WIN32
685	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	794	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
686	#endif	795	#endif
687	exit (1);	796	_exit (1);
688		797
		798	void
		799	_exit (int retval = 0)
		800	CODE:
		801	_exit (retval);
		802
689	MODULE = CFClient PACKAGE = CFClient::Font	803	MODULE = CFPlus PACKAGE = CFPlus::Font
690		804
691	CFClient::Font	805	CFPlus::Font
692	new_from_file (SV class, char path, int id = 0)	806	new_from_file (SV class, char path, int id = 0)
693	CODE:	807	CODE:
694	{	808	{
695	int count;	809	int count;
696	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	810	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
699	}	813	}
700	OUTPUT:	814	OUTPUT:
701	RETVAL	815	RETVAL
702		816
703	void	817	void
704	DESTROY (CFClient::Font self)	818	DESTROY (CFPlus::Font self)
705	CODE:	819	CODE:
706	pango_font_description_free (self);	820	pango_font_description_free (self);
707		821
708	void	822	void
709	make_default (CFClient::Font self)	823	make_default (CFPlus::Font self)
710	CODE:	824	CODE:
711	default_font = self;	825	default_font = self;
712		826
713	MODULE = CFClient PACKAGE = CFClient::Layout	827	MODULE = CFPlus PACKAGE = CFPlus::Layout
714		828
715	CFClient::Layout	829	void
716	new (SV *class, int rgba = 0)	830	reset_glyph_cache ()
		831	CODE:
		832	tc_clear ();
		833
		834	CFPlus::Layout
		835	new (SV *class)
717	CODE:	836	CODE:
718	New (0, RETVAL, 1, struct cf_layout);	837	New (0, RETVAL, 1, struct cf_layout);
719		838
720	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	839	RETVAL->pl = pango_layout_new (opengl_context);
721	RETVAL->rgba = rgba;
722	RETVAL->r = 1.;	840	RETVAL->r = 1.;
723	RETVAL->g = 1.;	841	RETVAL->g = 1.;
724	RETVAL->b = 1.;	842	RETVAL->b = 1.;
725	RETVAL->a = 1.;	843	RETVAL->a = 1.;
726	RETVAL->base_height = MIN_FONT_HEIGHT;	844	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
730	layout_update_font (RETVAL);	848	layout_update_font (RETVAL);
731	OUTPUT:	849	OUTPUT:
732	RETVAL	850	RETVAL
733		851
734	void	852	void
735	DESTROY (CFClient::Layout self)	853	DESTROY (CFPlus::Layout self)
736	CODE:	854	CODE:
737	g_object_unref (self->pl);	855	g_object_unref (self->pl);
738	Safefree (self);	856	Safefree (self);
739		857
740	int
741	is_rgba (CFClient::Layout self)
742	CODE:
743	RETVAL = self->rgba;
744	OUTPUT:
745	RETVAL
746
747	void	858	void
748	set_text (CFClient::Layout self, SV *text_)	859	set_text (CFPlus::Layout self, SV *text_)
749	CODE:	860	CODE:
750	{	861	{
751	STRLEN textlen;	862	STRLEN textlen;
752	char *text = SvPVutf8 (text_, textlen);	863	char *text = SvPVutf8 (text_, textlen);
753		864
754	pango_layout_set_text (self->pl, text, textlen);	865	pango_layout_set_text (self->pl, text, textlen);
755	}	866	}
756		867
757	void	868	void
758	set_markup (CFClient::Layout self, SV *text_)	869	set_markup (CFPlus::Layout self, SV *text_)
759	CODE:	870	CODE:
760	{	871	{
761	STRLEN textlen;	872	STRLEN textlen;
762	char *text = SvPVutf8 (text_, textlen);	873	char *text = SvPVutf8 (text_, textlen);
763		874
764	pango_layout_set_markup (self->pl, text, textlen);	875	pango_layout_set_markup (self->pl, text, textlen);
765	}	876	}
766		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
767	SV *	963	SV *
768	get_text (CFClient::Layout self)	964	get_text (CFPlus::Layout self)
769	CODE:	965	CODE:
770	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	966	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
771	SvUTF8_on (RETVAL);	967	sv_utf8_decode (RETVAL);
772	OUTPUT:	968	OUTPUT:
773	RETVAL	969	RETVAL
774		970
775	void	971	void
776	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.)
777	CODE:	973	CODE:
778	self->r = r;	974	self->r = r;
779	self->g = g;	975	self->g = g;
780	self->b = b;	976	self->b = b;
781	self->a = a;	977	self->a = a;
782		978
783	void	979	void
784	set_font (CFClient::Layout self, CFClient::Font font = 0)	980	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
785	CODE:	981	CODE:
786	if (self->font != font)	982	if (self->font != font)
787	{	983	{
788	self->font = font;	984	self->font = font;
789	layout_update_font (self);	985	layout_update_font (self);
790	}	986	}
791		987
792	void	988	void
793	set_height (CFClient::Layout self, int base_height)	989	set_height (CFPlus::Layout self, int base_height)
794	CODE:	990	CODE:
795	if (self->base_height != base_height)	991	if (self->base_height != base_height)
796	{	992	{
797	self->base_height = base_height;	993	self->base_height = base_height;
798	layout_update_font (self);	994	layout_update_font (self);
799	}	995	}
800		996
801	void	997	void
802	set_width (CFClient::Layout self, int max_width = -1)	998	set_width (CFPlus::Layout self, int max_width = -1)
803	CODE:	999	CODE:
804	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);
805		1001
806	void	1002	void
807	set_indent (CFClient::Layout self, int indent)	1003	set_indent (CFPlus::Layout self, int indent)
808	CODE:	1004	CODE:
809	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1005	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
810		1006
811	void	1007	void
812	set_spacing (CFClient::Layout self, int spacing)	1008	set_spacing (CFPlus::Layout self, int spacing)
813	CODE:	1009	CODE:
814	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1010	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
815		1011
816	void	1012	void
817	set_ellipsise (CFClient::Layout self, int ellipsise)	1013	set_ellipsise (CFPlus::Layout self, int ellipsise)
818	CODE:	1014	CODE:
819	pango_layout_set_ellipsize (self->pl,	1015	pango_layout_set_ellipsize (self->pl,
820	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1016	ellipsise == 1 ? PANGO_ELLIPSIZE_START
821	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1017	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
822	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1018	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
823	: PANGO_ELLIPSIZE_NONE	1019	: PANGO_ELLIPSIZE_NONE
824	);	1020	);
825		1021
826	void	1022	void
827	set_single_paragraph_mode (CFClient::Layout self, int spm)	1023	set_single_paragraph_mode (CFPlus::Layout self, int spm)
828	CODE:	1024	CODE:
829	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1025	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
830		1026
831	void	1027	void
832	size (CFClient::Layout self)	1028	size (CFPlus::Layout self)
833	PPCODE:	1029	PPCODE:
834	{	1030	{
835	int w, h;	1031	int w, h;
836		1032
837	layout_get_pixel_size (self, &w, &h);	1033	layout_get_pixel_size (self, &w, &h);
…		…
840	PUSHs (sv_2mortal (newSViv (w)));	1036	PUSHs (sv_2mortal (newSViv (w)));
841	PUSHs (sv_2mortal (newSViv (h)));	1037	PUSHs (sv_2mortal (newSViv (h)));
842	}	1038	}
843		1039
844	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
845	xy_to_index (CFClient::Layout self, int x, int y)	1053	xy_to_index (CFPlus::Layout self, int x, int y)
846	CODE:	1054	CODE:
847	{	1055	{
848	int index, trailing;	1056	int index, trailing;
849	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);
850	RETVAL = index;	1058	RETVAL = index;
851	}	1059	}
852	OUTPUT:	1060	OUTPUT:
853	RETVAL	1061	RETVAL
854		1062
855	void	1063	void
856	cursor_pos (CFClient::Layout self, int index)	1064	cursor_pos (CFPlus::Layout self, int index)
857	PPCODE:	1065	PPCODE:
858	{	1066	{
859	PangoRectangle strong_pos;	1067	PangoRectangle strong_pos;
860	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1068	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
861		1069
…		…
864	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
865	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
866	}	1074	}
867		1075
868	void	1076	void
869	render (CFClient::Layout self)	1077	render (CFPlus::Layout self, float x, float y, int flags = 0)
870	PPCODE:	1078	PPCODE:
871	{	1079	pango_opengl_render_layout_subpixel (
872	SV *retval;	1080	self->pl,
873	int w, h;	1081	x * PANGO_SCALE, y * PANGO_SCALE,
		1082	self->r, self->g, self->b, self->a,
		1083	flags
		1084	);
874		1085
875	layout_get_pixel_size (self, &w, &h);	1086	MODULE = CFPlus PACKAGE = CFPlus::Texture
876		1087
877	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)
878	{	1096	{
879	cairo_surface_t *surface;	1097	int nw = minpot (ow);
880	cairo_t *cairo;	1098	int nh = minpot (oh);
881		1099
882	retval = newSV (w * h * 4);	1100	if (nw != ow \|\| nh != oh)
883	SvPOK_only (retval);
884	SvCUR_set (retval, w * h * 4);
885
886	memset (SvPVX (retval), 0, w * h * 4);
887
888	surface = cairo_image_surface_create_for_data (
889	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
890	cairo = cairo_create (surface);
891	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
892
893	pango_cairo_show_layout (cairo, self->pl);
894
895	cairo_destroy (cairo);
896	cairo_surface_destroy (surface);
897
898	// what a mess, and its premultiplied, too :(
899	{	1101	{
900	uint32_t p = (uint32_t )SvPVX (retval);	1102	if (SvOK (data_))
901	uint32_t e = p + w h;
902
903	while (p < e)
904	{	1103	{
905	uint32_t rgba = *p;	1104	STRLEN datalen;
906	rgba = (rgba >> 24) \| (rgba << 8);	1105	char *data = SvPVbyte (data_, datalen);
907	rgba = SDL_SwapBE32 (rgba);	1106	int bpp = datalen / (ow * oh);
908	*p++ = rgba;	1107	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1108
		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_);
909	}	1117	}
		1118
		1119	sv_setiv (w_, nw);
		1120	sv_setiv (h_, nh);
910	}	1121	}
911
912	EXTEND (SP, 5);
913	PUSHs (sv_2mortal (newSViv (w)));
914	PUSHs (sv_2mortal (newSViv (h)));
915	PUSHs (sv_2mortal (retval));
916	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
917	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
918	}	1122	}
919	else
920	{
921	FT_Bitmap bitmap;
922
923	retval = newSV (w * h);
924	SvPOK_only (retval);
925	SvCUR_set (retval, w * h);
926
927	bitmap.rows = h;
928	bitmap.width = w;
929	bitmap.pitch = w;
930	bitmap.buffer = (unsigned char*)SvPVX (retval);
931	bitmap.num_grays = 256;
932	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
933
934	memset (bitmap.buffer, 0, w * h);
935
936	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
937
938	EXTEND (SP, 5);
939	PUSHs (sv_2mortal (newSViv (w)));
940	PUSHs (sv_2mortal (newSViv (h)));
941	PUSHs (sv_2mortal (retval));
942	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
943	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
944	}
945	}	1123	}
946		1124
947	MODULE = CFClient PACKAGE = CFClient::Texture
948
949	void	1125	void
950	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.)
951	PROTOTYPE: $$$;$$	1127	PROTOTYPE: $$$;$$
952	ALIAS:	1128	ALIAS:
953	draw_quad_alpha = 1	1129	draw_quad_alpha = 1
954	draw_quad_alpha_premultiplied = 2	1130	draw_quad_alpha_premultiplied = 2
955	CODE:	1131	CODE:
956	{	1132	{
957	HV hv = (HV )SvRV (self);	1133	HV hv = (HV )SvRV (self);
958	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1134	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
959	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1135	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
960	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1136	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
961	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
962		1137
963	if (items < 5)	1138	if (items < 5)
964	{	1139	{
965	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1140	w = SvNV (*hv_fetch (hv, "w", 1, 1));
966	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1141	h = SvNV (*hv_fetch (hv, "h", 1, 1));
967	}	1142	}
968		1143
969	if (ix)	1144	if (ix)
970	{	1145	{
971	glEnable (GL_BLEND);	1146	glEnable (GL_BLEND);
		1147
		1148	if (ix == 2)
972	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
973	glEnable (GL_ALPHA_TEST);	1154	glEnable (GL_ALPHA_TEST);
974	glAlphaFunc (GL_GREATER, 0.01f);	1155	glAlphaFunc (GL_GREATER, 0.01f);
975	}	1156	}
976		1157
977	glBindTexture (GL_TEXTURE_2D, name);	1158	glBindTexture (GL_TEXTURE_2D, name);
978
979	if (wrap_mode)
980	{
981	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
982	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
983	}
984		1159
985	glBegin (GL_QUADS);	1160	glBegin (GL_QUADS);
986	glTexCoord2f (0, 0); glVertex2f (x , y );	1161	glTexCoord2f (0, 0); glVertex2f (x , y );
987	glTexCoord2f (0, t); glVertex2f (x , y + h);	1162	glTexCoord2f (0, t); glVertex2f (x , y + h);
988	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1163	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
994	glDisable (GL_ALPHA_TEST);	1169	glDisable (GL_ALPHA_TEST);
995	glDisable (GL_BLEND);	1170	glDisable (GL_BLEND);
996	}	1171	}
997	}	1172	}
998		1173
999	MODULE = CFClient PACKAGE = CFClient::Map	1174	MODULE = CFPlus PACKAGE = CFPlus::Map
1000		1175
1001	CFClient::Map	1176	CFPlus::Map
1002	new (SV *class, int map_width, int map_height)	1177	new (SV *class, int map_width, int map_height)
1003	CODE:	1178	CODE:
1004	New (0, RETVAL, 1, struct map);	1179	New (0, RETVAL, 1, struct map);
1005	RETVAL->x = 0;	1180	RETVAL->x = 0;
1006	RETVAL->y = 0;	1181	RETVAL->y = 0;
…		…
1016	RETVAL->row = 0;	1191	RETVAL->row = 0;
1017	OUTPUT:	1192	OUTPUT:
1018	RETVAL	1193	RETVAL
1019		1194
1020	void	1195	void
1021	DESTROY (CFClient::Map self)	1196	DESTROY (CFPlus::Map self)
1022	CODE:	1197	CODE:
1023	{	1198	{
1024	map_clear (self);	1199	map_clear (self);
1025	Safefree (self->face);	1200	Safefree (self->face);
		1201	Safefree (self->tex);
1026	Safefree (self);	1202	Safefree (self);
1027	}	1203	}
1028		1204
1029	void	1205	void
1030	clear (CFClient::Map self)	1206	clear (CFPlus::Map self)
1031	CODE:	1207	CODE:
1032	map_clear (self);	1208	map_clear (self);
1033		1209
1034	void	1210	void
1035	set_face (CFClient::Map self, int face, int texid)	1211	set_face (CFPlus::Map self, int face, int texid)
1036	CODE:	1212	CODE:
1037	{	1213	{
1038	while (self->faces <= face)	1214	while (self->faces <= face)
1039	{	1215	{
1040	Append (mapface, self->face, self->faces, self->faces);	1216	Append (mapface, self->face, self->faces, self->faces);
…		…
1043		1219
1044	self->face [face] = texid;	1220	self->face [face] = texid;
1045	}	1221	}
1046		1222
1047	void	1223	void
1048	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)
1049	CODE:	1225	CODE:
1050	{	1226	{
1051	while (self->texs <= texid)	1227	while (self->texs <= texid)
1052	{	1228	{
1053	Append (maptex, self->tex, self->texs, self->texs);	1229	Append (maptex, self->tex, self->texs, self->texs);
…		…
1065	tex->r = r;	1241	tex->r = r;
1066	tex->g = g;	1242	tex->g = g;
1067	tex->b = b;	1243	tex->b = b;
1068	tex->a = a;	1244	tex->a = a;
1069	}	1245	}
		1246
		1247	// somewhat hackish, but for textures that require it, it really
		1248	// improves the look, and most others don't suffer.
		1249	glBindTexture (GL_TEXTURE_2D, name);
		1250	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		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);
1070	}	1255	}
1071		1256
1072	int	1257	int
1073	ox (CFClient::Map self)	1258	ox (CFPlus::Map self)
1074	ALIAS:	1259	ALIAS:
1075	oy = 1	1260	oy = 1
		1261	x = 2
		1262	y = 3
		1263	w = 4
		1264	h = 5
1076	CODE:	1265	CODE:
1077	switch (ix)	1266	switch (ix)
1078	{	1267	{
1079	case 0: RETVAL = self->ox; break;	1268	case 0: RETVAL = self->ox; break;
1080	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;
1081	}	1274	}
1082	OUTPUT:	1275	OUTPUT:
1083	RETVAL	1276	RETVAL
1084		1277
1085	void	1278	void
1086	scroll (CFClient::Map self, int dx, int dy)	1279	scroll (CFPlus::Map self, int dx, int dy)
1087	CODE:	1280	CODE:
1088	{	1281	{
1089	if (dx > 0)	1282	if (dx > 0)
1090	map_blank (self, self->x, self->y, dx - 1, self->h);	1283	map_blank (self, self->x, self->y, dx, self->h);
1091	else if (dx < 0)	1284	else if (dx < 0)
1092	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);
1093		1286
1094	if (dy > 0)	1287	if (dy > 0)
1095	map_blank (self, self->x, self->y, self->w, dy - 1);	1288	map_blank (self, self->x, self->y, self->w, dy);
1096	else if (dy < 0)	1289	else if (dy < 0)
1097	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);
1098		1291
1099	self->ox += dx; self->x += dx;	1292	self->ox += dx; self->x += dx;
1100	self->oy += dy; self->y += dy;	1293	self->oy += dy; self->y += dy;
1101		1294
1102	while (self->y < 0)	1295	while (self->y < 0)
…		…
1107	self->y += MAP_EXTEND_Y;	1300	self->y += MAP_EXTEND_Y;
1108	}	1301	}
1109	}	1302	}
1110		1303
1111	void	1304	void
1112	map1a_update (CFClient::Map self, SV *data_)	1305	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1113	CODE:	1306	CODE:
1114	{	1307	{
1115	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1308	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1116	uint8_t data_end = (uint8_t )SvEND (data_);	1309	uint8_t data_end = (uint8_t )SvEND (data_);
1117	mapcell *cell;	1310	mapcell *cell;
1118	int x, y, flags;	1311	int x, y, flags;
1119		1312
1120	while (data < data_end)	1313	while (data < data_end - 1)
1121	{	1314	{
1122	flags = (data [0] << 8) + data [1]; data += 2;	1315	flags = (data [0] << 8) + data [1]; data += 2;
1123		1316
1124	x = ((flags >> 10) & 63) + self->x;	1317	x = self->x + ((flags >> 10) & 63);
1125	y = ((flags >> 4) & 63) + self->y;	1318	y = self->y + ((flags >> 4) & 63);
1126		1319
1127	cell = map_get_cell (self, x, y);	1320	cell = map_get_cell (self, x, y);
1128		1321
1129	if (flags & 15)	1322	if (flags & 15)
1130	{	1323	{
1131	if (cell->darkness < 0)	1324	if (!cell->darkness)
1132	{	1325	{
		1326	memset (cell, 0, sizeof (*cell));
1133	cell->darkness = 0;	1327	cell->darkness = 256;
1134	cell->face [0] = 0;
1135	cell->face [1] = 0;
1136	cell->face [2] = 0;
1137	}	1328	}
1138		1329
1139	cell->darkness = flags & 8 ? *data++ : 255;
1140
1141	//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	}
1142		1371
1143	if (flags & 4)	1372	if (flags & 4)
1144	{	1373	{
1145	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;
1146	}	1375	}
…		…
1154	{	1383	{
1155	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;
1156	}	1385	}
1157	}	1386	}
1158	else	1387	else
1159	cell->darkness = -1;	1388	cell->darkness = 0;
1160	}	1389	}
1161	}	1390	}
1162		1391
1163	SV *	1392	SV *
1164	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)
1165	CODE:	1394	CODE:
1166	{	1395	{
1167	int x1, x;	1396	int x1, x;
1168	int y1, y;	1397	int y1, y;
1169	int z;	1398	int z;
…		…
1219	}	1448	}
1220	OUTPUT:	1449	OUTPUT:
1221	RETVAL	1450	RETVAL
1222		1451
1223	void	1452	void
1224	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)
1225	PPCODE:	1454	CODE:
1226	{	1455	{
1227	int vx, vy;	1456	int vx, vy;
1228	int x, y, z;	1457	int x, y, z;
1229	int last_name;	1458	int last_name;
1230	mapface face;	1459	mapface face;
1231	int sw4 = (sw + 3) & ~3;
1232	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1233	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1234		1460
1235	memset (darkness, 255, sw4 * sh);
1236	SvPOK_only (darkness_sv);
1237	SvCUR_set (darkness_sv, sw4 * sh);
1238
1239	vx = self->x + (self->w - sw) / 2 - shift_x;	1461	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1240	vy = self->y + (self->h - sh) / 2 - shift_y;	1462	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1241		1463
1242	/*	1464	/*
1243	int vx = self->vx = self->w >= sw	1465	int vx = self->vx = self->w >= sw
1244	? self->x + (self->w - sw) / 2	1466	? self->x + (self->w - sw) / 2
1245	: 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));
…		…
1249	: 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));
1250	*/	1472	*/
1251		1473
1252	glColor4ub (255, 255, 255, 255);	1474	glColor4ub (255, 255, 255, 255);
1253		1475
		1476	glEnable (GL_BLEND);
1254	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1477	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1255	glEnable (GL_BLEND);
1256	glEnable (GL_TEXTURE_2D);	1478	glEnable (GL_TEXTURE_2D);
1257	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1479	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1258		1480
1259	glBegin (GL_QUADS);	1481	glBegin (GL_QUADS);
1260		1482
…		…
1269	for (x = 0; x < sw; x++)	1491	for (x = 0; x < sw; x++)
1270	if (row->c0 <= x + vx && x + vx < row->c1)	1492	if (row->c0 <= x + vx && x + vx < row->c1)
1271	{	1493	{
1272	mapcell *cell = row->col + (x + vx - row->c0);	1494	mapcell *cell = row->col + (x + vx - row->c0);
1273		1495
1274	darkness[y * sw4 + x] = cell->darkness < 0
1275	? 255 - FOW_DARKNESS
1276	: 255 - cell->darkness;
1277
1278	face = cell->face [z];	1496	face = cell->face [z];
1279		1497
1280	if (face)	1498	if (face && face < self->texs)
1281	{	1499	{
1282	maptex tex = self->tex [face];	1500	maptex tex = self->tex [face];
1283
1284	int px = (x + 1) * 32 - tex.w;	1501	int px = (x + 1) * 32 - tex.w;
1285	int py = (y + 1) * 32 - tex.h;	1502	int py = (y + 1) * 32 - tex.h;
1286		1503
1287	if (last_name != tex.name)	1504	if (last_name != tex.name)
1288	{	1505	{
1289	glEnd ();	1506	glEnd ();
1290	last_name = tex.name;
1291	glBindTexture (GL_TEXTURE_2D, last_name);	1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1292	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1293	}	1509	}
1294		1510
1295	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1296	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1297	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);
1298	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1299	}	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	}
1300	}	1535	}
1301	}	1536	}
1302		1537
1303	glEnd ();	1538	glEnd ();
1304		1539
1305	glDisable (GL_TEXTURE_2D);	1540	glDisable (GL_TEXTURE_2D);
1306	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	}
1307		1667
1308	EXTEND (SP, 3);	1668	EXTEND (SP, 3);
1309	PUSHs (sv_2mortal (newSViv (sw4)));	1669	PUSHs (sv_2mortal (newSViv (sw4)));
1310	PUSHs (sv_2mortal (newSViv (sh)));	1670	PUSHs (sv_2mortal (newSViv (sh)));
1311	PUSHs (darkness_sv);	1671	PUSHs (darkness_sv);
1312	}	1672	}
1313		1673
1314	SV *	1674	SV *
1315	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)
1316	CODE:	1676	CODE:
1317	{	1677	{
1318	int x, y, x1, y1;	1678	int x, y, x1, y1;
1319	SV data_sv = newSV (w h * 7 + 5);	1679	SV data_sv = newSV (w h * 7 + 5);
1320	uint8_t data = (uint8_t )SvPVX (data_sv);	1680	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1382	}	1742	}
1383	OUTPUT:	1743	OUTPUT:
1384	RETVAL	1744	RETVAL
1385		1745
1386	void	1746	void
1387	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)
1388	PPCODE:	1748	PPCODE:
1389	{	1749	{
1390	int x, y, z;	1750	int x, y, z;
1391	int w, h;	1751	int w, h;
1392	int x1, y1;	1752	int x1, y1;
…		…
1424		1784
1425	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1785	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1426	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1786	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1427	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1787	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1428		1788
1429	if (cell->darkness <= 0)	1789	if (cell->darkness == 0)
1430	{	1790	{
1431	cell->darkness = -1;	1791	cell->darkness = 0;
1432		1792
1433	for (z = 0; z <= 2; z++)	1793	for (z = 0; z <= 2; z++)
1434	{	1794	{
1435	cell->face[z] = face[z];	1795	cell->face[z] = face[z];
1436		1796
…		…
1441	}	1801	}
1442	}	1802	}
1443	}	1803	}
1444	}	1804	}
1445		1805
1446	MODULE = CFClient PACKAGE = CFClient::MixChunk	1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1447		1807
1448	CFClient::MixChunk	1808	CFPlus::MixChunk
1449	new_from_file (SV class, char path)	1809	new_from_file (SV class, char path)
1450	CODE:	1810	CODE:
1451	RETVAL = Mix_LoadWAV (path);	1811	RETVAL = Mix_LoadWAV (path);
1452	OUTPUT:	1812	OUTPUT:
1453	RETVAL	1813	RETVAL
1454		1814
1455	void	1815	void
1456	DESTROY (CFClient::MixChunk self)	1816	DESTROY (CFPlus::MixChunk self)
1457	CODE:	1817	CODE:
1458	Mix_FreeChunk (self);	1818	Mix_FreeChunk (self);
1459		1819
1460	int	1820	int
1461	volume (CFClient::MixChunk self, int volume = -1)	1821	volume (CFPlus::MixChunk self, int volume = -1)
1462	CODE:	1822	CODE:
1463	RETVAL = Mix_VolumeChunk (self, volume);	1823	RETVAL = Mix_VolumeChunk (self, volume);
1464	OUTPUT:	1824	OUTPUT:
1465	RETVAL	1825	RETVAL
1466		1826
1467	int	1827	int
1468	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)
1469	CODE:	1829	CODE:
1470	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1471	OUTPUT:	1831	OUTPUT:
1472	RETVAL	1832	RETVAL
1473		1833
1474	MODULE = CFClient PACKAGE = CFClient::MixMusic	1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1475		1835
1476	int	1836	int
1477	volume (int volume = -1)	1837	volume (int volume = -1)
1478	CODE:	1838	CODE:
1479	RETVAL = Mix_VolumeMusic (volume);	1839	RETVAL = Mix_VolumeMusic (volume);
1480	OUTPUT:	1840	OUTPUT:
1481	RETVAL	1841	RETVAL
1482		1842
1483	CFClient::MixMusic	1843	CFPlus::MixMusic
1484	new_from_file (SV class, char path)	1844	new_from_file (SV class, char path)
1485	CODE:	1845	CODE:
1486	RETVAL = Mix_LoadMUS (path);	1846	RETVAL = Mix_LoadMUS (path);
1487	OUTPUT:	1847	OUTPUT:
1488	RETVAL	1848	RETVAL
1489		1849
1490	void	1850	void
1491	DESTROY (CFClient::MixMusic self)	1851	DESTROY (CFPlus::MixMusic self)
1492	CODE:	1852	CODE:
1493	Mix_FreeMusic (self);	1853	Mix_FreeMusic (self);
1494		1854
1495	int	1855	int
1496	play (CFClient::MixMusic self, int loops = -1)	1856	play (CFPlus::MixMusic self, int loops = -1)
1497	CODE:	1857	CODE:
1498	RETVAL = Mix_PlayMusic (self, loops);	1858	RETVAL = Mix_PlayMusic (self, loops);
1499	OUTPUT:	1859	OUTPUT:
1500	RETVAL	1860	RETVAL
1501		1861
1502	MODULE = CFClient PACKAGE = CFClient::OpenGL	1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1503		1863
1504	BOOT:	1864	BOOT:
1505	{	1865	{
1506	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1507	static const struct {	1867	static const struct {
1508	const char *name;	1868	const char *name;
1509	IV iv;	1869	IV iv;
1510	} *civ, const_iv[] = {	1870	} *civ, const_iv[] = {
1511	# define const_iv(name) { # name, (IV)name }	1871	# define const_iv(name) { # name, (IV)name }
1512	const_iv (GL_COLOR_MATERIAL),	1872	const_iv (GL_COLOR_MATERIAL),
1513	const_iv (GL_SMOOTH),	1873	const_iv (GL_SMOOTH),
1514	const_iv (GL_FLAT),	1874	const_iv (GL_FLAT),
1515	const_iv (GL_DITHER),	1875	const_iv (GL_DITHER),
1516	const_iv (GL_BLEND),	1876	const_iv (GL_BLEND),
		1877	const_iv (GL_CULL_FACE),
1517	const_iv (GL_SCISSOR_TEST),	1878	const_iv (GL_SCISSOR_TEST),
		1879	const_iv (GL_DEPTH_TEST),
		1880	const_iv (GL_ALPHA_TEST),
		1881	const_iv (GL_NORMALIZE),
		1882	const_iv (GL_RESCALE_NORMAL),
		1883	const_iv (GL_FRONT),
		1884	const_iv (GL_BACK),
1518	const_iv (GL_AND),	1885	const_iv (GL_AND),
1519	const_iv (GL_ONE),	1886	const_iv (GL_ONE),
1520	const_iv (GL_ZERO),	1887	const_iv (GL_ZERO),
1521	const_iv (GL_SRC_ALPHA),	1888	const_iv (GL_SRC_ALPHA),
1522	const_iv (GL_SRC_ALPHA_SATURATE),	1889	const_iv (GL_DST_ALPHA),
1523	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1890	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1524	const_iv (GL_ONE_MINUS_DST_ALPHA),	1891	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1892	const_iv (GL_SRC_ALPHA_SATURATE),
1525	const_iv (GL_RGB),	1893	const_iv (GL_RGB),
1526	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),
1527	const_iv (GL_UNSIGNED_BYTE),	1898	const_iv (GL_UNSIGNED_BYTE),
		1899	const_iv (GL_UNSIGNED_SHORT),
		1900	const_iv (GL_UNSIGNED_INT),
1528	const_iv (GL_ALPHA),	1901	const_iv (GL_ALPHA),
1529	const_iv (GL_INTENSITY),	1902	const_iv (GL_INTENSITY),
1530	const_iv (GL_LUMINANCE),	1903	const_iv (GL_LUMINANCE),
1531	const_iv (GL_LUMINANCE_ALPHA),	1904	const_iv (GL_LUMINANCE_ALPHA),
1532	const_iv (GL_FLOAT),	1905	const_iv (GL_FLOAT),
…		…
1538	const_iv (GL_TEXTURE_MAG_FILTER),	1911	const_iv (GL_TEXTURE_MAG_FILTER),
1539	const_iv (GL_TEXTURE_MIN_FILTER),	1912	const_iv (GL_TEXTURE_MIN_FILTER),
1540	const_iv (GL_TEXTURE_ENV_MODE),	1913	const_iv (GL_TEXTURE_ENV_MODE),
1541	const_iv (GL_TEXTURE_WRAP_S),	1914	const_iv (GL_TEXTURE_WRAP_S),
1542	const_iv (GL_TEXTURE_WRAP_T),	1915	const_iv (GL_TEXTURE_WRAP_T),
		1916	const_iv (GL_REPEAT),
1543	const_iv (GL_CLAMP),	1917	const_iv (GL_CLAMP),
1544	const_iv (GL_REPEAT),	1918	const_iv (GL_CLAMP_TO_EDGE),
1545	const_iv (GL_NEAREST),	1919	const_iv (GL_NEAREST),
1546	const_iv (GL_LINEAR),	1920	const_iv (GL_LINEAR),
1547	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1921	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1548	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1922	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1549	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1923	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1550	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1924	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1551	const_iv (GL_GENERATE_MIPMAP),	1925	const_iv (GL_GENERATE_MIPMAP),
1552	const_iv (GL_MODULATE),	1926	const_iv (GL_MODULATE),
1553	const_iv (GL_DECAL),	1927	const_iv (GL_DECAL),
1554	const_iv (GL_REPLACE),	1928	const_iv (GL_REPLACE),
		1929	const_iv (GL_DEPTH_BUFFER_BIT),
1555	const_iv (GL_COLOR_BUFFER_BIT),	1930	const_iv (GL_COLOR_BUFFER_BIT),
1556	const_iv (GL_PROJECTION),	1931	const_iv (GL_PROJECTION),
1557	const_iv (GL_MODELVIEW),	1932	const_iv (GL_MODELVIEW),
1558	const_iv (GL_COLOR_LOGIC_OP),	1933	const_iv (GL_COLOR_LOGIC_OP),
1559	const_iv (GL_SEPARABLE_2D),	1934	const_iv (GL_SEPARABLE_2D),
1560	const_iv (GL_CONVOLUTION_2D),	1935	const_iv (GL_CONVOLUTION_2D),
1561	const_iv (GL_CONVOLUTION_BORDER_MODE),	1936	const_iv (GL_CONVOLUTION_BORDER_MODE),
1562	const_iv (GL_CONSTANT_BORDER),	1937	const_iv (GL_CONSTANT_BORDER),
1563	const_iv (GL_LINES),	1938	const_iv (GL_LINES),
		1939	const_iv (GL_LINE_STRIP),
		1940	const_iv (GL_LINE_LOOP),
1564	const_iv (GL_QUADS),	1941	const_iv (GL_QUADS),
1565	const_iv (GL_LINE_LOOP),	1942	const_iv (GL_QUAD_STRIP),
		1943	const_iv (GL_TRIANGLES),
		1944	const_iv (GL_TRIANGLE_STRIP),
		1945	const_iv (GL_TRIANGLE_FAN),
1566	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1946	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1567	const_iv (GL_FASTEST),	1947	const_iv (GL_FASTEST),
		1948	const_iv (GL_V2F),
		1949	const_iv (GL_V3F),
		1950	const_iv (GL_T2F_V3F),
		1951	const_iv (GL_T2F_N3F_V3F),
1568	# undef const_iv	1952	# undef const_iv
1569	};	1953	};
1570		1954
1571	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; )
1572	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1956	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1573	}	1957	}
1574		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
1575	int glGetError ()	1980	int glGetError ()
		1981
		1982	void glFinish ()
1576		1983
1577	void glClear (int mask)	1984	void glClear (int mask)
1578		1985
1579	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)
1580	PROTOTYPE: @	1987	PROTOTYPE: @
…		…
1587		1994
1588	void glHint (int target, int mode)	1995	void glHint (int target, int mode)
1589		1996
1590	void glBlendFunc (int sfactor, int dfactor)	1997	void glBlendFunc (int sfactor, int dfactor)
1591		1998
		1999	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		2000	CODE:
		2001	gl_BlendFuncSeparate (sa, da, saa, daa);
		2002
		2003	void glDepthMask (int flag)
		2004
1592	void glLogicOp (int opcode)	2005	void glLogicOp (int opcode)
1593		2006
1594	void glColorMask (int red, int green, int blue, int alpha)	2007	void glColorMask (int red, int green, int blue, int alpha)
1595		2008
1596	void glMatrixMode (int mode)	2009	void glMatrixMode (int mode)
…		…
1599		2012
1600	void glPopMatrix ()	2013	void glPopMatrix ()
1601		2014
1602	void glLoadIdentity ()	2015	void glLoadIdentity ()
1603		2016
		2017	void glDrawBuffer (int buffer)
		2018
		2019	void glReadBuffer (int buffer)
		2020
1604	# near and far are due to microsofts buggy c compiler	2021	# near_ and far_ are due to microsofts buggy "c" compiler
		2022	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2023
		2024	# near_ and far_ are due to microsofts buggy "c" compiler
1605	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	2025	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1606		2026
1607	void glViewport (int x, int y, int width, int height)	2027	void glViewport (int x, int y, int width, int height)
1608		2028
1609	void glScissor (int x, int y, int width, int height)	2029	void glScissor (int x, int y, int width, int height)
…		…
1624		2044
1625	void glEnd ()	2045	void glEnd ()
1626		2046
1627	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)
1628	PROTOTYPE: @	2048	PROTOTYPE: @
		2049	ALIAS:
		2050	glColor_premultiply = 1
1629	CODE:	2051	CODE:
1630	glColor4ub (MIN ((int)(r * 255.f), 255),	2052	if (ix)
1631	MIN ((int)(g * 255.f), 255),	2053	{
1632	MIN ((int)(b * 255.f), 255),	2054	r *= a;
1633	MIN ((int)(a * 255.f), 255));	2055	g *= a;
		2056	b *= a;
		2057	}
		2058	// microsoft visual "c" rounds instead of truncating...
		2059	glColor4f (r, g, b, a);
		2060
		2061	void glInterleavedArrays (int format, int stride, char *data)
		2062
		2063	void glDrawElements (int mode, int count, int type, char *indices)
		2064
		2065	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2066
		2067	void glRasterPos (float x, float y, float z = 0.)
		2068	CODE:
		2069	glRasterPos3f (0, 0, z);
		2070	glBitmap (0, 0, 0, 0, x, y, 0);
1634		2071
1635	void glVertex (float x, float y, float z = 0.)	2072	void glVertex (float x, float y, float z = 0.)
1636	CODE:	2073	CODE:
1637	glVertex3f (x, y, z);	2074	glVertex3f (x, y, z);
1638		2075
…		…
1650		2087
1651	void glBindTexture (int target, int name)	2088	void glBindTexture (int target, int name)
1652		2089
1653	void glConvolutionParameter (int target, int pname, float params)	2090	void glConvolutionParameter (int target, int pname, float params)
1654	CODE:	2091	CODE:
1655	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2092	if (gl.ConvolutionParameterf)
		2093	gl.ConvolutionParameterf (target, pname, params);
1656		2094
1657	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)
1658	CODE:	2096	CODE:
1659	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2097	if (gl.ConvolutionFilter2D)
1660	(target, internalformat, width, height, format, type, data));	2098	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1661		2099
1662	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)
1663	CODE:	2101	CODE:
1664	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2102	if (gl.SeparableFilter2D)
1665	(target, internalformat, width, height, format, type, row, column));	2103	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1666		2104
1667	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)
1668		2106
1669	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)
1670		2108
1671	void glRasterPos (int x, int y)	2109	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1672	CODE:
1673	glRasterPos2i (x, y);
1674		2110
1675	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2111	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1676		2112
1677	int glGenTexture ()	2113	int glGenTexture ()
1678	CODE:	2114	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.86 by root, Fri May 19 16:43:56 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.86 by root, Fri May 19 16:43:56 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC