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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs. Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.92 by elmex, Tue May 23 17:30:18 2006 UTC vs.
Revision 1.161 by root, Mon Oct 9 23:30:44 2006 UTC