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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs. Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.90 by root, Sun May 21 00:34:58 2006 UTC vs.
Revision 1.160 by root, Mon Oct 9 01:06:36 2006 UTC