ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/Client.xs

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

Diff Legend

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