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