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.80 by root, Sun May 14 22:58:24 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);
		126	#ifdef FC_HINT_STYLE
		127	FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL);
		128	#endif
89	FcPatternAddBool (pattern, FC_AUTOHINT, 1);	129	FcPatternAddBool (pattern, FC_AUTOHINT, 0);
90	}	130	}
91		131
92	static void	132	static void
93	layout_update_font (CFClient__Layout self)	133	layout_update_font (CFPlus__Layout self)
94	{	134	{
95	/* 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
96	* reasonably well with bitstream vera	136	* reasonably well with bitstream vera
97	*/	137	*/
98	PangoFontDescription *font = self->font ? self->font : default_font;	138	PangoFontDescription *font = self->font ? self->font : default_font;
…		…
102		142
103	pango_layout_set_font_description (self->pl, font);	143	pango_layout_set_font_description (self->pl, font);
104	}	144	}
105		145
106	static void	146	static void
107	layout_get_pixel_size (CFClient__Layout self, int *w, int *h)	147	layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
108	{	148	{
		149	PangoRectangle rect;
		150
		151	// get_pixel_* wrongly rounds down
109	pango_layout_get_pixel_size (self->pl, w, h);	152	pango_layout_get_extents (self->pl, 0, &rect);
110		153
111	if (!*w) *w = 1;	154	rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
112	if (!*h) *h = 1;	155	rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
113		156
114	*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;
115	}	162	}
116		163
117	typedef uint16_t mapface;	164	typedef uint16_t mapface;
118		165
119	typedef struct {	166	typedef struct {
…		…
142	int texs;	189	int texs;
143	maptex *tex;	190	maptex *tex;
144		191
145	int32_t rows;	192	int32_t rows;
146	maprow *row;	193	maprow *row;
147	} *CFClient__Map;	194	} *CFPlus__Map;
148		195
149	static char *	196	static char *
150	prepend (char *ptr, int sze, int inc)	197	prepend (char *ptr, int sze, int inc)
151	{	198	{
152	char *p;	199	char *p;
…		…
170		217
171	#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))
172	#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))
173		220
174	static maprow *	221	static maprow *
175	map_get_row (CFClient__Map self, int y)	222	map_get_row (CFPlus__Map self, int y)
176	{	223	{
177	if (0 > y)	224	if (0 > y)
178	{	225	{
179	int extend = - y + MAP_EXTEND_Y;	226	int extend = - y + MAP_EXTEND_Y;
180	Prepend (maprow, self->row, self->rows, extend);	227	Prepend (maprow, self->row, self->rows, extend);
…		…
218		265
219	return row->col + (x - row->c0);	266	return row->col + (x - row->c0);
220	}	267	}
221		268
222	static mapcell *	269	static mapcell *
223	map_get_cell (CFClient__Map self, int x, int y)	270	map_get_cell (CFPlus__Map self, int x, int y)
224	{	271	{
225	return row_get_cell (map_get_row (self, y), x);	272	return row_get_cell (map_get_row (self, y), x);
226	}	273	}
227		274
228	static void	275	static void
229	map_clear (CFClient__Map self)	276	map_clear (CFPlus__Map self)
230	{	277	{
231	int r;	278	int r;
232		279
233	for (r = 0; r < self->rows; r++)	280	for (r = 0; r < self->rows; r++)
234	Safefree (self->row[r].col);	281	Safefree (self->row[r].col);
…		…
242	self->row = 0;	289	self->row = 0;
243	self->rows = 0;	290	self->rows = 0;
244	}	291	}
245		292
246	static void	293	static void
247	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)
248	{	295	{
249	int x, y;	296	int x, y;
250	maprow *row;	297	maprow *row;
251		298
252	for (y = y0; y < y0 + h; y++)	299	for (y = y0; y < y0 + h; y++)
…		…
292	ev.data2 = 0;	339	ev.data2 = 0;
293		340
294	SDL_PushEvent ((SDL_Event *)&ev);	341	SDL_PushEvent ((SDL_Event *)&ev);
295	}	342	}
296		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
297	MODULE = CFClient PACKAGE = CFClient	361	MODULE = CFPlus PACKAGE = CFPlus
298		362
299	PROTOTYPES: ENABLE	363	PROTOTYPES: ENABLE
300		364
301	BOOT:	365	BOOT:
302	{	366	{
303	HV *stash = gv_stashpv ("CFClient", 1);	367	HV *stash = gv_stashpv ("CFPlus", 1);
304	static const struct {	368	static const struct {
305	const char *name;	369	const char *name;
306	IV iv;	370	IV iv;
307	} *civ, const_iv[] = {	371	} *civ, const_iv[] = {
308	# define const_iv(name) { # name, (IV)name }	372	# define const_iv(name) { # name, (IV)name }
…		…
409		473
410	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; )
411	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	475	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
412	}	476	}
413		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
414	void	489	void
415	pango_init ()	490	pango_init ()
416	CODE:	491	CODE:
417	{	492	{
418	// delayed, so it can pick up new fonts added by AddFontResourceEx
419	ft2_fontmap = pango_ft2_font_map_new ();	493	opengl_fontmap = pango_opengl_font_map_new ();
420	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);
421	ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);	495	opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
422
423	cairo_fontmap = pango_cairo_font_map_get_default ();
424	cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
425	}	496	}
426		497
427	int	498	int
428	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO)	499	SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
429		500
430	void	501	void
431	SDL_Quit ()	502	SDL_Quit ()
432		503
433	void	504	void
…		…
439	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);	510	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, 5);
440	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);	511	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, 5);
441	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);	512	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, 5);
442	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);	513	SDL_GL_SetAttribute (SDL_GL_ALPHA_SIZE, 1);
443		514
		515	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);
		516	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);
		517
444	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);	518	SDL_GL_SetAttribute (SDL_GL_ACCUM_RED_SIZE, 0);
445	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);	519	SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
446	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);	520	SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE, 0);
447	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);	521	SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
448		522
449	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	523	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
		524	#if SDL_VERSION_ATLEAST(1,2,10)
450	SDL_GL_SetAttribute (SDL_GL_BUFFER_SIZE, 15);	525	SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
451	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 0);	526	SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
		527	#endif
452		528
453	SDL_EnableUNICODE (1);	529	SDL_EnableUNICODE (1);
454	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);	530	SDL_EnableKeyRepeat (SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
455		531
456	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);	532	m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
…		…
465		541
466	++m;	542	++m;
467	}	543	}
468	}	544	}
469		545
		546	char *
		547	SDL_GetError ()
		548
470	int	549	int
471	SDL_SetVideoMode (int w, int h, int fullscreen)	550	SDL_SetVideoMode (int w, int h, int fullscreen)
472	CODE:	551	CODE:
473	RETVAL = !!SDL_SetVideoMode (	552	RETVAL = !!SDL_SetVideoMode (
474	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)	553	w, h, 0, SDL_OPENGL | (fullscreen ? SDL_FULLSCREEN : 0)
475	);	554	);
		555	if (RETVAL)
		556	{
476	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	}
477	OUTPUT:	562	OUTPUT:
478	RETVAL	563	RETVAL
479		564
480	void	565	void
481	SDL_GL_SwapBuffers ()	566	SDL_GL_SwapBuffers ()
		567
		568	char *
		569	SDL_GetKeyName (int sym)
482		570
483	void	571	void
484	SDL_PollEvent ()	572	SDL_PollEvent ()
485	PPCODE:	573	PPCODE:
486	{	574	{
…		…
505	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);	593	hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
506	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);	594	hv_store (hv, "state", 5, newSViv (ev.active.state), 0);
507	break;	595	break;
508		596
509	case SDL_MOUSEMOTION:	597	case SDL_MOUSEMOTION:
		598	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		599
510	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);	600	hv_store (hv, "state", 5, newSViv (ev.motion.state), 0);
511	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);	601	hv_store (hv, "x", 1, newSViv (ev.motion.x), 0);
512	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);	602	hv_store (hv, "y", 1, newSViv (ev.motion.y), 0);
513	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);	603	hv_store (hv, "xrel", 4, newSViv (ev.motion.xrel), 0);
514	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);	604	hv_store (hv, "yrel", 4, newSViv (ev.motion.yrel), 0);
515	break;	605	break;
516		606
517	case SDL_MOUSEBUTTONDOWN:	607	case SDL_MOUSEBUTTONDOWN:
518	case SDL_MOUSEBUTTONUP:	608	case SDL_MOUSEBUTTONUP:
		609	hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0);
		610
519	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);	611	hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
520	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);	612	hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
521	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);	613	hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
522	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);	614	hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
523	break;	615	break;
…		…
527	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);	619	hv_store (hv, "data1", 5, newSViv ((IV)ev.user.data1), 0);
528	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);	620	hv_store (hv, "data2", 5, newSViv ((IV)ev.user.data2), 0);
529	break;	621	break;
530	}	622	}
531		623
532	XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));	624	XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("CFPlus::UI::Event", 1))));
533	}	625	}
534	}	626	}
535		627
536	int	628	int
537	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)
…		…
550	CODE:	642	CODE:
551	#ifndef _WIN32	643	#ifndef _WIN32
552	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));	644	setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
553	#endif	645	#endif
554		646
555	char *
556	gl_version ()
557	CODE:
558	RETVAL = (char *)glGetString (GL_VERSION);
559	OUTPUT:
560	RETVAL
561
562	char *
563	gl_extensions ()
564	CODE:
565	RETVAL = (char *)glGetString (GL_EXTENSIONS);
566	OUTPUT:
567	RETVAL
568
569	void	647	void
570	add_font (char *file)	648	add_font (char *file)
571	CODE:	649	CODE:
572	FcConfigAppFontAddFile (0, (const FcChar8 *)file); /* no idea wether this is required */	650	FcConfigAppFontAddFile (0, (const FcChar8 *)file);
573	#ifdef _WIN32
574	// cairo... sigh... requires win2000
575	AddFontResourceEx (file, FR_PRIVATE, 0);
576	#endif
577		651
578	void	652	void
579	load_image_inline (SV *image_)	653	load_image_inline (SV *image_)
580	ALIAS:	654	ALIAS:
581	load_image_file = 1	655	load_image_file = 1
…		…
623		697
624	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);	698	surface2 = SDL_ConvertSurface (surface, &fmt, SDL_SWSURFACE);
625		699
626	assert (surface2->pitch == surface2->w * 4);	700	assert (surface2->pitch == surface2->w * 4);
627		701
		702	SDL_LockSurface (surface2);
628	EXTEND (SP, 5);	703	EXTEND (SP, 6);
629	PUSHs (sv_2mortal (newSViv (surface2->w)));	704	PUSHs (sv_2mortal (newSViv (surface2->w)));
630	PUSHs (sv_2mortal (newSViv (surface2->h)));	705	PUSHs (sv_2mortal (newSViv (surface2->h)));
631	SDL_LockSurface (surface2);
632	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));	706	PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch)));
633	SDL_UnlockSurface (surface2);
634	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)));
635	PUSHs (sv_2mortal (newSViv (GL_RGBA)));	708	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
636	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));	709	PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
		710	SDL_UnlockSurface (surface2);
637		711
638	SDL_FreeSurface (surface);	712	SDL_FreeSurface (surface);
639	SDL_FreeSurface (surface2);	713	SDL_FreeSurface (surface2);
640	}	714	}
641		715
…		…
665	}	739	}
666		740
667	void	741	void
668	error (char *message)	742	error (char *message)
669	CODE:	743	CODE:
		744	fprintf (stderr, "ERROR: %s\n", message);
670	#ifdef _WIN32	745	#ifdef _WIN32
671	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	746	MessageBox (0, message, "Crossfire+ Error", MB_OK | MB_ICONERROR);
672	#else
673	fprintf (stderr, "ERROR: %s\n", message);
674	#endif	747	#endif
675		748
676	void	749	void
677	fatal (char *message)	750	fatal (char *message)
678	CODE:	751	CODE:
		752	fprintf (stderr, "FATAL: %s\n", message);
679	#ifdef _WIN32	753	#ifdef _WIN32
680	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR | MB_SETFOREGROUND);	754	MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
681	#else
682	fprintf (stderr, "FATAL: %s\n", message);
683	#endif	755	#endif
684	exit (1);	756	_exit (1);
685		757
		758	void
		759	_exit (int retval)
		760	CODE:
		761	_exit (retval);
		762
686	MODULE = CFClient PACKAGE = CFClient::Font	763	MODULE = CFPlus PACKAGE = CFPlus::Font
687		764
688	CFClient::Font	765	CFPlus::Font
689	new_from_file (SV *class, char *path, int id = 0)	766	new_from_file (SV *class, char *path, int id = 0)
690	CODE:	767	CODE:
691	{	768	{
692	int count;	769	int count;
693	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);	770	FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
…		…
696	}	773	}
697	OUTPUT:	774	OUTPUT:
698	RETVAL	775	RETVAL
699		776
700	void	777	void
701	DESTROY (CFClient::Font self)	778	DESTROY (CFPlus::Font self)
702	CODE:	779	CODE:
703	pango_font_description_free (self);	780	pango_font_description_free (self);
704		781
705	void	782	void
706	make_default (CFClient::Font self)	783	make_default (CFPlus::Font self)
707	CODE:	784	CODE:
708	default_font = self;	785	default_font = self;
709		786
710	MODULE = CFClient PACKAGE = CFClient::Layout	787	MODULE = CFPlus PACKAGE = CFPlus::Layout
711		788
712	CFClient::Layout	789	void
713	new (SV *class, int rgba = 0)	790	reset_glyph_cache ()
		791	CODE:
		792	tc_clear ();
		793
		794	CFPlus::Layout
		795	new (SV *class)
714	CODE:	796	CODE:
715	New (0, RETVAL, 1, struct cf_layout);	797	New (0, RETVAL, 1, struct cf_layout);
716		798
717	RETVAL->pl = pango_layout_new (rgba ? cairo_context : ft2_context);	799	RETVAL->pl = pango_layout_new (opengl_context);
718	RETVAL->rgba = rgba;
719	RETVAL->r = 1.;	800	RETVAL->r = 1.;
720	RETVAL->g = 1.;	801	RETVAL->g = 1.;
721	RETVAL->b = 1.;	802	RETVAL->b = 1.;
722	RETVAL->a = 1.;	803	RETVAL->a = 1.;
723	RETVAL->base_height = MIN_FONT_HEIGHT;	804	RETVAL->base_height = MIN_FONT_HEIGHT;
…		…
727	layout_update_font (RETVAL);	808	layout_update_font (RETVAL);
728	OUTPUT:	809	OUTPUT:
729	RETVAL	810	RETVAL
730		811
731	void	812	void
732	DESTROY (CFClient::Layout self)	813	DESTROY (CFPlus::Layout self)
733	CODE:	814	CODE:
734	g_object_unref (self->pl);	815	g_object_unref (self->pl);
735	Safefree (self);	816	Safefree (self);
736		817
737	int
738	is_rgba (CFClient::Layout self)
739	CODE:
740	RETVAL = self->rgba;
741	OUTPUT:
742	RETVAL
743
744	void	818	void
745	set_text (CFClient::Layout self, SV *text_)	819	set_text (CFPlus::Layout self, SV *text_)
746	CODE:	820	CODE:
747	{	821	{
748	STRLEN textlen;	822	STRLEN textlen;
749	char *text = SvPVutf8 (text_, textlen);	823	char *text = SvPVutf8 (text_, textlen);
750		824
751	pango_layout_set_text (self->pl, text, textlen);	825	pango_layout_set_text (self->pl, text, textlen);
752	}	826	}
753		827
754	void	828	void
755	set_markup (CFClient::Layout self, SV *text_)	829	set_markup (CFPlus::Layout self, SV *text_)
756	CODE:	830	CODE:
757	{	831	{
758	STRLEN textlen;	832	STRLEN textlen;
759	char *text = SvPVutf8 (text_, textlen);	833	char *text = SvPVutf8 (text_, textlen);
760		834
761	pango_layout_set_markup (self->pl, text, textlen);	835	pango_layout_set_markup (self->pl, text, textlen);
762	}	836	}
763		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
764	SV *	923	SV *
765	get_text (CFClient::Layout self)	924	get_text (CFPlus::Layout self)
766	CODE:	925	CODE:
767	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);	926	RETVAL = newSVpv (pango_layout_get_text (self->pl), 0);
768	SvUTF8_on (RETVAL);	927	sv_utf8_decode (RETVAL);
769	OUTPUT:	928	OUTPUT:
770	RETVAL	929	RETVAL
771		930
772	void	931	void
773	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.)
774	CODE:	933	CODE:
775	self->r = r;	934	self->r = r;
776	self->g = g;	935	self->g = g;
777	self->b = b;	936	self->b = b;
778	self->a = a;	937	self->a = a;
779		938
780	void	939	void
781	set_font (CFClient::Layout self, CFClient::Font font = 0)	940	set_font (CFPlus::Layout self, CFPlus::Font font = 0)
782	CODE:	941	CODE:
783	if (self->font != font)	942	if (self->font != font)
784	{	943	{
785	self->font = font;	944	self->font = font;
786	layout_update_font (self);	945	layout_update_font (self);
787	}	946	}
788		947
789	void	948	void
790	set_height (CFClient::Layout self, int base_height)	949	set_height (CFPlus::Layout self, int base_height)
791	CODE:	950	CODE:
792	if (self->base_height != base_height)	951	if (self->base_height != base_height)
793	{	952	{
794	self->base_height = base_height;	953	self->base_height = base_height;
795	layout_update_font (self);	954	layout_update_font (self);
796	}	955	}
797		956
798	void	957	void
799	set_width (CFClient::Layout self, int max_width = -1)	958	set_width (CFPlus::Layout self, int max_width = -1)
800	CODE:	959	CODE:
801	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);
802		961
803	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
804	size (CFClient::Layout self)	988	size (CFPlus::Layout self)
805	PPCODE:	989	PPCODE:
806	{	990	{
807	int w, h;	991	int w, h;
808		992
809	layout_get_pixel_size (self, &w, &h);	993	layout_get_pixel_size (self, &w, &h);
…		…
812	PUSHs (sv_2mortal (newSViv (w)));	996	PUSHs (sv_2mortal (newSViv (w)));
813	PUSHs (sv_2mortal (newSViv (h)));	997	PUSHs (sv_2mortal (newSViv (h)));
814	}	998	}
815		999
816	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
817	xy_to_index (CFClient::Layout self, int x, int y)	1013	xy_to_index (CFPlus::Layout self, int x, int y)
818	CODE:	1014	CODE:
819	{	1015	{
820	int index, trailing;	1016	int index, trailing;
821	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);
822	RETVAL = index;	1018	RETVAL = index;
823	}	1019	}
824	OUTPUT:	1020	OUTPUT:
825	RETVAL	1021	RETVAL
826		1022
827	void	1023	void
828	cursor_pos (CFClient::Layout self, int index)	1024	cursor_pos (CFPlus::Layout self, int index)
829	PPCODE:	1025	PPCODE:
830	{	1026	{
831	PangoRectangle strong_pos;	1027	PangoRectangle strong_pos;
832	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);	1028	pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0);
833		1029
…		…
836	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));	1032	PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
837	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));	1033	PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
838	}	1034	}
839		1035
840	void	1036	void
841	render (CFClient::Layout self)	1037	render (CFPlus::Layout self, float x, float y, int flags = 0)
842	PPCODE:	1038	PPCODE:
843	{	1039	pango_opengl_render_layout_subpixel (
844	SV *retval;	1040	self->pl,
845	int w, h;	1041	x * PANGO_SCALE, y * PANGO_SCALE,
		1042	self->r, self->g, self->b, self->a,
		1043	flags
		1044	);
846		1045
847	layout_get_pixel_size (self, &w, &h);	1046	MODULE = CFPlus PACKAGE = CFPlus::Texture
848		1047
849	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)
850	{	1056	{
851	cairo_surface_t *surface;	1057	int nw = minpot (ow);
852	cairo_t *cairo;	1058	int nh = minpot (oh);
853		1059
854	retval = newSV (w * h * 4);	1060	if (nw != ow || nh != oh)
855	SvPOK_only (retval);
856	SvCUR_set (retval, w * h * 4);
857
858	memset (SvPVX (retval), 0, w * h * 4);
859
860	surface = cairo_image_surface_create_for_data (
861	(void*)SvPVX (retval), CAIRO_FORMAT_ARGB32, w, h, w * 4);
862	cairo = cairo_create (surface);
863	cairo_set_source_rgba (cairo, self->r, self->g, self->b, self->a);
864
865	pango_cairo_show_layout (cairo, self->pl);
866
867	cairo_destroy (cairo);
868	cairo_surface_destroy (surface);
869
870	// what a mess, and its premultiplied, too :(
871	{	1061	{
872	uint32_t *p = (uint32_t *)SvPVX (retval);	1062	if (SvOK (data_))
873	uint32_t *e = p + w * h;
874
875	while (p < e)
876	{	1063	{
877	uint32_t rgba = *p;	1064	STRLEN datalen;
878	rgba = (rgba >> 24) | (rgba << 8);	1065	char *data = SvPVbyte (data_, datalen);
879	rgba = SDL_SwapBE32 (rgba);	1066	int bpp = datalen / (ow * oh);
880	*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_);
881	}	1077	}
		1078
		1079	sv_setiv (w_, nw);
		1080	sv_setiv (h_, nh);
882	}	1081	}
883
884	EXTEND (SP, 5);
885	PUSHs (sv_2mortal (newSViv (w)));
886	PUSHs (sv_2mortal (newSViv (h)));
887	PUSHs (sv_2mortal (retval));
888	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
889	PUSHs (sv_2mortal (newSViv (GL_RGBA)));
890	}	1082	}
891	else
892	{
893	FT_Bitmap bitmap;
894
895	retval = newSV (w * h);
896	SvPOK_only (retval);
897	SvCUR_set (retval, w * h);
898
899	bitmap.rows = h;
900	bitmap.width = w;
901	bitmap.pitch = w;
902	bitmap.buffer = (unsigned char*)SvPVX (retval);
903	bitmap.num_grays = 256;
904	bitmap.pixel_mode = FT_PIXEL_MODE_GRAY;
905
906	memset (bitmap.buffer, 0, w * h);
907
908	pango_ft2_render_layout (&bitmap, self->pl, 0 * PANGO_SCALE, 0 * PANGO_SCALE);
909
910	EXTEND (SP, 5);
911	PUSHs (sv_2mortal (newSViv (w)));
912	PUSHs (sv_2mortal (newSViv (h)));
913	PUSHs (sv_2mortal (retval));
914	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
915	PUSHs (sv_2mortal (newSViv (GL_ALPHA)));
916	}
917	}	1083	}
918		1084
919	MODULE = CFClient PACKAGE = CFClient::Texture
920
921	void	1085	void
922	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.)
923	PROTOTYPE: $$$;$$	1087	PROTOTYPE: $$$;$$
924	ALIAS:	1088	ALIAS:
925	draw_quad_alpha = 1	1089	draw_quad_alpha = 1
926	draw_quad_alpha_premultiplied = 2	1090	draw_quad_alpha_premultiplied = 2
927	CODE:	1091	CODE:
928	{	1092	{
929	HV *hv = (HV *)SvRV (self);	1093	HV *hv = (HV *)SvRV (self);
930	float s = SvNV (*hv_fetch (hv, "s", 1, 1));	1094	float s = SvNV (*hv_fetch (hv, "s", 1, 1));
931	float t = SvNV (*hv_fetch (hv, "t", 1, 1));	1095	float t = SvNV (*hv_fetch (hv, "t", 1, 1));
932	int name = SvIV (*hv_fetch (hv, "name", 4, 1));	1096	int name = SvIV (*hv_fetch (hv, "name", 4, 1));
933	int wrap_mode = SvIV (*hv_fetch (hv, "wrap_mode", 9, 1));
934		1097
935	if (items < 5)	1098	if (items < 5)
936	{	1099	{
937	w = SvNV (*hv_fetch (hv, "w", 1, 1));	1100	w = SvNV (*hv_fetch (hv, "w", 1, 1));
938	h = SvNV (*hv_fetch (hv, "h", 1, 1));	1101	h = SvNV (*hv_fetch (hv, "h", 1, 1));
939	}	1102	}
940		1103
941	if (ix)	1104	if (ix)
942	{	1105	{
943	glEnable (GL_BLEND);	1106	glEnable (GL_BLEND);
		1107
		1108	if (ix == 2)
944	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);
945	}	1116	}
946		1117
947	glBindTexture (GL_TEXTURE_2D, name);	1118	glBindTexture (GL_TEXTURE_2D, name);
948
949	if (wrap_mode)
950	{
951	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
952	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
953	}
954		1119
955	glBegin (GL_QUADS);	1120	glBegin (GL_QUADS);
956	glTexCoord2f (0, 0); glVertex2f (x , y );	1121	glTexCoord2f (0, 0); glVertex2f (x , y );
957	glTexCoord2f (0, t); glVertex2f (x , y + h);	1122	glTexCoord2f (0, t); glVertex2f (x , y + h);
958	glTexCoord2f (s, t); glVertex2f (x + w, y + h);	1123	glTexCoord2f (s, t); glVertex2f (x + w, y + h);
959	glTexCoord2f (s, 0); glVertex2f (x + w, y );	1124	glTexCoord2f (s, 0); glVertex2f (x + w, y );
960	glEnd ();	1125	glEnd ();
961		1126
962	if (ix)	1127	if (ix)
		1128	{
		1129	glDisable (GL_ALPHA_TEST);
963	glDisable (GL_BLEND);	1130	glDisable (GL_BLEND);
		1131	}
964	}	1132	}
965		1133
966	MODULE = CFClient PACKAGE = CFClient::Map	1134	MODULE = CFPlus PACKAGE = CFPlus::Map
967		1135
968	CFClient::Map	1136	CFPlus::Map
969	new (SV *class, int map_width, int map_height)	1137	new (SV *class, int map_width, int map_height)
970	CODE:	1138	CODE:
971	New (0, RETVAL, 1, struct map);	1139	New (0, RETVAL, 1, struct map);
972	RETVAL->x = 0;	1140	RETVAL->x = 0;
973	RETVAL->y = 0;	1141	RETVAL->y = 0;
…		…
983	RETVAL->row = 0;	1151	RETVAL->row = 0;
984	OUTPUT:	1152	OUTPUT:
985	RETVAL	1153	RETVAL
986		1154
987	void	1155	void
988	DESTROY (CFClient::Map self)	1156	DESTROY (CFPlus::Map self)
989	CODE:	1157	CODE:
990	{	1158	{
991	map_clear (self);	1159	map_clear (self);
992	Safefree (self->face);	1160	Safefree (self->face);
		1161	Safefree (self->tex);
993	Safefree (self);	1162	Safefree (self);
994	}	1163	}
995		1164
996	void	1165	void
997	clear (CFClient::Map self)	1166	clear (CFPlus::Map self)
998	CODE:	1167	CODE:
999	map_clear (self);	1168	map_clear (self);
1000		1169
1001	void	1170	void
1002	set_face (CFClient::Map self, int face, int texid)	1171	set_face (CFPlus::Map self, int face, int texid)
1003	CODE:	1172	CODE:
1004	{	1173	{
1005	while (self->faces <= face)	1174	while (self->faces <= face)
1006	{	1175	{
1007	Append (mapface, self->face, self->faces, self->faces);	1176	Append (mapface, self->face, self->faces, self->faces);
…		…
1010		1179
1011	self->face [face] = texid;	1180	self->face [face] = texid;
1012	}	1181	}
1013		1182
1014	void	1183	void
1015	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)
1016	CODE:	1185	CODE:
1017	{	1186	{
1018	while (self->texs <= texid)	1187	while (self->texs <= texid)
1019	{	1188	{
1020	Append (maptex, self->tex, self->texs, self->texs);	1189	Append (maptex, self->tex, self->texs, self->texs);
…		…
1032	tex->r = r;	1201	tex->r = r;
1033	tex->g = g;	1202	tex->g = g;
1034	tex->b = b;	1203	tex->b = b;
1035	tex->a = a;	1204	tex->a = a;
1036	}	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);
1037	}	1215	}
1038		1216
1039	int	1217	int
1040	ox (CFClient::Map self)	1218	ox (CFPlus::Map self)
1041	ALIAS:	1219	ALIAS:
1042	oy = 1	1220	oy = 1
		1221	x = 2
		1222	y = 3
		1223	w = 4
		1224	h = 5
1043	CODE:	1225	CODE:
1044	switch (ix)	1226	switch (ix)
1045	{	1227	{
1046	case 0: RETVAL = self->ox; break;	1228	case 0: RETVAL = self->ox; break;
1047	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;
1048	}	1234	}
1049	OUTPUT:	1235	OUTPUT:
1050	RETVAL	1236	RETVAL
1051		1237
1052	void	1238	void
1053	scroll (CFClient::Map self, int dx, int dy)	1239	scroll (CFPlus::Map self, int dx, int dy)
1054	CODE:	1240	CODE:
1055	{	1241	{
1056	if (dx > 0)	1242	if (dx > 0)
1057	map_blank (self, self->x, self->y, dx - 1, self->h);	1243	map_blank (self, self->x, self->y, dx - 1, self->h);
1058	else if (dx < 0)	1244	else if (dx < 0)
…		…
1074	self->y += MAP_EXTEND_Y;	1260	self->y += MAP_EXTEND_Y;
1075	}	1261	}
1076	}	1262	}
1077		1263
1078	void	1264	void
1079	map1a_update (CFClient::Map self, SV *data_)	1265	map1a_update (CFPlus::Map self, SV *data_, int extmap)
1080	CODE:	1266	CODE:
1081	{	1267	{
1082	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);	1268	uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1083	uint8_t *data_end = (uint8_t *)SvEND (data_);	1269	uint8_t *data_end = (uint8_t *)SvEND (data_);
1084	mapcell *cell;	1270	mapcell *cell;
…		…
1086		1272
1087	while (data < data_end)	1273	while (data < data_end)
1088	{	1274	{
1089	flags = (data [0] << 8) + data [1]; data += 2;	1275	flags = (data [0] << 8) + data [1]; data += 2;
1090		1276
1091	x = ((flags >> 10) & 63) + self->x;	1277	x = self->x + ((flags >> 10) & 63);
1092	y = ((flags >> 4) & 63) + self->y;	1278	y = self->y + ((flags >> 4) & 63);
1093		1279
1094	cell = map_get_cell (self, x, y);	1280	cell = map_get_cell (self, x, y);
1095		1281
1096	if (flags & 15)	1282	if (flags & 15)
1097	{	1283	{
…		…
1101	cell->face [0] = 0;	1287	cell->face [0] = 0;
1102	cell->face [1] = 0;	1288	cell->face [1] = 0;
1103	cell->face [2] = 0;	1289	cell->face [2] = 0;
1104	}	1290	}
1105		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
1106	cell->darkness = flags & 8 ? *data++ : 255;	1313	cell->darkness = flags & 8 ? *data++ : 255;
		1314	}
1107		1315
1108	//TODO: don't trust server data to be in-range(!)	1316	//TODO: don't trust server data to be in-range(!)
1109		1317
1110	if (flags & 4)	1318	if (flags & 4)
1111	{	1319	{
…		…
1126	cell->darkness = -1;	1334	cell->darkness = -1;
1127	}	1335	}
1128	}	1336	}
1129		1337
1130	SV *	1338	SV *
1131	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)
1132	CODE:	1340	CODE:
1133	{	1341	{
1134	int x1, x;	1342	int x1, x;
1135	int y1, y;	1343	int y1, y;
1136	int z;	1344	int z;
…		…
1186	}	1394	}
1187	OUTPUT:	1395	OUTPUT:
1188	RETVAL	1396	RETVAL
1189		1397
1190	void	1398	void
1191	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)
1192	PPCODE:	1400	CODE:
1193	{	1401	{
1194	int vx, vy;	1402	int vx, vy;
1195	int x, y, z;	1403	int x, y, z;
1196	int last_name;	1404	int last_name;
1197	mapface face;	1405	mapface face;
1198	int sw4 = (sw + 3) & ~3;
1199	SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1200	uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1201		1406
1202	memset (darkness, 255, sw4 * sh);
1203	SvPOK_only (darkness_sv);
1204	SvCUR_set (darkness_sv, sw4 * sh);
1205
1206	vx = self->x + (self->w - sw) / 2 - shift_x;	1407	vx = self->x + self->w / 2 - sw / 2 - shift_x;
1207	vy = self->y + (self->h - sh) / 2 - shift_y;	1408	vy = self->y + self->h / 2 - sh / 2 - shift_y;
1208		1409
1209	/*	1410	/*
1210	int vx = self->vx = self->w >= sw	1411	int vx = self->vx = self->w >= sw
1211	? self->x + (self->w - sw) / 2	1412	? self->x + (self->w - sw) / 2
1212	: 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));
…		…
1216	: 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));
1217	*/	1418	*/
1218		1419
1219	glColor4ub (255, 255, 255, 255);	1420	glColor4ub (255, 255, 255, 255);
1220		1421
		1422	glEnable (GL_BLEND);
1221	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	1423	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1222	glEnable (GL_BLEND);
1223	glEnable (GL_TEXTURE_2D);	1424	glEnable (GL_TEXTURE_2D);
1224	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);	1425	glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1225		1426
1226	glBegin (GL_QUADS);	1427	glBegin (GL_QUADS);
1227		1428
…		…
1235		1436
1236	for (x = 0; x < sw; x++)	1437	for (x = 0; x < sw; x++)
1237	if (row->c0 <= x + vx && x + vx < row->c1)	1438	if (row->c0 <= x + vx && x + vx < row->c1)
1238	{	1439	{
1239	mapcell *cell = row->col + (x + vx - row->c0);	1440	mapcell *cell = row->col + (x + vx - row->c0);
1240
1241	darkness[y * sw4 + x] = cell->darkness < 0
1242	? 255 - FOW_DARKNESS
1243	: 255 - cell->darkness;
1244		1441
1245	face = cell->face [z];	1442	face = cell->face [z];
1246		1443
1247	if (face)	1444	if (face)
1248	{	1445	{
…		…
1269		1466
1270	glEnd ();	1467	glEnd ();
1271		1468
1272	glDisable (GL_TEXTURE_2D);	1469	glDisable (GL_TEXTURE_2D);
1273	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	}
1274		1565
1275	EXTEND (SP, 3);	1566	EXTEND (SP, 3);
1276	PUSHs (sv_2mortal (newSViv (sw4)));	1567	PUSHs (sv_2mortal (newSViv (sw4)));
1277	PUSHs (sv_2mortal (newSViv (sh)));	1568	PUSHs (sv_2mortal (newSViv (sh)));
1278	PUSHs (darkness_sv);	1569	PUSHs (darkness_sv);
1279	}	1570	}
1280		1571
1281	SV *	1572	SV *
1282	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)
1283	CODE:	1574	CODE:
1284	{	1575	{
1285	int x, y, x1, y1;	1576	int x, y, x1, y1;
1286	SV *data_sv = newSV (w * h * 7 + 5);	1577	SV *data_sv = newSV (w * h * 7 + 5);
1287	uint8_t *data = (uint8_t *)SvPVX (data_sv);	1578	uint8_t *data = (uint8_t *)SvPVX (data_sv);
…		…
1349	}	1640	}
1350	OUTPUT:	1641	OUTPUT:
1351	RETVAL	1642	RETVAL
1352		1643
1353	void	1644	void
1354	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)
1355	PPCODE:	1646	PPCODE:
1356	{	1647	{
1357	int x, y, z;	1648	int x, y, z;
1358	int w, h;	1649	int w, h;
1359	int x1, y1;	1650	int x1, y1;
…		…
1408	}	1699	}
1409	}	1700	}
1410	}	1701	}
1411	}	1702	}
1412		1703
1413	MODULE = CFClient PACKAGE = CFClient::MixChunk	1704	MODULE = CFPlus PACKAGE = CFPlus::MixChunk
1414		1705
1415	CFClient::MixChunk	1706	CFPlus::MixChunk
1416	new_from_file (SV *class, char *path)	1707	new_from_file (SV *class, char *path)
1417	CODE:	1708	CODE:
1418	RETVAL = Mix_LoadWAV (path);	1709	RETVAL = Mix_LoadWAV (path);
1419	OUTPUT:	1710	OUTPUT:
1420	RETVAL	1711	RETVAL
1421		1712
1422	void	1713	void
1423	DESTROY (CFClient::MixChunk self)	1714	DESTROY (CFPlus::MixChunk self)
1424	CODE:	1715	CODE:
1425	Mix_FreeChunk (self);	1716	Mix_FreeChunk (self);
1426		1717
1427	int	1718	int
1428	volume (CFClient::MixChunk self, int volume = -1)	1719	volume (CFPlus::MixChunk self, int volume = -1)
1429	CODE:	1720	CODE:
1430	RETVAL = Mix_VolumeChunk (self, volume);	1721	RETVAL = Mix_VolumeChunk (self, volume);
1431	OUTPUT:	1722	OUTPUT:
1432	RETVAL	1723	RETVAL
1433		1724
1434	int	1725	int
1435	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)
1436	CODE:	1727	CODE:
1437	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);	1728	RETVAL = Mix_PlayChannelTimed (channel, self, loops, ticks);
1438	OUTPUT:	1729	OUTPUT:
1439	RETVAL	1730	RETVAL
1440		1731
1441	MODULE = CFClient PACKAGE = CFClient::MixMusic	1732	MODULE = CFPlus PACKAGE = CFPlus::MixMusic
1442		1733
1443	int	1734	int
1444	volume (int volume = -1)	1735	volume (int volume = -1)
1445	CODE:	1736	CODE:
1446	RETVAL = Mix_VolumeMusic (volume);	1737	RETVAL = Mix_VolumeMusic (volume);
1447	OUTPUT:	1738	OUTPUT:
1448	RETVAL	1739	RETVAL
1449		1740
1450	CFClient::MixMusic	1741	CFPlus::MixMusic
1451	new_from_file (SV *class, char *path)	1742	new_from_file (SV *class, char *path)
1452	CODE:	1743	CODE:
1453	RETVAL = Mix_LoadMUS (path);	1744	RETVAL = Mix_LoadMUS (path);
1454	OUTPUT:	1745	OUTPUT:
1455	RETVAL	1746	RETVAL
1456		1747
1457	void	1748	void
1458	DESTROY (CFClient::MixMusic self)	1749	DESTROY (CFPlus::MixMusic self)
1459	CODE:	1750	CODE:
1460	Mix_FreeMusic (self);	1751	Mix_FreeMusic (self);
1461		1752
1462	int	1753	int
1463	play (CFClient::MixMusic self, int loops = -1)	1754	play (CFPlus::MixMusic self, int loops = -1)
1464	CODE:	1755	CODE:
1465	RETVAL = Mix_PlayMusic (self, loops);	1756	RETVAL = Mix_PlayMusic (self, loops);
1466	OUTPUT:	1757	OUTPUT:
1467	RETVAL	1758	RETVAL
1468		1759
1469	MODULE = CFClient PACKAGE = CFClient::OpenGL	1760	MODULE = CFPlus PACKAGE = CFPlus::OpenGL
1470		1761
1471	BOOT:	1762	BOOT:
1472	{	1763	{
1473	HV *stash = gv_stashpv ("CFClient::OpenGL", 1);	1764	HV *stash = gv_stashpv ("CFPlus::OpenGL", 1);
1474	static const struct {	1765	static const struct {
1475	const char *name;	1766	const char *name;
1476	IV iv;	1767	IV iv;
1477	} *civ, const_iv[] = {	1768	} *civ, const_iv[] = {
1478	# define const_iv(name) { # name, (IV)name }	1769	# define const_iv(name) { # name, (IV)name }
1479	const_iv (GL_COLOR_MATERIAL),	1770	const_iv (GL_COLOR_MATERIAL),
1480	const_iv (GL_SMOOTH),	1771	const_iv (GL_SMOOTH),
1481	const_iv (GL_FLAT),	1772	const_iv (GL_FLAT),
1482	const_iv (GL_DITHER),	1773	const_iv (GL_DITHER),
1483	const_iv (GL_BLEND),	1774	const_iv (GL_BLEND),
		1775	const_iv (GL_CULL_FACE),
1484	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),
1485	const_iv (GL_AND),	1783	const_iv (GL_AND),
1486	const_iv (GL_ONE),	1784	const_iv (GL_ONE),
1487	const_iv (GL_ZERO),	1785	const_iv (GL_ZERO),
1488	const_iv (GL_SRC_ALPHA),	1786	const_iv (GL_SRC_ALPHA),
1489	const_iv (GL_SRC_ALPHA_SATURATE),	1787	const_iv (GL_DST_ALPHA),
1490	const_iv (GL_ONE_MINUS_SRC_ALPHA),	1788	const_iv (GL_ONE_MINUS_SRC_ALPHA),
1491	const_iv (GL_ONE_MINUS_DST_ALPHA),	1789	const_iv (GL_ONE_MINUS_DST_ALPHA),
		1790	const_iv (GL_SRC_ALPHA_SATURATE),
1492	const_iv (GL_RGB),	1791	const_iv (GL_RGB),
1493	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),
1494	const_iv (GL_UNSIGNED_BYTE),	1796	const_iv (GL_UNSIGNED_BYTE),
		1797	const_iv (GL_UNSIGNED_SHORT),
		1798	const_iv (GL_UNSIGNED_INT),
1495	const_iv (GL_ALPHA),	1799	const_iv (GL_ALPHA),
		1800	const_iv (GL_INTENSITY),
1496	const_iv (GL_LUMINANCE),	1801	const_iv (GL_LUMINANCE),
		1802	const_iv (GL_LUMINANCE_ALPHA),
1497	const_iv (GL_FLOAT),	1803	const_iv (GL_FLOAT),
1498	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),	1804	const_iv (GL_UNSIGNED_INT_8_8_8_8_REV),
1499	const_iv (GL_COMPILE),	1805	const_iv (GL_COMPILE),
1500	const_iv (GL_TEXTURE_1D),	1806	const_iv (GL_TEXTURE_1D),
1501	const_iv (GL_TEXTURE_2D),	1807	const_iv (GL_TEXTURE_2D),
…		…
1503	const_iv (GL_TEXTURE_MAG_FILTER),	1809	const_iv (GL_TEXTURE_MAG_FILTER),
1504	const_iv (GL_TEXTURE_MIN_FILTER),	1810	const_iv (GL_TEXTURE_MIN_FILTER),
1505	const_iv (GL_TEXTURE_ENV_MODE),	1811	const_iv (GL_TEXTURE_ENV_MODE),
1506	const_iv (GL_TEXTURE_WRAP_S),	1812	const_iv (GL_TEXTURE_WRAP_S),
1507	const_iv (GL_TEXTURE_WRAP_T),	1813	const_iv (GL_TEXTURE_WRAP_T),
		1814	const_iv (GL_REPEAT),
1508	const_iv (GL_CLAMP),	1815	const_iv (GL_CLAMP),
1509	const_iv (GL_REPEAT),	1816	const_iv (GL_CLAMP_TO_EDGE),
1510	const_iv (GL_NEAREST),	1817	const_iv (GL_NEAREST),
1511	const_iv (GL_LINEAR),	1818	const_iv (GL_LINEAR),
1512	const_iv (GL_NEAREST_MIPMAP_NEAREST),	1819	const_iv (GL_NEAREST_MIPMAP_NEAREST),
1513	const_iv (GL_LINEAR_MIPMAP_NEAREST),	1820	const_iv (GL_LINEAR_MIPMAP_NEAREST),
1514	const_iv (GL_NEAREST_MIPMAP_LINEAR),	1821	const_iv (GL_NEAREST_MIPMAP_LINEAR),
1515	const_iv (GL_LINEAR_MIPMAP_LINEAR),	1822	const_iv (GL_LINEAR_MIPMAP_LINEAR),
1516	const_iv (GL_GENERATE_MIPMAP),	1823	const_iv (GL_GENERATE_MIPMAP),
1517	const_iv (GL_MODULATE),	1824	const_iv (GL_MODULATE),
1518	const_iv (GL_DECAL),	1825	const_iv (GL_DECAL),
1519	const_iv (GL_REPLACE),	1826	const_iv (GL_REPLACE),
		1827	const_iv (GL_DEPTH_BUFFER_BIT),
1520	const_iv (GL_COLOR_BUFFER_BIT),	1828	const_iv (GL_COLOR_BUFFER_BIT),
1521	const_iv (GL_PROJECTION),	1829	const_iv (GL_PROJECTION),
1522	const_iv (GL_MODELVIEW),	1830	const_iv (GL_MODELVIEW),
1523	const_iv (GL_COLOR_LOGIC_OP),	1831	const_iv (GL_COLOR_LOGIC_OP),
1524	const_iv (GL_SEPARABLE_2D),	1832	const_iv (GL_SEPARABLE_2D),
1525	const_iv (GL_CONVOLUTION_2D),	1833	const_iv (GL_CONVOLUTION_2D),
1526	const_iv (GL_CONVOLUTION_BORDER_MODE),	1834	const_iv (GL_CONVOLUTION_BORDER_MODE),
1527	const_iv (GL_CONSTANT_BORDER),	1835	const_iv (GL_CONSTANT_BORDER),
1528	const_iv (GL_LINES),	1836	const_iv (GL_LINES),
		1837	const_iv (GL_LINE_STRIP),
		1838	const_iv (GL_LINE_LOOP),
1529	const_iv (GL_QUADS),	1839	const_iv (GL_QUADS),
1530	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),
1531	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),	1844	const_iv (GL_PERSPECTIVE_CORRECTION_HINT),
1532	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),
1533	# undef const_iv	1850	# undef const_iv
1534	};	1851	};
1535		1852
1536	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; )
1537	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));	1854	newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
1538	}	1855	}
1539		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
1540	int glGetError ()	1878	int glGetError ()
		1879
		1880	void glFinish ()
1541		1881
1542	void glClear (int mask)	1882	void glClear (int mask)
1543		1883
1544	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)
1545	PROTOTYPE: @	1885	PROTOTYPE: @
…		…
1552		1892
1553	void glHint (int target, int mode)	1893	void glHint (int target, int mode)
1554		1894
1555	void glBlendFunc (int sfactor, int dfactor)	1895	void glBlendFunc (int sfactor, int dfactor)
1556		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
1557	void glLogicOp (int opcode)	1903	void glLogicOp (int opcode)
1558		1904
1559	void glColorMask (int red, int green, int blue, int alpha)	1905	void glColorMask (int red, int green, int blue, int alpha)
1560		1906
1561	void glMatrixMode (int mode)	1907	void glMatrixMode (int mode)
…		…
1564		1910
1565	void glPopMatrix ()	1911	void glPopMatrix ()
1566		1912
1567	void glLoadIdentity ()	1913	void glLoadIdentity ()
1568		1914
		1915	void glDrawBuffer (int buffer)
		1916
		1917	void glReadBuffer (int buffer)
		1918
1569	# 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
1570	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_)
1571		1924
1572	void glViewport (int x, int y, int width, int height)	1925	void glViewport (int x, int y, int width, int height)
1573		1926
1574	void glScissor (int x, int y, int width, int height)	1927	void glScissor (int x, int y, int width, int height)
…		…
1589		1942
1590	void glEnd ()	1943	void glEnd ()
1591		1944
1592	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)
1593	PROTOTYPE: @	1946	PROTOTYPE: @
		1947	ALIAS:
		1948	glColor_premultiply = 1
1594	CODE:	1949	CODE:
1595	glColor4ub (MIN ((int)r * 256., 255),	1950	if (ix)
1596	MIN ((int)g * 256., 255),	1951	{
1597	MIN ((int)b * 256., 255),	1952	r *= a;
1598	MIN ((int)a * 256., 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);
1599		1969
1600	void glVertex (float x, float y, float z = 0.)	1970	void glVertex (float x, float y, float z = 0.)
1601	CODE:	1971	CODE:
1602	glVertex3f (x, y, z);	1972	glVertex3f (x, y, z);
1603		1973
…		…
1615		1985
1616	void glBindTexture (int target, int name)	1986	void glBindTexture (int target, int name)
1617		1987
1618	void glConvolutionParameter (int target, int pname, float params)	1988	void glConvolutionParameter (int target, int pname, float params)
1619	CODE:	1989	CODE:
1620	GL_CALL (PFNGLCONVOLUTIONPARAMETERFEXTPROC, glConvolutionParameterf, (target, pname, params));	1990	if (gl.ConvolutionParameterf)
		1991	gl.ConvolutionParameterf (target, pname, params);
1621		1992
1622	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)
1623	CODE:	1994	CODE:
1624	GL_CALL (PFNGLCONVOLUTIONFILTER2DEXTPROC, glConvolutionFilter2D,	1995	if (gl.ConvolutionFilter2D)
1625	(target, internalformat, width, height, format, type, data));	1996	gl.ConvolutionFilter2D (target, internalformat, width, height, format, type, data);
1626		1997
1627	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)
1628	CODE:	1999	CODE:
1629	GL_CALL (PFNGLSEPARABLEFILTER2DEXTPROC, glSeparableFilter2D,	2000	if (gl.SeparableFilter2D)
1630	(target, internalformat, width, height, format, type, row, column));	2001	gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
1631		2002
1632	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)
1633		2004
1634	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)
1635		2006
1636	void glRasterPos (int x, int y)	2007	void glDrawPixels (int width, int height, int format, int type, char *pixels)
1637	CODE:
1638	glRasterPos2i (x, y);
1639		2008
1640	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)
1641		2010
1642	int glGenTexture ()	2011	int glGenTexture ()
1643	CODE:	2012	CODE:

Diff Legend

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