[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.158 by root, Sun Oct 1 18:17:37 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	INTERNET_PROXY_INFO proxyinfo;
		662	char buffer[2048];
		663	DWORD buflen;
560		664
561	char *	665	EXTEND (SP, 3);
562	gl_extensions ()	666
563	CODE:	667	buflen = sizeof (buffer);
564	RETVAL = (char *)glGetString (GL_EXTENSIONS);	668	if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
565	OUTPUT:	669	if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
566	RETVAL	670	{
		671	PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
		672
		673	buflen = sizeof (buffer);
		674	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
		675	{
		676	PUSHs (newSVpv (buffer, 0));
		677
		678	buflen = sizeof (buffer);
		679	if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
		680	PUSHs (newSVpv (buffer, 0));
		681	}
		682	}
		683	#endif
		684	}
567		685
568	void	686	void
569	add_font (char *file)	687	add_font (char *file)
570	CODE:	688	CODE:
571	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	689	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572	#ifdef _WIN32
573	// cairo... sigh... requires win2000
574	AddFontResourceEx (file, FR_PRIVATE, 0);
575	#endif
576		690
577	void	691	void
578	load_image_inline (SV *image_)	692	load_image_inline (SV *image_)
579	ALIAS:	693	ALIAS:
580	load_image_file = 1	694	load_image_file = 1
…		…
622		736
623	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	737	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624		738
625	assert (surface2->pitch == surface2->w * 4);	739	assert (surface2->pitch == surface2->w * 4);
626		740
		741	SDL_LockSurface (surface2);
627	EXTEND (SP, 5);	742	EXTEND (SP, 6);
628	PUSHs (sv_2mortal (newSViv (surface2->w)));	743	PUSHs (sv_2mortal (newSViv (surface2->w)));
629	PUSHs (sv_2mortal (newSViv (surface2->h)));	744	PUSHs (sv_2mortal (newSViv (surface2->h)));
630	SDL_LockSurface (surface2);
631	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	745	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)));	746	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
634	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	747	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	748	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		749	SDL_UnlockSurface (surface2);
636		750
637	SDL_FreeSurface (surface);	751	SDL_FreeSurface (surface);
638	SDL_FreeSurface (surface2);	752	SDL_FreeSurface (surface2);
639	}	753	}
640		754
…		…
664	}	778	}
665		779
666	void	780	void
667	error (char *message)	781	error (char *message)
668	CODE:	782	CODE:
		783	fprintf (stderr, "ERROR: %s\n", message);
669	#ifdef _WIN32	784	#ifdef _WIN32
670	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	785	MessageBox (0, message, "Crossfire+ Error", MB_OK \| MB_ICONERROR);
671	#else
672	fprintf (stderr, "ERROR: %s\n", message);
673	#endif	786	#endif
674		787
675	void	788	void
676	fatal (char *message)	789	fatal (char *message)
677	CODE:	790	CODE:
		791	fprintf (stderr, "FATAL: %s\n", message);
678	#ifdef _WIN32	792	#ifdef _WIN32
679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR \| MB_SETFOREGROUND);	793	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
680	#else
681	fprintf (stderr, "FATAL: %s\n", message);
682	#endif	794	#endif
683	exit (1);	795	_exit (1);
684		796
		797	void
		798	_exit (int retval = 0)
		799	CODE:
		800	_exit (retval);
		801
685	MODULE = CFClient PACKAGE = CFClient::Font	802	MODULE = CFPlus PACKAGE = CFPlus::Font
686		803
687	CFClient::Font	804	CFPlus::Font
688	new_from_file (SV class, char path, int id = 0)	805	new_from_file (SV class, char path, int id = 0)
689	CODE:	806	CODE:
690	{	807	{
691	int count;	808	int count;
692	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	809	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
695	}	812	}
696	OUTPUT:	813	OUTPUT:
697	RETVAL	814	RETVAL
698		815
699	void	816	void
700	DESTROY (CFClient::Font self)	817	DESTROY (CFPlus::Font self)
701	CODE:	818	CODE:
702	pango_font_description_free (self);	819	pango_font_description_free (self);
703		820
704	void	821	void
705	make_default (CFClient::Font self)	822	make_default (CFPlus::Font self)
706	CODE:	823	CODE:
707	default_font = self;	824	default_font = self;
708		825
709	MODULE = CFClient PACKAGE = CFClient::Layout	826	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		827
711	CFClient::Layout	828	void
712	new (SV *class, int rgba = 0)	829	reset_glyph_cache ()
		830	CODE:
		831	tc_clear ();
		832
		833	CFPlus::Layout
		834	new (SV *class)
713	CODE:	835	CODE:
714	New (0, RETVAL, 1, struct cf_layout);	836	New (0, RETVAL, 1, struct cf_layout);
715		837
716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	838	RETVAL->pl = pango_layout_new (opengl_context);
717	RETVAL->rgba = rgba;
718	RETVAL->r = 1.;	839	RETVAL->r = 1.;
719	RETVAL->g = 1.;	840	RETVAL->g = 1.;
720	RETVAL->b = 1.;	841	RETVAL->b = 1.;
721	RETVAL->a = 1.;	842	RETVAL->a = 1.;
722	RETVAL->base_height = MIN_FONT_HEIGHT;	843	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
726	layout_update_font (RETVAL);	847	layout_update_font (RETVAL);
727	OUTPUT:	848	OUTPUT:
728	RETVAL	849	RETVAL
729		850
730	void	851	void
731	DESTROY (CFClient::Layout self)	852	DESTROY (CFPlus::Layout self)
732	CODE:	853	CODE:
733	g_object_unref (self->pl);	854	g_object_unref (self->pl);
734	Safefree (self);	855	Safefree (self);
735		856
736	int
737	is_rgba (CFClient::Layout self)
738	CODE:
739	RETVAL = self->rgba;
740	OUTPUT:
741	RETVAL
742
743	void	857	void
744	set_text (CFClient::Layout self, SV *text_)	858	set_text (CFPlus::Layout self, SV *text_)
745	CODE:	859	CODE:
746	{	860	{
747	STRLEN textlen;	861	STRLEN textlen;
748	char *text = SvPVutf8 (text_, textlen);	862	char *text = SvPVutf8 (text_, textlen);
749		863
750	pango_layout_set_text (self->pl, text, textlen);	864	pango_layout_set_text (self->pl, text, textlen);
751	}	865	}
752		866
753	void	867	void
754	set_markup (CFClient::Layout self, SV *text_)	868	set_markup (CFPlus::Layout self, SV *text_)
755	CODE:	869	CODE:
756	{	870	{
757	STRLEN textlen;	871	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	872	char *text = SvPVutf8 (text_, textlen);
759		873
760	pango_layout_set_markup (self->pl, text, textlen);	874	pango_layout_set_markup (self->pl, text, textlen);
761	}	875	}
762		876
		877	void
		878	set_shapes (CFPlus::Layout self, ...)
		879	CODE:
		880	{
		881	PangoAttrList *attrs = 0;
		882	const char *text = pango_layout_get_text (self->pl);
		883	const char *pos = text;
		884	int arg = 4;
		885
		886	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		887	{
		888	PangoRectangle inkrect, rect;
		889	PangoAttribute *attr;
		890
		891	int x = SvIV (ST (arg - 3));
		892	int y = SvIV (ST (arg - 2));
		893	int w = SvIV (ST (arg - 1));
		894	int h = SvIV (ST (arg ));
		895
		896	inkrect.x = 0;
		897	inkrect.y = 0;
		898	inkrect.width = 0;
		899	inkrect.height = 0;
		900
		901	rect.x = x * PANGO_SCALE;
		902	rect.y = y * PANGO_SCALE;
		903	rect.width = w * PANGO_SCALE;
		904	rect.height = h * PANGO_SCALE;
		905
		906	if (!attrs)
		907	attrs = pango_layout_get_attributes (self->pl);
		908
		909	attr = pango_attr_shape_new (&inkrect, &rect);
		910	attr->start_index = pos - text;
		911	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		912	pango_attr_list_insert (attrs, attr);
		913
		914	arg += 4;
		915	pos += sizeof (OBJ_STR) - 1;
		916	}
		917
		918	if (attrs)
		919	pango_layout_set_attributes (self->pl, attrs);
		920	}
		921
		922	void
		923	get_shapes (CFPlus::Layout self)
		924	PPCODE:
		925	{
		926	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		927
		928	do
		929	{
		930	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		931
		932	if (run && shape_attr_p (run))
		933	{
		934	PangoRectangle extents;
		935	pango_layout_iter_get_run_extents (iter, 0, &extents);
		936
		937	EXTEND (SP, 2);
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		939	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		940	}
		941	}
		942	while (pango_layout_iter_next_run (iter));
		943
		944	pango_layout_iter_free (iter);
		945	}
		946
		947	int
		948	has_wrapped (CFPlus::Layout self)
		949	CODE:
		950	{
		951	int lines = 1;
		952	const char *text = pango_layout_get_text (self->pl);
		953
		954	while (*text)
		955	lines += *text++ == '\n';
		956
		957	RETVAL = lines < pango_layout_get_line_count (self->pl);
		958	}
		959	OUTPUT:
		960	RETVAL
		961
763	SV *	962	SV *
764	get_text (CFClient::Layout self)	963	get_text (CFPlus::Layout self)
765	CODE:	964	CODE:
766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	965	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767	SvUTF8_on (RETVAL);	966	sv_utf8_decode (RETVAL);
768	OUTPUT:	967	OUTPUT:
769	RETVAL	968	RETVAL
770		969
771	void	970	void
772	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	971	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
773	CODE:	972	CODE:
774	self->r = r;	973	self->r = r;
775	self->g = g;	974	self->g = g;
776	self->b = b;	975	self->b = b;
777	self->a = a;	976	self->a = a;
778		977
779	void	978	void
780	set_font (CFClient::Layout self, CFClient::Font font = 0)	979	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781	CODE:	980	CODE:
782	if (self->font != font)	981	if (self->font != font)
783	{	982	{
784	self->font = font;	983	self->font = font;
785	layout_update_font (self);	984	layout_update_font (self);
786	}	985	}
787		986
788	void	987	void
789	set_height (CFClient::Layout self, int base_height)	988	set_height (CFPlus::Layout self, int base_height)
790	CODE:	989	CODE:
791	if (self->base_height != base_height)	990	if (self->base_height != base_height)
792	{	991	{
793	self->base_height = base_height;	992	self->base_height = base_height;
794	layout_update_font (self);	993	layout_update_font (self);
795	}	994	}
796		995
797	void	996	void
798	set_width (CFClient::Layout self, int max_width = -1)	997	set_width (CFPlus::Layout self, int max_width = -1)
799	CODE:	998	CODE:
800	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	999	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
801		1000
802	void	1001	void
		1002	set_indent (CFPlus::Layout self, int indent)
		1003	CODE:
		1004	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		1005
		1006	void
		1007	set_spacing (CFPlus::Layout self, int spacing)
		1008	CODE:
		1009	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		1010
		1011	void
		1012	set_ellipsise (CFPlus::Layout self, int ellipsise)
		1013	CODE:
		1014	pango_layout_set_ellipsize (self->pl,
		1015	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		1016	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		1017	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		1018	: PANGO_ELLIPSIZE_NONE
		1019	);
		1020
		1021	void
		1022	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		1023	CODE:
		1024	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		1025
		1026	void
803	size (CFClient::Layout self)	1027	size (CFPlus::Layout self)
804	PPCODE:	1028	PPCODE:
805	{	1029	{
806	int w, h;	1030	int w, h;
807		1031
808	layout_get_pixel_size (self, &w, &h);	1032	layout_get_pixel_size (self, &w, &h);
…		…
811	PUSHs (sv_2mortal (newSViv (w)));	1035	PUSHs (sv_2mortal (newSViv (w)));
812	PUSHs (sv_2mortal (newSViv (h)));	1036	PUSHs (sv_2mortal (newSViv (h)));
813	}	1037	}
814		1038
815	int	1039	int
		1040	descent (CFPlus::Layout self)
		1041	CODE:
		1042	{
		1043	PangoRectangle rect;
		1044	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1045	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1046	RETVAL = PANGO_DESCENT (rect);
		1047	}
		1048	OUTPUT:
		1049	RETVAL
		1050
		1051	int
816	xy_to_index (CFClient::Layout self, int x, int y)	1052	xy_to_index (CFPlus::Layout self, int x, int y)
817	CODE:	1053	CODE:
818	{	1054	{
819	int index, trailing;	1055	int index, trailing;
820	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1056	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
821	RETVAL = index;	1057	RETVAL = index;
822	}	1058	}
823	OUTPUT:	1059	OUTPUT:
824	RETVAL	1060	RETVAL
825		1061
826	void	1062	void
827	cursor_pos (CFClient::Layout self, int index)	1063	cursor_pos (CFPlus::Layout self, int index)
828	PPCODE:	1064	PPCODE:
829	{	1065	{
830	PangoRectangle strong_pos;	1066	PangoRectangle strong_pos;
831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1067	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832		1068
…		…
835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1072	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837	}	1073	}
838		1074
839	void	1075	void
840	render (CFClient::Layout self)	1076	render (CFPlus::Layout self, float x, float y, int flags = 0)
841	PPCODE:	1077	PPCODE:
842	{	1078	pango_opengl_render_layout_subpixel (
843	SV *retval;	1079	self->pl,
844	int w, h;	1080	x * PANGO_SCALE, y * PANGO_SCALE,
		1081	self->r, self->g, self->b, self->a,
		1082	flags
		1083	);
845		1084
846	layout_get_pixel_size (self, &w, &h);	1085	MODULE = CFPlus PACKAGE = CFPlus::Texture
847		1086
848	if (self->rgba)	1087	void
		1088	pad2pot (SV data_, SV w_, SV *h_)
		1089	CODE:
		1090	{
		1091	int ow = SvIV (w_);
		1092	int oh = SvIV (h_);
		1093
		1094	if (ow && oh)
849	{	1095	{
850	cairo_surface_t *surface;	1096	int nw = minpot (ow);
851	cairo_t *cairo;	1097	int nh = minpot (oh);
852		1098
853	retval = newSV (w * h * 4);	1099	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	{	1100	{
871	uint32_t p = (uint32_t )SvPVX (retval);	1101	if (SvOK (data_))
872	uint32_t e = p + w h;
873
874	while (p < e)
875	{	1102	{
876	uint32_t rgba = *p;	1103	STRLEN datalen;
877	rgba = (rgba >> 24) \| (rgba << 8);	1104	char *data = SvPVbyte (data_, datalen);
878	rgba = SDL_SwapBE32 (rgba);	1105	int bpp = datalen / (ow * oh);
879	*p++ = rgba;	1106	SV result_ = sv_2mortal (newSV (nw nh * bpp));
		1107
		1108	SvPOK_only (result_);
		1109	SvCUR_set (result_, nw * nh * bpp);
		1110
		1111	memset (SvPVX (result_), 0, nw * nh * bpp);
		1112	while (oh--)
		1113	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1114
		1115	sv_setsv (data_, result_);
880	}	1116	}
		1117
		1118	sv_setiv (w_, nw);
		1119	sv_setiv (h_, nh);
881	}	1120	}
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	}	1121	}
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	}	1122	}
917		1123
918	MODULE = CFClient PACKAGE = CFClient::Texture
919
920	void	1124	void
921	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1125	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
922	PROTOTYPE: $$$;$$	1126	PROTOTYPE: $$$;$$
923	ALIAS:	1127	ALIAS:
924	draw_quad_alpha = 1	1128	draw_quad_alpha = 1
925	draw_quad_alpha_premultiplied = 2	1129	draw_quad_alpha_premultiplied = 2
926	CODE:	1130	CODE:
927	{	1131	{
928	HV hv = (HV )SvRV (self);	1132	HV hv = (HV )SvRV (self);
929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1133	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1134	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1135	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933		1136
934	if (items < 5)	1137	if (items < 5)
935	{	1138	{
936	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1139	w = SvNV (*hv_fetch (hv, "w", 1, 1));
937	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1140	h = SvNV (*hv_fetch (hv, "h", 1, 1));
938	}	1141	}
939		1142
940	if (ix)	1143	if (ix)
941	{	1144	{
942	glEnable (GL_BLEND);	1145	glEnable (GL_BLEND);
		1146
		1147	if (ix == 2)
943	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1148	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1149	else
		1150	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1151	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1152
		1153	glEnable (GL_ALPHA_TEST);
		1154	glAlphaFunc (GL_GREATER, 0.01f);
944	}	1155	}
945		1156
946	glBindTexture (GL_TEXTURE_2D, name);	1157	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		1158
954	glBegin (GL_QUADS);	1159	glBegin (GL_QUADS);
955	glTexCoord2f (0, 0); glVertex2f (x , y );	1160	glTexCoord2f (0, 0); glVertex2f (x , y );
956	glTexCoord2f (0, t); glVertex2f (x , y + h);	1161	glTexCoord2f (0, t); glVertex2f (x , y + h);
957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1162	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1163	glTexCoord2f (s, 0); glVertex2f (x + w, y );
959	glEnd ();	1164	glEnd ();
960		1165
961	if (ix)	1166	if (ix)
		1167	{
		1168	glDisable (GL_ALPHA_TEST);
962	glDisable (GL_BLEND);	1169	glDisable (GL_BLEND);
		1170	}
963	}	1171	}
964		1172
965	MODULE = CFClient PACKAGE = CFClient::Map	1173	MODULE = CFPlus PACKAGE = CFPlus::Map
966		1174
967	CFClient::Map	1175	CFPlus::Map
968	new (SV *class, int map_width, int map_height)	1176	new (SV *class, int map_width, int map_height)
969	CODE:	1177	CODE:
970	New (0, RETVAL, 1, struct map);	1178	New (0, RETVAL, 1, struct map);
971	RETVAL->x = 0;	1179	RETVAL->x = 0;
972	RETVAL->y = 0;	1180	RETVAL->y = 0;
…		…
982	RETVAL->row = 0;	1190	RETVAL->row = 0;
983	OUTPUT:	1191	OUTPUT:
984	RETVAL	1192	RETVAL
985		1193
986	void	1194	void
987	DESTROY (CFClient::Map self)	1195	DESTROY (CFPlus::Map self)
988	CODE:	1196	CODE:
989	{	1197	{
990	map_clear (self);	1198	map_clear (self);
991	Safefree (self->face);	1199	Safefree (self->face);
		1200	Safefree (self->tex);
992	Safefree (self);	1201	Safefree (self);
993	}	1202	}
994		1203
995	void	1204	void
996	clear (CFClient::Map self)	1205	clear (CFPlus::Map self)
997	CODE:	1206	CODE:
998	map_clear (self);	1207	map_clear (self);
999		1208
1000	void	1209	void
1001	set_face (CFClient::Map self, int face, int texid)	1210	set_face (CFPlus::Map self, int face, int texid)
1002	CODE:	1211	CODE:
1003	{	1212	{
1004	while (self->faces <= face)	1213	while (self->faces <= face)
1005	{	1214	{
1006	Append (mapface, self->face, self->faces, self->faces);	1215	Append (mapface, self->face, self->faces, self->faces);
…		…
1009		1218
1010	self->face [face] = texid;	1219	self->face [face] = texid;
1011	}	1220	}
1012		1221
1013	void	1222	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)	1223	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:	1224	CODE:
1016	{	1225	{
1017	while (self->texs <= texid)	1226	while (self->texs <= texid)
1018	{	1227	{
1019	Append (maptex, self->tex, self->texs, self->texs);	1228	Append (maptex, self->tex, self->texs, self->texs);
…		…
1031	tex->r = r;	1240	tex->r = r;
1032	tex->g = g;	1241	tex->g = g;
1033	tex->b = b;	1242	tex->b = b;
1034	tex->a = a;	1243	tex->a = a;
1035	}	1244	}
		1245
		1246	// somewhat hackish, but for textures that require it, it really
		1247	// improves the look, and most others don't suffer.
		1248	glBindTexture (GL_TEXTURE_2D, name);
		1249	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1250	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1251	// use uglier nearest interpolation because linear suffers
		1252	// from transparent color bleeding and ugly wrapping effects.
		1253	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1036	}	1254	}
1037		1255
1038	int	1256	int
1039	ox (CFClient::Map self)	1257	ox (CFPlus::Map self)
1040	ALIAS:	1258	ALIAS:
1041	oy = 1	1259	oy = 1
		1260	x = 2
		1261	y = 3
		1262	w = 4
		1263	h = 5
1042	CODE:	1264	CODE:
1043	switch (ix)	1265	switch (ix)
1044	{	1266	{
1045	case 0: RETVAL = self->ox; break;	1267	case 0: RETVAL = self->ox; break;
1046	case 1: RETVAL = self->oy; break;	1268	case 1: RETVAL = self->oy; break;
		1269	case 2: RETVAL = self->x; break;
		1270	case 3: RETVAL = self->y; break;
		1271	case 4: RETVAL = self->w; break;
		1272	case 5: RETVAL = self->h; break;
1047	}	1273	}
1048	OUTPUT:	1274	OUTPUT:
1049	RETVAL	1275	RETVAL
1050		1276
1051	void	1277	void
1052	scroll (CFClient::Map self, int dx, int dy)	1278	scroll (CFPlus::Map self, int dx, int dy)
1053	CODE:	1279	CODE:
1054	{	1280	{
1055	if (dx > 0)	1281	if (dx > 0)
1056	map_blank (self, self->x, self->y, dx - 1, self->h);	1282	map_blank (self, self->x, self->y, dx, self->h);
1057	else if (dx < 0)	1283	else if (dx < 0)
1058	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1284	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1059		1285
1060	if (dy > 0)	1286	if (dy > 0)
1061	map_blank (self, self->x, self->y, self->w, dy - 1);	1287	map_blank (self, self->x, self->y, self->w, dy);
1062	else if (dy < 0)	1288	else if (dy < 0)
1063	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1289	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1064		1290
1065	self->ox += dx; self->x += dx;	1291	self->ox += dx; self->x += dx;
1066	self->oy += dy; self->y += dy;	1292	self->oy += dy; self->y += dy;
1067		1293
1068	while (self->y < 0)	1294	while (self->y < 0)
…		…
1073	self->y += MAP_EXTEND_Y;	1299	self->y += MAP_EXTEND_Y;
1074	}	1300	}
1075	}	1301	}
1076		1302
1077	void	1303	void
1078	map1a_update (CFClient::Map self, SV *data_)	1304	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1079	CODE:	1305	CODE:
1080	{	1306	{
1081	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1307	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1082	uint8_t data_end = (uint8_t )SvEND (data_);	1308	uint8_t data_end = (uint8_t )SvEND (data_);
1083	mapcell *cell;	1309	mapcell *cell;
1084	int x, y, flags;	1310	int x, y, flags;
1085		1311
1086	while (data < data_end)	1312	while (data < data_end - 1)
1087	{	1313	{
1088	flags = (data [0] << 8) + data [1]; data += 2;	1314	flags = (data [0] << 8) + data [1]; data += 2;
1089		1315
1090	x = ((flags >> 10) & 63) + self->x;	1316	x = self->x + ((flags >> 10) & 63);
1091	y = ((flags >> 4) & 63) + self->y;	1317	y = self->y + ((flags >> 4) & 63);
1092		1318
1093	cell = map_get_cell (self, x, y);	1319	cell = map_get_cell (self, x, y);
1094		1320
1095	if (flags & 15)	1321	if (flags & 15)
1096	{	1322	{
1097	if (cell->darkness < 0)	1323	if (!cell->darkness)
1098	{	1324	{
		1325	memset (cell, 0, sizeof (*cell));
1099	cell->darkness = 0;	1326	cell->darkness = 256;
1100	cell->face [0] = 0;
1101	cell->face [1] = 0;
1102	cell->face [2] = 0;
1103	}	1327	}
1104		1328
1105	cell->darkness = flags & 8 ? *data++ : 255;
1106
1107	//TODO: don't trust server data to be in-range(!)	1329	//TODO: don't trust server data to be in-range(!)
		1330
		1331	if (flags & 8)
		1332	{
		1333	if (extmap)
		1334	{
		1335	uint8_t ext, cmd;
		1336
		1337	do
		1338	{
		1339	ext = *data++;
		1340	cmd = ext & 0x3f;
		1341
		1342	if (cmd < 4)
		1343	cell->darkness = 255 - ext * 64 + 1;
		1344	else if (cmd == 5) // health
		1345	{
		1346	cell->stat_width = 1;
		1347	cell->stat_hp = *data++;
		1348	}
		1349	else if (cmd == 6) // monster width
		1350	cell->stat_width = *data++ + 1;
		1351	else if (cmd == 0x47) // monster width
		1352	{
		1353	if (*data == 4)
		1354	; // decode player tag
		1355
		1356	data += *data + 1;
		1357	}
		1358	else if (cmd == 8) // cell flags
		1359	cell->flags = *data++;
		1360	else if (ext & 0x40) // unknown, multibyte => skip
		1361	data += *data + 1;
		1362	else
		1363	data++;
		1364	}
		1365	while (ext & 0x80);
		1366	}
		1367	else
		1368	cell->darkness = *data++ + 1;
		1369	}
1108		1370
1109	if (flags & 4)	1371	if (flags & 4)
1110	{	1372	{
1111	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1373	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1112	}	1374	}
…		…
1120	{	1382	{
1121	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1383	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1122	}	1384	}
1123	}	1385	}
1124	else	1386	else
1125	cell->darkness = -1;	1387	cell->darkness = 0;
1126	}	1388	}
1127	}	1389	}
1128		1390
1129	SV *	1391	SV *
1130	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1392	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1131	CODE:	1393	CODE:
1132	{	1394	{
1133	int x1, x;	1395	int x1, x;
1134	int y1, y;	1396	int y1, y;
1135	int z;	1397	int z;
…		…
1185	}	1447	}
1186	OUTPUT:	1448	OUTPUT:
1187	RETVAL	1449	RETVAL
1188		1450
1189	void	1451	void
1190	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1452	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1191	PPCODE:	1453	CODE:
1192	{	1454	{
1193	int vx, vy;	1455	int vx, vy;
1194	int x, y, z;	1456	int x, y, z;
1195	int last_name;	1457	int last_name;
1196	mapface face;	1458	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		1459
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;	1460	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1206	vy = self->y + (self->h - sh) / 2 - shift_y;	1461	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1207		1462
1208	/*	1463	/*
1209	int vx = self->vx = self->w >= sw	1464	int vx = self->vx = self->w >= sw
1210	? self->x + (self->w - sw) / 2	1465	? self->x + (self->w - sw) / 2
1211	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1466	: 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));	1470	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1216	*/	1471	*/
1217		1472
1218	glColor4ub (255, 255, 255, 255);	1473	glColor4ub (255, 255, 255, 255);
1219		1474
		1475	glEnable (GL_BLEND);
1220	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1476	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221	glEnable (GL_BLEND);
1222	glEnable (GL_TEXTURE_2D);	1477	glEnable (GL_TEXTURE_2D);
1223	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1478	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224		1479
1225	glBegin (GL_QUADS);	1480	glBegin (GL_QUADS);
1226		1481
…		…
1235	for (x = 0; x < sw; x++)	1490	for (x = 0; x < sw; x++)
1236	if (row->c0 <= x + vx && x + vx < row->c1)	1491	if (row->c0 <= x + vx && x + vx < row->c1)
1237	{	1492	{
1238	mapcell *cell = row->col + (x + vx - row->c0);	1493	mapcell *cell = row->col + (x + vx - row->c0);
1239		1494
1240	darkness[y * sw4 + x] = cell->darkness < 0
1241	? 255 - FOW_DARKNESS
1242	: 255 - cell->darkness;
1243
1244	face = cell->face [z];	1495	face = cell->face [z];
1245		1496
1246	if (face)	1497	if (face && face < self->texs)
1247	{	1498	{
1248	maptex tex = self->tex [face];	1499	maptex tex = self->tex [face];
1249
1250	int px = (x + 1) * 32 - tex.w;	1500	int px = (x + 1) * 32 - tex.w;
1251	int py = (y + 1) * 32 - tex.h;	1501	int py = (y + 1) * 32 - tex.h;
1252		1502
1253	if (last_name != tex.name)	1503	if (last_name != tex.name)
1254	{	1504	{
1255	glEnd ();	1505	glEnd ();
1256	last_name = tex.name;
1257	glBindTexture (GL_TEXTURE_2D, last_name);	1506	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1258	glBegin (GL_QUADS);	1507	glBegin (GL_QUADS);
1259	}	1508	}
1260		1509
1261	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1510	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1262	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1511	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1263	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1512	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1264	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1513	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1265	}	1514	}
		1515
		1516	if (cell->flags && z == 2)
		1517	{
		1518	if (cell->flags & 1)
		1519	{
		1520	maptex tex = self->tex [1];
		1521	int px = (x + 1) * 32 - tex.w + 2;
		1522	int py = (y + 1) * 32 - tex.h - 6;
		1523
		1524	glEnd ();
		1525	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1526	glBegin (GL_QUADS);
		1527
		1528	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1529	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1530	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1531	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1532	}
		1533	}
1266	}	1534	}
1267	}	1535	}
1268		1536
1269	glEnd ();	1537	glEnd ();
1270		1538
1271	glDisable (GL_TEXTURE_2D);	1539	glDisable (GL_TEXTURE_2D);
1272	glDisable (GL_BLEND);	1540	glDisable (GL_BLEND);
		1541
		1542	// top layer: overlays such as the health bar
		1543	for (y = 0; y < sh; y++)
		1544	if (0 <= y + vy && y + vy < self->rows)
		1545	{
		1546	maprow *row = self->row + (y + vy);
		1547
		1548	for (x = 0; x < sw; x++)
		1549	if (row->c0 <= x + vx && x + vx < row->c1)
		1550	{
		1551	mapcell *cell = row->col + (x + vx - row->c0);
		1552
		1553	int px = x * 32;
		1554	int py = y * 32;
		1555
		1556	if (cell->stat_hp)
		1557	{
		1558	int width = cell->stat_width * 32;
		1559	int thick = sh / 28 + 1 + cell->stat_width;
		1560
		1561	glColor3ub (0, 0, 0);
		1562	glRectf (px + 1, py - thick - 2,
		1563	px + width - 1, py);
		1564
		1565	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1566	glRectf (px + 2,
		1567	py - thick - 1,
		1568	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1569	}
		1570	}
		1571	}
		1572	}
		1573
		1574	void
		1575	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1576	CODE:
		1577	{
		1578	static float color[16][3] = {
		1579	{ 0.00F, 0.00F, 0.00F },
		1580	{ 1.00F, 1.00F, 1.00F },
		1581	{ 0.00F, 0.00F, 0.55F },
		1582	{ 1.00F, 0.00F, 0.00F },
		1583
		1584	{ 1.00F, 0.54F, 0.00F },
		1585	{ 0.11F, 0.56F, 1.00F },
		1586	{ 0.93F, 0.46F, 0.00F },
		1587	{ 0.18F, 0.54F, 0.34F },
		1588
		1589	{ 0.56F, 0.73F, 0.56F },
		1590	{ 0.80F, 0.80F, 0.80F },
		1591	{ 0.55F, 0.41F, 0.13F },
		1592	{ 0.99F, 0.77F, 0.26F },
		1593
		1594	{ 0.74F, 0.65F, 0.41F },
		1595
		1596	{ 0.00F, 1.00F, 1.00F },
		1597	{ 1.00F, 0.00F, 1.00F },
		1598	{ 1.00F, 1.00F, 0.00F },
		1599	};
		1600
		1601	int x, y;
		1602
		1603	glEnable (GL_TEXTURE_2D);
		1604	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1605	glEnable (GL_BLEND);
		1606	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1607	glBegin (GL_QUADS);
		1608
		1609	for (y = 0; y < h; y++)
		1610	for (x = 0; x < w; x++)
		1611	{
		1612	unsigned char m = data [x + y * w];
		1613
		1614	if (m)
		1615	{
		1616	float *c = color [m & 15];
		1617
		1618	float tx1 = m & 0x40 ? 0.5 : 0.;
		1619	float tx2 = tx1 + 0.5;
		1620
		1621	glColor4f (c[0], c[1], c[2], 0.75);
		1622	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1623	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1624	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1625	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1626	}
		1627	}
		1628
		1629	glEnd ();
		1630	glDisable (GL_BLEND);
		1631	glDisable (GL_TEXTURE_2D);
		1632	}
		1633
		1634	void
		1635	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1636	PPCODE:
		1637	{
		1638	int vx, vy;
		1639	int x, y;
		1640	int sw4 = (sw + 3) & ~3;
		1641	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1642	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1643
		1644	memset (darkness, 255, sw4 * sh);
		1645	SvPOK_only (darkness_sv);
		1646	SvCUR_set (darkness_sv, sw4 * sh);
		1647
		1648	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1649	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1650
		1651	for (y = 0; y < sh; y++)
		1652	if (0 <= y + vy && y + vy < self->rows)
		1653	{
		1654	maprow *row = self->row + (y + vy);
		1655
		1656	for (x = 0; x < sw; x++)
		1657	if (row->c0 <= x + vx && x + vx < row->c1)
		1658	{
		1659	mapcell *cell = row->col + (x + vx - row->c0);
		1660
		1661	darkness[y * sw4 + x] = cell->darkness
		1662	? 255 - (cell->darkness - 1)
		1663	: 255 - FOW_DARKNESS;
		1664	}
		1665	}
1273		1666
1274	EXTEND (SP, 3);	1667	EXTEND (SP, 3);
1275	PUSHs (sv_2mortal (newSViv (sw4)));	1668	PUSHs (sv_2mortal (newSViv (sw4)));
1276	PUSHs (sv_2mortal (newSViv (sh)));	1669	PUSHs (sv_2mortal (newSViv (sh)));
1277	PUSHs (darkness_sv);	1670	PUSHs (darkness_sv);
1278	}	1671	}
1279		1672
1280	SV *	1673	SV *
1281	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1674	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1282	CODE:	1675	CODE:
1283	{	1676	{
1284	int x, y, x1, y1;	1677	int x, y, x1, y1;
1285	SV data_sv = newSV (w h * 7 + 5);	1678	SV data_sv = newSV (w h * 7 + 5);
1286	uint8_t data = (uint8_t )SvPVX (data_sv);	1679	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1348	}	1741	}
1349	OUTPUT:	1742	OUTPUT:
1350	RETVAL	1743	RETVAL
1351		1744
1352	void	1745	void
1353	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1746	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1354	PPCODE:	1747	PPCODE:
1355	{	1748	{
1356	int x, y, z;	1749	int x, y, z;
1357	int w, h;	1750	int w, h;
1358	int x1, y1;	1751	int x1, y1;
…		…
1390		1783
1391	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1784	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1392	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1785	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1393	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1786	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1394		1787
1395	if (cell->darkness <= 0)	1788	if (cell->darkness == 0)
1396	{	1789	{
1397	cell->darkness = -1;	1790	cell->darkness = 0;
1398		1791
1399	for (z = 0; z <= 2; z++)	1792	for (z = 0; z <= 2; z++)
1400	{	1793	{
1401	cell->face[z] = face[z];	1794	cell->face[z] = face[z];
1402		1795
…		…
1407	}	1800	}
1408	}	1801	}
1409	}	1802	}
1410	}	1803	}
1411		1804
1412	MODULE = CFClient PACKAGE = CFClient::MixChunk	1805	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413		1806
1414	CFClient::MixChunk	1807	CFPlus::MixChunk
1415	new_from_file (SV class, char path)	1808	new_from_file (SV class, char path)
1416	CODE:	1809	CODE:
1417	RETVAL = Mix_LoadWAV (path);	1810	RETVAL = Mix_LoadWAV (path);
1418	OUTPUT:	1811	OUTPUT:
1419	RETVAL	1812	RETVAL
1420		1813
1421	void	1814	void
1422	DESTROY (CFClient::MixChunk self)	1815	DESTROY (CFPlus::MixChunk self)
1423	CODE:	1816	CODE:
1424	Mix_FreeChunk (self);	1817	Mix_FreeChunk (self);
1425		1818
1426	int	1819	int
1427	volume (CFClient::MixChunk self, int volume = -1)	1820	volume (CFPlus::MixChunk self, int volume = -1)
1428	CODE:	1821	CODE:
1429	RETVAL = Mix_VolumeChunk (self, volume);	1822	RETVAL = Mix_VolumeChunk (self, volume);
1430	OUTPUT:	1823	OUTPUT:
1431	RETVAL	1824	RETVAL
1432		1825
1433	int	1826	int
1434	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1827	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1435	CODE:	1828	CODE:
1436	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1829	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437	OUTPUT:	1830	OUTPUT:
1438	RETVAL	1831	RETVAL
1439		1832
1440	MODULE = CFClient PACKAGE = CFClient::MixMusic	1833	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441		1834
1442	int	1835	int
1443	volume (int volume = -1)	1836	volume (int volume = -1)
1444	CODE:	1837	CODE:
1445	RETVAL = Mix_VolumeMusic (volume);	1838	RETVAL = Mix_VolumeMusic (volume);
1446	OUTPUT:	1839	OUTPUT:
1447	RETVAL	1840	RETVAL
1448		1841
1449	CFClient::MixMusic	1842	CFPlus::MixMusic
1450	new_from_file (SV class, char path)	1843	new_from_file (SV class, char path)
1451	CODE:	1844	CODE:
1452	RETVAL = Mix_LoadMUS (path);	1845	RETVAL = Mix_LoadMUS (path);
1453	OUTPUT:	1846	OUTPUT:
1454	RETVAL	1847	RETVAL
1455		1848
1456	void	1849	void
1457	DESTROY (CFClient::MixMusic self)	1850	DESTROY (CFPlus::MixMusic self)
1458	CODE:	1851	CODE:
1459	Mix_FreeMusic (self);	1852	Mix_FreeMusic (self);
1460		1853
1461	int	1854	int
1462	play (CFClient::MixMusic self, int loops = -1)	1855	play (CFPlus::MixMusic self, int loops = -1)
1463	CODE:	1856	CODE:
1464	RETVAL = Mix_PlayMusic (self, loops);	1857	RETVAL = Mix_PlayMusic (self, loops);
1465	OUTPUT:	1858	OUTPUT:
1466	RETVAL	1859	RETVAL
1467		1860
1468	MODULE = CFClient PACKAGE = CFClient::OpenGL	1861	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469		1862
1470	BOOT:	1863	BOOT:
1471	{	1864	{
1472	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1865	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473	static const struct {	1866	static const struct {
1474	const char *name;	1867	const char *name;
1475	IV iv;	1868	IV iv;
1476	} *civ, const_iv[] = {	1869	} *civ, const_iv[] = {
1477	# define const_iv(name) { # name, (IV)name }	1870	# define const_iv(name) { # name, (IV)name }
1478	const_iv (GL_COLOR_MATERIAL),	1871	const_iv (GL_COLOR_MATERIAL),
1479	const_iv (GL_SMOOTH),	1872	const_iv (GL_SMOOTH),
1480	const_iv (GL_FLAT),	1873	const_iv (GL_FLAT),
1481	const_iv (GL_DITHER),	1874	const_iv (GL_DITHER),
1482	const_iv (GL_BLEND),	1875	const_iv (GL_BLEND),
		1876	const_iv (GL_CULL_FACE),
1483	const_iv (GL_SCISSOR_TEST),	1877	const_iv (GL_SCISSOR_TEST),
		1878	const_iv (GL_DEPTH_TEST),
		1879	const_iv (GL_ALPHA_TEST),
		1880	const_iv (GL_NORMALIZE),
		1881	const_iv (GL_RESCALE_NORMAL),
		1882	const_iv (GL_FRONT),
		1883	const_iv (GL_BACK),
1484	const_iv (GL_AND),	1884	const_iv (GL_AND),
1485	const_iv (GL_ONE),	1885	const_iv (GL_ONE),
1486	const_iv (GL_ZERO),	1886	const_iv (GL_ZERO),
1487	const_iv (GL_SRC_ALPHA),	1887	const_iv (GL_SRC_ALPHA),
1488	const_iv (GL_SRC_ALPHA_SATURATE),	1888	const_iv (GL_DST_ALPHA),
1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1889	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490	const_iv (GL_ONE_MINUS_DST_ALPHA),	1890	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1891	const_iv (GL_SRC_ALPHA_SATURATE),
1491	const_iv (GL_RGB),	1892	const_iv (GL_RGB),
1492	const_iv (GL_RGBA),	1893	const_iv (GL_RGBA),
		1894	const_iv (GL_RGBA4),
		1895	const_iv (GL_RGBA8),
		1896	const_iv (GL_RGB5_A1),
1493	const_iv (GL_UNSIGNED_BYTE),	1897	const_iv (GL_UNSIGNED_BYTE),
		1898	const_iv (GL_UNSIGNED_SHORT),
		1899	const_iv (GL_UNSIGNED_INT),
1494	const_iv (GL_ALPHA),	1900	const_iv (GL_ALPHA),
		1901	const_iv (GL_INTENSITY),
1495	const_iv (GL_LUMINANCE),	1902	const_iv (GL_LUMINANCE),
		1903	const_iv (GL_LUMINANCE_ALPHA),
1496	const_iv (GL_FLOAT),	1904	const_iv (GL_FLOAT),
1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1905	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498	const_iv (GL_COMPILE),	1906	const_iv (GL_COMPILE),
1499	const_iv (GL_TEXTURE_1D),	1907	const_iv (GL_TEXTURE_1D),
1500	const_iv (GL_TEXTURE_2D),	1908	const_iv (GL_TEXTURE_2D),
…		…
1502	const_iv (GL_TEXTURE_MAG_FILTER),	1910	const_iv (GL_TEXTURE_MAG_FILTER),
1503	const_iv (GL_TEXTURE_MIN_FILTER),	1911	const_iv (GL_TEXTURE_MIN_FILTER),
1504	const_iv (GL_TEXTURE_ENV_MODE),	1912	const_iv (GL_TEXTURE_ENV_MODE),
1505	const_iv (GL_TEXTURE_WRAP_S),	1913	const_iv (GL_TEXTURE_WRAP_S),
1506	const_iv (GL_TEXTURE_WRAP_T),	1914	const_iv (GL_TEXTURE_WRAP_T),
		1915	const_iv (GL_REPEAT),
1507	const_iv (GL_CLAMP),	1916	const_iv (GL_CLAMP),
1508	const_iv (GL_REPEAT),	1917	const_iv (GL_CLAMP_TO_EDGE),
1509	const_iv (GL_NEAREST),	1918	const_iv (GL_NEAREST),
1510	const_iv (GL_LINEAR),	1919	const_iv (GL_LINEAR),
1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1920	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1921	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1922	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1923	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515	const_iv (GL_GENERATE_MIPMAP),	1924	const_iv (GL_GENERATE_MIPMAP),
1516	const_iv (GL_MODULATE),	1925	const_iv (GL_MODULATE),
1517	const_iv (GL_DECAL),	1926	const_iv (GL_DECAL),
1518	const_iv (GL_REPLACE),	1927	const_iv (GL_REPLACE),
		1928	const_iv (GL_DEPTH_BUFFER_BIT),
1519	const_iv (GL_COLOR_BUFFER_BIT),	1929	const_iv (GL_COLOR_BUFFER_BIT),
1520	const_iv (GL_PROJECTION),	1930	const_iv (GL_PROJECTION),
1521	const_iv (GL_MODELVIEW),	1931	const_iv (GL_MODELVIEW),
1522	const_iv (GL_COLOR_LOGIC_OP),	1932	const_iv (GL_COLOR_LOGIC_OP),
1523	const_iv (GL_SEPARABLE_2D),	1933	const_iv (GL_SEPARABLE_2D),
1524	const_iv (GL_CONVOLUTION_2D),	1934	const_iv (GL_CONVOLUTION_2D),
1525	const_iv (GL_CONVOLUTION_BORDER_MODE),	1935	const_iv (GL_CONVOLUTION_BORDER_MODE),
1526	const_iv (GL_CONSTANT_BORDER),	1936	const_iv (GL_CONSTANT_BORDER),
1527	const_iv (GL_LINES),	1937	const_iv (GL_LINES),
		1938	const_iv (GL_LINE_STRIP),
		1939	const_iv (GL_LINE_LOOP),
1528	const_iv (GL_QUADS),	1940	const_iv (GL_QUADS),
1529	const_iv (GL_LINE_LOOP),	1941	const_iv (GL_QUAD_STRIP),
		1942	const_iv (GL_TRIANGLES),
		1943	const_iv (GL_TRIANGLE_STRIP),
		1944	const_iv (GL_TRIANGLE_FAN),
1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1945	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531	const_iv (GL_FASTEST),	1946	const_iv (GL_FASTEST),
		1947	const_iv (GL_V2F),
		1948	const_iv (GL_V3F),
		1949	const_iv (GL_T2F_V3F),
		1950	const_iv (GL_T2F_N3F_V3F),
1532	# undef const_iv	1951	# undef const_iv
1533	};	1952	};
1534		1953
1535	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1954	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1536	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1955	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537	}	1956	}
1538		1957
		1958	char *
		1959	gl_vendor ()
		1960	CODE:
		1961	RETVAL = (char *)glGetString (GL_VENDOR);
		1962	OUTPUT:
		1963	RETVAL
		1964
		1965	char *
		1966	gl_version ()
		1967	CODE:
		1968	RETVAL = (char *)glGetString (GL_VERSION);
		1969	OUTPUT:
		1970	RETVAL
		1971
		1972	char *
		1973	gl_extensions ()
		1974	CODE:
		1975	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1976	OUTPUT:
		1977	RETVAL
		1978
1539	int glGetError ()	1979	int glGetError ()
		1980
		1981	void glFinish ()
1540		1982
1541	void glClear (int mask)	1983	void glClear (int mask)
1542		1984
1543	void glClearColor (float r, float g, float b, float a = 1.0)	1985	void glClearColor (float r, float g, float b, float a = 1.0)
1544	PROTOTYPE: @	1986	PROTOTYPE: @
…		…
1551		1993
1552	void glHint (int target, int mode)	1994	void glHint (int target, int mode)
1553		1995
1554	void glBlendFunc (int sfactor, int dfactor)	1996	void glBlendFunc (int sfactor, int dfactor)
1555		1997
		1998	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1999	CODE:
		2000	gl_BlendFuncSeparate (sa, da, saa, daa);
		2001
		2002	void glDepthMask (int flag)
		2003
1556	void glLogicOp (int opcode)	2004	void glLogicOp (int opcode)
1557		2005
1558	void glColorMask (int red, int green, int blue, int alpha)	2006	void glColorMask (int red, int green, int blue, int alpha)
1559		2007
1560	void glMatrixMode (int mode)	2008	void glMatrixMode (int mode)
…		…
1563		2011
1564	void glPopMatrix ()	2012	void glPopMatrix ()
1565		2013
1566	void glLoadIdentity ()	2014	void glLoadIdentity ()
1567		2015
		2016	void glDrawBuffer (int buffer)
		2017
		2018	void glReadBuffer (int buffer)
		2019
1568	# near and far are due to microsofts buggy c compiler	2020	# near_ and far_ are due to microsofts buggy "c" compiler
		2021	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		2022
		2023	# 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_)	2024	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1570		2025
1571	void glViewport (int x, int y, int width, int height)	2026	void glViewport (int x, int y, int width, int height)
1572		2027
1573	void glScissor (int x, int y, int width, int height)	2028	void glScissor (int x, int y, int width, int height)
…		…
1588		2043
1589	void glEnd ()	2044	void glEnd ()
1590		2045
1591	void glColor (float r, float g, float b, float a = 1.0)	2046	void glColor (float r, float g, float b, float a = 1.0)
1592	PROTOTYPE: @	2047	PROTOTYPE: @
		2048	ALIAS:
		2049	glColor_premultiply = 1
1593	CODE:	2050	CODE:
1594	// 255.999 is close enough to correctness (256 and clamp)	2051	if (ix)
1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	2052	{
		2053	r *= a;
		2054	g *= a;
		2055	b *= a;
		2056	}
		2057	// microsoft visual "c" rounds instead of truncating...
		2058	glColor4f (r, g, b, a);
		2059
		2060	void glInterleavedArrays (int format, int stride, char *data)
		2061
		2062	void glDrawElements (int mode, int count, int type, char *indices)
		2063
		2064	# 1.2 void glDrawRangeElements (int mode, int start, int end
		2065
		2066	void glRasterPos (float x, float y, float z = 0.)
		2067	CODE:
		2068	glRasterPos3f (0, 0, z);
		2069	glBitmap (0, 0, 0, 0, x, y, 0);
1596		2070
1597	void glVertex (float x, float y, float z = 0.)	2071	void glVertex (float x, float y, float z = 0.)
1598	CODE:	2072	CODE:
1599	glVertex3f (x, y, z);	2073	glVertex3f (x, y, z);
1600		2074
…		…
1612		2086
1613	void glBindTexture (int target, int name)	2087	void glBindTexture (int target, int name)
1614		2088
1615	void glConvolutionParameter (int target, int pname, float params)	2089	void glConvolutionParameter (int target, int pname, float params)
1616	CODE:	2090	CODE:
1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2091	if (gl.ConvolutionParameterf)
		2092	gl.ConvolutionParameterf (target, pname, params);
1618		2093
1619	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2094	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1620	CODE:	2095	CODE:
1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2096	if (gl.ConvolutionFilter2D)
1622	(target, internalformat, width, height, format, type, data));	2097	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623		2098
1624	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2099	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1625	CODE:	2100	CODE:
1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2101	if (gl.SeparableFilter2D)
1627	(target, internalformat, width, height, format, type, row, column));	2102	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628		2103
1629	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2104	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1630		2105
1631	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2106	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1632		2107
1633	void glRasterPos (int x, int y)	2108	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634	CODE:
1635	glRasterPos2i (x, y);
1636		2109
1637	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2110	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1638		2111
1639	int glGenTexture ()	2112	int glGenTexture ()
1640	CODE:	2113	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.158 by root, Sun Oct 1 18:17:37 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.158 by root, Sun Oct 1 18:17:37 2006 UTC