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

Diff Legend

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