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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs. Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.159 by root, Sun Oct 8 21:22:29 2006 UTC