[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.161 by root, Mon Oct 9 23:30:44 2006 UTC

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