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.79 by root, Sun May 14 22:24:14 2006 UTC vs.
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC

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

Diff Legend

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