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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs. Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.87 by root, Fri May 19 18:39:06 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 2006 UTC