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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs. Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.158 by root, Sun Oct 1 18:17:37 2006 UTC