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.141 by root, Fri Aug 18 01:01:00 2006 UTC

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

Diff Legend

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