[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.159 by root, Sun Oct 8 21:22:29 2006 UTC

…		…
1	#ifdef _WIN32	1	#ifdef _WIN32
		2	# define WIN32_LEAN_AND_MEAN
2	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls	3	# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
3	# include <malloc.h>	4	# include <malloc.h>
4	# include <windows.h>	5	# include <windows.h>
		6	# include <wininet.h>
5	# pragma warning(disable:4244)	7	# pragma warning(disable:4244)
6	#endif	8	#endif
7		9
8	#include "EXTERN.h"	10	#include "EXTERN.h"
9	#include "perl.h"	11	#include "perl.h"
10	#include "XSUB.h"	12	#include "XSUB.h"
11		13
		14	#ifdef _WIN32
		15	# undef pipe
		16	#endif
		17
12	#include <math.h>	18	#include <math.h>
13	#include <string.h>	19	#include <string.h>
14	#include <stdio.h>	20	#include <stdio.h>
		21	#include <stdlib.h>
15		22
16	#include <SDL.h>	23	#include <SDL.h>
17	#include <SDL_endian.h>	24	#include <SDL_endian.h>
18	#include <SDL_image.h>	25	#include <SDL_image.h>
19	#include <SDL_mixer.h>	26	#include <SDL_mixer.h>
20	#include <SDL_opengl.h>	27	#include <SDL_opengl.h>
21		28
		29	#define PANGO_ENABLE_BACKEND
		30	#define G_DISABLE_CAST_CHECKS
		31
22	#include <glib/gmacros.h>	32	#include <glib/gmacros.h>
23		33
24	#include <pango/pango.h>	34	#include <pango/pango.h>
25	#include <pango/pangofc-fontmap.h>
26	#include <pango/pangoft2.h>
27	#include <pango/pangocairo.h>
28		35
29	#ifndef _WIN32	36	#ifndef _WIN32
30	# include <sys/types.h>	37	# include <sys/types.h>
31	# include <sys/socket.h>	38	# include <sys/socket.h>
32	# include <netinet/in.h>	39	# include <netinet/in.h>
39	typedef signed char int8_t;	46	typedef signed char int8_t;
40	typedef signed short int16_t;	47	typedef signed short int16_t;
41	typedef signed int int32_t;	48	typedef signed int int32_t;
42	#endif	49	#endif
43		50
44	#include "glext.h"	51	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
45		52
46	#define FOW_DARKNESS 32	53	#define FOW_DARKNESS 32
47		54
48	#define MAP_EXTEND_X 32	55	#define MAP_EXTEND_X 32
49	#define MAP_EXTEND_Y 512	56	#define MAP_EXTEND_Y 512
50		57
51	#define MIN_FONT_HEIGHT 10	58	#define MIN_FONT_HEIGHT 10
52		59
53	#define GL_CALL(type,func,args) \	60	#if 0
54	{ \	61	# define PARACHUTE SDL_INIT_NOPARACHUTE
55	static int init_; \	62	#else
56	static type fptr_; \	63	# define PARACHUTE 0
57	\	64	#endif
58	if (!init_) \
59	{ \
60	init_ = 1; \
61	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
62	} \
63	\
64	if (fptr_) \
65	fptr_ args; \
66	}
67		65
		66	static struct
		67	{
		68	#define GL_FUNC(ptr,name) ptr name;
		69	#include "glfunc.h"
		70	#undef GL_FUNC
		71	} gl;
		72
		73	static void gl_BlendFuncSeparate (GLenum sa, GLenum da, GLenum saa, GLenum daa)
		74	{
		75	if (gl.BlendFuncSeparate)
		76	gl.BlendFuncSeparate (sa, da, saa, daa);
		77	else if (gl.BlendFuncSeparateEXT)
		78	gl.BlendFuncSeparateEXT (sa, da, saa, daa);
		79	else
		80	glBlendFunc (sa, da);
		81	}
		82
		83	#include "texcache.c"
		84
		85	#include "pango-font.c"
		86	#include "pango-fontmap.c"
		87	#include "pango-render.c"
		88
68	typedef Mix_Chunk *CFClient__MixChunk;	89	typedef Mix_Chunk *CFPlus__MixChunk;
69	typedef Mix_Music *CFClient__MixMusic;	90	typedef Mix_Music *CFPlus__MixMusic;
70		91
71	typedef PangoFontDescription *CFClient__Font;	92	typedef PangoFontDescription *CFPlus__Font;
		93
		94	static int
		95	shape_attr_p (PangoLayoutRun *run)
		96	{
		97	GSList *attrs = run->item->analysis.extra_attrs;
		98
		99	while (attrs)
		100	{
		101	PangoAttribute *attr = attrs->data;
		102
		103	if (attr->klass->type == PANGO_ATTR_SHAPE)
		104	return 1;
		105
		106	attrs = attrs->next;
		107	}
		108
		109	return 0;
		110	}
72		111
73	typedef struct cf_layout {	112	typedef struct cf_layout {
74	PangoLayout *pl; // either derived from a cairo or ft2 context	113	PangoLayout *pl;
75	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
76	float r, g, b, a; // default color for rgba mode	114	float r, g, b, a; // default color for rgba mode
77	int base_height;	115	int base_height;
78	CFClient__Font font;	116	CFPlus__Font font;
79	} *CFClient__Layout;	117	} *CFPlus__Layout;
80		118
81	static CFClient__Font default_font;	119	static CFPlus__Font default_font;
82	static PangoContext ft2_context, cairo_context;	120	static PangoContext *opengl_context;
83	static PangoFontMap ft2_fontmap, cairo_fontmap;	121	static PangoFontMap *opengl_fontmap;
84		122
85	static void	123	static void
86	substitute_func (FcPattern *pattern, gpointer data)	124	substitute_func (FcPattern *pattern, gpointer data)
87	{	125	{
88	FcPatternAddBool (pattern, FC_HINTING , 1);	126	FcPatternAddBool (pattern, FC_HINTING, 1);
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	_exit (retval);
		800
699	MODULE = CFClient PACKAGE = CFClient::Font	801	MODULE = CFPlus PACKAGE = CFPlus::Font
700		802
701	CFClient::Font	803	CFPlus::Font
702	new_from_file (SV class, char path, int id = 0)	804	new_from_file (SV class, char path, int id = 0)
703	CODE:	805	CODE:
704	{	806	{
705	int count;	807	int count;
706	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	808	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
709	}	811	}
710	OUTPUT:	812	OUTPUT:
711	RETVAL	813	RETVAL
712		814
713	void	815	void
714	DESTROY (CFClient::Font self)	816	DESTROY (CFPlus::Font self)
715	CODE:	817	CODE:
716	pango_font_description_free (self);	818	pango_font_description_free (self);
717		819
718	void	820	void
719	make_default (CFClient::Font self)	821	make_default (CFPlus::Font self)
720	CODE:	822	CODE:
721	default_font = self;	823	default_font = self;
722		824
723	MODULE = CFClient PACKAGE = CFClient::Layout	825	MODULE = CFPlus PACKAGE = CFPlus::Layout
724		826
725	CFClient::Layout	827	void
726	new (SV *class, int rgba = 0)	828	reset_glyph_cache ()
727	CODE:	829	CODE:
728	#if _WIN32	830	tc_clear ();
729	rgba = 0;//D	831
730	#endif	832	CFPlus::Layout
		833	new (SV *class)
		834	CODE:
731	New (0, RETVAL, 1, struct cf_layout);	835	New (0, RETVAL, 1, struct cf_layout);
732		836
733	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	837	RETVAL->pl = pango_layout_new (opengl_context);
734	RETVAL->rgba = rgba;
735	RETVAL->r = 1.;	838	RETVAL->r = 1.;
736	RETVAL->g = 1.;	839	RETVAL->g = 1.;
737	RETVAL->b = 1.;	840	RETVAL->b = 1.;
738	RETVAL->a = 1.;	841	RETVAL->a = 1.;
739	RETVAL->base_height = MIN_FONT_HEIGHT;	842	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
743	layout_update_font (RETVAL);	846	layout_update_font (RETVAL);
744	OUTPUT:	847	OUTPUT:
745	RETVAL	848	RETVAL
746		849
747	void	850	void
748	DESTROY (CFClient::Layout self)	851	DESTROY (CFPlus::Layout self)
749	CODE:	852	CODE:
750	g_object_unref (self->pl);	853	g_object_unref (self->pl);
751	Safefree (self);	854	Safefree (self);
752		855
753	int
754	is_rgba (CFClient::Layout self)
755	CODE:
756	RETVAL = self->rgba;
757	OUTPUT:
758	RETVAL
759
760	void	856	void
761	set_text (CFClient::Layout self, SV *text_)	857	set_text (CFPlus::Layout self, SV *text_)
762	CODE:	858	CODE:
763	{	859	{
764	STRLEN textlen;	860	STRLEN textlen;
765	char *text = SvPVutf8 (text_, textlen);	861	char *text = SvPVutf8 (text_, textlen);
766		862
767	pango_layout_set_text (self->pl, text, textlen);	863	pango_layout_set_text (self->pl, text, textlen);
768	}	864	}
769		865
770	void	866	void
771	set_markup (CFClient::Layout self, SV *text_)	867	set_markup (CFPlus::Layout self, SV *text_)
772	CODE:	868	CODE:
773	{	869	{
774	STRLEN textlen;	870	STRLEN textlen;
775	char *text = SvPVutf8 (text_, textlen);	871	char *text = SvPVutf8 (text_, textlen);
776		872
777	pango_layout_set_markup (self->pl, text, textlen);	873	pango_layout_set_markup (self->pl, text, textlen);
778	}	874	}
779		875
		876	void
		877	set_shapes (CFPlus::Layout self, ...)
		878	CODE:
		879	{
		880	PangoAttrList *attrs = 0;
		881	const char *text = pango_layout_get_text (self->pl);
		882	const char *pos = text;
		883	int arg = 4;
		884
		885	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		886	{
		887	PangoRectangle inkrect, rect;
		888	PangoAttribute *attr;
		889
		890	int x = SvIV (ST (arg - 3));
		891	int y = SvIV (ST (arg - 2));
		892	int w = SvIV (ST (arg - 1));
		893	int h = SvIV (ST (arg ));
		894
		895	inkrect.x = 0;
		896	inkrect.y = 0;
		897	inkrect.width = 0;
		898	inkrect.height = 0;
		899
		900	rect.x = x * PANGO_SCALE;
		901	rect.y = y * PANGO_SCALE;
		902	rect.width = w * PANGO_SCALE;
		903	rect.height = h * PANGO_SCALE;
		904
		905	if (!attrs)
		906	attrs = pango_layout_get_attributes (self->pl);
		907
		908	attr = pango_attr_shape_new (&inkrect, &rect);
		909	attr->start_index = pos - text;
		910	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		911	pango_attr_list_insert (attrs, attr);
		912
		913	arg += 4;
		914	pos += sizeof (OBJ_STR) - 1;
		915	}
		916
		917	if (attrs)
		918	pango_layout_set_attributes (self->pl, attrs);
		919	}
		920
		921	void
		922	get_shapes (CFPlus::Layout self)
		923	PPCODE:
		924	{
		925	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		926
		927	do
		928	{
		929	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		930
		931	if (run && shape_attr_p (run))
		932	{
		933	PangoRectangle extents;
		934	pango_layout_iter_get_run_extents (iter, 0, &extents);
		935
		936	EXTEND (SP, 2);
		937	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		938	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		939	}
		940	}
		941	while (pango_layout_iter_next_run (iter));
		942
		943	pango_layout_iter_free (iter);
		944	}
		945
		946	int
		947	has_wrapped (CFPlus::Layout self)
		948	CODE:
		949	{
		950	int lines = 1;
		951	const char *text = pango_layout_get_text (self->pl);
		952
		953	while (*text)
		954	lines += *text++ == '\n';
		955
		956	RETVAL = lines < pango_layout_get_line_count (self->pl);
		957	}
		958	OUTPUT:
		959	RETVAL
		960
780	SV *	961	SV *
781	get_text (CFClient::Layout self)	962	get_text (CFPlus::Layout self)
782	CODE:	963	CODE:
783	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	964	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
784	SvUTF8_on (RETVAL);	965	sv_utf8_decode (RETVAL);
785	OUTPUT:	966	OUTPUT:
786	RETVAL	967	RETVAL
787		968
788	void	969	void
789	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	970	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
790	CODE:	971	CODE:
791	self->r = r;	972	self->r = r;
792	self->g = g;	973	self->g = g;
793	self->b = b;	974	self->b = b;
794	self->a = a;	975	self->a = a;
795		976
796	void	977	void
797	set_font (CFClient::Layout self, CFClient::Font font = 0)	978	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
798	CODE:	979	CODE:
799	if (self->font != font)	980	if (self->font != font)
800	{	981	{
801	self->font = font;	982	self->font = font;
802	layout_update_font (self);	983	layout_update_font (self);
803	}	984	}
804		985
805	void	986	void
806	set_height (CFClient::Layout self, int base_height)	987	set_height (CFPlus::Layout self, int base_height)
807	CODE:	988	CODE:
808	if (self->base_height != base_height)	989	if (self->base_height != base_height)
809	{	990	{
810	self->base_height = base_height;	991	self->base_height = base_height;
811	layout_update_font (self);	992	layout_update_font (self);
812	}	993	}
813		994
814	void	995	void
815	set_width (CFClient::Layout self, int max_width = -1)	996	set_width (CFPlus::Layout self, int max_width = -1)
816	CODE:	997	CODE:
817	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	998	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
818		999
819	void	1000	void
820	set_indent (CFClient::Layout self, int indent)	1001	set_indent (CFPlus::Layout self, int indent)
821	CODE:	1002	CODE:
822	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	1003	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
823		1004
824	void	1005	void
825	set_spacing (CFClient::Layout self, int spacing)	1006	set_spacing (CFPlus::Layout self, int spacing)
826	CODE:	1007	CODE:
827	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	1008	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
828		1009
829	void	1010	void
830	set_ellipsise (CFClient::Layout self, int ellipsise)	1011	set_ellipsise (CFPlus::Layout self, int ellipsise)
831	CODE:	1012	CODE:
832	pango_layout_set_ellipsize (self->pl,	1013	pango_layout_set_ellipsize (self->pl,
833	ellipsise == 1 ? PANGO_ELLIPSIZE_START	1014	ellipsise == 1 ? PANGO_ELLIPSIZE_START
834	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	1015	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
835	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	1016	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
836	: PANGO_ELLIPSIZE_NONE	1017	: PANGO_ELLIPSIZE_NONE
837	);	1018	);
838		1019
839	void	1020	void
840	set_single_paragraph_mode (CFClient::Layout self, int spm)	1021	set_single_paragraph_mode (CFPlus::Layout self, int spm)
841	CODE:	1022	CODE:
842	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	1023	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
843		1024
844	void	1025	void
845	size (CFClient::Layout self)	1026	size (CFPlus::Layout self)
846	PPCODE:	1027	PPCODE:
847	{	1028	{
848	int w, h;	1029	int w, h;
849		1030
850	layout_get_pixel_size (self, &w, &h);	1031	layout_get_pixel_size (self, &w, &h);
…		…
853	PUSHs (sv_2mortal (newSViv (w)));	1034	PUSHs (sv_2mortal (newSViv (w)));
854	PUSHs (sv_2mortal (newSViv (h)));	1035	PUSHs (sv_2mortal (newSViv (h)));
855	}	1036	}
856		1037
857	int	1038	int
		1039	descent (CFPlus::Layout self)
		1040	CODE:
		1041	{
		1042	PangoRectangle rect;
		1043	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1044	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1045	RETVAL = PANGO_DESCENT (rect);
		1046	}
		1047	OUTPUT:
		1048	RETVAL
		1049
		1050	int
858	xy_to_index (CFClient::Layout self, int x, int y)	1051	xy_to_index (CFPlus::Layout self, int x, int y)
859	CODE:	1052	CODE:
860	{	1053	{
861	int index, trailing;	1054	int index, trailing;
862	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1055	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
863	RETVAL = index;	1056	RETVAL = index;
864	}	1057	}
865	OUTPUT:	1058	OUTPUT:
866	RETVAL	1059	RETVAL
867		1060
868	void	1061	void
869	cursor_pos (CFClient::Layout self, int index)	1062	cursor_pos (CFPlus::Layout self, int index)
870	PPCODE:	1063	PPCODE:
871	{	1064	{
872	PangoRectangle strong_pos;	1065	PangoRectangle strong_pos;
873	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1066	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
874		1067
…		…
877	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1070	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
878	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1071	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
879	}	1072	}
880		1073
881	void	1074	void
882	render (CFClient::Layout self)	1075	render (CFPlus::Layout self, float x, float y, int flags = 0)
883	PPCODE:	1076	PPCODE:
884	{	1077	pango_opengl_render_layout_subpixel (
885	SV *retval;	1078	self->pl,
886	int w, h;	1079	x * PANGO_SCALE, y * PANGO_SCALE,
		1080	self->r, self->g, self->b, self->a,
		1081	flags
		1082	);
887		1083
888	layout_get_pixel_size (self, &w, &h);	1084	MODULE = CFPlus PACKAGE = CFPlus::Texture
889		1085
890	if (self->rgba)	1086	void
		1087	pad2pot (SV data_, SV w_, SV *h_)
		1088	CODE:
		1089	{
		1090	int ow = SvIV (w_);
		1091	int oh = SvIV (h_);
		1092
		1093	if (ow && oh)
891	{	1094	{
892	cairo_surface_t *surface;	1095	int nw = minpot (ow);
893	cairo_t *cairo;	1096	int nh = minpot (oh);
894		1097
895	retval = newSV (w * h * 4);	1098	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	{	1099	{
913	uint32_t p = (uint32_t )SvPVX (retval);	1100	if (SvOK (data_))
914	uint32_t e = p + w h;
915
916	while (p < e)
917	{	1101	{
918	uint32_t rgba = *p;	1102	STRLEN datalen;
919	rgba = (rgba >> 24) \| (rgba << 8);	1103	char *data = SvPVbyte (data_, datalen);
920	#if 0	1104	int bpp = datalen / (ow * oh);
921	#ifdef _WIN32	1105	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		1106
928	rgba = (rgba & 0xffffff00) \| a;	1107	SvPOK_only (result_);
		1108	SvCUR_set (result_, nw * nh * bpp);
		1109
		1110	memset (SvPVX (result_), 0, nw * nh * bpp);
		1111	while (oh--)
		1112	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1113
		1114	sv_setsv (data_, result_);
929	}	1115	}
930	#endif	1116
931	#endif	1117	sv_setiv (w_, nw);
932	rgba = SDL_SwapBE32 (rgba);	1118	sv_setiv (h_, nh);
933	*p++ = rgba;
934	}	1119	}
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	}	1120	}
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	}	1121	}
971		1122
972	MODULE = CFClient PACKAGE = CFClient::Texture
973
974	void	1123	void
975	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1124	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
976	PROTOTYPE: $$$;$$	1125	PROTOTYPE: $$$;$$
977	ALIAS:	1126	ALIAS:
978	draw_quad_alpha = 1	1127	draw_quad_alpha = 1
979	draw_quad_alpha_premultiplied = 2	1128	draw_quad_alpha_premultiplied = 2
980	CODE:	1129	CODE:
981	{	1130	{
982	HV hv = (HV )SvRV (self);	1131	HV hv = (HV )SvRV (self);
983	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1132	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
984	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1133	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
985	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1134	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
986	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
987		1135
988	if (items < 5)	1136	if (items < 5)
989	{	1137	{
990	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1138	w = SvNV (*hv_fetch (hv, "w", 1, 1));
991	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1139	h = SvNV (*hv_fetch (hv, "h", 1, 1));
992	}	1140	}
993		1141
994	if (ix)	1142	if (ix)
995	{	1143	{
996	glEnable (GL_BLEND);	1144	glEnable (GL_BLEND);
		1145
		1146	if (ix == 2)
997	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1147	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1148	else
		1149	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1150	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1151
998	glEnable (GL_ALPHA_TEST);	1152	glEnable (GL_ALPHA_TEST);
999	glAlphaFunc (GL_GREATER, 0.01f);	1153	glAlphaFunc (GL_GREATER, 0.01f);
1000	}	1154	}
1001		1155
1002	glBindTexture (GL_TEXTURE_2D, name);	1156	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		1157
1010	glBegin (GL_QUADS);	1158	glBegin (GL_QUADS);
1011	glTexCoord2f (0, 0); glVertex2f (x , y );	1159	glTexCoord2f (0, 0); glVertex2f (x , y );
1012	glTexCoord2f (0, t); glVertex2f (x , y + h);	1160	glTexCoord2f (0, t); glVertex2f (x , y + h);
1013	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1161	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1019	glDisable (GL_ALPHA_TEST);	1167	glDisable (GL_ALPHA_TEST);
1020	glDisable (GL_BLEND);	1168	glDisable (GL_BLEND);
1021	}	1169	}
1022	}	1170	}
1023		1171
1024	MODULE = CFClient PACKAGE = CFClient::Map	1172	MODULE = CFPlus PACKAGE = CFPlus::Map
1025		1173
1026	CFClient::Map	1174	CFPlus::Map
1027	new (SV *class, int map_width, int map_height)	1175	new (SV *class, int map_width, int map_height)
1028	CODE:	1176	CODE:
1029	New (0, RETVAL, 1, struct map);	1177	New (0, RETVAL, 1, struct map);
1030	RETVAL->x = 0;	1178	RETVAL->x = 0;
1031	RETVAL->y = 0;	1179	RETVAL->y = 0;
…		…
1041	RETVAL->row = 0;	1189	RETVAL->row = 0;
1042	OUTPUT:	1190	OUTPUT:
1043	RETVAL	1191	RETVAL
1044		1192
1045	void	1193	void
1046	DESTROY (CFClient::Map self)	1194	DESTROY (CFPlus::Map self)
1047	CODE:	1195	CODE:
1048	{	1196	{
1049	map_clear (self);	1197	map_clear (self);
1050	Safefree (self->face);	1198	Safefree (self->face);
		1199	Safefree (self->tex);
1051	Safefree (self);	1200	Safefree (self);
1052	}	1201	}
1053		1202
1054	void	1203	void
1055	clear (CFClient::Map self)	1204	clear (CFPlus::Map self)
1056	CODE:	1205	CODE:
1057	map_clear (self);	1206	map_clear (self);
1058		1207
1059	void	1208	void
1060	set_face (CFClient::Map self, int face, int texid)	1209	set_face (CFPlus::Map self, int face, int texid)
1061	CODE:	1210	CODE:
1062	{	1211	{
1063	while (self->faces <= face)	1212	while (self->faces <= face)
1064	{	1213	{
1065	Append (mapface, self->face, self->faces, self->faces);	1214	Append (mapface, self->face, self->faces, self->faces);
…		…
1068		1217
1069	self->face [face] = texid;	1218	self->face [face] = texid;
1070	}	1219	}
1071		1220
1072	void	1221	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)	1222	set_texture (CFPlus::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)
1074	CODE:	1223	CODE:
1075	{	1224	{
1076	while (self->texs <= texid)	1225	while (self->texs <= texid)
1077	{	1226	{
1078	Append (maptex, self->tex, self->texs, self->texs);	1227	Append (maptex, self->tex, self->texs, self->texs);
…		…
1090	tex->r = r;	1239	tex->r = r;
1091	tex->g = g;	1240	tex->g = g;
1092	tex->b = b;	1241	tex->b = b;
1093	tex->a = a;	1242	tex->a = a;
1094	}	1243	}
		1244
		1245	// somewhat hackish, but for textures that require it, it really
		1246	// improves the look, and most others don't suffer.
		1247	glBindTexture (GL_TEXTURE_2D, name);
		1248	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1249	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1250	// use uglier nearest interpolation because linear suffers
		1251	// from transparent color bleeding and ugly wrapping effects.
		1252	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1095	}	1253	}
1096		1254
1097	int	1255	int
1098	ox (CFClient::Map self)	1256	ox (CFPlus::Map self)
1099	ALIAS:	1257	ALIAS:
1100	oy = 1	1258	oy = 1
		1259	x = 2
		1260	y = 3
		1261	w = 4
		1262	h = 5
1101	CODE:	1263	CODE:
1102	switch (ix)	1264	switch (ix)
1103	{	1265	{
1104	case 0: RETVAL = self->ox; break;	1266	case 0: RETVAL = self->ox; break;
1105	case 1: RETVAL = self->oy; break;	1267	case 1: RETVAL = self->oy; break;
		1268	case 2: RETVAL = self->x; break;
		1269	case 3: RETVAL = self->y; break;
		1270	case 4: RETVAL = self->w; break;
		1271	case 5: RETVAL = self->h; break;
1106	}	1272	}
1107	OUTPUT:	1273	OUTPUT:
1108	RETVAL	1274	RETVAL
1109		1275
1110	void	1276	void
1111	scroll (CFClient::Map self, int dx, int dy)	1277	scroll (CFPlus::Map self, int dx, int dy)
1112	CODE:	1278	CODE:
1113	{	1279	{
1114	if (dx > 0)	1280	if (dx > 0)
1115	map_blank (self, self->x, self->y, dx - 1, self->h);	1281	map_blank (self, self->x, self->y, dx, self->h);
1116	else if (dx < 0)	1282	else if (dx < 0)
1117	map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h);	1283	map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1118		1284
1119	if (dy > 0)	1285	if (dy > 0)
1120	map_blank (self, self->x, self->y, self->w, dy - 1);	1286	map_blank (self, self->x, self->y, self->w, dy);
1121	else if (dy < 0)	1287	else if (dy < 0)
1122	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy);	1288	map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1123		1289
1124	self->ox += dx; self->x += dx;	1290	self->ox += dx; self->x += dx;
1125	self->oy += dy; self->y += dy;	1291	self->oy += dy; self->y += dy;
1126		1292
1127	while (self->y < 0)	1293	while (self->y < 0)
…		…
1132	self->y += MAP_EXTEND_Y;	1298	self->y += MAP_EXTEND_Y;
1133	}	1299	}
1134	}	1300	}
1135		1301
1136	void	1302	void
1137	map1a_update (CFClient::Map self, SV *data_)	1303	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1138	CODE:	1304	CODE:
1139	{	1305	{
1140	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1306	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1141	uint8_t data_end = (uint8_t )SvEND (data_);	1307	uint8_t data_end = (uint8_t )SvEND (data_);
1142	mapcell *cell;	1308	mapcell *cell;
1143	int x, y, flags;	1309	int x, y, flags;
1144		1310
1145	while (data < data_end)	1311	while (data < data_end - 1)
1146	{	1312	{
1147	flags = (data [0] << 8) + data [1]; data += 2;	1313	flags = (data [0] << 8) + data [1]; data += 2;
1148		1314
1149	x = ((flags >> 10) & 63) + self->x;	1315	x = self->x + ((flags >> 10) & 63);
1150	y = ((flags >> 4) & 63) + self->y;	1316	y = self->y + ((flags >> 4) & 63);
1151		1317
1152	cell = map_get_cell (self, x, y);	1318	cell = map_get_cell (self, x, y);
1153		1319
1154	if (flags & 15)	1320	if (flags & 15)
1155	{	1321	{
1156	if (cell->darkness < 0)	1322	if (!cell->darkness)
1157	{	1323	{
		1324	memset (cell, 0, sizeof (*cell));
1158	cell->darkness = 0;	1325	cell->darkness = 256;
1159	cell->face [0] = 0;
1160	cell->face [1] = 0;
1161	cell->face [2] = 0;
1162	}	1326	}
1163		1327
1164	cell->darkness = flags & 8 ? *data++ : 255;
1165
1166	//TODO: don't trust server data to be in-range(!)	1328	//TODO: don't trust server data to be in-range(!)
		1329
		1330	if (flags & 8)
		1331	{
		1332	if (extmap)
		1333	{
		1334	uint8_t ext, cmd;
		1335
		1336	do
		1337	{
		1338	ext = *data++;
		1339	cmd = ext & 0x3f;
		1340
		1341	if (cmd < 4)
		1342	cell->darkness = 255 - ext * 64 + 1;
		1343	else if (cmd == 5) // health
		1344	{
		1345	cell->stat_width = 1;
		1346	cell->stat_hp = *data++;
		1347	}
		1348	else if (cmd == 6) // monster width
		1349	cell->stat_width = *data++ + 1;
		1350	else if (cmd == 0x47) // monster width
		1351	{
		1352	if (*data == 4)
		1353	; // decode player tag
		1354
		1355	data += *data + 1;
		1356	}
		1357	else if (cmd == 8) // cell flags
		1358	cell->flags = *data++;
		1359	else if (ext & 0x40) // unknown, multibyte => skip
		1360	data += *data + 1;
		1361	else
		1362	data++;
		1363	}
		1364	while (ext & 0x80);
		1365	}
		1366	else
		1367	cell->darkness = *data++ + 1;
		1368	}
1167		1369
1168	if (flags & 4)	1370	if (flags & 4)
1169	{	1371	{
1170	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1372	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1171	}	1373	}
…		…
1179	{	1381	{
1180	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1382	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1181	}	1383	}
1182	}	1384	}
1183	else	1385	else
1184	cell->darkness = -1;	1386	cell->darkness = 0;
1185	}	1387	}
1186	}	1388	}
1187		1389
1188	SV *	1390	SV *
1189	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1391	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1190	CODE:	1392	CODE:
1191	{	1393	{
1192	int x1, x;	1394	int x1, x;
1193	int y1, y;	1395	int y1, y;
1194	int z;	1396	int z;
…		…
1244	}	1446	}
1245	OUTPUT:	1447	OUTPUT:
1246	RETVAL	1448	RETVAL
1247		1449
1248	void	1450	void
1249	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1451	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1250	PPCODE:	1452	CODE:
1251	{	1453	{
1252	int vx, vy;	1454	int vx, vy;
1253	int x, y, z;	1455	int x, y, z;
1254	int last_name;	1456	int last_name;
1255	mapface face;	1457	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		1458
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;	1459	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1265	vy = self->y + (self->h - sh) / 2 - shift_y;	1460	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1266		1461
1267	/*	1462	/*
1268	int vx = self->vx = self->w >= sw	1463	int vx = self->vx = self->w >= sw
1269	? self->x + (self->w - sw) / 2	1464	? self->x + (self->w - sw) / 2
1270	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1465	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1274	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1469	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1275	*/	1470	*/
1276		1471
1277	glColor4ub (255, 255, 255, 255);	1472	glColor4ub (255, 255, 255, 255);
1278		1473
		1474	glEnable (GL_BLEND);
1279	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1475	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1280	glEnable (GL_BLEND);
1281	glEnable (GL_TEXTURE_2D);	1476	glEnable (GL_TEXTURE_2D);
1282	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1477	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1283		1478
1284	glBegin (GL_QUADS);	1479	glBegin (GL_QUADS);
1285		1480
…		…
1294	for (x = 0; x < sw; x++)	1489	for (x = 0; x < sw; x++)
1295	if (row->c0 <= x + vx && x + vx < row->c1)	1490	if (row->c0 <= x + vx && x + vx < row->c1)
1296	{	1491	{
1297	mapcell *cell = row->col + (x + vx - row->c0);	1492	mapcell *cell = row->col + (x + vx - row->c0);
1298		1493
1299	darkness[y * sw4 + x] = cell->darkness < 0
1300	? 255 - FOW_DARKNESS
1301	: 255 - cell->darkness;
1302
1303	face = cell->face [z];	1494	face = cell->face [z];
1304		1495
1305	if (face)	1496	if (face && face < self->texs)
1306	{	1497	{
1307	maptex tex = self->tex [face];	1498	maptex tex = self->tex [face];
1308
1309	int px = (x + 1) * 32 - tex.w;	1499	int px = (x + 1) * 32 - tex.w;
1310	int py = (y + 1) * 32 - tex.h;	1500	int py = (y + 1) * 32 - tex.h;
1311		1501
1312	if (last_name != tex.name)	1502	if (last_name != tex.name)
1313	{	1503	{
1314	glEnd ();	1504	glEnd ();
1315	last_name = tex.name;
1316	glBindTexture (GL_TEXTURE_2D, last_name);	1505	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1317	glBegin (GL_QUADS);	1506	glBegin (GL_QUADS);
1318	}	1507	}
1319		1508
1320	glTexCoord2f (0 , 0 ); glVertex2f (px , py );	1509	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1321	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);	1510	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1322	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);	1511	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1323	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );	1512	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1324	}	1513	}
		1514
		1515	if (cell->flags && z == 2)
		1516	{
		1517	if (cell->flags & 1)
		1518	{
		1519	maptex tex = self->tex [1];
		1520	int px = (x + 1) * 32 - tex.w + 2;
		1521	int py = (y + 1) * 32 - tex.h - 6;
		1522
		1523	glEnd ();
		1524	glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
		1525	glBegin (GL_QUADS);
		1526
		1527	glTexCoord2f (0 , 0 ); glVertex2f (px , py );
		1528	glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
		1529	glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
		1530	glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
		1531	}
		1532	}
1325	}	1533	}
1326	}	1534	}
1327		1535
1328	glEnd ();	1536	glEnd ();
1329		1537
1330	glDisable (GL_TEXTURE_2D);	1538	glDisable (GL_TEXTURE_2D);
1331	glDisable (GL_BLEND);	1539	glDisable (GL_BLEND);
		1540
		1541	// top layer: overlays such as the health bar
		1542	for (y = 0; y < sh; y++)
		1543	if (0 <= y + vy && y + vy < self->rows)
		1544	{
		1545	maprow *row = self->row + (y + vy);
		1546
		1547	for (x = 0; x < sw; x++)
		1548	if (row->c0 <= x + vx && x + vx < row->c1)
		1549	{
		1550	mapcell *cell = row->col + (x + vx - row->c0);
		1551
		1552	int px = x * 32;
		1553	int py = y * 32;
		1554
		1555	if (cell->stat_hp)
		1556	{
		1557	int width = cell->stat_width * 32;
		1558	int thick = sh / 28 + 1 + cell->stat_width;
		1559
		1560	glColor3ub (0, 0, 0);
		1561	glRectf (px + 1, py - thick - 2,
		1562	px + width - 1, py);
		1563
		1564	glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
		1565	glRectf (px + 2,
		1566	py - thick - 1,
		1567	px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
		1568	}
		1569	}
		1570	}
		1571	}
		1572
		1573	void
		1574	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1575	CODE:
		1576	{
		1577	static float color[16][3] = {
		1578	{ 0.00F, 0.00F, 0.00F },
		1579	{ 1.00F, 1.00F, 1.00F },
		1580	{ 0.00F, 0.00F, 0.55F },
		1581	{ 1.00F, 0.00F, 0.00F },
		1582
		1583	{ 1.00F, 0.54F, 0.00F },
		1584	{ 0.11F, 0.56F, 1.00F },
		1585	{ 0.93F, 0.46F, 0.00F },
		1586	{ 0.18F, 0.54F, 0.34F },
		1587
		1588	{ 0.56F, 0.73F, 0.56F },
		1589	{ 0.80F, 0.80F, 0.80F },
		1590	{ 0.55F, 0.41F, 0.13F },
		1591	{ 0.99F, 0.77F, 0.26F },
		1592
		1593	{ 0.74F, 0.65F, 0.41F },
		1594
		1595	{ 0.00F, 1.00F, 1.00F },
		1596	{ 1.00F, 0.00F, 1.00F },
		1597	{ 1.00F, 1.00F, 0.00F },
		1598	};
		1599
		1600	int x, y;
		1601
		1602	glEnable (GL_TEXTURE_2D);
		1603	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1604	glEnable (GL_BLEND);
		1605	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1606	glBegin (GL_QUADS);
		1607
		1608	for (y = 0; y < h; y++)
		1609	for (x = 0; x < w; x++)
		1610	{
		1611	unsigned char m = data [x + y * w];
		1612
		1613	if (m)
		1614	{
		1615	float *c = color [m & 15];
		1616
		1617	float tx1 = m & 0x40 ? 0.5 : 0.;
		1618	float tx2 = tx1 + 0.5;
		1619
		1620	glColor4f (c[0], c[1], c[2], 0.75);
		1621	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1622	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1623	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1624	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1625	}
		1626	}
		1627
		1628	glEnd ();
		1629	glDisable (GL_BLEND);
		1630	glDisable (GL_TEXTURE_2D);
		1631	}
		1632
		1633	void
		1634	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1635	PPCODE:
		1636	{
		1637	int vx, vy;
		1638	int x, y;
		1639	int sw4 = (sw + 3) & ~3;
		1640	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1641	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1642
		1643	memset (darkness, 255, sw4 * sh);
		1644	SvPOK_only (darkness_sv);
		1645	SvCUR_set (darkness_sv, sw4 * sh);
		1646
		1647	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1648	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1649
		1650	for (y = 0; y < sh; y++)
		1651	if (0 <= y + vy && y + vy < self->rows)
		1652	{
		1653	maprow *row = self->row + (y + vy);
		1654
		1655	for (x = 0; x < sw; x++)
		1656	if (row->c0 <= x + vx && x + vx < row->c1)
		1657	{
		1658	mapcell *cell = row->col + (x + vx - row->c0);
		1659
		1660	darkness[y * sw4 + x] = cell->darkness
		1661	? 255 - (cell->darkness - 1)
		1662	: 255 - FOW_DARKNESS;
		1663	}
		1664	}
1332		1665
1333	EXTEND (SP, 3);	1666	EXTEND (SP, 3);
1334	PUSHs (sv_2mortal (newSViv (sw4)));	1667	PUSHs (sv_2mortal (newSViv (sw4)));
1335	PUSHs (sv_2mortal (newSViv (sh)));	1668	PUSHs (sv_2mortal (newSViv (sh)));
1336	PUSHs (darkness_sv);	1669	PUSHs (darkness_sv);
1337	}	1670	}
1338		1671
1339	SV *	1672	SV *
1340	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1673	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1341	CODE:	1674	CODE:
1342	{	1675	{
1343	int x, y, x1, y1;	1676	int x, y, x1, y1;
1344	SV data_sv = newSV (w h * 7 + 5);	1677	SV data_sv = newSV (w h * 7 + 5);
1345	uint8_t data = (uint8_t )SvPVX (data_sv);	1678	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1407	}	1740	}
1408	OUTPUT:	1741	OUTPUT:
1409	RETVAL	1742	RETVAL
1410		1743
1411	void	1744	void
1412	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1745	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1413	PPCODE:	1746	PPCODE:
1414	{	1747	{
1415	int x, y, z;	1748	int x, y, z;
1416	int w, h;	1749	int w, h;
1417	int x1, y1;	1750	int x1, y1;
…		…
1449		1782
1450	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1783	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1451	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1784	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1452	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1785	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1453		1786
1454	if (cell->darkness <= 0)	1787	if (cell->darkness == 0)
1455	{	1788	{
1456	cell->darkness = -1;	1789	cell->darkness = 0;
1457		1790
1458	for (z = 0; z <= 2; z++)	1791	for (z = 0; z <= 2; z++)
1459	{	1792	{
1460	cell->face[z] = face[z];	1793	cell->face[z] = face[z];
1461		1794
…		…
1466	}	1799	}
1467	}	1800	}
1468	}	1801	}
1469	}	1802	}
1470		1803
1471	MODULE = CFClient PACKAGE = CFClient::MixChunk	1804	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1472		1805
1473	CFClient::MixChunk	1806	CFPlus::MixChunk
1474	new_from_file (SV class, char path)	1807	new_from_file (SV class, char path)
1475	CODE:	1808	CODE:
1476	RETVAL = Mix_LoadWAV (path);	1809	RETVAL = Mix_LoadWAV (path);
1477	OUTPUT:	1810	OUTPUT:
1478	RETVAL	1811	RETVAL
1479		1812
1480	void	1813	void
1481	DESTROY (CFClient::MixChunk self)	1814	DESTROY (CFPlus::MixChunk self)
1482	CODE:	1815	CODE:
1483	Mix_FreeChunk (self);	1816	Mix_FreeChunk (self);
1484		1817
1485	int	1818	int
1486	volume (CFClient::MixChunk self, int volume = -1)	1819	volume (CFPlus::MixChunk self, int volume = -1)
1487	CODE:	1820	CODE:
1488	RETVAL = Mix_VolumeChunk (self, volume);	1821	RETVAL = Mix_VolumeChunk (self, volume);
1489	OUTPUT:	1822	OUTPUT:
1490	RETVAL	1823	RETVAL
1491		1824
1492	int	1825	int
1493	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1826	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1494	CODE:	1827	CODE:
1495	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1828	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1496	OUTPUT:	1829	OUTPUT:
1497	RETVAL	1830	RETVAL
1498		1831
1499	MODULE = CFClient PACKAGE = CFClient::MixMusic	1832	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1500		1833
1501	int	1834	int
1502	volume (int volume = -1)	1835	volume (int volume = -1)
1503	CODE:	1836	CODE:
1504	RETVAL = Mix_VolumeMusic (volume);	1837	RETVAL = Mix_VolumeMusic (volume);
1505	OUTPUT:	1838	OUTPUT:
1506	RETVAL	1839	RETVAL
1507		1840
1508	CFClient::MixMusic	1841	CFPlus::MixMusic
1509	new_from_file (SV class, char path)	1842	new_from_file (SV class, char path)
1510	CODE:	1843	CODE:
1511	RETVAL = Mix_LoadMUS (path);	1844	RETVAL = Mix_LoadMUS (path);
1512	OUTPUT:	1845	OUTPUT:
1513	RETVAL	1846	RETVAL
1514		1847
1515	void	1848	void
1516	DESTROY (CFClient::MixMusic self)	1849	DESTROY (CFPlus::MixMusic self)
1517	CODE:	1850	CODE:
1518	Mix_FreeMusic (self);	1851	Mix_FreeMusic (self);
1519		1852
1520	int	1853	int
1521	play (CFClient::MixMusic self, int loops = -1)	1854	play (CFPlus::MixMusic self, int loops = -1)
1522	CODE:	1855	CODE:
1523	RETVAL = Mix_PlayMusic (self, loops);	1856	RETVAL = Mix_PlayMusic (self, loops);
1524	OUTPUT:	1857	OUTPUT:
1525	RETVAL	1858	RETVAL
1526		1859
1527	MODULE = CFClient PACKAGE = CFClient::OpenGL	1860	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1528		1861
1529	BOOT:	1862	BOOT:
1530	{	1863	{
1531	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1864	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1532	static const struct {	1865	static const struct {
1533	const char *name;	1866	const char *name;
1534	IV iv;	1867	IV iv;
1535	} *civ, const_iv[] = {	1868	} *civ, const_iv[] = {
1536	# define const_iv(name) { # name, (IV)name }	1869	# define const_iv(name) { # name, (IV)name }
…		…
1543	const_iv (GL_SCISSOR_TEST),	1876	const_iv (GL_SCISSOR_TEST),
1544	const_iv (GL_DEPTH_TEST),	1877	const_iv (GL_DEPTH_TEST),
1545	const_iv (GL_ALPHA_TEST),	1878	const_iv (GL_ALPHA_TEST),
1546	const_iv (GL_NORMALIZE),	1879	const_iv (GL_NORMALIZE),
1547	const_iv (GL_RESCALE_NORMAL),	1880	const_iv (GL_RESCALE_NORMAL),
		1881	const_iv (GL_FRONT),
		1882	const_iv (GL_BACK),
1548	const_iv (GL_AND),	1883	const_iv (GL_AND),
1549	const_iv (GL_ONE),	1884	const_iv (GL_ONE),
1550	const_iv (GL_ZERO),	1885	const_iv (GL_ZERO),
1551	const_iv (GL_SRC_ALPHA),	1886	const_iv (GL_SRC_ALPHA),
1552	const_iv (GL_SRC_ALPHA_SATURATE),	1887	const_iv (GL_DST_ALPHA),
1553	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1888	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1554	const_iv (GL_ONE_MINUS_DST_ALPHA),	1889	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1890	const_iv (GL_SRC_ALPHA_SATURATE),
1555	const_iv (GL_RGB),	1891	const_iv (GL_RGB),
1556	const_iv (GL_RGBA),	1892	const_iv (GL_RGBA),
		1893	const_iv (GL_RGBA4),
		1894	const_iv (GL_RGBA8),
		1895	const_iv (GL_RGB5_A1),
1557	const_iv (GL_UNSIGNED_BYTE),	1896	const_iv (GL_UNSIGNED_BYTE),
1558	const_iv (GL_UNSIGNED_SHORT),	1897	const_iv (GL_UNSIGNED_SHORT),
1559	const_iv (GL_UNSIGNED_INT),	1898	const_iv (GL_UNSIGNED_INT),
1560	const_iv (GL_ALPHA),	1899	const_iv (GL_ALPHA),
1561	const_iv (GL_INTENSITY),	1900	const_iv (GL_INTENSITY),
…		…
1570	const_iv (GL_TEXTURE_MAG_FILTER),	1909	const_iv (GL_TEXTURE_MAG_FILTER),
1571	const_iv (GL_TEXTURE_MIN_FILTER),	1910	const_iv (GL_TEXTURE_MIN_FILTER),
1572	const_iv (GL_TEXTURE_ENV_MODE),	1911	const_iv (GL_TEXTURE_ENV_MODE),
1573	const_iv (GL_TEXTURE_WRAP_S),	1912	const_iv (GL_TEXTURE_WRAP_S),
1574	const_iv (GL_TEXTURE_WRAP_T),	1913	const_iv (GL_TEXTURE_WRAP_T),
		1914	const_iv (GL_REPEAT),
1575	const_iv (GL_CLAMP),	1915	const_iv (GL_CLAMP),
1576	const_iv (GL_REPEAT),	1916	const_iv (GL_CLAMP_TO_EDGE),
1577	const_iv (GL_NEAREST),	1917	const_iv (GL_NEAREST),
1578	const_iv (GL_LINEAR),	1918	const_iv (GL_LINEAR),
1579	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1919	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1580	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1920	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1581	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1921	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1592	const_iv (GL_SEPARABLE_2D),	1932	const_iv (GL_SEPARABLE_2D),
1593	const_iv (GL_CONVOLUTION_2D),	1933	const_iv (GL_CONVOLUTION_2D),
1594	const_iv (GL_CONVOLUTION_BORDER_MODE),	1934	const_iv (GL_CONVOLUTION_BORDER_MODE),
1595	const_iv (GL_CONSTANT_BORDER),	1935	const_iv (GL_CONSTANT_BORDER),
1596	const_iv (GL_LINES),	1936	const_iv (GL_LINES),
		1937	const_iv (GL_LINE_STRIP),
1597	const_iv (GL_LINE_LOOP),	1938	const_iv (GL_LINE_LOOP),
1598	const_iv (GL_QUADS),	1939	const_iv (GL_QUADS),
1599	const_iv (GL_QUAD_STRIP),	1940	const_iv (GL_QUAD_STRIP),
1600	const_iv (GL_TRIANGLES),	1941	const_iv (GL_TRIANGLES),
1601	const_iv (GL_TRIANGLE_STRIP),	1942	const_iv (GL_TRIANGLE_STRIP),
…		…
1611		1952
1612	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1953	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1613	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1954	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1614	}	1955	}
1615		1956
		1957	char *
		1958	gl_vendor ()
		1959	CODE:
		1960	RETVAL = (char *)glGetString (GL_VENDOR);
		1961	OUTPUT:
		1962	RETVAL
		1963
		1964	char *
		1965	gl_version ()
		1966	CODE:
		1967	RETVAL = (char *)glGetString (GL_VERSION);
		1968	OUTPUT:
		1969	RETVAL
		1970
		1971	char *
		1972	gl_extensions ()
		1973	CODE:
		1974	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1975	OUTPUT:
		1976	RETVAL
		1977
1616	int glGetError ()	1978	int glGetError ()
		1979
		1980	void glFinish ()
1617		1981
1618	void glClear (int mask)	1982	void glClear (int mask)
1619		1983
1620	void glClearColor (float r, float g, float b, float a = 1.0)	1984	void glClearColor (float r, float g, float b, float a = 1.0)
1621	PROTOTYPE: @	1985	PROTOTYPE: @
…		…
1628		1992
1629	void glHint (int target, int mode)	1993	void glHint (int target, int mode)
1630		1994
1631	void glBlendFunc (int sfactor, int dfactor)	1995	void glBlendFunc (int sfactor, int dfactor)
1632		1996
		1997	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1998	CODE:
		1999	gl_BlendFuncSeparate (sa, da, saa, daa);
		2000
1633	void glDepthMask (int flag)	2001	void glDepthMask (int flag)
1634		2002
1635	void glLogicOp (int opcode)	2003	void glLogicOp (int opcode)
1636		2004
1637	void glColorMask (int red, int green, int blue, int alpha)	2005	void glColorMask (int red, int green, int blue, int alpha)
…		…
1641	void glPushMatrix ()	2009	void glPushMatrix ()
1642		2010
1643	void glPopMatrix ()	2011	void glPopMatrix ()
1644		2012
1645	void glLoadIdentity ()	2013	void glLoadIdentity ()
		2014
		2015	void glDrawBuffer (int buffer)
		2016
		2017	void glReadBuffer (int buffer)
1646		2018
1647	# near_ and far_ are due to microsofts buggy "c" compiler	2019	# 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_)	2020	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1649		2021
1650	# near_ and far_ are due to microsofts buggy "c" compiler	2022	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1670		2042
1671	void glEnd ()	2043	void glEnd ()
1672		2044
1673	void glColor (float r, float g, float b, float a = 1.0)	2045	void glColor (float r, float g, float b, float a = 1.0)
1674	PROTOTYPE: @	2046	PROTOTYPE: @
		2047	ALIAS:
		2048	glColor_premultiply = 1
1675	CODE:	2049	CODE:
		2050	if (ix)
		2051	{
		2052	r *= a;
		2053	g *= a;
		2054	b *= a;
		2055	}
1676	// microsoft visual "c" rounds instead of truncating...	2056	// microsoft visual "c" rounds instead of truncating...
1677	glColor4ub (MIN ((int)(r * 255.f), 255),	2057	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		2058
1682	void glInterleavedArrays (int format, int stride, char *data)	2059	void glInterleavedArrays (int format, int stride, char *data)
1683		2060
1684	void glDrawElements (int mode, int count, int type, char *indices)	2061	void glDrawElements (int mode, int count, int type, char *indices)
1685		2062
…		…
1708		2085
1709	void glBindTexture (int target, int name)	2086	void glBindTexture (int target, int name)
1710		2087
1711	void glConvolutionParameter (int target, int pname, float params)	2088	void glConvolutionParameter (int target, int pname, float params)
1712	CODE:	2089	CODE:
1713	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2090	if (gl.ConvolutionParameterf)
		2091	gl.ConvolutionParameterf (target, pname, params);
1714		2092
1715	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2093	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1716	CODE:	2094	CODE:
1717	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2095	if (gl.ConvolutionFilter2D)
1718	(target, internalformat, width, height, format, type, data));	2096	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1719		2097
1720	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2098	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1721	CODE:	2099	CODE:
1722	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2100	if (gl.SeparableFilter2D)
1723	(target, internalformat, width, height, format, type, row, column));	2101	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1724		2102
1725	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2103	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1726		2104
1727	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2105	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1728		2106
…		…
1761		2139
1762	void glEndList ()	2140	void glEndList ()
1763		2141
1764	void glCallList (int list)	2142	void glCallList (int list)
1765		2143
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.159 by root, Sun Oct 8 21:22:29 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.159 by root, Sun Oct 8 21:22:29 2006 UTC