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

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 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	uint16_t darkness;
132	mapface face[3];	175	mapface face[3];
		176	uint8_t stat_hp;
133	} mapcell;	177	} mapcell;
134		178
135	typedef struct {	179	typedef struct {
136	int32_t c0, c1;	180	int32_t c0, c1;
137	mapcell *col;	181	mapcell *col;
…		…
146	int texs;	190	int texs;
147	maptex *tex;	191	maptex *tex;
148		192
149	int32_t rows;	193	int32_t rows;
150	maprow *row;	194	maprow *row;
151	} *CFClient__Map;	195	} *CFPlus__Map;
152		196
153	static char *	197	static char *
154	prepend (char *ptr, int sze, int inc)	198	prepend (char *ptr, int sze, int inc)
155	{	199	{
156	char *p;	200	char *p;
…		…
174		218
175	#define Append(type,ptr,sze,inc) (ptr) = (type )append ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))	219	#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))	220	#define Prepend(type,ptr,sze,inc) (ptr) = (type )prepend ((char )ptr, (sze) * sizeof (type), (inc) * sizeof (type))
177		221
178	static maprow *	222	static maprow *
179	map_get_row (CFClient__Map self, int y)	223	map_get_row (CFPlus__Map self, int y)
180	{	224	{
181	if (0 > y)	225	if (0 > y)
182	{	226	{
183	int extend = - y + MAP_EXTEND_Y;	227	int extend = - y + MAP_EXTEND_Y;
184	Prepend (maprow, self->row, self->rows, extend);	228	Prepend (maprow, self->row, self->rows, extend);
…		…
222		266
223	return row->col + (x - row->c0);	267	return row->col + (x - row->c0);
224	}	268	}
225		269
226	static mapcell *	270	static mapcell *
227	map_get_cell (CFClient__Map self, int x, int y)	271	map_get_cell (CFPlus__Map self, int x, int y)
228	{	272	{
229	return row_get_cell (map_get_row (self, y), x);	273	return row_get_cell (map_get_row (self, y), x);
230	}	274	}
231		275
232	static void	276	static void
233	map_clear (CFClient__Map self)	277	map_clear (CFPlus__Map self)
234	{	278	{
235	int r;	279	int r;
236		280
237	for (r = 0; r < self->rows; r++)	281	for (r = 0; r < self->rows; r++)
238	Safefree (self->row[r].col);	282	Safefree (self->row[r].col);
…		…
246	self->row = 0;	290	self->row = 0;
247	self->rows = 0;	291	self->rows = 0;
248	}	292	}
249		293
250	static void	294	static void
251	map_blank (CFClient__Map self, int x0, int y0, int w, int h)	295	map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
252	{	296	{
253	int x, y;	297	int x, y;
254	maprow *row;	298	maprow *row;
255		299
256	for (y = y0; y < y0 + h; y++)	300	for (y = y0; y < y0 + h; y++)
…		…
265	if (x >= row->c0)	309	if (x >= row->c0)
266	{	310	{
267	if (x >= row->c1)	311	if (x >= row->c1)
268	break;	312	break;
269		313
270	row->col[x - row->c0].darkness = -1;	314	row->col[x - row->c0].darkness = 0;
271	}	315	}
272	}	316	}
273	}	317	}
274		318
275	static void	319	static void
…		…
296	ev.data2 = 0;	340	ev.data2 = 0;
297		341
298	SDL_PushEvent ((SDL_Event *)&ev);	342	SDL_PushEvent ((SDL_Event *)&ev);
299	}	343	}
300		344
		345	static unsigned int
		346	minpot (unsigned int n)
		347	{
		348	if (!n)
		349	return 0;
		350
		351	--n;
		352
		353	n \|= n >> 1;
		354	n \|= n >> 2;
		355	n \|= n >> 4;
		356	n \|= n >> 8;
		357	n \|= n >> 16;
		358
		359	return n + 1;
		360	}
		361
301	MODULE = CFClient PACKAGE = CFClient	362	MODULE = CFPlus PACKAGE = CFPlus
302		363
303	PROTOTYPES: ENABLE	364	PROTOTYPES: ENABLE
304		365
305	BOOT:	366	BOOT:
306	{	367	{
307	HV *stash = gv_stashpv ("CFClient", 1);	368	HV *stash = gv_stashpv ("CFPlus", 1);
308	static const struct {	369	static const struct {
309	const char *name;	370	const char *name;
310	IV iv;	371	IV iv;
311	} *civ, const_iv[] = {	372	} *civ, const_iv[] = {
312	# define const_iv(name) { # name, (IV)name }	373	# define const_iv(name) { # name, (IV)name }
…		…
413		474
414	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	475	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
415	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	476	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
416	}	477	}
417		478
		479	int
		480	in_destruct ()
		481	CODE:
		482	RETVAL = PL_main_cv == Nullcv;
		483	OUTPUT:
		484	RETVAL
		485
		486	NV floor (NV x)
		487
		488	NV ceil (NV x)
		489
418	void	490	void
419	pango_init ()	491	pango_init ()
420	CODE:	492	CODE:
421	{	493	{
422	// delayed, so it can pick up new fonts added by AddFontResourceEx
423	ft2_fontmap = pango_ft2_font_map_new ();	494	opengl_fontmap = pango_opengl_font_map_new ();
424	pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);	495	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);	496	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	}	497	}
430		498
431	int	499	int
432	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO)	500	SDL_Init (U32 flags = SDL_INIT_VIDEO \| SDL_INIT_AUDIO \| PARACHUTE)
433		501
434	void	502	void
435	SDL_Quit ()	503	SDL_Quit ()
436		504
437	void	505	void
…		…
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	514	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		515
448	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	516	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
449	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	517	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
450		518
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
452	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
453	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
454	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
455		523
456	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	524	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		525	#if SDL_VERSION_ATLEAST(1,2,10)
		526	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
		527	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		528	#endif
457		529
458	SDL_EnableUNICODE (1);	530	SDL_EnableUNICODE (1);
459	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	531	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
460		532
461	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);	533	m = SDL_ListModes (0, SDL_FULLSCREEN \| SDL_OPENGL);
…		…
479	SDL_SetVideoMode (int w, int h, int fullscreen)	551	SDL_SetVideoMode (int w, int h, int fullscreen)
480	CODE:	552	CODE:
481	RETVAL = !!SDL_SetVideoMode (	553	RETVAL = !!SDL_SetVideoMode (
482	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)	554	w, h, 0, SDL_OPENGL \| (fullscreen ? SDL_FULLSCREEN : 0)
483	);	555	);
		556	if (RETVAL)
		557	{
484	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");	558	SDL_WM_SetCaption ("Crossfire+ Client " VERSION, "Crossfire+");
		559	# define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
		560	# include "glfunc.h"
		561	# undef GL_FUNC
		562	}
485	OUTPUT:	563	OUTPUT:
486	RETVAL	564	RETVAL
487		565
488	void	566	void
489	SDL_GL_SwapBuffers ()	567	SDL_GL_SwapBuffers ()
		568
		569	char *
		570	SDL_GetKeyName (int sym)
490		571
491	void	572	void
492	SDL_PollEvent ()	573	SDL_PollEvent ()
493	PPCODE:	574	PPCODE:
494	{	575	{
495	SDL_Event ev;	576	SDL_Event ev;
496	int i;
497	static int modifier;
498	static int modkey[] = {
499	SDLK_RSHIFT, KMOD_RSHIFT,
500	SDLK_LSHIFT, KMOD_LSHIFT,
501	SDLK_RCTRL, KMOD_RCTRL,
502	SDLK_LCTRL, KMOD_LCTRL,
503	SDLK_RALT, KMOD_RALT,
504	SDLK_LALT, KMOD_LALT,
505	SDLK_RMETA, KMOD_RMETA,
506	SDLK_LMETA, KMOD_LMETA,
507	};
508		577
509	while (SDL_PollEvent (&ev))	578	while (SDL_PollEvent (&ev))
510	{	579	{
511	HV *hv = newHV ();	580	HV *hv = newHV ();
512	hv_store (hv, "type", 4, newSViv (ev.type), 0);	581	hv_store (hv, "type", 4, newSViv (ev.type), 0);
513		582
514	switch (ev.type)	583	switch (ev.type)
515	{	584	{
516	case SDL_KEYDOWN:	585	case SDL_KEYDOWN:
517	case SDL_KEYUP:	586	case SDL_KEYUP:
518
519	for (i = 0; i < sizeof (modkey) / (sizeof (int) * 2); i++)
520	if (modkey [i * 2] == ev.key.keysym.sym)
521	{
522	if (ev.type == SDL_KEYDOWN)
523	modifier \|= modkey [i * 2 + 1];
524	else
525	modifier &= ~modkey [i * 2 + 1];
526	break;
527	}
528
529	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);	587	hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
530	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);	588	hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
531	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);	589	hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
532	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);	590	hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
533	break;	591	break;
…		…
536	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	594	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
537	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	595	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
538	break;	596	break;
539		597
540	case SDL_MOUSEMOTION:	598	case SDL_MOUSEMOTION:
541	hv_store (hv, "mod", 3, newSViv (modifier), 0);	599	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
542		600
543	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	601	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
544	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	602	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
545	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	603	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
546	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	604	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
547	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	605	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
548	break;	606	break;
549		607
550	case SDL_MOUSEBUTTONDOWN:	608	case SDL_MOUSEBUTTONDOWN:
551	case SDL_MOUSEBUTTONUP:	609	case SDL_MOUSEBUTTONUP:
552	hv_store (hv, "mod", 3, newSViv (modifier), 0);	610	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
553		611
554	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	612	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
555	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	613	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
556	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	614	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
557	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	615	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
…		…
562	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	620	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
563	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	621	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
564	break;	622	break;
565	}	623	}
566		624
567	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	625	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
568	}	626	}
569	}	627	}
570		628
571	int	629	int
572	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)	630	Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
…		…
585	CODE:	643	CODE:
586	#ifndef _WIN32	644	#ifndef _WIN32
587	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	645	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
588	#endif	646	#endif
589		647
590	char *
591	gl_vendor ()
592	CODE:
593	RETVAL = (char *)glGetString (GL_VENDOR);
594	OUTPUT:
595	RETVAL
596
597	char *
598	gl_version ()
599	CODE:
600	RETVAL = (char *)glGetString (GL_VERSION);
601	OUTPUT:
602	RETVAL
603
604	char *
605	gl_extensions ()
606	CODE:
607	RETVAL = (char *)glGetString (GL_EXTENSIONS);
608	OUTPUT:
609	RETVAL
610
611	void	648	void
612	add_font (char *file)	649	add_font (char *file)
613	CODE:	650	CODE:
614	FcConfigAppFontAddFile (0, (const FcChar8 )file); / no idea wether this is required */	651	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
615	#ifdef _WIN32
616	// cairo... sigh... requires win2000
617	AddFontResourceEx (file, FR_PRIVATE, 0);
618	#endif
619		652
620	void	653	void
621	load_image_inline (SV *image_)	654	load_image_inline (SV *image_)
622	ALIAS:	655	ALIAS:
623	load_image_file = 1	656	load_image_file = 1
…		…
665		698
666	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	699	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
667		700
668	assert (surface2->pitch == surface2->w * 4);	701	assert (surface2->pitch == surface2->w * 4);
669		702
		703	SDL_LockSurface (surface2);
670	EXTEND (SP, 5);	704	EXTEND (SP, 6);
671	PUSHs (sv_2mortal (newSViv (surface2->w)));	705	PUSHs (sv_2mortal (newSViv (surface2->w)));
672	PUSHs (sv_2mortal (newSViv (surface2->h)));	706	PUSHs (sv_2mortal (newSViv (surface2->h)));
673	SDL_LockSurface (surface2);
674	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	707	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
675	SDL_UnlockSurface (surface2);
676	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	708	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY \| SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
677	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	709	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
678	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	710	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		711	SDL_UnlockSurface (surface2);
679		712
680	SDL_FreeSurface (surface);	713	SDL_FreeSurface (surface);
681	SDL_FreeSurface (surface2);	714	SDL_FreeSurface (surface2);
682	}	715	}
683		716
…		…
719	CODE:	752	CODE:
720	fprintf (stderr, "FATAL: %s\n", message);	753	fprintf (stderr, "FATAL: %s\n", message);
721	#ifdef _WIN32	754	#ifdef _WIN32
722	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);	755	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK \| MB_ICONERROR);
723	#endif	756	#endif
724	exit (1);	757	_exit (1);
725		758
		759	void
		760	_exit (int retval)
		761	CODE:
		762	_exit (retval);
		763
726	MODULE = CFClient PACKAGE = CFClient::Font	764	MODULE = CFPlus PACKAGE = CFPlus::Font
727		765
728	CFClient::Font	766	CFPlus::Font
729	new_from_file (SV class, char path, int id = 0)	767	new_from_file (SV class, char path, int id = 0)
730	CODE:	768	CODE:
731	{	769	{
732	int count;	770	int count;
733	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);	771	FcPattern pattern = FcFreeTypeQuery ((const FcChar8 )path, id, 0, &count);
…		…
736	}	774	}
737	OUTPUT:	775	OUTPUT:
738	RETVAL	776	RETVAL
739		777
740	void	778	void
741	DESTROY (CFClient::Font self)	779	DESTROY (CFPlus::Font self)
742	CODE:	780	CODE:
743	pango_font_description_free (self);	781	pango_font_description_free (self);
744		782
745	void	783	void
746	make_default (CFClient::Font self)	784	make_default (CFPlus::Font self)
747	CODE:	785	CODE:
748	default_font = self;	786	default_font = self;
749		787
750	MODULE = CFClient PACKAGE = CFClient::Layout	788	MODULE = CFPlus PACKAGE = CFPlus::Layout
751		789
752	CFClient::Layout	790	void
753	new (SV *class, int rgba = 0)	791	reset_glyph_cache ()
754	CODE:	792	CODE:
755	#if _WIN32	793	tc_clear ();
756	rgba = 0;//D	794
757	#endif	795	CFPlus::Layout
		796	new (SV *class)
		797	CODE:
758	New (0, RETVAL, 1, struct cf_layout);	798	New (0, RETVAL, 1, struct cf_layout);
759		799
760	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	800	RETVAL->pl = pango_layout_new (opengl_context);
761	RETVAL->rgba = rgba;
762	RETVAL->r = 1.;	801	RETVAL->r = 1.;
763	RETVAL->g = 1.;	802	RETVAL->g = 1.;
764	RETVAL->b = 1.;	803	RETVAL->b = 1.;
765	RETVAL->a = 1.;	804	RETVAL->a = 1.;
766	RETVAL->base_height = MIN_FONT_HEIGHT;	805	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
770	layout_update_font (RETVAL);	809	layout_update_font (RETVAL);
771	OUTPUT:	810	OUTPUT:
772	RETVAL	811	RETVAL
773		812
774	void	813	void
775	DESTROY (CFClient::Layout self)	814	DESTROY (CFPlus::Layout self)
776	CODE:	815	CODE:
777	g_object_unref (self->pl);	816	g_object_unref (self->pl);
778	Safefree (self);	817	Safefree (self);
779		818
780	int
781	is_rgba (CFClient::Layout self)
782	CODE:
783	RETVAL = self->rgba;
784	OUTPUT:
785	RETVAL
786
787	void	819	void
788	set_text (CFClient::Layout self, SV *text_)	820	set_text (CFPlus::Layout self, SV *text_)
789	CODE:	821	CODE:
790	{	822	{
791	STRLEN textlen;	823	STRLEN textlen;
792	char *text = SvPVutf8 (text_, textlen);	824	char *text = SvPVutf8 (text_, textlen);
793		825
794	pango_layout_set_text (self->pl, text, textlen);	826	pango_layout_set_text (self->pl, text, textlen);
795	}	827	}
796		828
797	void	829	void
798	set_markup (CFClient::Layout self, SV *text_)	830	set_markup (CFPlus::Layout self, SV *text_)
799	CODE:	831	CODE:
800	{	832	{
801	STRLEN textlen;	833	STRLEN textlen;
802	char *text = SvPVutf8 (text_, textlen);	834	char *text = SvPVutf8 (text_, textlen);
803		835
804	pango_layout_set_markup (self->pl, text, textlen);	836	pango_layout_set_markup (self->pl, text, textlen);
805	}	837	}
806		838
		839	void
		840	set_shapes (CFPlus::Layout self, ...)
		841	CODE:
		842	{
		843	PangoAttrList *attrs = 0;
		844	const char *text = pango_layout_get_text (self->pl);
		845	const char *pos = text;
		846	int arg = 4;
		847
		848	while (arg < items && (pos = strstr (pos, OBJ_STR)))
		849	{
		850	PangoRectangle inkrect, rect;
		851	PangoAttribute *attr;
		852
		853	int x = SvIV (ST (arg - 3));
		854	int y = SvIV (ST (arg - 2));
		855	int w = SvIV (ST (arg - 1));
		856	int h = SvIV (ST (arg ));
		857
		858	inkrect.x = 0;
		859	inkrect.y = 0;
		860	inkrect.width = 0;
		861	inkrect.height = 0;
		862
		863	rect.x = x * PANGO_SCALE;
		864	rect.y = y * PANGO_SCALE;
		865	rect.width = w * PANGO_SCALE;
		866	rect.height = h * PANGO_SCALE;
		867
		868	if (!attrs)
		869	attrs = pango_layout_get_attributes (self->pl);
		870
		871	attr = pango_attr_shape_new (&inkrect, &rect);
		872	attr->start_index = pos - text;
		873	attr->end_index = attr->start_index + sizeof (OBJ_STR) - 1;
		874	pango_attr_list_insert (attrs, attr);
		875
		876	arg += 4;
		877	pos += sizeof (OBJ_STR) - 1;
		878	}
		879
		880	if (attrs)
		881	pango_layout_set_attributes (self->pl, attrs);
		882	}
		883
		884	void
		885	get_shapes (CFPlus::Layout self)
		886	PPCODE:
		887	{
		888	PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
		889
		890	do
		891	{
		892	PangoLayoutRun *run = pango_layout_iter_get_run (iter);
		893
		894	if (run && shape_attr_p (run))
		895	{
		896	PangoRectangle extents;
		897	pango_layout_iter_get_run_extents (iter, 0, &extents);
		898
		899	EXTEND (SP, 2);
		900	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.x))));
		901	PUSHs (sv_2mortal (newSViv (PANGO_PIXELS (extents.y))));
		902	}
		903	}
		904	while (pango_layout_iter_next_run (iter));
		905
		906	pango_layout_iter_free (iter);
		907	}
		908
		909	int
		910	has_wrapped (CFPlus::Layout self)
		911	CODE:
		912	{
		913	int lines = 1;
		914	const char *text = pango_layout_get_text (self->pl);
		915
		916	while (*text)
		917	lines += *text++ == '\n';
		918
		919	RETVAL = lines < pango_layout_get_line_count (self->pl);
		920	}
		921	OUTPUT:
		922	RETVAL
		923
807	SV *	924	SV *
808	get_text (CFClient::Layout self)	925	get_text (CFPlus::Layout self)
809	CODE:	926	CODE:
810	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	927	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
811	SvUTF8_on (RETVAL);	928	sv_utf8_decode (RETVAL);
812	OUTPUT:	929	OUTPUT:
813	RETVAL	930	RETVAL
814		931
815	void	932	void
816	set_foreground (CFClient::Layout self, float r, float g, float b, float a = 1.)	933	set_foreground (CFPlus::Layout self, float r, float g, float b, float a = 1.)
817	CODE:	934	CODE:
818	self->r = r;	935	self->r = r;
819	self->g = g;	936	self->g = g;
820	self->b = b;	937	self->b = b;
821	self->a = a;	938	self->a = a;
822		939
823	void	940	void
824	set_font (CFClient::Layout self, CFClient::Font font = 0)	941	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
825	CODE:	942	CODE:
826	if (self->font != font)	943	if (self->font != font)
827	{	944	{
828	self->font = font;	945	self->font = font;
829	layout_update_font (self);	946	layout_update_font (self);
830	}	947	}
831		948
832	void	949	void
833	set_height (CFClient::Layout self, int base_height)	950	set_height (CFPlus::Layout self, int base_height)
834	CODE:	951	CODE:
835	if (self->base_height != base_height)	952	if (self->base_height != base_height)
836	{	953	{
837	self->base_height = base_height;	954	self->base_height = base_height;
838	layout_update_font (self);	955	layout_update_font (self);
839	}	956	}
840		957
841	void	958	void
842	set_width (CFClient::Layout self, int max_width = -1)	959	set_width (CFPlus::Layout self, int max_width = -1)
843	CODE:	960	CODE:
844	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);	961	pango_layout_set_width (self->pl, max_width < 0 ? max_width : max_width * PANGO_SCALE);
845		962
846	void	963	void
847	set_indent (CFClient::Layout self, int indent)	964	set_indent (CFPlus::Layout self, int indent)
848	CODE:	965	CODE:
849	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	966	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
850		967
851	void	968	void
852	set_spacing (CFClient::Layout self, int spacing)	969	set_spacing (CFPlus::Layout self, int spacing)
853	CODE:	970	CODE:
854	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	971	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
855		972
856	void	973	void
857	set_ellipsise (CFClient::Layout self, int ellipsise)	974	set_ellipsise (CFPlus::Layout self, int ellipsise)
858	CODE:	975	CODE:
859	pango_layout_set_ellipsize (self->pl,	976	pango_layout_set_ellipsize (self->pl,
860	ellipsise == 1 ? PANGO_ELLIPSIZE_START	977	ellipsise == 1 ? PANGO_ELLIPSIZE_START
861	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	978	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
862	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	979	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
863	: PANGO_ELLIPSIZE_NONE	980	: PANGO_ELLIPSIZE_NONE
864	);	981	);
865		982
866	void	983	void
867	set_single_paragraph_mode (CFClient::Layout self, int spm)	984	set_single_paragraph_mode (CFPlus::Layout self, int spm)
868	CODE:	985	CODE:
869	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	986	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
870		987
871	void	988	void
872	size (CFClient::Layout self)	989	size (CFPlus::Layout self)
873	PPCODE:	990	PPCODE:
874	{	991	{
875	int w, h;	992	int w, h;
876		993
877	layout_get_pixel_size (self, &w, &h);	994	layout_get_pixel_size (self, &w, &h);
…		…
880	PUSHs (sv_2mortal (newSViv (w)));	997	PUSHs (sv_2mortal (newSViv (w)));
881	PUSHs (sv_2mortal (newSViv (h)));	998	PUSHs (sv_2mortal (newSViv (h)));
882	}	999	}
883		1000
884	int	1001	int
		1002	descent (CFPlus::Layout self)
		1003	CODE:
		1004	{
		1005	PangoRectangle rect;
		1006	PangoLayoutLine *line = pango_layout_get_line (self->pl, 0);
		1007	pango_layout_line_get_pixel_extents (line, 0, &rect);
		1008	RETVAL = PANGO_DESCENT (rect);
		1009	}
		1010	OUTPUT:
		1011	RETVAL
		1012
		1013	int
885	xy_to_index (CFClient::Layout self, int x, int y)	1014	xy_to_index (CFPlus::Layout self, int x, int y)
886	CODE:	1015	CODE:
887	{	1016	{
888	int index, trailing;	1017	int index, trailing;
889	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);	1018	pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
890	RETVAL = index;	1019	RETVAL = index;
891	}	1020	}
892	OUTPUT:	1021	OUTPUT:
893	RETVAL	1022	RETVAL
894		1023
895	void	1024	void
896	cursor_pos (CFClient::Layout self, int index)	1025	cursor_pos (CFPlus::Layout self, int index)
897	PPCODE:	1026	PPCODE:
898	{	1027	{
899	PangoRectangle strong_pos;	1028	PangoRectangle strong_pos;
900	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1029	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
901		1030
…		…
904	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
905	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
906	}	1035	}
907		1036
908	void	1037	void
909	render (CFClient::Layout self)	1038	render (CFPlus::Layout self, float x, float y, int flags = 0)
910	PPCODE:	1039	PPCODE:
911	{	1040	pango_opengl_render_layout_subpixel (
912	SV *retval;	1041	self->pl,
913	int w, h;	1042	x * PANGO_SCALE, y * PANGO_SCALE,
		1043	self->r, self->g, self->b, self->a,
		1044	flags
		1045	);
914		1046
915	layout_get_pixel_size (self, &w, &h);	1047	MODULE = CFPlus PACKAGE = CFPlus::Texture
916		1048
917	if (self->rgba)	1049	void
		1050	pad2pot (SV data_, SV w_, SV *h_)
		1051	CODE:
		1052	{
		1053	int ow = SvIV (w_);
		1054	int oh = SvIV (h_);
		1055
		1056	if (ow && oh)
918	{	1057	{
919	cairo_surface_t *surface;	1058	int nw = minpot (ow);
920	cairo_t *cairo;	1059	int nh = minpot (oh);
921		1060
922	retval = newSV (w * h * 4);	1061	if (nw != ow \|\| nh != oh)
923	SvPOK_only (retval);
924	SvCUR_set (retval, w * h * 4);
925
926	memset (SvPVX (retval), 0, w * h * 4);
927
928	surface = cairo_image_surface_create_for_data (
929	(void)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w 4);
930	cairo = cairo_create (surface);
931	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
932
933	pango_cairo_show_layout (cairo, self->pl);
934
935	cairo_destroy (cairo);
936	cairo_surface_destroy (surface);
937
938	// what a mess, and its premultiplied, too :(
939	{	1062	{
940	uint32_t p = (uint32_t )SvPVX (retval);	1063	if (SvOK (data_))
941	uint32_t e = p + w h;
942
943	while (p < e)
944	{	1064	{
945	uint32_t rgba = *p;	1065	STRLEN datalen;
946	rgba = (rgba >> 24) \| (rgba << 8);	1066	char *data = SvPVbyte (data_, datalen);
947	#if 0	1067	int bpp = datalen / (ow * oh);
948	#ifdef _WIN32	1068	SV result_ = sv_2mortal (newSV (nw nh * bpp));
949	{//D
950	uint8_t r = rgba >> 24;
951	uint8_t g = rgba >> 16;
952	uint8_t b = rgba >> 8;
953	uint8_t a = rgba >> 0;
954		1069
955	rgba = (rgba & 0xffffff00) \| a;	1070	SvPOK_only (result_);
		1071	SvCUR_set (result_, nw * nh * bpp);
		1072
		1073	memset (SvPVX (result_), 0, nw * nh * bpp);
		1074	while (oh--)
		1075	memcpy (SvPVX (result_) + oh * nw * bpp, data + oh * ow * bpp, ow * bpp);
		1076
		1077	sv_setsv (data_, result_);
956	}	1078	}
957	#endif	1079
958	#endif	1080	sv_setiv (w_, nw);
959	rgba = SDL_SwapBE32 (rgba);	1081	sv_setiv (h_, nh);
960	*p++ = rgba;
961	}	1082	}
962	}
963
964	EXTEND (SP, 5);
965	PUSHs (sv_2mortal (newSViv (w)));
966	PUSHs (sv_2mortal (newSViv (h)));
967	PUSHs (sv_2mortal (retval));
968	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
969	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
970	}	1083	}
971	else
972	{
973	FT_Bitmap bitmap;
974
975	retval = newSV (w * h);
976	SvPOK_only (retval);
977	SvCUR_set (retval, w * h);
978
979	bitmap.rows = h;
980	bitmap.width = w;
981	bitmap.pitch = w;
982	bitmap.buffer = (unsigned char*)SvPVX (retval);
983	bitmap.num_grays = 256;
984	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
985
986	memset (bitmap.buffer, 0, w * h);
987
988	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
989
990	EXTEND (SP, 5);
991	PUSHs (sv_2mortal (newSViv (w)));
992	PUSHs (sv_2mortal (newSViv (h)));
993	PUSHs (sv_2mortal (retval));
994	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
995	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
996	}
997	}	1084	}
998		1085
999	MODULE = CFClient PACKAGE = CFClient::Texture
1000
1001	void	1086	void
1002	draw_quad (SV *self, float x, float y, float w = 0, float h = 0)	1087	draw_quad (SV *self, float x, float y, float w = 0., float h = 0.)
1003	PROTOTYPE: $$$;$$	1088	PROTOTYPE: $$$;$$
1004	ALIAS:	1089	ALIAS:
1005	draw_quad_alpha = 1	1090	draw_quad_alpha = 1
1006	draw_quad_alpha_premultiplied = 2	1091	draw_quad_alpha_premultiplied = 2
1007	CODE:	1092	CODE:
1008	{	1093	{
1009	HV hv = (HV )SvRV (self);	1094	HV hv = (HV )SvRV (self);
1010	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1095	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
1011	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1096	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
1012	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1097	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
1013	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
1014		1098
1015	if (items < 5)	1099	if (items < 5)
1016	{	1100	{
1017	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1101	w = SvNV (*hv_fetch (hv, "w", 1, 1));
1018	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1102	h = SvNV (*hv_fetch (hv, "h", 1, 1));
1019	}	1103	}
1020		1104
1021	if (ix)	1105	if (ix)
1022	{	1106	{
1023	glEnable (GL_BLEND);	1107	glEnable (GL_BLEND);
		1108
		1109	if (ix == 2)
1024	glBlendFunc (ix == 1 ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);	1110	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
		1111	else
		1112	gl_BlendFuncSeparate (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		1113	GL_ONE , GL_ONE_MINUS_SRC_ALPHA);
		1114
1025	glEnable (GL_ALPHA_TEST);	1115	glEnable (GL_ALPHA_TEST);
1026	glAlphaFunc (GL_GREATER, 0.01f);	1116	glAlphaFunc (GL_GREATER, 0.01f);
1027	}	1117	}
1028		1118
1029	glBindTexture (GL_TEXTURE_2D, name);	1119	glBindTexture (GL_TEXTURE_2D, name);
1030
1031	if (wrap_mode)
1032	{
1033	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
1034	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
1035	}
1036		1120
1037	glBegin (GL_QUADS);	1121	glBegin (GL_QUADS);
1038	glTexCoord2f (0, 0); glVertex2f (x , y );	1122	glTexCoord2f (0, 0); glVertex2f (x , y );
1039	glTexCoord2f (0, t); glVertex2f (x , y + h);	1123	glTexCoord2f (0, t); glVertex2f (x , y + h);
1040	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1124	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1046	glDisable (GL_ALPHA_TEST);	1130	glDisable (GL_ALPHA_TEST);
1047	glDisable (GL_BLEND);	1131	glDisable (GL_BLEND);
1048	}	1132	}
1049	}	1133	}
1050		1134
1051	MODULE = CFClient PACKAGE = CFClient::Map	1135	MODULE = CFPlus PACKAGE = CFPlus::Map
1052		1136
1053	CFClient::Map	1137	CFPlus::Map
1054	new (SV *class, int map_width, int map_height)	1138	new (SV *class, int map_width, int map_height)
1055	CODE:	1139	CODE:
1056	New (0, RETVAL, 1, struct map);	1140	New (0, RETVAL, 1, struct map);
1057	RETVAL->x = 0;	1141	RETVAL->x = 0;
1058	RETVAL->y = 0;	1142	RETVAL->y = 0;
…		…
1068	RETVAL->row = 0;	1152	RETVAL->row = 0;
1069	OUTPUT:	1153	OUTPUT:
1070	RETVAL	1154	RETVAL
1071		1155
1072	void	1156	void
1073	DESTROY (CFClient::Map self)	1157	DESTROY (CFPlus::Map self)
1074	CODE:	1158	CODE:
1075	{	1159	{
1076	map_clear (self);	1160	map_clear (self);
1077	Safefree (self->face);	1161	Safefree (self->face);
		1162	Safefree (self->tex);
1078	Safefree (self);	1163	Safefree (self);
1079	}	1164	}
1080		1165
1081	void	1166	void
1082	clear (CFClient::Map self)	1167	clear (CFPlus::Map self)
1083	CODE:	1168	CODE:
1084	map_clear (self);	1169	map_clear (self);
1085		1170
1086	void	1171	void
1087	set_face (CFClient::Map self, int face, int texid)	1172	set_face (CFPlus::Map self, int face, int texid)
1088	CODE:	1173	CODE:
1089	{	1174	{
1090	while (self->faces <= face)	1175	while (self->faces <= face)
1091	{	1176	{
1092	Append (mapface, self->face, self->faces, self->faces);	1177	Append (mapface, self->face, self->faces, self->faces);
…		…
1095		1180
1096	self->face [face] = texid;	1181	self->face [face] = texid;
1097	}	1182	}
1098		1183
1099	void	1184	void
1100	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)	1185	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)
1101	CODE:	1186	CODE:
1102	{	1187	{
1103	while (self->texs <= texid)	1188	while (self->texs <= texid)
1104	{	1189	{
1105	Append (maptex, self->tex, self->texs, self->texs);	1190	Append (maptex, self->tex, self->texs, self->texs);
…		…
1117	tex->r = r;	1202	tex->r = r;
1118	tex->g = g;	1203	tex->g = g;
1119	tex->b = b;	1204	tex->b = b;
1120	tex->a = a;	1205	tex->a = a;
1121	}	1206	}
		1207
		1208	// somewhat hackish, but for textures that require it, it really
		1209	// improves the look, and most others don't suffer.
		1210	glBindTexture (GL_TEXTURE_2D, name);
		1211	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
		1212	//glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
		1213	// use uglier nearest interpolation because linear suffers
		1214	// from transparent color bleeding and ugly wrapping effects.
		1215	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1122	}	1216	}
1123		1217
1124	int	1218	int
1125	ox (CFClient::Map self)	1219	ox (CFPlus::Map self)
1126	ALIAS:	1220	ALIAS:
1127	oy = 1	1221	oy = 1
		1222	x = 2
		1223	y = 3
		1224	w = 4
		1225	h = 5
1128	CODE:	1226	CODE:
1129	switch (ix)	1227	switch (ix)
1130	{	1228	{
1131	case 0: RETVAL = self->ox; break;	1229	case 0: RETVAL = self->ox; break;
1132	case 1: RETVAL = self->oy; break;	1230	case 1: RETVAL = self->oy; break;
		1231	case 2: RETVAL = self->x; break;
		1232	case 3: RETVAL = self->y; break;
		1233	case 4: RETVAL = self->w; break;
		1234	case 5: RETVAL = self->h; break;
1133	}	1235	}
1134	OUTPUT:	1236	OUTPUT:
1135	RETVAL	1237	RETVAL
1136		1238
1137	void	1239	void
1138	scroll (CFClient::Map self, int dx, int dy)	1240	scroll (CFPlus::Map self, int dx, int dy)
1139	CODE:	1241	CODE:
1140	{	1242	{
1141	if (dx > 0)	1243	if (dx > 0)
1142	map_blank (self, self->x, self->y, dx - 1, self->h);	1244	map_blank (self, self->x, self->y, dx - 1, self->h);
1143	else if (dx < 0)	1245	else if (dx < 0)
…		…
1159	self->y += MAP_EXTEND_Y;	1261	self->y += MAP_EXTEND_Y;
1160	}	1262	}
1161	}	1263	}
1162		1264
1163	void	1265	void
1164	map1a_update (CFClient::Map self, SV *data_)	1266	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1165	CODE:	1267	CODE:
1166	{	1268	{
1167	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);	1269	uint8_t data = (uint8_t )SvPVbyte_nolen (data_);
1168	uint8_t data_end = (uint8_t )SvEND (data_);	1270	uint8_t data_end = (uint8_t )SvEND (data_);
1169	mapcell *cell;	1271	mapcell *cell;
…		…
1171		1273
1172	while (data < data_end)	1274	while (data < data_end)
1173	{	1275	{
1174	flags = (data [0] << 8) + data [1]; data += 2;	1276	flags = (data [0] << 8) + data [1]; data += 2;
1175		1277
1176	x = ((flags >> 10) & 63) + self->x;	1278	x = self->x + ((flags >> 10) & 63);
1177	y = ((flags >> 4) & 63) + self->y;	1279	y = self->y + ((flags >> 4) & 63);
1178		1280
1179	cell = map_get_cell (self, x, y);	1281	cell = map_get_cell (self, x, y);
1180		1282
1181	if (flags & 15)	1283	if (flags & 15)
1182	{	1284	{
1183	if (cell->darkness < 0)	1285	if (!cell->darkness)
1184	{	1286	{
1185	cell->darkness = 0;	1287	cell->darkness = 256;
1186	cell->face [0] = 0;	1288	cell->face [0] = 0;
1187	cell->face [1] = 0;	1289	cell->face [1] = 0;
1188	cell->face [2] = 0;	1290	cell->face [2] = 0;
		1291	cell->stat_hp = 0;
1189	}	1292	}
1190		1293
1191	cell->darkness = flags & 8 ? *data++ : 255;
1192
1193	//TODO: don't trust server data to be in-range(!)	1294	//TODO: don't trust server data to be in-range(!)
		1295
		1296	if (flags & 8)
		1297	{
		1298	if (extmap)
		1299	{
		1300	uint8_t ext, cmd;
		1301
		1302	do
		1303	{
		1304	ext = *data++;
		1305	cmd = ext & 0x7f;
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64 + 1;
		1309	else if (ext == 5) // health
		1310	cell->stat_hp = *data++;
		1311	}
		1312	while (cmd & 0x80);
		1313	}
		1314	else
		1315	cell->darkness = *data++ + 1;
		1316	}
1194		1317
1195	if (flags & 4)	1318	if (flags & 4)
1196	{	1319	{
1197	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;	1320	cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1198	}	1321	}
…		…
1206	{	1329	{
1207	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;	1330	cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1208	}	1331	}
1209	}	1332	}
1210	else	1333	else
1211	cell->darkness = -1;	1334	cell->darkness = 0;
1212	}	1335	}
1213	}	1336	}
1214		1337
1215	SV *	1338	SV *
1216	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1217	CODE:	1340	CODE:
1218	{	1341	{
1219	int x1, x;	1342	int x1, x;
1220	int y1, y;	1343	int y1, y;
1221	int z;	1344	int z;
…		…
1271	}	1394	}
1272	OUTPUT:	1395	OUTPUT:
1273	RETVAL	1396	RETVAL
1274		1397
1275	void	1398	void
1276	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1277	PPCODE:	1400	CODE:
1278	{	1401	{
1279	int vx, vy;	1402	int vx, vy;
1280	int x, y, z;	1403	int x, y, z;
1281	int last_name;	1404	int last_name;
1282	mapface face;	1405	mapface face;
1283	int sw4 = (sw + 3) & ~3;
1284	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
1285	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
1286		1406
1287	memset (darkness, 255, sw4 * sh);
1288	SvPOK_only (darkness_sv);
1289	SvCUR_set (darkness_sv, sw4 * sh);
1290
1291	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1292	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1293		1409
1294	/*	1410	/*
1295	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1296	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1297	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1301	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1302	*/	1418	*/
1303		1419
1304	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1305		1421
		1422	glEnable (GL_BLEND);
1306	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1307	glEnable (GL_BLEND);
1308	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1309	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1310		1426
1311	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1312		1428
…		…
1320		1436
1321	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1322	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1323	{	1439	{
1324	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1325
1326	darkness[y * sw4 + x] = cell->darkness < 0
1327	? 255 - FOW_DARKNESS
1328	: 255 - cell->darkness;
1329		1441
1330	face = cell->face [z];	1442	face = cell->face [z];
1331		1443
1332	if (face)	1444	if (face)
1333	{	1445	{
…		…
1355	glEnd ();	1467	glEnd ();
1356		1468
1357	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1358	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
1359		1471
		1472	for (y = 0; y < sh; y++)
		1473	if (0 <= y + vy && y + vy < self->rows)
		1474	{
		1475	maprow *row = self->row + (y + vy);
		1476
		1477	for (x = 0; x < sw; x++)
		1478	if (row->c0 <= x + vx && x + vx < row->c1)
		1479	{
		1480	mapcell *cell = row->col + (x + vx - row->c0);
		1481
		1482	int px = x * 32;
		1483	int py = y * 32;
		1484
		1485	if (cell->stat_hp)
		1486	{
		1487	glColor3ub (0, 0, 0);
		1488	glRectf (px + 1, py + 1, px + 31, py + 4);
		1489
		1490	glColor3ub (0, 255, 0);
		1491	glBegin (GL_LINES);
		1492	glVertex2f (px + 2, py + 2.5f);
		1493	glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
		1494	glEnd ();
		1495	}
		1496	}
		1497	}
		1498	}
		1499
		1500	void
		1501	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1502	CODE:
		1503	{
		1504	static float color[16][3] = {
		1505	{ 0.00F, 0.00F, 0.00F },
		1506	{ 1.00F, 1.00F, 1.00F },
		1507	{ 0.00F, 0.00F, 0.55F },
		1508	{ 1.00F, 0.00F, 0.00F },
		1509
		1510	{ 1.00F, 0.54F, 0.00F },
		1511	{ 0.11F, 0.56F, 1.00F },
		1512	{ 0.93F, 0.46F, 0.00F },
		1513	{ 0.18F, 0.54F, 0.34F },
		1514
		1515	{ 0.56F, 0.73F, 0.56F },
		1516	{ 0.80F, 0.80F, 0.80F },
		1517	{ 0.55F, 0.41F, 0.13F },
		1518	{ 0.99F, 0.77F, 0.26F },
		1519
		1520	{ 0.74F, 0.65F, 0.41F },
		1521
		1522	{ 0.00F, 1.00F, 1.00F },
		1523	{ 1.00F, 0.00F, 1.00F },
		1524	{ 1.00F, 1.00F, 0.00F },
		1525	};
		1526
		1527	int x, y;
		1528
		1529	glEnable (GL_TEXTURE_2D);
		1530	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1531	glEnable (GL_BLEND);
		1532	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1533	glBegin (GL_QUADS);
		1534
		1535	for (y = 0; y < h; y++)
		1536	for (x = 0; x < w; x++)
		1537	{
		1538	unsigned char m = data [x + y * w];
		1539
		1540	if (m)
		1541	{
		1542	float *c = color [m & 15];
		1543
		1544	float tx1 = m & 0x40 ? 0.5 : 0.;
		1545	float tx2 = tx1 + 0.5;
		1546
		1547	glColor4f (c[0], c[1], c[2], 0.75);
		1548	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1549	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1550	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1551	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1552	}
		1553	}
		1554
		1555	glEnd ();
		1556	glDisable (GL_BLEND);
		1557	glDisable (GL_TEXTURE_2D);
		1558	}
		1559
		1560	void
		1561	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1562	PPCODE:
		1563	{
		1564	int vx, vy;
		1565	int x, y;
		1566	int sw4 = (sw + 3) & ~3;
		1567	SV darkness_sv = sv_2mortal (newSV (sw4 sh));
		1568	uint8_t darkness = (uint8_t )SvPVX (darkness_sv);
		1569
		1570	memset (darkness, 255, sw4 * sh);
		1571	SvPOK_only (darkness_sv);
		1572	SvCUR_set (darkness_sv, sw4 * sh);
		1573
		1574	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1575	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1576
		1577	for (y = 0; y < sh; y++)
		1578	if (0 <= y + vy && y + vy < self->rows)
		1579	{
		1580	maprow *row = self->row + (y + vy);
		1581
		1582	for (x = 0; x < sw; x++)
		1583	if (row->c0 <= x + vx && x + vx < row->c1)
		1584	{
		1585	mapcell *cell = row->col + (x + vx - row->c0);
		1586
		1587	darkness[y * sw4 + x] = cell->darkness
		1588	? 255 - (cell->darkness - 1)
		1589	: 255 - FOW_DARKNESS;
		1590	}
		1591	}
		1592
1360	EXTEND (SP, 3);	1593	EXTEND (SP, 3);
1361	PUSHs (sv_2mortal (newSViv (sw4)));	1594	PUSHs (sv_2mortal (newSViv (sw4)));
1362	PUSHs (sv_2mortal (newSViv (sh)));	1595	PUSHs (sv_2mortal (newSViv (sh)));
1363	PUSHs (darkness_sv);	1596	PUSHs (darkness_sv);
1364	}	1597	}
1365		1598
1366	SV *	1599	SV *
1367	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1600	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1368	CODE:	1601	CODE:
1369	{	1602	{
1370	int x, y, x1, y1;	1603	int x, y, x1, y1;
1371	SV data_sv = newSV (w h * 7 + 5);	1604	SV data_sv = newSV (w h * 7 + 5);
1372	uint8_t data = (uint8_t )SvPVX (data_sv);	1605	uint8_t data = (uint8_t )SvPVX (data_sv);
…		…
1434	}	1667	}
1435	OUTPUT:	1668	OUTPUT:
1436	RETVAL	1669	RETVAL
1437		1670
1438	void	1671	void
1439	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1672	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1440	PPCODE:	1673	PPCODE:
1441	{	1674	{
1442	int x, y, z;	1675	int x, y, z;
1443	int w, h;	1676	int w, h;
1444	int x1, y1;	1677	int x1, y1;
…		…
1476		1709
1477	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }	1710	if (flags & 1) { face[0] = data++ << 8; face[0] \|= data++; }
1478	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }	1711	if (flags & 2) { face[1] = data++ << 8; face[1] \|= data++; }
1479	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }	1712	if (flags & 4) { face[2] = data++ << 8; face[2] \|= data++; }
1480		1713
1481	if (cell->darkness <= 0)	1714	if (cell->darkness == 0)
1482	{	1715	{
1483	cell->darkness = -1;	1716	cell->darkness = 0;
1484		1717
1485	for (z = 0; z <= 2; z++)	1718	for (z = 0; z <= 2; z++)
1486	{	1719	{
1487	cell->face[z] = face[z];	1720	cell->face[z] = face[z];
1488		1721
…		…
1493	}	1726	}
1494	}	1727	}
1495	}	1728	}
1496	}	1729	}
1497		1730
1498	MODULE = CFClient PACKAGE = CFClient::MixChunk	1731	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1499		1732
1500	CFClient::MixChunk	1733	CFPlus::MixChunk
1501	new_from_file (SV class, char path)	1734	new_from_file (SV class, char path)
1502	CODE:	1735	CODE:
1503	RETVAL = Mix_LoadWAV (path);	1736	RETVAL = Mix_LoadWAV (path);
1504	OUTPUT:	1737	OUTPUT:
1505	RETVAL	1738	RETVAL
1506		1739
1507	void	1740	void
1508	DESTROY (CFClient::MixChunk self)	1741	DESTROY (CFPlus::MixChunk self)
1509	CODE:	1742	CODE:
1510	Mix_FreeChunk (self);	1743	Mix_FreeChunk (self);
1511		1744
1512	int	1745	int
1513	volume (CFClient::MixChunk self, int volume = -1)	1746	volume (CFPlus::MixChunk self, int volume = -1)
1514	CODE:	1747	CODE:
1515	RETVAL = Mix_VolumeChunk (self, volume);	1748	RETVAL = Mix_VolumeChunk (self, volume);
1516	OUTPUT:	1749	OUTPUT:
1517	RETVAL	1750	RETVAL
1518		1751
1519	int	1752	int
1520	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1753	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1521	CODE:	1754	CODE:
1522	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1755	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1523	OUTPUT:	1756	OUTPUT:
1524	RETVAL	1757	RETVAL
1525		1758
1526	MODULE = CFClient PACKAGE = CFClient::MixMusic	1759	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1527		1760
1528	int	1761	int
1529	volume (int volume = -1)	1762	volume (int volume = -1)
1530	CODE:	1763	CODE:
1531	RETVAL = Mix_VolumeMusic (volume);	1764	RETVAL = Mix_VolumeMusic (volume);
1532	OUTPUT:	1765	OUTPUT:
1533	RETVAL	1766	RETVAL
1534		1767
1535	CFClient::MixMusic	1768	CFPlus::MixMusic
1536	new_from_file (SV class, char path)	1769	new_from_file (SV class, char path)
1537	CODE:	1770	CODE:
1538	RETVAL = Mix_LoadMUS (path);	1771	RETVAL = Mix_LoadMUS (path);
1539	OUTPUT:	1772	OUTPUT:
1540	RETVAL	1773	RETVAL
1541		1774
1542	void	1775	void
1543	DESTROY (CFClient::MixMusic self)	1776	DESTROY (CFPlus::MixMusic self)
1544	CODE:	1777	CODE:
1545	Mix_FreeMusic (self);	1778	Mix_FreeMusic (self);
1546		1779
1547	int	1780	int
1548	play (CFClient::MixMusic self, int loops = -1)	1781	play (CFPlus::MixMusic self, int loops = -1)
1549	CODE:	1782	CODE:
1550	RETVAL = Mix_PlayMusic (self, loops);	1783	RETVAL = Mix_PlayMusic (self, loops);
1551	OUTPUT:	1784	OUTPUT:
1552	RETVAL	1785	RETVAL
1553		1786
1554	MODULE = CFClient PACKAGE = CFClient::OpenGL	1787	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1555		1788
1556	BOOT:	1789	BOOT:
1557	{	1790	{
1558	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1791	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1559	static const struct {	1792	static const struct {
1560	const char *name;	1793	const char *name;
1561	IV iv;	1794	IV iv;
1562	} *civ, const_iv[] = {	1795	} *civ, const_iv[] = {
1563	# define const_iv(name) { # name, (IV)name }	1796	# define const_iv(name) { # name, (IV)name }
…		…
1570	const_iv (GL_SCISSOR_TEST),	1803	const_iv (GL_SCISSOR_TEST),
1571	const_iv (GL_DEPTH_TEST),	1804	const_iv (GL_DEPTH_TEST),
1572	const_iv (GL_ALPHA_TEST),	1805	const_iv (GL_ALPHA_TEST),
1573	const_iv (GL_NORMALIZE),	1806	const_iv (GL_NORMALIZE),
1574	const_iv (GL_RESCALE_NORMAL),	1807	const_iv (GL_RESCALE_NORMAL),
		1808	const_iv (GL_FRONT),
		1809	const_iv (GL_BACK),
1575	const_iv (GL_AND),	1810	const_iv (GL_AND),
1576	const_iv (GL_ONE),	1811	const_iv (GL_ONE),
1577	const_iv (GL_ZERO),	1812	const_iv (GL_ZERO),
1578	const_iv (GL_SRC_ALPHA),	1813	const_iv (GL_SRC_ALPHA),
1579	const_iv (GL_SRC_ALPHA_SATURATE),	1814	const_iv (GL_DST_ALPHA),
1580	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1815	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1581	const_iv (GL_ONE_MINUS_DST_ALPHA),	1816	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1817	const_iv (GL_SRC_ALPHA_SATURATE),
1582	const_iv (GL_RGB),	1818	const_iv (GL_RGB),
1583	const_iv (GL_RGBA),	1819	const_iv (GL_RGBA),
		1820	const_iv (GL_RGBA4),
		1821	const_iv (GL_RGBA8),
		1822	const_iv (GL_RGB5_A1),
1584	const_iv (GL_UNSIGNED_BYTE),	1823	const_iv (GL_UNSIGNED_BYTE),
1585	const_iv (GL_UNSIGNED_SHORT),	1824	const_iv (GL_UNSIGNED_SHORT),
1586	const_iv (GL_UNSIGNED_INT),	1825	const_iv (GL_UNSIGNED_INT),
1587	const_iv (GL_ALPHA),	1826	const_iv (GL_ALPHA),
1588	const_iv (GL_INTENSITY),	1827	const_iv (GL_INTENSITY),
…		…
1597	const_iv (GL_TEXTURE_MAG_FILTER),	1836	const_iv (GL_TEXTURE_MAG_FILTER),
1598	const_iv (GL_TEXTURE_MIN_FILTER),	1837	const_iv (GL_TEXTURE_MIN_FILTER),
1599	const_iv (GL_TEXTURE_ENV_MODE),	1838	const_iv (GL_TEXTURE_ENV_MODE),
1600	const_iv (GL_TEXTURE_WRAP_S),	1839	const_iv (GL_TEXTURE_WRAP_S),
1601	const_iv (GL_TEXTURE_WRAP_T),	1840	const_iv (GL_TEXTURE_WRAP_T),
		1841	const_iv (GL_REPEAT),
1602	const_iv (GL_CLAMP),	1842	const_iv (GL_CLAMP),
1603	const_iv (GL_REPEAT),	1843	const_iv (GL_CLAMP_TO_EDGE),
1604	const_iv (GL_NEAREST),	1844	const_iv (GL_NEAREST),
1605	const_iv (GL_LINEAR),	1845	const_iv (GL_LINEAR),
1606	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1846	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1607	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1847	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1608	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1848	const_iv (GL_NEAREST_MIPMAP_LINEAR),
…		…
1619	const_iv (GL_SEPARABLE_2D),	1859	const_iv (GL_SEPARABLE_2D),
1620	const_iv (GL_CONVOLUTION_2D),	1860	const_iv (GL_CONVOLUTION_2D),
1621	const_iv (GL_CONVOLUTION_BORDER_MODE),	1861	const_iv (GL_CONVOLUTION_BORDER_MODE),
1622	const_iv (GL_CONSTANT_BORDER),	1862	const_iv (GL_CONSTANT_BORDER),
1623	const_iv (GL_LINES),	1863	const_iv (GL_LINES),
		1864	const_iv (GL_LINE_STRIP),
1624	const_iv (GL_LINE_LOOP),	1865	const_iv (GL_LINE_LOOP),
1625	const_iv (GL_QUADS),	1866	const_iv (GL_QUADS),
1626	const_iv (GL_QUAD_STRIP),	1867	const_iv (GL_QUAD_STRIP),
1627	const_iv (GL_TRIANGLES),	1868	const_iv (GL_TRIANGLES),
1628	const_iv (GL_TRIANGLE_STRIP),	1869	const_iv (GL_TRIANGLE_STRIP),
…		…
1638		1879
1639	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1880	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1640	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1881	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1641	}	1882	}
1642		1883
		1884	char *
		1885	gl_vendor ()
		1886	CODE:
		1887	RETVAL = (char *)glGetString (GL_VENDOR);
		1888	OUTPUT:
		1889	RETVAL
		1890
		1891	char *
		1892	gl_version ()
		1893	CODE:
		1894	RETVAL = (char *)glGetString (GL_VERSION);
		1895	OUTPUT:
		1896	RETVAL
		1897
		1898	char *
		1899	gl_extensions ()
		1900	CODE:
		1901	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1902	OUTPUT:
		1903	RETVAL
		1904
1643	int glGetError ()	1905	int glGetError ()
		1906
		1907	void glFinish ()
1644		1908
1645	void glClear (int mask)	1909	void glClear (int mask)
1646		1910
1647	void glClearColor (float r, float g, float b, float a = 1.0)	1911	void glClearColor (float r, float g, float b, float a = 1.0)
1648	PROTOTYPE: @	1912	PROTOTYPE: @
…		…
1655		1919
1656	void glHint (int target, int mode)	1920	void glHint (int target, int mode)
1657		1921
1658	void glBlendFunc (int sfactor, int dfactor)	1922	void glBlendFunc (int sfactor, int dfactor)
1659		1923
		1924	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1925	CODE:
		1926	gl_BlendFuncSeparate (sa, da, saa, daa);
		1927
1660	void glDepthMask (int flag)	1928	void glDepthMask (int flag)
1661		1929
1662	void glLogicOp (int opcode)	1930	void glLogicOp (int opcode)
1663		1931
1664	void glColorMask (int red, int green, int blue, int alpha)	1932	void glColorMask (int red, int green, int blue, int alpha)
…		…
1668	void glPushMatrix ()	1936	void glPushMatrix ()
1669		1937
1670	void glPopMatrix ()	1938	void glPopMatrix ()
1671		1939
1672	void glLoadIdentity ()	1940	void glLoadIdentity ()
		1941
		1942	void glDrawBuffer (int buffer)
		1943
		1944	void glReadBuffer (int buffer)
1673		1945
1674	# near_ and far_ are due to microsofts buggy "c" compiler	1946	# near_ and far_ are due to microsofts buggy "c" compiler
1675	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)	1947	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
1676		1948
1677	# near_ and far_ are due to microsofts buggy "c" compiler	1949	# near_ and far_ are due to microsofts buggy "c" compiler
…		…
1697		1969
1698	void glEnd ()	1970	void glEnd ()
1699		1971
1700	void glColor (float r, float g, float b, float a = 1.0)	1972	void glColor (float r, float g, float b, float a = 1.0)
1701	PROTOTYPE: @	1973	PROTOTYPE: @
		1974	ALIAS:
		1975	glColor_premultiply = 1
1702	CODE:	1976	CODE:
		1977	if (ix)
		1978	{
		1979	r *= a;
		1980	g *= a;
		1981	b *= a;
		1982	}
1703	// microsoft visual "c" rounds instead of truncating...	1983	// microsoft visual "c" rounds instead of truncating...
1704	glColor4ub (MIN ((int)(r * 255.f), 255),	1984	glColor4f (r, g, b, a);
1705	MIN ((int)(g * 255.f), 255),
1706	MIN ((int)(b * 255.f), 255),
1707	MIN ((int)(a * 255.f), 255));
1708		1985
1709	void glInterleavedArrays (int format, int stride, char *data)	1986	void glInterleavedArrays (int format, int stride, char *data)
1710		1987
1711	void glDrawElements (int mode, int count, int type, char *indices)	1988	void glDrawElements (int mode, int count, int type, char *indices)
1712		1989
…		…
1735		2012
1736	void glBindTexture (int target, int name)	2013	void glBindTexture (int target, int name)
1737		2014
1738	void glConvolutionParameter (int target, int pname, float params)	2015	void glConvolutionParameter (int target, int pname, float params)
1739	CODE:	2016	CODE:
1740	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	2017	if (gl.ConvolutionParameterf)
		2018	gl.ConvolutionParameterf (target, pname, params);
1741		2019
1742	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	2020	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1743	CODE:	2021	CODE:
1744	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	2022	if (gl.ConvolutionFilter2D)
1745	(target, internalformat, width, height, format, type, data));	2023	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1746		2024
1747	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)	2025	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char row, char column)
1748	CODE:	2026	CODE:
1749	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2027	if (gl.SeparableFilter2D)
1750	(target, internalformat, width, height, format, type, row, column));	2028	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1751		2029
1752	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2030	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1753		2031
1754	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2032	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1755		2033
…		…
1788		2066
1789	void glEndList ()	2067	void glEndList ()
1790		2068
1791	void glCallList (int list)	2069	void glCallList (int list)
1792		2070
1793

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs. Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.93 by root, Tue May 23 18:54:37 2006 UTC vs.
Revision 1.143 by root, Fri Aug 18 02:23:39 2006 UTC