[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.160 by root, Mon Oct 9 01:06:36 2006 UTC

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