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.78 by root, Fri May 12 01:47:03 2006 UTC vs.
Revision 1.133 by root, Sun Jul 30 13:16:44 2006 UTC

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

Diff Legend

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