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.87 by root, Fri May 19 18:39:06 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 ()
717	CODE:	793	CODE:
718	#if _WIN32	794	tc_clear ();
719	rgba = 0;//D	795
720	#endif	796	CFPlus::Layout
		797	new (SV *class)
		798	CODE:
721	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
722		800
723	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	801	RETVAL->pl = pango_layout_new (opengl_context);
724	RETVAL->rgba = rgba;
725	RETVAL->r = 1.;	802	RETVAL->r = 1.;
726	RETVAL->g = 1.;	803	RETVAL->g = 1.;
727	RETVAL->b = 1.;	804	RETVAL->b = 1.;
728	RETVAL->a = 1.;	805	RETVAL->a = 1.;
729	RETVAL->base_height = MIN_FONT_HEIGHT;	806	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
733	layout_update_font (RETVAL);	810	layout_update_font (RETVAL);
734	OUTPUT:	811	OUTPUT:
735	RETVAL	812	RETVAL
736		813
737	void	814	void
738	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
739	CODE:	816	CODE:
740	g_object_unref (self->pl);	817	g_object_unref (self->pl);
741	Safefree (self);	818	Safefree (self);
742		819
743	int
744	is_rgba (CFClient::Layout self)
745	CODE:
746	RETVAL = self->rgba;
747	OUTPUT:
748	RETVAL
749
750	void	820	void
751	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
752	CODE:	822	CODE:
753	{	823	{
754	STRLEN textlen;	824	STRLEN textlen;
755	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
756		826
757	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
758	}	828	}
759		829
760	void	830	void
761	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
762	CODE:	832	CODE:
763	{	833	{
764	STRLEN textlen;	834	STRLEN textlen;
765	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
766		836
767	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
768	}	838	}
769		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
770	SV *	925	SV *
771	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
772	CODE:	927	CODE:
773	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
774	SvUTF8_on (RETVAL);	929	sv_utf8_decode (RETVAL);
775	OUTPUT:	930	OUTPUT:
776	RETVAL	931	RETVAL
777		932
778	void	933	void
779	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.)
780	CODE:	935	CODE:
781	self->r = r;	936	self->r = r;
782	self->g = g;	937	self->g = g;
783	self->b = b;	938	self->b = b;
784	self->a = a;	939	self->a = a;
785		940
786	void	941	void
787	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
788	CODE:	943	CODE:
789	if (self->font != font)	944	if (self->font != font)
790	{	945	{
791	self->font = font;	946	self->font = font;
792	layout_update_font (self);	947	layout_update_font (self);
793	}	948	}
794		949
795	void	950	void
796	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
797	CODE:	952	CODE:
798	if (self->base_height != base_height)	953	if (self->base_height != base_height)
799	{	954	{
800	self->base_height = base_height;	955	self->base_height = base_height;
801	layout_update_font (self);	956	layout_update_font (self);
802	}	957	}
803		958
804	void	959	void
805	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
806	CODE:	961	CODE:
807	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);
808		963
809	void	964	void
810	set_indent (CFClient::Layout self, int indent)	965	set_indent (CFPlus::Layout self, int indent)
811	CODE:	966	CODE:
812	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);	967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
813		968
814	void	969	void
815	set_spacing (CFClient::Layout self, int spacing)	970	set_spacing (CFPlus::Layout self, int spacing)
816	CODE:	971	CODE:
817	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);	972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
818		973
819	void	974	void
820	set_ellipsise (CFClient::Layout self, int ellipsise)	975	set_ellipsise (CFPlus::Layout self, int ellipsise)
821	CODE:	976	CODE:
822	pango_layout_set_ellipsize (self->pl,	977	pango_layout_set_ellipsize (self->pl,
823	ellipsise == 1 ? PANGO_ELLIPSIZE_START	978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
824	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE	979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
825	: ellipsise == 3 ? PANGO_ELLIPSIZE_END	980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
826	: PANGO_ELLIPSIZE_NONE	981	: PANGO_ELLIPSIZE_NONE
827	);	982	);
828		983
829	void	984	void
830	set_single_paragraph_mode (CFClient::Layout self, int spm)	985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
831	CODE:	986	CODE:
832	pango_layout_set_single_paragraph_mode (self->pl, !!spm);	987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
833		988
834	void	989	void
835	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
836	PPCODE:	991	PPCODE:
837	{	992	{
838	int w, h;	993	int w, h;
839		994
840	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
843	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
844	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
845	}	1000	}
846		1001
847	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
848	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
849	CODE:	1016	CODE:
850	{	1017	{
851	int index, trailing;	1018	int index, trailing;
852	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);
853	RETVAL = index;	1020	RETVAL = index;
854	}	1021	}
855	OUTPUT:	1022	OUTPUT:
856	RETVAL	1023	RETVAL
857		1024
858	void	1025	void
859	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
860	PPCODE:	1027	PPCODE:
861	{	1028	{
862	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
863	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
864		1031
…		…
867	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
868	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
869	}	1036	}
870		1037
871	void	1038	void
872	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
873	PPCODE:	1040	PPCODE:
874	{	1041	pango_opengl_render_layout_subpixel (
875	SV *retval;	1042	self->pl,
876	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
		1044	self->r, self->g, self->b, self->a,
		1045	flags
		1046	);
877		1047
878	layout_get_pixel_size (self, &w, &h);	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
879		1049
880	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)
881	{	1058	{
882	cairo_surface_t *surface;	1059	int nw = minpot (ow);
883	cairo_t *cairo;	1060	int nh = minpot (oh);
884		1061
885	retval = newSV (w * h * 4);	1062	if (nw != ow || nh != oh)
886	SvPOK_only (retval);
887	SvCUR_set (retval, w * h * 4);
888
889	memset (SvPVX (retval), 0, w * h * 4);
890
891	surface = cairo_image_surface_create_for_data (
892	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
893	cairo = cairo_create (surface);
894	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
895
896	pango_cairo_show_layout (cairo, self->pl);
897
898	cairo_destroy (cairo);
899	cairo_surface_destroy (surface);
900
901	// what a mess, and its premultiplied, too :(
902	{	1063	{
903	uint32_t *p = (uint32_t *)SvPVX (retval);	1064	if (SvOK (data_))
904	uint32_t *e = p + w * h;
905
906	while (p < e)
907	{	1065	{
908	uint32_t rgba = *p;	1066	STRLEN datalen;
909	rgba = (rgba >> 24) | (rgba << 8);	1067	char *data = SvPVbyte (data_, datalen);
910	#if 0	1068	int bpp = datalen / (ow * oh);
911	#ifdef _WIN32	1069	SV *result_ = sv_2mortal (newSV (nw * nh * bpp));
912	{//D
913	uint8_t r = rgba >> 24;
914	uint8_t g = rgba >> 16;
915	uint8_t b = rgba >> 8;
916	uint8_t a = rgba >> 0;
917		1070
918	rgba = (rgba & 0xffffff00) | a;	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_);
919	}	1079	}
920	#endif	1080
921	#endif	1081	sv_setiv (w_, nw);
922	rgba = SDL_SwapBE32 (rgba);	1082	sv_setiv (h_, nh);
923	*p++ = rgba;
924	}	1083	}
925	}
926
927	EXTEND (SP, 5);
928	PUSHs (sv_2mortal (newSViv (w)));
929	PUSHs (sv_2mortal (newSViv (h)));
930	PUSHs (sv_2mortal (retval));
931	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
932	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
933	}	1084	}
934	else
935	{
936	FT_Bitmap bitmap;
937
938	retval = newSV (w * h);
939	SvPOK_only (retval);
940	SvCUR_set (retval, w * h);
941
942	bitmap.rows = h;
943	bitmap.width = w;
944	bitmap.pitch = w;
945	bitmap.buffer = (unsigned char*)SvPVX (retval);
946	bitmap.num_grays = 256;
947	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
948
949	memset (bitmap.buffer, 0, w * h);
950
951	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
952
953	EXTEND (SP, 5);
954	PUSHs (sv_2mortal (newSViv (w)));
955	PUSHs (sv_2mortal (newSViv (h)));
956	PUSHs (sv_2mortal (retval));
957	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
958	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
959	}
960	}	1085	}
961		1086
962	MODULE = CFClient PACKAGE = CFClient::Texture
963
964	void	1087	void
965	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.)
966	PROTOTYPE: $$$;$$	1089	PROTOTYPE: $$$;$$
967	ALIAS:	1090	ALIAS:
968	draw_quad_alpha = 1	1091	draw_quad_alpha = 1
969	draw_quad_alpha_premultiplied = 2	1092	draw_quad_alpha_premultiplied = 2
970	CODE:	1093	CODE:
971	{	1094	{
972	HV *hv = (HV *)SvRV (self);	1095	HV *hv = (HV *)SvRV (self);
973	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1096	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
974	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1097	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
975	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1098	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
976	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
977		1099
978	if (items < 5)	1100	if (items < 5)
979	{	1101	{
980	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1102	w = SvNV (*hv_fetch (hv, "w", 1, 1));
981	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1103	h = SvNV (*hv_fetch (hv, "h", 1, 1));
982	}	1104	}
983		1105
984	if (ix)	1106	if (ix)
985	{	1107	{
986	glEnable (GL_BLEND);	1108	glEnable (GL_BLEND);
		1109
		1110	if (ix == 2)
987	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
988	glEnable (GL_ALPHA_TEST);	1116	glEnable (GL_ALPHA_TEST);
989	glAlphaFunc (GL_GREATER, 0.01f);	1117	glAlphaFunc (GL_GREATER, 0.01f);
990	}	1118	}
991		1119
992	glBindTexture (GL_TEXTURE_2D, name);	1120	glBindTexture (GL_TEXTURE_2D, name);
993
994	if (wrap_mode)
995	{
996	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
997	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
998	}
999		1121
1000	glBegin (GL_QUADS);	1122	glBegin (GL_QUADS);
1001	glTexCoord2f (0, 0); glVertex2f (x , y );	1123	glTexCoord2f (0, 0); glVertex2f (x , y );
1002	glTexCoord2f (0, t); glVertex2f (x , y + h);	1124	glTexCoord2f (0, t); glVertex2f (x , y + h);
1003	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1125	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
…		…
1009	glDisable (GL_ALPHA_TEST);	1131	glDisable (GL_ALPHA_TEST);
1010	glDisable (GL_BLEND);	1132	glDisable (GL_BLEND);
1011	}	1133	}
1012	}	1134	}
1013		1135
1014	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
1015		1137
1016	CFClient::Map	1138	CFPlus::Map
1017	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
1018	CODE:	1140	CODE:
1019	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
1020	RETVAL->x = 0;	1142	RETVAL->x = 0;
1021	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
1031	RETVAL->row = 0;	1153	RETVAL->row = 0;
1032	OUTPUT:	1154	OUTPUT:
1033	RETVAL	1155	RETVAL
1034		1156
1035	void	1157	void
1036	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
1037	CODE:	1159	CODE:
1038	{	1160	{
1039	map_clear (self);	1161	map_clear (self);
1040	Safefree (self->face);	1162	Safefree (self->face);
		1163	Safefree (self->tex);
1041	Safefree (self);	1164	Safefree (self);
1042	}	1165	}
1043		1166
1044	void	1167	void
1045	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
1046	CODE:	1169	CODE:
1047	map_clear (self);	1170	map_clear (self);
1048		1171
1049	void	1172	void
1050	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
1051	CODE:	1174	CODE:
1052	{	1175	{
1053	while (self->faces <= face)	1176	while (self->faces <= face)
1054	{	1177	{
1055	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
1058		1181
1059	self->face [face] = texid;	1182	self->face [face] = texid;
1060	}	1183	}
1061		1184
1062	void	1185	void
1063	set_texture (CFClient::Map self, int texid, int name, int w, int h, float s, float t, int r, int g, int b, int a)	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)
1064	CODE:	1187	CODE:
1065	{	1188	{
1066	while (self->texs <= texid)	1189	while (self->texs <= texid)
1067	{	1190	{
1068	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
1080	tex->r = r;	1203	tex->r = r;
1081	tex->g = g;	1204	tex->g = g;
1082	tex->b = b;	1205	tex->b = b;
1083	tex->a = a;	1206	tex->a = a;
1084	}	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);
1085	}	1217	}
1086		1218
1087	int	1219	int
1088	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
1089	ALIAS:	1221	ALIAS:
1090	oy = 1	1222	oy = 1
		1223	x = 2
		1224	y = 3
		1225	w = 4
		1226	h = 5
1091	CODE:	1227	CODE:
1092	switch (ix)	1228	switch (ix)
1093	{	1229	{
1094	case 0: RETVAL = self->ox; break;	1230	case 0: RETVAL = self->ox; break;
1095	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;
1096	}	1236	}
1097	OUTPUT:	1237	OUTPUT:
1098	RETVAL	1238	RETVAL
1099		1239
1100	void	1240	void
1101	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
1102	CODE:	1242	CODE:
1103	{	1243	{
1104	if (dx > 0)	1244	if (dx > 0)
1105	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
1106	else if (dx < 0)	1246	else if (dx < 0)
…		…
1122	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
1123	}	1263	}
1124	}	1264	}
1125		1265
1126	void	1266	void
1127	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
1128	CODE:	1268	CODE:
1129	{	1269	{
1130	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1270	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1131	uint8_t *data_end = (uint8_t *)SvEND (data_);	1271	uint8_t *data_end = (uint8_t *)SvEND (data_);
1132	mapcell *cell;	1272	mapcell *cell;
…		…
1134		1274
1135	while (data < data_end)	1275	while (data < data_end)
1136	{	1276	{
1137	flags = (data [0] << 8) + data [1]; data += 2;	1277	flags = (data [0] << 8) + data [1]; data += 2;
1138		1278
1139	x = ((flags >> 10) & 63) + self->x;	1279	x = self->x + ((flags >> 10) & 63);
1140	y = ((flags >> 4) & 63) + self->y;	1280	y = self->y + ((flags >> 4) & 63);
1141		1281
1142	cell = map_get_cell (self, x, y);	1282	cell = map_get_cell (self, x, y);
1143		1283
1144	if (flags & 15)	1284	if (flags & 15)
1145	{	1285	{
…		…
1174	cell->darkness = -1;	1314	cell->darkness = -1;
1175	}	1315	}
1176	}	1316	}
1177		1317
1178	SV *	1318	SV *
1179	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)
1180	CODE:	1320	CODE:
1181	{	1321	{
1182	int x1, x;	1322	int x1, x;
1183	int y1, y;	1323	int y1, y;
1184	int z;	1324	int z;
…		…
1234	}	1374	}
1235	OUTPUT:	1375	OUTPUT:
1236	RETVAL	1376	RETVAL
1237		1377
1238	void	1378	void
1239	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)
1240	PPCODE:	1380	CODE:
1241	{	1381	{
1242	int vx, vy;	1382	int vx, vy;
1243	int x, y, z;	1383	int x, y, z;
1244	int last_name;	1384	int last_name;
1245	mapface face;	1385	mapface face;
1246	int sw4 = (sw + 3) & ~3;
1247	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1248	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1249		1386
1250	memset (darkness, 255, sw4 * sh);
1251	SvPOK_only (darkness_sv);
1252	SvCUR_set (darkness_sv, sw4 * sh);
1253
1254	vx = self->x + (self->w - sw) / 2 - shift_x;	1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1255	vy = self->y + (self->h - sh) / 2 - shift_y;	1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1256		1389
1257	/*	1390	/*
1258	int vx = self->vx = self->w >= sw	1391	int vx = self->vx = self->w >= sw
1259	? self->x + (self->w - sw) / 2	1392	? self->x + (self->w - sw) / 2
1260	: 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));
…		…
1264	: 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));
1265	*/	1398	*/
1266		1399
1267	glColor4ub (255, 255, 255, 255);	1400	glColor4ub (255, 255, 255, 255);
1268		1401
		1402	glEnable (GL_BLEND);
1269	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1403	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1270	glEnable (GL_BLEND);
1271	glEnable (GL_TEXTURE_2D);	1404	glEnable (GL_TEXTURE_2D);
1272	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1405	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1273		1406
1274	glBegin (GL_QUADS);	1407	glBegin (GL_QUADS);
1275		1408
…		…
1283		1416
1284	for (x = 0; x < sw; x++)	1417	for (x = 0; x < sw; x++)
1285	if (row->c0 <= x + vx && x + vx < row->c1)	1418	if (row->c0 <= x + vx && x + vx < row->c1)
1286	{	1419	{
1287	mapcell *cell = row->col + (x + vx - row->c0);	1420	mapcell *cell = row->col + (x + vx - row->c0);
1288
1289	darkness[y * sw4 + x] = cell->darkness < 0
1290	? 255 - FOW_DARKNESS
1291	: 255 - cell->darkness;
1292		1421
1293	face = cell->face [z];	1422	face = cell->face [z];
1294		1423
1295	if (face)	1424	if (face)
1296	{	1425	{
…		…
1317		1446
1318	glEnd ();	1447	glEnd ();
1319		1448
1320	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1321	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	}
1322		1545
1323	EXTEND (SP, 3);	1546	EXTEND (SP, 3);
1324	PUSHs (sv_2mortal (newSViv (sw4)));	1547	PUSHs (sv_2mortal (newSViv (sw4)));
1325	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1326	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1327	}	1550	}
1328		1551
1329	SV *	1552	SV *
1330	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)
1331	CODE:	1554	CODE:
1332	{	1555	{
1333	int x, y, x1, y1;	1556	int x, y, x1, y1;
1334	SV *data_sv = newSV (w * h * 7 + 5);	1557	SV *data_sv = newSV (w * h * 7 + 5);
1335	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1558	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1397	}	1620	}
1398	OUTPUT:	1621	OUTPUT:
1399	RETVAL	1622	RETVAL
1400		1623
1401	void	1624	void
1402	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)
1403	PPCODE:	1626	PPCODE:
1404	{	1627	{
1405	int x, y, z;	1628	int x, y, z;
1406	int w, h;	1629	int w, h;
1407	int x1, y1;	1630	int x1, y1;
…		…
1456	}	1679	}
1457	}	1680	}
1458	}	1681	}
1459	}	1682	}
1460		1683
1461	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1462		1685
1463	CFClient::MixChunk	1686	CFPlus::MixChunk
1464	new_from_file (SV *class, char *path)	1687	new_from_file (SV *class, char *path)
1465	CODE:	1688	CODE:
1466	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1467	OUTPUT:	1690	OUTPUT:
1468	RETVAL	1691	RETVAL
1469		1692
1470	void	1693	void
1471	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1472	CODE:	1695	CODE:
1473	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1474		1697
1475	int	1698	int
1476	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1477	CODE:	1700	CODE:
1478	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1479	OUTPUT:	1702	OUTPUT:
1480	RETVAL	1703	RETVAL
1481		1704
1482	int	1705	int
1483	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)
1484	CODE:	1707	CODE:
1485	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1486	OUTPUT:	1709	OUTPUT:
1487	RETVAL	1710	RETVAL
1488		1711
1489	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1490		1713
1491	int	1714	int
1492	volume (int volume = -1)	1715	volume (int volume = -1)
1493	CODE:	1716	CODE:
1494	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1495	OUTPUT:	1718	OUTPUT:
1496	RETVAL	1719	RETVAL
1497		1720
1498	CFClient::MixMusic	1721	CFPlus::MixMusic
1499	new_from_file (SV *class, char *path)	1722	new_from_file (SV *class, char *path)
1500	CODE:	1723	CODE:
1501	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1502	OUTPUT:	1725	OUTPUT:
1503	RETVAL	1726	RETVAL
1504		1727
1505	void	1728	void
1506	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1507	CODE:	1730	CODE:
1508	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1509		1732
1510	int	1733	int
1511	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1512	CODE:	1735	CODE:
1513	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1514	OUTPUT:	1737	OUTPUT:
1515	RETVAL	1738	RETVAL
1516		1739
1517	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1518		1741
1519	BOOT:	1742	BOOT:
1520	{	1743	{
1521	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1522	static const struct {	1745	static const struct {
1523	const char *name;	1746	const char *name;
1524	IV iv;	1747	IV iv;
1525	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1526	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
1527	const_iv (GL_COLOR_MATERIAL),	1750	const_iv (GL_COLOR_MATERIAL),
1528	const_iv (GL_SMOOTH),	1751	const_iv (GL_SMOOTH),
1529	const_iv (GL_FLAT),	1752	const_iv (GL_FLAT),
1530	const_iv (GL_DITHER),	1753	const_iv (GL_DITHER),
1531	const_iv (GL_BLEND),	1754	const_iv (GL_BLEND),
		1755	const_iv (GL_CULL_FACE),
1532	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),
1533	const_iv (GL_AND),	1763	const_iv (GL_AND),
1534	const_iv (GL_ONE),	1764	const_iv (GL_ONE),
1535	const_iv (GL_ZERO),	1765	const_iv (GL_ZERO),
1536	const_iv (GL_SRC_ALPHA),	1766	const_iv (GL_SRC_ALPHA),
1537	const_iv (GL_SRC_ALPHA_SATURATE),	1767	const_iv (GL_DST_ALPHA),
1538	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1768	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1539	const_iv (GL_ONE_MINUS_DST_ALPHA),	1769	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1770	const_iv (GL_SRC_ALPHA_SATURATE),
1540	const_iv (GL_RGB),	1771	const_iv (GL_RGB),
1541	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),
1542	const_iv (GL_UNSIGNED_BYTE),	1776	const_iv (GL_UNSIGNED_BYTE),
		1777	const_iv (GL_UNSIGNED_SHORT),
		1778	const_iv (GL_UNSIGNED_INT),
1543	const_iv (GL_ALPHA),	1779	const_iv (GL_ALPHA),
1544	const_iv (GL_INTENSITY),	1780	const_iv (GL_INTENSITY),
1545	const_iv (GL_LUMINANCE),	1781	const_iv (GL_LUMINANCE),
1546	const_iv (GL_LUMINANCE_ALPHA),	1782	const_iv (GL_LUMINANCE_ALPHA),
1547	const_iv (GL_FLOAT),	1783	const_iv (GL_FLOAT),
…		…
1553	const_iv (GL_TEXTURE_MAG_FILTER),	1789	const_iv (GL_TEXTURE_MAG_FILTER),
1554	const_iv (GL_TEXTURE_MIN_FILTER),	1790	const_iv (GL_TEXTURE_MIN_FILTER),
1555	const_iv (GL_TEXTURE_ENV_MODE),	1791	const_iv (GL_TEXTURE_ENV_MODE),
1556	const_iv (GL_TEXTURE_WRAP_S),	1792	const_iv (GL_TEXTURE_WRAP_S),
1557	const_iv (GL_TEXTURE_WRAP_T),	1793	const_iv (GL_TEXTURE_WRAP_T),
		1794	const_iv (GL_REPEAT),
1558	const_iv (GL_CLAMP),	1795	const_iv (GL_CLAMP),
1559	const_iv (GL_REPEAT),	1796	const_iv (GL_CLAMP_TO_EDGE),
1560	const_iv (GL_NEAREST),	1797	const_iv (GL_NEAREST),
1561	const_iv (GL_LINEAR),	1798	const_iv (GL_LINEAR),
1562	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1799	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1563	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1800	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1564	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1801	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1565	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1802	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1566	const_iv (GL_GENERATE_MIPMAP),	1803	const_iv (GL_GENERATE_MIPMAP),
1567	const_iv (GL_MODULATE),	1804	const_iv (GL_MODULATE),
1568	const_iv (GL_DECAL),	1805	const_iv (GL_DECAL),
1569	const_iv (GL_REPLACE),	1806	const_iv (GL_REPLACE),
		1807	const_iv (GL_DEPTH_BUFFER_BIT),
1570	const_iv (GL_COLOR_BUFFER_BIT),	1808	const_iv (GL_COLOR_BUFFER_BIT),
1571	const_iv (GL_PROJECTION),	1809	const_iv (GL_PROJECTION),
1572	const_iv (GL_MODELVIEW),	1810	const_iv (GL_MODELVIEW),
1573	const_iv (GL_COLOR_LOGIC_OP),	1811	const_iv (GL_COLOR_LOGIC_OP),
1574	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1575	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1576	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1577	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1578	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
		1818	const_iv (GL_LINE_LOOP),
1579	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1580	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),
1581	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1824	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1582	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),
1583	# undef const_iv	1830	# undef const_iv
1584	};	1831	};
1585		1832
1586	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; )
1587	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1834	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1588	}	1835	}
1589		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
1590	int glGetError ()	1858	int glGetError ()
		1859
		1860	void glFinish ()
1591		1861
1592	void glClear (int mask)	1862	void glClear (int mask)
1593		1863
1594	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)
1595	PROTOTYPE: @	1865	PROTOTYPE: @
…		…
1602		1872
1603	void glHint (int target, int mode)	1873	void glHint (int target, int mode)
1604		1874
1605	void glBlendFunc (int sfactor, int dfactor)	1875	void glBlendFunc (int sfactor, int dfactor)
1606		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
1607	void glLogicOp (int opcode)	1883	void glLogicOp (int opcode)
1608		1884
1609	void glColorMask (int red, int green, int blue, int alpha)	1885	void glColorMask (int red, int green, int blue, int alpha)
1610		1886
1611	void glMatrixMode (int mode)	1887	void glMatrixMode (int mode)
…		…
1614		1890
1615	void glPopMatrix ()	1891	void glPopMatrix ()
1616		1892
1617	void glLoadIdentity ()	1893	void glLoadIdentity ()
1618		1894
		1895	void glDrawBuffer (int buffer)
		1896
		1897	void glReadBuffer (int buffer)
		1898
1619	# 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
1620	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_)
1621		1904
1622	void glViewport (int x, int y, int width, int height)	1905	void glViewport (int x, int y, int width, int height)
1623		1906
1624	void glScissor (int x, int y, int width, int height)	1907	void glScissor (int x, int y, int width, int height)
…		…
1639		1922
1640	void glEnd ()	1923	void glEnd ()
1641		1924
1642	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)
1643	PROTOTYPE: @	1926	PROTOTYPE: @
		1927	ALIAS:
		1928	glColor_premultiply = 1
1644	CODE:	1929	CODE:
1645	glColor4ub (MIN ((int)(r * 255.f), 255),	1930	if (ix)
1646	MIN ((int)(g * 255.f), 255),	1931	{
1647	MIN ((int)(b * 255.f), 255),	1932	r *= a;
1648	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);
1649		1949
1650	void glVertex (float x, float y, float z = 0.)	1950	void glVertex (float x, float y, float z = 0.)
1651	CODE:	1951	CODE:
1652	glVertex3f (x, y, z);	1952	glVertex3f (x, y, z);
1653		1953
…		…
1665		1965
1666	void glBindTexture (int target, int name)	1966	void glBindTexture (int target, int name)
1667		1967
1668	void glConvolutionParameter (int target, int pname, float params)	1968	void glConvolutionParameter (int target, int pname, float params)
1669	CODE:	1969	CODE:
1670	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1970	if (gl.ConvolutionParameterf)
		1971	gl.ConvolutionParameterf (target, pname, params);
1671		1972
1672	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)
1673	CODE:	1974	CODE:
1674	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1975	if (gl.ConvolutionFilter2D)
1675	(target, internalformat, width, height, format, type, data));	1976	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1676		1977
1677	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)
1678	CODE:	1979	CODE:
1679	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1980	if (gl.SeparableFilter2D)
1680	(target, internalformat, width, height, format, type, row, column));	1981	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1681		1982
1682	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)
1683		1984
1684	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)
1685		1986
1686	void glRasterPos (int x, int y)	1987	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1687	CODE:
1688	glRasterPos2i (x, y);
1689		1988
1690	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)
1691		1990
1692	int glGenTexture ()	1991	int glGenTexture ()
1693	CODE:	1992	CODE:

Diff Legend

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