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