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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.76 by root, Thu May 11 23:41:45 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.76 by root, Thu May 11 23:41:45 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC