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.82 by root, Mon May 15 00:15:08 2006 UTC vs.
Revision 1.139 by root, Mon Aug 14 03:04:17 2006 UTC

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

Diff Legend

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