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.85 by root, Fri May 19 03:49:47 2006 UTC vs.
Revision 1.140 by root, Mon Aug 14 03:41:25 2006 UTC

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

Diff Legend

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