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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.79 by root, Sun May 14 22:24:14 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
		20	#include <math.h>
12	#include <string.h>	21	#include <string.h>
13	#include <stdio.h>	22	#include <stdio.h>
		23	#include <stdlib.h>
14		24
15	#include <SDL.h>	25	#include <SDL.h>
16	#include <SDL_endian.h>	26	#include <SDL_endian.h>
17	#include <SDL_image.h>	27	#include <SDL_image.h>
18	#include <SDL_mixer.h>	28	#include <SDL_mixer.h>
19	#include <SDL_opengl.h>	29	#include <SDL_opengl.h>
20		30
		31	#define PANGO_ENABLE_BACKEND
		32	#define G_DISABLE_CAST_CHECKS
		33
21	#include <glib/gmacros.h>	34	#include <glib/gmacros.h>
22		35
23	#include <pango/pango.h>	36	#include <pango/pango.h>
24	#include <pango/pangofc-fontmap.h>
25	#include <pango/pangoft2.h>
26	#include <pango/pangocairo.h>
27		37
28	#ifndef _WIN32	38	#ifndef _WIN32
29	# include <sys/types.h>	39	# include <sys/types.h>
30	# include <sys/socket.h>	40	# include <sys/socket.h>
31	# include <netinet/in.h>	41	# include <netinet/in.h>
38	typedef signed char int8_t;	48	typedef signed char int8_t;
39	typedef signed short int16_t;	49	typedef signed short int16_t;
40	typedef signed int int32_t;	50	typedef signed int int32_t;
41	#endif	51	#endif
42		52
43	#include "glext.h"	53	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
44		54
45	#define FOW_DARKNESS 32	55	#define FOW_DARKNESS 32
46		56
47	#define MAP_EXTEND_X 32	57	#define MAP_EXTEND_X 32
48	#define MAP_EXTEND_Y 512	58	#define MAP_EXTEND_Y 512
49		59
50	#define MIN_FONT_HEIGHT 10	60	#define MIN_FONT_HEIGHT 10
51		61
52	#define GL_CALL(type,func,args) \	62	#if 0
53	{ \	63	# define PARACHUTE SDL_INIT_NOPARACHUTE
54	static int init_; \	64	#else
55	static type fptr_; \	65	# define PARACHUTE 0
56	\	66	#endif
57	if (!init_) \
58	{ \
59	init_ = 1; \
60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
61	} \
62	\
63	if (fptr_) \
64	fptr_ args; \
65	}
66		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
67	typedef Mix_Chunk *CFClient__MixChunk;	91	typedef Mix_Chunk *CFPlus__MixChunk;
68	typedef Mix_Music *CFClient__MixMusic;	92	typedef Mix_Music *CFPlus__MixMusic;
69		93
70	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	}
71		113
72	typedef struct cf_layout {	114	typedef struct cf_layout {
73	PangoLayout *pl; // either derived from a cairo or ft2 context	115	PangoLayout *pl;
74	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75	float r, g, b, a; // default color for rgba mode	116	float r, g, b, a; // default color for rgba mode
76	int base_height;	117	int base_height;
77	CFClient__Font font;	118	CFPlus__Font font;
78	} *CFClient__Layout;	119	} *CFPlus__Layout;
79		120
80	static CFClient__Font default_font;	121	static CFPlus__Font default_font;
81	static PangoContext ft2_context, cairo_context;	122	static PangoContext *opengl_context;
82	static PangoFontMap ft2_fontmap, cairo_fontmap;	123	static PangoFontMap *opengl_fontmap;
83		124
84	static void	125	static void
85	substitute_func (FcPattern *pattern, gpointer data)	126	substitute_func (FcPattern *pattern, gpointer data)
86	{	127	{
87	FcPatternAddBool (pattern, FC_HINTING , 1);	128	FcPatternAddBool (pattern, FC_HINTING, 1);
		129	#ifdef FC_HINT_STYLE
		130	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		131	#endif
88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	132	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
89	}	133	}
90		134
91	static void	135	static void
92	layout_update_font (CFClient__Layout self)	136	layout_update_font (CFPlus__Layout self)
93	{	137	{
94	/* 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
95	* reasonably well with bitstream vera	139	* reasonably well with bitstream vera
96	*/	140	*/
97	PangoFontDescription *font = self->font ? self->font : default_font;	141	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
101		145
102	pango_layout_set_font_description (self->pl, font);	146	pango_layout_set_font_description (self->pl, font);
103	}	147	}
104		148
105	static void	149	static void
106	layout_get_pixel_size (CFClient__Layout self, int w, int h)	150	layout_get_pixel_size (CFPlus__Layout self, int w, int h)
107	{	151	{
		152	PangoRectangle rect;
		153
		154	// get_pixel_* wrongly rounds down
108	pango_layout_get_pixel_size (self->pl, w, h);	155	pango_layout_get_extents (self->pl, 0, &rect);
109		156
110	if (!w) w = 1;	157	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
111	if (!h) h = 1;	158	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
112		159
113	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;
114	}	165	}
115		166
116	typedef uint16_t mapface;	167	typedef uint16_t mapface;
117		168
118	typedef struct {	169	typedef struct {
…		…
121	float s, t;	172	float s, t;
122	uint8_t r, g, b, a;	173	uint8_t r, g, b, a;
123	} maptex;	174	} maptex;
124		175
125	typedef struct {	176	typedef struct {
126	int16_t darkness;	177	uint32_t player;
127	mapface face[3];	178	mapface face[3];
		179	uint16_t darkness;
		180	uint8_t stat_width, stat_hp, flags;
128	} mapcell;	181	} mapcell;
129		182
130	typedef struct {	183	typedef struct {
131	int32_t c0, c1;	184	int32_t c0, c1;
132	mapcell *col;	185	mapcell *col;
…		…
141	int texs;	194	int texs;
142	maptex *tex;	195	maptex *tex;
143		196
144	int32_t rows;	197	int32_t rows;
145	maprow *row;	198	maprow *row;
146	} *CFClient__Map;	199	} *CFPlus__Map;
147		200
148	static char *	201	static char *
149	prepend (char *ptr, int sze, int inc)	202	prepend (char *ptr, int sze, int inc)
150	{	203	{
151	char *p;	204	char *p;
…		…
169		222
170	#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))
171	#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))
172		225
173	static maprow *	226	static maprow *
174	map_get_row (CFClient__Map self, int y)	227	map_get_row (CFPlus__Map self, int y)
175	{	228	{
176	if (0 > y)	229	if (0 > y)
177	{	230	{
178	int extend = - y + MAP_EXTEND_Y;	231	int extend = - y + MAP_EXTEND_Y;
179	Prepend (maprow, self->row, self->rows, extend);	232	Prepend (maprow, self->row, self->rows, extend);
…		…
217		270
218	return row->col + (x - row->c0);	271	return row->col + (x - row->c0);
219	}	272	}
220		273
221	static mapcell *	274	static mapcell *
222	map_get_cell (CFClient__Map self, int x, int y)	275	map_get_cell (CFPlus__Map self, int x, int y)
223	{	276	{
224	return row_get_cell (map_get_row (self, y), x);	277	return row_get_cell (map_get_row (self, y), x);
225	}	278	}
226		279
227	static void	280	static void
228	map_clear (CFClient__Map self)	281	map_clear (CFPlus__Map self)
229	{	282	{
230	int r;	283	int r;
231		284
232	for (r = 0; r < self->rows; r++)	285	for (r = 0; r < self->rows; r++)
233	Safefree (self->row[r].col);	286	Safefree (self->row[r].col);
…		…
241	self->row = 0;	294	self->row = 0;
242	self->rows = 0;	295	self->rows = 0;
243	}	296	}
244		297
245	static void	298	static void
246	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)
247	{	300	{
248	int x, y;	301	int x, y;
249	maprow *row;	302	maprow *row;
		303	mapcell *cell;
250		304
251	for (y = y0; y < y0 + h; y++)	305	for (y = y0; y < y0 + h; y++)
252	if (y >= 0)	306	if (y >= 0)
253	{	307	{
254	if (y >= self->rows)	308	if (y >= self->rows)
…		…
260	if (x >= row->c0)	314	if (x >= row->c0)
261	{	315	{
262	if (x >= row->c1)	316	if (x >= row->c1)
263	break;	317	break;
264		318
265	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;
266	}	325	}
267	}	326	}
268	}	327	}
269		328
270	static void	329	static void
…		…
291	ev.data2 = 0;	350	ev.data2 = 0;
292		351
293	SDL_PushEvent ((SDL_Event *)&ev);	352	SDL_PushEvent ((SDL_Event *)&ev);
294	}	353	}
295		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
296	MODULE = CFClient PACKAGE = CFClient	372	MODULE = CFPlus PACKAGE = CFPlus
297		373
298	PROTOTYPES: ENABLE	374	PROTOTYPES: ENABLE
299		375
300	BOOT:	376	BOOT:
301	{	377	{
302	HV *stash = gv_stashpv ("CFClient", 1);	378	HV *stash = gv_stashpv ("CFPlus", 1);
303	static const struct {	379	static const struct {
304	const char *name;	380	const char *name;
305	IV iv;	381	IV iv;
306	} *civ, const_iv[] = {	382	} *civ, const_iv[] = {
307	# define const_iv(name) { # name, (IV)name }	383	# define const_iv(name) { # name, (IV)name }
…		…
408		484
409	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; )
410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	486	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411	}	487	}
412		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
413	void	500	void
414	pango_init ()	501	pango_init ()
415	CODE:	502	CODE:
416	{	503	{
417	// delayed, so it can pick up new fonts added by AddFontResourceEx
418	ft2_fontmap = pango_ft2_font_map_new ();	504	opengl_fontmap = pango_opengl_font_map_new ();
419	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);
420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	506	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
421
422	cairo_fontmap = pango_cairo_font_map_get_default ();
423	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
424	}	507	}
425		508
426	int	509	int
427	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	510	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
428		511
429	void	512	void
430	SDL_Quit ()	513	SDL_Quit ()
431		514
432	void	515	void
…		…
438	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	521	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	522	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	523	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	524	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442		525
		526	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		527	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		528
443	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	529	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	530	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	531	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	532	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447		533
448	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	534	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		535	#if SDL_VERSION_ATLEAST(1,2,10)
449	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	536	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
450	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	537	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		538	#endif
451		539
452	SDL_EnableUNICODE (1);	540	SDL_EnableUNICODE (1);
453	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	541	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454		542
455	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	543	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
464		552
465	++m;	553	++m;
466	}	554	}
467	}	555	}
468		556
		557	char *
		558	SDL_GetError ()
		559
469	int	560	int
470	SDL_SetVideoMode (int w, int h, int fullscreen)	561	SDL_SetVideoMode (int w, int h, int fullscreen)
471	CODE:	562	CODE:
472	RETVAL = !!SDL_SetVideoMode (	563	RETVAL = !!SDL_SetVideoMode (
473	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	564	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
474	);	565	);
		566	if (RETVAL)
		567	{
475	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	}
476	OUTPUT:	573	OUTPUT:
477	RETVAL	574	RETVAL
478		575
479	void	576	void
480	SDL_GL_SwapBuffers ()	577	SDL_GL_SwapBuffers ()
		578
		579	char *
		580	SDL_GetKeyName (int sym)
481		581
482	void	582	void
483	SDL_PollEvent ()	583	SDL_PollEvent ()
484	PPCODE:	584	PPCODE:
485	{	585	{
…		…
504	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	604	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	605	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506	break;	606	break;
507		607
508	case SDL_MOUSEMOTION:	608	case SDL_MOUSEMOTION:
		609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		610
509	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	611	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	612	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	613	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	614	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	615	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514	break;	616	break;
515		617
516	case SDL_MOUSEBUTTONDOWN:	618	case SDL_MOUSEBUTTONDOWN:
517	case SDL_MOUSEBUTTONUP:	619	case SDL_MOUSEBUTTONUP:
		620	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		621
518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	622	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	623	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	624	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	625	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522	break;	626	break;
…		…
526	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	630	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	631	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528	break;	632	break;
529	}	633	}
530		634
531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	635	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
532	}	636	}
533	}	637	}
534		638
535	int	639	int
536	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)
…		…
549	CODE:	653	CODE:
550	#ifndef _WIN32	654	#ifndef _WIN32
551	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	655	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552	#endif	656	#endif
553		657
554	char *	658	void
555	gl_version ()	659	win32_proxy_info ()
556	CODE:	660	PPCODE:
557	RETVAL = (char *)glGetString (GL_VERSION);	661	{
558	OUTPUT:	662	#ifdef _WIN32
559	RETVAL	663	char buffer[2048];
		664	DWORD buflen;
560		665
561	char *	666	EXTEND (SP, 3);
562	gl_extensions ()	667
563	CODE:	668	buflen = sizeof (buffer);
564	RETVAL = (char *)glGetString (GL_EXTENSIONS);	669	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
565	OUTPUT:	670	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
566	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	}
567		686
568	void	687	void
569	add_font (char *file)	688	add_font (char *file)
570	CODE:	689	CODE:
571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	690	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572	#ifdef _WIN32
573	// cairo... sigh... requires win2000
574	AddFontResourceEx (file, FR_PRIVATE, 0);
575	#endif
576		691
577	void	692	void
578	load_image_inline (SV *image_)	693	load_image_inline (SV *image_)
579	ALIAS:	694	ALIAS:
580	load_image_file = 1	695	load_image_file = 1
…		…
622		737
623	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	738	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624		739
625	assert (surface2->pitch == surface2->w * 4);	740	assert (surface2->pitch == surface2->w * 4);
626		741
		742	SDL_LockSurface (surface2);
627	EXTEND (SP, 5);	743	EXTEND (SP, 6);
628	PUSHs (sv_2mortal (newSViv (surface2->w)));	744	PUSHs (sv_2mortal (newSViv (surface2->w)));
629	PUSHs (sv_2mortal (newSViv (surface2->h)));	745	PUSHs (sv_2mortal (newSViv (surface2->h)));
630	SDL_LockSurface (surface2);
631	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	746	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
632	SDL_UnlockSurface (surface2);
633	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)));
634	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	748	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	749	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		750	SDL_UnlockSurface (surface2);
636		751
637	SDL_FreeSurface (surface);	752	SDL_FreeSurface (surface);
638	SDL_FreeSurface (surface2);	753	SDL_FreeSurface (surface2);
639	}	754	}
640		755
…		…
664	}	779	}
665		780
666	void	781	void
667	error (char *message)	782	error (char *message)
668	CODE:	783	CODE:
		784	fprintf (stderr, "ERROR: %s\n", message);
669	#ifdef _WIN32	785	#ifdef _WIN32
670	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	786	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
671	#else
672	fprintf (stderr, "ERROR: %s\n", message);
673	#endif	787	#endif
674		788
675	void	789	void
676	fatal (char *message)	790	fatal (char *message)
677	CODE:	791	CODE:
		792	fprintf (stderr, "FATAL: %s\n", message);
678	#ifdef _WIN32	793	#ifdef _WIN32
679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	794	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
680	#else
681	fprintf (stderr, "FATAL: %s\n", message);
682	#endif	795	#endif
683	exit (1);	796	_exit (1);
684		797
		798	void
		799	_exit (int retval = 0)
		800	CODE:
		801	_exit (retval);
		802
685	MODULE = CFClient PACKAGE = CFClient::Font	803	MODULE = CFPlus PACKAGE = CFPlus::Font
686		804
687	CFClient::Font	805	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	806	new_from_file (SV class, char path, int id = 0)
689	CODE:	807	CODE:
690	{	808	{
691	int count;	809	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	810	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	813	}
696	OUTPUT:	814	OUTPUT:
697	RETVAL	815	RETVAL
698		816
699	void	817	void
700	DESTROY (CFClient::Font self)	818	DESTROY (CFPlus::Font self)
701	CODE:	819	CODE:
702	pango_font_description_free (self);	820	pango_font_description_free (self);
703		821
704	void	822	void
705	make_default (CFClient::Font self)	823	make_default (CFPlus::Font self)
706	CODE:	824	CODE:
707	default_font = self;	825	default_font = self;
708		826
709	MODULE = CFClient PACKAGE = CFClient::Layout	827	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		828
711	CFClient::Layout	829	void
712	new (SV *class, int rgba = 0)	830	reset_glyph_cache ()
		831	CODE:
		832	tc_clear ();
		833
		834	CFPlus::Layout
		835	new (SV *class)
713	CODE:	836	CODE:
714	New (0, RETVAL, 1, struct cf_layout);	837	New (0, RETVAL, 1, struct cf_layout);
715		838
716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	839	RETVAL->pl = pango_layout_new (opengl_context);
717	RETVAL->rgba = rgba;
718	RETVAL->r = 1.;	840	RETVAL->r = 1.;
719	RETVAL->g = 1.;	841	RETVAL->g = 1.;
720	RETVAL->b = 1.;	842	RETVAL->b = 1.;
721	RETVAL->a = 1.;	843	RETVAL->a = 1.;
722	RETVAL->base_height = MIN_FONT_HEIGHT;	844	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
726	layout_update_font (RETVAL);	848	layout_update_font (RETVAL);
727	OUTPUT:	849	OUTPUT:
728	RETVAL	850	RETVAL
729		851
730	void	852	void
731	DESTROY (CFClient::Layout self)	853	DESTROY (CFPlus::Layout self)
732	CODE:	854	CODE:
733	g_object_unref (self->pl);	855	g_object_unref (self->pl);
734	Safefree (self);	856	Safefree (self);
735		857
736	int
737	is_rgba (CFClient::Layout self)
738	CODE:
739	RETVAL = self->rgba;
740	OUTPUT:
741	RETVAL
742
743	void	858	void
744	set_text (CFClient::Layout self, SV *text_)	859	set_text (CFPlus::Layout self, SV *text_)
745	CODE:	860	CODE:
746	{	861	{
747	STRLEN textlen;	862	STRLEN textlen;
748	char *text = SvPVutf8 (text_, textlen);	863	char *text = SvPVutf8 (text_, textlen);
749		864
750	pango_layout_set_text (self->pl, text, textlen);	865	pango_layout_set_text (self->pl, text, textlen);
751	}	866	}
752		867
753	void	868	void
754	set_markup (CFClient::Layout self, SV *text_)	869	set_markup (CFPlus::Layout self, SV *text_)
755	CODE:	870	CODE:
756	{	871	{
757	STRLEN textlen;	872	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	873	char *text = SvPVutf8 (text_, textlen);
759		874
760	pango_layout_set_markup (self->pl, text, textlen);	875	pango_layout_set_markup (self->pl, text, textlen);
761	}	876	}
762		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
763	SV *	963	SV *
764	get_text (CFClient::Layout self)	964	get_text (CFPlus::Layout self)
765	CODE:	965	CODE:
766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	966	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767	SvUTF8_on (RETVAL);	967	sv_utf8_decode (RETVAL);
768	OUTPUT:	968	OUTPUT:
769	RETVAL	969	RETVAL
770		970
771	void	971	void
772	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.)
773	CODE:	973	CODE:
774	self->r = r;	974	self->r = r;
775	self->g = g;	975	self->g = g;
776	self->b = b;	976	self->b = b;
777	self->a = a;	977	self->a = a;
778		978
779	void	979	void
780	set_font (CFClient::Layout self, CFClient::Font font = 0)	980	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781	CODE:	981	CODE:
782	if (self->font != font)	982	if (self->font != font)
783	{	983	{
784	self->font = font;	984	self->font = font;
785	layout_update_font (self);	985	layout_update_font (self);
786	}	986	}
787		987
788	void	988	void
789	set_height (CFClient::Layout self, int base_height)	989	set_height (CFPlus::Layout self, int base_height)
790	CODE:	990	CODE:
791	if (self->base_height != base_height)	991	if (self->base_height != base_height)
792	{	992	{
793	self->base_height = base_height;	993	self->base_height = base_height;
794	layout_update_font (self);	994	layout_update_font (self);
795	}	995	}
796		996
797	void	997	void
798	set_width (CFClient::Layout self, int max_width = -1)	998	set_width (CFPlus::Layout self, int max_width = -1)
799	CODE:	999	CODE:
800	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);
801		1001
802	void	1002	void
		1003	set_indent (CFPlus::Layout self, int indent)
		1004	CODE:
		1005	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1006
		1007	void
		1008	set_spacing (CFPlus::Layout self, int spacing)
		1009	CODE:
		1010	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1011
		1012	void
		1013	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1014	CODE:
		1015	pango_layout_set_ellipsize (self->pl,
		1016	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1017	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1018	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1019	: PANGO_ELLIPSIZE_NONE
		1020	);
		1021
		1022	void
		1023	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1024	CODE:
		1025	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1026
		1027	void
803	size (CFClient::Layout self)	1028	size (CFPlus::Layout self)
804	PPCODE:	1029	PPCODE:
805	{	1030	{
806	int w, h;	1031	int w, h;
807		1032
808	layout_get_pixel_size (self, &w, &h);	1033	layout_get_pixel_size (self, &w, &h);
…		…
811	PUSHs (sv_2mortal (newSViv (w)));	1036	PUSHs (sv_2mortal (newSViv (w)));
812	PUSHs (sv_2mortal (newSViv (h)));	1037	PUSHs (sv_2mortal (newSViv (h)));
813	}	1038	}
814		1039
815	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
816	xy_to_index (CFClient::Layout self, int x, int y)	1053	xy_to_index (CFPlus::Layout self, int x, int y)
817	CODE:	1054	CODE:
818	{	1055	{
819	int index, trailing;	1056	int index, trailing;
820	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);
821	RETVAL = index;	1058	RETVAL = index;
822	}	1059	}
823	OUTPUT:	1060	OUTPUT:
824	RETVAL	1061	RETVAL
825		1062
826	void	1063	void
827	cursor_pos (CFClient::Layout self, int index)	1064	cursor_pos (CFPlus::Layout self, int index)
828	PPCODE:	1065	PPCODE:
829	{	1066	{
830	PangoRectangle strong_pos;	1067	PangoRectangle strong_pos;
831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1068	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832		1069
…		…
835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1073	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837	}	1074	}
838		1075
839	void	1076	void
840	render (CFClient::Layout self)	1077	render (CFPlus::Layout self, float x, float y, int flags = 0)
841	PPCODE:	1078	PPCODE:
842	{	1079	pango_opengl_render_layout_subpixel (
843	SV *retval;	1080	self->pl,
844	int w, h;	1081	x * PANGO_SCALE, y * PANGO_SCALE,
		1082	self->r, self->g, self->b, self->a,
		1083	flags
		1084	);
845		1085
846	layout_get_pixel_size (self, &w, &h);	1086	MODULE = CFPlus PACKAGE = CFPlus::Texture
847		1087
848	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)
849	{	1096	{
850	cairo_surface_t *surface;	1097	int nw = minpot (ow);
851	cairo_t *cairo;	1098	int nh = minpot (oh);
852		1099
853	retval = newSV (w * h * 4);	1100	if (nw != ow \|\| nh != oh)
854	SvPOK_only (retval);
855	SvCUR_set (retval, w * h * 4);
856
857	memset (SvPVX (retval), 0, w * h * 4);
858
859	surface = cairo_image_surface_create_for_data (
860	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
861	cairo = cairo_create (surface);
862	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
863
864	pango_cairo_show_layout (cairo, self->pl);
865
866	cairo_destroy (cairo);
867	cairo_surface_destroy (surface);
868
869	// what a mess, and its premultiplied, too :(
870	{	1101	{
871	uint32_t p = (uint32_t )SvPVX (retval);	1102	if (SvOK (data_))
872	uint32_t e = p + w h;
873
874	while (p < e)
875	{	1103	{
876	uint32_t rgba = *p;	1104	STRLEN datalen;
877	rgba = (rgba >> 24) \| (rgba << 8);	1105	char *data = SvPVbyte (data_, datalen);
878	rgba = SDL_SwapBE32 (rgba);	1106	int bpp = datalen / (ow * oh);
879	*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_);
880	}	1117	}
		1118
		1119	sv_setiv (w_, nw);
		1120	sv_setiv (h_, nh);
881	}	1121	}
882
883	EXTEND (SP, 5);
884	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));
886	PUSHs (sv_2mortal (retval));
887	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889	}	1122	}
890	else
891	{
892	FT_Bitmap bitmap;
893
894	retval = newSV (w * h);
895	SvPOK_only (retval);
896	SvCUR_set (retval, w * h);
897
898	bitmap.rows = h;
899	bitmap.width = w;
900	bitmap.pitch = w;
901	bitmap.buffer = (unsigned char*)SvPVX (retval);
902	bitmap.num_grays = 256;
903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
904
905	memset (bitmap.buffer, 0, w * h);
906
907	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
908
909	EXTEND (SP, 5);
910	PUSHs (sv_2mortal (newSViv (w)));
911	PUSHs (sv_2mortal (newSViv (h)));
912	PUSHs (sv_2mortal (retval));
913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915	}
916	}	1123	}
917		1124
918	MODULE = CFClient PACKAGE = CFClient::Texture
919
920	void	1125	void
921	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.)
922	PROTOTYPE: $$$;$$	1127	PROTOTYPE: $$$;$$
923	ALIAS:	1128	ALIAS:
924	draw_quad_alpha = 1	1129	draw_quad_alpha = 1
925	draw_quad_alpha_premultiplied = 2	1130	draw_quad_alpha_premultiplied = 2
926	CODE:	1131	CODE:
927	{	1132	{
928	HV hv = (HV )SvRV (self);	1133	HV hv = (HV )SvRV (self);
929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1134	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1135	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1136	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933		1137
934	if (items < 5)	1138	if (items < 5)
935	{	1139	{
936	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1140	w = SvNV (*hv_fetch (hv, "w", 1, 1));
937	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1141	h = SvNV (*hv_fetch (hv, "h", 1, 1));
938	}	1142	}
939		1143
940	if (ix)	1144	if (ix)
941	{	1145	{
942	glEnable (GL_BLEND);	1146	glEnable (GL_BLEND);
		1147
		1148	if (ix == 2)
943	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
		1154	glEnable (GL_ALPHA_TEST);
		1155	glAlphaFunc (GL_GREATER, 0.01f);
944	}	1156	}
945		1157
946	glBindTexture (GL_TEXTURE_2D, name);	1158	glBindTexture (GL_TEXTURE_2D, name);
947
948	if (wrap_mode)
949	{
950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952	}
953		1159
954	glBegin (GL_QUADS);	1160	glBegin (GL_QUADS);
955	glTexCoord2f (0, 0); glVertex2f (x , y );	1161	glTexCoord2f (0, 0); glVertex2f (x , y );
956	glTexCoord2f (0, t); glVertex2f (x , y + h);	1162	glTexCoord2f (0, t); glVertex2f (x , y + h);
957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1163	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1164	glTexCoord2f (s, 0); glVertex2f (x + w, y );
959	glEnd ();	1165	glEnd ();
960		1166
961	if (ix)	1167	if (ix)
		1168	{
		1169	glDisable (GL_ALPHA_TEST);
962	glDisable (GL_BLEND);	1170	glDisable (GL_BLEND);
		1171	}
963	}	1172	}
964		1173
965	MODULE = CFClient PACKAGE = CFClient::Map	1174	MODULE = CFPlus PACKAGE = CFPlus::Map
966		1175
967	CFClient::Map	1176	CFPlus::Map
968	new (SV *class, int map_width, int map_height)	1177	new (SV *class, int map_width, int map_height)
969	CODE:	1178	CODE:
970	New (0, RETVAL, 1, struct map);	1179	New (0, RETVAL, 1, struct map);
971	RETVAL->x = 0;	1180	RETVAL->x = 0;
972	RETVAL->y = 0;	1181	RETVAL->y = 0;
…		…
982	RETVAL->row = 0;	1191	RETVAL->row = 0;
983	OUTPUT:	1192	OUTPUT:
984	RETVAL	1193	RETVAL
985		1194
986	void	1195	void
987	DESTROY (CFClient::Map self)	1196	DESTROY (CFPlus::Map self)
988	CODE:	1197	CODE:
989	{	1198	{
990	map_clear (self);	1199	map_clear (self);
991	Safefree (self->face);	1200	Safefree (self->face);
		1201	Safefree (self->tex);
992	Safefree (self);	1202	Safefree (self);
993	}	1203	}
994		1204
995	void	1205	void
996	clear (CFClient::Map self)	1206	clear (CFPlus::Map self)
997	CODE:	1207	CODE:
998	map_clear (self);	1208	map_clear (self);
999		1209
1000	void	1210	void
1001	set_face (CFClient::Map self, int face, int texid)	1211	set_face (CFPlus::Map self, int face, int texid)
1002	CODE:	1212	CODE:
1003	{	1213	{
1004	while (self->faces <= face)	1214	while (self->faces <= face)
1005	{	1215	{
1006	Append (mapface, self->face, self->faces, self->faces);	1216	Append (mapface, self->face, self->faces, self->faces);
…		…
1009		1219
1010	self->face [face] = texid;	1220	self->face [face] = texid;
1011	}	1221	}
1012		1222
1013	void	1223	void
1014	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)
1015	CODE:	1225	CODE:
1016	{	1226	{
1017	while (self->texs <= texid)	1227	while (self->texs <= texid)
1018	{	1228	{
1019	Append (maptex, self->tex, self->texs, self->texs);	1229	Append (maptex, self->tex, self->texs, self->texs);
…		…
1031	tex->r = r;	1241	tex->r = r;
1032	tex->g = g;	1242	tex->g = g;
1033	tex->b = b;	1243	tex->b = b;
1034	tex->a = a;	1244	tex->a = a;
1035	}	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);
1036	}	1255	}
1037		1256
1038	int	1257	int
1039	ox (CFClient::Map self)	1258	ox (CFPlus::Map self)
1040	ALIAS:	1259	ALIAS:
1041	oy = 1	1260	oy = 1
		1261	x = 2
		1262	y = 3
		1263	w = 4
		1264	h = 5
1042	CODE:	1265	CODE:
1043	switch (ix)	1266	switch (ix)
1044	{	1267	{
1045	case 0: RETVAL = self->ox; break;	1268	case 0: RETVAL = self->ox; break;
1046	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;
1047	}	1274	}
1048	OUTPUT:	1275	OUTPUT:
1049	RETVAL	1276	RETVAL
1050		1277
1051	void	1278	void
1052	scroll (CFClient::Map self, int dx, int dy)	1279	scroll (CFPlus::Map self, int dx, int dy)
1053	CODE:	1280	CODE:
1054	{	1281	{
1055	if (dx > 0)	1282	if (dx > 0)
1056	map_blank (self, self->x, self->y, dx - 1, self->h);	1283	map_blank (self, self->x, self->y, dx, self->h);
1057	else if (dx < 0)	1284	else if (dx < 0)
1058	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);
1059		1286
1060	if (dy > 0)	1287	if (dy > 0)
1061	map_blank (self, self->x, self->y, self->w, dy - 1);	1288	map_blank (self, self->x, self->y, self->w, dy);
1062	else if (dy < 0)	1289	else if (dy < 0)
1063	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);
1064		1291
1065	self->ox += dx; self->x += dx;	1292	self->ox += dx; self->x += dx;
1066	self->oy += dy; self->y += dy;	1293	self->oy += dy; self->y += dy;
1067		1294
1068	while (self->y < 0)	1295	while (self->y < 0)
…		…
1073	self->y += MAP_EXTEND_Y;	1300	self->y += MAP_EXTEND_Y;
1074	}	1301	}
1075	}	1302	}
1076		1303
1077	void	1304	void
1078	map1a_update (CFClient::Map self, SV *data_)	1305	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1079	CODE:	1306	CODE:
1080	{	1307	{
1081	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1308	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1082	uint8_t data_end = (uint8_t )SvEND (data_);	1309	uint8_t data_end = (uint8_t )SvEND (data_);
1083	mapcell *cell;	1310	mapcell *cell;
1084	int x, y, flags;	1311	int x, y, flags;
1085		1312
1086	while (data < data_end)	1313	while (data < data_end - 1)
1087	{	1314	{
1088	flags = (data [0] << 8) + data [1]; data += 2;	1315	flags = (data [0] << 8) + data [1]; data += 2;
1089		1316
1090	x = ((flags >> 10) & 63) + self->x;	1317	x = self->x + ((flags >> 10) & 63);
1091	y = ((flags >> 4) & 63) + self->y;	1318	y = self->y + ((flags >> 4) & 63);
1092		1319
1093	cell = map_get_cell (self, x, y);	1320	cell = map_get_cell (self, x, y);
1094		1321
1095	if (flags & 15)	1322	if (flags & 15)
1096	{	1323	{
1097	if (cell->darkness < 0)	1324	if (!cell->darkness)
1098	{	1325	{
		1326	memset (cell, 0, sizeof (*cell));
1099	cell->darkness = 0;	1327	cell->darkness = 256;
1100	cell->face [0] = 0;
1101	cell->face [1] = 0;
1102	cell->face [2] = 0;
1103	}	1328	}
1104		1329
1105	cell->darkness = flags & 8 ? *data++ : 255;
1106
1107	//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	}
1108		1371
1109	if (flags & 4)	1372	if (flags & 4)
1110	{	1373	{
1111	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;
1112	}	1375	}
…		…
1120	{	1383	{
1121	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;
1122	}	1385	}
1123	}	1386	}
1124	else	1387	else
1125	cell->darkness = -1;	1388	cell->darkness = 0;
1126	}	1389	}
1127	}	1390	}
1128		1391
1129	SV *	1392	SV *
1130	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)
1131	CODE:	1394	CODE:
1132	{	1395	{
1133	int x1, x;	1396	int x1, x;
1134	int y1, y;	1397	int y1, y;
1135	int z;	1398	int z;
…		…
1185	}	1448	}
1186	OUTPUT:	1449	OUTPUT:
1187	RETVAL	1450	RETVAL
1188		1451
1189	void	1452	void
1190	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)
1191	PPCODE:	1454	CODE:
1192	{	1455	{
1193	int vx, vy;	1456	int vx, vy;
1194	int x, y, z;	1457	int x, y, z;
1195	int last_name;	1458	int last_name;
1196	mapface face;	1459	mapface face;
1197	int sw4 = (sw + 3) & ~3;
1198	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1199	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1200		1460
1201	memset (darkness, 255, sw4 * sh);
1202	SvPOK_only (darkness_sv);
1203	SvCUR_set (darkness_sv, sw4 * sh);
1204
1205	vx = self->x + (self->w - sw) / 2 - shift_x;	1461	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1206	vy = self->y + (self->h - sh) / 2 - shift_y;	1462	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1207		1463
1208	/*	1464	/*
1209	int vx = self->vx = self->w >= sw	1465	int vx = self->vx = self->w >= sw
1210	? self->x + (self->w - sw) / 2	1466	? self->x + (self->w - sw) / 2
1211	: 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));
…		…
1215	: 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));
1216	*/	1472	*/
1217		1473
1218	glColor4ub (255, 255, 255, 255);	1474	glColor4ub (255, 255, 255, 255);
1219		1475
		1476	glEnable (GL_BLEND);
1220	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1477	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221	glEnable (GL_BLEND);
1222	glEnable (GL_TEXTURE_2D);	1478	glEnable (GL_TEXTURE_2D);
1223	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1479	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224		1480
1225	glBegin (GL_QUADS);	1481	glBegin (GL_QUADS);
1226		1482
…		…
1235	for (x = 0; x < sw; x++)	1491	for (x = 0; x < sw; x++)
1236	if (row->c0 <= x + vx && x + vx < row->c1)	1492	if (row->c0 <= x + vx && x + vx < row->c1)
1237	{	1493	{
1238	mapcell *cell = row->col + (x + vx - row->c0);	1494	mapcell *cell = row->col + (x + vx - row->c0);
1239		1495
1240	darkness[y * sw4 + x] = cell->darkness < 0
1241	? 255 - FOW_DARKNESS
1242	: 255 - cell->darkness;
1243
1244	face = cell->face [z];	1496	face = cell->face [z];
1245		1497
1246	if (face)	1498	if (face && face < self->texs)
1247	{	1499	{
1248	maptex tex = self->tex [face];	1500	maptex tex = self->tex [face];
1249
1250	int px = (x + 1) * 32 - tex.w;	1501	int px = (x + 1) * 32 - tex.w;
1251	int py = (y + 1) * 32 - tex.h;	1502	int py = (y + 1) * 32 - tex.h;
1252		1503
1253	if (last_name != tex.name)	1504	if (last_name != tex.name)
1254	{	1505	{
1255	glEnd ();	1506	glEnd ();
1256	last_name = tex.name;
1257	glBindTexture (GL_TEXTURE_2D, last_name);	1507	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1258	glBegin (GL_QUADS);	1508	glBegin (GL_QUADS);
1259	}	1509	}
1260		1510
1261	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1511	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1262	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1512	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1263	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);
1264	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1514	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1265	}	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	}
1266	}	1535	}
1267	}	1536	}
1268		1537
1269	glEnd ();	1538	glEnd ();
1270		1539
1271	glDisable (GL_TEXTURE_2D);	1540	glDisable (GL_TEXTURE_2D);
1272	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	}
1273		1667
1274	EXTEND (SP, 3);	1668	EXTEND (SP, 3);
1275	PUSHs (sv_2mortal (newSViv (sw4)));	1669	PUSHs (sv_2mortal (newSViv (sw4)));
1276	PUSHs (sv_2mortal (newSViv (sh)));	1670	PUSHs (sv_2mortal (newSViv (sh)));
1277	PUSHs (darkness_sv);	1671	PUSHs (darkness_sv);
1278	}	1672	}
1279		1673
1280	SV *	1674	SV *
1281	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)
1282	CODE:	1676	CODE:
1283	{	1677	{
1284	int x, y, x1, y1;	1678	int x, y, x1, y1;
1285	SV data_sv = newSV (w h * 7 + 5);	1679	SV data_sv = newSV (w h * 7 + 5);
1286	uint8_t data = (uint8_t )SvPVX (data_sv);	1680	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1348	}	1742	}
1349	OUTPUT:	1743	OUTPUT:
1350	RETVAL	1744	RETVAL
1351		1745
1352	void	1746	void
1353	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)
1354	PPCODE:	1748	PPCODE:
1355	{	1749	{
1356	int x, y, z;	1750	int x, y, z;
1357	int w, h;	1751	int w, h;
1358	int x1, y1;	1752	int x1, y1;
…		…
1390		1784
1391	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1785	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1392	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1786	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1393	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1787	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1394		1788
1395	if (cell->darkness <= 0)	1789	if (cell->darkness == 0)
1396	{	1790	{
1397	cell->darkness = -1;	1791	cell->darkness = 0;
1398		1792
1399	for (z = 0; z <= 2; z++)	1793	for (z = 0; z <= 2; z++)
1400	{	1794	{
1401	cell->face[z] = face[z];	1795	cell->face[z] = face[z];
1402		1796
…		…
1407	}	1801	}
1408	}	1802	}
1409	}	1803	}
1410	}	1804	}
1411		1805
1412	MODULE = CFClient PACKAGE = CFClient::MixChunk	1806	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413		1807
1414	CFClient::MixChunk	1808	CFPlus::MixChunk
1415	new_from_file (SV class, char path)	1809	new_from_file (SV class, char path)
1416	CODE:	1810	CODE:
1417	RETVAL = Mix_LoadWAV (path);	1811	RETVAL = Mix_LoadWAV (path);
1418	OUTPUT:	1812	OUTPUT:
1419	RETVAL	1813	RETVAL
1420		1814
1421	void	1815	void
1422	DESTROY (CFClient::MixChunk self)	1816	DESTROY (CFPlus::MixChunk self)
1423	CODE:	1817	CODE:
1424	Mix_FreeChunk (self);	1818	Mix_FreeChunk (self);
1425		1819
1426	int	1820	int
1427	volume (CFClient::MixChunk self, int volume = -1)	1821	volume (CFPlus::MixChunk self, int volume = -1)
1428	CODE:	1822	CODE:
1429	RETVAL = Mix_VolumeChunk (self, volume);	1823	RETVAL = Mix_VolumeChunk (self, volume);
1430	OUTPUT:	1824	OUTPUT:
1431	RETVAL	1825	RETVAL
1432		1826
1433	int	1827	int
1434	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)
1435	CODE:	1829	CODE:
1436	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1830	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437	OUTPUT:	1831	OUTPUT:
1438	RETVAL	1832	RETVAL
1439		1833
1440	MODULE = CFClient PACKAGE = CFClient::MixMusic	1834	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441		1835
1442	int	1836	int
1443	volume (int volume = -1)	1837	volume (int volume = -1)
1444	CODE:	1838	CODE:
1445	RETVAL = Mix_VolumeMusic (volume);	1839	RETVAL = Mix_VolumeMusic (volume);
1446	OUTPUT:	1840	OUTPUT:
1447	RETVAL	1841	RETVAL
1448		1842
1449	CFClient::MixMusic	1843	CFPlus::MixMusic
1450	new_from_file (SV class, char path)	1844	new_from_file (SV class, char path)
1451	CODE:	1845	CODE:
1452	RETVAL = Mix_LoadMUS (path);	1846	RETVAL = Mix_LoadMUS (path);
1453	OUTPUT:	1847	OUTPUT:
1454	RETVAL	1848	RETVAL
1455		1849
1456	void	1850	void
1457	DESTROY (CFClient::MixMusic self)	1851	DESTROY (CFPlus::MixMusic self)
1458	CODE:	1852	CODE:
1459	Mix_FreeMusic (self);	1853	Mix_FreeMusic (self);
1460		1854
1461	int	1855	int
1462	play (CFClient::MixMusic self, int loops = -1)	1856	play (CFPlus::MixMusic self, int loops = -1)
1463	CODE:	1857	CODE:
1464	RETVAL = Mix_PlayMusic (self, loops);	1858	RETVAL = Mix_PlayMusic (self, loops);
1465	OUTPUT:	1859	OUTPUT:
1466	RETVAL	1860	RETVAL
1467		1861
1468	MODULE = CFClient PACKAGE = CFClient::OpenGL	1862	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469		1863
1470	BOOT:	1864	BOOT:
1471	{	1865	{
1472	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1866	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473	static const struct {	1867	static const struct {
1474	const char *name;	1868	const char *name;
1475	IV iv;	1869	IV iv;
1476	} *civ, const_iv[] = {	1870	} *civ, const_iv[] = {
1477	# define const_iv(name) { # name, (IV)name }	1871	# define const_iv(name) { # name, (IV)name }
1478	const_iv (GL_COLOR_MATERIAL),	1872	const_iv (GL_COLOR_MATERIAL),
1479	const_iv (GL_SMOOTH),	1873	const_iv (GL_SMOOTH),
1480	const_iv (GL_FLAT),	1874	const_iv (GL_FLAT),
1481	const_iv (GL_DITHER),	1875	const_iv (GL_DITHER),
1482	const_iv (GL_BLEND),	1876	const_iv (GL_BLEND),
		1877	const_iv (GL_CULL_FACE),
1483	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),
1484	const_iv (GL_AND),	1885	const_iv (GL_AND),
1485	const_iv (GL_ONE),	1886	const_iv (GL_ONE),
1486	const_iv (GL_ZERO),	1887	const_iv (GL_ZERO),
1487	const_iv (GL_SRC_ALPHA),	1888	const_iv (GL_SRC_ALPHA),
1488	const_iv (GL_SRC_ALPHA_SATURATE),	1889	const_iv (GL_DST_ALPHA),
1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1890	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490	const_iv (GL_ONE_MINUS_DST_ALPHA),	1891	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1892	const_iv (GL_SRC_ALPHA_SATURATE),
1491	const_iv (GL_RGB),	1893	const_iv (GL_RGB),
1492	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),
1493	const_iv (GL_UNSIGNED_BYTE),	1898	const_iv (GL_UNSIGNED_BYTE),
		1899	const_iv (GL_UNSIGNED_SHORT),
		1900	const_iv (GL_UNSIGNED_INT),
1494	const_iv (GL_ALPHA),	1901	const_iv (GL_ALPHA),
		1902	const_iv (GL_INTENSITY),
1495	const_iv (GL_LUMINANCE),	1903	const_iv (GL_LUMINANCE),
		1904	const_iv (GL_LUMINANCE_ALPHA),
1496	const_iv (GL_FLOAT),	1905	const_iv (GL_FLOAT),
1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1906	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498	const_iv (GL_COMPILE),	1907	const_iv (GL_COMPILE),
1499	const_iv (GL_TEXTURE_1D),	1908	const_iv (GL_TEXTURE_1D),
1500	const_iv (GL_TEXTURE_2D),	1909	const_iv (GL_TEXTURE_2D),
…		…
1502	const_iv (GL_TEXTURE_MAG_FILTER),	1911	const_iv (GL_TEXTURE_MAG_FILTER),
1503	const_iv (GL_TEXTURE_MIN_FILTER),	1912	const_iv (GL_TEXTURE_MIN_FILTER),
1504	const_iv (GL_TEXTURE_ENV_MODE),	1913	const_iv (GL_TEXTURE_ENV_MODE),
1505	const_iv (GL_TEXTURE_WRAP_S),	1914	const_iv (GL_TEXTURE_WRAP_S),
1506	const_iv (GL_TEXTURE_WRAP_T),	1915	const_iv (GL_TEXTURE_WRAP_T),
		1916	const_iv (GL_REPEAT),
1507	const_iv (GL_CLAMP),	1917	const_iv (GL_CLAMP),
1508	const_iv (GL_REPEAT),	1918	const_iv (GL_CLAMP_TO_EDGE),
1509	const_iv (GL_NEAREST),	1919	const_iv (GL_NEAREST),
1510	const_iv (GL_LINEAR),	1920	const_iv (GL_LINEAR),
1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1921	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1922	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1923	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1924	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515	const_iv (GL_GENERATE_MIPMAP),	1925	const_iv (GL_GENERATE_MIPMAP),
1516	const_iv (GL_MODULATE),	1926	const_iv (GL_MODULATE),
1517	const_iv (GL_DECAL),	1927	const_iv (GL_DECAL),
1518	const_iv (GL_REPLACE),	1928	const_iv (GL_REPLACE),
		1929	const_iv (GL_DEPTH_BUFFER_BIT),
1519	const_iv (GL_COLOR_BUFFER_BIT),	1930	const_iv (GL_COLOR_BUFFER_BIT),
1520	const_iv (GL_PROJECTION),	1931	const_iv (GL_PROJECTION),
1521	const_iv (GL_MODELVIEW),	1932	const_iv (GL_MODELVIEW),
1522	const_iv (GL_COLOR_LOGIC_OP),	1933	const_iv (GL_COLOR_LOGIC_OP),
1523	const_iv (GL_SEPARABLE_2D),	1934	const_iv (GL_SEPARABLE_2D),
1524	const_iv (GL_CONVOLUTION_2D),	1935	const_iv (GL_CONVOLUTION_2D),
1525	const_iv (GL_CONVOLUTION_BORDER_MODE),	1936	const_iv (GL_CONVOLUTION_BORDER_MODE),
1526	const_iv (GL_CONSTANT_BORDER),	1937	const_iv (GL_CONSTANT_BORDER),
1527	const_iv (GL_LINES),	1938	const_iv (GL_LINES),
		1939	const_iv (GL_LINE_STRIP),
		1940	const_iv (GL_LINE_LOOP),
1528	const_iv (GL_QUADS),	1941	const_iv (GL_QUADS),
1529	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),
1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1946	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531	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),
1532	# undef const_iv	1952	# undef const_iv
1533	};	1953	};
1534		1954
1535	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; )
1536	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1956	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537	}	1957	}
1538		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
1539	int glGetError ()	1980	int glGetError ()
		1981
		1982	void glFinish ()
1540		1983
1541	void glClear (int mask)	1984	void glClear (int mask)
1542		1985
1543	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)
1544	PROTOTYPE: @	1987	PROTOTYPE: @
…		…
1551		1994
1552	void glHint (int target, int mode)	1995	void glHint (int target, int mode)
1553		1996
1554	void glBlendFunc (int sfactor, int dfactor)	1997	void glBlendFunc (int sfactor, int dfactor)
1555		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
1556	void glLogicOp (int opcode)	2005	void glLogicOp (int opcode)
1557		2006
1558	void glColorMask (int red, int green, int blue, int alpha)	2007	void glColorMask (int red, int green, int blue, int alpha)
1559		2008
1560	void glMatrixMode (int mode)	2009	void glMatrixMode (int mode)
…		…
1563		2012
1564	void glPopMatrix ()	2013	void glPopMatrix ()
1565		2014
1566	void glLoadIdentity ()	2015	void glLoadIdentity ()
1567		2016
		2017	void glDrawBuffer (int buffer)
		2018
		2019	void glReadBuffer (int buffer)
		2020
1568	# 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
1569	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_)
1570		2026
1571	void glViewport (int x, int y, int width, int height)	2027	void glViewport (int x, int y, int width, int height)
1572		2028
1573	void glScissor (int x, int y, int width, int height)	2029	void glScissor (int x, int y, int width, int height)
…		…
1588		2044
1589	void glEnd ()	2045	void glEnd ()
1590		2046
1591	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)
1592	PROTOTYPE: @	2048	PROTOTYPE: @
		2049	ALIAS:
		2050	glColor_premultiply = 1
1593	CODE:	2051	CODE:
1594	// 255.999 is close enough to correctness (256 and clamp)	2052	if (ix)
1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	2053	{
		2054	r *= a;
		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);
1596		2071
1597	void glVertex (float x, float y, float z = 0.)	2072	void glVertex (float x, float y, float z = 0.)
1598	CODE:	2073	CODE:
1599	glVertex3f (x, y, z);	2074	glVertex3f (x, y, z);
1600		2075
…		…
1612		2087
1613	void glBindTexture (int target, int name)	2088	void glBindTexture (int target, int name)
1614		2089
1615	void glConvolutionParameter (int target, int pname, float params)	2090	void glConvolutionParameter (int target, int pname, float params)
1616	CODE:	2091	CODE:
1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2092	if (gl.ConvolutionParameterf)
		2093	gl.ConvolutionParameterf (target, pname, params);
1618		2094
1619	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)
1620	CODE:	2096	CODE:
1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2097	if (gl.ConvolutionFilter2D)
1622	(target, internalformat, width, height, format, type, data));	2098	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623		2099
1624	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)
1625	CODE:	2101	CODE:
1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2102	if (gl.SeparableFilter2D)
1627	(target, internalformat, width, height, format, type, row, column));	2103	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628		2104
1629	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)
1630		2106
1631	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)
1632		2108
1633	void glRasterPos (int x, int y)	2109	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634	CODE:
1635	glRasterPos2i (x, y);
1636		2110
1637	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)
1638		2112
1639	int glGenTexture ()	2113	int glGenTexture ()
1640	CODE:	2114	CODE:

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.79 by root, Sun May 14 22:24:14 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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC