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.79 by root, Sun May 14 22:24:14 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
		17	#include <math.h>
12	#include <string.h>	18	#include <string.h>
13	#include <stdio.h>	19	#include <stdio.h>
		20	#include <stdlib.h>
14		21
15	#include <SDL.h>	22	#include <SDL.h>
16	#include <SDL_endian.h>	23	#include <SDL_endian.h>
17	#include <SDL_image.h>	24	#include <SDL_image.h>
18	#include <SDL_mixer.h>	25	#include <SDL_mixer.h>
19	#include <SDL_opengl.h>	26	#include <SDL_opengl.h>
20		27
		28	#define PANGO_ENABLE_BACKEND
		29	#define G_DISABLE_CAST_CHECKS
		30
21	#include <glib/gmacros.h>	31	#include <glib/gmacros.h>
22		32
23	#include <pango/pango.h>	33	#include <pango/pango.h>
24	#include <pango/pangofc-fontmap.h>
25	#include <pango/pangoft2.h>
26	#include <pango/pangocairo.h>
27		34
28	#ifndef _WIN32	35	#ifndef _WIN32
29	# include <sys/types.h>	36	# include <sys/types.h>
30	# include <sys/socket.h>	37	# include <sys/socket.h>
31	# include <netinet/in.h>	38	# include <netinet/in.h>
…		…
38	typedef signed char int8_t;	45	typedef signed char int8_t;
39	typedef signed short int16_t;	46	typedef signed short int16_t;
40	typedef signed int int32_t;	47	typedef signed int int32_t;
41	#endif	48	#endif
42		49
43	#include "glext.h"	50	#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */
44		51
45	#define FOW_DARKNESS 32	52	#define FOW_DARKNESS 32
46		53
47	#define MAP_EXTEND_X 32	54	#define MAP_EXTEND_X 32
48	#define MAP_EXTEND_Y 512	55	#define MAP_EXTEND_Y 512
49		56
50	#define MIN_FONT_HEIGHT 10	57	#define MIN_FONT_HEIGHT 10
51		58
52	#define GL_CALL(type,func,args) \	59	#if 0
53	{ \	60	# define PARACHUTE SDL_INIT_NOPARACHUTE
54	static int init_; \	61	#else
55	static type fptr_; \	62	# define PARACHUTE 0
56	\	63	#endif
57	if (!init_) \
58	{ \
59	init_ = 1; \
60	fptr_ = (type)SDL_GL_GetProcAddress (# func); \
61	} \
62	\
63	if (fptr_) \
64	fptr_ args; \
65	}
66		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
67	typedef Mix_Chunk *CFClient__MixChunk;	88	typedef Mix_Chunk *CFPlus__MixChunk;
68	typedef Mix_Music *CFClient__MixMusic;	89	typedef Mix_Music *CFPlus__MixMusic;
69		90
70	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	}
71		110
72	typedef struct cf_layout {	111	typedef struct cf_layout {
73	PangoLayout *pl; // either derived from a cairo or ft2 context	112	PangoLayout *pl;
74	int rgba; // wether we use rgba (cairo) or grayscale (ft2)
75	float r, g, b, a; // default color for rgba mode	113	float r, g, b, a; // default color for rgba mode
76	int base_height;	114	int base_height;
77	CFClient__Font font;	115	CFPlus__Font font;
78	} *CFClient__Layout;	116	} *CFPlus__Layout;
79		117
80	static CFClient__Font default_font;	118	static CFPlus__Font default_font;
81	static PangoContext *ft2_context, *cairo_context;	119	static PangoContext *opengl_context;
82	static PangoFontMap *ft2_fontmap, *cairo_fontmap;	120	static PangoFontMap *opengl_fontmap;
83		121
84	static void	122	static void
85	substitute_func (FcPattern *pattern, gpointer data)	123	substitute_func (FcPattern *pattern, gpointer data)
86	{	124	{
87	FcPatternAddBool (pattern, FC_HINTING , 1);	125	FcPatternAddBool (pattern, FC_HINTING, 1);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
88	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
89	}	130	}
90		131
91	static void	132	static void
92	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
93	{	134	{
94	/* 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
95	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
96	*/	137	*/
97	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
101		142
102	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
103	}	144	}
104		145
105	static void	146	static void
106	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
107	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
108	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
109		153
110	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
111	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
112		156
113	*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;
114	}	164	}
115		165
116	typedef uint16_t mapface;	166	typedef uint16_t mapface;
117		167
118	typedef struct {	168	typedef struct {
…		…
141	int texs;	191	int texs;
142	maptex *tex;	192	maptex *tex;
143		193
144	int32_t rows;	194	int32_t rows;
145	maprow *row;	195	maprow *row;
146	} *CFClient__Map;	196	} *CFPlus__Map;
147		197
148	static char *	198	static char *
149	prepend (char *ptr, int sze, int inc)	199	prepend (char *ptr, int sze, int inc)
150	{	200	{
151	char *p;	201	char *p;
…		…
169		219
170	#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))
171	#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))
172		222
173	static maprow *	223	static maprow *
174	map_get_row (CFClient__Map self, int y)	224	map_get_row (CFPlus__Map self, int y)
175	{	225	{
176	if (0 > y)	226	if (0 > y)
177	{	227	{
178	int extend = - y + MAP_EXTEND_Y;	228	int extend = - y + MAP_EXTEND_Y;
179	Prepend (maprow, self->row, self->rows, extend);	229	Prepend (maprow, self->row, self->rows, extend);
…		…
217		267
218	return row->col + (x - row->c0);	268	return row->col + (x - row->c0);
219	}	269	}
220		270
221	static mapcell *	271	static mapcell *
222	map_get_cell (CFClient__Map self, int x, int y)	272	map_get_cell (CFPlus__Map self, int x, int y)
223	{	273	{
224	return row_get_cell (map_get_row (self, y), x);	274	return row_get_cell (map_get_row (self, y), x);
225	}	275	}
226		276
227	static void	277	static void
228	map_clear (CFClient__Map self)	278	map_clear (CFPlus__Map self)
229	{	279	{
230	int r;	280	int r;
231		281
232	for (r = 0; r < self->rows; r++)	282	for (r = 0; r < self->rows; r++)
233	Safefree (self->row[r].col);	283	Safefree (self->row[r].col);
…		…
241	self->row = 0;	291	self->row = 0;
242	self->rows = 0;	292	self->rows = 0;
243	}	293	}
244		294
245	static void	295	static void
246	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)
247	{	297	{
248	int x, y;	298	int x, y;
249	maprow *row;	299	maprow *row;
250		300
251	for (y = y0; y < y0 + h; y++)	301	for (y = y0; y < y0 + h; y++)
…		…
291	ev.data2 = 0;	341	ev.data2 = 0;
292		342
293	SDL_PushEvent ((SDL_Event *)&ev);	343	SDL_PushEvent ((SDL_Event *)&ev);
294	}	344	}
295		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
296	MODULE = CFClient PACKAGE = CFClient	363	MODULE = CFPlus PACKAGE = CFPlus
297		364
298	PROTOTYPES: ENABLE	365	PROTOTYPES: ENABLE
299		366
300	BOOT:	367	BOOT:
301	{	368	{
302	HV *stash = gv_stashpv ("CFClient", 1);	369	HV *stash = gv_stashpv ("CFPlus", 1);
303	static const struct {	370	static const struct {
304	const char *name;	371	const char *name;
305	IV iv;	372	IV iv;
306	} *civ, const_iv[] = {	373	} *civ, const_iv[] = {
307	# define const_iv(name) { # name, (IV)name }	374	# define const_iv(name) { # name, (IV)name }
…		…
408		475
409	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; )
410	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	477	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
411	}	478	}
412		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
413	void	491	void
414	pango_init ()	492	pango_init ()
415	CODE:	493	CODE:
416	{	494	{
417	// delayed, so it can pick up new fonts added by AddFontResourceEx
418	ft2_fontmap = pango_ft2_font_map_new ();	495	opengl_fontmap = pango_opengl_font_map_new ();
419	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);
420	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	497	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
421
422	cairo_fontmap = pango_cairo_font_map_get_default ();
423	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
424	}	498	}
425		499
426	int	500	int
427	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	501	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
428		502
429	void	503	void
430	SDL_Quit ()	504	SDL_Quit ()
431		505
432	void	506	void
…		…
438	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
439	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	513	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	514	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	515	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
442		516
		517	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		518	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		519
443	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	522	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	523	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
447		524
448	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	525	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		526	#if SDL_VERSION_ATLEAST(1,2,10)
449	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	527	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
450	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	528	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		529	#endif
451		530
452	SDL_EnableUNICODE (1);	531	SDL_EnableUNICODE (1);
453	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	532	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
454		533
455	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	534	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
464		543
465	++m;	544	++m;
466	}	545	}
467	}	546	}
468		547
		548	char *
		549	SDL_GetError ()
		550
469	int	551	int
470	SDL_SetVideoMode (int w, int h, int fullscreen)	552	SDL_SetVideoMode (int w, int h, int fullscreen)
471	CODE:	553	CODE:
472	RETVAL = !!SDL_SetVideoMode (	554	RETVAL = !!SDL_SetVideoMode (
473	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	555	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
474	);	556	);
		557	if (RETVAL)
		558	{
475	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	}
476	OUTPUT:	564	OUTPUT:
477	RETVAL	565	RETVAL
478		566
479	void	567	void
480	SDL_GL_SwapBuffers ()	568	SDL_GL_SwapBuffers ()
		569
		570	char *
		571	SDL_GetKeyName (int sym)
481		572
482	void	573	void
483	SDL_PollEvent ()	574	SDL_PollEvent ()
484	PPCODE:	575	PPCODE:
485	{	576	{
…		…
504	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	595	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
505	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	596	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
506	break;	597	break;
507		598
508	case SDL_MOUSEMOTION:	599	case SDL_MOUSEMOTION:
		600	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		601
509	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	602	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
510	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	603	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
511	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	604	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
512	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	605	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
513	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	606	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
514	break;	607	break;
515		608
516	case SDL_MOUSEBUTTONDOWN:	609	case SDL_MOUSEBUTTONDOWN:
517	case SDL_MOUSEBUTTONUP:	610	case SDL_MOUSEBUTTONUP:
		611	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		612
518	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	613	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
519	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	614	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
520	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	615	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
521	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	616	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
522	break;	617	break;
…		…
526	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	621	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
527	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	622	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
528	break;	623	break;
529	}	624	}
530		625
531	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	626	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
532	}	627	}
533	}	628	}
534		629
535	int	630	int
536	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)
…		…
549	CODE:	644	CODE:
550	#ifndef _WIN32	645	#ifndef _WIN32
551	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	646	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
552	#endif	647	#endif
553		648
554	char *
555	gl_version ()
556	CODE:
557	RETVAL = (char *)glGetString (GL_VERSION);
558	OUTPUT:
559	RETVAL
560
561	char *
562	gl_extensions ()
563	CODE:
564	RETVAL = (char *)glGetString (GL_EXTENSIONS);
565	OUTPUT:
566	RETVAL
567
568	void	649	void
569	add_font (char *file)	650	add_font (char *file)
570	CODE:	651	CODE:
571	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	652	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
572	#ifdef _WIN32
573	// cairo... sigh... requires win2000
574	AddFontResourceEx (file, FR_PRIVATE, 0);
575	#endif
576		653
577	void	654	void
578	load_image_inline (SV *image_)	655	load_image_inline (SV *image_)
579	ALIAS:	656	ALIAS:
580	load_image_file = 1	657	load_image_file = 1
…		…
622		699
623	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	700	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
624		701
625	assert (surface2->pitch == surface2->w * 4);	702	assert (surface2->pitch == surface2->w * 4);
626		703
		704	SDL_LockSurface (surface2);
627	EXTEND (SP, 5);	705	EXTEND (SP, 6);
628	PUSHs (sv_2mortal (newSViv (surface2->w)));	706	PUSHs (sv_2mortal (newSViv (surface2->w)));
629	PUSHs (sv_2mortal (newSViv (surface2->h)));	707	PUSHs (sv_2mortal (newSViv (surface2->h)));
630	SDL_LockSurface (surface2);
631	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	708	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
632	SDL_UnlockSurface (surface2);
633	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)));
634	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	710	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
635	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	711	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		712	SDL_UnlockSurface (surface2);
636		713
637	SDL_FreeSurface (surface);	714	SDL_FreeSurface (surface);
638	SDL_FreeSurface (surface2);	715	SDL_FreeSurface (surface2);
639	}	716	}
640		717
…		…
664	}	741	}
665		742
666	void	743	void
667	error (char *message)	744	error (char *message)
668	CODE:	745	CODE:
		746	fprintf (stderr, "ERROR: %s\n", message);
669	#ifdef _WIN32	747	#ifdef _WIN32
670	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	748	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
671	#else
672	fprintf (stderr, "ERROR: %s\n", message);
673	#endif	749	#endif
674		750
675	void	751	void
676	fatal (char *message)	752	fatal (char *message)
677	CODE:	753	CODE:
		754	fprintf (stderr, "FATAL: %s\n", message);
678	#ifdef _WIN32	755	#ifdef _WIN32
679	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	756	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
680	#else
681	fprintf (stderr, "FATAL: %s\n", message);
682	#endif	757	#endif
683	exit (1);	758	_exit (1);
684		759
		760	void
		761	_exit (int retval)
		762	CODE:
		763	_exit (retval);
		764
685	MODULE = CFClient PACKAGE = CFClient::Font	765	MODULE = CFPlus PACKAGE = CFPlus::Font
686		766
687	CFClient::Font	767	CFPlus::Font
688	new_from_file (SV *class, char *path, int id = 0)	768	new_from_file (SV *class, char *path, int id = 0)
689	CODE:	769	CODE:
690	{	770	{
691	int count;	771	int count;
692	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	772	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
695	}	775	}
696	OUTPUT:	776	OUTPUT:
697	RETVAL	777	RETVAL
698		778
699	void	779	void
700	DESTROY (CFClient::Font self)	780	DESTROY (CFPlus::Font self)
701	CODE:	781	CODE:
702	pango_font_description_free (self);	782	pango_font_description_free (self);
703		783
704	void	784	void
705	make_default (CFClient::Font self)	785	make_default (CFPlus::Font self)
706	CODE:	786	CODE:
707	default_font = self;	787	default_font = self;
708		788
709	MODULE = CFClient PACKAGE = CFClient::Layout	789	MODULE = CFPlus PACKAGE = CFPlus::Layout
710		790
711	CFClient::Layout	791	void
712	new (SV *class, int rgba = 0)	792	reset_glyph_cache ()
		793	CODE:
		794	tc_clear ();
		795
		796	CFPlus::Layout
		797	new (SV *class)
713	CODE:	798	CODE:
714	New (0, RETVAL, 1, struct cf_layout);	799	New (0, RETVAL, 1, struct cf_layout);
715		800
716	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	801	RETVAL->pl = pango_layout_new (opengl_context);
717	RETVAL->rgba = rgba;
718	RETVAL->r = 1.;	802	RETVAL->r = 1.;
719	RETVAL->g = 1.;	803	RETVAL->g = 1.;
720	RETVAL->b = 1.;	804	RETVAL->b = 1.;
721	RETVAL->a = 1.;	805	RETVAL->a = 1.;
722	RETVAL->base_height = MIN_FONT_HEIGHT;	806	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
726	layout_update_font (RETVAL);	810	layout_update_font (RETVAL);
727	OUTPUT:	811	OUTPUT:
728	RETVAL	812	RETVAL
729		813
730	void	814	void
731	DESTROY (CFClient::Layout self)	815	DESTROY (CFPlus::Layout self)
732	CODE:	816	CODE:
733	g_object_unref (self->pl);	817	g_object_unref (self->pl);
734	Safefree (self);	818	Safefree (self);
735		819
736	int
737	is_rgba (CFClient::Layout self)
738	CODE:
739	RETVAL = self->rgba;
740	OUTPUT:
741	RETVAL
742
743	void	820	void
744	set_text (CFClient::Layout self, SV *text_)	821	set_text (CFPlus::Layout self, SV *text_)
745	CODE:	822	CODE:
746	{	823	{
747	STRLEN textlen;	824	STRLEN textlen;
748	char *text = SvPVutf8 (text_, textlen);	825	char *text = SvPVutf8 (text_, textlen);
749		826
750	pango_layout_set_text (self->pl, text, textlen);	827	pango_layout_set_text (self->pl, text, textlen);
751	}	828	}
752		829
753	void	830	void
754	set_markup (CFClient::Layout self, SV *text_)	831	set_markup (CFPlus::Layout self, SV *text_)
755	CODE:	832	CODE:
756	{	833	{
757	STRLEN textlen;	834	STRLEN textlen;
758	char *text = SvPVutf8 (text_, textlen);	835	char *text = SvPVutf8 (text_, textlen);
759		836
760	pango_layout_set_markup (self->pl, text, textlen);	837	pango_layout_set_markup (self->pl, text, textlen);
761	}	838	}
762		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
763	SV *	925	SV *
764	get_text (CFClient::Layout self)	926	get_text (CFPlus::Layout self)
765	CODE:	927	CODE:
766	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	928	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
767	SvUTF8_on (RETVAL);	929	sv_utf8_decode (RETVAL);
768	OUTPUT:	930	OUTPUT:
769	RETVAL	931	RETVAL
770		932
771	void	933	void
772	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.)
773	CODE:	935	CODE:
774	self->r = r;	936	self->r = r;
775	self->g = g;	937	self->g = g;
776	self->b = b;	938	self->b = b;
777	self->a = a;	939	self->a = a;
778		940
779	void	941	void
780	set_font (CFClient::Layout self, CFClient::Font font = 0)	942	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
781	CODE:	943	CODE:
782	if (self->font != font)	944	if (self->font != font)
783	{	945	{
784	self->font = font;	946	self->font = font;
785	layout_update_font (self);	947	layout_update_font (self);
786	}	948	}
787		949
788	void	950	void
789	set_height (CFClient::Layout self, int base_height)	951	set_height (CFPlus::Layout self, int base_height)
790	CODE:	952	CODE:
791	if (self->base_height != base_height)	953	if (self->base_height != base_height)
792	{	954	{
793	self->base_height = base_height;	955	self->base_height = base_height;
794	layout_update_font (self);	956	layout_update_font (self);
795	}	957	}
796		958
797	void	959	void
798	set_width (CFClient::Layout self, int max_width = -1)	960	set_width (CFPlus::Layout self, int max_width = -1)
799	CODE:	961	CODE:
800	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);
801		963
802	void	964	void
		965	set_indent (CFPlus::Layout self, int indent)
		966	CODE:
		967	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		968
		969	void
		970	set_spacing (CFPlus::Layout self, int spacing)
		971	CODE:
		972	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		973
		974	void
		975	set_ellipsise (CFPlus::Layout self, int ellipsise)
		976	CODE:
		977	pango_layout_set_ellipsize (self->pl,
		978	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		979	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		980	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		981	: PANGO_ELLIPSIZE_NONE
		982	);
		983
		984	void
		985	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		986	CODE:
		987	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		988
		989	void
803	size (CFClient::Layout self)	990	size (CFPlus::Layout self)
804	PPCODE:	991	PPCODE:
805	{	992	{
806	int w, h;	993	int w, h;
807		994
808	layout_get_pixel_size (self, &w, &h);	995	layout_get_pixel_size (self, &w, &h);
…		…
811	PUSHs (sv_2mortal (newSViv (w)));	998	PUSHs (sv_2mortal (newSViv (w)));
812	PUSHs (sv_2mortal (newSViv (h)));	999	PUSHs (sv_2mortal (newSViv (h)));
813	}	1000	}
814		1001
815	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
816	xy_to_index (CFClient::Layout self, int x, int y)	1015	xy_to_index (CFPlus::Layout self, int x, int y)
817	CODE:	1016	CODE:
818	{	1017	{
819	int index, trailing;	1018	int index, trailing;
820	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);
821	RETVAL = index;	1020	RETVAL = index;
822	}	1021	}
823	OUTPUT:	1022	OUTPUT:
824	RETVAL	1023	RETVAL
825		1024
826	void	1025	void
827	cursor_pos (CFClient::Layout self, int index)	1026	cursor_pos (CFPlus::Layout self, int index)
828	PPCODE:	1027	PPCODE:
829	{	1028	{
830	PangoRectangle strong_pos;	1029	PangoRectangle strong_pos;
831	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1030	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
832		1031
…		…
835	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1034	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
836	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1035	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
837	}	1036	}
838		1037
839	void	1038	void
840	render (CFClient::Layout self)	1039	render (CFPlus::Layout self, float x, float y, int flags = 0)
841	PPCODE:	1040	PPCODE:
842	{	1041	pango_opengl_render_layout_subpixel (
843	SV *retval;	1042	self->pl,
844	int w, h;	1043	x * PANGO_SCALE, y * PANGO_SCALE,
		1044	self->r, self->g, self->b, self->a,
		1045	flags
		1046	);
845		1047
846	layout_get_pixel_size (self, &w, &h);	1048	MODULE = CFPlus PACKAGE = CFPlus::Texture
847		1049
848	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)
849	{	1058	{
850	cairo_surface_t *surface;	1059	int nw = minpot (ow);
851	cairo_t *cairo;	1060	int nh = minpot (oh);
852		1061
853	retval = newSV (w * h * 4);	1062	if (nw != ow || nh != oh)
854	SvPOK_only (retval);
855	SvCUR_set (retval, w * h * 4);
856
857	memset (SvPVX (retval), 0, w * h * 4);
858
859	surface = cairo_image_surface_create_for_data (
860	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
861	cairo = cairo_create (surface);
862	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
863
864	pango_cairo_show_layout (cairo, self->pl);
865
866	cairo_destroy (cairo);
867	cairo_surface_destroy (surface);
868
869	// what a mess, and its premultiplied, too :(
870	{	1063	{
871	uint32_t *p = (uint32_t *)SvPVX (retval);	1064	if (SvOK (data_))
872	uint32_t *e = p + w * h;
873
874	while (p < e)
875	{	1065	{
876	uint32_t rgba = *p;	1066	STRLEN datalen;
877	rgba = (rgba >> 24) | (rgba << 8);	1067	char *data = SvPVbyte (data_, datalen);
878	rgba = SDL_SwapBE32 (rgba);	1068	int bpp = datalen / (ow * oh);
879	*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_);
880	}	1079	}
		1080
		1081	sv_setiv (w_, nw);
		1082	sv_setiv (h_, nh);
881	}	1083	}
882
883	EXTEND (SP, 5);
884	PUSHs (sv_2mortal (newSViv (w)));
885	PUSHs (sv_2mortal (newSViv (h)));
886	PUSHs (sv_2mortal (retval));
887	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889	}	1084	}
890	else
891	{
892	FT_Bitmap bitmap;
893
894	retval = newSV (w * h);
895	SvPOK_only (retval);
896	SvCUR_set (retval, w * h);
897
898	bitmap.rows = h;
899	bitmap.width = w;
900	bitmap.pitch = w;
901	bitmap.buffer = (unsigned char*)SvPVX (retval);
902	bitmap.num_grays = 256;
903	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
904
905	memset (bitmap.buffer, 0, w * h);
906
907	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
908
909	EXTEND (SP, 5);
910	PUSHs (sv_2mortal (newSViv (w)));
911	PUSHs (sv_2mortal (newSViv (h)));
912	PUSHs (sv_2mortal (retval));
913	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915	}
916	}	1085	}
917		1086
918	MODULE = CFClient PACKAGE = CFClient::Texture
919
920	void	1087	void
921	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.)
922	PROTOTYPE: $$$;$$	1089	PROTOTYPE: $$$;$$
923	ALIAS:	1090	ALIAS:
924	draw_quad_alpha = 1	1091	draw_quad_alpha = 1
925	draw_quad_alpha_premultiplied = 2	1092	draw_quad_alpha_premultiplied = 2
926	CODE:	1093	CODE:
927	{	1094	{
928	HV *hv = (HV *)SvRV (self);	1095	HV *hv = (HV *)SvRV (self);
929	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1096	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
930	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1097	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
931	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1098	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
932	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
933		1099
934	if (items < 5)	1100	if (items < 5)
935	{	1101	{
936	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1102	w = SvNV (*hv_fetch (hv, "w", 1, 1));
937	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1103	h = SvNV (*hv_fetch (hv, "h", 1, 1));
938	}	1104	}
939		1105
940	if (ix)	1106	if (ix)
941	{	1107	{
942	glEnable (GL_BLEND);	1108	glEnable (GL_BLEND);
		1109
		1110	if (ix == 2)
943	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
		1116	glEnable (GL_ALPHA_TEST);
		1117	glAlphaFunc (GL_GREATER, 0.01f);
944	}	1118	}
945		1119
946	glBindTexture (GL_TEXTURE_2D, name);	1120	glBindTexture (GL_TEXTURE_2D, name);
947
948	if (wrap_mode)
949	{
950	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
952	}
953		1121
954	glBegin (GL_QUADS);	1122	glBegin (GL_QUADS);
955	glTexCoord2f (0, 0); glVertex2f (x , y );	1123	glTexCoord2f (0, 0); glVertex2f (x , y );
956	glTexCoord2f (0, t); glVertex2f (x , y + h);	1124	glTexCoord2f (0, t); glVertex2f (x , y + h);
957	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1125	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
958	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1126	glTexCoord2f (s, 0); glVertex2f (x + w, y );
959	glEnd ();	1127	glEnd ();
960		1128
961	if (ix)	1129	if (ix)
		1130	{
		1131	glDisable (GL_ALPHA_TEST);
962	glDisable (GL_BLEND);	1132	glDisable (GL_BLEND);
		1133	}
963	}	1134	}
964		1135
965	MODULE = CFClient PACKAGE = CFClient::Map	1136	MODULE = CFPlus PACKAGE = CFPlus::Map
966		1137
967	CFClient::Map	1138	CFPlus::Map
968	new (SV *class, int map_width, int map_height)	1139	new (SV *class, int map_width, int map_height)
969	CODE:	1140	CODE:
970	New (0, RETVAL, 1, struct map);	1141	New (0, RETVAL, 1, struct map);
971	RETVAL->x = 0;	1142	RETVAL->x = 0;
972	RETVAL->y = 0;	1143	RETVAL->y = 0;
…		…
982	RETVAL->row = 0;	1153	RETVAL->row = 0;
983	OUTPUT:	1154	OUTPUT:
984	RETVAL	1155	RETVAL
985		1156
986	void	1157	void
987	DESTROY (CFClient::Map self)	1158	DESTROY (CFPlus::Map self)
988	CODE:	1159	CODE:
989	{	1160	{
990	map_clear (self);	1161	map_clear (self);
991	Safefree (self->face);	1162	Safefree (self->face);
		1163	Safefree (self->tex);
992	Safefree (self);	1164	Safefree (self);
993	}	1165	}
994		1166
995	void	1167	void
996	clear (CFClient::Map self)	1168	clear (CFPlus::Map self)
997	CODE:	1169	CODE:
998	map_clear (self);	1170	map_clear (self);
999		1171
1000	void	1172	void
1001	set_face (CFClient::Map self, int face, int texid)	1173	set_face (CFPlus::Map self, int face, int texid)
1002	CODE:	1174	CODE:
1003	{	1175	{
1004	while (self->faces <= face)	1176	while (self->faces <= face)
1005	{	1177	{
1006	Append (mapface, self->face, self->faces, self->faces);	1178	Append (mapface, self->face, self->faces, self->faces);
…		…
1009		1181
1010	self->face [face] = texid;	1182	self->face [face] = texid;
1011	}	1183	}
1012		1184
1013	void	1185	void
1014	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)
1015	CODE:	1187	CODE:
1016	{	1188	{
1017	while (self->texs <= texid)	1189	while (self->texs <= texid)
1018	{	1190	{
1019	Append (maptex, self->tex, self->texs, self->texs);	1191	Append (maptex, self->tex, self->texs, self->texs);
…		…
1031	tex->r = r;	1203	tex->r = r;
1032	tex->g = g;	1204	tex->g = g;
1033	tex->b = b;	1205	tex->b = b;
1034	tex->a = a;	1206	tex->a = a;
1035	}	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);
1036	}	1217	}
1037		1218
1038	int	1219	int
1039	ox (CFClient::Map self)	1220	ox (CFPlus::Map self)
1040	ALIAS:	1221	ALIAS:
1041	oy = 1	1222	oy = 1
		1223	x = 2
		1224	y = 3
		1225	w = 4
		1226	h = 5
1042	CODE:	1227	CODE:
1043	switch (ix)	1228	switch (ix)
1044	{	1229	{
1045	case 0: RETVAL = self->ox; break;	1230	case 0: RETVAL = self->ox; break;
1046	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;
1047	}	1236	}
1048	OUTPUT:	1237	OUTPUT:
1049	RETVAL	1238	RETVAL
1050		1239
1051	void	1240	void
1052	scroll (CFClient::Map self, int dx, int dy)	1241	scroll (CFPlus::Map self, int dx, int dy)
1053	CODE:	1242	CODE:
1054	{	1243	{
1055	if (dx > 0)	1244	if (dx > 0)
1056	map_blank (self, self->x, self->y, dx - 1, self->h);	1245	map_blank (self, self->x, self->y, dx - 1, self->h);
1057	else if (dx < 0)	1246	else if (dx < 0)
…		…
1073	self->y += MAP_EXTEND_Y;	1262	self->y += MAP_EXTEND_Y;
1074	}	1263	}
1075	}	1264	}
1076		1265
1077	void	1266	void
1078	map1a_update (CFClient::Map self, SV *data_)	1267	map1a_update (CFPlus::Map self, SV *data_)
1079	CODE:	1268	CODE:
1080	{	1269	{
1081	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1270	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1082	uint8_t *data_end = (uint8_t *)SvEND (data_);	1271	uint8_t *data_end = (uint8_t *)SvEND (data_);
1083	mapcell *cell;	1272	mapcell *cell;
…		…
1085		1274
1086	while (data < data_end)	1275	while (data < data_end)
1087	{	1276	{
1088	flags = (data [0] << 8) + data [1]; data += 2;	1277	flags = (data [0] << 8) + data [1]; data += 2;
1089		1278
1090	x = ((flags >> 10) & 63) + self->x;	1279	x = self->x + ((flags >> 10) & 63);
1091	y = ((flags >> 4) & 63) + self->y;	1280	y = self->y + ((flags >> 4) & 63);
1092		1281
1093	cell = map_get_cell (self, x, y);	1282	cell = map_get_cell (self, x, y);
1094		1283
1095	if (flags & 15)	1284	if (flags & 15)
1096	{	1285	{
…		…
1125	cell->darkness = -1;	1314	cell->darkness = -1;
1126	}	1315	}
1127	}	1316	}
1128		1317
1129	SV *	1318	SV *
1130	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)
1131	CODE:	1320	CODE:
1132	{	1321	{
1133	int x1, x;	1322	int x1, x;
1134	int y1, y;	1323	int y1, y;
1135	int z;	1324	int z;
…		…
1185	}	1374	}
1186	OUTPUT:	1375	OUTPUT:
1187	RETVAL	1376	RETVAL
1188		1377
1189	void	1378	void
1190	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)
1191	PPCODE:	1380	CODE:
1192	{	1381	{
1193	int vx, vy;	1382	int vx, vy;
1194	int x, y, z;	1383	int x, y, z;
1195	int last_name;	1384	int last_name;
1196	mapface face;	1385	mapface face;
1197	int sw4 = (sw + 3) & ~3;
1198	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1199	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1200		1386
1201	memset (darkness, 255, sw4 * sh);
1202	SvPOK_only (darkness_sv);
1203	SvCUR_set (darkness_sv, sw4 * sh);
1204
1205	vx = self->x + (self->w - sw) / 2 - shift_x;	1387	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1206	vy = self->y + (self->h - sh) / 2 - shift_y;	1388	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1207		1389
1208	/*	1390	/*
1209	int vx = self->vx = self->w >= sw	1391	int vx = self->vx = self->w >= sw
1210	? self->x + (self->w - sw) / 2	1392	? self->x + (self->w - sw) / 2
1211	: 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));
…		…
1215	: 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));
1216	*/	1398	*/
1217		1399
1218	glColor4ub (255, 255, 255, 255);	1400	glColor4ub (255, 255, 255, 255);
1219		1401
		1402	glEnable (GL_BLEND);
1220	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1403	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1221	glEnable (GL_BLEND);
1222	glEnable (GL_TEXTURE_2D);	1404	glEnable (GL_TEXTURE_2D);
1223	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1405	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1224		1406
1225	glBegin (GL_QUADS);	1407	glBegin (GL_QUADS);
1226		1408
…		…
1234		1416
1235	for (x = 0; x < sw; x++)	1417	for (x = 0; x < sw; x++)
1236	if (row->c0 <= x + vx && x + vx < row->c1)	1418	if (row->c0 <= x + vx && x + vx < row->c1)
1237	{	1419	{
1238	mapcell *cell = row->col + (x + vx - row->c0);	1420	mapcell *cell = row->col + (x + vx - row->c0);
1239
1240	darkness[y * sw4 + x] = cell->darkness < 0
1241	? 255 - FOW_DARKNESS
1242	: 255 - cell->darkness;
1243		1421
1244	face = cell->face [z];	1422	face = cell->face [z];
1245		1423
1246	if (face)	1424	if (face)
1247	{	1425	{
…		…
1268		1446
1269	glEnd ();	1447	glEnd ();
1270		1448
1271	glDisable (GL_TEXTURE_2D);	1449	glDisable (GL_TEXTURE_2D);
1272	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	}
1273		1545
1274	EXTEND (SP, 3);	1546	EXTEND (SP, 3);
1275	PUSHs (sv_2mortal (newSViv (sw4)));	1547	PUSHs (sv_2mortal (newSViv (sw4)));
1276	PUSHs (sv_2mortal (newSViv (sh)));	1548	PUSHs (sv_2mortal (newSViv (sh)));
1277	PUSHs (darkness_sv);	1549	PUSHs (darkness_sv);
1278	}	1550	}
1279		1551
1280	SV *	1552	SV *
1281	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)
1282	CODE:	1554	CODE:
1283	{	1555	{
1284	int x, y, x1, y1;	1556	int x, y, x1, y1;
1285	SV *data_sv = newSV (w * h * 7 + 5);	1557	SV *data_sv = newSV (w * h * 7 + 5);
1286	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1558	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1348	}	1620	}
1349	OUTPUT:	1621	OUTPUT:
1350	RETVAL	1622	RETVAL
1351		1623
1352	void	1624	void
1353	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)
1354	PPCODE:	1626	PPCODE:
1355	{	1627	{
1356	int x, y, z;	1628	int x, y, z;
1357	int w, h;	1629	int w, h;
1358	int x1, y1;	1630	int x1, y1;
…		…
1407	}	1679	}
1408	}	1680	}
1409	}	1681	}
1410	}	1682	}
1411		1683
1412	MODULE = CFClient PACKAGE = CFClient::MixChunk	1684	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1413		1685
1414	CFClient::MixChunk	1686	CFPlus::MixChunk
1415	new_from_file (SV *class, char *path)	1687	new_from_file (SV *class, char *path)
1416	CODE:	1688	CODE:
1417	RETVAL = Mix_LoadWAV (path);	1689	RETVAL = Mix_LoadWAV (path);
1418	OUTPUT:	1690	OUTPUT:
1419	RETVAL	1691	RETVAL
1420		1692
1421	void	1693	void
1422	DESTROY (CFClient::MixChunk self)	1694	DESTROY (CFPlus::MixChunk self)
1423	CODE:	1695	CODE:
1424	Mix_FreeChunk (self);	1696	Mix_FreeChunk (self);
1425		1697
1426	int	1698	int
1427	volume (CFClient::MixChunk self, int volume = -1)	1699	volume (CFPlus::MixChunk self, int volume = -1)
1428	CODE:	1700	CODE:
1429	RETVAL = Mix_VolumeChunk (self, volume);	1701	RETVAL = Mix_VolumeChunk (self, volume);
1430	OUTPUT:	1702	OUTPUT:
1431	RETVAL	1703	RETVAL
1432		1704
1433	int	1705	int
1434	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)
1435	CODE:	1707	CODE:
1436	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1708	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1437	OUTPUT:	1709	OUTPUT:
1438	RETVAL	1710	RETVAL
1439		1711
1440	MODULE = CFClient PACKAGE = CFClient::MixMusic	1712	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1441		1713
1442	int	1714	int
1443	volume (int volume = -1)	1715	volume (int volume = -1)
1444	CODE:	1716	CODE:
1445	RETVAL = Mix_VolumeMusic (volume);	1717	RETVAL = Mix_VolumeMusic (volume);
1446	OUTPUT:	1718	OUTPUT:
1447	RETVAL	1719	RETVAL
1448		1720
1449	CFClient::MixMusic	1721	CFPlus::MixMusic
1450	new_from_file (SV *class, char *path)	1722	new_from_file (SV *class, char *path)
1451	CODE:	1723	CODE:
1452	RETVAL = Mix_LoadMUS (path);	1724	RETVAL = Mix_LoadMUS (path);
1453	OUTPUT:	1725	OUTPUT:
1454	RETVAL	1726	RETVAL
1455		1727
1456	void	1728	void
1457	DESTROY (CFClient::MixMusic self)	1729	DESTROY (CFPlus::MixMusic self)
1458	CODE:	1730	CODE:
1459	Mix_FreeMusic (self);	1731	Mix_FreeMusic (self);
1460		1732
1461	int	1733	int
1462	play (CFClient::MixMusic self, int loops = -1)	1734	play (CFPlus::MixMusic self, int loops = -1)
1463	CODE:	1735	CODE:
1464	RETVAL = Mix_PlayMusic (self, loops);	1736	RETVAL = Mix_PlayMusic (self, loops);
1465	OUTPUT:	1737	OUTPUT:
1466	RETVAL	1738	RETVAL
1467		1739
1468	MODULE = CFClient PACKAGE = CFClient::OpenGL	1740	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1469		1741
1470	BOOT:	1742	BOOT:
1471	{	1743	{
1472	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1744	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1473	static const struct {	1745	static const struct {
1474	const char *name;	1746	const char *name;
1475	IV iv;	1747	IV iv;
1476	} *civ, const_iv[] = {	1748	} *civ, const_iv[] = {
1477	# define const_iv(name) { # name, (IV)name }	1749	# define const_iv(name) { # name, (IV)name }
1478	const_iv (GL_COLOR_MATERIAL),	1750	const_iv (GL_COLOR_MATERIAL),
1479	const_iv (GL_SMOOTH),	1751	const_iv (GL_SMOOTH),
1480	const_iv (GL_FLAT),	1752	const_iv (GL_FLAT),
1481	const_iv (GL_DITHER),	1753	const_iv (GL_DITHER),
1482	const_iv (GL_BLEND),	1754	const_iv (GL_BLEND),
		1755	const_iv (GL_CULL_FACE),
1483	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),
1484	const_iv (GL_AND),	1763	const_iv (GL_AND),
1485	const_iv (GL_ONE),	1764	const_iv (GL_ONE),
1486	const_iv (GL_ZERO),	1765	const_iv (GL_ZERO),
1487	const_iv (GL_SRC_ALPHA),	1766	const_iv (GL_SRC_ALPHA),
1488	const_iv (GL_SRC_ALPHA_SATURATE),	1767	const_iv (GL_DST_ALPHA),
1489	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1768	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1490	const_iv (GL_ONE_MINUS_DST_ALPHA),	1769	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1770	const_iv (GL_SRC_ALPHA_SATURATE),
1491	const_iv (GL_RGB),	1771	const_iv (GL_RGB),
1492	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),
1493	const_iv (GL_UNSIGNED_BYTE),	1776	const_iv (GL_UNSIGNED_BYTE),
		1777	const_iv (GL_UNSIGNED_SHORT),
		1778	const_iv (GL_UNSIGNED_INT),
1494	const_iv (GL_ALPHA),	1779	const_iv (GL_ALPHA),
		1780	const_iv (GL_INTENSITY),
1495	const_iv (GL_LUMINANCE),	1781	const_iv (GL_LUMINANCE),
		1782	const_iv (GL_LUMINANCE_ALPHA),
1496	const_iv (GL_FLOAT),	1783	const_iv (GL_FLOAT),
1497	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1784	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1498	const_iv (GL_COMPILE),	1785	const_iv (GL_COMPILE),
1499	const_iv (GL_TEXTURE_1D),	1786	const_iv (GL_TEXTURE_1D),
1500	const_iv (GL_TEXTURE_2D),	1787	const_iv (GL_TEXTURE_2D),
…		…
1502	const_iv (GL_TEXTURE_MAG_FILTER),	1789	const_iv (GL_TEXTURE_MAG_FILTER),
1503	const_iv (GL_TEXTURE_MIN_FILTER),	1790	const_iv (GL_TEXTURE_MIN_FILTER),
1504	const_iv (GL_TEXTURE_ENV_MODE),	1791	const_iv (GL_TEXTURE_ENV_MODE),
1505	const_iv (GL_TEXTURE_WRAP_S),	1792	const_iv (GL_TEXTURE_WRAP_S),
1506	const_iv (GL_TEXTURE_WRAP_T),	1793	const_iv (GL_TEXTURE_WRAP_T),
		1794	const_iv (GL_REPEAT),
1507	const_iv (GL_CLAMP),	1795	const_iv (GL_CLAMP),
1508	const_iv (GL_REPEAT),	1796	const_iv (GL_CLAMP_TO_EDGE),
1509	const_iv (GL_NEAREST),	1797	const_iv (GL_NEAREST),
1510	const_iv (GL_LINEAR),	1798	const_iv (GL_LINEAR),
1511	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1799	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1512	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1800	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1513	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1801	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1514	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1802	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1515	const_iv (GL_GENERATE_MIPMAP),	1803	const_iv (GL_GENERATE_MIPMAP),
1516	const_iv (GL_MODULATE),	1804	const_iv (GL_MODULATE),
1517	const_iv (GL_DECAL),	1805	const_iv (GL_DECAL),
1518	const_iv (GL_REPLACE),	1806	const_iv (GL_REPLACE),
		1807	const_iv (GL_DEPTH_BUFFER_BIT),
1519	const_iv (GL_COLOR_BUFFER_BIT),	1808	const_iv (GL_COLOR_BUFFER_BIT),
1520	const_iv (GL_PROJECTION),	1809	const_iv (GL_PROJECTION),
1521	const_iv (GL_MODELVIEW),	1810	const_iv (GL_MODELVIEW),
1522	const_iv (GL_COLOR_LOGIC_OP),	1811	const_iv (GL_COLOR_LOGIC_OP),
1523	const_iv (GL_SEPARABLE_2D),	1812	const_iv (GL_SEPARABLE_2D),
1524	const_iv (GL_CONVOLUTION_2D),	1813	const_iv (GL_CONVOLUTION_2D),
1525	const_iv (GL_CONVOLUTION_BORDER_MODE),	1814	const_iv (GL_CONVOLUTION_BORDER_MODE),
1526	const_iv (GL_CONSTANT_BORDER),	1815	const_iv (GL_CONSTANT_BORDER),
1527	const_iv (GL_LINES),	1816	const_iv (GL_LINES),
		1817	const_iv (GL_LINE_STRIP),
		1818	const_iv (GL_LINE_LOOP),
1528	const_iv (GL_QUADS),	1819	const_iv (GL_QUADS),
1529	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),
1530	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1824	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1531	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),
1532	# undef const_iv	1830	# undef const_iv
1533	};	1831	};
1534		1832
1535	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; )
1536	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1834	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1537	}	1835	}
1538		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
1539	int glGetError ()	1858	int glGetError ()
		1859
		1860	void glFinish ()
1540		1861
1541	void glClear (int mask)	1862	void glClear (int mask)
1542		1863
1543	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)
1544	PROTOTYPE: @	1865	PROTOTYPE: @
…		…
1551		1872
1552	void glHint (int target, int mode)	1873	void glHint (int target, int mode)
1553		1874
1554	void glBlendFunc (int sfactor, int dfactor)	1875	void glBlendFunc (int sfactor, int dfactor)
1555		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
1556	void glLogicOp (int opcode)	1883	void glLogicOp (int opcode)
1557		1884
1558	void glColorMask (int red, int green, int blue, int alpha)	1885	void glColorMask (int red, int green, int blue, int alpha)
1559		1886
1560	void glMatrixMode (int mode)	1887	void glMatrixMode (int mode)
…		…
1563		1890
1564	void glPopMatrix ()	1891	void glPopMatrix ()
1565		1892
1566	void glLoadIdentity ()	1893	void glLoadIdentity ()
1567		1894
		1895	void glDrawBuffer (int buffer)
		1896
		1897	void glReadBuffer (int buffer)
		1898
1568	# 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
1569	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_)
1570		1904
1571	void glViewport (int x, int y, int width, int height)	1905	void glViewport (int x, int y, int width, int height)
1572		1906
1573	void glScissor (int x, int y, int width, int height)	1907	void glScissor (int x, int y, int width, int height)
…		…
1588		1922
1589	void glEnd ()	1923	void glEnd ()
1590		1924
1591	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)
1592	PROTOTYPE: @	1926	PROTOTYPE: @
		1927	ALIAS:
		1928	glColor_premultiply = 1
1593	CODE:	1929	CODE:
1594	// 255.999 is close enough to correctness (256 and clamp)	1930	if (ix)
1595	glColor4ub (r * 255.999, g * 255.999, b * 255.999, a * 255.999);	1931	{
		1932	r *= a;
		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);
1596		1949
1597	void glVertex (float x, float y, float z = 0.)	1950	void glVertex (float x, float y, float z = 0.)
1598	CODE:	1951	CODE:
1599	glVertex3f (x, y, z);	1952	glVertex3f (x, y, z);
1600		1953
…		…
1612		1965
1613	void glBindTexture (int target, int name)	1966	void glBindTexture (int target, int name)
1614		1967
1615	void glConvolutionParameter (int target, int pname, float params)	1968	void glConvolutionParameter (int target, int pname, float params)
1616	CODE:	1969	CODE:
1617	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1970	if (gl.ConvolutionParameterf)
		1971	gl.ConvolutionParameterf (target, pname, params);
1618		1972
1619	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)
1620	CODE:	1974	CODE:
1621	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1975	if (gl.ConvolutionFilter2D)
1622	(target, internalformat, width, height, format, type, data));	1976	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1623		1977
1624	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)
1625	CODE:	1979	CODE:
1626	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	1980	if (gl.SeparableFilter2D)
1627	(target, internalformat, width, height, format, type, row, column));	1981	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1628		1982
1629	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)
1630		1984
1631	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)
1632		1986
1633	void glRasterPos (int x, int y)	1987	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1634	CODE:
1635	glRasterPos2i (x, y);
1636		1988
1637	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)
1638		1990
1639	int glGenTexture ()	1991	int glGenTexture ()
1640	CODE:	1992	CODE:

Diff Legend

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