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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/Client.xs (file contents): Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs. Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.89 by root, Sun May 21 00:02:01 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC