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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs. Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.73 by root, Fri May 5 19:30:14 2006 UTC vs.
Revision 1.165 by root, Fri Dec 8 14:59:54 2006 UTC