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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs. Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.80 by root, Sun May 14 22:58:24 2006 UTC vs.
Revision 1.164 by root, Tue Nov 7 22:41:27 2006 UTC