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.83 by root, Mon May 15 00:25:14 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 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
…		…
443	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	510	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
444	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
445	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
446	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
447		514
		515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		517
448	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
449	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
450	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
451	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
452		522
453	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
454	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
455	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
456		528
457	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
458	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
459		531
460	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
469		541
470	++m;	542	++m;
471	}	543	}
472	}	544	}
473		545
		546	char *
		547	SDL_GetError ()
		548
474	int	549	int
475	SDL_SetVideoMode (int w, int h, int fullscreen)	550	SDL_SetVideoMode (int w, int h, int fullscreen)
476	CODE:	551	CODE:
477	RETVAL = !!SDL_SetVideoMode (	552	RETVAL = !!SDL_SetVideoMode (
478	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	553	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
479	);	554	);
		555	if (RETVAL)
		556	{
480	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	}
481	OUTPUT:	562	OUTPUT:
482	RETVAL	563	RETVAL
483		564
484	void	565	void
485	SDL_GL_SwapBuffers ()	566	SDL_GL_SwapBuffers ()
		567
		568	char *
		569	SDL_GetKeyName (int sym)
486		570
487	void	571	void
488	SDL_PollEvent ()	572	SDL_PollEvent ()
489	PPCODE:	573	PPCODE:
490	{	574	{
…		…
509	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	593	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
510	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	594	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
511	break;	595	break;
512		596
513	case SDL_MOUSEMOTION:	597	case SDL_MOUSEMOTION:
		598	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		599
514	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	600	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
515	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	601	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
516	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	602	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
517	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	603	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
518	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	604	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
519	break;	605	break;
520		606
521	case SDL_MOUSEBUTTONDOWN:	607	case SDL_MOUSEBUTTONDOWN:
522	case SDL_MOUSEBUTTONUP:	608	case SDL_MOUSEBUTTONUP:
		609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		610
523	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	611	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
524	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
525	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	613	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
526	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	614	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
527	break;	615	break;
…		…
531	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
532	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
533	break;	621	break;
534	}	622	}
535		623
536	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
537	}	625	}
538	}	626	}
539		627
540	int	628	int
541	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)
…		…
554	CODE:	642	CODE:
555	#ifndef _WIN32	643	#ifndef _WIN32
556	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	644	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
557	#endif	645	#endif
558		646
559	char *
560	gl_version ()
561	CODE:
562	RETVAL = (char *)glGetString (GL_VERSION);
563	OUTPUT:
564	RETVAL
565
566	char *
567	gl_extensions ()
568	CODE:
569	RETVAL = (char *)glGetString (GL_EXTENSIONS);
570	OUTPUT:
571	RETVAL
572
573	void	647	void
574	add_font (char *file)	648	add_font (char *file)
575	CODE:	649	CODE:
576	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
577	#ifdef _WIN32
578	// cairo... sigh... requires win2000
579	AddFontResourceEx (file, FR_PRIVATE, 0);
580	#endif
581		651
582	void	652	void
583	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
584	ALIAS:	654	ALIAS:
585	load_image_file = 1	655	load_image_file = 1
…		…
627		697
628	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
629		699
630	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
631		701
		702	SDL_LockSurface (surface2);
632	EXTEND (SP, 5);	703	EXTEND (SP, 6);
633	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
634	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
635	SDL_LockSurface (surface2);
636	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
637	SDL_UnlockSurface (surface2);
638	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));	707	PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
639	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
640	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
641		711
642	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
643	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
644	}	714	}
645		715
…		…
669	}	739	}
670		740
671	void	741	void
672	error (char *message)	742	error (char *message)
673	CODE:	743	CODE:
		744	fprintf (stderr, "ERROR: %s\n", message);
674	#ifdef _WIN32	745	#ifdef _WIN32
675	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	746	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
676	#else
677	fprintf (stderr, "ERROR: %s\n", message);
678	#endif	747	#endif
679		748
680	void	749	void
681	fatal (char *message)	750	fatal (char *message)
682	CODE:	751	CODE:
		752	fprintf (stderr, "FATAL: %s\n", message);
683	#ifdef _WIN32	753	#ifdef _WIN32
684	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
685	#else
686	fprintf (stderr, "FATAL: %s\n", message);
687	#endif	755	#endif
688	exit (1);	756	_exit (1);
689		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
690	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
691		764
692	CFClient::Font	765	CFPlus::Font
693	new_from_file (SV *class, char *path, int id = 0)	766	new_from_file (SV *class, char *path, int id = 0)
694	CODE:	767	CODE:
695	{	768	{
696	int count;	769	int count;
697	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	770	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
700	}	773	}
701	OUTPUT:	774	OUTPUT:
702	RETVAL	775	RETVAL
703		776
704	void	777	void
705	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
706	CODE:	779	CODE:
707	pango_font_description_free (self);	780	pango_font_description_free (self);
708		781
709	void	782	void
710	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
711	CODE:	784	CODE:
712	default_font = self;	785	default_font = self;
713		786
714	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
715		788
716	CFClient::Layout	789	void
717	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
		791	CODE:
		792	tc_clear ();
		793
		794	CFPlus::Layout
		795	new (SV *class)
718	CODE:	796	CODE:
719	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
720		798
721	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
722	RETVAL->rgba = rgba;
723	RETVAL->r = 1.;	800	RETVAL->r = 1.;
724	RETVAL->g = 1.;	801	RETVAL->g = 1.;
725	RETVAL->b = 1.;	802	RETVAL->b = 1.;
726	RETVAL->a = 1.;	803	RETVAL->a = 1.;
727	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
731	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
732	OUTPUT:	809	OUTPUT:
733	RETVAL	810	RETVAL
734		811
735	void	812	void
736	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
737	CODE:	814	CODE:
738	g_object_unref (self->pl);	815	g_object_unref (self->pl);
739	Safefree (self);	816	Safefree (self);
740		817
741	int
742	is_rgba (CFClient::Layout self)
743	CODE:
744	RETVAL = self->rgba;
745	OUTPUT:
746	RETVAL
747
748	void	818	void
749	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
750	CODE:	820	CODE:
751	{	821	{
752	STRLEN textlen;	822	STRLEN textlen;
753	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
754		824
755	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
756	}	826	}
757		827
758	void	828	void
759	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
760	CODE:	830	CODE:
761	{	831	{
762	STRLEN textlen;	832	STRLEN textlen;
763	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
764		834
765	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
766	}	836	}
767		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
768	SV *	923	SV *
769	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
770	CODE:	925	CODE:
771	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
772	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
773	OUTPUT:	928	OUTPUT:
774	RETVAL	929	RETVAL
775		930
776	void	931	void
777	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.)
778	CODE:	933	CODE:
779	self->r = r;	934	self->r = r;
780	self->g = g;	935	self->g = g;
781	self->b = b;	936	self->b = b;
782	self->a = a;	937	self->a = a;
783		938
784	void	939	void
785	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
786	CODE:	941	CODE:
787	if (self->font != font)	942	if (self->font != font)
788	{	943	{
789	self->font = font;	944	self->font = font;
790	layout_update_font (self);	945	layout_update_font (self);
791	}	946	}
792		947
793	void	948	void
794	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
795	CODE:	950	CODE:
796	if (self->base_height != base_height)	951	if (self->base_height != base_height)
797	{	952	{
798	self->base_height = base_height;	953	self->base_height = base_height;
799	layout_update_font (self);	954	layout_update_font (self);
800	}	955	}
801		956
802	void	957	void
803	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
804	CODE:	959	CODE:
805	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);
806		961
807	void	962	void
		963	set_indent (CFPlus::Layout self, int indent)
		964	CODE:
		965	pango_layout_set_indent (self->pl, indent * PANGO_SCALE);
		966
		967	void
		968	set_spacing (CFPlus::Layout self, int spacing)
		969	CODE:
		970	pango_layout_set_spacing (self->pl, spacing * PANGO_SCALE);
		971
		972	void
		973	set_ellipsise (CFPlus::Layout self, int ellipsise)
		974	CODE:
		975	pango_layout_set_ellipsize (self->pl,
		976	ellipsise == 1 ? PANGO_ELLIPSIZE_START
		977	: ellipsise == 2 ? PANGO_ELLIPSIZE_MIDDLE
		978	: ellipsise == 3 ? PANGO_ELLIPSIZE_END
		979	: PANGO_ELLIPSIZE_NONE
		980	);
		981
		982	void
		983	set_single_paragraph_mode (CFPlus::Layout self, int spm)
		984	CODE:
		985	pango_layout_set_single_paragraph_mode (self->pl, !!spm);
		986
		987	void
808	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
809	PPCODE:	989	PPCODE:
810	{	990	{
811	int w, h;	991	int w, h;
812		992
813	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
816	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
817	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
818	}	998	}
819		999
820	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
821	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
822	CODE:	1014	CODE:
823	{	1015	{
824	int index, trailing;	1016	int index, trailing;
825	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);
826	RETVAL = index;	1018	RETVAL = index;
827	}	1019	}
828	OUTPUT:	1020	OUTPUT:
829	RETVAL	1021	RETVAL
830		1022
831	void	1023	void
832	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
833	PPCODE:	1025	PPCODE:
834	{	1026	{
835	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
836	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
837		1029
…		…
840	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
841	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
842	}	1034	}
843		1035
844	void	1036	void
845	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
846	PPCODE:	1038	PPCODE:
847	{	1039	pango_opengl_render_layout_subpixel (
848	SV *retval;	1040	self->pl,
849	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
		1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
850		1045
851	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
852		1047
853	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)
854	{	1056	{
855	cairo_surface_t *surface;	1057	int nw = minpot (ow);
856	cairo_t *cairo;	1058	int nh = minpot (oh);
857		1059
858	retval = newSV (w * h * 4);	1060	if (nw != ow || nh != oh)
859	SvPOK_only (retval);
860	SvCUR_set (retval, w * h * 4);
861
862	memset (SvPVX (retval), 0, w * h * 4);
863
864	surface = cairo_image_surface_create_for_data (
865	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
866	cairo = cairo_create (surface);
867	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
868
869	pango_cairo_show_layout (cairo, self->pl);
870
871	cairo_destroy (cairo);
872	cairo_surface_destroy (surface);
873
874	// what a mess, and its premultiplied, too :(
875	{	1061	{
876	uint32_t *p = (uint32_t *)SvPVX (retval);	1062	if (SvOK (data_))
877	uint32_t *e = p + w * h;
878
879	while (p < e)
880	{	1063	{
881	uint32_t rgba = *p;	1064	STRLEN datalen;
882	rgba = (rgba >> 24) | (rgba << 8);	1065	char *data = SvPVbyte (data_, datalen);
883	rgba = SDL_SwapBE32 (rgba);	1066	int bpp = datalen / (ow * oh);
884	*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_);
885	}	1077	}
		1078
		1079	sv_setiv (w_, nw);
		1080	sv_setiv (h_, nh);
886	}	1081	}
887
888	EXTEND (SP, 5);
889	PUSHs (sv_2mortal (newSViv (w)));
890	PUSHs (sv_2mortal (newSViv (h)));
891	PUSHs (sv_2mortal (retval));
892	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
893	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
894	}	1082	}
895	else
896	{
897	FT_Bitmap bitmap;
898
899	retval = newSV (w * h);
900	SvPOK_only (retval);
901	SvCUR_set (retval, w * h);
902
903	bitmap.rows = h;
904	bitmap.width = w;
905	bitmap.pitch = w;
906	bitmap.buffer = (unsigned char*)SvPVX (retval);
907	bitmap.num_grays = 256;
908	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
909
910	memset (bitmap.buffer, 0, w * h);
911
912	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
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_ALPHA)));
919	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
920	}
921	}	1083	}
922		1084
923	MODULE = CFClient PACKAGE = CFClient::Texture
924
925	void	1085	void
926	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.)
927	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
928	ALIAS:	1088	ALIAS:
929	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
930	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
931	CODE:	1091	CODE:
932	{	1092	{
933	HV *hv = (HV *)SvRV (self);	1093	HV *hv = (HV *)SvRV (self);
934	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1094	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
935	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1095	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
936	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1096	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
937	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
938		1097
939	if (items < 5)	1098	if (items < 5)
940	{	1099	{
941	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1100	w = SvNV (*hv_fetch (hv, "w", 1, 1));
942	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1101	h = SvNV (*hv_fetch (hv, "h", 1, 1));
943	}	1102	}
944		1103
945	if (ix)	1104	if (ix)
946	{	1105	{
947	glEnable (GL_BLEND);	1106	glEnable (GL_BLEND);
		1107
		1108	if (ix == 2)
948	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);
949	}	1116	}
950		1117
951	glBindTexture (GL_TEXTURE_2D, name);	1118	glBindTexture (GL_TEXTURE_2D, name);
952
953	if (wrap_mode)
954	{
955	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
956	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
957	}
958		1119
959	glBegin (GL_QUADS);	1120	glBegin (GL_QUADS);
960	glTexCoord2f (0, 0); glVertex2f (x , y );	1121	glTexCoord2f (0, 0); glVertex2f (x , y );
961	glTexCoord2f (0, t); glVertex2f (x , y + h);	1122	glTexCoord2f (0, t); glVertex2f (x , y + h);
962	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1123	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
963	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1124	glTexCoord2f (s, 0); glVertex2f (x + w, y );
964	glEnd ();	1125	glEnd ();
965		1126
966	if (ix)	1127	if (ix)
		1128	{
		1129	glDisable (GL_ALPHA_TEST);
967	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
		1131	}
968	}	1132	}
969		1133
970	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
971		1135
972	CFClient::Map	1136	CFPlus::Map
973	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
974	CODE:	1138	CODE:
975	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
976	RETVAL->x = 0;	1140	RETVAL->x = 0;
977	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
987	RETVAL->row = 0;	1151	RETVAL->row = 0;
988	OUTPUT:	1152	OUTPUT:
989	RETVAL	1153	RETVAL
990		1154
991	void	1155	void
992	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
993	CODE:	1157	CODE:
994	{	1158	{
995	map_clear (self);	1159	map_clear (self);
996	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
997	Safefree (self);	1162	Safefree (self);
998	}	1163	}
999		1164
1000	void	1165	void
1001	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
1002	CODE:	1167	CODE:
1003	map_clear (self);	1168	map_clear (self);
1004		1169
1005	void	1170	void
1006	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1007	CODE:	1172	CODE:
1008	{	1173	{
1009	while (self->faces <= face)	1174	while (self->faces <= face)
1010	{	1175	{
1011	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1014		1179
1015	self->face [face] = texid;	1180	self->face [face] = texid;
1016	}	1181	}
1017		1182
1018	void	1183	void
1019	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)
1020	CODE:	1185	CODE:
1021	{	1186	{
1022	while (self->texs <= texid)	1187	while (self->texs <= texid)
1023	{	1188	{
1024	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1036	tex->r = r;	1201	tex->r = r;
1037	tex->g = g;	1202	tex->g = g;
1038	tex->b = b;	1203	tex->b = b;
1039	tex->a = a;	1204	tex->a = a;
1040	}	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);
1041	}	1215	}
1042		1216
1043	int	1217	int
1044	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1045	ALIAS:	1219	ALIAS:
1046	oy = 1	1220	oy = 1
		1221	x = 2
		1222	y = 3
		1223	w = 4
		1224	h = 5
1047	CODE:	1225	CODE:
1048	switch (ix)	1226	switch (ix)
1049	{	1227	{
1050	case 0: RETVAL = self->ox; break;	1228	case 0: RETVAL = self->ox; break;
1051	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;
1052	}	1234	}
1053	OUTPUT:	1235	OUTPUT:
1054	RETVAL	1236	RETVAL
1055		1237
1056	void	1238	void
1057	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1058	CODE:	1240	CODE:
1059	{	1241	{
1060	if (dx > 0)	1242	if (dx > 0)
1061	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1062	else if (dx < 0)	1244	else if (dx < 0)
…		…
1078	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1079	}	1261	}
1080	}	1262	}
1081		1263
1082	void	1264	void
1083	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1084	CODE:	1266	CODE:
1085	{	1267	{
1086	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1268	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1087	uint8_t *data_end = (uint8_t *)SvEND (data_);	1269	uint8_t *data_end = (uint8_t *)SvEND (data_);
1088	mapcell *cell;	1270	mapcell *cell;
…		…
1090		1272
1091	while (data < data_end)	1273	while (data < data_end)
1092	{	1274	{
1093	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1094		1276
1095	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1096	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1097		1279
1098	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1099		1281
1100	if (flags & 15)	1282	if (flags & 15)
1101	{	1283	{
…		…
1105	cell->face [0] = 0;	1287	cell->face [0] = 0;
1106	cell->face [1] = 0;	1288	cell->face [1] = 0;
1107	cell->face [2] = 0;	1289	cell->face [2] = 0;
1108	}	1290	}
1109		1291
		1292	if (flags & 8)
		1293	{
		1294	fprintf (stderr, "oi\n");//D
		1295	if (extmap)
		1296	{
		1297	uint8_t ext, cmd;
		1298
		1299	do
		1300	{
		1301
		1302	ext = *data++;
		1303	cmd = ext & 0x7f;
		1304
		1305	fprintf (stderr, "extcmd = %x\n", ext);//D
		1306
		1307	if (ext < 4)
		1308	cell->darkness = 255 - ext * 64;
		1309	}
		1310	while (cmd & 0x80);
		1311	}
		1312	else
1110	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1111		1315
1112	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1113		1317
1114	if (flags & 4)	1318	if (flags & 4)
1115	{	1319	{
…		…
1130	cell->darkness = -1;	1334	cell->darkness = -1;
1131	}	1335	}
1132	}	1336	}
1133		1337
1134	SV *	1338	SV *
1135	mapmap (CFClient::Map self, int x0, int y0, int w, int h)	1339	mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
1136	CODE:	1340	CODE:
1137	{	1341	{
1138	int x1, x;	1342	int x1, x;
1139	int y1, y;	1343	int y1, y;
1140	int z;	1344	int z;
…		…
1190	}	1394	}
1191	OUTPUT:	1395	OUTPUT:
1192	RETVAL	1396	RETVAL
1193		1397
1194	void	1398	void
1195	draw (CFClient::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)	1399	draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
1196	PPCODE:	1400	CODE:
1197	{	1401	{
1198	int vx, vy;	1402	int vx, vy;
1199	int x, y, z;	1403	int x, y, z;
1200	int last_name;	1404	int last_name;
1201	mapface face;	1405	mapface face;
1202	int sw4 = (sw + 3) & ~3;
1203	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1204	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1205		1406
1206	memset (darkness, 255, sw4 * sh);
1207	SvPOK_only (darkness_sv);
1208	SvCUR_set (darkness_sv, sw4 * sh);
1209
1210	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1211	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1212		1409
1213	/*	1410	/*
1214	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1215	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1216	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));	1413	: MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
…		…
1220	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));	1417	: MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1221	*/	1418	*/
1222		1419
1223	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1224		1421
		1422	glEnable (GL_BLEND);
1225	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1226	glEnable (GL_BLEND);
1227	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1228	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1229		1426
1230	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1231		1428
…		…
1239		1436
1240	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1241	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1242	{	1439	{
1243	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1244
1245	darkness[y * sw4 + x] = cell->darkness < 0
1246	? 255 - FOW_DARKNESS
1247	: 255 - cell->darkness;
1248		1441
1249	face = cell->face [z];	1442	face = cell->face [z];
1250		1443
1251	if (face)	1444	if (face)
1252	{	1445	{
…		…
1273		1466
1274	glEnd ();	1467	glEnd ();
1275		1468
1276	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1277	glDisable (GL_BLEND);	1470	glDisable (GL_BLEND);
		1471	}
		1472
		1473	void
		1474	draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
		1475	CODE:
		1476	{
		1477	static float color[16][3] = {
		1478	{ 0.00F, 0.00F, 0.00F },
		1479	{ 1.00F, 1.00F, 1.00F },
		1480	{ 0.00F, 0.00F, 0.55F },
		1481	{ 1.00F, 0.00F, 0.00F },
		1482
		1483	{ 1.00F, 0.54F, 0.00F },
		1484	{ 0.11F, 0.56F, 1.00F },
		1485	{ 0.93F, 0.46F, 0.00F },
		1486	{ 0.18F, 0.54F, 0.34F },
		1487
		1488	{ 0.56F, 0.73F, 0.56F },
		1489	{ 0.80F, 0.80F, 0.80F },
		1490	{ 0.55F, 0.41F, 0.13F },
		1491	{ 0.99F, 0.77F, 0.26F },
		1492
		1493	{ 0.74F, 0.65F, 0.41F },
		1494
		1495	{ 0.00F, 1.00F, 1.00F },
		1496	{ 1.00F, 0.00F, 1.00F },
		1497	{ 1.00F, 1.00F, 0.00F },
		1498	};
		1499
		1500	int x, y;
		1501
		1502	glEnable (GL_TEXTURE_2D);
		1503	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
		1504	glEnable (GL_BLEND);
		1505	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
		1506	glBegin (GL_QUADS);
		1507
		1508	for (y = 0; y < h; y++)
		1509	for (x = 0; x < w; x++)
		1510	{
		1511	unsigned char m = data [x + y * w];
		1512
		1513	if (m)
		1514	{
		1515	float *c = color [m & 15];
		1516
		1517	float tx1 = m & 0x40 ? 0.5 : 0.;
		1518	float tx2 = tx1 + 0.5;
		1519
		1520	glColor4f (c[0], c[1], c[2], 0.75);
		1521	glTexCoord2f (tx1, 0.); glVertex2i (x , y );
		1522	glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
		1523	glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
		1524	glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
		1525	}
		1526	}
		1527
		1528	glEnd ();
		1529	glDisable (GL_BLEND);
		1530	glDisable (GL_TEXTURE_2D);
		1531	}
		1532
		1533	void
		1534	fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh)
		1535	PPCODE:
		1536	{
		1537	int vx, vy;
		1538	int x, y;
		1539	int sw4 = (sw + 3) & ~3;
		1540	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
		1541	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
		1542
		1543	memset (darkness, 255, sw4 * sh);
		1544	SvPOK_only (darkness_sv);
		1545	SvCUR_set (darkness_sv, sw4 * sh);
		1546
		1547	vx = self->x + (self->w - sw + 1) / 2 - shift_x;
		1548	vy = self->y + (self->h - sh + 1) / 2 - shift_y;
		1549
		1550	for (y = 0; y < sh; y++)
		1551	if (0 <= y + vy && y + vy < self->rows)
		1552	{
		1553	maprow *row = self->row + (y + vy);
		1554
		1555	for (x = 0; x < sw; x++)
		1556	if (row->c0 <= x + vx && x + vx < row->c1)
		1557	{
		1558	mapcell *cell = row->col + (x + vx - row->c0);
		1559
		1560	darkness[y * sw4 + x] = cell->darkness < 0
		1561	? 255 - FOW_DARKNESS
		1562	: 255 - cell->darkness;
		1563	}
		1564	}
1278		1565
1279	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1280	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1281	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1282	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1283	}	1570	}
1284		1571
1285	SV *	1572	SV *
1286	get_rect (CFClient::Map self, int x0, int y0, int w, int h)	1573	get_rect (CFPlus::Map self, int x0, int y0, int w, int h)
1287	CODE:	1574	CODE:
1288	{	1575	{
1289	int x, y, x1, y1;	1576	int x, y, x1, y1;
1290	SV *data_sv = newSV (w * h * 7 + 5);	1577	SV *data_sv = newSV (w * h * 7 + 5);
1291	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1578	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1353	}	1640	}
1354	OUTPUT:	1641	OUTPUT:
1355	RETVAL	1642	RETVAL
1356		1643
1357	void	1644	void
1358	set_rect (CFClient::Map self, int x0, int y0, uint8_t *data)	1645	set_rect (CFPlus::Map self, int x0, int y0, uint8_t *data)
1359	PPCODE:	1646	PPCODE:
1360	{	1647	{
1361	int x, y, z;	1648	int x, y, z;
1362	int w, h;	1649	int w, h;
1363	int x1, y1;	1650	int x1, y1;
…		…
1412	}	1699	}
1413	}	1700	}
1414	}	1701	}
1415	}	1702	}
1416		1703
1417	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1418		1705
1419	CFClient::MixChunk	1706	CFPlus::MixChunk
1420	new_from_file (SV *class, char *path)	1707	new_from_file (SV *class, char *path)
1421	CODE:	1708	CODE:
1422	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1423	OUTPUT:	1710	OUTPUT:
1424	RETVAL	1711	RETVAL
1425		1712
1426	void	1713	void
1427	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1428	CODE:	1715	CODE:
1429	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1430		1717
1431	int	1718	int
1432	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1433	CODE:	1720	CODE:
1434	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1435	OUTPUT:	1722	OUTPUT:
1436	RETVAL	1723	RETVAL
1437		1724
1438	int	1725	int
1439	play (CFClient::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)	1726	play (CFPlus::MixChunk self, int channel = -1, int loops = 0, int ticks = -1)
1440	CODE:	1727	CODE:
1441	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1442	OUTPUT:	1729	OUTPUT:
1443	RETVAL	1730	RETVAL
1444		1731
1445	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1446		1733
1447	int	1734	int
1448	volume (int volume = -1)	1735	volume (int volume = -1)
1449	CODE:	1736	CODE:
1450	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1451	OUTPUT:	1738	OUTPUT:
1452	RETVAL	1739	RETVAL
1453		1740
1454	CFClient::MixMusic	1741	CFPlus::MixMusic
1455	new_from_file (SV *class, char *path)	1742	new_from_file (SV *class, char *path)
1456	CODE:	1743	CODE:
1457	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1458	OUTPUT:	1745	OUTPUT:
1459	RETVAL	1746	RETVAL
1460		1747
1461	void	1748	void
1462	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1463	CODE:	1750	CODE:
1464	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1465		1752
1466	int	1753	int
1467	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1468	CODE:	1755	CODE:
1469	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1470	OUTPUT:	1757	OUTPUT:
1471	RETVAL	1758	RETVAL
1472		1759
1473	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1474		1761
1475	BOOT:	1762	BOOT:
1476	{	1763	{
1477	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1478	static const struct {	1765	static const struct {
1479	const char *name;	1766	const char *name;
1480	IV iv;	1767	IV iv;
1481	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1482	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
1483	const_iv (GL_COLOR_MATERIAL),	1770	const_iv (GL_COLOR_MATERIAL),
1484	const_iv (GL_SMOOTH),	1771	const_iv (GL_SMOOTH),
1485	const_iv (GL_FLAT),	1772	const_iv (GL_FLAT),
1486	const_iv (GL_DITHER),	1773	const_iv (GL_DITHER),
1487	const_iv (GL_BLEND),	1774	const_iv (GL_BLEND),
		1775	const_iv (GL_CULL_FACE),
1488	const_iv (GL_SCISSOR_TEST),	1776	const_iv (GL_SCISSOR_TEST),
		1777	const_iv (GL_DEPTH_TEST),
		1778	const_iv (GL_ALPHA_TEST),
		1779	const_iv (GL_NORMALIZE),
		1780	const_iv (GL_RESCALE_NORMAL),
		1781	const_iv (GL_FRONT),
		1782	const_iv (GL_BACK),
1489	const_iv (GL_AND),	1783	const_iv (GL_AND),
1490	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1491	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1492	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1493	const_iv (GL_SRC_ALPHA_SATURATE),	1787	const_iv (GL_DST_ALPHA),
1494	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1495	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1790	const_iv (GL_SRC_ALPHA_SATURATE),
1496	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1497	const_iv (GL_RGBA),	1792	const_iv (GL_RGBA),
		1793	const_iv (GL_RGBA4),
		1794	const_iv (GL_RGBA8),
		1795	const_iv (GL_RGB5_A1),
1498	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
		1797	const_iv (GL_UNSIGNED_SHORT),
		1798	const_iv (GL_UNSIGNED_INT),
1499	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
		1800	const_iv (GL_INTENSITY),
1500	const_iv (GL_LUMINANCE),	1801	const_iv (GL_LUMINANCE),
		1802	const_iv (GL_LUMINANCE_ALPHA),
1501	const_iv (GL_FLOAT),	1803	const_iv (GL_FLOAT),
1502	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1804	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1503	const_iv (GL_COMPILE),	1805	const_iv (GL_COMPILE),
1504	const_iv (GL_TEXTURE_1D),	1806	const_iv (GL_TEXTURE_1D),
1505	const_iv (GL_TEXTURE_2D),	1807	const_iv (GL_TEXTURE_2D),
…		…
1507	const_iv (GL_TEXTURE_MAG_FILTER),	1809	const_iv (GL_TEXTURE_MAG_FILTER),
1508	const_iv (GL_TEXTURE_MIN_FILTER),	1810	const_iv (GL_TEXTURE_MIN_FILTER),
1509	const_iv (GL_TEXTURE_ENV_MODE),	1811	const_iv (GL_TEXTURE_ENV_MODE),
1510	const_iv (GL_TEXTURE_WRAP_S),	1812	const_iv (GL_TEXTURE_WRAP_S),
1511	const_iv (GL_TEXTURE_WRAP_T),	1813	const_iv (GL_TEXTURE_WRAP_T),
		1814	const_iv (GL_REPEAT),
1512	const_iv (GL_CLAMP),	1815	const_iv (GL_CLAMP),
1513	const_iv (GL_REPEAT),	1816	const_iv (GL_CLAMP_TO_EDGE),
1514	const_iv (GL_NEAREST),	1817	const_iv (GL_NEAREST),
1515	const_iv (GL_LINEAR),	1818	const_iv (GL_LINEAR),
1516	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1819	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1517	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1820	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1518	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1821	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1519	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1822	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1520	const_iv (GL_GENERATE_MIPMAP),	1823	const_iv (GL_GENERATE_MIPMAP),
1521	const_iv (GL_MODULATE),	1824	const_iv (GL_MODULATE),
1522	const_iv (GL_DECAL),	1825	const_iv (GL_DECAL),
1523	const_iv (GL_REPLACE),	1826	const_iv (GL_REPLACE),
		1827	const_iv (GL_DEPTH_BUFFER_BIT),
1524	const_iv (GL_COLOR_BUFFER_BIT),	1828	const_iv (GL_COLOR_BUFFER_BIT),
1525	const_iv (GL_PROJECTION),	1829	const_iv (GL_PROJECTION),
1526	const_iv (GL_MODELVIEW),	1830	const_iv (GL_MODELVIEW),
1527	const_iv (GL_COLOR_LOGIC_OP),	1831	const_iv (GL_COLOR_LOGIC_OP),
1528	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1529	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1530	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1531	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1532	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
		1838	const_iv (GL_LINE_LOOP),
1533	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1534	const_iv (GL_LINE_LOOP),	1840	const_iv (GL_QUAD_STRIP),
		1841	const_iv (GL_TRIANGLES),
		1842	const_iv (GL_TRIANGLE_STRIP),
		1843	const_iv (GL_TRIANGLE_FAN),
1535	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1844	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1536	const_iv (GL_FASTEST),	1845	const_iv (GL_FASTEST),
		1846	const_iv (GL_V2F),
		1847	const_iv (GL_V3F),
		1848	const_iv (GL_T2F_V3F),
		1849	const_iv (GL_T2F_N3F_V3F),
1537	# undef const_iv	1850	# undef const_iv
1538	};	1851	};
1539		1852
1540	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )	1853	for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
1541	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1854	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1542	}	1855	}
1543		1856
		1857	char *
		1858	gl_vendor ()
		1859	CODE:
		1860	RETVAL = (char *)glGetString (GL_VENDOR);
		1861	OUTPUT:
		1862	RETVAL
		1863
		1864	char *
		1865	gl_version ()
		1866	CODE:
		1867	RETVAL = (char *)glGetString (GL_VERSION);
		1868	OUTPUT:
		1869	RETVAL
		1870
		1871	char *
		1872	gl_extensions ()
		1873	CODE:
		1874	RETVAL = (char *)glGetString (GL_EXTENSIONS);
		1875	OUTPUT:
		1876	RETVAL
		1877
1544	int glGetError ()	1878	int glGetError ()
		1879
		1880	void glFinish ()
1545		1881
1546	void glClear (int mask)	1882	void glClear (int mask)
1547		1883
1548	void glClearColor (float r, float g, float b, float a = 1.0)	1884	void glClearColor (float r, float g, float b, float a = 1.0)
1549	PROTOTYPE: @	1885	PROTOTYPE: @
…		…
1556		1892
1557	void glHint (int target, int mode)	1893	void glHint (int target, int mode)
1558		1894
1559	void glBlendFunc (int sfactor, int dfactor)	1895	void glBlendFunc (int sfactor, int dfactor)
1560		1896
		1897	void glBlendFuncSeparate (int sa, int da, int saa, int daa)
		1898	CODE:
		1899	gl_BlendFuncSeparate (sa, da, saa, daa);
		1900
		1901	void glDepthMask (int flag)
		1902
1561	void glLogicOp (int opcode)	1903	void glLogicOp (int opcode)
1562		1904
1563	void glColorMask (int red, int green, int blue, int alpha)	1905	void glColorMask (int red, int green, int blue, int alpha)
1564		1906
1565	void glMatrixMode (int mode)	1907	void glMatrixMode (int mode)
…		…
1568		1910
1569	void glPopMatrix ()	1911	void glPopMatrix ()
1570		1912
1571	void glLoadIdentity ()	1913	void glLoadIdentity ()
1572		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
		1918
1573	# near and far are due to microsofts buggy c compiler	1919	# near_ and far_ are due to microsofts buggy "c" compiler
		1920	void glFrustum (double left, double right, double bottom, double top, double near_, double far_)
		1921
		1922	# near_ and far_ are due to microsofts buggy "c" compiler
1574	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)	1923	void glOrtho (double left, double right, double bottom, double top, double near_, double far_)
1575		1924
1576	void glViewport (int x, int y, int width, int height)	1925	void glViewport (int x, int y, int width, int height)
1577		1926
1578	void glScissor (int x, int y, int width, int height)	1927	void glScissor (int x, int y, int width, int height)
…		…
1593		1942
1594	void glEnd ()	1943	void glEnd ()
1595		1944
1596	void glColor (float r, float g, float b, float a = 1.0)	1945	void glColor (float r, float g, float b, float a = 1.0)
1597	PROTOTYPE: @	1946	PROTOTYPE: @
		1947	ALIAS:
		1948	glColor_premultiply = 1
1598	CODE:	1949	CODE:
1599	glColor4ub (MIN ((int)(r * 255.f), 255),	1950	if (ix)
1600	MIN ((int)(g * 255.f), 255),	1951	{
1601	MIN ((int)(b * 255.f), 255),	1952	r *= a;
1602	MIN ((int)(a * 255.f), 255));	1953	g *= a;
		1954	b *= a;
		1955	}
		1956	// microsoft visual "c" rounds instead of truncating...
		1957	glColor4f (r, g, b, a);
		1958
		1959	void glInterleavedArrays (int format, int stride, char *data)
		1960
		1961	void glDrawElements (int mode, int count, int type, char *indices)
		1962
		1963	# 1.2 void glDrawRangeElements (int mode, int start, int end
		1964
		1965	void glRasterPos (float x, float y, float z = 0.)
		1966	CODE:
		1967	glRasterPos3f (0, 0, z);
		1968	glBitmap (0, 0, 0, 0, x, y, 0);
1603		1969
1604	void glVertex (float x, float y, float z = 0.)	1970	void glVertex (float x, float y, float z = 0.)
1605	CODE:	1971	CODE:
1606	glVertex3f (x, y, z);	1972	glVertex3f (x, y, z);
1607		1973
…		…
1619		1985
1620	void glBindTexture (int target, int name)	1986	void glBindTexture (int target, int name)
1621		1987
1622	void glConvolutionParameter (int target, int pname, float params)	1988	void glConvolutionParameter (int target, int pname, float params)
1623	CODE:	1989	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1990	if (gl.ConvolutionParameterf)
		1991	gl.ConvolutionParameterf (target, pname, params);
1625		1992
1626	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)	1993	void glConvolutionFilter2D (int target, int internalformat, int width, int height, int format, int type, char *data)
1627	CODE:	1994	CODE:
1628	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1995	if (gl.ConvolutionFilter2D)
1629	(target, internalformat, width, height, format, type, data));	1996	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1630		1997
1631	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)	1998	void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
1632	CODE:	1999	CODE:
1633	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2000	if (gl.SeparableFilter2D)
1634	(target, internalformat, width, height, format, type, row, column));	2001	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1635		2002
1636	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)	2003	void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data)
1637		2004
1638	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)	2005	void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
1639		2006
1640	void glRasterPos (int x, int y)	2007	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1641	CODE:
1642	glRasterPos2i (x, y);
1643		2008
1644	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)	2009	void glCopyPixels (int x, int y, int width, int height, int type = GL_COLOR)
1645		2010
1646	int glGenTexture ()	2011	int glGenTexture ()
1647	CODE:	2012	CODE:

Diff Legend

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